继骑&重骑骑行结果页细节调整

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

@@ -0,0 +1,67 @@
+using Assets.Scenes.Ride.Scripts.Model.RiderModels;
+using Assets.Scripts;
+using Assets.Scripts.Apis.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
+{
+    public class ReviewModel : BaseCycling
+    {
+        public List<MapRecordRanking> rankings;
+
+        public ReviewModel(Route route1, RouteResultParam param)
+            : base(route1, CyclingModel.Review)
+        {
+            riders = new List<BaseRider>();
+            riders.Add(new OnlineRiderModel()
+            {
+                NickName = App.CurrentUser.Nickname,
+                UserId = App.CurrentUser.Id,
+                WxHeadImg = App.CurrentUser.WxHeadImg,
+                Point = new GeoJSON.Net.Geometry.GeographicPosition(this.route.RouteInstance.Point[0], this.route.RouteInstance.Point[1])
+            });
+        
+            recorderData = new RecorderDataModel()
+            {
+                CurrentUser = App.CurrentUser,
+                Competitionid = 0,
+                ContinueIndex = 0,
+                ContinueMark = Guid.NewGuid().ToString(),
+                EndDistance = 0,
+                PreDistance = 0,
+                IsCompleted = false,
+                IsNeedRanking = true,
+                CyclingState = CyclingStateEnum.Prepare,
+                CurrentRoute = route,
+                CurrentRouteStartDistance = 0,
+            };
+            this.IsRecord = true;
+        }
+
+        public override void Run(TargetData targetData)
+        {
+        
+            riders.RemoveAll(r => r.IsSelf == false);
+            var onlineUsers = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id).Where(d => d.IsSelf == false)
+                .ToList();
+            foreach (var item in onlineUsers)
+            {
+                riders.Add(new OnlineRiderModel()
+                {
+                    NickName = item.Name,
+                    UserId = item.Id,
+                    WxHeadImg = item.HeadImage,
+                    Point = new GeoJSON.Net.Geometry.GeographicPosition(item.Point[0], item.Point[1]),
+                    EndDistance = item.EndDistance,
+                    PreDistance = item.PreDistance,
+                });
+            }
+  
+            base.Run(targetData);
+        }
+    }
+}

Assets/Scenes/Ride/Scripts/Model/CyclingModels/ReviewModel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 363f64631c874c84198aa481f8899911
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,4 +1,5 @@
 using Assets.Scenes.Ride.Scripts.Model.RiderModels;
