Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs

@@ -13,9 +13,16 @@
        EchartsOption_BrokenLine brokenLine;
        MyEchartsViewOn myEchartsView_Line;
        string curQueryType = "hour";
        public CacDayHistoryPage()
        string queryTime;
        string functionId;
        string time;
        public CacDayHistoryPage(string functionId,string queryType, string time)
        {
            this.time = time;
            this.functionId = functionId;
            curQueryType = queryType;
            bodyView = this;
            queryTime = time;
        }


@@ -24,15 +31,34 @@
        /// </summary>
        public void InitView()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.StatisticalChart24Hour)).LoadTopView();
            var topview = new TopViewDiv(bodyView, Language.StringByID(StringId.StatisticalChart24Hour));
            topview.maginY = 10;
            topview.LoadTopView();
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

            var contentView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(74),
                Height = Application.GetRealHeight(603),
            };
            bodyView.AddChidren(contentView);

            var btnTitle = new Button()
            {
                Height = Application.GetRealHeight(60),
                TextAlignment = TextAlignment.Center,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextColor = CSS_Color.FirstLevelTitleColor,
            };
            if(curQueryType == "room_temp")
            {
                btnTitle.Text = queryTime + "室内温度历史数据";
            }
            else
            {
                btnTitle.Text = queryTime + "室内湿度历史数据";
            }
            contentView.AddChidren(btnTitle);


            var historyDataView = new FrameLayout()
@@ -78,20 +104,22 @@
            }, "#FF9D54");
            brokenLine.yTitle = "(℃)";
            brokenLine.xTitle = "";
            if (curQueryType != "hour")
            {
                brokenLine.xTitle = Language.StringByID(StringId.Date);
            }
            //if (curQueryType != "hour")
            //{
            //    brokenLine.xTitle = Language.StringByID(StringId.Date);
            //}
            var opString = brokenLine.InitOption();

                myEchartsView_Line.ShowWithOption(opString);
            myEchartsView_Line.ShowWithOptionJsonString(opString);

#endif
            //LoadMothed_GetHistoryData();
        }

        /// <summary>
        /// 读取历史数据
        /// </summary>
        void LoadMothed_GetHistoryData(Function sr, bool isDel)
        void LoadMothed_GetHistoryData()
        {

            var loadPage = new Loading()
@@ -109,8 +137,7 @@
                        loadPage.Start(Language.StringByID(StringId.PleaseWait));
                    });

                    var sensorType = sr.spk.Split(".")[1];
                    var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId, "total_electricity");
                    var revertObj = new HttpServerRequest().GetSensorHistory("day_hour", functionId, curQueryType,time);
                    if (revertObj != null)
                    {
                        if (revertObj.Code == StateCode.SUCCESS)
@@ -126,19 +153,28 @@
                                }
                                brokenLine.InitXdataText(vs);
                            }
                            if (sr.GetAttribute("ydata") == null)
                            {
                                sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
                            }
                            sr.SetAttrState("ydata", brokenLine.InitYdataText(sr.name, revertData, sr.GetAttrState("color")) + ",");
                            //if (sr.GetAttribute("ydata") == null)
                            //{
                            //    sr.attributes.Add(new FunctionAttributes() { key = "ydata" });
                            //}
                            //sr.SetAttrState("ydata",
                            brokenLine.InitYdataText("", revertData, "#FF9D54");// + ",");
                        }
                    }
                    brokenLine.yTitle = Language.StringByID(StringId.EnergyConsumption) + "(kW)";
                    brokenLine.xTitle = Language.StringByID(StringId.timeMode);
                    if (curQueryType != "hour")
                    brokenLine.yTitle = Language.StringByID(StringId.Uint);
                    if(curQueryType == "room_temp")
                    {
                        brokenLine.xTitle = Language.StringByID(StringId.Date);
                        brokenLine.yTitle += ":°C";
                    }
                    else
                    {
                        brokenLine.yTitle += ":%";
                    }
                    brokenLine.xTitle = Language.StringByID(StringId.timeMode);
                    //if (curQueryType != "hour")
                    //{
                    //    brokenLine.xTitle = Language.StringByID(StringId.Date);
                    //}
                    var opString = brokenLine.InitOption();

                    Application.RunOnMainThread(() =>