From f33dd4fa2eabf0be8fe41c4e716339033a70e312 Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 12 Aug 2021 12:26:43 +0800 Subject: [PATCH] =?UTF-8?q?tcp=E4=BC=A0=E8=BE=93=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BF=83=E7=8E=87=E8=B8=8F=E9=A2=91=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.config | 6 +++--- Model/MsgModel.cs | 10 +++++++++- ViewModels/MainWindowViewModel.cs | 2 +- lib/TurfCS.dll | Bin 0 -> 20480 bytes 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 lib/TurfCS.dll diff --git a/App.config b/App.config index b9492c7..37e3262 100644 --- a/App.config +++ b/App.config @@ -1,10 +1,10 @@  - + - - + + \ No newline at end of file diff --git a/Model/MsgModel.cs b/Model/MsgModel.cs index d27bc85..30c4e71 100644 --- a/Model/MsgModel.cs +++ b/Model/MsgModel.cs @@ -14,6 +14,10 @@ namespace OnlineUserPool.Model public bool exit = false; public double Speed { get; set; } + public double HeartRate { get; set; } + public double Power { get; set; } + public double Cadence { get; set; } + public int TotalTicks { get; set; } ///// ///// 需要展示的属性 ///// @@ -42,7 +46,11 @@ namespace OnlineUserPool.Model public string ToString(int v) { - return $"{ RouteId },{ MemberId },{ string.Join(":", Point) },{ Convert.ToInt32(IsCompleted) },{ Speed },{ PreDistance },{ EndDistance },{ WeightKg },{ Competitionid },{ Convert.ToInt32(Saved) }"; + if (v == 2) + { + return $"{ RouteId },{ MemberId },{ string.Join(":", Point) },{ Convert.ToInt32(IsCompleted) },{ Speed },{ PreDistance },{ EndDistance },{ WeightKg },{ Competitionid },{ Convert.ToInt32(Saved)},{ Power} ,{ HeartRate},{ Cadence},{ TotalTicks}"; + } + return $"{ RouteId },{ MemberId },{ string.Join(":", Point) },{ Convert.ToInt32(IsCompleted) },{ Speed },{ PreDistance },{ EndDistance },{ WeightKg },{ Competitionid },{ Convert.ToInt32(Saved)}"; } } } diff --git a/ViewModels/MainWindowViewModel.cs b/ViewModels/MainWindowViewModel.cs index 587b048..a6d0c74 100644 --- a/ViewModels/MainWindowViewModel.cs +++ b/ViewModels/MainWindowViewModel.cs @@ -349,7 +349,7 @@ namespace OnlineUserPool.ViewModels { //ddd = data2; - var temp = string.Join("|", list.Where(m => m.Competitionid == item.Competitionid).Select(m => m.ToString(1))) + "|"; + var temp = string.Join("|", list.Where(m => m.Competitionid == item.Competitionid).Select(m => m.ToString(2))) + "|"; var watchList1 = string.Join('|', clients1.Where(c => c.IsWatch && c.Competitionid == item.Competitionid).Select(c => c.MemberId)); var strV21 = $"*l{{{ temp }}};w{{{ watchList1 }}}#"; diff --git a/lib/TurfCS.dll b/lib/TurfCS.dll new file mode 100644 index 0000000000000000000000000000000000000000..b66c26e13cdab6105abb56770efb2704f1d8315c GIT binary patch literal 20480 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 literal 0 HcmV?d00001