Merge branch 'WJC'

wxr

2020-12-07 64dbbfe1d6488635e160189a704afccffc7d34d0

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs

@@ -9,7 +9,7 @@
        /// <summary>
        /// 最上面块View
        /// </summary>
        public FrameLayout fLayout = new FrameLayout
        public FrameLayout frameLayout = new FrameLayout 
        {
            BackgroundColor = CSS.CSS_Color.viewTop,
            Height = Application.GetRealHeight(64),
@@ -44,10 +44,10 @@
        /// </summary>
        public Button setBtn = new Button
        {
            Y = Application.GetRealHeight(29),
            Y = Application.GetRealHeight(28),
            X = Application.GetRealWidth(337),
            Width = Application.GetMinRealAverage(28),
            Height = Application.GetMinRealAverage(28),
            Width = Application.GetMinRealAverage(32),
            Height = Application.GetMinRealAverage(32),
            UnSelectedImagePath = "LogicIcon/set.png",
            Visible = false,
        };
@@ -62,7 +62,7 @@
        /// <summary>
        /// 设置图标增加热键大小
        /// </summary>
        public Button clickSetBtn = new Button
        public Button clickSetBtn = new Button 
        {
            X = Application.GetRealWidth(337 - 37),
            Width = Application.GetMinRealAverage(28 + 37),
@@ -74,12 +74,12 @@
        /// <returns></returns>
        public FrameLayout FLayoutView()
        {
            fLayout.AddChidren(topNameBtn);
            fLayout.AddChidren(backBtn);
            fLayout.AddChidren(setBtn);
            fLayout.AddChidren(clickBackBtn);
            fLayout.AddChidren(clickSetBtn);
            return fLayout;
            frameLayout.AddChidren(topNameBtn);
            frameLayout.AddChidren(backBtn);
            frameLayout.AddChidren(setBtn);
            frameLayout.AddChidren(clickBackBtn);
            frameLayout.AddChidren(clickSetBtn);
            return frameLayout;
        }
        #endregion
    }