From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 01 九月 2023 18:06:45 +0800
Subject: [PATCH] 2023年09月01日18:06:42
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | 109 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index a49c750..2ba2c67 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -351,6 +351,10 @@
/// </summary>
void LoadSensorDiv(Function sensor,int index)
{
+ if (sensor.spk==SPK.SensorLight) {
+ //鍏堣繃婊ゆ帀鍏夌収浼犳劅鍣�
+ return;
+ }
var levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
var levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
{
@@ -391,6 +395,10 @@
case SPK.SensorHcho:
imagePath = "FunctionIcon/EnvirSensor/HchoBg.png";
iconPath = "FunctionIcon/EnvirSensor/HchoIcon.png";
+ break;
+ case SPK.SensorLight:
+ imagePath = "FunctionIcon/EnvirSensor/IlluminationBg.png";
+ iconPath = "FunctionIcon/EnvirSensor/IlluminationIcon.png";
break;
}
sensorView.BackgroundImagePath = imagePath;
@@ -495,6 +503,7 @@
List<uint> levelColorList = new List<uint>();
List<int> levelTextList = new List<int>();
List<string> levelText = new List<string>();
+ List<string> intervalList = new List<string>();
var configs = sensor.GetAttrKeyConfigs(sensor.SpkClassification);
@@ -514,7 +523,9 @@
{
levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
- foreach(var iii in levelTextList)
+ intervalList = sensorTemp.GetIntervalValue(sensor.spk);
+
+ foreach (var iii in levelTextList)
{
levelText.Add(Language.StringByID(iii));
}
@@ -554,7 +565,7 @@
switch (sensor.spk)
{
case SPK.SensorPm25:
- btnTitle.Text = "PM2.5(ug/m虏)";
+ btnTitle.Text = "PM2.5(ug/m鲁)";//虏
break;
case SPK.SensorTemperature:
btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
@@ -611,55 +622,65 @@
IsBold = true,
TextID = StringId.ColorValue,
});
- for (int index = 0; index < levelText.Count; index++)
+ try
{
- infoView.AddChidren(new Button()
+ for (int index = 0; index < levelText.Count; index++)
{
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(303),
- Height = Application.GetRealWidth(1),
- BackgroundColor = CSS_Color.DividingLineColor,
- });
+ //if(sensorTemp.GetIntervalValue(sensor.spk).Count >= index)
+ //{
+ // return;
+ //}
+ infoView.AddChidren(new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(303),
+ Height = Application.GetRealWidth(1),
+ BackgroundColor = CSS_Color.DividingLineColor,
+ });
- FrameLayout subInfoView = new FrameLayout()
- {
- Height = Application.GetRealHeight(44),
- };
- infoView.AddChidren(subInfoView);
+ FrameLayout subInfoView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(44),
+ };
+ infoView.AddChidren(subInfoView);
- subInfoView.AddChidren(new Button()
- {
- X = Application.GetRealWidth(20),
- Width = Application.GetRealWidth(100),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- IsBold = true,
- Text = sensorTemp.GetIntervalValue(sensor.spk)[index]
- });
+ subInfoView.AddChidren(new Button()
+ {
+ X = Application.GetRealWidth(20),
+ Width = Application.GetRealWidth(100),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ IsBold = true,
+ Text = sensorTemp.GetIntervalValue(sensor.spk)[index]
+ });
- subInfoView.AddChidren(new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(100),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- IsBold = true,
- Text = levelText[index]
- });
+ subInfoView.AddChidren(new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(100),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ IsBold = true,
+ Text = levelText[index]
+ });
- subInfoView.AddChidren(new Button()
- {
- X = Application.GetRealWidth(285),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetRealWidth(38),
- Height = Application.GetRealHeight(18),
- Radius = (uint)Application.GetRealWidth(4),
- BackgroundColor = levelColorList[index]
- });
+ subInfoView.AddChidren(new Button()
+ {
+ X = Application.GetRealWidth(285),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(38),
+ Height = Application.GetRealHeight(18),
+ Radius = (uint)Application.GetRealWidth(4),
+ BackgroundColor = levelColorList[index]
+ });
+ }
}
-
+ catch (Exception ex)
+ {
+ MainPage.Log($"鐜绛夌骇淇℃伅琛ㄥ姞杞藉紓甯�:{ex.Message}");
+ }
--
Gitblit v1.8.0