From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/AndroidManifest.xml | 61 ++++++++++++++----------------
1 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 54f1017..ee6ece8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,32 +6,32 @@
<uses-permission
android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
tools:ignore="ProtectedPermissions" />
-
-
-<!-- <!–Android13 鐓х墖–>-->
-<!-- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
-<!-- <!–Android13 瑙嗛–>-->
-<!-- <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />-->
- <!--Android13 闊抽-->
- <!-- <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />-->
+ <!-- <!–Android13 鐓х墖–> -->
+ <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+ <!-- <!–Android13 瑙嗛–> -->
+ <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" /><!–澶栭儴瀛樺偍鐩綍璁块棶鏉冮檺 璋锋瓕play涓婃灦涓嶄簡–>-->
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /><!–澶栭儴瀛樺偍鐩綍璁块棶鏉冮檺 璋锋瓕play涓婃灦涓嶄簡–> -->
<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" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- android 10.0浣跨敤wifi api鏂版坊鍔犵殑鏉冮檺 -->
<uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <!-- UNI鐩告満鍜屽瓨鍌ㄧ殑鏉冮檺 -->
+ <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.REQUEST_INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.GET_TASKS" />
@@ -40,18 +40,13 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<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.ACCESS_WIFI_STATE" /> <!-- 濡傛偍闇�瑕佹帴鍏ュ湴鐞嗗洿鏍忎笟鍔★紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級 -->
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <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" /> <!– 濡傛偍闇�瑕佸搴旇澶囬�氱煡鐩稿叧鐨勮兘鍔涳紝寤鸿闆嗘垚浠ヤ笅鏉冮檺锛堝彲閫夛級 –> -->
<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鏀寔閫氱煡寮�鍚尟鍔ㄥ姛鑳斤紝灏忕背鎺ㄩ�佸繀椤� -->
+ <uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" /> <!-- 鎸姩鍣ㄦ潈闄愶紝JPUSH鏀寔閫氱煡寮�鍚尟鍔ㄥ姛鑳斤紝灏忕背鎺ㄩ�佸繀椤� -->
<!-- 鎵╁睍澶囩敤鏉冮檺锛堝彲閫夛級 -->
<permission
android:name="${applicationId}.permission.JOPERATE_MESSAGE"
@@ -65,6 +60,10 @@
<uses-permission android:name="com.hdl.photovoltaic.permission.JPUSH_MESSAGE" /> <!-- 閫傞厤Android13锛屽脊鍑洪�氱煡蹇呴』鏉冮檺 -->
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+ <queries>
+ <package android:name="com.hdl.photovoltaic.services" />
+ </queries>
+
<application
android:name=".HDLApp"
android:allowBackup="true"
@@ -74,6 +73,9 @@
android:requestLegacyExternalStorage="true"
android:supportsRtl="true"
android:theme="@style/Theme.PhotovoltaicDebug">
+ <activity
+ android:name=".ui.me.UnregisterActivity"
+ android:exported="false" />
<activity
android:name=".ui.newC.PowerStationsMoveActivity"
android:exported="false" />
@@ -94,9 +96,6 @@
android:exported="false" />
<activity
android:name=".ui.powerstation.HouseSearchActivity"
- android:exported="false" />
- <activity
- android:name=".ui.powerstation.HouseListEditActivity"
android:exported="false" />
<activity
android:name=".ui.newC.MessageCenterList"
@@ -130,10 +129,11 @@
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" />
@@ -186,10 +186,8 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths"
tools:replace="android:resource" />
- </provider>
- <!-- 娉ㄥ唽鏈嶅姟 -->
+ </provider> <!-- 娉ㄥ唽鏈嶅姟 -->
<service android:name=".internet.HttpServer.MyNanoHttpService" /> <!-- 鍔犲畠uniapp鎵嶈兘鍞よ捣鐩告満 -->
-
<provider
android:name="io.dcloud.common.util.DCloud_FileProvider"
android:authorities="com.hdl.photovoltaic.dc.fileprovider"
@@ -226,7 +224,6 @@
<service
android:name="org.eclipse.paho.android.service.MqttService"
android:exported="false" />
-
<service
android:name=".services.UniappService"
android:enabled="true"
@@ -246,7 +243,5 @@
android:name="ScopedStorage"
android:value="true" />
</application>
- <queries>
- <package android:name="com.hdl.photovoltaic.services" />
- </queries>
+
</manifest>
\ No newline at end of file
--
Gitblit v1.8.0