From c8c33200e43f05136eca9fc8ff4942f8def31cc6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 18 八月 2021 10:45:40 +0800
Subject: [PATCH] 2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接

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