From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
index 9784397..cd6cbe0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
@@ -99,6 +99,24 @@
listView.Height = bodyFrameLayout.Height;
bodyFrameLayout.AddChidren(listView);
+ //瀵艰建闀垮害涓�0鏃�
+ if (curtainData.CurtainLength <= 0)
+ {
+ //鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uCurtainDataIsErrorPleaseResetCurtain));
+ try
+ {
+ //璁惧寮傚父琛ユ晳 -> 娣诲姞閲嶇疆鐢垫満琛�
+ this.AddElectricalMachineryRow();
+ return;
+ }
+ catch (Exception ex2)
+ {
+ HdlLogLogic.Current.WriteLog(ex2, "寮�鍚堝笜琛ユ晳寮傚父1");
+ return;
+ }
+ }
+
try
{
//娣诲姞鏂瑰悜琛�
@@ -124,7 +142,7 @@
//璁惧寮傚父琛ユ晳 -> 娣诲姞閲嶇疆鐢垫満琛�
this.AddElectricalMachineryRow();
}
- catch (Exception ex2) { HdlLogLogic.Current.WriteLog(ex2, "寮�鍚堝笜琛ユ晳寮傚父"); }
+ catch (Exception ex2) { HdlLogLogic.Current.WriteLog(ex2, "寮�鍚堝笜琛ユ晳寮傚父2"); }
}
});
}
@@ -706,7 +724,7 @@
HdlGatewayReceiveLogic.Current.RemoveEvent("CurtainDeviceAttribute");
//澶囦唤绐楀笜鏁版嵁
- if (this.backupCurtainData == true)
+ if (this.backupCurtainData == true && curtainData.CurtainLength > 0)
{
this.backupCurtainData = false;
HdlThreadLogic.Current.RunThread(async () =>
--
Gitblit v1.8.0