Merge pull request #1554 from wanshanghong/master

#7 #324 第7次实验
hzuapps · Apr 22, 2019 · f8e45bb · f8e45bb
2 parents 4b81d4c + 1c4c025
commit f8e45bb
Show file tree

Hide file tree

Showing 8 changed files with 947 additions and 12 deletions.
diff --git a/students/soft1714080902219/app/src/main/AndroidManifest.xml b/students/soft1714080902219/app/src/main/AndroidManifest.xml
@@ -1,13 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="edu.hzuapps.androidlabs.Soft1714080902219">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <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"/>
+        tools:ignore="ProtectedPermissions"/>
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <provider
+
+            android:name="android.support.v4.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>
+
         <activity android:name=".Soft1714080902219Activity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -16,9 +45,8 @@
             </intent-filter>
         </activity>
         <activity android:name=".Soft1714080902219Activity2" />
-        <activity android:name=".Soft1714080902219Activity3"></activity>
+        <activity android:name=".Soft1714080902219Activity3" />
+        <activity android:name=".Soft1714080902219TakephotoActivity"></activity>
     </application>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.INTERNET" />
+
 </manifest>