pull

Dev/OHV/VehicleControlSystem/ControlLayer/Serial/BatteryTabos/BMUManager.cs

@@ -69,10 +69,10 @@ namespace VehicleControlSystem.ControlLayer.Serial.BatteryTabos
                         data.Scale = 1;
                         break;
                     case eDataKind.ChargeCompleteTime:
-                        data.Scale = 1;
+                        data.Scale = 60;
                         break;
                     case eDataKind.DisChargeCompleteTime:
-                        data.Scale = 1;
+                        data.Scale = 60;
                         break;
                     case eDataKind.SOC:
                         data.Scale = 1;

Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -1391,10 +1391,14 @@ namespace VehicleControlSystem.ControlLayer
                     this.BatteryState = ( double )obj.Value;
                     break;
                 case eDataKind.ChargeCompleteTime:
-                    this.BatteryChargeTime = (double)obj.Value * obj.Scale;
+                    if ( obj.Value == null || obj.Value <= 0 )
+                        return;
+                    this.BatteryChargeTime = (double)obj.Value / obj.Scale;
                     break;
                 case eDataKind.DisChargeCompleteTime:
-                    this.BatteryDisChargeTime = ( double )obj.Value * obj.Scale;
+                    if ( obj.Value == null || obj.Value <= 0 )
+                        return;
+                    this.BatteryDisChargeTime = ( double )obj.Value / obj.Scale;
                     break;
                 case eDataKind.SOC:
                     this.BatteryStateOfCharge = ( double )obj.Value * obj.Scale;