From 9064c76e6a795ae735cac52d98bed178a27c2a87 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 16:38:16 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
index b232308..66b7f3d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
@@ -367,18 +367,18 @@
}
else if (actions["SecuritySetting"].ToString() == "1")
{
+ if (actions["SecurityModeId"].ToString() == "1") {
athomedefenceSelected.Visible = true;
leavehomedefenceSelected.Visible = false;
withdrawalSelected.Visible = false;
urgentwithdrawalSelected.Visible = false;
- }
- else if (actions["SecuritySetting"].ToString() == "2")
- {
- athomedefenceSelected.Visible = false;
- leavehomedefenceSelected.Visible = true;
- withdrawalSelected.Visible = false;
- urgentwithdrawalSelected.Visible = false;
-
+ }
+ else {
+ athomedefenceSelected.Visible = false;
+ leavehomedefenceSelected.Visible = true;
+ withdrawalSelected.Visible = false;
+ urgentwithdrawalSelected.Visible = false;
+ }
}
break;
--
Gitblit v1.8.0