Browse Source

@fun 3D土建精装

lihao1 2 years ago
parent
commit
a542ebe014
2 changed files with 5 additions and 19 deletions
  1. 2 19
      app/src/main/AndroidManifest.xml
  2. 3 0
      app/src/main/res/xml/file_paths.xml

+ 2 - 19
app/src/main/AndroidManifest.xml

@@ -6,8 +6,6 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission
             android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
@@ -30,15 +28,6 @@
                 android:name="design_height_in_dp"
                 android:value="1600"/>
 
-        <provider
-                android:name=".mvvm.ui.examine.MyProvider"
-                android:authorities="com.ys.bdtp.adm.fileProvider"
-                android:exported="false"
-                android:grantUriPermissions="true">
-            <meta-data
-                    android:name="android.support.FILE_PROVIDER_PATHS"
-                    android:resource="@xml/file_paths"/>
-        </provider>
 
         <activity
                 android:name=".MainActivity"
@@ -54,18 +43,12 @@
         </activity>
 
         <!--        <activity android:name=".mvvm.ui.examine.ModelExamineActivity" android:exported="true"/>-->
-        <activity android:name=".mvvm.ui.examine.Space3DActivity" android:exported="true">
         <!--        <activity android:name=".mvvm.ui.examine.ModelExamineActivity" android:exported="true"/>-->
         <activity
                 android:name=".mvvm.ui.examine.Space3DActivity"
                 android:exported="true"
                 android:windowSoftInputMode="adjustPan"
                 android:theme="@style/Theme.Adm.NoActionBar">
-            <!--<intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>-->
         </activity>
         <activity
                 android:name=".mvvm.ui.examine.Repair_ImgSelActivity"
@@ -77,8 +60,8 @@
                 android:theme="@style/Theme.Adm.NoActionBar"/>
 
         <provider
-                android:name="androidx.core.content.FileProvider"
-                android:authorities="com.ys.bdtp.adm.fileprovider"
+                android:name=".mvvm.ui.examine.MyProvider"
+                android:authorities="com.ys.bdtp.adm.fileProvider"
                 android:exported="false"
                 android:grantUriPermissions="true">
             <meta-data

+ 3 - 0
app/src/main/res/xml/file_paths.xml

@@ -12,4 +12,7 @@
     <external-cache-path  path="files/" name="externalcache"/>
     <!-- 物理路径为`Context.getExternalMediaDirs() + /files/*, 要求API21+ -->
     <external-media-path name="externalmedia" path="files/" />
+
+    <external-path path="Android/data/com.ys.bdtp.adm/" name="files_root" />
+    <external-path path="." name="external_storage_root" />
 </paths>