wxr
2023-07-10 46a03f3b19b39cfa6e00b7af41c1ef90ae812e26
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -670,6 +670,10 @@
                int functionOnCount = 0;
                switch (item)
                {
                    case ShowFunction.Series:
                        functionCount = FunctionList.List.GetSeries().Count;
                        functionOnCount = FunctionList.List.GetSeries().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        break;
                    case ShowFunction.IpCam:
                        functionCount = FunctionList.List.GetIpCamImouList().Count;
                        break;
@@ -869,6 +873,10 @@
                int functionPageTitleId = 0;
                switch (item)
                {
                    case ShowFunction.Series:
                        btnName.TextID = StringId.HorseRaceLamp;
                        functionPageTitleId = StringId.HorseRaceLamp;
                        break;
                    case ShowFunction.Light:
                        #region Light
                        btnName.TextID = StringId.Lights;
@@ -1194,7 +1202,6 @@
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {
                        var skipView = new FunctionPage();
                        MainPage.BasePageView.AddChidren(skipView);
                        skipView.LoadPage(functionPageTitleId);
@@ -1425,12 +1432,18 @@
                    {
                        lz = "en";
                    }
                    string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={OnAppConfig.Instance.RequestHttpsHost}&language={lz}";
                    string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={OnAppConfig.Instance.RequestHttpsHost}&language={lz}&weather={MainPage.cityInfo.weather}";
                    Inverter.Ins.ShowWebviewFormUrl(url);
                    Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
                    {
                        JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));
                        //var jObj = dictionary;
                        //JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));
                        var valuePairs = "";
                        dictionary.TryGetValue("method", out valuePairs);
                        JObject jObj = JObject.Parse(valuePairs);
                        if (!jObj.ContainsKey("method") || !jObj.ContainsKey("data"))
                        {