请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 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,6 +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();

@@ -515,7 +530,8 @@
                var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);

                HdlThreadLogic.Current.RunMain(() =>

                {

                    if (((ZigBee.Device.TemperatureSensor)localDevice).Humidity == 0)

                    decimal humidity = (decimal)localDevice.GetType().InvokeMember("Humidity", System.Reflection.BindingFlags.GetField, null, localDevice, null);

                    if (humidity == 0)

                    {

                        //0

                        btnHumi.Text = "0.0%";

@@ -524,13 +540,13 @@
                    else

                    {

                        //记录湿度

                        this.cloneRoom.Humidity = ((ZigBee.Device.TemperatureSensor)localDevice).Humidity;

                        this.cloneRoom.Humidity = humidity;

                        btnHumi.Text = this.cloneRoom.Humidity.ToString() + "%";

                    }

                }, ShowErrorMode.NO);

            });

            //发送获取湿度的命令

            ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();

            device.GetType().InvokeMember("ReadTemperatureOrHumidity", System.Reflection.BindingFlags.InvokeMethod, null, device, null);

        }



        #endregion