V1.7.1发布版本

wxr

2023-04-23 098ca04f324624d97399c7c1040c46d2a96ebfaa

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

@@ -39,7 +39,7 @@
        {

            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            if (titleId == StringId.Lights)
            if (titleId == StringId.Lights && !DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
            {
                Action action = () =>
                {
@@ -141,7 +141,10 @@

            if (titleId == StringId.Lights)
            {
                functionList.AddRange(FunctionList.List.groupControls);
                functionList.AddRange(FunctionList.List.GetLightList());


                var lightScene = FunctionList.List.scenes.FindAll((obj) => obj.sceneType == SceneType.LightScene);

                foreach (var scene in lightScene)
@@ -218,7 +221,7 @@
        /// <summary>
        /// 显示的设备的总数
        /// </summary>
        int showCount = 0;
        int showCount = -1;
        /// <summary>
        /// 加载功能row
        /// </summary>
@@ -236,18 +239,18 @@
                    {
                        if (!isAppend)
                        {
                            showCount = 0;
                            showCount = -1;
                            functionListView.RemoveAll();
                        }
                        int i = 0;
                        foreach (var function in showList)
                        for(var i = 0;i<50;i++)
                        //foreach (var function in showList)
                        {
                            i++;
                            if (i > 50)
                            showCount++;
                            if (showCount >= showList.Count)
                            {
                                break;
                            }
                            showCount++;
                            var function = showList[showCount];

                            if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
                            {
@@ -267,6 +270,7 @@
                                    Tag = function.spk + function.sid
                                };
                                functionDiv.LoadFunctionDiv();
                                functionDiv.OrderEvent = OrderEvent;
                                functionListView.AddChidren(functionDiv);
                            }
                            else if (function.spk == SPK.IpCam_Imou)
@@ -300,6 +304,7 @@
                                    Tag = function.spk + function.sid
                                };
                                functionDiv.LoadFunctionDiv();
                                functionDiv.OrderEvent = OrderEvent;
                                functionListView.AddChidren(functionDiv);
                            }
                            functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
@@ -312,12 +317,8 @@
                                TextAlignment = TextAlignment.Center,
                                TextSize = CSS_FontSize.SubheadingFontSize,
                                TextColor = CSS_Color.FirstLevelTitleColor,
                                Text = "加载更多",
                                TextID = StringId.LoadMore,
                            };
                            if (Language.CurrentLanguage != "Chinese")
                            {
                                btnAppend.Text = "Load more";
                            }
                            functionListView.AddChidren(btnAppend);
                            btnAppend.MouseUpEventHandler = (sender, e) =>
                            {
@@ -346,7 +347,21 @@
            })
            { IsBackground = true }.Start();
        }

        /// <summary>
        /// 排序事件
        /// </summary>
        void OrderEvent()
        {
            Action action = () =>
            {
                functionList = functionList.OrderBy(o => o.FunctionOrderNumber).ToList();
                ShowFunctionRow(functionList);
            };
            var skipView = new OrderFunctionPage();
            MainPage.BasePageView.AddChidren(skipView);
            skipView.LoadPage(functionList, action);
            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
        }

        ///// <summary>
        ///// 加载功能类型控制卡片