From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:19:13 +0800 Subject: [PATCH] 合并嘉乐lc代码 --- HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs index e0d3cbc..4f249a8 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Weather.cs @@ -46,6 +46,7 @@ weatherView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16); weatherView.btnText.TextID = StringId.tianqibianhua; viewLayout.AddChidren(weatherView.FLayoutView()); +<<<<<<< HEAD //绌烘皵璐ㄩ噺 LogicView.SelectTypeView kongqiViewk = new LogicView.SelectTypeView(); kongqiViewk.frameLayout.Y = weatherView.frameLayout.Bottom; @@ -55,6 +56,9 @@ kongqiViewk.btnLine.Width = Application.GetRealWidth(375 - 16 - 16); kongqiViewk.btnText.TextID = StringId.kongqizhiliang; viewLayout.AddChidren(kongqiViewk.FLayoutView()); +======= + +>>>>>>> origin/CJL-LC #endregion #region 鎵�鏈夌偣鍑讳簨浠� //瀹ゅ娓┿�佹箍搴︺�丳M2.5鍙樺寲 @@ -72,14 +76,7 @@ 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