2.1.2

wxr

2023-08-18 3fcb73db484d2bed5ee993702913a7eaea68068c

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

@@ -755,10 +755,6 @@
                        break;
                    case ShowFunction.SecurityCenter:
                        functionCount = FunctionList.List.securities.Count;
                        //if (DB_ResidenceData.Instance.GatewayType == 1)
                        //{
                        //    functionCount = 1;
                        //}
                        break;
                    case ShowFunction.Acst:
                        functionCount = FunctionList.List.GetAcstParentList().Count;
@@ -766,14 +762,10 @@
                        break;
                    case ShowFunction.VideoDoorLock:
                        functionCount = FunctionList.List.GetVideoDoorLockList().Count;
#if DEBUG
                        //functionCount = 1;
#endif
                        functionOnCount = 1;
                        functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
                            || obj.GetAttrState("status").ToString() == "normal_open").Count;

                        break;



                }

                if (functionCount == 0)
@@ -1055,13 +1047,15 @@
                    case ShowFunction.EnergyMonitoring:
                        #region 能源监测
                        btnName.TextID = StringId.EnergyMonitoring;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var skipView = new EnergyMainPage();
                            MainPage.BasePageView.AddChidren(skipView);
                            skipView.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        };
                        functionPageTitleId = StringId.EnergyMonitoring;

                        //btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        //{
                        //    var skipView = new EnergyMainPage();
                        //    MainPage.BasePageView.AddChidren(skipView);
                        //    skipView.LoadPage();
                        //    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        //};
                        #endregion
                        break;
                    case ShowFunction.Environmental:
@@ -1209,7 +1203,7 @@
                    && item != ShowFunction.Environmental
                    && item != ShowFunction.SecurityMonitoring
                    && item != ShowFunction.DoorLock
                    && ShowFunction.EnergyMonitoring != item
                    //&& ShowFunction.EnergyMonitoring != item
                    && ShowFunction.VideoIntercom != item
                    && ShowFunction.SecurityCenter != item
                    && ShowFunction.Series != item
@@ -1290,7 +1284,7 @@
                int count = 0;
                foreach (var temp in FunctionList.List.InverterList())
                {
                    if (temp.online)
                    if (temp.isOnline())
                    {
                        if (temp.trait_on_off.state.ToString() == "on")
                        {