Merge branch 'CJL' into NewFilePath

wxr

2020-12-16 f5a49299caaf1fdca7503ae682da13c6fda887c6

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs

@@ -284,7 +284,7 @@
            bodyView.AddChidren(contentView);

            #region 房间顶部切换显示区域
            room = new Room() { name = Language.StringByID(StringId.All), sid = ""};
            room = new Room() { roomName = Language.StringByID(StringId.All)};
            //if (DB_ResidenceData.rooms.Count > 0)
            //{
            //    room = DB_ResidenceData.rooms[0];
@@ -308,7 +308,7 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextAlignment = TextAlignment.CenterLeft,
                Text = room.name,
                Text = room.roomName,
            };
            contentView.AddChidren(btnRoom);

@@ -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.sid == "" ||  sensor.roomIdList.Contains(room.sid))
            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.rooms.Count < 2)
                if (SpatialInfo.CurrentSpatial.RoomList.Count < 2)
                {
                }
                else if (DB_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.rooms.Count < 4)
                else if (SpatialInfo.CurrentSpatial.RoomList.Count < 4)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -709,12 +709,12 @@


                var showListRoom = new List<Room>();
                showListRoom.Add(new Room() { name = Language.StringByID(StringId.All),sid = "" });
                showListRoom.AddRange(DB_ResidenceData.rooms);
                showListRoom.Add(new Room() { roomName = Language.StringByID(StringId.All) });
                showListRoom.AddRange(SpatialInfo.CurrentSpatial.RoomList);

                foreach (var roomTemp in showListRoom) 
                {
                    string roomName = roomTemp.name;
                    string roomName = roomTemp.roomName;
                    var btnRoomName = new Button()
                    {
                        Gravity = Gravity.CenterHorizontal,