Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-18 aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -101,7 +101,12 @@
                            a31PlayMusicPage.Show();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                        //case FunctionType
                    case FunctionType.ColorTemperature:
                        var TureView = new ColorTureLampPage(function as Light);
                        MainPage.BasePageView.AddChidren(TureView);
                        TureView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                }
            };
            return eventHandler;