From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本

---
 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