From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28

---
 ZigbeeApp/Shared/R.cs |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
old mode 100755
new mode 100644
index 732e838..1d3c336
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -764,7 +764,7 @@
         /// <summary>
         /// 鎵嬫満鍙烽敊璇紝璇烽噸鏂拌緭鍏�
         /// </summary>
-        public const int ThePhoneError = 10139;
+        public const int ThePhoneError = 10139;
         /// <summary>
         /// 璇疯緭鍏ラ暱搴︿负6-13涓瓧绗︾殑瀵嗙爜
         /// </summary>
@@ -901,10 +901,10 @@
 		/// 缂栬緫
 		/// </summary>
 		public const int Edit = 11011;
-		/// <summary>
-		/// 璁剧疆鍔熻兘
-		/// </summary>
-		public const int FunctionSetting = 11012;
+        /// <summary>
+        /// 鍔熻兘璁剧疆
+        /// </summary>
+        public const int FunctionSetting = 11012;
 		/// <summary>
 		/// 淇℃伅缂栬緫
 		/// </summary>
@@ -1001,6 +1001,11 @@
         /// 娣诲姞寤舵椂
         /// </summary>
         public const int AddDelayTime = 11036;
+        /// <summary>
+        /// 绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
+        /// </summary>
+        public const int AC_Model_None = 11037;
+
 
         #region  璁惧绫诲瀷
         /// <summary>
@@ -1357,15 +1362,15 @@
         #endregion
 
 
-        
 
 
 
 
-		/// <summary>
-		/// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
-		/// </summary>
-		public const int PswLengthMsg = 15000;
+
+        /// <summary>
+        /// 瀵嗙爜闀垮害涓簕0}涓瓧绗�
+        /// </summary>
+        public const int PswLengthMsg = 15000;
         /// <summary>
         /// 1涓皬鍐欏瓧姣�
         /// </summary>
@@ -5274,6 +5279,18 @@
         /// 鍔炲叕瀹�
         /// </summary>
         public const int uWorkRoom = 16060;
+        /// <summary>
+        /// 鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+        /// </summary>
+        public const int uCurtainDataIsErrorPleaseResetCurtain = 16061;
+        /// <summary>
+        /// 鑾峰彇绌鸿皟鎽嗛鐘舵�佸け璐�
+        /// </summary>
+        public const int uGetAirConditionerSwingFunctionFail = 16062;
+        /// <summary>
+        /// 璁剧疆绌鸿皟鎽嗛澶辫触
+        /// </summary>
+        public const int uSetAirConditionerSwingFunctionFail = 16063;
 
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�

--
Gitblit v1.8.0