From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 14:30:13 +0800
Subject: [PATCH] 原来的 IOS 工程舍弃(注:没有合并其他组员的代码)

---
 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
old mode 100755
new mode 100644
index 04898b2..3fc0938
--- 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.hdl.home" android:versionCode="2019111801" android:installLocation="auto" android:versionName="1.0.19111801">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019112201" android:installLocation="auto" android:versionName="1.0.19112201">
 	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
 	<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -164,5 +164,7 @@
 		<meta-data android:name="JPUSH_APPKEY" android:value="f4a3322fbc45e58d04c85191" />
 		<!--  </>鍊兼潵鑷紑鍙戣�呭钩鍙板彇寰楃殑AppKey-->
 		<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
+		<!-- 璁剧疆楂樺痉鍦板浘key -->
+		<meta-data android:name="com.amap.api.v2.apikey" android:value="8be10ffb3e302c9a42dfa58110c5c6fb" />
 	</application>
 </manifest>
\ No newline at end of file

--
Gitblit v1.8.0