From cbe3c22d13b30208eccfa75ecd36f88adaa72930 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 26 二月 2021 16:50:00 +0800
Subject: [PATCH] Merge branch 'ez-test' into temp-wxr
---
HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
index 2da30d5..56b569f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
@@ -63,6 +63,8 @@
addSceneView.AddChidren(btnAddSceneText);
#endregion
+ #region F3闃舵
+ /*
#region 鎹曡幏鍦烘櫙
FrameLayout catchSceneView = new FrameLayout()
{
@@ -137,7 +139,8 @@
};
movieSceneView.AddChidren(btnMovieSceneText);
#endregion
-
+ */
+ #endregion
LoadEventList();
}
@@ -155,18 +158,18 @@
{
btnAddSceneBg.MouseUpEventHandler = (sender, e) =>
{
- if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
- {
- new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.UnableToCreateScenarioPleaseBindGateway), 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.FunctionList.List.scenes.Count).ToString();
+ scene.name = Language.StringByID(StringId.Scene) + " " + (1 + FunctionList.List.scenes.Count).ToString();
var aep = new SceneAddPage(scene,backAction);
MainPage.BasePageView.AddChidren(aep);
aep.LoadPage();
--
Gitblit v1.8.0