From f91ef956cf482ed4ce0885dc47794b783c20c415 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 30 四月 2025 10:14:43 +0800
Subject: [PATCH] Merge branch '1.2.0' into 1.5.1_google

---
 app/src/main/AndroidManifest.xml |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 60a9274..14012a8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,8 +22,6 @@
     <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_COARSE_LOCATION" />
     <!--    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />&lt;!&ndash;鏉冮檺鍏佽搴旂敤绋嬪簭鍦ㄥ悗鍙拌闂綅缃俊鎭� 璋锋瓕play涓婃灦涓嶄簡 &ndash;&gt;-->
     <uses-permission android:name="android.permission.CAMERA" />
@@ -63,6 +61,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" />
@@ -76,7 +76,8 @@
         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" />
@@ -124,7 +125,8 @@
             android:exported="false" />
         <activity
             android:name=".ui.me.languageSelectionActivity"
-            android:exported="false" />
+            android:exported="false"
+            />
         <activity
             android:name=".ui.me.AccountAndSecurityActivity"
             android:exported="false" />
@@ -234,6 +236,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