pm2.5单位修改

wxr

2023-04-21 d3c48684c8c4e0467fdf0c7a2193c9c02f122ef8

pm2.5单位修改

 HDL-ON_Android/Resources/Resource.designer.cs

@@ -14,7 +14,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.8.165")]
    public partial class Resource
    {
        

 HDL-ON_iOS/Info.plist

@@ -11,7 +11,7 @@
    <key>CFBundleName</key>
    <string>On Pro</string>
    <key>CFBundleShortVersionString</key>
    <string>1.6.602303301</string>
    <string>1.7.1</string>
    <key>CFBundleURLTypes</key>
    <array>
        <dict>
@@ -36,7 +36,7 @@
        </dict>
    </array>
    <key>CFBundleVersion</key>
    <string>1.6.603301</string>
    <string>1.7.1</string>
    <key>LSApplicationQueriesSchemes</key>
    <array>
        <string>weixinULAPI</string>

 HDL_ON/Entity/Function/Sensor.cs

@@ -159,7 +159,7 @@
            switch (function.spk)
            {
                case SPK.SensorPm25:
                    unit = "ug/m²";
                    unit = "ug/m³";
                    break;
                case SPK.SensorTemperature:
                    unit = "°C";

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -1092,7 +1092,7 @@
                //        new AttrKeyConfig (){
                //            key = "pm2.5",
                //            type = "interval" ,
                //            unit = "ug/m²",
                //            unit = "ug/m³",
                //            configs = new List<AttrKeyInfo>(){
                //               new AttrKeyInfo(){ start = "0",end = "75",color = "0xFFADE764", desc = "良好"},
                //               new AttrKeyInfo(){ start = "76",end = "150",color = "0xFFFFD154",desc = "轻/中度污染"},

 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs

@@ -605,17 +605,12 @@
                                }
                                if (groupControlLightList.Count == functions.Count)
                                {
                                    if (!btnChooseAll.IsSelected)
                                    {
                                        btnChooseAll.IsSelected = true;
                                    }
                                    btnChooseAll.TextID = StringId.SelectedAll;
                                }
                                else
                                {
                                    if (btnChooseAll.IsSelected)
                                    {
                                        btnChooseAll.IsSelected = false;
                                    }
                                    if(btnChooseAll.TextID != StringId.Cancel)
                                        btnChooseAll.TextID = StringId.Cancel;
                                }
                            };
                            if (groupControl.sids.Find((obj) => obj.sid == function.sid) != null)

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs

@@ -892,7 +892,7 @@
            switch (sensorSPK)
            {
                case SPK.SensorPm25:
                    btnTitle.Text = "PM2.5(ug/m²)";
                    btnTitle.Text = "PM2.5(ug/m³)";
                    break;
                case SPK.SensorTemperature:
                    btnTitle.Text = Language.StringByID(StringId.Temp) + "(°C)";

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs

@@ -557,7 +557,7 @@
            switch (sensor.spk)
            {
                case SPK.SensorPm25:
                    btnTitle.Text = "PM2.5(ug/m²)";
                    btnTitle.Text = "PM2.5(ug/m³)";//²
                    break;
                case SPK.SensorTemperature:
                    btnTitle.Text = Language.StringByID(StringId.Temp) + "(°C)";

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs

@@ -152,7 +152,7 @@
//                Text = "10°C",
//            };
//            topWeatherView.AddChidren(btnTempUpperLimitText);
            

//            var btnTempLowerLimit = new Button()
//            {
//                X = btnTempUpperLimitText.Right,
@@ -295,7 +295,7 @@
//                UnSelectedImagePath = "Public/DownIcon.png",
//            };
//            contentView.AddChidren(btnFoorDownIcon);
            

//            btnRoom = new Button()
//            {
//                X = btnFoorDownIcon.Right,
@@ -514,7 +514,7 @@
//            switch (sensor.spk)
//            {
//                case SPK.SensorPm25:
//                    btnTitle.Text = "PM2.5(ug/m²)";
//                    btnTitle.Text = "PM2.5(ug/m³)";
//                    break;
//                case SPK.SensorTemperature:
//                    btnTitle.Text = Language.StringByID(StringId.Temp) + "(°C)";