合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -282,7 +282,7 @@
            btnTemper.Text = Language.StringByID(R.MyInternationalizationString.uGetting);



            HdlGatewayReceiveLogic.Current.RemoveEvent("TemperatrueDevice");

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A设备属性上报, (Action<ZigBee.Device.CommonDevice>)((report) =>

            HdlGatewayReceiveLogic.Current.AddAttributeEvent("TemperatrueDevice", ReceiveComandDiv.A设备属性上报, ((report) =>

            {

                string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(report);

                if (newRoom.TemperatrueDevice != mainKeys || btnTemper == null)

@@ -295,6 +295,8 @@
                foreach (var data in report.DeviceStatusReport.AttriBute)

                {

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

                    {

                        HdlThreadLogic.Current.RunMain(() =>

                    {

                        if (data.AttriButeData == 0)

                        {

@@ -316,6 +318,7 @@
                            strValue = strValue.Substring(0, strValue.Length - 1);

                            btnTemper.Text = strValue.Insert(strValue.Length - 1, ".") + "℃";

                        }

                        });

                    }

                }

            }));

@@ -388,6 +391,8 @@
                {

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

                    {

                        HdlThreadLogic.Current.RunMain(() =>

                        {

                        if (data.AttriButeData == 0)

                        {

                            //0

@@ -400,6 +405,7 @@
                            strValue = strValue.Substring(0, strValue.Length - 1);

                            btnHumi.Text = strValue.Insert(strValue.Length - 1, ".") + "%";

                        }

                        });

                    }

                }

            });