2021-12-01-01

xm

2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f

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

@@ -26,6 +26,7 @@

        Function function;
        List<Function> showFunctions;
        List<Function> sensorList;
        /// <summary>
        /// 当前查询类型
        /// </summary>
@@ -45,6 +46,17 @@
        {
            bodyView = this;
            function = ss;
            showFunctions = new List<Function>();
            showFunctions.Add(ss);
            sensorList = FunctionList.List.GetEnvirSensorsList();
        }


        public EnvironmentalSensorPage(Function ss,List<Function> functions)
        {
            bodyView = this;
            function = ss;
            sensorList = functions;
            showFunctions = new List<Function>();
            showFunctions.Add(ss);
        }
@@ -118,7 +130,7 @@
                TextColor = CSS_Color.PromptingColor2,
                SelectedTextColor = CSS_Color.MainColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Text = DateTime.Now.Month.ToString() + Language.StringByID(StringId.month),
                Text = Language.StringByID(StringId.month),//DateTime.Now.Month.ToString() + 
            };
            showDataTypeView.AddChidren(btnShowHistroyData_Month);
            #endregion
@@ -128,7 +140,7 @@
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(52),
                Width = Application.GetRealWidth(343 - 32),
                Height = Application.GetRealHeight(270),
                Height = Application.GetRealWidth(270),
            };
            diagramView.AddChidren(historyDataView);

@@ -595,18 +607,18 @@
            };
            selfInfoView.AddChidren(btnSeltSensorValue);

            Button btnShowData;
            btnShowData = new Button()
            {
                X = Application.GetRealWidth(291),
                Y = Application.GetRealWidth(62),
                Width = Application.GetMinRealAverage(32),
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIcon.png",
                SelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIconOn.png",
                IsSelected = true,
            };
            selfInfoView.AddChidren(btnShowData);
            //Button btnShowData;
            //btnShowData = new Button()
            //{
            //    X = Application.GetRealWidth(291),
            //    Y = Application.GetRealWidth(62),
            //    Width = Application.GetMinRealAverage(32),
            //    Height = Application.GetMinRealAverage(32),
            //    UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIcon.png",
            //    SelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIconOn.png",
            //    IsSelected = true,
            //};
            //selfInfoView.AddChidren(btnShowData);
            //btnShowData.MouseUpEventHandler = (sender, e) => {
            //    btnShowData.IsSelected = !btnShowData.IsSelected;
            //    if(btnShowData.IsSelected)
@@ -644,7 +656,8 @@

            bool initTitleButton = true;

            foreach (var tempSensor in FunctionList.List.GetEnvirSensorsList())

            foreach (var tempSensor in sensorList)
            {
                if (tempSensor.sid == function.sid)
                {
@@ -675,7 +688,7 @@
                #region 其它传感器信息栏
                FrameLayout otherInfoView = new FrameLayout()
                {
                    Gravity = Gravity.CenterVertical,
                    Gravity = Gravity.CenterHorizontal,
                    Width = Application.GetRealWidth(343),
                    Height = Application.GetRealWidth(100),
                    BackgroundColor = CSS_Color.MainBackgroundColor,
@@ -739,7 +752,11 @@
                {
                    Action backAction = () =>
                    {
                        btnSeltSensorName.Text = tempSensor.name;
                        MainPage.Log("45678i");
                        Application.RunOnMainThread(() =>
                        {
                            btnSeltSensorName.Text = tempSensor.name;
                        });
                    };
                    var infoView = new FunctionBaseInfoSetPage(tempSensor, backAction);
                    MainPage.BasePageView.AddChidren(infoView);
@@ -774,21 +791,26 @@
                    btnShowData1.IsSelected = !btnShowData1.IsSelected;
                    if (btnShowData1.IsSelected)
                    {
                        if (!showFunctions.Contains(function))
                        if (!showFunctions.Contains(tempSensor))
                        {
                            showFunctions.Add(function);
                            showFunctions.Add(tempSensor);
                        }
                    }
                    else
                    {
                        if (showFunctions.Contains(function))
                        if (showFunctions.Contains(tempSensor))
                        {
                            showFunctions.Remove(function);
                            showFunctions.Remove(tempSensor);
                        }
                    }
                    LoadMothed_GetSensorHistoryData();
                };
                #endregion

                contentView.AddChidren(new Button()
                {
                    Height = Application.GetRealHeight(12),
                });

            }
            #endregion
@@ -826,7 +848,7 @@

                    string yDataString = "";

                    foreach (var sr in FunctionList.List.GetEnvirSensorsList())
                    foreach (var sr in showFunctions)
                    {
                        if (sr.spk != function.spk)
                        {
@@ -839,7 +861,13 @@
                        }

                        var sensorType = sr.spk.Split(".")[1];
                        var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId,"value");
                        var queryType = sr.GetAttrState("spk").ToString();
                        if(queryType == "0")
                        {
                            queryType = "value";
                        }

                        var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId, queryType);
                        if (revertObj != null)
                        {
                            if (revertObj.Code == StateCode.SUCCESS)