From 542a1aebe872632e69b4a42ff629d13bb4e8d6d0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 七月 2025 09:31:14 +0800
Subject: [PATCH] Merge branch '1.3.1'

---
 app/src/main/AndroidManifest.xml |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ae10be4..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" />
     <!-- &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 瑙掓爣 -->
@@ -21,18 +21,15 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.INTERNET" /> <!-- 寮�鍚綉缁滄潈闄� -->
     <!-- 浣嶇疆淇℃伅 -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 濡傛灉鏄畨鍗�10.0锛岄渶瑕佸悗鍙拌幏鍙栬繛鎺ョ殑wifi鍚嶇О鍒欐坊鍔犺繘绋嬭幏鍙栦綅缃俊鎭潈闄� -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- android 10.0浣跨敤wifi api鏂版坊鍔犵殑鏉冮檺 -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- 妫�娴嬭仈缃戞柟寮忥紝鍦ㄧ綉缁滃紓甯哥姸鎬佷笅閬垮厤鏁版嵁鍙戦�侊紝鑺傜渷娴侀噺鍜岀數閲忋��-->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 	鑾峰彇WIFI mac鍦板潃锛屽湪骞虫澘璁惧鎴栫數瑙嗙洅瀛愪笂锛屾棤娉曢�氳繃IMEI鏍囪瘑璁惧锛屾垜浠細灏哤IFI mac鍦板潃浣滀负鐢ㄦ埛鐨勫敮涓�鏍囪瘑锛屼互渚挎甯告彁渚涚粺璁″垎鏋愭湇鍔�-->
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <!-- UNI鐩告満鍜屽瓨鍌ㄧ殑鏉冮檺 -->
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" /> <!-- 璁块棶闂厜鐏� -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- Optional. Required for location feature -->
-    <!-- 涓轰簡鎻愰珮sdk璇嗗埆鍞竴鐢ㄦ埛鐨勮兘鍔涳紝淇濊瘉娑堟伅鎺ㄩ�佺殑绮惧噯閫佽揪锛屽缓璁泦鎴愪互涓嬫潈闄愶紙鍙�夛級 -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />   <!-- 鑾峰彇鐢ㄦ埛璁惧鐨処MEI锛岄�氳繃IMEI瀵圭敤鎴疯繘琛屽敮涓�鏍囪瘑锛屼互渚挎彁渚涚粺璁″垎鏋愶紝sdk鎺ㄩ�佹湇鍔°�� -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
@@ -59,6 +56,8 @@
 
     <uses-permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" /> <!-- 閫傞厤Android13锛屽脊鍑洪�氱煡蹇呴』鏉冮檺 -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <!--  鍓嶅彴鏈嶅姟鏉冮檺  -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <queries>
         <package android:name="com.hdl.photovoltaic.services" />
@@ -98,13 +97,10 @@
             android:name=".ui.powerstation.HouseSearchActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.powerstation.HouseListEditActivity"
+            android:name=".ui.newC.MessageCenterListActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.newC.MessageCenterList"
-            android:exported="false" />
-        <activity
-            android:name=".ui.newC.PowerStationsListEdit"
+            android:name=".ui.newC.PowerStationsListActivity"
             android:exported="false" />
         <activity
             android:name=".ui.CPowerStationActivity"
@@ -154,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"
@@ -166,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"
@@ -236,6 +235,11 @@
             </intent-filter>
         </service>
 
+        <!--        <service-->
+        <!--            android:name=".services.ForeService"-->
+        <!--            android:enabled="true"-->
+        <!--            android:exported="true" />-->
+
         <meta-data
             android:name="design_height_in_dp"
             android:value="812" />

--
Gitblit v1.8.0