Merge pull request #1210 from BBsan13/master

#6 #420 第六次实验
hzuapps · Dec 3, 2020 · 54c843d · 54c843d
2 parents 8d42aa1 + f75b147
commit 54c843d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 27 deletions.
diff --git a/students/net1814080903139/src/main/AndroidManifest.xml b/students/net1814080903139/src/main/AndroidManifest.xml
@@ -2,41 +2,35 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="edu.hzuapps.androids">
 
+
+    <uses-permission
+        android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity
-            android:name=".TimeActivity"
-            android:parentActivityName=".Net1814080903139Activity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".Net1814080903139Activity"></meta-data>
-        </activity>
-        <activity
-            android:name=".AlarmActivity"
-            android:parentActivityName=".Net1814080903139Activity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".Net1814080903139Activity"></meta-data>
-        </activity>
-        <activity
-            android:name=".TimerActivity"
-            android:parentActivityName=".Net1814080903139Activity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".Net1814080903139Activity"></meta-data>
-        </activity>
-        <activity
-            android:name=".StopWatchActivity"
-            android:parentActivityName=".Net1814080903139Activity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".Net1814080903139Activity" />
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
+        <activity android:name=".AlarmActivity" />
+
+        <receiver
+            android:name=".AlarmReceiver"
+            android:screenOrientation="portrait">
+            <!--android:enabled="true"-->
+            <!--android:exported="true"-->
+
+            <intent-filter>
+                <action android:name="android.intent.cation.BOOT_COMPLETED"/>
+            </intent-filter>
+        </receiver>
 
     </application>
 

diff --git a/students/net1814080903139/src/main/res/raw/music.mp3 b/students/net1814080903139/src/main/res/raw/music.mp3