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

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs

@@ -237,11 +237,17 @@
                strType = Language.StringByID(R.MyInternationalizationString.AirerFun);
                nowSelectNo = -1;
            }
            else if (this.device.Type == DeviceType.PMSensor)
            else if (device.Type == DeviceType.TemperatureSensor)
            {
                //空气质量传感器 环境  
                strType = Language.StringByID(R.MyInternationalizationString.Envoronment);
                nowSelectNo = -1;
                //获取设备类型
                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                //空气质量传感器
                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
                {
                    //空气质量传感器 环境  
                    strType = Language.StringByID(R.MyInternationalizationString.Envoronment);
                    nowSelectNo = -1;
                }
            }

            //显示文本
@@ -274,6 +280,18 @@
            {
                return true;
            }
            //空气质量传感器
            if (this.device.Type == DeviceType.TemperatureSensor)
            {
                //获取设备类型
                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                //空气质量传感器
                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
                {
                    return true;
                }
            }

            return false;
        }