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 | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
index ae014e0..a16d97a 100644
--- 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 涓婇潰鐨勫竷灞�浠ｇ爜
@@ -335,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