Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

 HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs

@@ -6,7 +6,7 @@
{
    /// <summary>
    /// 通用二次确认界面
    /// 可以自定义按钮文字
    /// 可以自定义按钮文字、提示内容支持多行显示
    /// </summary>
    public class ConfirmDialog : Dialog
    {
@@ -15,7 +15,7 @@
        /// </summary>
        public ConfirmDialog()
        {
           

        }

        /// <summary>
@@ -45,8 +45,8 @@

            Button btnTitle = new Button()
            {
                Y = Application.GetRealHeight(16),
                Height = Application.GetRealHeight(30),
                Y = Application.GetRealHeight(20),
                Height = Application.GetRealHeight(22),
                TextColor = CSS_Color.MainColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextAlignment = TextAlignment.Center,
@@ -55,16 +55,18 @@
            };
            contentView.AddChidren(btnTitle);

            //提示内容按钮
            Button btnMsg = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Height = Application.GetRealHeight(25),
                Y = btnTitle.Bottom,
                Width = Application.GetRealHeight(200),
                Y = btnTitle.Bottom + Application.GetRealHeight(4),
                X = Application.GetRealWidth(6),
                Height = Application.GetRealHeight(46),
                Width = Application.GetRealWidth(258),
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Text = msgStr,
                IsMoreLines = true,
            };
            contentView.AddChidren(btnMsg);