Merge remote-tracking branch 'origin/lss' into temp-wxr

wxr

2021-03-26 80faceb86399017851f9f72feaaef868a37ff23f

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

@@ -76,6 +76,7 @@

        public void LoadPage()
        {
            MainPage.CurPageIndex = 1;
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            #region top
            FrameLayout topView = new FrameLayout()
@@ -480,6 +481,7 @@
                        #endregion
                        break;
                    case ShowFunction.FreshAir:
                        functionCount = FunctionList.List.GetAirFreshList().Count;
                        break;
                    case ShowFunction.Music:
                        functionCount = Music.A31MusicModel.A31MusicModelList.Count;
@@ -551,7 +553,7 @@
                functionView.AddChidren(btnName);

                if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                    && item != ShowFunction.SecurityMonitoring
                    && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir
                    && functionCount != 0)
                {
                    Button btnFunctionCount = new Button()
@@ -737,6 +739,27 @@
                        break;
                    case ShowFunction.FreshAir:
                        btnName.TextID = StringId.FreshAir;
                        #region Light
                        Button btnFreshAirPower = 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(btnFreshAirPower);

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

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