From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 9a4cac8..6212c3d 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.hdl.home" android:versionCode="2019060501" android:installLocation="auto" android:versionName="1.0.19060501">
- <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
+<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">
+ <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" />
<!--8.0鏉冮檺-->
@@ -11,6 +11,7 @@
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
<!--android.permission-group.CAMERA鍒嗙粍
-->
+ <uses-permission android:name="android.permission.CAMERA" />
<!--android.permission-group.CONTACTS鍒嗙粍
-->
<uses-permission android:name="android.permission.READ_CONTACTS" />
@@ -92,7 +93,7 @@
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.GET_TASKS" />
<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
- <application android:allowBackup="true" android:persistent="true" android:label="HDL Home" android:icon="@drawable/Icon">
+ <application android:allowBackup="true" android:largeHeap="true" android:persistent="true" android:label="HDL Home" android:icon="@drawable/Icon">
<!-- 鑷姩鏇存柊 -->
<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.home.fileProvider" android:grantUriPermissions="true" android:exported="false">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
@@ -164,4 +165,4 @@
<!-- </>鍊兼潵鑷紑鍙戣�呭钩鍙板彇寰楃殑AppKey-->
<!-- 鏋佸厜鎺ㄩ�佺粨鏉� -->
</application>
-</manifest>
\ No newline at end of file
+</manifest>
--
Gitblit v1.8.0