diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d175c01..db80cb12 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,8 @@ + + diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt index 37cebe65..94b8ab90 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt @@ -28,7 +28,8 @@ open class PermissionsActivity : BaseActivity() { //定位权限 permissionList.add(Permission.ACCESS_FINE_LOCATION) permissionList.add(Permission.ACCESS_COARSE_LOCATION) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + //android10 + if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) { permissionList.add(Permission.ACCESS_BACKGROUND_LOCATION) } XXPermissions.with(this) diff --git a/build.gradle b/build.gradle index 1d762f35..18e288c4 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,9 @@ buildscript { dependencies { + classpath 'com.android.tools.build:gradle:4.2.2' + classpath('androidx.multidex:multidex:2.0.1') + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath "io.realm:realm-gradle-plugin:10.10.1" } } diff --git a/gradle.properties b/gradle.properties index 26bd972f..ce45e5af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,4 +27,5 @@ systemProp.http.proxyPort=1080 systemProp.https.proxyHost=127.0.0.1 systemProp.https.proxyPort=1080 org.gradle.configureondemand=true -android.experimental.legacyTransform.forceNonIncremental=true \ No newline at end of file +android.experimental.legacyTransform.forceNonIncremental=true +android.injected.studio.version.check = false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 690a555d..fce747eb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Mar 21 10:15:37 CST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME