From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:50:43 +0800 Subject: [PATCH] Revert "1" --- HDL_ON/DAL/DriverLayer/Control_TcpServer.cs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs b/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs index eb77a42..82a2caa 100644 --- a/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs +++ b/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs @@ -203,7 +203,7 @@ break; case CommunicationTopic.BusPcGetAppOids: - var bytes = FileUtils.ReadFile(DB_ResidenceData.OidSavePathName); + var bytes = Common.FileUtlis.Files.ReadFile(DB_ResidenceData.OidSavePathName); if (bytes.Length > 0) { socket.Send(bytes); @@ -215,7 +215,7 @@ sendSidObj.id = Control.Ins.msg_id.ToString(); sendSidObj.time_stamp = ""; //杞崲鎴恇us闇�瑕佺殑鏁版嵁鏍煎紡 - var localFunction = DB_ResidenceData.functionList.GetAllFunction(); + var localFunction = FunctionList.List.GetDeviceFunctionList(); var localFunctionString = Newtonsoft.Json.JsonConvert.SerializeObject(localFunction); var tcpFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<List<BusSidObj>>(localFunctionString); -- Gitblit v1.8.0