From a01f2b7bb230a6a384ba1555280e3977154488a1 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 20:42:44 +0800
Subject: [PATCH] 2020-12-23 1.解决点击通知栏打开不了APP问题
---
HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs | 21 +++++++++++++++------
1 files changed, 15 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
old mode 100644
new mode 100755
index 781bfce..fa5a3fe
--- 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,7 +158,13 @@
{
btnAddSceneBg.MouseUpEventHandler = (sender, e) =>
{
- if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.HomeGateway.gatewayId))
+ //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;
@@ -164,12 +173,12 @@
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