From c0c734d7a84cf7105401878ffc4b64cbb67621d1 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 01 十一月 2024 15:02:24 +0800
Subject: [PATCH] 更新极光Sdk531

---
 HDL-ON_Android/Properties/AndroidManifest.xml |   67 ++++++++++-----------------------
 1 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index c655526..872c140 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.2.2" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202407022">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.2.2" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202410141">
 	<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
 	<uses-permission android:name="android.permission.RECEIVE_SMS" />
 	<!--绋嬪簭鍙互璇诲彇璁惧澶栭儴瀛樺偍绌洪棿(鍐呯疆SDcard鍜屽缃甋DCard)鐨勬枃浠讹紝鎴戠殑鏂囦欢绛�-->
@@ -36,9 +36,9 @@
 	<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
 	<!--鏋佸厜鎺ㄩ�� Required  涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�-->
 	<!-- Required  涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�-->
-	<permission android:name="com.hdl.onpro.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
+	<permission android:name="com.santan.smartcontrol.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
 	<!-- Required -->
-	<uses-permission android:name="com.hdl.onpro.permission.JPUSH_MESSAGE" />
+	<uses-permission android:name="com.santan.smartcontrol.permission.JPUSH_MESSAGE" />
 	<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -46,13 +46,11 @@
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 	<uses-permission android:name="android.permission.READ_LOGS" />
-	<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
 	<application android:allowBackup="true" android:debuggable="false" android:icon="@drawable/Icon" android:requestLegacyExternalStorage="true" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="鎯冲ぉ鏅烘帶">
 		<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.santan.smartcontrol.fileProvider" android:grantUriPermissions="true" android:exported="false">
 			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
 		</provider>
 		<!--鏋佸厜鎺ㄩ��-->
-		<provider android:name="Shared.Droid.JPush.HmsContentProvider" android:authorities="${applicationId}.hmspushprovider" android:exported="false"></provider>
 		<!-- Required SDK 鏍稿績鍔熻兘-->
 		<!-- 鍙厤缃� android:process 鍙傛暟灏� PushService 鏀惧湪鍏朵粬杩涚▼涓� -->
 		<service android:name="cn.jpush.android.service.PushService" android:enabled="true" android:exported="false">
@@ -65,36 +63,15 @@
 		</service>
 		<!-- since 3.0.9 Required SDK 鏍稿績鍔熻兘-->
 		<provider android:authorities="com.santan.smartcontrol.DataProvider" android:name="cn.jpush.android.service.DataProvider" android:exported="true" />
-		<!-- since 1.8.0 option 鍙�夐」銆傜敤浜庡悓涓�璁惧涓笉鍚屽簲鐢ㄧ殑 JPush 鏈嶅姟鐩镐簰鎷夎捣鐨勫姛鑳姐�� -->
-		<!-- 鑻ヤ笉鍚敤璇ュ姛鑳藉彲鍒犻櫎璇ョ粍浠讹紝鎴栨妸 enabled 璁剧疆鎴� false 锛汚pp 涓嶄細琚叾浠� App 鎷夎捣锛屼絾浼氭媺璧峰叾浠栫殑 App銆� -->
-		<service android:name="cn.jpush.android.service.DaemonService" android:enabled="false" android:exported="true">
-			<intent-filter>
-				<action android:name="cn.jpush.android.intent.DaemonService" />
-				<category android:name="com.santan.smartcontrol" />
-			</intent-filter>
-		</service>
-		<!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘-->
-		<provider android:authorities="com.santan.smartcontrol.DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" />
 		<!-- Required SDK 鏍稿績鍔熻兘-->
 		<receiver android:name="cn.jpush.android.service.PushReceiver" android:enabled="true">
 			<intent-filter android:priority="1000">
 				<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
 				<category android:name="com.santan.smartcontrol" />
 			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.USER_PRESENT" />
-				<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-			</intent-filter>
-			<!-- Optional -->
-			<intent-filter>
-				<action android:name="android.intent.action.PACKAGE_ADDED" />
-				<action android:name="android.intent.action.PACKAGE_REMOVED" />
-				<data android:scheme="package" />
-			</intent-filter>
 		</receiver>
 		<!-- Required SDK 鏍稿績鍔熻兘-->
-		<!-- 鑻ユ偍鐨勪笟鍔′腑鏈変娇鐢ㄦ瀬鍏夊瘜濯掍綋鍔熻兘锛屾垨鑰呮瀬鍏夋棭涓婂ソ鍔熻兘锛岄渶瑕佹妸姝� Activity 鐨� exported 璁剧疆鎴� true銆� -->
-		<activity android:name="cn.jpush.android.ui.PushActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.NoTitleBar" android:exported="false">
+		<activity android:name="cn.jpush.android.ui.PushActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.NoTitleBar" android:exported="true">
 			<intent-filter>
 				<action android:name="cn.jpush.android.ui.PushActivity" />
 				<category android:name="android.intent.category.DEFAULT" />
