Merge branch 'Dev-Branch' into wjc

wjc

2023-03-30 cae4d4b5b508a666fbd0dff3c2a981fdff841bc8

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

@@ -495,6 +495,7 @@
            List<uint> levelColorList = new List<uint>();
            List<int> levelTextList = new List<int>();
            List<string> levelText = new List<string>();
            List<string> intervalList = new List<string>();
            var configs = sensor.GetAttrKeyConfigs(sensor.SpkClassification);


@@ -514,6 +515,8 @@
            {
                levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
                levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
                intervalList = sensorTemp.GetIntervalValue(sensor.spk);

                foreach(var iii in levelTextList)
                {
                    levelText.Add(Language.StringByID(iii));
@@ -611,8 +614,14 @@
                IsBold = true,
                TextID = StringId.ColorValue,
            });
            try
            {
            for (int index = 0; index < levelText.Count; index++)
            {
                    //if(sensorTemp.GetIntervalValue(sensor.spk).Count >= index)
                    //{
                    //    return;
                    //}
                infoView.AddChidren(new Button()
                {
                    Gravity = Gravity.CenterHorizontal,
@@ -659,7 +668,11 @@
                    BackgroundColor = levelColorList[index]
                });
            }

            }
            catch (Exception ex)
            {
                MainPage.Log($"环境等级信息表加载异常:{ex.Message}");
            }