兼容低版本的 targetSdkVersion 应用集成

Author: getActivity

Logcat.apk

@@ -10,7 +10,7 @@
 
 ```groovy
 dependencies {
-    debugImplementation 'com.hjq:logcat:8.6'
+    debugImplementation 'com.hjq:logcat:8.8'
 }
 ```
 
@@ -71,7 +71,7 @@ dependencies {
 
 #### 作者的其他开源项目
 
-* 安卓架构：[AndroidProject](https://github.com/getActivity/AndroidProject)
+* 安卓技术中台：[AndroidProject](https://github.com/getActivity/AndroidProject)
 
 * 网络框架：[EasyHttp](https://github.com/getActivity/EasyHttp)
 

README.md

@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.logcat.demo"
         minSdkVersion 14
         targetSdkVersion 30
-        versionCode 86
-        versionName "8.6"
+        versionCode 88
+        versionName "8.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/build.gradle

@@ -11,8 +11,9 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
         android:theme="@style/AppTheme"
-        tools:targetApi="n">
+        tools:targetApi="q">
 
         <activity
             android:name=".MainActivity"

app/src/main/AndroidManifest.xml

@@ -9,9 +9,9 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 30
-        versionCode 86
-        versionName "8.6"
+        targetSdkVersion 26
+        versionCode 88
+        versionName "8.8"
     }
 }
 
@@ -26,7 +26,7 @@ publish {
     userOrg = 'getactivity'
     groupId = 'com.hjq'
     artifactId = 'logcat'
-    version = '8.6'
+    version = '8.8'
     description = 'This is to help developers quickly see the logging framework they want'
     website = "https://github.com/getActivity/Logcat"
 }

library/build.gradle

@@ -179,7 +179,7 @@ public void onSelected(final int location) {
                                 break;
                             case 3:
                                 XXPermissions.with(LogcatActivity.this)
-                                        .permission(Permission.MANAGE_EXTERNAL_STORAGE)
+                                        .permission(getStoragePermission())
                                         .request(new OnPermission() {
                                             @Override
                                             public void hasPermission(List<String> granted, boolean all) {
@@ -226,7 +226,7 @@ public boolean onLongClick(View v) {
     public void onClick(View v) {
         if (v == mSaveView) {
             XXPermissions.with(this)
-                    .permission(Permission.MANAGE_EXTERNAL_STORAGE)
+                    .permission(getStoragePermission())
                     .request(new OnPermission() {
                         @Override
                         public void hasPermission(List<String> granted, boolean all) {
@@ -389,7 +389,7 @@ public void run() {
      */
     private void initFilter() {
         File file = new File(LOG_DIRECTORY, LOGCAT_TAG_FILTER_FILE);
-        if (file.exists() && file.isFile() && XXPermissions.hasPermission(this, Permission.MANAGE_EXTERNAL_STORAGE)) {
+        if (file.exists() && file.isFile() && XXPermissions.hasPermission(this, getStoragePermission())) {
             BufferedReader reader = null;
             try {
                 reader = new BufferedReader(new InputStreamReader(new FileInputStream(file),
@@ -533,4 +533,18 @@ protected void onDestroy() {
         super.onDestroy();
         LogcatManager.destroy();
     }
+
+    /**
+     * 获取存储权限
+     */
+    private String[] getStoragePermission() {
+        // 如果当前应用适配的是 Android 11 及以上
+        if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.R) {
+            // 返回 Android 11 的存储权限
+            return new String[]{Permission.MANAGE_EXTERNAL_STORAGE};
+        } else {
+            // 否则就返回旧版的存储权限
+            return Permission.Group.STORAGE;
+        }
+    }
 }