From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 2497cbb..95b5452 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/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绫诲瀷杞崲涓烘暟缁�);
--
Gitblit v1.8.0