Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS

 Conflicts:

	build.gradle

app/src/main/AndroidManifest.xml

@@ -28,6 +28,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <!-- 读取缓存数据 -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!--android:largeHeap="true" 大内存 128M -->
     <application
         android:name=".OMQSApplication"
         android:allowBackup="true"
@@ -35,10 +36,10 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
+        android:largeHeap="true"
         android:theme="@style/Theme.OMQualityInspection"
-        tools:targetApi="31">
+        android:requestLegacyExternalStorage="true">
         <activity
             android:name=".ui.activity.login.LoginActivity"
             android:exported="true"
@@ -58,6 +59,7 @@
             android:screenOrientation="landscape"
             android:theme="@style/Theme.OMQualityInspection" />
 
+        <meta-data android:name="ScopedStorage" android:value="true" />
     </application>
 
 </manifest>