From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1
---
HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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..fa5a3fe 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,6 +63,8 @@
addSceneView.AddChidren(btnAddSceneText);
#endregion
+ #region F3闃舵
+ /*
#region 鎹曡幏鍦烘櫙
FrameLayout catchSceneView = new FrameLayout()
{
@@ -136,7 +139,8 @@
};
movieSceneView.AddChidren(btnMovieSceneText);
#endregion
-
+ */
+ #endregion
LoadEventList();
}
@@ -154,16 +158,27 @@
{
btnAddSceneBg.MouseUpEventHandler = (sender, e) =>
{
+ //if(!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)
+ //{
+ // new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.GatewayOfflineCannotCreateScene), true);
+ // return;
+ //}
+
+ 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.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