2020-11-26-2

陈嘉乐

2020-11-26 9118585babf132b7e8a7a93da8c6ebf79510b72c

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

@@ -357,7 +357,7 @@
            }
        }
        #endregion

        
        #region 自动化部分
        /// <summary>
        /// 加载自动化列表界面
@@ -367,53 +367,8 @@
            //btnAddIcon.RemoveFromParent();
            automationPage = new FrameLayout();
            contentPageView.AddChidren(automationPage);
            //for (int i = 0; i < 3; i++)
            //{
            //    HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Add(new HDL_ON.UI.UI2.Intelligence.Automation.Logic { name = "123456" });
            //}
            //for (int i = 0; i < HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Count; i++)
            //{
            //    /////上下间隔12像素
            //    //vv.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12)});
            //    //LogicView.SingleLogicView logicView = new LogicView.SingleLogicView();
            //    //vv.AddChidren(logicView.FLayoutView());
            //    //logicView.btnLogicName.Text = i.ToString();
            //    //logicView.btnWeekText.Text = "每天";


            //    /// <summary>
            //    /// 主控件View
            //    /// </summary>
            //    FrameLayout frameLayout = new FrameLayout
            //    {
            //        X = Application.GetRealWidth(16),
            //        Y = Application.GetRealHeight(12 + 102 * i),
            //        Width = Application.GetRealWidth(343),
            //        Height = Application.GetRealHeight(102),
            //        BackgroundColor = CSS.CSS_Color.view,
            //        Radius = (uint)Application.GetRealHeight(12),
            //    };
            //    automationPage.AddChidren(frameLayout);
            //    /// <summary>
            //    /// 逻辑名称
            //    /// </summary>
            //    Button btnLogicName = new Button
            //    {
            //        Width = Application.GetRealWidth(250),
            //        Height = Application.GetRealHeight(20),
            //        TextSize = 14,
            //        TextColor = CSS.CSS_Color.textColor,
            //        Y = Application.GetRealHeight(12),
            //        X = Application.GetRealWidth(12),
            //        TextAlignment = TextAlignment.CenterLeft,
            //        Text = i.ToString(),

            //    };
            //    frameLayout.AddChidren(btnLogicName);

            //}

            HDL_ON.UI.UI2.Intelligence.Automation.MainView.MainShow(automationPage);
            HDL_ON.UI.UI2.Intelligence.Automation.MainView.automationPage = automationPage;
            HDL_ON.UI.UI2.Intelligence.Automation.MainView.MainShow();

        }
        #endregion
@@ -480,7 +435,6 @@
                btnSceneTilte.IsSelected = false;
                btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
                contentPageView.PageIndex = 1;
                LoadAutomationPageView();

            };
        }
@@ -507,7 +461,7 @@
                else
                {
                    //跳转到逻辑界面
                    SkipAddLogicPage();
                    HDL_ON.UI.UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
                }
            };
        }
@@ -529,21 +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;
            UI2.Intelligence.Automation.AddLogic.action += () =>
            {
                LoadAutomationPageView();
            };
        }
      
    }

}