From c137c854b904503d5f1815849f380ac2969d161c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 14 三月 2022 19:30:03 +0800
Subject: [PATCH] 2022-03-14-01
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 2 +-
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 72fa068..4917487 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/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 01a0587..f8370df 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -667,6 +667,8 @@
{
if (edit)
{
+ ///
+ this.function = device;
Input inputs = Logic.currlogic.input[index];
//娓呴櫎涔嬪墠鏃ф暟鎹�
dicSateteList.Clear();
@@ -854,6 +856,9 @@
private bool Is_SpkAttribute(string key) {
///淇敼鏂板睘鎬�
///璇嗗埆浣跨敤鍔熻兘鏄惁瀛樺湪灞炴��
+ if (this.function==null) {
+ return false;
+ }
var job = this.function.GetAttribute(key);
if (job != null)
{
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index d209740..d23adfd 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -966,7 +966,7 @@
case "(115,150]": {
text = Language.StringByID(StringId.pmzhongdu);
} break;
- case "(151,100000]": {
+ case "(150,100000]": {
text = Language.StringByID(StringId.pmzhongduwuran);
} break;
}
--
Gitblit v1.8.0