From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google

---
 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 14012a8..4754d99 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" />
     <!-- &lt;!&ndash;Android13 鐓х墖&ndash;&gt; -->
-     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <!-- &lt;!&ndash;Android13 瑙嗛&ndash;&gt; -->
-     <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 瑙掓爣 -->
@@ -76,8 +76,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" />
@@ -103,10 +102,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"
@@ -125,8 +124,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" />
@@ -154,9 +152,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"
@@ -166,7 +166,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"
@@ -236,10 +237,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