20210303-1

wei

2021-03-03 d4811b7d34b45ff6b21b97f11da128b5572ec526

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

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

            #region 房间顶部切换显示区域
            room = new Room() { roomName = Language.StringByID(StringId.All), uid = ""};
            //if (DB_ResidenceData.rooms.Count > 0)
            //{
            //    room = DB_ResidenceData.rooms[0];
            //}
            room = new Room() { roomName = Language.StringByID(StringId.All)};
            btnFoorDownIcon = new Button()
            {
                Width = Application.GetMinRealAverage(16),
@@ -353,7 +349,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,13 +361,9 @@
        /// </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)
                {
                    sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus_Data.SubnetID + "_" + sensor.bus_Data.DeviceID + "_" + sensor.bus_Data.loopId;
                }
                FrameLayout sensorView = new FrameLayout()
                {
                    Width = Application.GetRealWidth(148),
@@ -422,10 +414,12 @@
                };
                sensorView.AddChidren(btnSensorTitle);
                btnSensorTitle.MouseUpEventHandler = (sender, e) => {
                    #region 
                    var esp = new EnvironmentalSensorPage(sensor);
                    MainPage.BasePageView.AddChidren(esp);
                    esp.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    #endregion
                };

                var btnInfoIcon = new Button()
@@ -512,21 +506,21 @@
            };
            infoView.AddChidren(btnTitle);

            switch (sensor.functionType)
            switch (sensor.spk)
            {
                case FunctionType.PM25:
                case SPK.SensorPm25:
                    btnTitle.Text = "PM2.5(ug/m²)";
                    break;
                case FunctionType.Temp:
                case SPK.SensorTemperature:
                    btnTitle.Text = Language.StringByID(StringId.Temp) + "(°C)";
                    break;
                case FunctionType.TVOC:
                case SPK.SensorTVOC:
                    btnTitle.Text = "TVOC(PPM)";
                    break;
                case FunctionType.CO2:
                case SPK.SensorCO2:
                    btnTitle.Text = "CO2(PPM)";
                    break;
                case FunctionType.Humidity:
                case SPK.SensorHumidity:
                    btnTitle.Text = Language.StringByID(StringId.Humidity) + "(%)";
                    break;
            }
@@ -657,10 +651,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 +669,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 +703,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) 
                {