From 541aefe4dd684167833a4ab667ab3b8e8d05a2ed Mon Sep 17 00:00:00 2001 From: lishuo Date: Tue, 8 Jun 2021 16:28:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E7=89=99=E7=9B=91=E5=90=AC=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Ride/Scripts/CyclingController.cs | 1 + .../Ride/Scripts/DeviceServiceMonoBase.cs | 3 +++ Assets/Scenes/Ride/Scripts/Helper.cs | 18 +++++++++++++----- .../Ride/Scripts/Model/RecorderDataModel.cs | 4 +++- Assets/Scenes/Ride/Scripts/PlayerController.cs | 2 +- .../Devices/Ble/Win/WclBleMainThread.cs | 7 ++++--- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scenes/Ride/Scripts/CyclingController.cs index 0e3b6d64..6eb0c859 100644 --- a/Assets/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scenes/Ride/Scripts/CyclingController.cs @@ -498,6 +498,7 @@ public class CyclingController : DeviceServiceMonoBase cyclingController.recorderData.EndDistance = totalDistance; cyclingController.recorderData.AntModelId = AntModelId; cyclingController.recorderData.ManufacturerId = ManufacturerId; + cyclingController.recorderData.ManufacturerName = ManufacturerName; cyclingController.recorderData.DeviceNumber = DeviceNumber; //显示骑行结果 resultPanel.SetActive(true); diff --git a/Assets/Scenes/Ride/Scripts/DeviceServiceMonoBase.cs b/Assets/Scenes/Ride/Scripts/DeviceServiceMonoBase.cs index 47d205b8..202748ea 100644 --- a/Assets/Scenes/Ride/Scripts/DeviceServiceMonoBase.cs +++ b/Assets/Scenes/Ride/Scripts/DeviceServiceMonoBase.cs @@ -46,6 +46,7 @@ namespace Assets.Scenes.Ride.Scripts { var bleDevice = _device as BleDevice; DeviceNumber = $"{ Helper.FormateMacAddress(bleDevice.Address) },{ ServiceUuids.GetBySensor(bleDevice.Sensor) }"; + ManufacturerName = bleDevice.Name + "," + bleDevice.Network + "," + bleDevice.Sensor; } } @@ -111,6 +112,7 @@ namespace Assets.Scenes.Ride.Scripts protected AntConnector _antConnector; public int? ManufacturerId { get; private set; } + public string ManufacturerName { get; private set; } public string DeviceNumber { get; private set; } public int? AntModelId { get; private set; } @@ -144,6 +146,7 @@ namespace Assets.Scenes.Ride.Scripts { var bleDevice =_device as BleDevice; DeviceNumber = $"{ bleDevice.Address },{ bleDevice.Sensor }"; + ManufacturerName = bleDevice.Name + " " + bleDevice.Network + " " + bleDevice.Sensor; } } diff --git a/Assets/Scenes/Ride/Scripts/Helper.cs b/Assets/Scenes/Ride/Scripts/Helper.cs index 5fa57849..909cd75a 100644 --- a/Assets/Scenes/Ride/Scripts/Helper.cs +++ b/Assets/Scenes/Ride/Scripts/Helper.cs @@ -112,13 +112,21 @@ namespace Assets.Scenes.Ride.Scripts { try { - var s = Convert.ToInt64(v).ToString("x8").ToUpperInvariant(); - var array = s.ToCharArray(); + //var s = Convert.ToInt64(v).ToString("x8").ToUpperInvariant(); + var array = v.ToCharArray(); StringBuilder newLsit = new StringBuilder(); - for (int i = array.Length - 1; i >= 0; i--) + List li = new List(); + for (int i = 0; i < array.Length; i++) { - newLsit.Append(array[i]); - if (i % 2 == 0 && i > 0) + if ((i+1) % 2 == 0 && i > 0) + { + li.Add(array[i-1].ToString()+ array[i].ToString()); + } + } + for (int i = li.Count() -1 ; i >= 0 ; i--) + { + newLsit.Append(li[i]); + if (i > 0) { newLsit.Append(":"); } diff --git a/Assets/Scenes/Ride/Scripts/Model/RecorderDataModel.cs b/Assets/Scenes/Ride/Scripts/Model/RecorderDataModel.cs index 1731e506..9f57862c 100644 --- a/Assets/Scenes/Ride/Scripts/Model/RecorderDataModel.cs +++ b/Assets/Scenes/Ride/Scripts/Model/RecorderDataModel.cs @@ -64,6 +64,8 @@ namespace Assets.Scenes.Ride.Scripts.Model /// public int? ManufacturerId { get; set; } + public string ManufacturerName { get; set; } + public int? AntModelId { get; set; } /// /// 骑行数据 @@ -154,7 +156,7 @@ namespace Assets.Scenes.Ride.Scripts.Model ContinueIndex = ContinueIndex, IsDelete = false, MapCompetitionId = Competitionid, - ManufacturerName = "",//manufacturer == null ? "" : manufacturer.Name, + ManufacturerName = ManufacturerName,//manufacturer == null ? "" : manufacturer.Name, DeviceNumber = DeviceNumber, IsRanking = IsNeedRanking, CurrentRouteStartDistance = CurrentRouteStartDistance, diff --git a/Assets/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scenes/Ride/Scripts/PlayerController.cs index 109c9f8a..08f0424f 100644 --- a/Assets/Scenes/Ride/Scripts/PlayerController.cs +++ b/Assets/Scenes/Ride/Scripts/PlayerController.cs @@ -56,7 +56,7 @@ namespace Assets.Scenes.Ride.Scripts bicycleWeight = App.CurrentUser.BicycleWeight; //#if UNITY_EDITOR System.Random rd = new System.Random(); - power = 1000; //rd.Next(150, 300);//测试功率 + //power = 1000; //rd.Next(150, 300);//测试功率 //#endif mainController.TrackResistance(currentSlope * App.rideSetting.sensitivity / 100); } diff --git a/Assets/Scripts/Devices/Ble/Win/WclBleMainThread.cs b/Assets/Scripts/Devices/Ble/Win/WclBleMainThread.cs index 0ada684c..81181ff8 100644 --- a/Assets/Scripts/Devices/Ble/Win/WclBleMainThread.cs +++ b/Assets/Scripts/Devices/Ble/Win/WclBleMainThread.cs @@ -138,11 +138,12 @@ namespace Assets.Scripts.Devices.Ble.Win public bool StartWatcher() { - this.wclWatcher.StartScan(this.wclBleManager.Radio); - return true; + return base.EnqueueAction(() => + { + this.wclWatcher.StartScan(this.wclBleManager.Radio); + }); } - public WclBleGattThread CreateGattThread(BlePeripheralInfo info) { lock (locker)