Merge branch 'Dev-Branch' into wjc

wjc

2023-03-30 cae4d4b5b508a666fbd0dff3c2a981fdff841bc8

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

@@ -69,7 +69,7 @@
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(600),
                ScrollEnabled = false
                ScrollEnabled = sensorList.Count > 6
            };
            bodyView.AddChidren(contentView);

@@ -657,9 +657,13 @@
            bool initTitleButton = true;

            int index = 1;
            try
            {
                new System.Threading.Thread(() =>
                {
            foreach (var tempSensor in sensorList)
            {
                if(index > 6)
                        if (index >= 6)
                {
                    break;
                }
@@ -671,8 +675,9 @@
                {
                    continue;
                }
                contentView.ScrollEnabled = true;

                        Application.RunOnMainThread(() =>
                        {
                if (initTitleButton)
                {
                    Button btnOthreTitle = new Button()
@@ -791,7 +796,8 @@
                    SelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIconOn.png",
                };
                otherInfoView.AddChidren(btnShowData1);
                btnShowData1.MouseUpEventHandler = (sender, e) => {
                            btnShowData1.MouseUpEventHandler = (sender, e) =>
                            {
                    btnShowData1.IsSelected = !btnShowData1.IsSelected;
                    if (btnShowData1.IsSelected)
                    {
@@ -815,7 +821,14 @@
                {
                    Height = Application.GetRealHeight(12),
                });

                        });
                        System.Threading.Thread.Sleep(50);
                    }
                }).Start();
            }
            catch(Exception ex)
            {
                MainPage.Log($"加载传感器异常xx:{ex.Message}");
            }
            #endregion
            new TopViewDiv(bodyView, Language.StringByID(sensorTemp.GetFunctionTypeNameId(function.spk))).LoadTopView();