From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
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 c30fa40..93c4e6e
--- a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
@@ -13,29 +13,27 @@
Tag = "Logic";
}
- public void Show (string titlename)
+ public void Show (string titlename,string if_logic,bool _bool)
{
- var weeklist = new List<string> ();
- #region 涓婇潰鐨勫竷灞�浠ｇ爜
+ #region 鐣岄潰鐨勫竷灞�浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.Text=titlename;
view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
- #endregion
-
var middle = new VerticalScrolViewLayout
{
Y = view.topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184-260),
+ Height = Application.GetRealHeight(Method.H - 184-260),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
-
LogicView.SaveView saveView = new LogicView.SaveView();
saveView.frameLayout.Y = middle.Bottom;
this.AddChidren(saveView.Show());
+ #endregion
+ var weeklist = new List<string>();
if (Common.Logic.CurrentLogic.TimeAttribute.Repeat == 5)
{
string len = "";
@@ -83,7 +81,6 @@
}
}
}
-
var cyclelist = new List<string> ();
cyclelist.AddRange (new string [] {
Language.StringByID(MyInternationalizationString.mon),
@@ -100,8 +97,8 @@
FunView monView = new FunView();
monView.iconBtn.UnSelectedImagePath = "ZigeeLogic/point.png";
monView.funnameBtn.Text= name;
- monView.funnextBtn.Width = Application.GetMinRealAverage(60);
- monView.funnextBtn.Height = Application.GetMinRealAverage(60);
+ monView.funnextBtn.Width = Application.GetRealWidth(60);
+ monView.funnextBtn.Height = Application.GetRealWidth(60);
monView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
monView.funnextBtn.Visible = false;
middle.AddChidren(monView.FunFrameView());
@@ -138,8 +135,6 @@
};
}
-
-
saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -177,7 +172,7 @@
}
if (weekvalue == 0)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectweek),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -186,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