Merge branch 'wxr6' into wxr4

wxr

2021-07-05 1ee407dd57a7273ef6b686ac25a40d4199f5bce9

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

@@ -142,6 +142,7 @@
            }
            else
            {

                var onePortAutomation = new OnePortAutomation();
                MainPage.BasePageView.AddChidren(onePortAutomation);
                onePortAutomation.Show();
@@ -260,7 +261,7 @@
            if (idStr.Code == "0" && idStr.Data != null && idStr.Data.ToString() != "")
            {
                var date = Newtonsoft.Json.JsonConvert.SerializeObject(idStr.Data);
                var dateList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LogicData>>(date);
                var dateList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Date>>(date);
                for (int i = 0; i < dateList.Count; i++)
                {
                    //添加逻辑ID
@@ -278,7 +279,6 @@
                    var jay = jArray[a];
                    //数据返序列化为Logic对象
                    var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
                    Console.WriteLine("获取逻辑==="+str);
                    var logic = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic>(str);
                    if (logic != null)
                    {
@@ -316,6 +316,8 @@
                                }
                                newlogic.output.Add(logic.output[i]);
                            }
                            newlogic.noticeConfig = logic.noticeConfig;
                            newlogic.pushConfigs = logic.pushConfigs;
                            //添加逻辑
                            Logic.LogicList.Add(newlogic);
                        }
@@ -357,7 +359,8 @@
            //2-功能图标
            for (int i = 0; i < logic.input.Count; i++)
            {

                if (logic.input[i] == null)
                    continue;
                var int1 = int.Parse(logic.input[i].condition_type);
                int iconInt = 0;
                switch (int1)
@@ -372,6 +375,14 @@
                    case 3:
                        {
                            iconInt = 2;

                        }
                        break;
                    case 4:
                    case 6:
                    case 9:
                        {
                            iconInt = 3;

                        }
                        break;
@@ -466,6 +477,12 @@
                            strIcon = "LogicIcon/selectTheFun.png";
                        }
                        break;
                    case 3:
                        {

                            strIcon = "LogicIcon/shiwaitianqi.png";
                        }
                        break;
                    case 11:
                        {
                            //分割条件和目标的图标
@@ -494,7 +511,7 @@
            }
        }
        /// <summary>
        /// 判断网关类型
        /// 判断网关类型(0:bus网关；1:A协议网关)
        /// </summary>
        /// <returns></returns>
        public static bool IsGatewayType
@@ -504,22 +521,17 @@
                if (Entity.DB_ResidenceData.Instance.GatewayType == 1)
                {
                    return true;

                }
                else
                {
                    return false;

                }
                return false;
            }
        }
    }
    class LogicData
    class Date
    {
        /// <summary>
        /// 云端唯一id
        /// </summary>
        public string userLogicId = ""; 
        public string userLogicId = "";
        /// <summary>
        /// 网关id
        /// </summary>