Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-01-23 e6156ab41aea16796798eb32fd7ce664345a8220

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

@@ -81,6 +81,19 @@

        };
        /// <summary>
        /// 显示是否删除标志
        /// </summary>
        public Button btnIsDelTag = new Button
        {
            Width = Application.GetRealWidth(10),
            Height = Application.GetRealWidth(10),
            Y = Application.GetRealHeight(12),
            X = Application.GetRealWidth(295 + 36 - 10),
            Radius = (uint)Application.GetRealHeight(5),
            BackgroundColor = 0xFFFF0000,
            Visible = false,
        };
        /// <summary>
        /// 点击事件
        /// </summary>
        public Button btnclick= new Button
@@ -101,6 +114,7 @@
            frameLayout.AddChidren(btnLienIcon);
            frameLayout.AddChidren(btnclick);
            frameLayout.AddChidren(btnSwitchIcon);
            frameLayout.AddChidren(btnIsDelTag);
            return frameLayout;
        }
    }