合并xm2021-01-13 wjc2021-02-06

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

 ZigbeeApp/Shared/Common/Device.cs

@@ -1648,6 +1648,12 @@
                    //面板的温度探头叫  面板名字+温度
                    return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.uTemperature);
                }
                else if (deviceInfoType.BeloneType == DeviceBeloneType.A空气质量)
                {

                    //空气质量传感器的温度探头叫空气质量传感器+温度
                    return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
                }
                else if (((TemperatureSensor)device).SensorDiv == 1)
                {
                    //温度传感器
@@ -2334,12 +2340,18 @@
            {
                bool temperatrue = false;
                bool humidity = false;
                bool airQualitySensor = false;
                //获取全部的回路
                var listTemp = this.GetDevicesByMac(listdevice[0].DeviceAddr, false);
                foreach (var device in listTemp)
                {
                    if (device is TemperatureSensor)
                    {
                        //空气质量传感器
                        if (device.isAirQualitySensor(device))
                        {
                            airQualitySensor = true;
                        }
                        //温度传感器
                        if (((TemperatureSensor)device).SensorDiv == 1)
                        {
@@ -2374,6 +2386,15 @@
                    info.ConcreteType = DeviceConcreteType.Sensor_Humidity;
                }
                info.ObjectTypeName = this.dicDeviceModelIdEnum["A411"].A类型名字;//传感器

                //空气质量传感器
                if (airQualitySensor == true)
                {
                    info.ConcreteText = this.dicDeviceModelIdEnum["A422"].A官方名字;
                    info.BeloneType = DeviceBeloneType.A空气质量;
                    info.ConcreteType = DeviceConcreteType.AirQualitySensor;
                    info.ObjectTypeName = this.dicDeviceModelIdEnum["A422"].A类型名字;
                }
            }
            //14新风设备
            else if (dicType.ContainsKey(DeviceType.FreshAir) == true)
@@ -2406,14 +2427,6 @@
                info.BeloneType = DeviceBeloneType.A晾衣架;
                info.ConcreteType = DeviceConcreteType.Airer;
                info.ObjectTypeName = this.dicDeviceModelIdEnum["A421"].A类型名字;
            }
            //18空气质量传感器
            else if (dicType.ContainsKey(DeviceType.AirQualitySensor) == true)
            {
                info.ConcreteText = this.dicDeviceModelIdEnum["A422"].A官方名字;
                info.BeloneType = DeviceBeloneType.A空气质量;
                info.ConcreteType = DeviceConcreteType.AirQualitySensor;
                info.ObjectTypeName = this.dicDeviceModelIdEnum["A422"].A类型名字;
            }

            //设备所属类型的翻译名字