Merge remote-tracking branch 'origin/WJC' into NewFilePath

wei

2020-12-23 0891d90cd0d435338cc2851fd0830cd318a17fff

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

@@ -72,7 +72,7 @@
                        try
                        {
                            //逻辑使能的命令
                            Send.switchLogic(currLogic);
                            Send.SwitchLogic(currLogic);

                        }
                        catch { }
@@ -240,7 +240,7 @@
            }
            List<string> logicIdList = new List<string>();
            //获取逻辑ID列表
            var idStr = Send.getLogicIdList();
            var idStr = Send.GetLogicIdList();
            if (idStr.Code == "0" && idStr.Data != null && idStr.Data.ToString() != "")
            {
                var date = Newtonsoft.Json.JsonConvert.SerializeObject(idStr.Data);
@@ -252,7 +252,7 @@
                }
            }
            //获取自动化列表
            var logicStr = Send.getLogic(logicIdList);
            var logicStr = Send.GetLogic(logicIdList);
            if (logicStr.Code == "0" && logicStr.Data != null && logicStr.Data.ToString() != "")
            {
                //获取逻辑详细返回是一个数组(object类型转换为数组);