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

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

@@ -214,6 +214,9 @@
                    newRoom.Temperatrue = 0;

                }



                //添加房间,主页需要重新刷新

                UserView.UserPage.Instance.RefreshAllForm = true;



                HdlRoomLogic.Current.AddRoom(newRoom);

                this.FinishEditorEvent?.Invoke();



@@ -272,6 +275,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);

                }

@@ -382,6 +390,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>() { newRoom.HumidityDevice };

            var form = new SelectDeviceForm();

@@ -437,7 +455,8 @@
                    {

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            if (data.AttriButeData == 0)

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

                            if (humidity == 0)

                            {

                                //0

                                btnHumi.Text = "0.0%";

@@ -445,11 +464,8 @@
                            }

                            else

                            {

                                //小数点需要一位(湿度没有负数)

                                string strValue = data.AttriButeData.ToString();

                                strValue = strValue.Substring(0, strValue.Length - 1);

                                //记录湿度

                                this.newRoom.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

                                this.newRoom.Humidity = humidity;

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

                            }

                        });

@@ -457,7 +473,7 @@
                }

            });

            //发送获取湿度的命令

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

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

        }



        #endregion