Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs

@@ -306,16 +306,16 @@
                if (changedFloor == false)

                {

                    //刷新左滑的房间列表界面的指定房间的信息

                    MainPage.ListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);

                    MainPage.LeftListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);

                }

                else

                {

                    //刷新左滑的房间列表界面的房间列表信息

                    MainPage.ListRoomViewFrom.Instance.RefreshListRoom();

                    MainPage.LeftListRoomViewFrom.Instance.RefreshListRoom();

                }



                //算了,这里如果按下保存,则主页需要重新刷新

                UserView.UserPage.Instance.RefreshForm = true;

                UserView.UserPage.Instance.RefreshAllForm = true;



                this.CloseForm();

            };

@@ -372,6 +372,11 @@
            {

                //获取温度传感器

                if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)

                {

                    listDevice.Add(device);

                }

                //PM2.5是温度和湿度合在同一个端点

                else if (device.Type == ZigBee.Device.DeviceType.PMSensor)

                {

                    listDevice.Add(device);

                }

@@ -463,10 +468,16 @@
                {

                    listDevice.Add(device);

                }

                //新风

                else if (device.Type == ZigBee.Device.DeviceType.FreshAirHumiditySensor)

                {

                    listDevice.Add(device);

                }

                //PM2.5是温度和湿度合在同一个端点

                else if (device.Type == ZigBee.Device.DeviceType.PMSensor)

                {

                    listDevice.Add(device);

                }

            }

            var listSelect = new List<string>() { cloneRoom.HumidityDevice };

            var form = new SelectDeviceForm();