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/EverymonthPage.cs | 89 ++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 57 deletions(-)
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 d983614..051311b
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
@@ -16,62 +16,21 @@
{
Tag = "Logic";
}
- public void Show(string titlename)
+ public void Show(string titlename,string if_logic,bool _bool)
{
- #region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
- var topRowLayout = new RowLayout
- {
- BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
- Height = Application.GetRealHeight(184),
- LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
- };
- this.AddChidren(topRowLayout);
+
- var titleName = new Button
- {
- TextSize = 17,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(600),
- Height = Application.GetRealHeight(69),
- Y = Application.GetRealHeight(92),
- Text = titlename,
- IsBold = true,
- };
- topRowLayout.AddChidren(titleName);
-
- var clickBtn = new Button
- {
- Width = Application.GetRealWidth(81 + 51),
- Height = Application.GetRealHeight(58 + 40),
- Y = Application.GetRealHeight(98 - 40),
- };
- topRowLayout.AddChidren(clickBtn);
- clickBtn.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
-
- var back = new Button
- {
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealHeight(51),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(98),
- //Gravity = Gravity.CenterVertical;
- UnSelectedImagePath = "ZigeeLogic/back.png",
- };
- topRowLayout.AddChidren(back);
- back.MouseDownEventHandler += (sender, e) => {
- RemoveFromParent();
- };
+ #region 涓婇潰鐨勫竷灞�浠ｇ爜
+ TopView view = new TopView();
+ this.AddChidren(view.TopRowView());
+ view.toptitleNameBtn.Text = titlename;
+ view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
#endregion
var middle = new FrameLayout
{
- Y = topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184),
+ Y = view.topRowLayout.Bottom,
+ Height = Application.GetRealHeight(Method.H - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
@@ -151,12 +110,12 @@
Text = k.ToString().Length == 1 ? "0" + k.ToString() : k.ToString(),
Y = Application.GetRealHeight(40),
- Height = Application.GetRealHeight(100),
+ Height = Application.GetRealWidth(100),
Width = Application.GetRealWidth(100),
X = Application.GetRealWidth(35 * j) + Application.GetRealWidth(100 * (j - 1)),
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- Radius = (uint)Application.GetRealHeight(50),
+ Radius = (uint)Application.GetRealWidth(50),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
SelectedBackgroundColor = ZigbeeColor.Current.LogicAddColor,
Tag = k,
@@ -203,7 +162,7 @@
if (monselectedlist.Count == 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();
@@ -227,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(() => { });
+ }
+
+
+
};
--
Gitblit v1.8.0