From d616b67bd6ea95562af73a00bf0aab38eec935df Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 13:37:26 +0800
Subject: [PATCH] 2020-12-11 1.取消屏幕常亮。2.优化iOS接收推送处理。
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 936f7d8..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)
@@ -709,7 +709,7 @@
var showListRoom = new List<Room>();
- showListRoom.Add(new Room() { roomName = Language.StringByID(StringId.All),uid = "" });
+ showListRoom.Add(new Room() { roomName = Language.StringByID(StringId.All) });
showListRoom.AddRange(DB_ResidenceData.residenceData.Rooms);
foreach (var roomTemp in showListRoom)
--
Gitblit v1.8.0