blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xm
2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f 
 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;


@@ -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 = "";


                    //转换成bus需要的数据格式


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