From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
index 05038ca..2f7a1b2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
@@ -136,25 +136,22 @@
         /// </summary>
         /// <param name="rollershade">绐楀笜瀵硅薄</param>
         /// <param name="limiType">纭鍙婅鐩栦笂闄愪綅杩樻槸涓嬮檺浣�</param>
-        /// <param name="upLimit">涓婇檺浣嶇殑鍊�,鐧惧垎姣�(澶囦唤鐢�)</param>
-        /// <param name="downLimit">涓嬮檺浣嶇殑鍊�,鐧惧垎姣�(澶囦唤鐢�)</param>
+        /// <param name="upLimit">涓婇檺浣嶇殑鍊�(闀垮害鍊�,涓嶆槸鐧惧垎姣�)</param>
+        /// <param name="downLimit">涓嬮檺浣嶇殑鍊�(闀垮害鍊�,涓嶆槸鐧惧垎姣�)</param>
         /// <returns></returns>
         public async Task<bool> CommitCurtainLimitPoint(Rollershade rollershade, Rollershade.CurtainPrivateInstalledLimi limiType, int upLimit, int downLimit)
         {
             CommonDevice.SetWritableValueResponAllData result = null;
-            if (upLimit == -1 && upLimit == -1)
+            if (upLimit == -1 && downLimit == -1)
             {
                 //杩欎釜鏄嵎甯�
                 result = await rollershade.SetCurtainInstalledLimitAsync(limiType);
             }
             else
             {
-                if (upLimit < 0) { upLimit = 0; }
-                if (downLimit < 0) { downLimit = 100; }
-
-                //杩欎釜鏄紑鍚堝笜 "2,0x00ff,0x00ff"鏍煎紡
-                string convertData = "\"2,0x" + Convert.ToString(upLimit, 16).PadLeft(4, '0');
-                convertData += ",0x" + Convert.ToString(downLimit, 16).PadLeft(4, '0') + "\"";
+                //杩欎釜鏄紑鍚堝笜 "2,0x00ff,0x00ff"鏍煎紡 鍚堥檺浣嶅湪鍓嶏紝寮�闄愪綅鍦ㄥ悗
+                string convertData = "\"2,0x" + Convert.ToString(downLimit, 16).PadLeft(4, '0');
+                convertData += ",0x" + Convert.ToString(upLimit, 16).PadLeft(4, '0') + "\"";
                 //鐒跺悗灏嗗畠浠浆涓篈SK鐮佹暟鍊�,鐒跺悗鍐嶈浆涓�16杩涘埗
                 //鎬昏闀垮害涓�17(杩欓噷鏄�16杩涘埗)
                 string sendData = "11";

--
Gitblit v1.8.0