From d4ff2cb026bfa348c62651c0547511eede9f94f3 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 21 七月 2021 13:45:50 +0800
Subject: [PATCH] Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7-ez
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index cd99561..e10d48d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -29,6 +29,8 @@
/// </summary>
FrameLayout sensorListView;
+ VerticalScrolViewLayout sensorListContentView;
+
/// <summary>
/// 澶╂皵鍚嶇О鏂囨湰
/// </summary>
@@ -237,17 +239,18 @@
contentView.AddChidren(btnRoomClickRow);
#endregion
-
- sensorListView = new FrameLayout()
+ sensorListContentView = new VerticalScrolViewLayout()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(50),
- Height = Application.GetRealHeight(456),
+ Height = Application.GetRealHeight(400),
Radius = (uint)Application.GetRealWidth(12),
BorderColor = 0x00000000,
BorderWidth = 0,
};
- contentView.AddChidren(sensorListView);
+ contentView.AddChidren(sensorListContentView);
+ sensorListView = new FrameLayout();
+ sensorListContentView.AddChidren(sensorListView);
LoadSenesorList();
@@ -280,37 +283,48 @@
name = sensor.name,
sid = sensor.sid,
deviceId = sensor.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = seTemp.state, curValue = seTemp.curValue } },
+ roomIds = sensor.roomIds,
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = seTemp.state, curValue = seTemp.curValue }
+ ,new FunctionAttributes { key = "spk"} }
};
switch (seTemp.key)
{
case "co2":
newTemp.spk = SPK.SensorCO2;
+ newTemp.SetAttrState("spk", "co2");
break;
case "pm25":
newTemp.spk = SPK.SensorPm25;
+ newTemp.SetAttrState("spk", "pm25");
break;
case "humidity":
newTemp.spk = SPK.SensorHumidity;
+ newTemp.SetAttrState("spk", "humidity");
break;
case "temperature":
newTemp.spk = SPK.SensorTemperature;
+ newTemp.SetAttrState("spk", "temperature");
break;
case "tvoc":
newTemp.spk = SPK.SensorTVOC;
+ newTemp.SetAttrState("spk", "tvoc");
break;
}
- LoadSensorDiv(newTemp, index);
- index++;
+
+ if (room.roomId == "" || sensor.roomIds.Contains(room.roomId))
+ {
+ LoadSensorDiv(newTemp, index);
+ index++;
+ }
}
}
else
{
-#if DEBUG
- continue;
-#endif
- LoadSensorDiv(sensor, index);
- index++;
+ if (room.roomId == "" || sensor.roomIds.Contains(room.roomId))
+ {
+ LoadSensorDiv(sensor, index);
+ index++;
+ }
}
new System.Threading.Thread(() =>
@@ -319,16 +333,16 @@
})
{ IsBackground = true }.Start();
}
+ sensorListView.Height = Application.GetRealWidth(124 * (index + 1) / 2);
}
/// <summary>
/// 鍔犺浇浼犳劅鍣ㄥ垪琛�
/// </summary>
- void LoadSensorDiv(Function sensor, int index)
+ void LoadSensorDiv(Function sensor,int index)
{
var levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
var levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
- if (room.roomId == "" || sensor.roomIds.Contains(room.roomId))
{
var sensorTag = sensor.spk + sensor.sid + sensor.deviceId;
FrameLayout sensorView = new FrameLayout()
--
Gitblit v1.8.0