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 |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index cc74f47..d69f35b 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="0122042501" android:installLocation="auto" android:versionName="1.1.0122042501">
+<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" />
@@ -192,11 +192,15 @@
 		<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
 		<!-- Required. AppKey copied from Portal -->
 		<meta-data android:name="JPUSH_APPKEY" android:value="07cfd3177490173e7c072f49" />
-		<meta-data android:name="XIAOMI_APPKEY" android:value="MI-5261873610008" />
+		<!--灏忕背-->
 		<meta-data android:name="XIAOMI_APPID" android:value="MI-2882303761518736008" />
-		<!--<meta-data android:name="OPPO_APPKEY" android:value="OP-e942dafe77cf4b9f868d5421d701655a" />
-		<meta-data android:name="OPPO_APPID" android:value="OP-30619979" />
-		<meta-data android:name="OPPO_APPSECRET" android:value="OP-11d511c42f654cafac99588322681003" />-->
+		<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" />
 		<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
 	</application>
 </manifest>
\ No newline at end of file

--
Gitblit v1.8.0