修复设备选择界面多设备选择bug

Assets/Scripts/Devices/Ant/AbstractAntDevice.cs

@@ -93,8 +93,8 @@ namespace Assets.Scripts.Devices.Ant
         //private readonly DeviceDetailService _deviceDetailService;
         //private readonly AntManufacturerService antManufacturerService;
         protected List<IPageHandler> pageHandlers = new List<IPageHandler>();
-        public AbstractAntDevice(String defaultSourceName, racerSportType sportType, SensorType sensor)
-            : base(sportType, true)
+        public AbstractAntDevice(string id, String defaultSourceName, racerSportType sportType, SensorType sensor)
+            : base(id, sportType, true)
         {
             State = DeviceState.Disconnected;
             this.Name = defaultSourceName;

Assets/Scripts/Devices/Ant/AntConnector.cs

@@ -81,11 +81,11 @@ namespace Assets.Scripts.Devices.Ant
             }
             //CheckStatus();
 
-            deviceList.Add(new FitDevice());
-            deviceList.Add(new PowerDevice());
-            deviceList.Add(new CadenceDevice());
-            deviceList.Add(new HeartRateDevice());
-            deviceList.Add(new BikeSpdCadDevice());
+            deviceList.Add(new FitDevice(""));
+            deviceList.Add(new PowerDevice(""));
+            deviceList.Add(new CadenceDevice(""));
+            deviceList.Add(new HeartRateDevice(""));
+            deviceList.Add(new BikeSpdCadDevice(""));
 
             var timer = new System.Timers.Timer(1000);
             timer.AutoReset = true;
@@ -336,27 +336,28 @@ namespace Assets.Scripts.Devices.Ant
                 var device1 = deviceList.SingleOrDefault(d => d.searchProfile.deviceType == deviceTypeId);
                 if (device1 != null)
                 {
+                    var id = $"{ deviceNumber }:{ deviceTypeId}:{ transmissionTypeId }";
                     AbstractAntDevice device = null;
                     switch (device1.Sensor)
                     {
                         case SensorType.None:
                             break;
                         case SensorType.Cadence:
-                            device = new CadenceDevice();
+                            device = new CadenceDevice(id);
                             break;
                         case SensorType.HeartRate:
-                            device = new HeartRateDevice();
+                            device = new HeartRateDevice(id);
                             break;
                         case SensorType.Power:
-                            device = new PowerDevice();
+                            device = new PowerDevice(id);
                             break;
                         case SensorType.Speed:
                             break;
                         case SensorType.SpeedCadence:
-                            device = new BikeSpdCadDevice();
+                            device = new BikeSpdCadDevice(id);
                             break;
                         case SensorType.Trainer:
-                            device = new FitDevice();
+                            device = new FitDevice(id);
                             break;
                         case SensorType.VirtualPower:
                             break;

Assets/Scripts/Devices/Ant/BikeSpdCadDevice.cs

@@ -18,8 +18,8 @@ namespace Assets.Scripts.Devices.Ant
         private RotationData _speedData = new RotationData();
         private RotationData _cadenceData = new RotationData();
 
-        public BikeSpdCadDevice(double wheelCircumfrence_m = DEFAULT_WHEEL_CIRCUMFERENCE_m)
-            : base("Ant+ Speed&Cadence", racerSportType.Biking, SensorType.SpeedCadence)
+        public BikeSpdCadDevice(string id, double wheelCircumfrence_m = DEFAULT_WHEEL_CIRCUMFERENCE_m)
+            : base(id, "Ant+ Speed&Cadence", racerSportType.Biking, SensorType.SpeedCadence)
         {
             Priority = 1;
             this.wheelCircumfrence_m = wheelCircumfrence_m;

Assets/Scripts/Devices/Ant/CadenceDevice.cs

@@ -28,8 +28,8 @@ namespace Assets.Scripts.Devices.Ant
         private DateTime _now = DateTime.Now;
         private RotationData _rotationData = new RotationData();
 
-        public CadenceDevice()
-            : base("Ant+ Cadence", racerSportType.Biking, SensorType.Cadence)
+        public CadenceDevice(string id)
+            : base(id, "Ant+ Cadence", racerSportType.Biking, SensorType.Cadence)
         {
             Priority = 2;
             //if (speedSensor.isInUse)

Assets/Scripts/Devices/Ant/DataSourceBase.cs

@@ -26,7 +26,7 @@ namespace Assets.Scripts.Devices.Ant
         public readonly byte uid;
 
 
-        public DataSourceBase(racerSportType sportType, bool isHuman):base(NetworkType.ANT)
+        public DataSourceBase(string id, racerSportType sportType, bool isHuman):base(id, NetworkType.ANT)
         {
             this.sportType = sportType;
             this.isHuman = isHuman;

Assets/Scripts/Devices/Ant/FitDevice.cs

@@ -25,8 +25,8 @@ namespace Assets.Scripts.Devices.Ant
         /// </summary>
         private double _grade = 0;
         private bool IsCalibrating { get; set; }
-        public FitDevice()
-            : base("Ant+ Trainer", racerSportType.Unknown, SensorType.Trainer)
+        public FitDevice(string id)
+            : base(id, "Ant+ Trainer", racerSportType.Unknown, SensorType.Trainer)
         {
             Priority = 0;
             this.StateChange = (state) =>

Assets/Scripts/Devices/Ant/HeartRateDevice.cs

@@ -26,8 +26,8 @@ namespace Assets.Scripts.Devices.Ant
 
         //ds_AntPlus_BikeSpd speedSensor;
 
-        public HeartRateDevice()
-            : base("Ant+ HeartRate", racerSportType.Unknown, SensorType.HeartRate)
+        public HeartRateDevice(string id)
+            : base(id, "Ant+ HeartRate", racerSportType.Unknown, SensorType.HeartRate)
         {
             Priority = 2;
         }

Assets/Scripts/Devices/Ant/PowerDevice.cs

@@ -23,8 +23,8 @@ namespace Assets.Scripts.Devices.Ant
 
         //List<IPageHandler> pageHandlers;
 
-        public PowerDevice()
-            : base("Ant+ Power", racerSportType.Biking, SensorType.Power)
+        public PowerDevice(string id)
+            : base(id, "Ant+ Power", racerSportType.Biking, SensorType.Power)
         {
             Priority = 2;
             //pageHandlers = new List<IPageHandler>();