Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

 HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs

@@ -11,6 +11,12 @@
    {
        Dialog dialog;
        FrameLayout bodyView;

        /// <summary>
        /// 回掉函数
        /// </summary>
        public Action rebackAction = null;

        public OperationResultDisPalyPage()
        {
            dialog = this;
@@ -24,7 +30,8 @@
        /// <param name="title">页面标题</param>
        /// <param name="tipTitle">提示标题</param>
        /// <param name="tipMsg">提示信息</param>
        public void LoadPage(bool result,string title,string tipTitle,string tipMsg)
        /// <param name="confirmText">按钮文本</param>
        public void LoadPage(bool result,string title,string tipTitle,string tipMsg,string confirmText = "")
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            dialog.AddChidren(bodyView);
@@ -77,8 +84,14 @@
                TextSize = CSS_FontSize.SubheadingFontSize,
            };
            bodyView.AddChidren(btnConfirm);
            if(confirmText != "")
            {
                btnConfirm.Text = confirmText;
            }

            btnConfirm.MouseUpEventHandler = (sender, e) => {
                this.Close();
                rebackAction?.Invoke();
            };

        }