From 5f0efe3995c2aba59784836586034655f73555e3 Mon Sep 17 00:00:00 2001 From: lishuo Date: Fri, 11 Feb 2022 17:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dios=E8=93=9D=E7=89=99?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=8A=9F=E7=8E=87=E4=B8=8D=E5=8F=98=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Plugins/iOS/UnityBluetoothLE.mm | 12 ++++++++++-- Assets/Scripts/Apis/ApiBase.cs | 3 ++- Assets/Scripts/Apis/MapApi.cs | 9 +++++++++ Assets/Scripts/Apis/PfHttpClientHandler.cs | 4 ++++ Assets/Scripts/App.cs | 3 ++- .../Scripts/Scenes/Ride/Scripts/CyclingController.cs | 9 +++++++++ .../Scripts/UI/Prefab/ResultList/LocalRouteItem.cs | 4 ++-- 7 files changed, 38 insertions(+), 6 deletions(-) diff --git a/Assets/Plugins/iOS/UnityBluetoothLE.mm b/Assets/Plugins/iOS/UnityBluetoothLE.mm index 174fc25e..e794b768 100644 --- a/Assets/Plugins/iOS/UnityBluetoothLE.mm +++ b/Assets/Plugins/iOS/UnityBluetoothLE.mm @@ -748,7 +748,8 @@ extern "C" { { NSLog(@"Central State: Powered Off"); - NSString *message = [NSString stringWithFormat:@"Error~Bluetooth LE Powered Off"]; + //NSString *message = [NSString stringWithFormat:@"Error~Bluetooth LE Powered Off"]; + NSString *message = [NSString stringWithFormat:@"BleStatusChanged~13"]; UnitySendMessage ("BluetoothLEReceiver", "OnBluetoothMessage", [message UTF8String] ); } break; @@ -756,7 +757,14 @@ extern "C" { { NSLog(@"Central State: Powered On"); if (_isInitializing) - UnitySendMessage ("BluetoothLEReceiver", "OnBluetoothMessage", "Initialized"); + { + UnitySendMessage ("BluetoothLEReceiver", "OnBluetoothMessage", "Initialized"); + } + else + { + NSString *message = [NSString stringWithFormat:@"BleStatusChanged~11"]; + UnitySendMessage ("BluetoothLEReceiver", "OnBluetoothMessage", [message UTF8String] ); + } _isInitializing = FALSE; } break; diff --git a/Assets/Scripts/Apis/ApiBase.cs b/Assets/Scripts/Apis/ApiBase.cs index 3e6b0b25..ffb6bb4c 100644 --- a/Assets/Scripts/Apis/ApiBase.cs +++ b/Assets/Scripts/Apis/ApiBase.cs @@ -122,7 +122,7 @@ namespace Assets.Scripts.Apis #else defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity", ConfigHelper.AppVersion)); #endif - defaultRequestHeaders.Add("deviceUniqueIdentifier", SystemInfo.deviceUniqueIdentifier); + defaultRequestHeaders.Add("deviceUniqueIdentifier", App.DeviceUniqueIdentifier); defaultRequestHeaders.Remove("Language"); defaultRequestHeaders.Add("Language", App.GetLocalLanguage()); } @@ -558,6 +558,7 @@ namespace Assets.Scripts.Apis request.UserAgent = httpClient.DefaultRequestHeaders.UserAgent.ToString(); request.Accept = "application/json"; request.Headers.Add("Language", App.GetLocalLanguage()); + request.Headers.Add("deviceUniqueIdentifier", App.DeviceUniqueIdentifier); request.CookieContainer = new CookieContainer(); foreach (Cookie item in cookies) { diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs index e20006dd..7aa68be7 100644 --- a/Assets/Scripts/Apis/MapApi.cs +++ b/Assets/Scripts/Apis/MapApi.cs @@ -95,6 +95,15 @@ namespace Assets.Scripts.Apis { return Get>>($"Map/GetServiceKey").data; } + /// + /// 骑行场景轮询是否有新设备登录 + /// + /// + public async Task GetPing() + { + var res = await GetAsync($"/Map/v1/Ping"); + return res; + } /// /// 获取在线用户的数据 diff --git a/Assets/Scripts/Apis/PfHttpClientHandler.cs b/Assets/Scripts/Apis/PfHttpClientHandler.cs index 184c7513..d1ac154d 100644 --- a/Assets/Scripts/Apis/PfHttpClientHandler.cs +++ b/Assets/Scripts/Apis/PfHttpClientHandler.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using UnityEngine; +using Assets.Scenes.Ride.Scripts; namespace Assets.Scripts.Apis { @@ -62,6 +63,9 @@ namespace Assets.Scripts.Apis } IEnumerator LoadLogin(string msg) { + //删除本地文件 + Helper.DelectDir(PFConstants.MapWorkoutRecordTempFolder); + App.tempRecordData = null; UnityEngine.SceneManagement.SceneManager.LoadScene(0); yield return null; } diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 50afeec2..4f560fc6 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -20,7 +20,7 @@ public delegate void ChangeLanguageDelegate(); public static class App { - public static string Host = "http://192.168.0.101:5084/"; + public static string Host = "http://192.168.0.102:5082/"; public static string AppVersion = Application.version; @@ -174,6 +174,7 @@ public static class App public static List RouteList = new List(); public static bool _currentPageIsHome = false; public static event EventHandler isHomeChanged; + public static string DeviceUniqueIdentifier = SystemInfo.deviceUniqueIdentifier; public static bool currentPageIsHome { get => _currentPageIsHome; diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index a283f7f6..59c9c7a5 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -237,6 +237,7 @@ public class CyclingController : DeviceServiceMonoBase SceneManager.activeSceneChanged += SceneManager_activeSceneChanged; HandleTouchAndInput(); + StartCoroutine(Ping()); //进入比赛 if (competitionId > 0) { @@ -253,6 +254,14 @@ public class CyclingController : DeviceServiceMonoBase } + private IEnumerator Ping() + { + while (true) + { + var result = ConfigHelper.mapApi.GetPing(); + yield return new WaitForSeconds(5); + } + } float timer = 1f; bool clearLock = false; diff --git a/Assets/Scripts/UI/Prefab/ResultList/LocalRouteItem.cs b/Assets/Scripts/UI/Prefab/ResultList/LocalRouteItem.cs index f5156e99..939e49dc 100644 --- a/Assets/Scripts/UI/Prefab/ResultList/LocalRouteItem.cs +++ b/Assets/Scripts/UI/Prefab/ResultList/LocalRouteItem.cs @@ -79,9 +79,9 @@ public class LocalRouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterH Name.text = record.RouteName; Time.text = record.StartTime.ToLocalString("HH:mm:ss dd-MM-yyyy"); - RidingTime.text = $"{App.GetLocalString("Riding time")}:{Helper.FormatTicks(record.Ticks)}"; + RidingTime.text = $"{App.GetLocalString("Riding Time")}:{Helper.FormatTicks(record.Ticks)}"; RidingDistance.text = $"{App.GetLocalString("Mileage")}:{record.EndDistance.ToString("#0.00")}KM"; - Device.text = $"{App.GetLocalString("Cycling equipment")}:{record.ManufacturerName}"; + Device.text = $"{App.GetLocalString("Cycling Equipment")}:{record.ManufacturerName}"; } else {