From e073fe7864d815379e4b118b9bcb8a935395381f Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 16 十二月 2020 09:07:23 +0800
Subject: [PATCH] 20201216-1

---
 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 049a185..ff038fd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -93,7 +93,7 @@
 
 
             refreshFunctionRowAction = () => {
-                LoadFunctionRow(functionListView);
+                LoadFunctionRow();
             };
         }
 
@@ -270,7 +270,7 @@
                     TextAlignment = TextAlignment.CenterRight,
                     TextColor = CSS_Color.PromptingColor1,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                    Text = scene.delayText
+                    Text = FunctionList.List.GetDelayText( scene.delay)
                 };
                 sceneDelayRow.AddChidren(btnSceneDelayInfo);
 
@@ -288,7 +288,11 @@
 
                 btnSceneDelayTitle.MouseUpEventHandler = (sender, e) =>
                 {
-                    new PublicAssmebly().SetSceneDelayDialog(scene, btnSceneDelayInfo);
+                    Action<string> action = (obj) => {
+                        scene.delay = obj;
+                        btnSceneDelayInfo.Text = FunctionList.List.GetDelayText(obj);
+                    };
+                    new PublicAssmebly().SetSceneDelayDialog(action,scene.delay);
                 };
 
                 contentView.AddChidren(new Button()
@@ -333,7 +337,7 @@
             };
             contentView.AddChidren(functionListView);
 
-            LoadFunctionRow(functionListView);
+            LoadFunctionRow();
 
             Button btnLine1 = new Button()
             {
@@ -393,6 +397,7 @@
                     }
                     Application.RunOnMainThread(() =>
                     {
+                        LoadFunctionRow();
                         waitPage.Hide();
                     });
                 }
@@ -409,7 +414,7 @@
         /// <summary>
         /// 鍔犺浇鍔熻兘鍒楄〃
         /// </summary>
-        void LoadFunctionRow(VerticalScrolViewLayout functionListView)
+        void LoadFunctionRow()
         {
             functionListView.RemoveAll();
             functionListView.Height = Application.GetRealWidth(65 * scene.functions.Count);
@@ -440,8 +445,6 @@
                 };
                 row.AddChidren(btnRight);
 
-                
-
                 var btnFunctionInfo = new Button()
                 {
                     Width = Application.GetRealWidth(327),
@@ -466,7 +469,7 @@
 
                 if (Convert.ToInt32( scenefunction.delay) > 0)
                 {
-                    btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + scenefunction.localFunction.delayText;
+                    btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + FunctionList.List.GetDelayText(scenefunction.delay);
                 }
                 else
                 {
@@ -763,7 +766,7 @@
         void LoadEvent_ChangeFunctionList()
         {
             btnAddFunctionTitle.MouseUpEventHandler = (sender, e) => {
-                var sefp =new SceneFunctionListEditPage(scene,refreshFunctionRowAction);
+                var sefp =new SceneFunctionListChoosePage(scene,refreshFunctionRowAction);
                 MainPage.BasePageView.AddChidren(sefp);
                 sefp.LoadPage();
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

--
Gitblit v1.8.0