From 98c998ca98ee014266f65a517d672df0cd97f244 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 25 三月 2020 17:51:18 +0800
Subject: [PATCH] 2020-03-25-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index bcc6ffa..a21475f 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -36,7 +36,7 @@
//new涓�涓柊閫昏緫瀵硅薄锛�
Common.Logic.CurrentLogic = new Common.Logic();
Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
- Common.Logic.CurrentLogic.LogicType = 1;
+ Common.Logic.CurrentLogic.LogicType = 1;//鏍囪鑷姩鍖栫被鍨�
Common.Logic.CurrentLogic.Relationship = 1;
Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
//Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
@@ -80,7 +80,7 @@
for (int j = 0; j < listlogic.Count; j++)
{
var logic = listlogic[j];
- if (logic.LogicType == 0)
+ if (logic.LogicType != 1)
{
continue;
}
@@ -228,7 +228,6 @@
};
-
///鍒犻櫎
var del = new Button
{
@@ -239,18 +238,16 @@
logicRowlayout.AddRightView(del);
del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
- alert.ResultEventHandler += (sender1, e1) =>
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ alert.ConfirmClickEvent += () =>
{
- if (e1)
- {
- Common.Logic.LockLogicList.Remove(logic);
- Automationview();
- Send.DelLogic(logic.LogicId);
- }
+ Common.Logic.LockLogicList.Remove(logic);
+ Automationview();
+ Send.DelLogic(logic.LogicId);
};
- alert.Show();
};
}
--
Gitblit v1.8.0