From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android,没调用拒接接口问题。

---
 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