Merge branch 'Dev-Branch' into hxb

hxb

2022-09-22 39cf2411b59772d56ee731f229f09ff472889bad

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

@@ -181,13 +181,13 @@
        public void AddDic(string keyValue, string comparator,string value,string data_type)
        {
            Input input = new Input();
            input.sid = LogicMethod.CurrLogicMethod.NewSid();
            input.sid = LogicMethod.Current.NewSid();
            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", data_type);
            LogicMethod.CurrLogicMethod.dictionary(dic, "value", value);
            LogicMethod.Current.dictionary(dic, "key", keyValue);
            LogicMethod.Current.dictionary(dic, "comparator", comparator);
            LogicMethod.Current.dictionary(dic, "data_type", data_type);
            LogicMethod.Current.dictionary(dic, "value", value);
            input.condition.Add(dic);
            AddCondition(input, keyValue, comparator);
        }
@@ -227,7 +227,7 @@
                Logic.currlogic.input.Add(input);
            }

            LogicMethod.CurrLogicMethod.RemoveAllView();
            LogicMethod.Current.RemoveAllView();
            AddLogic addLogic = new AddLogic();
            MainPage.BasePageView.AddChidren(addLogic);
            addLogic.Show();