2020-11-18-1

陈嘉乐

2020-11-18 50f0a7ce08531e0c5d37f7da243dd54f8dd2fe7b

 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs

@@ -365,8 +365,8 @@
        void LoadAutomationPageView()
        {
            //btnAddIcon.RemoveFromParent();


            ///清除之前界面数据重新加载新数据；
            contentPageView.RemoveAll();
            automationPage = new FrameLayout();
            contentPageView.AddChidren(automationPage);

@@ -442,9 +442,9 @@
                btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
                btnAutomationTitle.IsSelected = false;
                btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;

                contentPageView.PageIndex = 0;
            };
            //逻辑点击事件
            btnAutomationTitle.MouseUpEventHandler = (sender, e) => {
                if (btnAutomationTitle.IsSelected)
                {
@@ -455,6 +455,8 @@
                btnSceneTilte.IsSelected = false;
                btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
                contentPageView.PageIndex = 1;
                LoadAutomationPageView();

            };
        }
        #endregion
@@ -466,13 +468,22 @@
        {
            btnAddIcon.MouseUpEventHandler = (sender, e) =>
            {
                Action action = () => {
                    LoadSceneFunctionControlZone();
                };
                var aep = new NewSceneMenuListPage(action);
                MainPage.BasePageView.AddChidren(aep);
                aep.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                if (!btnAutomationTitle.IsSelected)
                {
                    Action action = () =>
                    {
                        LoadSceneFunctionControlZone();
                    };
                    var aep = new NewSceneMenuListPage(action);
                    MainPage.BasePageView.AddChidren(aep);
                    aep.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
                else
                {
                    //跳转到逻辑界面
                    SkipAddLogicPage();
                }
            };
        }

@@ -493,6 +504,16 @@
            btnName.MouseUpEventHandler = eventHandler;
            btnZone.MouseUpEventHandler = eventHandler;
        }
        /// <summary>
        /// 跳转到逻辑界面的方法
        /// </summary>
        public void SkipAddLogicPage()
        {
            var addLogic = new UI2.Intelligence.Automation.AddLogic();
            MainPage.BasePageView.AddChidren(addLogic);
            addLogic.Show();
            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
        }
    }

}