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 | 119 ++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 72 insertions(+), 47 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e0c48cf..ee6ece8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,55 +5,48 @@ <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.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" /> + <!-- <!–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.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.ACCESS_COARSE_LOCATION" /> - <uses-permission android:name="android.permission.ACCESS_BACKGROUND_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.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> --> - <!-- UNI鐩告満鍜屽瓨鍌ㄧ殑鏉冮檺 --> + <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.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.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" @@ -67,15 +60,34 @@ <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" - android:icon="@drawable/logo" + android:icon="@drawable/desktop_logo" android:label="@string/app_name" + android:persistent="true" android:requestLegacyExternalStorage="true" - android:roundIcon="@drawable/logo" 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" /> + <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" /> @@ -84,12 +96,6 @@ android:exported="false" /> <activity android:name=".ui.powerstation.HouseSearchActivity" - android:exported="false" /> - <activity - android:name=".ui.home.HomePageFragment" - android:exported="false" /> - <activity - android:name=".ui.powerstation.HouseListEditActivity" android:exported="false" /> <activity android:name=".ui.newC.MessageCenterList" @@ -102,9 +108,6 @@ android:exported="false" /> <activity android:name=".ui.message.MessageInfoActivity" - android:exported="false" /> - <activity - android:name=".ui.message.TestMessageActivity" android:exported="false" /> <activity android:name=".ui.me.BindMailActivity" @@ -122,14 +125,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" /> @@ -152,24 +156,37 @@ 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> <!-- 娉ㄥ唽鏈嶅姟 --> + </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" @@ -207,6 +224,14 @@ <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> <meta-data android:name="design_height_in_dp" -- Gitblit v1.8.0