From 6ba43603ccd8868a4ee73e9b978b7cb20a5b2c52 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 14:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
index 9603b0c..54fb5ad 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TipPopView.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Threading;
using HDL_ON.UI.CSS;
using Shared;
@@ -52,7 +53,7 @@
X = Application.GetRealWidth(35),
Height = Application.GetRealHeight(22),
Width = Application.GetRealWidth(200),
- TextColor =CSS_Color.textConfirmColor,
+ TextColor = CSS_Color.textConfirmColor,
TextSize = TextSize.text16,
TextAlignment = TextAlignment.Center,
TextID = titleId,
@@ -116,7 +117,7 @@
Width = Application.GetRealWidth(135),
Height = Application.GetRealHeight(44),
TextAlignment = TextAlignment.Center,
- TextColor =CSS_Color.textTipColor,
+ TextColor = CSS_Color.textTipColor,
TextSize = TextSize.text16,
TextID = StringId.cancelMusic,
Gravity = Gravity.BottomLeft,
@@ -401,7 +402,7 @@
X = Application.GetRealWidth(20),
Height = Application.GetRealHeight(22),
Width = Application.GetRealWidth(270 - 20 * 2),
- TextColor =CSS_Color.textTipColor,
+ TextColor = CSS_Color.textTipColor,
TextSize = TextSize.text12,
TextAlignment = TextAlignment.Center,
TextID = tipTxet,
@@ -423,7 +424,7 @@
Width = Application.GetRealWidth(135),
Height = Application.GetRealHeight(44),
TextAlignment = TextAlignment.Center,
- TextColor =CSS_Color.textTipColor,
+ TextColor = CSS_Color.textTipColor,
TextSize = TextSize.text16,
TextID = StringId.cancelMusic,
Gravity = Gravity.BottomLeft,
@@ -565,5 +566,14 @@
};
}
+
+ /// <summary>
+ /// 淇℃伅鎻愮ず绐楀彛锛岃嚜鍔ㄥ叧闂�
+ /// </summary>
+ /// <param name="msg">鎻愮ず閿欒鏂囨湰</param>
+ public void FlashingBox(string msg)
+ {
+ new PublicAssmebly().TipMsgAutoClose(msg, false, 2000);
+ }
}
}
--
Gitblit v1.8.0