Merge branch 'CJL' into NewFilePath

wxr

2020-12-20 6a8e27a164158b31356b30c1e2947b95898275fe

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

old mode 100755
new mode 100644
@@ -11,6 +11,10 @@
    /// </summary>
    public class ConfirmDialog : Dialog
    {
        /// bodyView
        /// </summary>
        FrameLayout bodyView;

        /// <summary>
        /// 
        /// </summary>
@@ -32,6 +36,14 @@
        {
            this.BackgroundColor = CSS_Color.DialogTransparentColor1;

            if (bodyView != null && bodyView.Parent != null)
            {
                bodyView.RemoveFromParent();
            }

            bodyView = new FrameLayout();
            this.AddChidren(bodyView);

            FrameLayout contentView = new FrameLayout()
            {
                Gravity = Gravity.Center,
@@ -42,7 +54,7 @@
                BorderWidth = 0,
                Radius = (uint)Application.GetMinRealAverage(10),
            };
            this.AddChidren(contentView);
            bodyView.AddChidren(contentView);

            Button btnTitle = new Button()
            {
@@ -122,7 +134,7 @@
                okAction?.Invoke();
            };

            this.Show();
            //this.Show();
        }

        /// <summary>
@@ -134,6 +146,7 @@
        public void ShowDialog(int titleId, int msgId, Action okAction, Action cancelAction = null)
        {
            this.ShowDialogBase(Language.StringByID(titleId), Language.StringByID(msgId), okAction, cancelAction);
            this.Show();
        }

        /// <summary>
@@ -149,6 +162,7 @@
        public void ShowDialog(int titleId, int msgId, Action okAction, Action cancelAction, int cancelID, int confirmID)
        {
            this.ShowDialogBase(Language.StringByID(titleId), Language.StringByID(msgId), okAction, cancelAction, cancelID, confirmID);
            this.Show();
        }

        /// <summary>
@@ -160,6 +174,7 @@
        public void ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction = null)
        {
            this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction);
            this.Show();
        }

        /// <summary>
@@ -175,7 +190,23 @@
        public void ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID, int confirmID)
        {
            this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction, cancelID, confirmID);
            this.Show();
        }

        /// <summary>
        /// RefreshDialog 在Dialog没关闭情况下调用
        /// 可以自定义按钮文字
        /// </summary>
        /// <param name="titleStr"></param>
        /// <param name="msgStr"></param>
        /// <param name="okAction"></param>
        /// <param name="cancelAction"></param>
        /// <param name="cancelID"></param>
        /// <param name="confirmID"></param>
        public void RefreshDialog(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID, int confirmID)
        {
            this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction, cancelID, confirmID);
            //this.Show();不需要show
        }
    }
}