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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
index 781bfce..2da30d5 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
@@ -155,7 +155,7 @@
{
btnAddSceneBg.MouseUpEventHandler = (sender, e) =>
{
- if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.HomeGateway.gatewayId))
+ if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
{
new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.UnableToCreateScenarioPleaseBindGateway), true);
return;
@@ -166,10 +166,10 @@
};
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