20201209

wei

2020-12-09 16deafb8aca7709877907ba938ea31407f6d2834

 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)