合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

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

@@ -124,7 +124,11 @@
        /// <summary>
        ///  按+跳转到逻辑界面的方法
        /// </summary>
<<<<<<< HEAD
        public void SkipAddLogicPage(Logic logic=null)
=======
        public static void SkipAddLogicPage()
>>>>>>> origin/CJL-LC
        {
            if (logic == null)
            {
@@ -261,7 +265,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
@@ -511,7 +515,7 @@
            }
        }
        /// <summary>
        /// 判断网关类型
        /// 判断网关类型(0:bus网关；1:A协议网关)
        /// </summary>
        /// <returns></returns>
        public static bool IsGatewayType
@@ -522,20 +526,16 @@
                {
                    return true;
                }
                else
                {
                    return false;

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