Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into De...

Davin

2023-07-26 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2

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

@@ -672,7 +672,7 @@
                {
                    case ShowFunction.Series:
                        functionCount = FunctionList.List.GetSeries().Count;
                        functionOnCount = FunctionList.List.GetSeries().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        //functionOnCount = FunctionList.List.GetSeries().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        break;
                    case ShowFunction.IpCam:
                        functionCount = FunctionList.List.GetIpCamImouList().Count;
@@ -844,21 +844,29 @@
                        TextAlignment = TextAlignment.CenterLeft,
                        Text = "/" + functionCount,
                    };
                    functionView.AddChidren(btnFunctionCount);
                    Button btnOpenCount = new Button()
                    if (item == ShowFunction.Series)
                    {
                        X = Application.GetRealWidth(16),
                        Y = btnName.Bottom,
                        Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
                        Height = Application.GetRealHeight(24),
                        TextColor = CSS_Color.MainColor,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                        TextAlignment = TextAlignment.CenterLeft,
                        Text = functionOnCount.ToString(),
                        Tag = item + "_onCount",
                        BorderWidth = 0,
                    };
                    functionView.AddChidren(btnOpenCount);
                        btnFunctionCount.Text = functionCount.ToString();
                    }
                    functionView.AddChidren(btnFunctionCount);

                    if (item != ShowFunction.Series)
                    {
                        Button btnOpenCount = new Button()
                        {
                            X = Application.GetRealWidth(16),
                            Y = btnName.Bottom,
                            Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
                            Height = Application.GetRealHeight(24),
                            TextColor = CSS_Color.MainColor,
                            TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                            TextAlignment = TextAlignment.CenterLeft,
                            Text = functionOnCount.ToString(),
                            Tag = item + "_onCount",
                            BorderWidth = 0,
                        };
                        functionView.AddChidren(btnOpenCount);
                    }
                }


@@ -876,6 +884,12 @@
                    case ShowFunction.Series:
                        btnName.TextID = StringId.HorseRaceLamp;
                        functionPageTitleId = StringId.HorseRaceLamp;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
                            var page2 = new UI2.Classification.SeriesFunctionListPage();
                            MainPage.BasePageView.AddChidren(page2);
                            page2.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        };
                        break;
                    case ShowFunction.Light:
                        #region Light
@@ -1196,8 +1210,9 @@
                    && item != ShowFunction.SecurityMonitoring
                    && item != ShowFunction.DoorLock
                    && ShowFunction.EnergyMonitoring != item
                    && ShowFunction.VideoIntercom != item &&
                    ShowFunction.SecurityCenter != item
                    && ShowFunction.VideoIntercom != item
                    && ShowFunction.SecurityCenter != item
                    && ShowFunction.Series != item
                    && ShowFunction.Acst != item)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
@@ -1437,13 +1452,13 @@

                    Inverter.Ins.H5Page.JSToNativeAction = (dictionary) =>
                    {
                        //var jObj = dictionary;
                        //JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));

#if __IOS__
                        JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary));
#else
                        var valuePairs = "";
                        dictionary.TryGetValue("method", out valuePairs);
                        JObject jObj = JObject.Parse(valuePairs);

#endif

                        if (!jObj.ContainsKey("method") || !jObj.ContainsKey("data"))
                        {
@@ -1496,7 +1511,7 @@

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

            #endregion
#endregion
        }