From 1ee407dd57a7273ef6b686ac25a40d4199f5bce9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 10:14:41 +0800
Subject: [PATCH] Merge branch 'wxr6' into wxr4
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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..90ab211 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs
@@ -35,6 +35,7 @@
airqualityView.btnLine.X = Application.GetRealWidth(16);
airqualityView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
airqualityView.btnText.TextID =StringId.shuwaigongneng;
+ airqualityView.btnText.Width = Application.GetRealWidth(280);
viewLayout.AddChidren(airqualityView.FLayoutView());
//澶╂皵鍙樺寲(鍩庡競澶╂皵)
LogicView.SelectTypeView weatherView = new LogicView.SelectTypeView();
@@ -45,9 +46,16 @@
weatherView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
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 鎵�鏈夌偣鍑讳簨浠�
//瀹ゅ娓┿�佹箍搴︺�丳M2.5鍙樺寲
airqualityView.btnClick.MouseUpEventHandler += (sen, e) => {
@@ -59,10 +67,10 @@
};
//澶╂皵鍙樺寲(鍩庡競澶╂皵)
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;
};
#endregion
--
Gitblit v1.8.0