Merge branch 'dev--wxr' into LcSdkV1

wxr

2022-11-23 5b77d9d57a6cddb474a66ca54401ad5ab0892db3

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

@@ -649,12 +649,19 @@
            var lastY2 = Application.GetRealWidth(16);
            var functionContentViewHeight = Application.GetRealWidth(16);

            foreach (var item in DB_ResidenceData.Instance.functionTypeList)
            foreach (var item in DB_ResidenceData.Instance.ShowFunctionTypeList)
            {
                int functionCount = 0;
                int functionOnCount = 0;
                switch (item)
                {
                    case ShowFunction.IpCam:
                        functionCount = FunctionList.List.GetIpCamImouList().Count;
                        break;
                    case ShowFunction.MechanicalArm:
                        functionCount = FunctionList.List.GetMechanicalArmList().Count;
                        functionOnCount = FunctionList.List.GetMechanicalArmList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        break;
                    case ShowFunction.Light:
                        #region Light
                        functionCount = FunctionList.List.GetLightList().Count;
@@ -796,7 +803,7 @@
                if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                    && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir && item != ShowFunction.Music
                    && item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter
                    && item != ShowFunction.Acst
                    && item != ShowFunction.Acst && item != ShowFunction.IpCam
                    && functionCount != 0)
                {
                    Button btnFunctionCount = new Button()
@@ -863,6 +870,36 @@

                        #endregion
                        break;
                    case ShowFunction.IpCam:
                        btnName.TextID = StringId.SecurityMonitoring;

                        btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png";

                        functionPageTitleId = StringId.SecurityMonitoring;

                        break;
                    case ShowFunction.MechanicalArm:
                        btnName.TextID = StringId.MechanicalArm;
                        Button btnMaPower = new Button()
                        {
                            X = Application.GetRealWidth(120),
                            Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
                            Width = Application.GetRealWidth(32),
                            Height = Application.GetRealWidth(32),
                            SelectedImagePath = "Public/PowerOpen.png",
                            UnSelectedImagePath = "Public/PowerClose.png",
                            IsSelected = functionOnCount > 0,
                            Tag = item + "_AllControl",
                        };
                        functionView.AddChidren(btnMaPower);

                        btnMaPower.MouseUpEventHandler = (sender, e) =>
                        {
                            LoadEvent_SwitchFunction(btnMaPower, item, functionView);
                        };
                        functionPageTitleId = StringId.MechanicalArm;

                        break;
                    case ShowFunction.AC:
                        #region AC
                        btnName.TextID = StringId.AC;