From 34d49c20c2c2543658e844847c5eaa87f4c954e9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 二月 2021 17:28:40 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs
index 86d16e0..c9b08eb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs
@@ -19,10 +19,6 @@
for (int i = 0; i < bodyView.sensorListView.ChildrenCount; i++)
{
var sensorTag = sensor.sid;
- if (sensor.bus_Data != null)
- {
- sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus_Data.SubnetID + "_" + sensor.bus_Data.DeviceID + "_" + sensor.bus_Data.LoopID;
- }
var view = bodyView.sensorListView.GetChildren(i);
if (view.GetType() == typeof(FrameLayout))
{
@@ -45,12 +41,14 @@
else if (tag == "SensorLevel")
{
(btn as Button).TextID = sensor.levelTextList[sensor.curLevel - 1];
+ (btn as Button).TextColor = sensor.levelColorList[sensor.curLevel - 1];
}
}
}
else if (btn.GetType() == typeof(ArcSeekBar))
{
(btn as ArcSeekBar).ProgressBarColor = sensor.levelColorList[sensor.curLevel - 1];
+
(btn as ArcSeekBar).Progress = (96 / sensor.levelColorList.Count) * sensor.curLevel;
}
}
--
Gitblit v1.8.0