修改引用路径

chenqiyang

2022-06-22 dc0309e64f02227d8e1468b7326c07955f804612

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

@@ -97,7 +97,7 @@
                {
                    return Language.StringByID(R.MyInternationalizationString.Close);
                }
                return $"{(int)((device as DimmableLight).Level * 1.0 / 254 * 100)}%";
                return HdlDeviceCommonLogic.Current.CalculateLightLevelPersent((device as DimmableLight).Level) + "%";
            }
            else if (device.Type == DeviceType.ColorTemperatureLight)
            {
@@ -110,7 +110,7 @@
                {
                    return Language.StringByID(R.MyInternationalizationString.Close);
                }
                return $"{(int)((device as ColorTemperatureLight).Level * 1.0 / 254 * 100)}%";
                return HdlDeviceCommonLogic.Current.CalculateLightLevelPersent((device as ColorTemperatureLight).Level) + "%";
            }
            else if (device.Type == DeviceType.WindowCoveringDevice)
            {
@@ -171,23 +171,23 @@
                }
                else if (pMSensor.currentPmData <= 75 && pMSensor.currentPmData > 35)
                {
                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
                    curQuality = Language.StringByID(R.MyInternationalizationString.GoodAirQuality);
                }
                else if (pMSensor.currentPmData <= 115 && pMSensor.currentPmData > 75)
                {
                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
                    curQuality = Language.StringByID(R.MyInternationalizationString.LightPollution);
                }
                else if (pMSensor.currentPmData <= 150 && pMSensor.currentPmData > 115)
                {
                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
                    curQuality = Language.StringByID(R.MyInternationalizationString.Moderatelyolluted);
                }
                else if (pMSensor.currentPmData <= 250 && pMSensor.currentPmData > 150)
                {
                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
                    curQuality = Language.StringByID(R.MyInternationalizationString.HeavyPollution);
                }
                else if (pMSensor.currentPmData > 250)
                {
                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
                    curQuality = Language.StringByID(R.MyInternationalizationString.SeriousPollution);
                }
                else
                {
@@ -392,23 +392,69 @@
            else if (device.Type == DeviceType.TemperatureSensor)
            {
                var tempera = device as TemperatureSensor;
                if (tempera.SensorDiv == 1)

                //空气质量传感器 
                //获取设备类型
                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
                //空气质量传感器
                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
                {
                    if (tempera.currentTemperature == 0)
                    //空气质量
                    string curQuality = "";
                    //温度
                    string temperature = string.Empty;
                    //湿度
                    string humidity = string.Empty;
                    //PM2.5
                    string pm = string.Empty;
                    //CO2
                    string co2 = string.Empty;

                    var tempAirQuality = tempera.AirQuality(tempera);

                    if (tempAirQuality == 1)
                    {
                        return "0.0℃";
                        curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
                    }
                    return $"{tempera.currentTemperature}℃";
                    else if (tempAirQuality == 2)
                    {
                        curQuality = Language.StringByID(R.MyInternationalizationString.GoodAirQuality);
                    }
                    else if (tempAirQuality == 3)
                    {
                        curQuality = Language.StringByID(R.MyInternationalizationString.Pollution);
                    }
                    else
                    {
                        curQuality = "";
                    }

                    humidity = $"{tempera.currentHumidity}%";
                    temperature = $"{tempera.currentTemperature}℃";
                    pm = $"{tempera.currentPmData}μg/m³";
                    //co2 = $"{tempera.currentCO2}ppm";
                    return $"{curQuality},{pm},{temperature},{humidity}";
                }
                else if (tempera.SensorDiv == 2)
                else
                {
                    if (tempera.currentHumidity == 0)
                    if (tempera.SensorDiv == 1)
                    {
                        return "--%";
                        if (tempera.currentTemperature == 0)
                        {
                            return "0.0℃";
                        }
                        return $"{tempera.currentTemperature}℃";
                    }
                    return $"{tempera.currentHumidity}%";
                    else if (tempera.SensorDiv == 2)
                    {
                        if (tempera.currentHumidity == 0)
                        {
                            return "--%";
                        }
                        return $"{tempera.currentHumidity}%";
                    }
                    return null;
                }
                return null;
            }
            else
            {