From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本
---
HDL_ON/DAL/DriverLayer/Control_TcpServer.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs b/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs
index 5d6292d..82a2caa 100644
--- a/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs
@@ -196,14 +196,14 @@
var addSidFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<TcpTransmissionSidsObj>(tcpDataObj.BodyDataString);
Application.RunOnMainThread(() =>
{
- var tipDialog = new UI.UpdataTcpResidenceDataDialog();
+ var tipDialog = new UI.UpdataSidDataDialog();
var tcpLocalFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Function>>(Newtonsoft.Json.JsonConvert.SerializeObject(addSidFunction.objects));
tipDialog.ShowDialog(tcpLocalFunction, tcpFunctionOidJsonString);
});
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