From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1

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

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
index aa25881..2da30d5 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
@@ -154,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() { 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 + Entity.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