From 011f58b260bb190256a526c287677b3e2b614c4a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 21 十二月 2022 15:21:42 +0800
Subject: [PATCH] 2022年12月21日15:21:39
---
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 4 ++++
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 12 ++++++------
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index bf39c96..511a91e 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 28be7fe..6841d02 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -226,17 +226,17 @@
///淇濆瓨鐐瑰嚮浜嬩欢
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- if (Logic.currlogic.input.Count == 0 && Logic.currlogic.output.Count == 0)
- {
- new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNullOrtargetNull);
- return;
- }
+ //if (Logic.currlogic.input.Count == 0 && Logic.currlogic.output.Count == 0)
+ //{
+ // new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNullOrtargetNull);
+ // return;
+ //}
if (Logic.currlogic.input.Count == 0)
{
new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNull);
return;
}
- if (Logic.currlogic.output.Count == 0)
+ if (Logic.currlogic.output.Count == 0&&!push.btnNextIcon.IsSelected)
{
new LogicView.TipPopView().TipBox(StringId.tip, StringId.targetNull);
return;
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 35a706a..f172059 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -401,6 +401,10 @@
{
foreach (var scene in listScene)
{
+ if (scene == null) {
+ //鏈夌┖鐜拌薄
+ continue;
+ }
if(scene.sceneType == SceneType.LightScene)
{
continue;
--
Gitblit v1.8.0