From 505effa88b17ce8c3c7ac5403b76d9e5d0cfc2a5 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 28 十月 2024 11:58:31 +0800
Subject: [PATCH] 谷歌版本问题修复
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index a10b239..c175e21 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -24,6 +24,7 @@
Sensor sensorTemp = new Sensor();
+
Function function;
List<Function> showFunctions;
List<Function> sensorList;
@@ -237,16 +238,6 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
});
break;
- //case SPK.SensorPm25:
- //_intervalValue.Add("0 ~ 35");
- //_intervalValue.Add("36 ~ 75");
- //_intervalValue.Add("76 ~ 115");
- //_intervalValue.Add("115 ~");
- //_levelTextList.Add(StringId.Great);
- //_levelTextList.Add(StringId.Good);
- //_levelTextList.Add(StringId.MildPollution);
- //_levelTextList.Add(StringId.HeavyPollution);
- //break;
case SPK.SensorCO2:
tipValuesView.AddChidren(new Button()
{
@@ -487,7 +478,7 @@
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(151),
- Text = "40%",
+ Text = "70%",
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
@@ -495,7 +486,7 @@
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(151),
- Text = "70%",
+ Text = "40%",
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
@@ -503,7 +494,7 @@
tipTextView.AddChidren(new Button()
{
Width = Application.GetRealWidth(101),
- TextID = StringId.SensorReferenceHumidityTipLevel1,
+ TextID = StringId.SensorReferenceHumidityTipLevel3,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
@@ -519,7 +510,7 @@
tipTextView.AddChidren(new Button()
{
Width = Application.GetRealWidth(101),
- TextID = StringId.SensorReferenceHumidityTipLevel3,
+ TextID = StringId.SensorReferenceHumidityTipLevel1,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
@@ -661,12 +652,14 @@
{
new System.Threading.Thread(() =>
{
+
foreach (var tempSensor in sensorList)
{
if (index >= 6)
{
break;
}
+
if (tempSensor.sid == function.sid)
{
continue;
@@ -729,7 +722,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = function.name,
+ Text = tempSensor.name,
IsBold = true,
};
otherInfoView.AddChidren(btnSensorName);
@@ -824,6 +817,12 @@
});
System.Threading.Thread.Sleep(50);
}
+ Application.RunOnMainThread(() => {
+ if (index > 1)
+ {
+ contentView.ScrollEnabled = true;
+ }
+ });
}).Start();
}
catch(Exception ex)
@@ -836,6 +835,7 @@
LoadMothed_GetSensorHistoryData();
LoadEvent_ChangeSensorHistoryShowType();
}
+
}
@@ -900,7 +900,7 @@
}
ebl.InitXdataText(vs);
}
- yDataString += ebl.InitYdataText(sr.name, revertData, tipColorStringList[i]);
+ yDataString += ebl.InitYdataText("", revertData, tipColorStringList[i]);
}
}
i++;
@@ -909,9 +909,18 @@
Application.RunOnMainThread(() =>
{
+ if (curQueryType == "hour")
+ {
+ ebl.xTitle = Language.StringByID(StringId.HourUint);
+ }
+ else
+ {
+ ebl.xTitle = Language.StringByID(StringId.Date);
+ }
+ ebl.yTitle = Language.StringByID(StringId.Uint) + "(" + sensorTemp.Unit(function) + ")";
+
myEchartsView.ShowWithOption(ebl.InitOption());
});
-
}
catch (Exception ex)
{
--
Gitblit v1.8.0