From 5d6626e390f7bccbbfbc0df1e95f8fb86a53af58 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 15 十二月 2020 18:25:47 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL

---
 HDL_ON/UI/UI0-Public/PublicAssmebly.cs |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 9f45882..d80eb59 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -188,17 +188,10 @@
 
             dialog.Show();
 
-            //btnCancel.MouseDownEventHandler += (sender, e) => {
-            //    btnCancel.IsSelected = true;
-            //};
             btnCancel.MouseUpEventHandler += (sender, e) =>
             {
-                //btnCancel.IsSelected = false;
                 dialog.Close();
             };
-            //btnConfirm.MouseDownEventHandler += (sender, e) => {
-            //    btnConfirm.IsSelected = true;
-            //};
             EditParaterEvent(btnConfirm, errorId_IsNullOrEmpty, errorId_ContainsPar, baseList, etParater, callBackAction,
                 contentView, btnLine, btnCancel, editView, dialog, titleId);
         }
@@ -209,7 +202,7 @@
         /// <param name="titleId"></param>
         /// <param name="msgId"></param>
         /// <param name="callBackAction"></param>
-        public void TipMsg(int titleId, int msgId, Action callBackAction)
+        public void TipOptionMsg(int titleId, int msgId, Action callBackAction)
         {
             Dialog dialog = new Dialog()
             {
@@ -250,6 +243,7 @@
                 TextColor = CSS_Color.TextualColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                 TextID = msgId,
+                IsMoreLines = true,
             };
             contentView.AddChidren(btnMsg);
 
@@ -392,7 +386,7 @@
         /// </summary>
         /// <param name="titleId"></param>
         /// <param name="msgId"></param>
-        public void TipMsg(int titleId, int msgId)
+        public void TipMsg(int titleId, int msgId,Action action = null)
         {
             Dialog dialog = new Dialog()
             {
@@ -433,6 +427,7 @@
                 TextColor = CSS_Color.TextualColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                 TextID = msgId,
+                IsMoreLines = true,
             };
             contentView.AddChidren(btnMsg);
 
@@ -466,6 +461,7 @@
             btnConfirm.MouseUpEventHandler += (sender, e) =>
             {
                 btnConfirm.IsSelected = false;
+                action?.Invoke();
                 dialog.Close();
             };
 
@@ -545,7 +541,7 @@
         /// 鍦烘櫙寤舵椂璁剧疆寮圭獥
         /// </summary>
         /// <param name="function"></param>
-        public void SetSceneDelayDialog(Function function,Button btn)
+        public void SetSceneDelayDialog(Scene  scene,Button btn)
         {
             Button lastButton = new Button();
             int changeDelay = 0;
@@ -628,7 +624,7 @@
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 X = Application.GetRealWidth(20),
                 Y = Application.GetRealHeight(80),
-                IsSelected = function.delayText == "30s"
+                IsSelected = scene.delayText == "30s"
             };
             optionBaseView.AddChidren(btn1);
 
@@ -648,7 +644,7 @@
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 X = Application.GetRealWidth(195),
                 Y = Application.GetRealHeight(80),
-                IsSelected = function.delayText == "1min"
+                IsSelected = scene.delayText == "1min"
             };
             optionBaseView.AddChidren(btn2);
 
@@ -668,7 +664,7 @@
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 X = Application.GetRealWidth(20),
                 Y = Application.GetRealHeight(140),
-                IsSelected = function.delayText == "2min"
+                IsSelected = scene.delayText == "2min"
             };
             optionBaseView.AddChidren(btn3);
 
@@ -688,7 +684,7 @@
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 X = Application.GetRealWidth(195),
                 Y = Application.GetRealHeight(140),
-                IsSelected = function.delayText == "5min"
+                IsSelected = scene.delayText == "5min"
             };
             optionBaseView.AddChidren(btn4);
 
@@ -709,8 +705,8 @@
             btnConfrim.MouseUpEventHandler = (sender, e) =>
             {
                 dialog.Close();
-                function.delay = changeDelay;
-                btn.Text = function.delayText;
+                scene.delay = changeDelay;
+                btn.Text = scene.delayText;
             };
             btn1.MouseUpEventHandler = (sender, e) => {
                 btn1.IsSelected = !btn1.IsSelected;

--
Gitblit v1.8.0