Merge branch 'branch_new_dev' into branch_new

app/build.gradle

@@ -63,7 +63,8 @@ android {
 
             // 【正式版图标】替换manifest中的占位符（使用main目录下的正式图标）
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_launcher"  // 需在main/res/mipmap放置该图标
+                    appIcon: "@mipmap/ic_launcher",  // 需在main/res/mipmap放置该图标
+                    fileProviderAuthority: "com.qxcm.qxlive.provider"
             ]
         }
 
@@ -80,7 +81,8 @@ android {
 //
 //            // 【测试版图标】替换为测试专用图标
             manifestPlaceholders = [
-                    appIcon: "@mipmap/ic_launcher_app_bat"  // 需在main/res/mipmap放置该图标
+                    appIcon: "@mipmap/ic_launcher_app_bat",  // 需在main/res/mipmap放置该图标
+                    fileProviderAuthority: "com.qxcm.qxlive.beta.provider"
             ]
         }
     }

app/src/main/AndroidManifest.xml

@@ -202,15 +202,16 @@
             android:exported="true"
             />
 
-<!--        <provider-->
-<!--            android:name="androidx.core.content.FileProvider"-->
-<!--            android:authorities="${applicationId}.fileprovider"-->
-<!--            android:exported="false"-->
-<!--            android:grantUriPermissions="true">-->
-<!--            <meta-data-->
-<!--                android:name="android.support.FILE_PROVIDER_PATHS"-->
-<!--                android:resource="@xml/file_paths" />-->
-<!--        </provider>-->
+
+        <!--<provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>-->
 
     </application>
 <!--    <queries>-->

app/src/main/res/xml/file_paths.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <!-- Environment.getExternalStorageDirectory()-->
-    <external-path
-        name="external-path"
-        path="."/>
-    <!-- Context.getExternalCacheDir() -->
-    <external-cache-path
-        name="external-cache-path"
-        path="."/>
-    <!-- Context.getExternalFilesDir(null) -->
-    <external-files-path
-        name="external-files-path"
-        path="."/>
-    <!-- Context.getFilesDir() -->
-    <files-path
-        name="files_path"
-        path="."/>
-    <!-- Context.getCacheDir() -->
-    <cache-path
-        name="cache-path"
-        path="."/>
-    <root-path
-        name="name"
-        path="."/>
-</paths>