From d53f7315de145266e6465d9f95d11d1712b9a91b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 20:55:28 +0800
Subject: [PATCH] 20201218-6

---
 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index 6b4111e..24834bd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -196,7 +196,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
-                TextID = StringId.BelongToZone,
+                TextID = StringId.LocationManagement,
             };
             belongToZoneRow.AddChidren(btnBelongToTitle);
 
@@ -217,7 +217,7 @@
                 TextAlignment = TextAlignment.CenterRight,
                 TextColor = CSS_Color.PromptingColor1,
                 TextSize = CSS_FontSize.TextFontSize,
-                Text = scene.GetRoomListName() == "" ? Language.StringByID(StringId.WholeHouseScene) : scene.GetRoomListName()
+                Text = scene.GetRoomListName() == "" ? Language.StringByID(StringId.WholeZone) : scene.GetRoomListName()
             };
             belongToZoneRow.AddChidren(btnZoneName);
 
@@ -312,7 +312,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.MainColor,
                 TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.AddFunction,
+                TextID = StringId.FunctionManagement,
                 IsBold = true,
             };
             addFunctionRow.AddChidren(btnAddFunctionTitle);
@@ -895,12 +895,12 @@
                     }
                 }
                 string result = "";
-                var addScene = FunctionList.List.AddScene(scene,out result);
+                var addScene = FunctionList.List.AddScene(scene,out scene);
                 if (addScene != null)
                 {
                     FunctionList.List.scenes.Add(scene);
                     backAction();
-                    this.RemoveFromParent();
+                    RemoveFromParent();
                 }
                 else
                 {

--
Gitblit v1.8.0