From 679c2a4c459c7ad0e9f727ad4196c0754716c28f Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 08 四月 2020 11:39:20 +0800
Subject: [PATCH] 2020-04-08-1
---
ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
old mode 100755
new mode 100644
index ef3652f..a16d97a
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -19,7 +19,7 @@
public string str1;
Dictionary<string, string> timeBucketConditionsInfo = new Dictionary<string, string>();
- public void Show()
+ public void Show(bool _if=false)
{
#region 涓婇潰鐨勫竷灞�浠ｇ爜
@@ -50,7 +50,9 @@
TypeView typeView = new TypeView();
middle.AddChidren(typeView.Show());
typeView.textBtn.TextID = MyInternationalizationString.type;
+ typeView.titleBtn.Width = Application.GetRealWidth(630+70);
typeView.titleBtn.TextID = MyInternationalizationString.timeframe;
+ typeView.backBtn.Visible = false;
#endregion
@@ -67,7 +69,9 @@
TypeView endView = new TypeView();
endView.frameLayout.Y = startView.frameLayout.Bottom;
+ endView.frameLayout.Height = Application.GetRealHeight(160 + 20);//鏈�鍚庝竴琛屽鍔�20楂樺害;
middle.AddChidren(endView.Show());
+ endView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;//鏀瑰彉鏈�鍚庝竴琛岀嚎棰滆壊;
endView.textBtn.TextID = MyInternationalizationString.endtime;
endView.titleBtn.Tag = "0";
@@ -331,11 +335,21 @@
}
//LogicIfon.logicIfon.Addconditions(timeBucketConditionsInfo,timeBucketConditionsInfo.Type);
+ if (_if) {
+ //璺冲埌S-one闂ㄩ攣
+ var oneLogic = new OneLogic { };
+ UserView.HomePage.Instance.AddChidren(oneLogic);
+ UserView.HomePage.Instance.PageIndex += 1;
+ oneLogic.Show(false);
- var logicCommunalPage = new LogicCommunalPage { };
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
+ }
+ else
+ {
+ var logicCommunalPage = new LogicCommunalPage { };
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
+ }
};
}
--
Gitblit v1.8.0