Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy

tzy

2021-03-26 0c1e29166e6b188939c092d16f87ce2a27662c5f

 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()
@@ -615,7 +617,7 @@
                            LoadEvent_SwitchFunction(btnLightPower, item, functionView);
                        };
                        functionPageTitleId = StringId.Lights;

                      
                        #endregion
                        break;
                    case ShowFunction.AC:
@@ -728,7 +730,7 @@
                        btnName.TextID = StringId.EnvironmentalData;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var skipView = new EnvironmentalSciencePage();
                            var skipView = new EnvironmentalPage();// EnvironmentalSciencePage();
                            MainPage.BasePageView.AddChidren(skipView);
                            skipView.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;