From 23bbed132eea46eef51c6d01c21b346238e29ee2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:39:12 +0800
Subject: [PATCH] Merge branch 'wxr0114' into V1.5.9
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index d7acf79..ea27379 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -347,8 +347,8 @@
/// </summary>
void LoadSensorDiv(Function sensor,int index)
{
- var levelColorList = sensorTemp.GetLevelColorList(sensor);
- var levelTextList = sensorTemp.GetLevelTextList(sensor);
+ var levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
+ var levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
{
var sensorTag = sensor.spk + sensor.sid + sensor.deviceId;
FrameLayout sensorView = new FrameLayout()
@@ -438,9 +438,9 @@
Width = Application.GetRealWidth(100),
Height = Application.GetRealWidth(32),
TextAlignment = TextAlignment.CenterLeft,
- TextColor = sensorTemp.GetLevelColorList(sensor)[sensorTemp.GetCurLevel(sensor) - 1],
+ TextColor = sensorTemp.GetLevelColorList(sensor.spk)[sensorTemp.GetCurLevel(sensor) - 1],
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = levelTextList[sensorTemp.GetCurLevel(sensor) - 1],
+ TextID = levelTextList[sensorTemp.GetCurLevel(sensor) - 1],
Tag = "SensorLevel",
};
sensorView.AddChidren(btnLevel);
@@ -488,8 +488,8 @@
/// </summary>
void LoadInfo(Function sensor)
{
- var levelColorList = sensorTemp.GetLevelColorList(sensor);
- var levelTextList = sensorTemp.GetLevelTextList(sensor);
+ var levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
+ var levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
Dialog dialog = new Dialog();
FrameLayout dialogBodyView = new FrameLayout();
@@ -525,22 +525,22 @@
switch (sensor.spk)
{
case SPK.SensorPm25:
- btnTitle.Text = $"PM2.5({sensorTemp.Unit(sensor)})";
+ btnTitle.Text = "PM2.5(ug/m虏)";
break;
case SPK.SensorTemperature:
- btnTitle.Text = Language.StringByID(StringId.Temp) + $"({sensorTemp.Unit(sensor)})";
+ btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
break;
case SPK.SensorTVOC:
- btnTitle.Text = $"TVOC({sensorTemp.Unit(sensor)})";
+ btnTitle.Text = "TVOC(PPB)";
break;
case SPK.SensorCO2:
- btnTitle.Text = $"CO2({sensorTemp.Unit(sensor)})";
+ btnTitle.Text = "CO2(PPM)";
break;
case SPK.SensorHumidity:
- btnTitle.Text = Language.StringByID(StringId.Humidity) + $"({sensorTemp.Unit(sensor)})";
+ btnTitle.Text = Language.StringByID(StringId.Humidity) + "(%)";
break;
case SPK.SensorHcho:
- btnTitle.Text = Language.StringByID(StringId.Formaldehyde) +$"({sensorTemp.Unit(sensor)})";
+ btnTitle.Text = Language.StringByID(StringId.Formaldehyde) +"(mg/m3)";
break;
}
@@ -606,7 +606,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
IsBold = true,
- Text = sensorTemp.GetIntervalValue(sensor)[index]
+ Text = sensorTemp.GetIntervalValue(sensor.spk)[index]
});
subInfoView.AddChidren(new Button()
@@ -617,7 +617,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
IsBold = true,
- Text = levelTextList[index]
+ TextID = levelTextList[index]
});
subInfoView.AddChidren(new Button()
@@ -865,16 +865,16 @@
}
else if (tag == "SensorLevel")
{
- (btn as Button).Text = bodyView.sensorTemp.GetLevelTextList(updateTemp)[bodyView.sensorTemp.GetCurLevel(updateTemp) - 1];
- (btn as Button).TextColor = bodyView.sensorTemp.GetLevelColorList(updateTemp)[bodyView.sensorTemp.GetCurLevel(updateTemp) - 1];
+ (btn as Button).TextID = bodyView.sensorTemp.GetLevelTextList(updateTemp.spk)[bodyView.sensorTemp.GetCurLevel(updateTemp) - 1];
+ (btn as Button).TextColor = bodyView.sensorTemp.GetLevelColorList(updateTemp.spk)[bodyView.sensorTemp.GetCurLevel(updateTemp) - 1];
}
}
}
else if (btn.GetType() == typeof(ArcSeekBar))
{
- (btn as ArcSeekBar).ProgressBarColor = bodyView.sensorTemp.GetLevelColorList(updateTemp)[bodyView.sensorTemp.GetCurLevel(updateTemp) - 1];
+ (btn as ArcSeekBar).ProgressBarColor = bodyView.sensorTemp.GetLevelColorList(updateTemp.spk)[bodyView.sensorTemp.GetCurLevel(updateTemp) - 1];
- (btn as ArcSeekBar).Progress = (96 / bodyView.sensorTemp.GetLevelColorList(updateTemp).Count) * bodyView.sensorTemp.GetCurLevel(updateTemp);
+ (btn as ArcSeekBar).Progress = (96 / bodyView.sensorTemp.GetLevelColorList(updateTemp.spk).Count) * bodyView.sensorTemp.GetCurLevel(updateTemp);
}
}
}
--
Gitblit v1.8.0