From 9a4629512ccf8359efd88671c9317c3cc7faf0c8 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 29 八月 2022 16:46:40 +0800
Subject: [PATCH] Merge branch 'dev' into dev-temp
---
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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 d897898..869ac68
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -61,7 +61,7 @@
var iconBtn = new Button
{
Width = Application.GetRealWidth(936),
- Height = Application.GetRealHeight(436),
+ Height = Application.GetRealWidth(436),
X = Application.GetRealWidth(72),
Y = Application.GetRealHeight(30),
UnSelectedImagePath = $"ZigeeLogic/logicbj{s}.png",
@@ -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);
--
Gitblit v1.8.0