Merge branch 'Dev-Branch' into wjc

mac

2023-11-07 efd01cddef2e9d29907592cbed154fba548d7ede

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs

@@ -878,11 +878,22 @@
        void LoadEvent_ChangeFunctionList()
        {
            btnAddFunctionTitle.MouseUpEventHandler = (sender, e) => {
                if (DB_ResidenceData.Instance.HomeGateway.isSupportSceneEnableAutomation)
                {
                //var sefp = new SceneFunctionListChoosePage(scene, refreshFunctionRowAction);
                var sefp = new SceneTargetTypeChoosePage(scene, refreshFunctionRowAction);
                MainPage.BasePageView.AddChidren(sefp);
                sefp.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
                else
                {
                    var sefp = new SceneFunctionListChoosePage(scene, refreshFunctionRowAction);
                    //var sefp = new SceneTargetTypeChoosePage(scene, refreshFunctionRowAction);
                    MainPage.BasePageView.AddChidren(sefp);
                    sefp.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
            };
        }