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 0000000..b66c26e
Binary files /dev/null and b/lib/TurfCS.dll differ