From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
old mode 100755
new mode 100644
index 3d45a4a..a8d8520
--- a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
@@ -11,12 +11,27 @@
/// </summary>
public class ConfirmDialog : Dialog
{
+ /// bodyView
+ /// </summary>
+ FrameLayout bodyView;
+ /// <summary>
+ /// 鏄惁鍔犺浇鎶ヨ棰滆壊绐楀彛(绾㈣壊)
+ /// </summary>
+ bool isAlarmColor = false;
+
/// <summary>
///
/// </summary>
public ConfirmDialog()
{
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ public ConfirmDialog(bool isAlarmColor)
+ {
+ this.isAlarmColor = isAlarmColor;
}
/// <summary>
@@ -32,6 +47,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 +65,7 @@
BorderWidth = 0,
Radius = (uint)Application.GetMinRealAverage(10),
};
- this.AddChidren(contentView);
+ bodyView.AddChidren(contentView);
Button btnTitle = new Button()
{
@@ -122,7 +145,13 @@
okAction?.Invoke();
};
- this.Show();
+ //this.Show();
+ if(isAlarmColor)
+ {
+ btnTitle.TextColor = CSS_Color.WarningColor;
+ btnConfirm.TextColor = CSS_Color.MainBackgroundColor;
+ btnConfirm.BackgroundColor = CSS_Color.WarningColor;
+ }
}
/// <summary>
@@ -134,6 +163,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 +179,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 +191,7 @@
public void ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction = null)
{
this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction);
+ this.Show();
}
/// <summary>
@@ -175,7 +207,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 鍦―ialog娌″叧闂儏鍐典笅璋冪敤
+ /// 鍙互鑷畾涔夋寜閽枃瀛�
+ /// </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();涓嶉渶瑕乻how
+ }
}
}
--
Gitblit v1.8.0