骑行保存数据改成同步

Assets/Scripts/Scenes/MainController.cs

@@ -412,8 +412,11 @@ public class MainController : BaseScene
                 var tempRecordData = Newtonsoft.Json.JsonConvert.DeserializeObject<TempRecordData>(content);
                 App.tempRecordData = tempRecordData;
 
-                UIManager.ShowConfirm(App.GetLocalString("Reconnect"), App.GetLocalString("Did you want to reconnect the trip that was interrupted abnormally?"), () => { App.RouteIdParam = App.tempRecordData.RouteId; App.CompetionId = App.tempRecordData.CompetitionId;
-                    SceneManager.LoadScene("Ride"); },2,()=> {
+                UIManager.ShowConfirm(App.GetLocalString("Reconnect"), App.GetLocalString("Did you want to reconnect the trip that was interrupted abnormally?"), () => {
+                    App.RouteIdParam = App.tempRecordData.RouteId; 
+                    App.CompetionId = App.tempRecordData.CompetitionId;
+                    SceneManager.LoadScene("Ride");
+                },2,()=> {
                     Helper.DelectDir(PFConstants.MapWorkoutRecordTempFolder);
                     App.tempRecordData = null;
                 });

Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs

@@ -54,9 +54,9 @@ namespace Assets.Scenes.Ride.Scripts
                     {
 #if UNITY_IOS || UNITY_ANDROID
                         //显示倒计时面板信息
-                        ShowCountDown(s.Item1, App.GetLocalString("Time Limit"));
+                        ShowCountDown(s.Item1, App.GetLocalString("Close Gate"));
 #else
-                        ShowCountDown(s.Item1, App.GetLocalString("Get The First Place. Time Limit"));
+                        ShowCountDown(s.Item1, App.GetLocalString("Get The First Place. Close Gate"));
 #endif
                     }
                     else if (s.Item1 >= 0)

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

@@ -119,13 +119,13 @@ namespace Assets.Scenes.Ride.Scripts.Model
 
         public RouteResultParam selectParam { get; set; }
 
-        public void SaveWithLocalRecordAysnc(CyclingModel cyclingModel, RouteResultParam selectParam, string imageName,string recordId,string path)
+        public int SaveWithLocalRecordAysnc(CyclingModel cyclingModel, RouteResultParam selectParam, string imageName,string recordId,string path)
         {
             Saved = true;
             Dictionary<MapInterruptRecord, List<string>> recordData = new Dictionary<MapInterruptRecord, List<string>>();
             if (RiderDatas.Count <= 0)
             {
-                return ;
+                return -1;
             }
             string newFileName = Guid.NewGuid().ToString();
             int FTP = Helper.GetFtp();
@@ -230,37 +230,43 @@ namespace Assets.Scenes.Ride.Scripts.Model
                 Debug.Log(ex.Message);
             }
             recordData.Add(interruptRecord, files);
-            SaveDataAysnc(recordData, path);
+            return SaveDataAysnc(recordData, path);
         }
         /// <summary>
         /// 保存数据
         /// </summary>
         /// <param name="base64Image"></param>
         /// <returns></returns>
-        public void SaveDataAysnc(Dictionary<MapInterruptRecord, List<string>> data,string path)
+        public int SaveDataAysnc(Dictionary<MapInterruptRecord, List<string>> data,string path)
         {
             if (data != null && data.Count > 0)
             {
                 //var path = Helper.GetDataDir("MapWorkoutRecords");
-                Task.Run(() => {
+                //Task.Run(() => {
+                try
+                {
                     var record = data.FirstOrDefault();
                     MapInterruptRecordApi service = new MapInterruptRecordApi();
                     var result = service.Add(record.Key, record.Value);
-                    
-                    //删除文件
-                    try
+
+                    if (result.result)
                     {
-                        if (result.result && Directory.Exists(path))
+                        //删除文件
+
+                        if (Directory.Exists(path))
                         {
                             Helper.DelectDir(path);
                         }
+                        //});
+                        return result.data.RankingId;
                     }
-                    catch (Exception e)
-                    {
-                        Debug.Log(e.Message);
-                    }
-                });
+                }
+                catch (Exception e)
+                {
+                    Debug.Log(e.Message);
+                }
             }
+            return -1;
         }
     }
 

Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

@@ -1148,8 +1148,8 @@ public BaseUIManager singleUIManager;
         RecorderDataModel recorderData = cyclingController.recorderData;
         tempRecordData.RiderDatas = recorderData.RiderDatas;
         tempRecordData.selectParam = recorderData.selectParam;
-        tempRecordData.RouteId = recorderData.Competitionid;
-        tempRecordData.CompetitionId = mapRoute.Id;
+        tempRecordData.RouteId = mapRoute.Id;
+        tempRecordData.CompetitionId = recorderData.Competitionid;
         tempRecordData.StartTime = startTime;
         tempRecordData.ManufacturerId = recorderData.ManufacturerId;
         tempRecordData.ManufacturerName = recorderData.ManufacturerName;
@@ -1161,7 +1161,7 @@ public BaseUIManager singleUIManager;
         var tempContent = Newtonsoft.Json.JsonConvert.SerializeObject(tempRecordData);
         System.IO.File.WriteAllText(filePath, tempContent);
     }
-
+    int RankingId;
     public void Save(double totalDistance)
     {
         ClearTempFile();
@@ -1182,6 +1182,7 @@ public BaseUIManager singleUIManager;
         cyclingController.recorderData.ManufacturerId = ManufacturerId;
         cyclingController.recorderData.ManufacturerName = ManufacturerName;
         cyclingController.recorderData.DeviceNumber = DeviceNumber;
+        RankingId =cyclingController.recorderData.SaveWithLocalRecordAysnc(cyclingModel, selectParamModel, imageFileName, recordId, path);
         //显示骑行结果(如果是比赛模式显示比赛最终排名)
         if (cyclingModel != CyclingModel.Competition)
         {
@@ -1190,7 +1191,6 @@ public BaseUIManager singleUIManager;
             rs.InjectController(this);
             rs.SetDataSource(cyclingController.recorderData);
         }
-        cyclingController.recorderData.SaveWithLocalRecordAysnc(cyclingModel, selectParamModel, imageFileName, recordId, path);
     }
     public byte[] CaptureCamera() 
     {

Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs

@@ -61,7 +61,7 @@ namespace Assets.Scenes.Ride.Scripts
 				weight = App.CurrentUser.Weight;
 				bicycleWeight = App.CurrentUser.BicycleWeight;
 //#if UNITY_EDITOR
-                power = 143;
+                power = 1443;
 //#endif
                 mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
 			}