From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacHistoryChoosePage.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacHistoryChoosePage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacHistoryChoosePage.cs
index 24d02f0..f46c646 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacHistoryChoosePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacHistoryChoosePage.cs
@@ -19,12 +19,12 @@
public void InitView()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.Data)).LoadTopView();
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Data)) { maginY = 10 }.LoadTopView();
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
FrameLayout tempView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(74),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -59,8 +59,9 @@
TextID = StringId.TemperatureStatistics
};
tempView.AddChidren(btnTempName);
- btnTempName.MouseUpEventHandler = (sender, e) => {
- var page = new CacWeekHistoryPage(device,"temp");
+ btnTempName.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new CacWeekHistoryPage(device, "room_temp");
MainPage.BasePageView.AddChidren(page);
page.InitView();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -70,7 +71,7 @@
FrameLayout humidityView = new FrameLayout()
{
- Y = Application.GetRealHeight(64 + 50),
+ Y = Application.GetRealHeight(74 + 50),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -95,8 +96,9 @@
TextID = StringId.HumidityStatistics
};
humidityView.AddChidren(btnHumidityName);
- btnHumidityName.MouseUpEventHandler = (sender, e) => {
- var page = new CacWeekHistoryPage(device, "humidity");
+ btnHumidityName.MouseUpEventHandler = (sender, e) =>
+ {
+ var page = new CacWeekHistoryPage(device, "room_humidity");
MainPage.BasePageView.AddChidren(page);
page.InitView();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0