From ec35d79add60d1438dff5291389f7e69c579d9f9 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 21 十一月 2019 18:18:25 +0800
Subject: [PATCH] 完成面板楼层显示处理和下拉刷新处理,请合并最新代码

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

diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 9a4cac8..58ce255 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.hdl.home" android:versionCode="2019060501" android:installLocation="auto" android:versionName="1.0.19060501">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2019111401" android:installLocation="auto" android:versionName="1.0.19111401">
 	<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" />
@@ -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" />

--
Gitblit v1.8.0