From dc8ae12444d1d887394eb525e2b80dd120dc4c87 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 20 二月 2024 13:43:56 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-hxb
---
app/src/main/AndroidManifest.xml | 111 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 82 insertions(+), 29 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d91f4a2..802d952 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,12 +7,9 @@
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.WRITE_EXTERNAL_STORAGE" /> -->
<!-- <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.ACCESS_WIFI_STATE" /> -->
<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" /> -->
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" /> <!-- wifi鐘舵�佹潈闄� -->
@@ -23,43 +20,64 @@
<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.ACCESS_NETWORK_STATE" /> -->
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- bugly鎵�闇�鏉冮檺 start -->
<uses-permission android:name="android.permission.CAMERA" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
- <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<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_NETWORK_STATE" /> -->
- <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" /> -->
- <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- bugly鎵�闇�鏉冮檺 end -->
- <!-- UNI SDK 鍩哄骇鍒犻櫎鐨勯儴鍒嗘潈闄� start -->
- <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
- <!-- <uses-feature android:name="android.hardware.camera.autofocus" /> -->
- <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
+ <!-- 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.ACCESS_WIFI_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.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="com.hdl.debugtreasure.permission.JPUSH_MESSAGE" />
+
<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.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="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 -->
+ <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="android.permission.POST_NOTIFICATIONS" />
<application
android:name=".HDLApp"
@@ -70,6 +88,9 @@
android:roundIcon="@drawable/version_icon"
android:supportsRtl="true"
android:theme="@style/Theme.PhotovoltaicDebug">
+ <activity
+ android:name=".ui.message.MessageInfoActivity"
+ android:exported="false" />
<activity
android:name=".ui.message.TestMessageActivity"
android:exported="false" />
@@ -138,19 +159,51 @@
</intent-filter>
</activity> <!-- 娉ㄥ唽鏈嶅姟 -->
<service android:name=".internet.HttpServer.MyNanoHttpService" />
-
+ <!--鍔犲畠uniapp鎵嶈兘鍞よ捣鐩告満-->
<provider
- android:name="androidx.core.content.FileProvider"
- android:authorities="com.hdl.photovoltaic.fileProvider"
+ android:name="io.dcloud.common.util.DCloud_FileProvider"
+ android:authorities="com.hdl.photovoltaic.dc.fileprovider"
android:exported="false"
- android:grantUriPermissions="true"
- tools:replace="android:authorities">
+ android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/provider_paths"
- tools:replace="android:resource" />
+ android:resource="@xml/dcloud_file_provider" />
</provider>
+
+ <!-- Since JCore2.0.0 Required SDK鏍稿績鍔熻兘-->
+ <!-- 鍙厤缃產ndroid:process鍙傛暟灏哠ervice鏀惧湪鍏朵粬杩涚▼涓紱android:enabled灞炴�т笉鑳芥槸false -->
+ <!-- 杩欎釜鏄嚜瀹氫箟Service锛岃缁ф壙鏋佸厜JCommonService锛屽彲浠ュ湪鏇村鎵嬫満骞冲彴涓婁娇寰楁帹閫侀�氶亾淇濇寔鐨勬洿绋冲畾 -->
+ <service
+ android:name=".jpush.JpushService"
+ android:enabled="true"
+ android:exported="false"
+ android:process=":pushcore">
+ <intent-filter>
+ <action android:name="cn.jiguang.user.service.action" />
+ </intent-filter>
+ </service>
+
+
+ <!-- Required since 5.2.0 -->
+ <!-- 鏂扮殑 tag/alias 鎺ュ彛缁撴灉杩斿洖闇�瑕佸紑鍙戣�呴厤缃竴涓嚜瀹氫箟鐨凷ervice -->
+ <!-- 5.2.0寮�濮嬫墍鏈変簨浠跺皢閫氳繃璇ョ被鍥炶皟 -->
+ <!-- 璇ュ箍鎾渶瑕佺户鎵� JPush 鎻愪緵鐨� JPushMessageService 绫�, 骞跺涓嬫柊澧炰竴涓� Intent-Filter -->
+ <service
+ android:name=".jpush.JPushReceiverService"
+ android:enabled="true"
+ 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" />
+
<meta-data
android:name="design_height_in_dp"
android:value="812" />
--
Gitblit v1.8.0