From 3095d187951ee524f557312f5bf0a7b297be566e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 14:48:31 +0800
Subject: [PATCH] 2021-10-15 1.修改乐橙推送字段，psk参数取值不能取cname和deviceName
---
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 b305916..295098b 100644
--- a/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs
@@ -182,7 +182,7 @@
void AnalysisTcpData(Socket socket, string tcpBodyDataString)
{
MainPage.Log($"0001 tcpDataString:\r\n {tcpBodyDataString}");
- var tcpDataObj = Control.Ins.AnalysisReceiveData(tcpBodyDataString);
+ var tcpDataObj = Control.Ins.AnalysisReceiveData(tcpBodyDataString, null);
if (tcpDataObj.BodyDataString == null)
{
return;
@@ -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