Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

 HDL_ON/DAL/DriverLayer/Control_TcpServer.cs

@@ -196,7 +196,7 @@
                    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);
                    });