From d60b92c58ac09197642eb6dac9b905f0898dacb8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 十二月 2020 15:42:13 +0800
Subject: [PATCH] Merge branch 'CJL-NEW'
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 929435a..b56b37f 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];
@@ -365,7 +365,7 @@
/// </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)
@@ -657,10 +657,10 @@
};
dispalyView.AddChidren(contentView);
- if (DB_ResidenceData.Rooms.Count < 2)
+ if (DB_ResidenceData.residenceData.Rooms.Count < 2)
{
}
- else if (DB_ResidenceData.Rooms.Count < 3)
+ else if (DB_ResidenceData.residenceData.Rooms.Count < 3)
{
dispalyView = new FrameLayout()
{
@@ -675,7 +675,7 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (DB_ResidenceData.Rooms.Count < 4)
+ else if (DB_ResidenceData.residenceData.Rooms.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.Rooms);
+ showListRoom.Add(new Room() { roomName = Language.StringByID(StringId.All) });
+ showListRoom.AddRange(DB_ResidenceData.residenceData.Rooms);
foreach (var roomTemp in showListRoom)
{
--
Gitblit v1.8.0