From 43e4b29135bc12bd97c821e5c38666c2a36f837e Mon Sep 17 00:00:00 2001 From: zeng_fs Date: Thu, 15 Aug 2024 13:13:12 +0800 Subject: [PATCH] =?UTF-8?q?Android11=E4=BB=A5=E4=B8=8A=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E6=9C=AA=E7=9F=A5=E6=9D=A5=E6=BA=90=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 2 +- .../java/cn/wandersnail/commons/helper/ApkInstallHelper.java | 4 +++- .../main/java/cn/wandersnail/commons/helper/ApkInstaller.java | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 4ba5c4f..ff27870 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 628f3d4..e4b02a3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip diff --git a/library/build.gradle b/library/build.gradle index 21dc790..9b794c8 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'maven-publish' apply plugin: 'signing' -def lib_version = '1.3.7' +def lib_version = '1.3.8' def user_name = 'wandersnail' def lib_group = 'cn.wandersnail' def lib_artifact = 'commons-android' diff --git a/library/src/main/java/cn/wandersnail/commons/helper/ApkInstallHelper.java b/library/src/main/java/cn/wandersnail/commons/helper/ApkInstallHelper.java index f0d99ab..8a6052e 100644 --- a/library/src/main/java/cn/wandersnail/commons/helper/ApkInstallHelper.java +++ b/library/src/main/java/cn/wandersnail/commons/helper/ApkInstallHelper.java @@ -44,7 +44,9 @@ public void onActivityResult(int requestCode) { */ public void install() { Objects.requireNonNull(apkFile, "apkFile is null"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !activity.getPackageManager().canRequestPackageInstalls()) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && + Build.VERSION.SDK_INT < Build.VERSION_CODES.R && + !activity.getPackageManager().canRequestPackageInstalls()) { Uri uri = Uri.parse("package:" + activity.getPackageName()); Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, uri); activity.startActivityForResult(intent, REQUEST_CODE); diff --git a/library/src/main/java/cn/wandersnail/commons/helper/ApkInstaller.java b/library/src/main/java/cn/wandersnail/commons/helper/ApkInstaller.java index 6027727..b858c3a 100644 --- a/library/src/main/java/cn/wandersnail/commons/helper/ApkInstaller.java +++ b/library/src/main/java/cn/wandersnail/commons/helper/ApkInstaller.java @@ -77,7 +77,8 @@ private void onActivityResult() { public void install() { Activity activity = getActivity(); if (activity != null) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && + Build.VERSION.SDK_INT < Build.VERSION_CODES.R && !activity.getPackageManager().canRequestPackageInstalls()) { Uri uri = Uri.parse("package:" + activity.getPackageName()); Intent intent = new Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, uri);