From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
index 24f615e..8e94a49 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
@@ -101,6 +101,7 @@
#endregion
+ /*
#region 鐢靛奖鍦烘櫙
FrameLayout movieSceneView = new FrameLayout()
{
@@ -137,7 +138,7 @@
};
movieSceneView.AddChidren(btnMovieSceneText);
#endregion
-
+ */
LoadEventList();
}
@@ -149,27 +150,46 @@
void LoadEventList()
{
LoadEvent_SkipAddScenePage();
+ LoadEvent_SkipCatchScenePage();
}
+ /// <summary>
+ /// 璺宠浆鍒涘缓鍦烘櫙鐣岄潰
+ /// </summary>
void LoadEvent_SkipAddScenePage()
{
btnAddSceneBg.MouseUpEventHandler = (sender, e) =>
{
- if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
- {
- new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.UnableToCreateScenarioPleaseBindGateway), true);
- return;
- }
Action backAction = () => {
this.RemoveFromParent();
action();
};
- var scene = new Entity.Scene() { roomIds = 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.FunctionList.List.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