Merge remote-tracking branch 'origin/wxr0114' into wjc

wjc

2022-01-19 07b0239f824ddb5a0cadf93f20ff6247f72baca2

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

@@ -678,6 +678,8 @@
                        #endregion
                        break;
                    case ShowFunction.DoorLock:
                        functionCount = FunctionList.List.GetDoorLockList().Count;
                        functionOnCount = 1;
                        break;
                    case ShowFunction.Electric:
                        #region 电器
@@ -934,6 +936,10 @@
                        break;
                    case ShowFunction.DoorLock:
                        btnName.TextID = StringId.DoorLock;
                        btnFunctionViewBg.MouseUpEventHandler = (sende, e) => {
                            var form = new DoorLockListPage();
                            form.AddForm(FunctionList.List.GetDoorLockList());
                        };
                        break;
                    case ShowFunction.Electric:
                        #region 电器
@@ -1050,7 +1056,7 @@

                }
                //界面跳转--音乐跳转自己的界面--环境跳转自己的界面
                if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring
                if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock
                    && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>