From 06978e3b15b8536e2d4511ae4612fec1d556e145 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:19:56 +0800
Subject: [PATCH] 合并了全部的代码,IOS 图片需要从新引入工程

---
 ZigbeeApp/Shared/Common/CommonPage.cs |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 0179b96..3151e47 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -57,7 +57,7 @@
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
-        public static string CodeIDString = "1.0.19080501";
+        public static string CodeIDString = "1.0.19110701";
         /// <summary>
         /// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
         /// </summary>
@@ -74,7 +74,7 @@
         /// <summary>
         /// 璇锋眰鐗堟湰鍙�
         /// </summary>
-        public static string RequestVersion = "1.0";
+        public static string RequestVersion = "2.0";
         /// <summary>
         /// 宸﹁竟璺濈灞忓箷鐨勫搴�--58
         /// </summary>
@@ -182,7 +182,10 @@
         /// 11
         /// </summary>
         public static int PlaceHolderTextSize = 11;
-
+        /// <summary>
+        /// 瀹夊崜鐨勭郴缁熻繑鍥炴寜閿兘鍚︽寜涓�(姣斿鍦ㄥ浠借繕鍘熸椂,涓嶈兘鎸変笅杩斿洖閿�)
+        /// </summary>
+        public static bool BackKeyCanClick = true;
 
         /// <summary>
         /// 璇锋眰鏈嶅姟鍣ㄦ柟娉�

--
Gitblit v1.8.0