From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 91 +++++++++++++++++++++++++++++++++++----------
1 files changed, 70 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index b7bdfe8..d69f35b 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120123101" android:installLocation="auto" android:versionName="1.1.0120123101">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0122082601" android:installLocation="auto" android:versionName="1.1.0122082601">
+ <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26" />
<permission android:name="com.evoyo.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<!--8.0鏉冮檺-->
@@ -64,6 +64,9 @@
<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" />
+ <!-- 钃濈墮鏉冮檺 -->
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<!-- elian -->
<uses-permission android:name="android.permission.NET_ADMIN" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@@ -94,22 +97,22 @@
<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">
+ <application android:allowBackup="true" android:largeHeap="true" android:persistent="true" android:label="Evoyo Home" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config">
<!-- 鑷姩鏇存柊 -->
<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>
<!--鑷姩鏇存柊缁撴潫-->
+ <!-- 璁剧疆楂樺痉鍦板浘key -->
+ <meta-data android:name="com.amap.api.v2.apikey" android:value="9901dd06e30b229efdd4c5bf5e076224" />
+ <!-- </>鍊兼潵鑷紑鍙戣�呭钩鍙板彇寰楃殑AppKey-->
+ <!-- 璁剧疆楂樺痉鍦板浘key -->
+ <meta-data android:name="com.amap.api.v2.apikey" android:value="f78f951092602db3962811e736758559" />
<!--鏋佸厜鎺ㄩ��-->
- <activity android:name="cn.jpush.android.ui.PopWinActivity" android:exported="false" />
- <activity android:name="cn.jpush.android.ui.PushActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.NoTitleBar" android:exported="false">
- <intent-filter>
- <action android:name="cn.jpush.android.ui.PushActivity" />
- <category android:name="android.intent.category.DEFAULT" />
- <category android:name="com.evoyo.home" />
- </intent-filter>
- </activity>
- <service android:name="cn.jpush.android.service.PushService" android:process=":mult">
+ <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">
<intent-filter>
<action android:name="cn.jpush.android.intent.REGISTER" />
<action android:name="cn.jpush.android.intent.REPORT" />
@@ -118,8 +121,10 @@
</intent-filter>
</service>
<!-- since 3.0.9 Required SDK 鏍稿績鍔熻兘-->
- <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">
+ <provider android:authorities="com.evoyo.home.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.evoyo.home" />
@@ -127,6 +132,7 @@
</service>
<!-- since 3.1.0 Required SDK 鏍稿績鍔熻兘-->
<provider android:authorities="com.evoyo.home.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" />
@@ -143,15 +149,58 @@
<data android:scheme="package" />
</intent-filter>
</receiver>
- <receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false" />
- <!-- User defined. For test only 鐢ㄦ埛鑷畾涔夌殑骞挎挱鎺ユ敹鍣�-->
-
- <!-- Required . Enable it you can get statistics data with channel -->
+ <!-- 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">
+ <intent-filter>
+ <action android:name="cn.jpush.android.ui.PushActivity" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.evoyo.home" />
+ </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/DialogTheme">
+ <intent-filter>
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="com.evoyo.home" />
+ </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.evoyo.home" />
+ </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">
+ <intent-filter>
+ <action android:name="cn.jpush.android.intent.JNotifyActivity" />
+ <category android:name="com.evoyo.home" />
+ </intent-filter>
+ </activity>
+ <!-- Required. For publish channel feature -->
+ <!-- JPUSH_CHANNEL 鏄负浜嗘柟渚垮紑鍙戣�呯粺璁� APK 鍒嗗彂娓犻亾銆�-->
+ <!-- 渚嬪: -->
+ <!-- 鍙戝埌 Google Play 鐨� APK 鍙互璁剧疆涓� google-play; -->
+ <!-- 鍙戝埌鍏朵粬甯傚満鐨� APK 鍙互璁剧疆涓� xxx-market銆� -->
<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
+ <!-- Required. AppKey copied from Portal -->
<meta-data android:name="JPUSH_APPKEY" android:value="07cfd3177490173e7c072f49" />
- <!-- </>鍊兼潵鑷紑鍙戣�呭钩鍙板彇寰楃殑AppKey-->
+ <!--灏忕背-->
+ <meta-data android:name="XIAOMI_APPID" android:value="MI-2882303761518736008" />
+ <meta-data android:name="XIAOMI_APPKEY" android:value="MI-5261873610008" />
+ <meta-data android:name="XIAOMI_AppSecret" android:value="MI-mlKUjKABHKs0P7SZsRggiQ==" />
+ <!--OPPO-->
+ <meta-data android:name="OPPO_APPID" android:value="OP-30396771" />
+ <meta-data android:name="OPPO_APPSECRET" android:value="OP-b7d4d96584164fda88dc53c5aaa58132" />
+ <meta-data android:name="OPPO_APPKEY" android:value="OP-c75e887071964eb3967fc9b3a0e4fab9" />
+ <meta-data android:name="OPPO_MasterSecret" android:value="ffde26276e604358a5c605d2d06b7ce3" />
<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
- <!-- 璁剧疆楂樺痉鍦板浘key -->
- <meta-data android:name="com.amap.api.v2.apikey" android:value="f78f951092602db3962811e736758559" />
</application>
</manifest>
\ No newline at end of file
--
Gitblit v1.8.0