From f77a3add1e7ab266e473da9128bbe5758ba3a890 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 19:29:03 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs
old mode 100644
new mode 100755
index 86d16e0..aac722a
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs
@@ -19,9 +19,9 @@
for (int i = 0; i < bodyView.sensorListView.ChildrenCount; i++)
{
var sensorTag = sensor.sid;
- if (sensor.bus_Data != null)
+ if (sensor.bus != null)
{
- sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus_Data.SubnetID + "_" + sensor.bus_Data.DeviceID + "_" + sensor.bus_Data.LoopID;
+ sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus.SubnetID + "_" + sensor.bus.DeviceID + "_" + sensor.bus.LoopId;
}
var view = bodyView.sensorListView.GetChildren(i);
if (view.GetType() == typeof(FrameLayout))
@@ -45,12 +45,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