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

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

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

@@ -424,41 +424,22 @@
                {

                    return;

                }



                foreach (var data in report.DeviceStatusReport.AttriBute)

                {

                    if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)

                    {

                var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            if (data.AttriButeData == 0)

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

                            {

                                //0℃

                                btnTemper.Text = "0.0℃";

                                this.cloneRoom.Temperatrue = 0;

                            }

                            else if (data.AttriButeData > 32767)

                            {

                                //负数(特殊处理)

                                string strValue = (data.AttriButeData - 65536).ToString();

                                //小数点需要一位

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

                                //记录温度

                                this.cloneRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

                                btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "℃";

                            }

                            else

                            {

                                //小数点需要一位

                                string strValue = data.AttriButeData.ToString();

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

                                //记录温度

                                this.cloneRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

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

                                btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "℃";

                            }

                        });

                    }

                }

                }, ShowErrorMode.NO);

            }));

            //发送获取温度的命令

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

@@ -531,13 +512,10 @@
                {

                    return;

                }

                foreach (var data in report.DeviceStatusReport.AttriBute)

                {

                    if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)

                    {

                var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            if (data.AttriButeData == 0)

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

                            {

                                //0

                                btnHumi.Text = "0.0%";

@@ -545,16 +523,11 @@
                            }

                            else

                            {

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

                                string strValue = data.AttriButeData.ToString();

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

                                //记录湿度

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

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

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

                            }

                        });

                    }

                }

                }, ShowErrorMode.NO);

            });

            //发送获取湿度的命令

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