Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 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="2019110501" android:installLocation="auto" android:versionName="1.0.19101801">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019111201" android:installLocation="auto" android:versionName="1.0.19111201">
   <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
   <permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -165,4 +165,4 @@
      <!--  </>值来自开发者平台取得的AppKey-->
      <!-- 极光推送结束 -->
   </application>
</manifest>
</manifest>