Revert "20201127 接受bus数据修改完成，搜索网关、一端口修改完成"

wei

2020-11-27 1293fea19c6a2b558986856e301d5218c1979692

 HDL_ON/UI/UI0-Public/ConfirmDialog.cs

File was renamed from HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
@@ -21,14 +21,15 @@
        /// <summary>
        /// 初始化Dialog
        /// </summary>
        /// <param name="titleStr"></param>
        /// <param name="msgStr"></param>
        /// <param name="titleId"></param>
        /// <param name="msgId"></param>
        /// <param name="okAction"></param>
        /// <param name="cancelAction"></param>
        /// <param name="cancelID"></param>
        /// <param name="confirmID"></param>
        void ShowDialogBase(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID = StringId.Cancel, int confirmID = StringId.Confirm)
        void ShowDialogBase(int titleId, int msgId, Action okAction, Action cancelAction, int cancelID = StringId.Cancel, int confirmID = StringId.Confirm)
        {

            this.BackgroundColor = CSS_Color.DialogTransparentColor1;

            FrameLayout contentView = new FrameLayout()
@@ -51,7 +52,7 @@
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextAlignment = TextAlignment.Center,
                IsBold = true,
                Text = titleStr,
                TextID = titleId,
            };
            contentView.AddChidren(btnTitle);

@@ -64,7 +65,7 @@
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Text = msgStr,
                TextID = msgId,
            };
            contentView.AddChidren(btnMsg);

@@ -106,7 +107,7 @@
            //例：右下圆角 大小为50
            int mRectCornerID = HDLUtils.RectCornerBottomRight;
            btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);

         
            btnCancel.MouseUpEventHandler += (sender, e) =>
            {
                this.Close();
@@ -130,7 +131,7 @@
        /// <param name="callBackAction"></param>
        public void ShowDialog(int titleId, int msgId, Action okAction, Action cancelAction = null)
        {
            this.ShowDialogBase(Language.StringByID(titleId), Language.StringByID(msgId), okAction, cancelAction);
            this.ShowDialogBase(titleId, msgId, okAction, cancelAction);
        }

        /// <summary>
@@ -145,33 +146,7 @@
        /// <param name="confirmID"></param>
        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);
        }

        /// <summary>
        /// 加载提示Dialog
        /// </summary>
        /// <param name="titleId"></param>
        /// <param name="msgId"></param>
        /// <param name="callBackAction"></param>
        public void ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction = null)
        {
            this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction);
        }

        /// <summary>
        /// 加载提示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 ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID, int confirmID)
        {
            this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction, cancelID, confirmID);
            this.ShowDialogBase(titleId, msgId, okAction, cancelAction, cancelID, confirmID);
        }

    }