From 849d8656a8ec66bf3472ddabdc541f98cd0f3e09 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 19:47:42 +0800
Subject: [PATCH] 2020-12-17 1.信息中心增加换行显示。2.收到报警推送类型的通知才弹窗。
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 936f7d8..659d396 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -284,7 +284,7 @@
bodyView.AddChidren(contentView);
#region 鎴块棿椤堕儴鍒囨崲鏄剧ず鍖哄煙
- room = new Room() { roomName = Language.StringByID(StringId.All), uid = ""};
+ room = new Room() { roomName = Language.StringByID(StringId.All)};
//if (DB_ResidenceData.rooms.Count > 0)
//{
// room = DB_ResidenceData.rooms[0];
@@ -353,7 +353,7 @@
{
sensorListView.RemoveAll();
int index = 0;
- foreach (var sensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
+ foreach (var sensor in FunctionList.List.sensorsEnvironmentalScience)
{
LoadSensorDiv(sensor, index);
index++;
@@ -365,12 +365,12 @@
/// </summary>
void LoadSensorDiv(Sensor sensor,int index)
{
- if (room.uid == "" || sensor.roomIds.Contains(room.uid))
+ if (room.roomId == "" || sensor.roomIds.Contains(room.roomId))
{
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;
}
FrameLayout sensorView = new FrameLayout()
{
@@ -657,10 +657,10 @@
};
dispalyView.AddChidren(contentView);
- if (DB_ResidenceData.residenceData.Rooms.Count < 2)
+ if (SpatialInfo.CurrentSpatial.RoomList.Count < 2)
{
}
- else if (DB_ResidenceData.residenceData.Rooms.Count < 3)
+ else if (SpatialInfo.CurrentSpatial.RoomList.Count < 3)
{
dispalyView = new FrameLayout()
{
@@ -675,7 +675,7 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (DB_ResidenceData.residenceData.Rooms.Count < 4)
+ else if (SpatialInfo.CurrentSpatial.RoomList.Count < 4)
{
dispalyView = new FrameLayout()
{
@@ -709,8 +709,8 @@
var showListRoom = new List<Room>();
- showListRoom.Add(new Room() { roomName = Language.StringByID(StringId.All),uid = "" });
- showListRoom.AddRange(DB_ResidenceData.residenceData.Rooms);
+ showListRoom.Add(new Room() { roomName = Language.StringByID(StringId.All) });
+ showListRoom.AddRange(SpatialInfo.CurrentSpatial.RoomList);
foreach (var roomTemp in showListRoom)
{
--
Gitblit v1.8.0