From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 11 八月 2020 13:21:10 +0800 Subject: [PATCH] 合并了新代码 --- ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 38 ++++++++++++-------------------------- 1 files changed, 12 insertions(+), 26 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml old mode 100755 new mode 100644 index b6f581a..33aa2f0 --- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml +++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml @@ -1,7 +1,7 @@ 锘�<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="0120080401" android:installLocation="auto" android:versionName="1.1.0120080401"> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120080601" android:installLocation="auto" android:versionName="1.1.0120080601"> <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" /> - <permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" /> + <permission android:name="com.evoyo.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> <!--8.0鏉冮檺--> <uses-permission android:name="android.permission.GET_TASKS" /> @@ -72,7 +72,7 @@ <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <!--鏋佸厜鎺ㄩ�� Required 涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�--> <!-- Required 涓�浜涚郴缁熻姹傜殑鏉冮檺锛屽璁块棶缃戠粶绛�--> - <uses-permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" /> + <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" /> @@ -92,10 +92,11 @@ <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <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="Evoyo Home" android:icon="@drawable/Icon"> <!-- 鑷姩鏇存柊 --> - <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.home.fileProvider" android:grantUriPermissions="true" android:exported="false"> + <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" /> </provider> <!--鑷姩鏇存柊缁撴潫--> @@ -105,7 +106,7 @@ <intent-filter> <action android:name="cn.jpush.android.ui.PushActivity" /> <category android:name="android.intent.category.DEFAULT" /> - <category android:name="com.hdl.home" /> + <category android:name="com.evoyo.home" /> </intent-filter> </activity> <service android:name="cn.jpush.android.service.PushService" android:process=":mult"> @@ -117,19 +118,19 @@ </intent-filter> </service> <!-- since 3.0.9 Required SDK 鏍稿績鍔熻兘--> - <provider android:authorities="com.hdl.home.DataProvider" android:name="cn.jpush.android.service.DataProvider" android:process=":pushcore" android:exported="false" /> + <provider android:authorities="com.evoyo.home.DataProvider" android:name="cn.jpush.android.service.DataProvider" android:process=":pushcore" android:exported="false" /> <service android:name="cn.jpush.android.service.DaemonService" android:enabled="true" android:exported="true"> <intent-filter> <action android:name="cn.jpush.android.intent.DaemonService" /> - <category android:name="com.hdl.home" /> + <category android:name="com.evoyo.home" /> </intent-filter> </service> <!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘--> - <provider android:authorities="com.hdl.home.DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" /> + <provider android:authorities="com.evoyo.home.DownloadProvider" android:name="cn.jpush.android.service.DownloadProvider" android:exported="true" /> <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.home" /> + <category android:name="com.evoyo.home" /> </intent-filter> <intent-filter> <action android:name="android.intent.action.USER_PRESENT" /> @@ -144,27 +145,12 @@ </receiver> <receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false" /> <!-- User defined. For test only 鐢ㄦ埛鑷畾涔夌殑骞挎挱鎺ユ敹鍣�--> - <receiver android:name="com.hdl.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.hdl.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 --> - <meta-data android:name="com.amap.api.v2.apikey" android:value="1f753413955012c9594c5df69eaa0aff" /> + <meta-data android:name="com.amap.api.v2.apikey" android:value="f78f951092602db3962811e736758559" /> </application> </manifest> \ No newline at end of file -- Gitblit v1.8.0