From c19f27f32f3c3d2caf82ddbdc3b2602ee3610e46 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期一, 07 七月 2025 11:11:34 +0800 Subject: [PATCH] Merge branch '1.3.1' --- app/src/main/AndroidManifest.xml | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b9d5646..230b50d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,9 +7,9 @@ android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" tools:ignore="ProtectedPermissions" /> <!-- <!–Android13 鐓х墖–> --> - <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> + <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> <!-- <!–Android13 瑙嗛–> --> - <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> + <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> <!-- Android13 闊抽 --> <!-- <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" /> --> <uses-permission android:name="android.permission.VIBRATE" /> <!-- honor 瑙掓爣 --> @@ -71,8 +71,7 @@ android:persistent="true" android:requestLegacyExternalStorage="true" android:supportsRtl="true" - android:theme="@style/Theme.PhotovoltaicDebug" - > + android:theme="@style/Theme.PhotovoltaicDebug"> <activity android:name=".ui.me.UnregisterActivity" android:exported="false" /> @@ -98,10 +97,10 @@ android:name=".ui.powerstation.HouseSearchActivity" android:exported="false" /> <activity - android:name=".ui.newC.MessageCenterList" + android:name=".ui.newC.MessageCenterListActivity" android:exported="false" /> <activity - android:name=".ui.newC.PowerStationsListEdit" + android:name=".ui.newC.PowerStationsListActivity" android:exported="false" /> <activity android:name=".ui.CPowerStationActivity" @@ -120,8 +119,7 @@ android:exported="false" /> <activity android:name=".ui.me.languageSelectionActivity" - android:exported="false" - /> + android:exported="false" /> <activity android:name=".ui.me.AccountAndSecurityActivity" android:exported="false" /> @@ -152,9 +150,11 @@ android:exported="false" /> <activity android:name=".ui.account.ChangePassword" + android:theme="@style/login_Theme" android:exported="false" /> <activity android:name=".ui.account.RegisterAccountActivity" + android:theme="@style/login_Theme" android:exported="false" /> <activity android:name=".ui.device.ScanActivity" @@ -164,7 +164,8 @@ android:exported="false" /> <activity android:name=".ui.LoginActivity" - android:exported="false" /> + android:exported="false" + android:theme="@style/login_Theme" /> <activity android:name=".widget.apkwgtupload.AndroidPermissionActivity" /> <activity android:name=".ui.StartActivity" @@ -234,10 +235,10 @@ </intent-filter> </service> -<!-- <service--> -<!-- android:name=".services.ForeService"--> -<!-- android:enabled="true"--> -<!-- android:exported="true" />--> + <!-- <service--> + <!-- android:name=".services.ForeService"--> + <!-- android:enabled="true"--> + <!-- android:exported="true" />--> <meta-data android:name="design_height_in_dp" -- Gitblit v1.8.0