From ea0b1e8e5f43c5fd0a7d479e25ede3b8cbea464a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 02 十二月 2024 17:17:19 +0800
Subject: [PATCH] tcp;可视对讲;

---
 HDL-ON_Android/Properties/AndroidManifest.xml |   93 ++++++++++++++--------------------------------
 1 files changed, 28 insertions(+), 65 deletions(-)

diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 83b53ef..a62c32b 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.1" package="com.santan.smartcontrol" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202401311">
-	<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
+<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="30" />
 	<uses-permission android:name="android.permission.RECEIVE_SMS" />
 	<!--绋嬪簭鍙互璇诲彇璁惧澶栭儴瀛樺偍绌洪棿(鍐呯疆SDcard鍜屽缃甋DCard)鐨勬枃浠讹紝鎴戠殑鏂囦欢绛�-->
 	<uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@ -15,17 +15,12 @@
 	<!--鍏佽涓�涓▼搴忚闂瓹ellID鎴� WiFi鐑偣鏉ヨ幏鍙栫簿纭殑浣嶇疆锛岀櫥闄嗐�佽澶囨坊鍔犵瓑锛燂紵锛�-->
 	<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
 	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-	<!--鍏佽搴旂敤绋嬪簭璇锋眰瀹夎鍖呫�傞拡瀵笰PI澶т簬22蹇呴』鎸佹湁璇ヨ鍙娇鐢ˋCTION_INSTALL_PACKAGE搴旂敤銆傚簲璇ユ病鍦ㄧ敤锛燂紵锛�-->
-	<uses-permission android:name="android.permission.VIBRATE" />
 	<!--  鍙瀵硅鏉冮檺-->
-	<uses-permission android:name="android.permission.CAMERA" />
 	<uses-feature android:name="android.hardware.camera" />
 	<uses-feature android:name="android.hardware.camera.autofocus" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.VIBRATE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
 	<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 	<!--  瀹氫綅鏉冮檺 -->
@@ -39,28 +34,23 @@
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<!--  鎾斁鏈湴闊充箰鏉冮檺-->
 	<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_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" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 	<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.hdl.onpro.fileProvider" android:grantUriPermissions="true" android:exported="false">
+		<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">
@@ -72,79 +62,52 @@
 			</intent-filter>
 		</service>
 		<!-- since 3.0.9 Required SDK 鏍稿績鍔熻兘-->
-		<provider android:authorities="com.hdl.onpro.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.hdl.onpro" />
-			</intent-filter>
-		</service>
-		<!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘-->
-		<provider android:authorities="com.hdl.onpro.DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" />
+		<provider android:authorities="com.santan.smartcontrol.DataProvider" android:name="cn.jpush.android.service.DataProvider" 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.hdl.onpro" />
-			</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" />
+				<category android:name="com.santan.smartcontrol" />
 			</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" />
-				<category android:name="com.hdl.onpro" />
+				<category android:name="com.santan.smartcontrol" />
 			</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.hdl.onpro" />
-			</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" />
-				<category android:name="com.hdl.onpro" />
+				<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="com.hdl.onpro" />
+				<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="cbd90743ac45cbca06c8118b" />
-		<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
-		<!-- 璁剧疆楂樺痉鍦板浘key -->
-		<meta-data android:name="com.amap.api.v2.apikey" android:value="9901dd06e30b229efdd4c5bf5e076224" />
+		<meta-data android:name="JPUSH_APPKEY" android:value="de27248c1b364917fc20d82e" />
 	</application>
 </manifest>
\ No newline at end of file

--
Gitblit v1.8.0