赛事微调&mapbox sqlite dll 更新

Assets/Scripts/Scenes/Ride/Model/CyclingModels/CompetitionModel.cs

@@ -109,7 +109,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
             //}
             //#endregion
 
-            var userList = MapUDPService.GetCompetitionOnlineUsers(recorderData.Competitionid).OrderByDescending(u => u.IsCompleted).ThenByDescending(d => d.EndDistance);
+            var userList = MapUDPService.GetCompetitionOnlineUsers(recorderData.Competitionid).OrderByDescending(u => u.IsCompleted).ThenBy(d => d.CreateTime).ThenByDescending(d => d.EndDistance);
             riders.RemoveAll(r => r.IsSelf == false);
             int index = 0;
             List<CompetitionRankingSortModel> sort = new List<CompetitionRankingSortModel>();
@@ -157,9 +157,11 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                         CountryImg = item.Country,//ConfigHelper.Host + $"User/GetCountryImg?userid={ item.Id }",
                         UserId = item.Id,
                         IsSelf = item.IsSelf,
-                        Headimage =item.HeadImage
+                        Headimage = item.HeadImage,
+                        CreateTime = DateTime.MaxValue,
+                        EndDistance = item.EndDistance,
+                        IsCompleted = item.IsCompleted
                     });
-
                 }
             }
 
@@ -180,11 +182,16 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                 foreach (var ranking in mapWorkoutRecordRankings)
                 {
                     //var ranking = mapWorkoutRecordRankings.SingleOrDefault(r => r.UserId == item.Id);
+                    var needUpdate = sort.Where(c => c.UserId == ranking.UserId).FirstOrDefault();
+                    if (needUpdate != null)
+                    {
+                        needUpdate.CreateTime = ranking.CreateTime.ToLocalTime();
+                    }
 
                     var createTime = "";
                     if (ranking != null)
                     {
-                        createTime = ranking.CreateTime;    //.ToString("yyyy-MM-dd HH:mm:ss");
+                        createTime = ranking.CreateTime.ToLocalTime().ToString();    //.ToString("yyyy-MM-dd HH:mm:ss");
                     }
                     results.Add(new CompetitionResultModel
                     {
@@ -196,7 +203,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                         //Time = ranking?.TotalTime ?? "",
                         Power = ranking?.AveragePower ?? 0,
                         BicycleWeight = ranking?.BicycleWeight ?? 0,
-                        HeartRate = ranking?.AverageHeartRate ?? 0,
+                        HeartRate = ranking?.AverageHeartRate,
                         DeviceType = ranking?.DeviceType ?? "",
                         CreateTime = createTime,
                         TripTime = ranking?.TripTime ?? "",

Assets/Scripts/Scenes/Ride/Model/OutModel.cs

@@ -29,6 +29,10 @@ namespace Assets.Scenes.Ride.Scripts.Model
         public int UserId { get; set; }
 
         public bool IsSelf { get; set; }
+
+        public DateTime CreateTime { get; set; }
+        public bool IsCompleted { get; set; }
+        public double EndDistance { get; set; }
     }
     /// <summary>
     /// 结果页模型
@@ -50,7 +54,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
         public double Weight { get; set; }
         public double BicycleWeight { get; set; }
 
-        public double HeartRate { get; set; }
+        public double? HeartRate { get; set; }
 
         public string DeviceType { get; set; }
 
@@ -582,6 +586,8 @@ namespace Assets.Scenes.Ride.Scripts.Model
         }
 
         public string Country { get; set; }
+
+        public DateTime CreateTime { get; set; }
     }
 
     public class KeyPaire