+using Assets.Scripts.Apis.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,50 +10,43 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
 {
     public class SingleModel : BaseCycling
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="route1"></param>
-        /// <param name="manufacturerId"></param>
-        /// <param name="deviceNumber"></param>
-        /// <param name="antModelId"></param>
-        public SingleModel(Route route1) //SelectParamModel param)
-            : base(route1, CyclingModel.Single)
+
+        public SingleModel(Route route,RouteResultParam param)
+            : base(route, CyclingModel.Single)
         {
-            //recorderData = recorderData1;
             this.IsRecord = true;
             recorderData = new RecorderDataModel()
             {
                 CurrentUser = App.CurrentUser,
-                //BelongUserId = App.CurrentUser.Id,
                 Competitionid = 0,
-                ContinueIndex = 0,
-                ContinueMark = Guid.NewGuid().ToString(),
+                ContinueIndex =  0,
+                ContinueMark =  Guid.NewGuid().ToString(),
                 EndDistance = 0,
                 IsCompleted = false,
                 IsNeedRanking = true,
                 CyclingState = CyclingStateEnum.Prepare,
-                //ManufacturerId = manufacturerId, //ManufacturerId,
                 CurrentRoute = route,
                 CurrentRouteStartDistance = 0,
-                //DeviceNumber = deviceNumber,//DeviceNumber
-                //AntModelId = antModelId,
                 StartTime = DateTime.Now
             };
-            #region TODO 线路上的人
-            //if (param != null)
-            //{
-            //    recorderData.EndDistance = param.EndDistance;
-            //    recorderData.CurrentRouteStartDistance = param.EndDistance;
-            //    if (!string.IsNullOrWhiteSpace(param.ContinueMark))
-            //    {
-            //        recorderData.ContinueMark = param.ContinueMark;
-            //    }
-            //    recorderData.ContinueIndex = param.ContinueIndex.GetValueOrDefault(0);
-            //}
-            //recorderData.PreDistance = recorderData.EndDistance;
+           
+            if (param != null)
+            {
+                recorderData.EndDistance = param.EndDistance;
+                recorderData.CurrentRouteStartDistance = param.EndDistance;
+                if (!string.IsNullOrWhiteSpace(param.ContinueMark))
+                {
+                    recorderData.ContinueMark = param.ContinueMark;
+                }
+                else
+                {
+                    param.ContinueMark = recorderData.ContinueMark;
+                }
+                recorderData.ContinueIndex = param.ContinueIndex.GetValueOrDefault(0);
+            }
+         
+            recorderData.PreDistance = recorderData.EndDistance;
 
-            //TODO 附件的人列表加上自己
             riders = new List<BaseRider>();
             var rider = new OnlineRiderModel()
             {
@@ -65,7 +59,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
             rider.Point = _turfHelper.Along(rider.EndDistance);
 
             riders.Add(rider);
-            #endregion
+          
         }
 
         public override void Run(TargetData targetData)

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

@@ -109,7 +109,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
         /// </summary>
         /// <param name="base64Image"></param>
         /// <returns></returns>
-        public JsonResult<AddMapRecordResultModel> SaveData(CyclingModel cyclingModel, SelectParamModel selectParam,  string imageName = "")
+        public JsonResult<AddMapRecordResultModel> SaveData(CyclingModel cyclingModel, RouteResultParam selectParam,  string imageName = "")
         {
             if (RiderDatas.Count <= 0)
             {
@@ -124,7 +124,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
             double TSS = (RiderDatas.Count * NP * IF) / (FTP * 3600) * 100;
             var averagePower = Helper.AveragePower(RiderDatas);
             MapInterruptRecordApi service = new MapInterruptRecordApi();
-            //AntManufacturer manufacturer = service.GetAntManufacturer(ManufacturerId);
+           // AntManufacturer manufacturer = service.GetAntManufacturer(ManufacturerId).data;
             var recordId = Guid.NewGuid().ToString();
             var ticks = RiderDatas.Last().Ticks;
             var interruptRecord = new MapInterruptRecord
@@ -133,7 +133,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
                 RouteId = CurrentRoute.RouteInstance.Id,
                 RouteName = CurrentRoute.RouteInstance.Name,
                 TotalDistance = CurrentRoute.RouteInstance.Distance,
-                UserId = 10688,//BelongUserId,
+                UserId = BelongUserId,
                 RecordFileName = newFileName + ".txt",
                 Ftp = FTP,//FTP设置
                 IF = Math.Round(IF, 2),
@@ -147,13 +147,13 @@ namespace Assets.Scenes.Ride.Scripts.Model
                 AveragePower = averagePower,//平均功率
                 MaxPower = RiderDatas.Max(a => a._Power),//最大功率
                 WeightKg = Math.Round(averagePower / 65, 2),
-                Weight = 65, //App.CurrentUser.Weight,
-                BicycleWeight =7, //App.CurrentUser.BicycleWeight,
+                Weight = App.CurrentUser.Weight,
+                BicycleWeight = App.CurrentUser.BicycleWeight,
                 ContinueMark = ContinueMark,
                 ContinueIndex = ContinueIndex,
                 IsDelete = false,
                 MapCompetitionId = Competitionid,
-                ManufacturerName = "TODO",//manufacturer == null ? "" : manufacturer.Name,
+                ManufacturerName = "",//manufacturer == null ? "" : manufacturer.Name,
                 DeviceNumber = DeviceNumber,
                 IsRanking = IsNeedRanking,
                 CurrentRouteStartDistance = CurrentRouteStartDistance,
@@ -163,8 +163,8 @@ namespace Assets.Scenes.Ride.Scripts.Model
                 CreateTime = StartTime.AddSeconds(ticks),
                 Ticks = ticks,
                 Mode = cyclingModel.ToString(),
-                //Param = Newtonsoft.Json.JsonConvert.SerializeObject(selectParam),
-                //GlobalCyclingId = selectParam.GlobalCyclingId
+                Param = Newtonsoft.Json.JsonConvert.SerializeObject(selectParam),
+                GlobalCyclingId = 0
             };
             //var range = new MapSpeedRange().GetSpeedRange(RiderDatas, CurrentRoute.RouteInstance.Distance);
             interruptRecord.SpeedRange = null; //JsonConvert.SerializeObject(range);