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

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

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

@@ -1085,9 +1085,10 @@
                            Tag = item + "_AllControl",
                        };
                        functionView.AddChidren(btnAcstPower);
                        btnAcstPower.MouseUpEventHandler = (sender, e) => {
                        btnAcstPower.MouseUpEventHandler = (sender, e) =>
                        {
                            btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
                            string onoff = btnAcstPower.IsSelected ? "on":"off";
                            string onoff = btnAcstPower.IsSelected ? "on" : "off";
                            Dictionary<string, string> d = new Dictionary<string, string>();
                            d.Add(FunctionAttributeKey.OnOff, onoff);

@@ -1098,7 +1099,8 @@
                        };


                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var page = new AcstParentPage();
                            MainPage.BasePageView.AddChidren(page);
                            page.LoadPage();
@@ -1110,7 +1112,7 @@
                }
                //界面跳转--音乐跳转自己的界面--环境跳转自己的界面
                if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock
                    && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item
                    && ShowFunction.EnergyMonitoring != item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item
                    && ShowFunction.Acst != item)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
@@ -1126,7 +1128,7 @@


            //光伏数据
            if (FunctionList.List.InverterList().Count > 0 )
            if (FunctionList.List.InverterList().Count > 0)
            {
                FrameLayout inverterListView = new FrameLayout()
                {
@@ -1193,7 +1195,7 @@
                    TextColor = CSS_Color.MainColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = FunctionList.List.InverterList().FindAll((temp)=>temp.trait_on_off.ToString() == "on").Count.ToString(),
                    Text = FunctionList.List.InverterList().FindAll((temp)=>temp.trait_on_off.curValue.ToString() == "on").Count.ToString(),
                    Tag = "inverter_onCount",
                    BorderWidth = 0,
                };
@@ -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()
                //{
@@ -1282,19 +1284,21 @@

                clickButton.MouseUpEventHandler = (sender2, e2) =>
                {
                    var h5BasePage = new FrameLayout();
                    var h5BasePage = new FrameLayout() {
                        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;

                    h5BasePage.AddChidren(Inverter.Ins.H5Page);//000
                    string lz = "zh";
                    if(Language.CurrentLanguage != "Chinese")
                    if (Language.CurrentLanguage != "Chinese")
                    {
                        lz = "en";
                    }
@@ -1335,34 +1339,20 @@
                            {
                                h5BasePage.RemoveFromParent();
                            });
                            refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
                        }
                        else if(jObj["method"].ToString() == "setPageIndex")
                        {
                            var data = jObj["data"].ToString();
                            Inverter.Ins.PageIndex = data.ToString();
                        }
                    };



                };

                new System.Threading.Thread(() => {
                    var http = new HttpServerRequest();
                    var pack = http.GetInverterStatisticsInfo();
                    if(pack!= null)
                    {
                        var info = JsonConvert.DeserializeObject<StatisticsInfo>(pack.Data.ToString());
                        try
                        {
                            Application.RunOnMainThread(() =>
                            {
                                btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
                                btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", info.workMode);
                                btnCurrentPowerGeneration.Text = Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
                                btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
                            });
                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"获取家庭光伏统计数据异常：{ex.Message}");
                        }
                    }


                }) { IsBackground = true }.Start();
                refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);

                index++;
            }
@@ -1370,6 +1360,44 @@
            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)
                {
                    if(pack.Data == null)
                    {
                        return;
                    }
                    var info = JsonConvert.DeserializeObject<StatisticsInfo>(pack.Data?.ToString());
                    if (info == null)
                    {
                        return;
                    }
                    try
                    {
                        Application.RunOnMainThread(() =>
                        {
                            btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
                            btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", info.workMode);
                            btnCurrentPowerGeneration.Text = Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
                            btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
                        });
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log($"获取家庭光伏统计数据异常：{ex.Message}");
                    }
                }


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

#region 切换楼层
@@ -1531,4 +1559,4 @@
        }
#endregion
    }
}
}