From e76381c3393d284f3f8ab61930cb6b71f18b2d6b Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 13 八月 2024 14:43:43 +0800
Subject: [PATCH] 金茂定制热水器，光伏储能，UI完成
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs
index c5084de..5a064b9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacWeekHistoryPage.cs
@@ -34,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();
}
@@ -51,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),
@@ -99,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);
@@ -176,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)
{
@@ -254,14 +268,9 @@
cv.InitView();
dataShowView.AddChidren(cv);
cv.Clicker();
-
-
valueIndex++;
}
}
-
-
-
}
class DataItemView : FrameLayout
@@ -281,7 +290,7 @@
Button btnValue = new Button()
{
- Width = Application.GetRealWidth(18),
+ Width = Application.GetRealWidth(24),
Height = Application.GetRealHeight(30),
TextAlignment = TextAlignment.CenterRight,
TextColor = 0xFF43425D,
@@ -356,6 +365,8 @@
}
Width = Application.GetRealWidth(39);
Height = Application.GetRealHeight((int)(value * 3 + 30));
+
+ ScrollEnabled = false;
}
public void InitView()
--
Gitblit v1.8.0