From 84fa7c9665d9bed9aef79237be9c5eb57c49f13d Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 05 三月 2021 10:54:37 +0800
Subject: [PATCH] Merge branch 'CJL' into ez-test
---
HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs
index fb7bb19..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,11 +158,11 @@
{
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();
--
Gitblit v1.8.0