From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 09 一月 2020 14:11:07 +0800 Subject: [PATCH] 合并代码 --- ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml old mode 100644 new mode 100755 index 13184a1..08a9d21 --- 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="2020010601" android:installLocation="auto" android:versionName="1.0.20010601"> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020010701" android:installLocation="auto" android:versionName="1.0.20010701"> <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,7 +164,7 @@ <meta-data android:name="JPUSH_APPKEY" android:value="f4a3322fbc45e58d04c85191" /> <!-- </>鍊兼潵鑷紑鍙戣�呭钩鍙板彇寰楃殑AppKey--> <!-- 鏋佸厜鎺ㄩ�佺粨鏉� --> - <!-- 璁剧疆楂樺痉鍦板浘key --> - <meta-data android:name="com.amap.api.v2.apikey" android:value="1f753413955012c9594c5df69eaa0aff" /> + <!-- 璁剧疆楂樺痉鍦板浘key --> + <meta-data android:name="com.amap.api.v2.apikey" android:value="1f753413955012c9594c5df69eaa0aff" /> </application> </manifest> \ No newline at end of file -- Gitblit v1.8.0