From f35f1397c980efdc2542dff7aaa23b1a7dbb65e7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 10:53:34 +0800
Subject: [PATCH] 2020-12-16-1
---
HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..fb7bb19 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()
{
@@ -138,8 +138,6 @@
movieSceneView.AddChidren(btnMovieSceneText);
#endregion
-#endif
-
LoadEventList();
}
@@ -157,16 +155,21 @@
{
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() { 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;
};
}
--
Gitblit v1.8.0