From 993ecf49ae04ccea89f6bc4a32cfc0c45def1215 Mon Sep 17 00:00:00 2001
From: 温居城 <wenjucheng@wenjuchengdeMacBook-Pro.local>
Date: 星期三, 27 十月 2021 14:23:30 +0800
Subject: [PATCH] 2021-10-27-01
---
ZigbeeApp/Shared/Common/CommonPage.cs | 0
ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs | 26 ++++++++++--
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs | 23 +++++++++--
ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs | 6 +-
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 2
7 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
old mode 100755
new mode 100644
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
old mode 100755
new mode 100644
index 0be91d1..8901f88
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
@@ -16,7 +16,7 @@
this.action = action;
}
- public void Show()
+ public void Show(string if_logic,bool _bool)
{
Tag = "Logic";
@@ -123,7 +123,7 @@
var weekPage = new WeekPage();
UserView.HomePage.Instance.AddChidren(weekPage);
UserView.HomePage.Instance.PageIndex += 1;
- weekPage.Show(weekView.funnameBtn.Text);
+ weekPage.Show(weekView.funnameBtn.Text, if_logic,_bool);
};
monView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -133,7 +133,7 @@
var everymonthPage = new EverymonthPage();
UserView.HomePage.Instance.AddChidren(everymonthPage);
UserView.HomePage.Instance.PageIndex += 1;
- everymonthPage.Show(monView.funnameBtn.Text);
+ everymonthPage.Show(monView.funnameBtn.Text, if_logic,_bool);
};
if (Common.Logic.CurrentLogic.TimeAttribute.Repeat == 0)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
old mode 100755
new mode 100644
index 0124d81..051311b
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
@@ -16,7 +16,7 @@
{
Tag = "Logic";
}
- public void Show(string titlename)
+ public void Show(string titlename,string if_logic,bool _bool)
{
@@ -186,10 +186,26 @@
Common.Logic.CurrentLogic.TimeAttribute.Repeat = 3;
Common.Logic.CurrentLogic.TimeAttribute.MonthDate = intvalue;
- var logicCommunalPage = new LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
+
+ if (LogicView.IfString._LockLogic == if_logic)
+ {
+ //璺冲埌s_one闂ㄩ攣缂栬緫鐣岄潰
+ var oneLogic = new OneLogic();
+ UserView.HomePage.Instance.AddChidren(oneLogic);
+ UserView.HomePage.Instance.PageIndex += 1;
+ oneLogic.Show(_bool);
+ }
+ else
+ {
+
+ var logicCommunalPage = new LogicCommunalPage { };
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
+ }
+
+
+
};
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 a872026..94c88ef
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -213,7 +213,7 @@
var cycle = new Cycle(() => { Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic); });
UserView.HomePage.Instance.AddChidren(cycle);
UserView.HomePage.Instance.PageIndex += 1;
- cycle.Show();
+ cycle.Show(LogicView.IfString._Logic,false);
};
weekBtn.MouseUpEventHandler += cycleclick;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
old mode 100755
new mode 100644
index 90df1c8..b185742
--- a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
@@ -300,7 +300,7 @@
var cycle = new Cycle(() => { Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic); });
UserView.HomePage.Instance.AddChidren(cycle);
UserView.HomePage.Instance.PageIndex += 1;
- cycle.Show();
+ cycle.Show(LogicView.IfString._LockLogic, Yes);
};
weekBtn.MouseUpEventHandler += cycleclick;
weekview.clickBtn.MouseUpEventHandler += cycleclick;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
old mode 100755
new mode 100644
index 7b4b789..869ac68
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -472,7 +472,7 @@
var cycle = new Cycle(() => { Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic); });
UserView.HomePage.Instance.AddChidren(cycle);
UserView.HomePage.Instance.PageIndex += 1;
- cycle.Show();
+ cycle.Show(LogicView.IfString._Logic,false);
//var cyclicCycle = new CyclicCycle(() => { UpdateWeek(btnweektext); });
//UserView.HomePage.Instance.AddChidren(cyclicCycle);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
old mode 100755
new mode 100644
index db4cf4f..93c4e6e
--- a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
@@ -13,7 +13,7 @@
Tag = "Logic";
}
- public void Show (string titlename)
+ public void Show (string titlename,string if_logic,bool _bool)
{
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
@@ -181,10 +181,23 @@
Common.Logic.CurrentLogic.TimeAttribute.Repeat = 5;
Common.Logic.CurrentLogic.TimeAttribute.WeekDay = weekvalue;
- var logicCommunalPage = new LogicCommunalPage { };
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
+
+ if (LogicView.IfString._LockLogic == if_logic)
+ {
+ //璺冲埌s_one闂ㄩ攣缂栬緫鐣岄潰
+ var oneLogic = new OneLogic();
+ UserView.HomePage.Instance.AddChidren(oneLogic);
+ UserView.HomePage.Instance.PageIndex += 1;
+ oneLogic.Show(_bool);
+ }
+ else
+ {
+
+ var logicCommunalPage = new LogicCommunalPage { };
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
+ }
};
--
Gitblit v1.8.0