From 07c647861d549a4c61f615dba9c008c29ad57f43 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 15:57:58 +0800
Subject: [PATCH] 2020-09-02-1

---
 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 66af92a..ab6d27e 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120061702" android:installLocation="auto" android:versionName="1.1.0120061702">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120082701" android:installLocation="auto" android:versionName="1.1.0120082701">
 	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
 	<permission android:name="com.evoyo.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -35,6 +35,7 @@
 	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
 	<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+	<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_SETTINGS" />
 	<uses-permission android:name="android.permission.VIBRATE" />
@@ -61,14 +62,18 @@
 	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 	<uses-permission android:name="android.permission.FLASHLIGHT" />
 	<uses-permission android:name="android.permission.READ_LOGS" />
+	<uses-permission android:name="android.permission.WRITE_OWNER_DATA" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
 	<!-- elian -->
+	<uses-permission android:name="android.permission.NET_ADMIN" />
 	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
 	<!-- elian缁撴潫 -->
 	<!-- 瀹夎apk-->
 	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 	<!--鏋佸厜鎺ㄩ�� Required  涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�-->
 	<!-- Required  涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�-->
+	<uses-permission android:name="com.evoyo.home.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" />
@@ -89,7 +94,7 @@
 	<uses-permission android:name="android.permission.GET_TASKS" />
 	<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
 	<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
-	<application android:allowBackup="true" android:largeHeap="true" android:persistent="true" android:label="HDL Home" android:icon="@drawable/Icon">
+	<application android:allowBackup="true" android:largeHeap="true" android:persistent="true" android:label="Evoyo Home" android:icon="@drawable/Icon">
 		<!-- 鑷姩鏇存柊 -->
 		<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.evoyo.home.fileProvider" android:grantUriPermissions="true" android:exported="false">
 			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
@@ -140,24 +145,9 @@
 		</receiver>
 		<receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false" />
 		<!-- User defined.  For test only  鐢ㄦ埛鑷畾涔夌殑骞挎挱鎺ユ敹鍣�-->
-		<receiver android:name="com.evoyo.home.JpushNotificationReceiver" android:exported="false" android:enabled="true">
-			<intent-filter>
-				<action android:name="cn.jpush.android.intent.REGISTRATION" />
-				<!--Required  鐢ㄦ埛娉ㄥ唽SDK鐨刬ntent-->
-				<action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" />
-				<!--Required  鐢ㄦ埛鎺ユ敹SDK娑堟伅鐨刬ntent-->
-				<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" />
-				<!--Required  鐢ㄦ埛鎺ユ敹SDK閫氱煡鏍忎俊鎭殑intent-->
-				<action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" />
-				<!--Required  鐢ㄦ埛鎵撳紑鑷畾涔夐�氱煡鏍忕殑intent-->
-				<action android:name="cn.jpush.android.intent.CONNECTION" />
-				<!-- 鎺ユ敹缃戠粶鍙樺寲 杩炴帴/鏂紑 since 1.6.3 -->
-				<category android:name="com.evoyo.home" />
-			</intent-filter>
-		</receiver>
 		<!-- Required  . Enable it you can get statistics data with channel -->
 		<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
-		<meta-data android:name="JPUSH_APPKEY" android:value="f4a3322fbc45e58d04c85191" />
+		<meta-data android:name="JPUSH_APPKEY" android:value="07cfd3177490173e7c072f49" />
 		<!--  </>鍊兼潵鑷紑鍙戣�呭钩鍙板彇寰楃殑AppKey-->
 		<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
 		<!-- 璁剧疆楂樺痉鍦板浘key -->

--
Gitblit v1.8.0