From 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期一, 28 十月 2024 11:58:31 +0800 Subject: [PATCH] 谷歌版本问题修复 --- HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs | 50 +++++++++++++++++++++++++++++++------------------- 1 files changed, 31 insertions(+), 19 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs index 1f5553b..5a064b9 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs @@ -20,7 +20,8 @@ /// room_humidity 婀垮害 /// </summary> string showType; - Dictionary<string, double> dataDic = new Dictionary<string, double>(); + Dictionary<string, double> dataDic = new Dictionary<string, double>(); + public CacWeekHistoryPage(Function device,string type) { bodyView = this; @@ -33,11 +34,15 @@ { if (showType == "room_temp") { - new TopViewDiv(bodyView, Language.StringByID(StringId.Temp)).LoadTopView(); + var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Temp)); + topView.maginY = 10; + topView.LoadTopView(); } else { - new TopViewDiv(bodyView, Language.StringByID(StringId.Humidity)).LoadTopView(); + var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Humidity)); + topView.maginY = 10; + topView.LoadTopView(); } @@ -50,7 +55,7 @@ { FrameLayout contentView = new FrameLayout() { - Y = Application.GetRealHeight(80), + Y = Application.GetRealHeight(90), Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealHeight(482), @@ -98,18 +103,18 @@ } else { - btnUnit.Text = Language.StringByID(StringId.Uint) + "%"; + btnUnit.Text = Language.StringByID(StringId.Uint) + "锛�%"; } dataView.AddChidren(btnUnit); #if DEBUG - //dataDic.Add("0201", 49); - //dataDic.Add("0202", 20); - //dataDic.Add("0203", 10); - //dataDic.Add("0204", 49); - //dataDic.Add("0205", 20); - //dataDic.Add("0206", 20); - //dataDic.Add("0207", 48); + dataDic.Add("0201", 49); + dataDic.Add("0202", 20); + dataDic.Add("0203", 10); + dataDic.Add("0204", 49); + dataDic.Add("0205", 20); + dataDic.Add("0206", 20); + dataDic.Add("0207", 48); //dataDic.Add("0201", -20); //dataDic.Add("0202", -20); @@ -175,7 +180,17 @@ new System.Threading.Thread(() => { - +#if DEBUG + if (MainPage.NoLoginMode) + { + Application.RunOnMainThread(() => + { + RefrshDataView(dataDic, dataShowView); + RefreshXtext(); + }); + return; + } +#endif var revertObj = new HttpServerRequest().GetSensorHistory("week", device.deviceId, showType); if (revertObj.Code == StateCode.SUCCESS) { @@ -253,14 +268,9 @@ cv.InitView(); dataShowView.AddChidren(cv); cv.Clicker(); - - valueIndex++; } } - - - } class DataItemView : FrameLayout @@ -280,7 +290,7 @@ Button btnValue = new Button() { - Width = Application.GetRealWidth(18), + Width = Application.GetRealWidth(24), Height = Application.GetRealHeight(30), TextAlignment = TextAlignment.CenterRight, TextColor = 0xFF43425D, @@ -355,6 +365,8 @@ } Width = Application.GetRealWidth(39); Height = Application.GetRealHeight((int)(value * 3 + 30)); + + ScrollEnabled = false; } public void InitView() -- Gitblit v1.8.0