From 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 15:16:00 +0800
Subject: [PATCH] Merge branch 'NewFilePath'

---
 HDL_ON/UI/UI0-Public/PublicAssmebly.cs |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index a2406d7..25523fb 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -202,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()
             {
@@ -243,6 +243,7 @@
                 TextColor = CSS_Color.TextualColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                 TextID = msgId,
+                IsMoreLines = true,
             };
             contentView.AddChidren(btnMsg);
 
@@ -385,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()
             {
@@ -426,6 +427,7 @@
                 TextColor = CSS_Color.TextualColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                 TextID = msgId,
+                IsMoreLines = true,
             };
             contentView.AddChidren(btnMsg);
 
@@ -459,6 +461,7 @@
             btnConfirm.MouseUpEventHandler += (sender, e) =>
             {
                 btnConfirm.IsSelected = false;
+                action?.Invoke();
                 dialog.Close();
             };
 
@@ -538,12 +541,10 @@
         /// 鍦烘櫙寤舵椂璁剧疆寮圭獥
         /// </summary>
         /// <param name="function"></param>
-        public void SetSceneDelayDialog(Scene  scene,Button btn)
+        public void SetSceneDelayDialog(Action<string> action,string changeDelay)
         {
             Button lastButton = new Button();
-            int changeDelay = 0;
             Dialog dialog = new Dialog();
-
             var pView = new FrameLayout()
             {
                 BackgroundColor = CSS_Color.DialogTransparentColor1,
@@ -621,7 +622,7 @@
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 X = Application.GetRealWidth(20),
                 Y = Application.GetRealHeight(80),
-                IsSelected = scene.delayText == "30s"
+                IsSelected = changeDelay == "30"
             };
             optionBaseView.AddChidren(btn1);
 
@@ -641,7 +642,7 @@
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 X = Application.GetRealWidth(195),
                 Y = Application.GetRealHeight(80),
-                IsSelected = scene.delayText == "1min"
+                IsSelected = changeDelay == "60"
             };
             optionBaseView.AddChidren(btn2);
 
@@ -661,7 +662,7 @@
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 X = Application.GetRealWidth(20),
                 Y = Application.GetRealHeight(140),
-                IsSelected = scene.delayText == "2min"
+                IsSelected = changeDelay == "120"
             };
             optionBaseView.AddChidren(btn3);
 
@@ -681,7 +682,7 @@
                 SelectedBackgroundColor = CSS_Color.MainColor,
                 X = Application.GetRealWidth(195),
                 Y = Application.GetRealHeight(140),
-                IsSelected = scene.delayText == "5min"
+                IsSelected = changeDelay == "300"
             };
             optionBaseView.AddChidren(btn4);
 
@@ -701,9 +702,8 @@
             };
             btnConfrim.MouseUpEventHandler = (sender, e) =>
             {
+                action(changeDelay);
                 dialog.Close();
-                scene.delay = changeDelay;
-                btn.Text = scene.delayText;
             };
             btn1.MouseUpEventHandler = (sender, e) => {
                 btn1.IsSelected = !btn1.IsSelected;
@@ -712,11 +712,11 @@
                 btn4.IsSelected = false;
                 if(btn1.IsSelected)
                 {
-                    changeDelay = 30;
+                    changeDelay = "30";
                 }
                 else
                 {
-                    changeDelay = 0;
+                    changeDelay = "0";
                 }       
             };
             btn2.MouseUpEventHandler = (sender, e) => {
@@ -726,11 +726,11 @@
                 btn4.IsSelected = false;
                 if (btn2.IsSelected)
                 {
-                    changeDelay = 60;
+                    changeDelay = "60";
                 }
                 else
                 {
-                    changeDelay = 0;
+                    changeDelay = "0";
                 }
             };
             btn3.MouseUpEventHandler = (sender, e) => {
@@ -740,11 +740,11 @@
                 btn4.IsSelected = false;
                 if (btn3.IsSelected)
                 {
-                    changeDelay = 120;
+                    changeDelay = "120";
                 }
                 else
                 {
-                    changeDelay = 0;
+                    changeDelay = "0";
                 }
             };
             btn4.MouseUpEventHandler = (sender, e) => {
@@ -754,11 +754,11 @@
                 btn1.IsSelected = false;
                 if (btn4.IsSelected)
                 {
-                    changeDelay = 300;
+                    changeDelay = "300";
                 }
                 else
                 {
-                    changeDelay = 0;
+                    changeDelay = "0";
                 }
             };
 

--
Gitblit v1.8.0