1.Android 13 存储权限适配

朱显松
1 parent 6c476972
Showing 9 changed files with 37 additions and 26 deletions
app/build.gradle
build.gradle
config.gradle
gradle.properties
gradle/wrapper/gradle-wrapper.properties
module_xiaojiaSoundBox/build.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/ShareFriendActivity.java
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/constant/PermissionConstants.java
settings.gradle
@@ -5,11 +5,12 @@ static def stringValue(def value) {
 }
  
 android {
-    compileSdkVersion 29
+    compileSdkVersion 33
+    buildToolsVersion = '30.0.3'
     defaultConfig {
         applicationId "com.cnlive.strike"
         minSdkVersion 18
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.test.runner.AndroidJUnitRunner"
@@ -63,12 +64,9 @@ android {
         javaMaxHeapSize '4g'
     }
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
-
-
-    buildToolsVersion = '29.0.2'
 }
  
 dependencies {
@@ -8,7 +8,7 @@ buildscript {
  
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "com.alibaba:arouter-register:1.0.2"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -44,10 +44,10 @@ ext {
     versionCode = versionMajor * 1000 + versionMinor * 100 + versionPatch * 10 + versionBuild
     versionName = "${versionMajor}.${versionMinor}.${versionPatch}.${versionBuild}"
  
-    compileSdkVersion = 28
+    compileSdkVersion = 33
     buildToolsVersion = "28.0.3"
     minSdkVersion = 18
-    targetSdkVersion = 27
+    targetSdkVersion = 33
  
     //support 相关
     supportV4 = '28.0.0'
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.4.6",
+            version: "0.4.8",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -11,10 +11,9 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
+#android.useAndroidX=true
+#android.enableJetifier=true
+android.injected.testOnly=false
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
  
-#Tue Aug 27 10:06:28 CST 2019
+#Mon May 06 14:30:22 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
@@ -6,12 +6,12 @@ static def stringValue(def value) {
 }
  
 android {
-    compileSdkVersion 28
-
+    compileSdkVersion 33
+    buildToolsVersion = '30.0.3'
  
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 28
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
  
@@ -8,6 +8,8 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Base64;
 import android.view.View;
@@ -118,8 +120,15 @@ import java.io.ByteArrayOutputStream;
                  .withActivity(this)
                  .getPermissions(this
                          , 100
-                         , Manifest.permission.WRITE_EXTERNAL_STORAGE
-                         , Manifest.permission.READ_EXTERNAL_STORAGE
+                         , Build.VERSION.SDK_INT >= 33 ?
+                                 new String[]{
+                                         Manifest.permission.READ_MEDIA_IMAGES,
+                                         Manifest.permission.READ_MEDIA_AUDIO,
+                                         Manifest.permission.READ_MEDIA_VIDEO,
+                                         Manifest.permission.WRITE_EXTERNAL_STORAGE} :
+                                 new String[]{
+                                         Manifest.permission.READ_EXTERNAL_STORAGE,
+                                         Manifest.permission.WRITE_EXTERNAL_STORAGE}
                  );
      }
  
@@ -63,9 +63,15 @@ public final class PermissionConstants {
             permission.SEND_SMS, permission.RECEIVE_SMS, permission.READ_SMS,
             permission.RECEIVE_WAP_PUSH, permission.RECEIVE_MMS,
     };
-    private static final String[] GROUP_STORAGE       = {
-            permission.READ_EXTERNAL_STORAGE, permission.WRITE_EXTERNAL_STORAGE,
-    };
+    private static final String[] GROUP_STORAGE = Build.VERSION.SDK_INT >= 33 ?
+            new String[]{
+                    Manifest.permission.READ_MEDIA_IMAGES,
+                    Manifest.permission.READ_MEDIA_AUDIO,
+                    Manifest.permission.READ_MEDIA_VIDEO,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE} :
+            new String[]{
+                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE};
  
     @StringDef({CALENDAR, CAMERA, CONTACTS, LOCATION, MICROPHONE, PHONE, SENSORS, SMS, STORAGE,})
     @Retention(RetentionPolicy.SOURCE)
 include ':app', ':module_xiaojiaSoundBox'
-rootProject.name='XiaoJiaSpeaker'