wxr
2022-09-29 88c408e49689961d3eb3496c6e89c60e230a92f3
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1186,20 +1186,34 @@
                    Text = "/" + FunctionList.List.InverterList().Count,
                };
                inverterListView.AddChidren(btnFunctionCount);
                int count = 0;
                foreach (var temp in FunctionList.List.InverterList())
                {
                    if (temp.online)
                    {
                        if (temp.trait_on_off.state.ToString() == "on")
                        {
                            ++count;
                        }
                    }
                }
                Button btnOpenCount = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = btnName.Bottom,
                    Width = Application.GetRealWidth(14 * FunctionList.List.InverterList().Count.ToString().Length),
                    Width = Application.GetRealWidth(14 * count.ToString().Length),
                    Height = Application.GetRealHeight(24),
                    TextColor = CSS_Color.MainColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                    Text = FunctionList.List.InverterList().FindAll((temp)=>temp.trait_on_off.curValue.ToString() == "on").Count.ToString(),
                    Text = count.ToString(),
                    Tag = "inverter_onCount",
                    BorderWidth = 0,
                };
                inverterListView.AddChidren(btnOpenCount);
                //Button btnWorkStatus = new Button()
                //{
@@ -1289,7 +1303,7 @@
                    };
//#if __Android__
                    //适配安卓沉浸式导航栏
                    //适配沉浸式导航栏
                    h5BasePage.Y = Application.GetRealHeight(20);
                    h5BasePage.Height = Application.GetRealHeight(646);
//#endif
@@ -1304,6 +1318,7 @@
                    }
                    string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={HttpUtil.GlobalRequestHttpsHost}&lang={lz}";
                    Inverter.Ins.ShowWebviewFormUrl(url);
                    Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
                    {
                        JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));
@@ -1341,7 +1356,7 @@
                            });
                            refreshInverterInfo(btnPowerTenerationToday, btnWorkingMode, btnCurrentPowerGeneration, btnBatterySOC);
                        }
                        else if(jObj["method"].ToString() == "setPageIndex")
                        else if (jObj["method"].ToString() == "setPageIndex")
                        {
                            var data = jObj["data"].ToString();
                            Inverter.Ins.PageIndex = data.ToString();