[MQTT] added topic drivetrain/remainingChargingTime

Author: mschmiedel

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - ASN.1 Types for `OTA_ChrgCtrlReq` and `OTA_ChrgCtrlStsResp`
 - MQTT
   - support starting/stopping charging via setting `drivetrain/charging`
+  - added topic `drivetrain/remainingChargingTime`
 
 ### Changed
 - MQTT

saic-java-mqtt-gateway/src/main/java/net/heberling/ismart/mqtt/MqttGatewayTopics.java

@@ -28,6 +28,8 @@ public class MqttGatewayTopics {
   public static final String DRIVETRAIN_RUNNING = DRIVETRAIN + "/running";
   public static final String DRIVETRAIN_SOC = DRIVETRAIN + "/soc";
   public static final String DRIVETRAIN_VOLTAGE = DRIVETRAIN + "/voltage";
+  public static final String DRIVETRAIN_REMAINING_CHARGING_TIME =
+      DRIVETRAIN + "/remainingChargingTime";
   public static final String INFO = "info";
   public static final String INFO_CONFIGURATION = INFO + "/configuration";
   public static final String INFO_LAST_MESSAGE = INFO + "/lastMessage";

saic-java-mqtt-gateway/src/main/java/net/heberling/ismart/mqtt/VehicleState.java

@@ -26,7 +26,7 @@ public class VehicleState {
   private static final Logger LOGGER = LoggerFactory.getLogger(VehicleState.class);
   private final IMqttClient client;
   private final String mqttVINPrefix;
-  private Supplier<Clock> clockSupplier;
+  private final Supplier<Clock> clockSupplier;
   private OffsetDateTime lastCarActivity;
   private OffsetDateTime lastSuccessfulRefresh;
   private OffsetDateTime lastCarShutdown;
@@ -40,7 +40,7 @@ public class VehicleState {
   private RefreshMode previousRefreshMode;
 
   public VehicleState(IMqttClient client, String mqttAccountPrefix, String vin) {
-    this(client, mqttAccountPrefix, vin, () -> Clock.systemDefaultZone());
+    this(client, mqttAccountPrefix, vin, Clock::systemDefaultZone);
   }
 
   protected VehicleState(
@@ -427,6 +427,17 @@ public void handleChargeStatusMessage(
     msg.setRetained(true);
     client.publish(mqttVINPrefix + "/" + DRIVETRAIN_VOLTAGE, msg);
 
+    int remainingChargingTime = 0;
+    if (chargingStatusResponseMessage.getApplicationData().getChargeStatus().getChargingGunState()
+        && current < 0) {
+      remainingChargingTime =
+          chargingStatusResponseMessage.getApplicationData().getChrgngRmnngTime() * 60;
+    }
+    msg = new MqttMessage((String.valueOf(remainingChargingTime)).getBytes(StandardCharsets.UTF_8));
+    msg.setQos(0);
+    msg.setRetained(true);
+    client.publish(mqttVINPrefix + "/" + DRIVETRAIN_REMAINING_CHARGING_TIME, msg);
+
     double power = current * voltage / 1000d;
     msg = new MqttMessage((String.valueOf(power)).getBytes(StandardCharsets.UTF_8));
     msg.setQos(0);
@@ -671,23 +682,23 @@ public void configure(String topic, MqttMessage message) {
         break;
       case REFRESH_PERIOD_ACTIVE:
         try {
-          long value = Long.valueOf(message.toString());
+          long value = Long.parseLong(message.toString());
           setRefreshPeriodActive(value);
         } catch (NumberFormatException e) {
           throw new MqttGatewayException("Error setting value for payload: " + message);
         }
         break;
       case REFRESH_PERIOD_INACTIVE:
         try {
-          long value = Long.valueOf(message.toString());
+          long value = Long.parseLong(message.toString());
           setRefreshPeriodInactive(value);
         } catch (NumberFormatException e) {
           throw new MqttGatewayException("Error setting value for payload: " + message);
         }
         break;
       case REFRESH_PERIOD_INACTIVE_GRACE:
         try {
-          long value = Long.valueOf(message.toString());
+          long value = Long.parseLong(message.toString());
           setRefreshPeriodAfterShutdown(value);
         } catch (NumberFormatException e) {
           throw new MqttGatewayException("Error setting value for payload: " + message);