合并温居城代码

wxr

2021-07-09 2ada6ff2b2db4f10ff6a44333d07a51777c5c4a8

合并温居城代码

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -18,8 +18,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>

 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)

 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;

 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

 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>