lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结果页面移除划船记录&设备断开扔保留之前的厂商序列号

Browse Source
This commit is contained in:
lishuo committed 2022-07-18 14:31:14 +08:00
1 parent 2697103479
commit 5b39dd985b
12 files changed
+92 -87
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs
+1 -1
View File
@@ -293,7 +293,7 @@ namespace Assets.Scenes.Ride.Scripts
currentSlope = pointList[CurrentIndex].Grade;
//格式化坡度最大不能超过15，-15
PreSlope = PreSlope > 0 ?Math.Min(PreSlope, 15) : Math.Max(PreSlope, -15);
currentSlope = currentSlope > 0? Math.Min(PreSlope, 15) : Math.Max(PreSlope, -15);
currentSlope = currentSlope > 0? Math.Min(currentSlope, 15) : Math.Max(currentSlope, -15);
CurrentDistance = pointList[CurrentIndex].Distance;
//计算下一个海拔和坡度&当前区间距离
nextSlope = pointList[nextIndex].Grade > 0 ? Math.Min(pointList[nextIndex].Grade, 15) : Math.Max(pointList[nextIndex].Grade, -15);
Assets/Scripts/Scenes/Ride/Scripts/DeviceServiceMonoBase.cs
+29 -36
View File
@@ -38,25 +38,36 @@ namespace Assets.Scenes.Ride.Scripts
{
(_device as IRequiresRiderWeight).RiderWeight = App.CurrentUser.Weight;
}
if (_device.Network == NetworkType.ANT)
{
var antDevice = _device as AbstractAntDevice;
ManufacturerId = antDevice.ManufacturerId;
AntModelId = antDevice.AntModelId;
DeviceNumber = $"{ antDevice.DeviceNumber },{ antDevice.DeviceType}";
}
else
{
var bleDevice = _device as BleDevice;
DeviceNumber = $"{ Helper.FormateMacAddress(bleDevice.Address) },{ ServiceUuids.GetBySensor(bleDevice.Sensor) }";
ManufacturerName = bleDevice.Name + "," + bleDevice.Network + "," + bleDevice.Sensor;
}
SetDeviceInfo();
}
return _device;
}
}
private void SetDeviceInfo()
{
if (_device.Network == NetworkType.ANT)
{
var antDevice = _device as AbstractAntDevice;
if (antDevice != null)
{
ManufacturerId = antDevice.ManufacturerId > 0 ? antDevice.ManufacturerId : ManufacturerId;
AntModelId = antDevice.AntModelId > 0 ? antDevice.AntModelId : AntModelId;
DeviceNumber = $"{ antDevice.DeviceNumber },{ antDevice.DeviceType}";
}
}
else
{
var bleDevice = _device as BleDevice;
if (bleDevice != null)
{
DeviceNumber = $"{ Helper.FormateMacAddress(bleDevice.Address) },{ ServiceUuids.GetBySensor(bleDevice.Sensor) }";
ManufacturerName = bleDevice.Name + "," + bleDevice.Network + "," + bleDevice.Sensor;
}
}
}
/// <summary>
/// 更新速度(KM/H)
///
@@ -130,6 +141,10 @@ namespace Assets.Scenes.Ride.Scripts
public bool CheckAnt()
{
//_antConnector = AntConnector.Instance();
if (_device == null || App.CurrentUser.FTP <= 0)
{
return false;
}
var devices = App.MainDeviceAdapter.GetDevices().Where(d => d.State == DeviceState.Connected && (d.Sensor == SensorType.Trainer || d.Sensor == SensorType.Power));
if (devices.Count() > 0)
{
@@ -138,34 +153,12 @@ namespace Assets.Scenes.Ride.Scripts
{
(_device as IRequiresRiderWeight).RiderWeight = App.CurrentUser.Weight;
}
if (_device.Network == NetworkType.ANT)
{
var antDevice = _device as AbstractAntDevice;
ManufacturerId = antDevice.ManufacturerId;
AntModelId = antDevice.AntModelId;
DeviceNumber = $"{ antDevice.DeviceNumber },{ antDevice.DeviceType}";
}
else
{
var bleDevice =_device as BleDevice;
DeviceNumber = $"{ bleDevice.Address },{ bleDevice.Sensor }";
ManufacturerName = bleDevice.Name + " " + bleDevice.Network + " " + bleDevice.Sensor;
}
SetDeviceInfo();
}
else
{
return false;
}
if (App.CurrentUser.FTP <= 0)
{
return false;
}
if (_device == null)
{
return false;
}
return true;
}
//设备列表
Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs
+1 -10
View File
@@ -1,13 +1,8 @@
using UnityEngine;
using Assets.Scenes.Ride.Scripts.Model;
using UnityEngine.SceneManagement;
using System.Collections.Generic;
using System.Linq;
using Assets.Scenes.Ride.Scripts.Model.RiderModels;
using System;
using ChartAndGraph;
using DG.Tweening;
using System.Collections;
using Assets.Scenes.Ride.Scripts.Model;
using Assets.Scenes.Ride.Scripts.Model.CyclingModels;
namespace Assets.Scenes.Ride.Scripts
@@ -159,10 +154,6 @@ namespace Assets.Scenes.Ride.Scripts
}
#endregion
//public void InitGraph(int index)
//{
// chartDataSourceScript.InitHorizontalScrolling(index);
//}
//移动海拔图头像
protected override void MoveGraphHead(bool init = false)
{