数据结构优化修改

wei

2021-03-08 37c315988c2dc11e4f477233f7a9f87d57bb61aa

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

@@ -21,9 +21,10 @@

        MyEchartsViewOn myEchartsView;

        Sensor sensor;
        Sensor sensorTemp = new Sensor();

        List<Sensor> showSensors;
        Function function;
        List<Function> showFunctions;
        /// <summary>
        /// 当前查询类型
        /// </summary>
@@ -39,12 +40,12 @@
            "#80AEFF","#FFD154","#FF9D54","#FE6A6A","#B183C3","#ADE764",
        };

        public EnvironmentalSensorPage(Sensor ss)
        public EnvironmentalSensorPage(Function ss)
        {
            bodyView = this;
            sensor = ss;
            showSensors = new List<Sensor>();
            showSensors.Add(ss);
            function = ss;
            showFunctions = new List<Function>();
            showFunctions.Add(ss);
        }

        public void LoadPage()
@@ -163,7 +164,7 @@
            };
            diagramView.AddChidren(tipTextView);

            switch (sensor.spk)
            switch (function.spk)
            {
                case SPK.SensorPm25:
                    tipValuesView.AddChidren(new Button()
@@ -552,7 +553,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.TextFontSize,
                Text = sensor.name,
                Text = function.name,
                IsBold = true,
            };
            selfInfoView.AddChidren(btnSeltSensorName);
@@ -566,7 +567,7 @@
                TextColor = CSS_Color.PromptingColor1,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Text = sensor.GetRoomListName()
                Text = function.GetRoomListName()
            };
            selfInfoView.AddChidren(btnFromFoorAndRoom);

@@ -628,9 +629,9 @@
            {
                Action backAction = () =>
                {
                    btnSeltSensorName.Text = sensor.name;
                    btnSeltSensorName.Text = function.name;
                };
                var infoView = new FunctionBaseInfoSetPage(sensor, backAction);
                var infoView = new FunctionBaseInfoSetPage(function, backAction);
                MainPage.BasePageView.AddChidren(infoView);
                infoView.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -642,13 +643,13 @@

            bool initTitleButton = true;

            foreach (var tempSensor in FunctionList.List.sensorsEnvironmentalScience)
            foreach (var tempSensor in FunctionList.List.GetEnvirSensorsList())
            {
                if (tempSensor.sid == sensor.sid)
                if (tempSensor.sid == function.sid)
                {
                    continue;
                }
                if (tempSensor.spk != sensor.spk)
                if (tempSensor.spk != function.spk)
                {
                    continue;
                }
@@ -705,7 +706,7 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.TextFontSize,
                    Text = sensor.name,
                    Text = function.name,
                    IsBold = true,
                };
                otherInfoView.AddChidren(btnSensorName);
@@ -772,16 +773,16 @@
                    btnShowData1.IsSelected = !btnShowData1.IsSelected;
                    if (btnShowData1.IsSelected)
                    {
                        if (!showSensors.Contains(sensor))
                        if (!showFunctions.Contains(function))
                        {
                            showSensors.Add(sensor);
                            showFunctions.Add(function);
                        }
                    }
                    else
                    {
                        if (showSensors.Contains(sensor))
                        if (showFunctions.Contains(function))
                        {
                            showSensors.Remove(sensor);
                            showFunctions.Remove(function);
                        }
                    }
                    LoadMothed_GetSensorHistoryData();
@@ -790,7 +791,7 @@

            }
            #endregion
            new TopViewDiv(bodyView, Language.StringByID(sensor.functionTypeNameId)).LoadTopView();
            new TopViewDiv(bodyView, Language.StringByID(sensorTemp.GetFunctionTypeNameId(function.spk))).LoadTopView();

            LoadMothed_GetSensorHistoryData();
            LoadEvent_ChangeSensorHistoryShowType();
@@ -824,13 +825,13 @@
                    });
                    int i = 0;
      
                    foreach (var sr in FunctionList.List.sensorsEnvironmentalScience)
                    foreach (var sr in FunctionList.List.GetEnvirSensorsList())
                    {
                        if (sr.spk != sensor.spk)
                        if (sr.spk != function.spk)
                        {
                            continue;
                        }
                        if (showSensors.Find((obj) => obj.sid == sr.sid) == null)
                        if (showFunctions.Find((obj) => obj.sid == sr.sid) == null)
                        {
                            i++;
                            continue;