From cb7fd6a89ad9fcd9cf575025ab43873f17bf17c8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 16:46:59 +0800
Subject: [PATCH] 2020-12-31-1
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
old mode 100755
new mode 100644
index 008ae98..a872026
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -108,7 +108,7 @@
Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
if (Common.Logic.CurrentLogic.Conditions.Count == 1)
{
- new LogicDveiceStatus { }.ConditionView(false, this);
+ new LogicDveiceStatus { }.ConditionView(false, this,null);
}
else
{
@@ -150,7 +150,7 @@
EventHandler<MouseEventArgs> editclick = (sender, e) =>
{
Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
- new LogicDveiceStatus { }.ConditionView(true, this);
+ new LogicDveiceStatus { }.ConditionView(true, this, relationship);
};
row.MouseUpEventHandler += editclick;
relationship.MouseUpEventHandler += editclick;
@@ -215,10 +215,6 @@
UserView.HomePage.Instance.PageIndex += 1;
cycle.Show();
- //var cyclicCycle = new CyclicCycle(() => { UpdateWeek(btnweektext); });
- //UserView.HomePage.Instance.AddChidren(cyclicCycle);
- //UserView.HomePage.Instance.PageIndex += 1;
- //cyclicCycle.Show();
};
weekBtn.MouseUpEventHandler += cycleclick;
weekview.clickBtn.MouseUpEventHandler += cycleclick;
--
Gitblit v1.8.0