From 18aad0f6f20ce89e2e904a59952f72c194ce085b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 25 四月 2025 13:42:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/featrue/1.2.0-hxb' into 1.2.0

---
 app/src/main/AndroidManifest.xml |  185 +++++++++++++++++++++++++++------------------
 1 files changed, 111 insertions(+), 74 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8644ee1..5fee0fc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,95 +5,108 @@
 
     <uses-permission
         android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
-        tools:ignore="ProtectedPermissions" /> <!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
-    <uses-permission android:name="android.permission.VIBRATE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
-    <!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
-    <!-- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> -->
-    <!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> -->
-    <!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> -->
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> -->
+        tools:ignore="ProtectedPermissions" />
+    <!-- &lt;!&ndash;Android13 鐓х墖&ndash;&gt; -->
+     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <!-- &lt;!&ndash;Android13 瑙嗛&ndash;&gt; -->
+     <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 瑙掓爣 -->
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />&lt;!&ndash;澶栭儴瀛樺偍鐩綍璁块棶鏉冮檺 璋锋瓕play涓婃灦涓嶄簡&ndash;&gt; -->
+    <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> <!-- wifi鐘舵�佹潈闄� -->
     <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" /> <!-- android 10.0浣跨敤wifi api鏂版坊鍔犵殑鏉冮檺 -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- bugly鎵�闇�鏉冮檺 -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
-    <uses-permission android:name="android.permission.CAMERA" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- bugly鎵�闇�鏉冮檺 -->
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- bugly鎵�闇�鏉冮檺 start -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
-    <!-- UNI鐩告満鍜屽瓨鍌ㄧ殑鏉冮檺 -->
+    <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" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" /> <!-- 璁块棶闂厜鐏� -->
+    <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" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
-
-    <!-- Optional. Required for location feature -->
-    <!-- 涓轰簡鎻愰珮sdk璇嗗埆鍞竴鐢ㄦ埛鐨勮兘鍔涳紝淇濊瘉娑堟伅鎺ㄩ�佺殑绮惧噯閫佽揪锛屽缓璁泦鎴愪互涓嬫潈闄愶紙鍙�夛級-->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-
-    <!-- 濡傛偍闇�瑕佹帴鍏ュ湴鐞嗗洿鏍忎笟鍔★紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級-->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> <!-- 濡傛偍闇�瑕佹帴鍏ュ湴鐞嗗洿鏍忎笟鍔★紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級 -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> &lt;!&ndash; 濡傛偍闇�瑕佸搴旇澶囬�氱煡鐩稿叧鐨勮兘鍔涳紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級 &ndash;&gt; -->
+    <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" /> <!-- 鍗庝负瑙掓爣 -->
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" /> <!-- VIVO瑙掓爣鏉冮檺 -->
+    <uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" /> <!-- 鎸姩鍣ㄦ潈闄愶紝JPUSH鏀寔閫氱煡寮�鍚尟鍔ㄥ姛鑳斤紝灏忕背鎺ㄩ�佸繀椤� -->
+    <!-- 鎵╁睍澶囩敤鏉冮檺锛堝彲閫夛級 -->
+    <permission
+        android:name="${applicationId}.permission.JOPERATE_MESSAGE"
+        android:protectionLevel="signature" />
 
-    <!-- 濡傛偍闇�瑕佸搴旇澶囬�氱煡鐩稿叧鐨勮兘鍔涳紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級-->
-    <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE" /><!-- 鍗庝负瑙掓爣 -->
-    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" /><!-- VIVO瑙掓爣鏉冮檺 -->
-    <uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" /><!--honor 瑙掓爣-->
-    <uses-permission android:name="android.permission.VIBRATE" /><!--鎸姩鍣ㄦ潈闄愶紝JPUSH鏀寔閫氱煡寮�鍚尟鍔ㄥ姛鑳斤紝灏忕背鎺ㄩ�佸繀椤�-->
-
-    <!-- 鎵╁睍澶囩敤鏉冮檺锛堝彲閫夛級-->
-    <permission android:name="${applicationId}.permission.JOPERATE_MESSAGE" android:protectionLevel="signature"/>
-    <uses-permission android:name="${applicationId}.permission.JOPERATE_MESSAGE" />
-
-
-    <!-- Required -->
+    <uses-permission android:name="${applicationId}.permission.JOPERATE_MESSAGE" /> <!-- Required -->
     <permission
         android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE"
         android:protectionLevel="signature" />
-    <uses-permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" />
 
-    <!-- 閫傞厤Android13锛屽脊鍑洪�氱煡蹇呴』鏉冮檺-->
+    <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" />
+    </queries>
 
     <application
         android:name=".HDLApp"
         android:allowBackup="true"
-        android:icon="@drawable/version_icon"
+        android:icon="@drawable/desktop_logo"
         android:label="@string/app_name"
+        android:persistent="true"
         android:requestLegacyExternalStorage="true"
-        android:roundIcon="@drawable/version_icon"
         android:supportsRtl="true"
         android:theme="@style/Theme.PhotovoltaicDebug">
         <activity
