From 950c0732a016ad3154981e983e71696055db2003 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 08 六月 2021 16:49:12 +0800
Subject: [PATCH] 5月功能迭代版本
---
HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
index 7fde6c8..8e94a49 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
namespace HDL_ON.UI
@@ -62,7 +63,6 @@
addSceneView.AddChidren(btnAddSceneText);
#endregion
-#if stage2
#region 鎹曡幏鍦烘櫙
FrameLayout catchSceneView = new FrameLayout()
{
@@ -101,6 +101,7 @@
#endregion
+ /*
#region 鐢靛奖鍦烘櫙
FrameLayout movieSceneView = new FrameLayout()
{
@@ -137,9 +138,7 @@
};
movieSceneView.AddChidren(btnMovieSceneText);
#endregion
-
-#endif
-
+ */
LoadEventList();
}
@@ -151,8 +150,12 @@
void LoadEventList()
{
LoadEvent_SkipAddScenePage();
+ LoadEvent_SkipCatchScenePage();
}
+ /// <summary>
+ /// 璺宠浆鍒涘缓鍦烘櫙鐣岄潰
+ /// </summary>
void LoadEvent_SkipAddScenePage()
{
btnAddSceneBg.MouseUpEventHandler = (sender, e) =>
@@ -161,12 +164,32 @@
this.RemoveFromParent();
action();
};
- var scene = new Entity.Scene() { roomIdList = new System.Collections.Generic.List<string>() { "" } };
+ var scene = new Scene() { roomIds = new System.Collections.Generic.List<string>() { "" } };
scene.NewSid();
- scene.name = Language.StringByID(StringId.Scene) + " " + (1 + Entity.DB_ResidenceData.functionList.scenes.Count).ToString();
- var aep = new SceneEditPage(scene,backAction);
+ scene.name = Language.StringByID(StringId.Scene) + " " + (1 + FunctionList.List.scenes.Count).ToString();
+ var aep = new SceneAddPage(scene,backAction);
MainPage.BasePageView.AddChidren(aep);
- aep.LoadPage(StringId.NewScene);
+ aep.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
+
+ /// <summary>
+ /// 璺宠浆鎹曡幏鍦烘櫙鐣岄潰
+ /// </summary>
+ void LoadEvent_SkipCatchScenePage()
+ {
+ btnCatchSceneBg.MouseUpEventHandler = (sener, e) => {
+ Action backAction = () => {
+ this.RemoveFromParent();
+ action();
+ };
+ var scene = new Scene() { roomIds = new System.Collections.Generic.List<string>() { "" } };
+ scene.NewSid();
+ scene.name = Language.StringByID(StringId.Scene) + " " + (1 + FunctionList.List.scenes.Count).ToString();
+ var aep = new CatchSceneAddPage(scene, backAction);
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
}
--
Gitblit v1.8.0