合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -452,8 +452,7 @@
                       && data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)

                    {

                        //处理网关返回的温度值

                        decimal temperatrue = 0;

                        this.AdjustTemperatrueValue(data.AttributeData, ref temperatrue);

                        decimal temperatrue = Common.LocalDevice.Current.AdjustTemperatrueValue(data.AttributeData);



                        device.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.SetField, null, device, new object[] { temperatrue });

                        device.ReSave();

@@ -471,37 +470,6 @@
                    }

                }

            });

        }



        /// <summary>

        /// 处理网关返回的温度值

        /// </summary>

        /// <param name="value">网关返回的属性值</param>

        /// <param name="temperatrue">转换成的温度值</param>

        private void AdjustTemperatrueValue(int value, ref decimal temperatrue)

        {

            if (value == 0)

            {

                //0℃

                temperatrue = 0;

            }

            else if (value > 32767)

            {

                //负数(特殊处理)

                string strValue = (value - 65536).ToString();

                //小数点需要一位

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

                //记录温度

                temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

            }

            else

            {

                //小数点需要一位

                string strValue = value.ToString();

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

                //记录温度

                temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

            }

        }



        #endregion

@@ -619,8 +587,7 @@
                       && data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)

                    {

                        //处理网关返回的湿度值

                        decimal humidity = 0;

                        this.AdjustHumidityValue(data.AttributeData, ref humidity);

                        decimal humidity = Common.LocalDevice.Current.AdjustHumidityValue(data.AttributeData);



                        device.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.SetField, null, device, new object[] { humidity });

                        device.ReSave();

@@ -638,30 +605,6 @@
                    }

                }

            });

        }



        /// <summary>

        /// 处理网关返回的湿度值

        /// </summary>

        /// <param name="value">网关返回的属性值</param>

        /// <param name="temperatrue">转换成的湿度值</param>

        /// <param name="valueText">转换成的湿度值的翻译文本</param>

        private void AdjustHumidityValue(int value, ref decimal humidity)

        {

            if (value == 0)

            {

                //0%

                humidity = 0;

            }

            //不会出现负数

            else

            {

                //小数点需要一位

                string strValue = value.ToString();

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

                //记录温度

                humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

            }

        }



        #endregion