-            android:name=".ui.message.MessageInfoActivity"
+            android:name=".ui.me.UnregisterActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.message.TestMessageActivity"
+            android:name=".ui.newC.PowerStationsMoveActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.me.QrCodeMainActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.me.BPersonalDataActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.me.ContactUsActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.message.SearchMessageActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.powerstation.DeviceSearchActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.powerstation.HouseSearchActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.newC.MessageCenterList"
+            android:exported="false" />
+        <activity
+            android:name=".ui.newC.PowerStationsListEdit"
+            android:exported="false" />
+        <activity
+            android:name=".ui.CPowerStationActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.message.MessageInfoActivity"
             android:exported="false" />
         <activity
             android:name=".ui.me.BindMailActivity"
@@ -111,14 +124,15 @@
             android:name=".ui.me.AccountAndSecurityActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.me.PersonalDataActivity"
+            android:name=".ui.me.CPersonalDataActivity"
             android:exported="false" />
 
         <service android:name=".widget.apkwgtupload.ApkDownLoadService" />
-
+        <!--largeHeap="true" 涓存椂缂撹В鍐呭瓨涓嶈冻闂 -->
         <activity
             android:name=".ui.me.WebActivity"
-            android:exported="false" />
+            android:exported="false"
+            android:largeHeap="true" />
         <activity
             android:name=".ui.me.AsRegardsActivity"
             android:exported="false" />
@@ -141,26 +155,38 @@
             android:name=".ui.account.RegisterAccountActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.device.FastScanActivity"
+            android:name=".ui.device.ScanActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.MyPowerStationActivity"
+            android:name=".ui.BPowerStationActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.HomeLoginActivity"
+            android:name=".ui.LoginActivity"
             android:exported="false" />
         <activity android:name=".widget.apkwgtupload.AndroidPermissionActivity" />
         <activity
             android:name=".ui.StartActivity"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/AppWelcome">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity> <!-- 娉ㄥ唽鏈嶅姟 -->
-        <service android:name=".internet.HttpServer.MyNanoHttpService" />
-        <!--鍔犲畠uniapp鎵嶈兘鍞よ捣鐩告満-->
+        </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="com.hdl.photovoltaic.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true"
+            tools:replace="android:authorities">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"
+                tools:replace="android:resource" />
+        </provider> <!-- 娉ㄥ唽鏈嶅姟 -->
+        <service android:name=".internet.HttpServer.MyNanoHttpService" /> <!-- 鍔犲畠uniapp鎵嶈兘鍞よ捣鐩告満 -->
         <provider
             android:name="io.dcloud.common.util.DCloud_FileProvider"
             android:authorities="com.hdl.photovoltaic.dc.fileprovider"
@@ -169,10 +195,7 @@
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/dcloud_file_provider" />
-        </provider>
-
-
-        <!-- Since JCore2.0.0 Required SDK鏍稿績鍔熻兘-->
+        </provider> <!-- Since JCore2.0.0 Required SDK鏍稿績鍔熻兘 -->
         <!-- 鍙厤缃產ndroid:process鍙傛暟灏哠ervice鏀惧湪鍏朵粬杩涚▼涓紱android:enabled灞炴�т笉鑳芥槸false -->
         <!-- 杩欎釜鏄嚜瀹氫箟Service锛岃缁ф壙鏋佸厜JCommonService锛屽彲浠ュ湪鏇村鎵嬫満骞冲彴涓婁娇寰楁帹閫侀�氶亾淇濇寔鐨勬洿绋冲畾 -->
         <service
@@ -183,10 +206,7 @@
             <intent-filter>
                 <action android:name="cn.jiguang.user.service.action" />
             </intent-filter>
-        </service>
-
-
-        <!-- Required since 5.2.0 -->
+        </service> <!-- Required since 5.2.0 -->
         <!-- 鏂扮殑 tag/alias 鎺ュ彛缁撴灉杩斿洖闇�瑕佸紑鍙戣�呴厤缃竴涓嚜瀹氫箟鐨凷ervice -->
         <!-- 5.2.0寮�濮嬫墍鏈変簨浠跺皢閫氳繃璇ョ被鍥炶皟 -->
         <!-- 璇ュ箍鎾渶瑕佺户鎵� JPush 鎻愪緵鐨� JPushMessageService 绫�, 骞跺涓嬫柊澧炰竴涓� Intent-Filter -->
@@ -196,10 +216,27 @@
             android:exported="false">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.SERVICE_MESSAGE" />
+
                 <category android:name="com.hdl.photovoltaic" />
             </intent-filter>
+        </service> <!-- uniMqtt蹇呰鐨�,寮�鍚痬qtt1883绔彛涓�涓湇鍔� -->
+        <service
+            android:name="org.eclipse.paho.android.service.MqttService"
+            android:exported="false" />
+        <service
+            android:name=".services.UniappService"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="UniappService.ACTION" />
+            </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