From 9a697d6a8bc05955b9f7322bc86dc3e920e90e14 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 06 十一月 2025 18:07:21 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao

---
 keyCabinet-android/app/src/main/AndroidManifest.xml |   52 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/keyCabinet-android/app/src/main/AndroidManifest.xml b/keyCabinet-android/app/src/main/AndroidManifest.xml
index 9b7b0e1..1246ac8 100644
--- a/keyCabinet-android/app/src/main/AndroidManifest.xml
+++ b/keyCabinet-android/app/src/main/AndroidManifest.xml
@@ -16,6 +16,12 @@
         android:usesCleartextTraffic="true"
         tools:replace="android:allowBackup">
         <activity
+            android:name=".ui.face.ChoseActivationActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.face.OfflineActivationActivity"
+            android:exported="false" />
+        <activity
             android:name=".ui.keyCabinet.ChangeUrlActivity"
             android:exported="false" />
         <activity
@@ -27,31 +33,30 @@
         <activity
             android:name=".ui.keyCabinet.KeyCabinetActivity"
             android:exported="false" />
-        <activity android:name=".ui.guide.TestActivity">
-
-        </activity>
+        <activity android:name=".ui.guide.TestActivity" />
         <activity
-            android:name="com.doumee.keyCabinet.ui.face.ErrActivity"
+            android:name=".ui.face.ErrActivity"
             android:exported="false" />
         <activity
-            android:name="com.doumee.keyCabinet.ui.face.UserManagerActivity"
+            android:name=".ui.face.UserManagerActivity"
             android:exported="false" />
         <activity
-            android:name="com.doumee.keyCabinet.ui.face.AddFaceActivity"
+            android:name=".ui.face.AddFaceActivity"
             android:exported="false" />
         <activity
-            android:name="com.doumee.keyCabinet.ui.face.ActivationActivity"
+            android:name=".ui.face.ActivationActivity"
             android:exported="false" />
         <activity
-            android:name="com.doumee.keyCabinet.ui.face.FaceActivity"
+            android:name=".ui.face.FaceActivity"
             android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustPan"/>
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" />
         <activity
-            android:name="com.doumee.keyCabinet.ui.main.MainActivity"
+            android:name=".ui.main.MainActivity"
             android:exported="true"
-            android:launchMode="singleTask" >
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -75,8 +80,8 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
-
-        <!--<receiver
+        <!--
+<receiver
             android:name="com.doumee.keyCabinet.ui.service.BootCompleteReceiver"
             android:enabled="true"
             android:exported="true">
@@ -85,20 +90,22 @@
             <intent-filter android:priority="1000">
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
-        </receiver>-->
-
-        <!--<service android:name="com.doumee.keyCabinet.ui.service.HeartbeatService" />
-        <service android:name="com.doumee.keyCabinet.ui.service.FaceUpdateService" />-->
-
+        </receiver>
+        -->
+        <!--
+<service android:name="com.doumee.keyCabinet.ui.service.HeartbeatService" />
+        <service android:name="com.doumee.keyCabinet.ui.service.FaceUpdateService" />
+        -->
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false" />
     </application>
-    <uses-permission android:name="android.permission.ACCESS_SURERUSER" />
-    <uses-permission android:name="android.permission.USB_PERMISSION"/>
-    <uses-feature android:name="android.hardware.usb.host"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-feature android:name="android.hardware.usb.host" />
+
     <uses-feature android:name="android.hardware.nfc" />
+    <uses-permission android:name="android.permission.ACCESS_SURERUSER" />
+    <uses-permission android:name="android.permission.USB_PERMISSION" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
@@ -120,7 +127,6 @@
     <uses-permission
         android:name="android.permission.INTERACT_ACROSS_USERS"
         tools:ignore="ProtectedPermissions" />
-
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
     <uses-permission
         android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"

--
Gitblit v1.9.3