From bdc8f378f6d736fda030b3ceceab3acd91505679 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 16:10:50 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-cqy（1.5.9）
---
HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
index d5a2001..65e7438 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
@@ -5,19 +5,44 @@
{
public class ShowDialog
{
+
+ private static ShowDialog showDialog;
+
+ public static ShowDialog Currnet
+ {
+ get
+ {
+ if (showDialog == null)
+ {
+
+ showDialog = new ShowDialog();
+ }
+
+ return showDialog;
+
+ }
+ }
+
+
+ public Dialog dialog;
+
/// <summary>
///
/// </summary>
/// <param name="title">鏍囬</param>
- /// <param name="action1">鍥炶皟鍑芥暟</param>
- /// <param name="action2">鍥炶皟鍑芥暟</param>
- public void ClickBox(string title, Action<Dialog> action1, Action<Dialog> action2)
+ /// <param name="jieTingAction">鍥炶皟鍑芥暟</param>
+ /// <param name="guanBiAction">鍥炶皟鍑芥暟</param>
+ public void ClickBox(string title, Action<Dialog> jieTingAction, Action<Dialog> guanBiAction)
{
- Dialog dialog = new Dialog()
+ if (dialog != null)
+ {
+ //闃叉浜岄噸鐣岄潰
+ dialog.Close();
+ }
+ dialog = new Dialog()
{
BackgroundColor = MusicColor.PopupBackgroundColor,
};
-
FrameLayout whiteView = new FrameLayout()
{
X = Application.GetRealWidth(56),
@@ -50,11 +75,11 @@
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
TextAlignment = TextAlignment.CenterLeft,
- Text = "鏉ヨ嚜鈥滃洿澧欐満鈥濆懠鍙�",
+ Text = title,
};
whiteView.AddChidren(btnTitle);
-
+
Button guaduanIconBtn = new Button
{
X = Application.GetRealWidth(75),
@@ -77,12 +102,11 @@
guaduanIconBtn.MouseUpEventHandler += (sender, e) =>
{
- action1(dialog);
+ guanBiAction(dialog);
};
jietingIconBtn.MouseUpEventHandler += (sender, e) =>
{
-
- action2(dialog);
+ jieTingAction(dialog);
};
}
--
Gitblit v1.8.0