ant+和http组件bug修复

Assets/Scenes/Ride/Scripts/DeviceServiceMonoBase.cs

@@ -11,14 +11,35 @@ namespace Assets.Scenes.Ride.Scripts
     {
         public void TrackResistance(double grade)
         {
-            var device = (_device as FitDevice);
+            var device = (CurrentTrainer as FitDevice);
             if (device != null)
             {
-                Debug.Log(grade);
                 device.SetTrackResistance(grade);
             }
         }
         #region 获取设备数据
+
+        public AbstractAntDevice CurrentTrainer
+        {
+            get {
+                var devices = AntConnector.Instance().discoveredDevices.Where(d => d.State == DeviceState.Connected && (d.Sensor == SensorType.Trainer));
+                if (devices.Count() > 0)
+                {
+                    _device = devices.OrderByDescending(d => d.Sensor == SensorType.Trainer).First();
+                    var RiderWeight = (_device as IRequiresRiderWeight).RiderWeight;
+                    if (RiderWeight == 0)
+                    {
+                        (_device as IRequiresRiderWeight).RiderWeight = App.CurrentUser.Weight;
+                    }
+                    ManufacturerId = _device.ManufacturerId;
+                    DeviceNumber = $"{ _device.DeviceNumber },{ _device.DeviceType }";
+                    AntModelId = _device.AntModelId;
+                }
+               
+                return _device;
+            }
+        }
+
         /// <summary>
         /// 更新速度(KM/H)
         /// 
@@ -89,11 +110,6 @@ namespace Assets.Scenes.Ride.Scripts
         #endregion
         public bool CheckAnt()
         {
-            //TODO
-            //if (!ConfigHelper.IsNeedContectedToDevice)
-            //{
-            //    return true;
-            //}
             _antConnector = AntConnector.Instance();
             var devices = _antConnector.discoveredDevices.Where(d => d.State == DeviceState.Connected && (d.Sensor == SensorType.Trainer || d.Sensor == SensorType.Power));
             if (devices.Count() > 0)
@@ -109,12 +125,10 @@ namespace Assets.Scenes.Ride.Scripts
             }
             else
             {
-
                 return false;
             }
             if (App.CurrentUser.FTP <= 0)
             {
-
                 return false;
             }
             if (_device == null)