From e8b6418aa6c922876b28abe05bc155875b6c5aa6 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 16 Dec 2020 13:47:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=AF=94=E8=B5=9B=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Hander/MapRecordRankingHander.cs | 7 ++++++- Model/MsgModel.cs | 2 ++ ViewModels/MainWindowViewModel.cs | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Hander/MapRecordRankingHander.cs b/Hander/MapRecordRankingHander.cs index 09ed34e..f74f157 100644 --- a/Hander/MapRecordRankingHander.cs +++ b/Hander/MapRecordRankingHander.cs @@ -59,6 +59,11 @@ namespace OnlineUserPool.Hander // targetData._Power.ToString(), // targetData._Cadence.ToString() //}; + var weightKg = 0.0D; + if(targetData._Power >= 0) + { + weightKg = Math.Round(targetData._Power / item.Weight, 2); + } var info = new MsgModel() { exit = item.End, @@ -72,7 +77,7 @@ namespace OnlineUserPool.Hander CommandType = 1, IsVirtual = true, Speed = targetData._Speed, - WeightKg = Math.Round(targetData._Power / item.Weight, 2), + WeightKg = weightKg, PreDistance = item.GetPreDistance() }; msgModels.Add(info); diff --git a/Model/MsgModel.cs b/Model/MsgModel.cs index 88f00be..c03c117 100644 --- a/Model/MsgModel.cs +++ b/Model/MsgModel.cs @@ -41,5 +41,7 @@ namespace OnlineUserPool.Model public double WeightKg { get; set; } public int Competitionid { get; set; } + + public bool Saved { get; set; } } } diff --git a/ViewModels/MainWindowViewModel.cs b/ViewModels/MainWindowViewModel.cs index 00ca732..3e76464 100644 --- a/ViewModels/MainWindowViewModel.cs +++ b/ViewModels/MainWindowViewModel.cs @@ -210,7 +210,8 @@ namespace OnlineUserPool.ViewModels m.EndDistance, m.IsVirtual,//后面要把这个字段过滤掉 m.WeightKg, - m.Competitionid + m.Competitionid, + m.Saved })); var data = Encoding.ASCII.GetBytes(jsonString); foreach (var item in clients)