diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index 49e55970..49826979 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -42,7 +42,7 @@ "Total Climbed": "累计爬升", "Other Account": "切换账号", "Ranking": "排名", - "Time Limit:": "倒计时：", + "Close Gate:": "倒计时：", "RANK": "排名", "NAME": "昵称", "TIME": "时间", @@ -208,7 +208,7 @@ "Record": "骑行记录", "More": "更多", "Remaining Time": "比赛结束倒计时：", - "Time Limit": "关门时间：", + "Close Gate": "关门时间：", "Start Time": "比赛开始时间：", "Start for Registration": "报名开始时间", "Deadline for Registration": "报名截止时间", @@ -345,7 +345,7 @@ "Total Climbed": "Total Climbed", "Other Account": "Other Account", "Ranking": "Ranking", - "Time Limit:": "Time Limit:", + "Close Gate:": "Close Gate:", "RANK": "RANK", "NAME": "NAME", "TIME": "TIME", @@ -505,7 +505,7 @@ "Record": "Record", "More": "More", "Remaining Time": "Remaining Time", - "Time Limit": "Time Limit", + "Close Gate": "Close Gate", "Start Time": "Start Time", "Start for Registration": "Start for Registration", "Deadline for Registration": "Deadline for Registration", diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index e3a9b0c3..aec67a24 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -479,8 +479,11 @@ public class MainController : BaseScene var tempRecordData = Newtonsoft.Json.JsonConvert.DeserializeObject(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; }); diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs b/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs index 133f895a..292c8260 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs +++ b/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) diff --git a/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs b/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs index 0590cb66..93c2327a 100644 --- a/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs +++ b/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> recordData = new Dictionary>(); 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); } /// /// 保存数据 /// /// /// - public void SaveDataAysnc(Dictionary> data,string path) + public int SaveDataAysnc(Dictionary> 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; } } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index 3878e20e..4a39bab6 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/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() { diff --git a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs index cd280c07..11a97273 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs +++ b/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); }