hhhhhhhhh

黄学彪

2020-05-15 3f87bf0ae7394cdd7d52428f1f6b4361434c7cc4

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs

@@ -425,24 +425,51 @@
                        //温度

                        if (attData.AttributeId == (int)AttriButeId.MeasuredValue)

                        {

                            if (attData.AttriButeData == 0)

                            decimal temperatrue = 0;

                            string receiptData = string.Empty;

                            //两个两个位置替换

                            for (int i = attData.AttriButeDataHex.Length - 1; i >= 0; i = i - 2)

                            {

                                ((TemperatureSensor)locadevice).Temperatrue = 0;

                                receiptData += attData.AttriButeDataHex[i - 1].ToString() + attData.AttriButeDataHex[i].ToString();

                            }

                            else if (attData.AttriButeData > 32767)

                            {

                                //负数(特殊处理)

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

                                //小数点需要一位

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

                                ((TemperatureSensor)locadevice).Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

                            }

                            else

                            //有符号(会出现负数)

                            if (attData.AttriButeDataType == 40 || attData.AttriButeDataType == 41)

                            {

                                //小数点需要一位

                                string strValue = attData.AttriButeData.ToString();

                                string strValue = Convert.ToInt16(receiptData, 16).ToString();

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

                                ((TemperatureSensor)locadevice).Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

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

                            }

                            //无符号(不会出现负数)

                            else if (attData.AttriButeDataType == 32 || attData.AttriButeDataType == 33)

                            {

                                ushort shortData = Convert.ToUInt16(receiptData, 16);

                                if (shortData > 32767)

                                {

                                    //负数(特殊处理)

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

                                    //小数点需要一位

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

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

                                }

                                else

                                {

                                    //小数点需要一位

                                    string strValue = shortData.ToString();

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

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

                                }

                            }



                            //温度传感器

                            if (locadevice is TemperatureSensor)

                            {

                                ((TemperatureSensor)locadevice).Temperatrue = temperatrue;

                            }

                            //PM2.5传感器

                            else if (locadevice is PMSensor)

                            {

                                ((PMSensor)locadevice).currentTemperature = (int)temperatrue;

                            }

                            //已经接收到状态

                            locadevice.HadReadDeviceStatu = true;

@@ -460,16 +487,38 @@
                        //湿度

                        if (attData.AttributeId == (int)AttriButeId.MeasuredValue)

                        {

                            if (attData.AttriButeData == 0)

                            decimal humidity = 0;

                            string receiptData = string.Empty;

                            //两个两个位置替换

                            for (int i = attData.AttriButeDataHex.Length - 1; i >= 0; i = i - 2)

                            {

                                ((TemperatureSensor)locadevice).Humidity = 0;

                                receiptData += attData.AttriButeDataHex[i - 1].ToString() + attData.AttriButeDataHex[i].ToString();

                            }

                            else

                            //有符号(会出现负数)

                            if (attData.AttriButeDataType == 40 || attData.AttriButeDataType == 41)

                            {

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

                                string strValue = attData.AttriButeData.ToString();

                                //小数点需要一位

                                string strValue = Convert.ToInt16(receiptData, 16).ToString();

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

                                ((TemperatureSensor)locadevice).Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));

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

                            }

                            //无符号(不会出现负数)

                            else if (attData.AttriButeDataType == 32 || attData.AttriButeDataType == 33)

                            {

                                //小数点需要一位 湿度不会出现负数

                                string strValue = Convert.ToUInt16(receiptData, 16).ToString();

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

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

                            }

                            //温度传感器

                            if (locadevice is TemperatureSensor)

                            {

                                ((TemperatureSensor)locadevice).Humidity = humidity;

                            }

                            //PM2.5传感器

                            else if (locadevice is PMSensor)

                            {

                                ((PMSensor)locadevice).currentHumidity = (int)humidity;

                            }

                        }

                        //已经接收到状态

@@ -548,7 +597,7 @@
                        {

                            //温居城的要网关中是否有逻辑存在 

                            //参数:2-常开自动化;3-失效时间自动化

                            var result = await Shared.Phone.Device.Logic.SkipView.Exist(2);

                            var result = await Shared.Phone.Device.Logic.SkipView.Exist(3, (ZigBee.Device.DoorLock)device);

                            HdlThreadLogic.Current.RunMain(() =>

                            {

                                //弹出徐梅的那个窗口