@@ -102,39 +79,35 @@
 			</intent-filter>
 		</activity>
 		<!-- SDK 鏍稿績鍔熻兘-->
-		<!-- 鑻ユ偍鐨勪笟鍔′腑鏈変娇鐢ㄦ瀬鍏夊瘜濯掍綋鍔熻兘锛屾垨鑰呮瀬鍏夋棭涓婂ソ鍔熻兘锛岄渶瑕佹妸姝� Activity 鐨� exported 璁剧疆鎴� true銆� -->
-		<activity android:name="cn.jpush.android.ui.PopWinActivity" android:configChanges="orientation|keyboardHidden" android:exported="false" android:theme="@style/MyDialogStyle">
+		<activity android:name="cn.jpush.android.ui.PopWinActivity" android:configChanges="orientation|keyboardHidden" android:exported="true" android:theme="@style/MyDialogStyle">
 			<intent-filter>
 				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="com.santan.smartcontrol" />
-			</intent-filter>
-		</activity>
-		<!-- since 3.6.0 -->
-		<activity android:name="cn.jpush.android.service.DActivity" android:enabled="true" android:exported="true" android:theme="@android:style/Theme.Translucent.NoTitleBar" android:taskAffinity="jpush.custom">
-			<intent-filter>
-				<action android:name="cn.jpush.android.intent.DActivity" />
+				<action android:name="cn.jpush.android.ui.PopWinActivity" />
 				<category android:name="com.santan.smartcontrol" />
 			</intent-filter>
 		</activity>
 		<!-- Required SDK 鏍稿績鍔熻兘-->
 		<receiver android:name="cn.jpush.android.service.AlarmReceiver" />
-		<!-- 3.5.0鏂板锛岀敤浜庡畾鏃跺睍绀哄姛鑳� -->
-		<receiver android:name="cn.jpush.android.service.SchedulerReceiver" android:exported="false" />
-		<!--Required SDK鏍稿績鍔熻兘 since 3.3.0-->
-		<activity android:name="cn.jpush.android.service.JNotifyActivity" android:exported="true" android:taskAffinity="jpush.custom" android:theme="@android:style/Theme.Translucent.NoTitleBar">
+		<!--Required SDK鏍稿績鍔熻兘 since 3.3.0锛屼富瑕佺敤鏉ョ粺涓�鍚勫ぇ鎺ㄩ�佸巶鍟嗚烦杞�昏緫锛岄�忔槑绐椾綋涔熸槸涓轰簡閫氱煡璺宠浆鏃跺�欙紝淇濇寔UI鏁堟灉涓�鑷淬��-->
+		<activity android:name="cn.jpush.android.service.JNotifyActivity" android:exported="true" android:taskAffinity="" android:theme="@style/JPushTheme">
 			<intent-filter>
 				<action android:name="cn.jpush.android.intent.JNotifyActivity" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<!--Required SDK鏍稿績鍔熻兘 since 4.2.2-->
 				<category android:name="com.santan.smartcontrol" />
 			</intent-filter>
 		</activity>
-		<!-- Required. For publish channel feature -->
-		<!-- JPUSH_CHANNEL 鏄负浜嗘柟渚垮紑鍙戣�呯粺璁� APK 鍒嗗彂娓犻亾銆�-->
-		<!-- 渚嬪: -->
-		<!-- 鍙戝埌 Google Play 鐨� APK 鍙互璁剧疆涓� google-play; -->
-		<!-- 鍙戝埌鍏朵粬甯傚満鐨� APK 鍙互璁剧疆涓� xxx-market銆� -->
+		<!-- since 4.6.0 Required SDK鏍稿績鍔熻兘锛屽悇澶ф帹閫佸巶鍟嗚烦杞� 澶囦唤Activity銆傞槻姝NotifyActivity 琚皝鍚庯紝閫氱煡涓嶈兘璺宠浆銆� -->
+		<activity android:name="cn.android.service.JTransitActivity" android:exported="true" android:taskAffinity="" android:theme="@style/JPushTheme">
+			<intent-filter>
+				<action android:name="cn.android.service.JTransitActivity" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="com.santan.smartcontrol" />
+			</intent-filter>
+		</activity>
+		<!-- since 5.0.0 Required SDK鏍稿績鍔熻兘 -->
+		<provider android:exported="false" android:authorities="com.santan.smartcontrol.jiguang.InitProvider" android:name="cn.jpush.android.service.InitProvider" />
 		<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
-		<!-- Required. AppKey copied from Portal -->
 		<meta-data android:name="JPUSH_APPKEY" android:value="de27248c1b364917fc20d82e" />
-		<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
 	</application>
 </manifest>
\ No newline at end of file

--
Gitblit v1.8.0