From 2ada6ff2b2db4f10ff6a44333d07a51777c5c4a8 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 09 七月 2021 17:18:48 +0800 Subject: [PATCH] 合并温居城代码 --- HDL_ON/DAL/Server/HttpUtil.cs | 4 ++-- HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 5 +++++ HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 4 ++-- HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs | 2 +- HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs index b271fdb..0dec30c 100644 --- a/HDL_ON/DAL/Server/HttpUtil.cs +++ b/HDL_ON/DAL/Server/HttpUtil.cs @@ -18,8 +18,8 @@ /// 鍏叡鍩熷悕灏辫繎瑙f瀽 /// /// </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 4b1896f..d6af876 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs @@ -537,7 +537,7 @@ { var value = view.GetValue(key, text); selectedState = device.spk + "_"+ key; - AddDictionary(key, value, "integer"); + AddDictionary(key, value, "integer","in"); Save(device,index, edit); }); } @@ -553,7 +553,7 @@ private void GetEditState(Entity.Function device, int index, Button button1, Button button2, Button button3, Button button4) { Input inputs = Logic.currlogic.input[index]; - var dicList = inputs.condition as List<Dictionary<string, string>>; + var dicList = inputs.condition; //娓呴櫎涔嬪墠鏃ф暟鎹� dicSateteList.Clear(); if (dicList.Count != 0) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs index 9357a40..c1ec71b 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs @@ -1782,6 +1782,11 @@ } break; } + + if (!MainView.IsGatewayType) + { + name +=Language.StringByID(StringId.push); + } } catch { } return name; diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs index ae546df..372f4bb 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs @@ -513,7 +513,7 @@ /// <summary> /// 鍒ゆ柇缃戝叧绫诲瀷(0:bus缃戝叧锛�1:A鍗忚缃戝叧) /// </summary> - /// <returns></returns> + /// <returns>true=A鍗忚缃戝叧;false=bus缃戝叧</returns> public static bool IsGatewayType { get diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs index d8930a7..661dbcd 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs @@ -169,7 +169,7 @@ , (text) => { var value= pmView.GetValue("pm25", text); - AddDic("pm2.5", "=", value); + AddDic("pm2.5", "in", value); }); } /// <summary> -- Gitblit v1.8.0