Merge branch 'dev--wxr' into LcSdkV1

wxr

2022-11-23 5b77d9d57a6cddb474a66ca54401ad5ab0892db3

 HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs

@@ -35,10 +35,12 @@
        string curQueryType = "hour";
        string queryTime;
        Function function;
        public AcstSubHistoryPage(Function temp)
        string colorString;
        public AcstSubHistoryPage(Function temp,string colorStr)
        {
            function = temp;
            bodyView = this;
            colorString = colorStr;
        }


@@ -47,7 +49,7 @@
        /// </summary>
        public void LoadPage()
        {
            new TopViewDiv(bodyView, function.GetRoomListName()).LoadTopView();
            new TopViewDiv(bodyView, function.name).LoadTopView();
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

            //var contentView = new FrameLayout()
@@ -134,7 +136,7 @@
            {
                Y = Application.GetRealHeight(222),
                Height = Application.GetRealHeight(34),
                Text = "最近24小时的平均室内温度",
                TextID = StringId.Temp,
                TextSize = 10,
                TextColor = 0xFF798394,
                TextAlignment = TextAlignment.Center,
@@ -169,7 +171,7 @@
            {
                Y = Application.GetRealHeight(222),
                Height = Application.GetRealHeight(34),
                Text = "最近24小时的平均室内湿度",
                TextID = StringId.Humidity,
                TextSize = 10,
                TextColor = 0xFF798394,
                TextAlignment = TextAlignment.Center,
@@ -327,7 +329,7 @@
                                }
                                tempEchartOption.InitXdataText(vs);
                            }
                            tempEchartOption.InitYdataText("", revertData, "#FF80AEFF");
                            tempEchartOption.InitYdataTextLinearGradient("(°C)", revertData, colorString);

                            tempEchartOption.xTitle = Language.StringByID(StringId.timeMode);
                            var opString = tempEchartOption.InitOption();
@@ -383,7 +385,7 @@
                                }
                                humiEchartsOption.InitXdataText(vs);
                            }
                            humiEchartsOption.InitYdataText("", revertData, "#FF80AEFF");
                            humiEchartsOption.InitYdataTextLinearGradient("(%)", revertData, colorString);
                        }
                    }
                    humiEchartsOption.xTitle = Language.StringByID(StringId.timeMode);