From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index bcc6ffa..0d0e1fc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -10,7 +10,7 @@
public LockLogicList()
{
- Tag = "Logic";
+ Tag = "LockListView";
}
VerticalRefreshLayout middle;
public void Show()
@@ -36,10 +36,9 @@
//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);
+ Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.linkageevent);
var lockLogicCommunalPage = new LockLogicCommunalPage();
UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
UserView.HomePage.Instance.PageIndex += 1;
@@ -80,7 +79,7 @@
for (int j = 0; j < listlogic.Count; j++)
{
var logic = listlogic[j];
- if (logic.LogicType == 0)
+ if (logic.LogicType != 1)
{
continue;
}
@@ -228,7 +227,6 @@
};
-
///鍒犻櫎
var del = new Button
{
@@ -239,18 +237,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