2021-11-17-01

JLChen

2021-11-17 4a446825261d475ac1e9b8402fb956c1d26b9ffe

 HDL_ON/UI/UI2/3-Intelligence/Automation/OutdoorEnvironment.cs

@@ -129,31 +129,31 @@
                {
                    case StringId.wendugaoyu:
                        {
                            keyValue = "outdoor_temp";
                            keyValue = "temperature";
                            comparator = ">";
                        }
                        break;
                    case StringId.wendudiyu:
                        {
                            keyValue = "outdoor_temp";
                            keyValue = "temperature";
                            comparator = "<";
                        }
                        break;
                    case StringId.shidugaoyu:
                        {
                            keyValue = "outdoor_humity";
                            keyValue = "humidity";
                            comparator = ">";
                        }
                        break;
                    case StringId.shidudiyu:
                        {
                            keyValue = "outdoor_humity";
                            keyValue = "humidity";
                            comparator = "<";
                        }
                        break;
                }

                AddDic(keyValue, comparator, value);
                AddDic(keyValue, comparator, value,"float");
            });
        }
        /// <summary>
@@ -169,24 +169,24 @@
               , (text) =>
               {
                   var value= pmView.GetValue("pm25", text);
                   AddDic("pm2.5", "in", value);
                   AddDic("pm25", "in", value, "integer");
               });
        }
        /// <summary>
        /// 封装数据
        /// </summary>
        /// <param name="keyValue">类型值(pm2.5；outdoor_temp；outdoor_humity)</param>
        /// <param name="keyValue">类型值(pm25；temperature；humidity)</param>
        /// <param name="comparator">比较关系</param>
        /// <param name="value">值</param>
        private void AddDic(string keyValue, string comparator, string value)
        public void AddDic(string keyValue, string comparator,string value,string data_type)
        {
            Input input = new Input();
            input.sid = LogicMethod.CurrLogicMethod.NewSid();
            input.condition_type = "4";
            input.condition_type = "6";
            Dictionary<string, string> dic = new Dictionary<string, string>();
            LogicMethod.CurrLogicMethod.dictionary(dic, "key", keyValue);
            LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", comparator);
            LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "float");
            LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", data_type);
            LogicMethod.CurrLogicMethod.dictionary(dic, "value", value);
            input.condition.Add(dic);
            AddCondition(input, keyValue, comparator);
@@ -204,7 +204,7 @@
            for (var i = 0; i < Logic.currlogic.input.Count; i++)
            {
                var condition_type = Logic.currlogic.input[i].condition_type;
                if (condition_type == "4")
                if (condition_type == "6")
                {
                    var dicList = Logic.currlogic.input[i].condition;
                    if (ExistKey(dicList, keyValue, comparator))