Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2023-04-21 666b28d77fc3c1b1dae61c9dfd878c8e683cef8c

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

@@ -26,7 +26,7 @@
            Gravity = Gravity.CenterVertical,
            TextAlignment = TextAlignment.CenterLeft,
        };
       

        /// <summary>
        /// （条件或者目标）设备状态文本描述
        /// </summary>
@@ -39,7 +39,7 @@
            Y = Application.GetRealHeight(17),
            X = Application.GetRealWidth(375 - 48 - 130),
            TextAlignment = TextAlignment.CenterRight,
            Text="",
            Text = "",
        };
        /// <summary>
        /// 图标