Merge branch 'WJC'

wxr

2020-12-08 145b157ba183ebf877c93ed2dbb01ec737c993d3

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

@@ -33,7 +33,7 @@
        public Button backBtn = new Button
        {
            Width = Application.GetRealWidth(12),
            Height = Application.GetRealHeight(20),
            Height = Application.GetRealWidth(20),
            X = Application.GetRealWidth(TextSize.left16),
            Y = Application.GetRealHeight(32),
            UnSelectedImagePath = "LogicIcon/back.png",
@@ -46,8 +46,8 @@
        {
            Y = Application.GetRealHeight(28),
            X = Application.GetRealWidth(337),
            Width = Application.GetMinRealAverage(32),
            Height = Application.GetMinRealAverage(32),
            Width = Application.GetRealWidth(32),
            Height = Application.GetRealWidth(32),
            UnSelectedImagePath = "LogicIcon/set.png",
            Visible = false,
        };
@@ -65,8 +65,8 @@
        public Button clickSetBtn = new Button 
        {
            X = Application.GetRealWidth(337 - 37),
            Width = Application.GetMinRealAverage(28 + 37),
            Height = Application.GetMinRealAverage(28 + 7 + 29),
            Width = Application.GetRealWidth(28 + 37),
            Height = Application.GetRealWidth(28 + 7 + 29),
        };
        /// <summary>
        /// 最上面的那块方法