From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
index 05038ca..c7b8dc2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
@@ -136,8 +136,8 @@
/// </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)
{
@@ -149,12 +149,9 @@
}
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