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/Cycle.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
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 cb2bb2a..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";
@@ -46,8 +46,8 @@
FunView onceView = new FunView();
onceView.iconBtn.UnSelectedImagePath = "ZigeeLogic/point.png";
onceView.funnameBtn.TextID = MyInternationalizationString.executeonce;
- onceView.funnextBtn.Width = Application.GetMinRealAverage(60);
- onceView.funnextBtn.Height = Application.GetMinRealAverage(60);
+ onceView.funnextBtn.Width = Application.GetRealWidth(60);
+ onceView.funnextBtn.Height = Application.GetRealWidth(60);
onceView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
onceView.funnextBtn.Visible = false;
middle.AddChidren(onceView.FunFrameView());
@@ -59,8 +59,8 @@
dayView.funFrameLayout.Y = onceView.funFrameLayout.Bottom;
dayView.iconBtn.UnSelectedImagePath = "ZigeeLogic/point.png";
dayView.funnameBtn.TextID = MyInternationalizationString.everyday;
- dayView.funnextBtn.Width = Application.GetMinRealAverage(60);
- dayView.funnextBtn.Height = Application.GetMinRealAverage(60);
+ dayView.funnextBtn.Width = Application.GetRealWidth(60);
+ dayView.funnextBtn.Height = Application.GetRealWidth(60);
dayView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
dayView.funnextBtn.Visible = false;
middle.AddChidren(dayView.FunFrameView());
@@ -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)
--
Gitblit v1.8.0