From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs | 11 +++++++----
1 files changed, 7 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 7fde6c8..48adb5c 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,11 +155,16 @@
{
btnAddSceneBg.MouseUpEventHandler = (sender, e) =>
{
+ if (!string.IsNullOrEmpty(DB_ResidenceData.residenceData.HomeGateway.gatewayId))
+ {
+ 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 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);
--
Gitblit v1.8.0