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

划船机暂存

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-09-28 11:27:24 +08:00
1 parent 1c73701e73
commit c73545d912
164 files changed
+38281 -2181
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs
+4 -1
View File
@@ -175,7 +175,10 @@ public class ConnectDeviceModal : PFUIPanel
devices = App.MainDeviceAdapter.GetDevices().Where(d => d.Sensor == SensorType || (d is ISpeedDevice && d.State == DeviceState.Connected)).OrderBy(d => d.Priority).ToList();
break;
case SensorType.Trainer:
devices = App.MainDeviceAdapter.GetDevices().Where(d => d.Sensor == SensorType).ToList();
devices = App.MainDeviceAdapter.GetDevices().Where(d => d.Sensor == SensorType && d is ITrainerDevice).ToList();
break;
case SensorType.Rower:
devices = App.MainDeviceAdapter.GetDevices().Where(d => d.Sensor == SensorType && d is IRowerDevice).ToList();
break;
case SensorType.VirtualPower:
break;
Assets/Scripts/UI/Prefab/Device/DeviceView.cs
+18 -10
View File
@@ -13,12 +13,13 @@ using Assets.Scripts;
using DG.Tweening;
using Assets.Scripts.UI.Prefab.Device;
using Assets.Scripts.Devices;
using Assets.Scripts.Devices.Ble;
public class DeviceView : MonoBehaviour
{
[SerializeField]
private SensorType mType;
private SensorType SensorType
{
get
@@ -162,7 +163,7 @@ public class DeviceView : MonoBehaviour
{
if (SensorType == SensorType.Power)
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Power_0");
sprite0 = Resources.Load<Sprite>("Images/Devices/Power_1");
sprite1 = Resources.Load<Sprite>("Images/Devices/Power_1");
sprite3 = Resources.Load<Sprite>("Images/Devices/Power_4");
@@ -170,7 +171,7 @@ public class DeviceView : MonoBehaviour
}
else if (SensorType == SensorType.Speed)
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Speed_0");
sprite0 = Resources.Load<Sprite>("Images/Devices/Speed_1");
sprite1 = Resources.Load<Sprite>("Images/Devices/Speed_1");
sprite3 = Resources.Load<Sprite>("Images/Devices/Speed_4");
@@ -178,7 +179,7 @@ public class DeviceView : MonoBehaviour
}
else if (SensorType == SensorType.Cadence || SensorType == SensorType.SpeedCadence)
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Cadence_0");
sprite0 = Resources.Load<Sprite>("Images/Devices/Cadence_1");
sprite1 = Resources.Load<Sprite>("Images/Devices/Cadence_1");
sprite3 = Resources.Load<Sprite>("Images/Devices/Cadence_4");
@@ -186,18 +187,24 @@ public class DeviceView : MonoBehaviour
}
else if (SensorType == SensorType.HeartRate)
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Heart Rate_0");
sprite0 = Resources.Load<Sprite>("Images/Devices/Heart Rate_1");
sprite1 = Resources.Load<Sprite>("Images/Devices/Heart Rate_1");
sprite3 = Resources.Load<Sprite>("Images/Devices/Heart Rate_4");
powerUnit.text = "BPM";
}
else if(SensorType == SensorType.Trainer)
else if (SensorType == SensorType.Trainer)
{
sprite0 = Resources.Load<Sprite>("Images/Devices/Trainer_0");
sprite0 = Resources.Load<Sprite>("Images/Devices/Trainer_1");
sprite1 = Resources.Load<Sprite>("Images/Devices/Trainer_1");
sprite3 = Resources.Load<Sprite>("Images/Devices/Trainer_4");
}
else if (SensorType == SensorType.Rower)
{
sprite0 = Resources.Load<Sprite>("Images/Rower/设备 - 划船机 - 未连接");
sprite1 = Resources.Load<Sprite>("Images/Rower/设备 - 划船机 - 未连接");
sprite3 = Resources.Load<Sprite>("Images/Rower/设备 - 划船机");
}
}
// Start is called before the first frame update
@@ -304,10 +311,7 @@ public class DeviceView : MonoBehaviour
//}
});
DeviceCache.Add(connectedDevice);
Debug.Log("connected");
}
logo.sprite = sprite3;
@@ -351,6 +355,8 @@ public class DeviceView : MonoBehaviour
return "Speed Meter";
case SensorType.Trainer:
return "Smart Trainer";
case SensorType.Rower:
return "Rower Machine";
case SensorType.VirtualPower:
break;
default:
@@ -424,6 +430,8 @@ public class DeviceView : MonoBehaviour
return item;
case SensorType.Speed:
return devices.FirstOrDefault(d => d is ISpeedDevice);
case SensorType.Rower:
return devices.FirstOrDefault(d => d.Sensor == SensorType.Rower);
case SensorType.Trainer:
var item3 = devices.FirstOrDefault(d => d.Sensor == SensorType.Trainer);
return item3;