From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs
index c1e0462..e11c983 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs
@@ -46,6 +46,15 @@
weatherView.btnText.TextID = StringId.tianqibianhua;
viewLayout.AddChidren(weatherView.FLayoutView());
+ //绌烘皵璐ㄩ噺
+ LogicView.SelectTypeView kongqiViewk = new LogicView.SelectTypeView();
+ kongqiViewk.frameLayout.Y = weatherView.frameLayout.Bottom;
+ kongqiViewk.btnIcon.Visible = false;
+ kongqiViewk.btnText.X = Application.GetRealWidth(16);
+ kongqiViewk.btnLine.X = Application.GetRealWidth(16);
+ kongqiViewk.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
+ kongqiViewk.btnText.TextID = StringId.kongqizhiliang;
+ viewLayout.AddChidren(kongqiViewk.FLayoutView());
#endregion
#region 鎵�鏈夌偣鍑讳簨浠�
@@ -59,12 +68,19 @@
};
//澶╂皵鍙樺寲(鍩庡競澶╂皵)
weatherView.btnClick.MouseUpEventHandler += (sen, e) => {
- //FunTpye funTpye = new FunTpye();
- //MainPage.BasePageView.AddChidren(funTpye);
- //funTpye.Show(LogicMethod.condition_if);
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ WeatherCondition weatherCondition = new WeatherCondition();
+ MainPage.BasePageView.AddChidren(weatherCondition);
+ weatherCondition.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
-
+ //绌烘皵璐ㄩ噺
+ kongqiViewk.btnClick.MouseUpEventHandler += (sen, e) => {
+ AirQuality airQuality = new AirQuality();
+ MainPage.BasePageView.AddChidren(airQuality);
+ airQuality.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+
#endregion
}
}
--
Gitblit v1.8.0