From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
index 725d5fa..4f509d2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
@@ -99,15 +99,29 @@
listView.Height = bodyFrameLayout.Height;
bodyFrameLayout.AddChidren(listView);
- //娣诲姞鏂瑰悜琛�
- this.AddDirectionRow();
- //娣诲姞闄愪綅琛�
- this.AddLimitRow();
- //娣诲姞閲嶇疆鐢垫満琛�
- this.AddElectricalMachineryRow();
+ try
+ {
+ //娣诲姞鏂瑰悜琛�
+ this.AddDirectionRow();
+ //娣诲姞闄愪綅琛�
+ this.AddLimitRow();
+ //娣诲姞閲嶇疆鐢垫満琛�
+ this.AddElectricalMachineryRow();
- //闄愪綅鏁版嵁鎺ユ敹
- this.ReceiveLimitData();
+ //闄愪綅鏁版嵁鎺ユ敹
+ this.ReceiveLimitData();
+ }
+ catch (Exception ex)
+ {
+ //Log鍑哄姏
+ string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + UserCenterResourse.NowActionFormID + "]";
+ HdlLogLogic.Current.WriteLog(ex, msg);
+ //鍑虹幇鏈煡閿欒
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+ this.listView.RemoveAll();
+ //璁惧寮傚父琛ユ晳 -> 娣诲姞閲嶇疆鐢垫満琛�
+ this.AddElectricalMachineryRow();
+ }
});
}
@@ -588,6 +602,10 @@
//姣�10鐨勯暱搴﹀ぇ姒傛槸2绉�,澶氶鐣�1娆″嚭鏉�
int waitCount = ((curtainData.CurtainLength / 10) + 1) * 3;
+ if (waitCount < 12)
+ {
+ waitCount = 12;
+ }
int timeCount = 0;
while (timeCount <= waitCount)
--
Gitblit v1.8.0