Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -1085,7 +1085,8 @@
                            Tag = item + "_AllControl",
                        };
                        functionView.AddChidren(btnAcstPower);
                        btnAcstPower.MouseUpEventHandler = (sender, e) => {
                        btnAcstPower.MouseUpEventHandler = (sender, e) =>
                        {
                            btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
                            string onoff = btnAcstPower.IsSelected ? "on":"off";
                            Dictionary<string, string> d = new Dictionary<string, string>();
@@ -1098,7 +1099,8 @@
                        };


                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var page = new AcstParentPage();
                            MainPage.BasePageView.AddChidren(page);
                            page.LoadPage();
@@ -1214,7 +1216,7 @@
                Button btnWorkingMode = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = btnOpenCount.Bottom,// + Application.GetRealHeight(16),
                    Y = btnOpenCount.Bottom + Application.GetRealHeight(5),// + Application.GetRealHeight(16),
                    Width = Application.GetRealWidth(148),
                    Height = Application.GetRealHeight(18),
                    TextColor = CSS_Color.FirstLevelTitleColor,
@@ -1227,7 +1229,7 @@
                Button btnPowerTenerationToday = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = btnWorkingMode.Bottom,
                    Y = btnWorkingMode.Bottom + Application.GetRealHeight(5),
                    Width = Application.GetRealWidth(148),
                    Height = Application.GetRealHeight(21),
                    TextColor = CSS_Color.FirstLevelTitleColor,
@@ -1241,7 +1243,7 @@
                Button btnCurrentPowerGeneration = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = btnPowerTenerationToday.Bottom,
                    Y = btnPowerTenerationToday.Bottom + Application.GetRealHeight(5),
                    Width = Application.GetRealWidth(148),
                    Height = Application.GetRealHeight(21),
                    TextColor = CSS_Color.FirstLevelTitleColor,
@@ -1262,7 +1264,7 @@
                    TextID = StringId.BatterySOC,
                    TextAlignment = TextAlignment.CenterLeft,
                };
                inverterListView.AddChidren(btnBatterySOC);
                //inverterListView.AddChidren(btnBatterySOC);

                //Button btnOperationDataTotalData = new Button()
                //{
@@ -1286,11 +1288,11 @@
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                    };

#if __Android__
//#if __Android__
                    //适配安卓沉浸式导航栏
                    h5BasePage.Y = Application.GetRealHeight(16);
                    h5BasePage.Height = Application.GetRealHeight(651);
#endif
                    h5BasePage.Y = Application.GetRealHeight(20);
                    h5BasePage.Height = Application.GetRealHeight(646);
//#endif
                    MainPage.BasePageView.AddChidren(h5BasePage);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

@@ -1337,6 +1339,12 @@
                            {
                                h5BasePage.RemoveFromParent();
                            });
                            refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
                        }
                        else if(jObj["method"].ToString() == "setPageIndex")
                        {
                            var data = jObj["data"].ToString();
                            Inverter.Ins.PageIndex = data.ToString();
                        }
                    };

@@ -1344,14 +1352,33 @@

                };

                new System.Threading.Thread(() => {
                refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);

                index++;
            }

            s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight + Application.GetRealWidth(40);

            #endregion
        }

        void refreshInverterInfo(Button btnPowerTenerationToday, Button btnWorkingMode, Button btnCurrentPowerGeneration, Button btnBatterySOC)
        {
            new System.Threading.Thread(() =>
            {
                    var http = new HttpServerRequest();
                    var pack = http.GetInverterStatisticsInfo();
                    if (pack != null)
                    {
                        var info = JsonConvert.DeserializeObject<StatisticsInfo>(pack.Data.ToString());
                        if (info != null)
                    if(pack.Data == null)
                        {
                        return;
                    }
                    var info = JsonConvert.DeserializeObject<StatisticsInfo>(pack.Data?.ToString());
                    if (info == null)
                    {
                        return;
                    }
                            try
                            {
                                Application.RunOnMainThread(() =>
@@ -1367,17 +1394,10 @@
                                MainPage.Log($"获取家庭光伏统计数据异常：{ex.Message}");
                            }
                        }
                    }


                }) { IsBackground = true }.Start();

                index++;
            }

            s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight + Application.GetRealWidth(40);

            #endregion
            })
            { IsBackground = true }.Start();
        }

#region 切换楼层