From fdc47d950498e088260a3b04028703adc0f878e0 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 三月 2020 10:54:27 +0800
Subject: [PATCH] 2020-03-30-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index 8ac599e..8f4a3b9 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -35,7 +35,6 @@
}
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
- //UserView.HomePage.Instance.ScrollEnabled = true;//鎭㈠宸︽粦
action();
RemoveFromParent();
};
@@ -155,7 +154,7 @@
{
if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
{
- selecteddevice.selecetddevicestateBtn.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
+ selecteddevice.selecetddevicestateBtn.Text = Common.Logic.CurrentLogic.Accounts[a]["AccountName"];
break;
}
}
@@ -240,7 +239,7 @@
string state = "";
switch (linkType)
{
-
+
case 0:
case 8:
{
@@ -604,7 +603,6 @@
Method.Push(middle);
#endregion
-
saveBtn.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
var name = logicTextBox.Text.Trim();
@@ -614,12 +612,12 @@
}
public void AddCondition(int value)
{
+ Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
var addCondition = new AddCondition();
addCondition.conditionsIndex = value;
UserView.HomePage.Instance.AddChidren(addCondition);
UserView.HomePage.Instance.PageIndex += 1;
addCondition.Show();
-
}
}
}
--
Gitblit v1.8.0