Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

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

@@ -1,4 +1,5 @@
using System;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -22,6 +23,7 @@
        Button btnSceneTilte;

        #region 场景底部切换显示区域
        FrameLayout topView;
        /// <summary>
        /// 场景区域，顶部区域
        /// </summary>
@@ -60,7 +62,7 @@
        {
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            #region top
            FrameLayout topView = new FrameLayout()
            topView = new FrameLayout()
            {
                Height = Application.GetRealHeight(64),
                BackgroundColor = CSS_Color.TopViewColor,
@@ -188,6 +190,8 @@
        /// </summary>
        void LoadSceneFunctionControlZone()
        {
            //topView.AddChidren(btnAddIcon);

            sceneFunctionView.RemoveAll();
            var rowView = new FrameLayout();
            try
@@ -353,36 +357,19 @@
            }
        }
        #endregion

        
        #region 自动化部分
        /// <summary>
        /// 加载自动化列表界面
        /// </summary>
        void LoadAutomationPageView()
         void LoadAutomationPageView()
        {
            //btnAddIcon.RemoveFromParent();
            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
    }
@@ -435,9 +422,9 @@
                btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
                btnAutomationTitle.IsSelected = false;
                btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;

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

            };
        }
        #endregion
@@ -459,13 +447,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
                {
                    //跳转到逻辑界面
                    HDL_ON.UI.UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
                }
            };
        }

@@ -480,12 +477,13 @@
            {
                string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
                new PublicAssmebly().TipMsgAutoClose(msg, true);
                Control.Send(function);
                Control.ins.ControlScene(function as Scene);
            };
            btnCoverd.MouseUpEventHandler = eventHandler;
            btnName.MouseUpEventHandler = eventHandler;
            btnZone.MouseUpEventHandler = eventHandler;
        }
      
    }

}