Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

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

@@ -713,7 +713,7 @@
            sensorSPK = showList[0].spk;
            foreach (var s in showList)
            {
                assembleValues += Convert.ToDouble(s.GetAttrState("value"));
                assembleValues += Convert.ToDouble(s.GetAttrState("value").Replace(",", "."));
            }


@@ -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)";
@@ -1011,7 +1011,7 @@
            assembleValues = 0;
            foreach (var s in sensorList)
            {
                assembleValues += Convert.ToDouble(s.GetAttrState("value"));
                assembleValues += Convert.ToDouble(s.GetAttrState("value").Replace(",", "."));
            }
        }