Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

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

@@ -357,39 +357,19 @@
            }
        }
        #endregion

        
        #region 自动化部分
        /// <summary>
        /// 加载自动化列表界面
        /// </summary>
        void LoadAutomationPageView()
         void LoadAutomationPageView()
        {
            //btnAddIcon.RemoveFromParent();
            ///清除之前界面数据重新加载新数据；
            contentPageView.RemoveAll();
            automationPage = new FrameLayout();
            contentPageView.AddChidren(automationPage);
            HDL_ON.UI.UI2.Intelligence.Automation.MainView.automationPage = automationPage;
            HDL_ON.UI.UI2.Intelligence.Automation.MainView.MainShow();

            Button btnTipNot = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(120),
                Width = Application.GetRealWidth(180),
                Height = Application.GetRealWidth(180),
                UnSelectedImagePath = "TipNot.png",
            };
            automationPage.AddChidren(btnTipNot);

            Button btnTipNotText = new Button()
            {
                Y = btnTipNot.Bottom,
                Height = Application.GetRealWidth(100),
                TextID = StringId.TipNotOpen,
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
            };
            automationPage.AddChidren(btnTipNotText);
        }
        #endregion
    }
@@ -455,7 +435,6 @@
                btnSceneTilte.IsSelected = false;
                btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
                contentPageView.PageIndex = 1;
                LoadAutomationPageView();

            };
        }
@@ -482,7 +461,7 @@
                else
                {
                    //跳转到逻辑界面
                    SkipAddLogicPage();
                    HDL_ON.UI.UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
                }
            };
        }
@@ -504,17 +483,7 @@
            btnName.MouseUpEventHandler = eventHandler;
            btnZone.MouseUpEventHandler = eventHandler;
        }
        /// <summary>
        /// 跳转到逻辑界面的方法
        /// </summary>
        public void SkipAddLogicPage()
        {
            HDL_ON.UI.UI2.Intelligence.Automation.Logic.currlogic = new UI2.Intelligence.Automation.Logic();
            var addLogic = new UI2.Intelligence.Automation.AddLogic();
            MainPage.BasePageView.AddChidren(addLogic);
            addLogic.Show();
            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
        }
      
    }

}