From 9cfcd4c424c99f1f9dede58c3bf5aa0166c95381 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 十二月 2025 08:51:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan
---
keyCabinet-android/app/src/main/AndroidManifest.xml | 90 ++++++++++++++++++++++++++++-----------------
1 files changed, 56 insertions(+), 34 deletions(-)
diff --git a/keyCabinet-android/app/src/main/AndroidManifest.xml b/keyCabinet-android/app/src/main/AndroidManifest.xml
index 9b7b0e1..ee474d0 100644
--- a/keyCabinet-android/app/src/main/AndroidManifest.xml
+++ b/keyCabinet-android/app/src/main/AndroidManifest.xml
@@ -10,11 +10,26 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:networkSecurityConfig="${network_security_config}"
- android:requestLegacyExternalStorage="true"
android:supportsRtl="true"
android:theme="@style/CustomAppTheme"
android:usesCleartextTraffic="true"
tools:replace="android:allowBackup">
+ <activity
+ android:name=".ui.keyCabinet.ChoseFunActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.keyCabinet.ZWLRActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.keyCabinet.ZWListActivity"
+ android:exported="true" >
+ </activity>
+ <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" />
@@ -27,31 +42,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>
@@ -65,7 +79,25 @@
<meta-data
android:name="com.google.android.gms.vision.DEPENDENCIES"
android:value="face" />
+ <meta-data
+ android:name="android:requestLegacyExternalStorage"
+ android:value="true" />
+ <!--
+<receiver
+ android:name="com.doumee.keyCabinet.ui.service.BootCompleteReceiver"
+ android:enabled="true"
+ android:exported="true">
+ <!– 鎺ユ敹鍚姩瀹屾垚鐨勫箍鎾� –>
+ <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" />
+ -->
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.doumee.keyCabinet.fileProvider"
@@ -75,32 +107,22 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
-
- <!--<receiver
- android:name="com.doumee.keyCabinet.ui.service.BootCompleteReceiver"
- android:enabled="true"
- android:exported="true">
-
- <!– 鎺ユ敹鍚姩瀹屾垚鐨勫箍鎾� –>
- <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" />-->
-
<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"
+ android:sharedUserId="android.uid.system"/>
+ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
+ tools:ignore="ProtectedPermissions" />
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.READ_OWNER_DATA" />
+ <uses-permission android:name="android.permission.WRITE_OWNER_DATA" />
<uses-feature android:name="android.hardware.nfc" />
+ <uses-permission android:name="android.permission.ACCESS_SURERUSER" />
+ <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" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -109,7 +131,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission
android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"
@@ -120,7 +142,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"
@@ -128,6 +149,7 @@
<uses-permission
android:name="android.permission.WRITE_SETTINGS"
tools:ignore="ProtectedPermissions" />
+ <uses-permission android:name="android.permission.ACCESS_USB_PERMISSION" />
<uses-permission android:name="android.permission.NFC" />
--
Gitblit v1.9.3