From b002d7e8709e4d6566124bdf7daa4bc3c3fd05d5 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 16 三月 2023 09:55:20 +0800
Subject: [PATCH] 1.新增大华摄像头dll及相关功能 2.更换LCVideoOnsdk.dll(跟大华摄像头有冲突) 3.修改适配版本为12.2(含有swift，需12.2以上支持)
---
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
index eb0b3db..bd1070c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
@@ -35,10 +35,12 @@
string curQueryType = "hour";
string queryTime;
Function function;
- public AcstSubHistoryPage(Function temp)
+ string colorString;
+ public AcstSubHistoryPage(Function temp,string colorStr)
{
function = temp;
bodyView = this;
+ colorString = colorStr;
}
@@ -47,7 +49,7 @@
/// </summary>
public void LoadPage()
{
- new TopViewDiv(bodyView, function.GetRoomListName()).LoadTopView();
+ new TopViewDiv(bodyView, function.name).LoadTopView();
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
//var contentView = new FrameLayout()
@@ -134,7 +136,7 @@
{
Y = Application.GetRealHeight(222),
Height = Application.GetRealHeight(34),
- Text = "鏈�杩�24灏忔椂鐨勫钩鍧囧鍐呮俯搴�",
+ TextID = StringId.Temp,
TextSize = 10,
TextColor = 0xFF798394,
TextAlignment = TextAlignment.Center,
@@ -169,7 +171,7 @@
{
Y = Application.GetRealHeight(222),
Height = Application.GetRealHeight(34),
- Text = "鏈�杩�24灏忔椂鐨勫钩鍧囧鍐呮箍搴�",
+ TextID = StringId.Humidity,
TextSize = 10,
TextColor = 0xFF798394,
TextAlignment = TextAlignment.Center,
@@ -327,7 +329,7 @@
}
tempEchartOption.InitXdataText(vs);
}
- tempEchartOption.InitYdataText("", revertData, "#FF80AEFF");
+ tempEchartOption.InitYdataTextLinearGradient("(掳C)", revertData, colorString);
tempEchartOption.xTitle = Language.StringByID(StringId.timeMode);
var opString = tempEchartOption.InitOption();
@@ -383,7 +385,7 @@
}
humiEchartsOption.InitXdataText(vs);
}
- humiEchartsOption.InitYdataText("", revertData, "#FF80AEFF");
+ humiEchartsOption.InitYdataTextLinearGradient("(%)", revertData, colorString);
}
}
humiEchartsOption.xTitle = Language.StringByID(StringId.timeMode);
--
Gitblit v1.8.0