@iternio/react-native-auto-play 0.3.3 → 0.3.5

package/android/src/auto/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidTelemetryObserver.kt

@@ -27,7 +27,7 @@ object AndroidTelemetryObserver : TelemetryObserver() {
             model.year.value
         } else null
 
-        telemetryHolder.updateVehicle(name, manufacturer, year)
+        telemetryHolder.updateVehicle(name, manufacturer, year, null)
 
         telemetryHolder.toTelemetry()?.let {
             telemetryCallbacks.forEach { callback ->

package/android/src/automotive/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidTelemetryObserver.kt

@@ -45,7 +45,7 @@ object AndroidTelemetryObserver : TelemetryObserver() {
             VehiclePropertyIds.INFO_EV_BATTERY_CAPACITY, VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL
         )?.value ?: 0f
 
-        telemetryHolder.updateVehicle(carModel, carManufacturer, carModelYear)
+        telemetryHolder.updateVehicle(carModel, carManufacturer, carModelYear, batteryCapacity)
     }
 
     val vehiclePropertyReceiver = object : CarPropertyManager.CarPropertyEventCallback {

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/AndroidAutoTelemetryHolder.kt

@@ -42,110 +42,73 @@ class AndroidAutoTelemetryHolder {
     private var name: String? = null
     private var manufacturer: String? = null
     private var year: Int? = null
+    private var batteryCapacity: Float? = null
 
-    fun updateVehicle(name: String?, manufacturer: String?, year: Int?) = synchronized(lock) {
-        this.name = name
-        this.manufacturer = manufacturer
-        this.year = year
-
-        isDirty = true
-    }
+    fun updateVehicle(name: String?, manufacturer: String?, year: Int?, batteryCapacity: Float?) =
+        synchronized(lock) {
+            this.name = name
+            this.manufacturer = manufacturer
+            this.year = year
+            this.batteryCapacity = batteryCapacity
 
-    fun updateBatteryLevel(value: Float) = synchronized(lock) {
-        if (batteryLevel == value) {
-            return
+            isDirty = true
         }
 
+    fun updateBatteryLevel(value: Float) = synchronized(lock) {
         batteryLevel = value
         batteryLevelTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateFuelLevel(value: Float) = synchronized(lock) {
-        if (fuelLevel == value) {
-            return
-        }
-
         fuelLevel = value
         fuelLevelTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateRange(value: Float) = synchronized(lock) {
-        if (range == value) {
-            return
-        }
-
         range = value
         rangeTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateSpeed(value: Float?) = synchronized(lock) {
-        if (speed == value) {
-            return
-        }
-
         speed = value
         speedTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateOdometer(value: Float?) = synchronized(lock) {
-        if (odometer == value) {
-            return
-        }
-
         odometer = value
         odometerTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateSelectedGear(value: Int?) = synchronized(lock) {
-        if (value == selectedGear) {
-            return
-        }
-
         selectedGear = value
         selectedGearTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateEnvOutsideTemperature(value: Float?) = synchronized(lock) {
-        if (value == envOutsideTemperature) {
-            return
-        }
-
         envOutsideTemperature = value
         envOutsideTemperatureTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateEvChargePortConnected(value: Boolean?) = synchronized(lock) {
-        if (value == evChargePortConnected) {
-            return
-        }
-
         evChargePortConnected = value
         evChargePortConnectedTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateEvBatteryInstantaneousChargeRate(value: Float?) = synchronized(lock) {
-        if (value == evBatteryInstantaneousChargeRate) {
-            return
-        }
-
         evBatteryInstantaneousChargeRate = value
         evBatteryInstantaneousChargeRateTimeStamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
     }
 
     fun updateParkingBrakeOn(value: Boolean?) = synchronized(lock) {
-        if (value == parkingBrakeOn) {
-            return
-        }
-
         parkingBrakeOn = value
         parkingBrakeOnTimestamp = (System.currentTimeMillis() / 1000L).toInt()
         isDirty = true
@@ -153,6 +116,10 @@ class AndroidAutoTelemetryHolder {
 
     fun updateBatteryLevel(levelWh: Float, capacityWh: Float) = synchronized(lock) {
         if (soe == levelWh) {
+            soeTimestamp = (System.currentTimeMillis() / 1000L).toInt()
+            batteryLevelTimestamp = soeTimestamp
+
+            isDirty = true
             return
         }
 
@@ -208,7 +175,8 @@ class AndroidAutoTelemetryHolder {
                 vehicle = VehicleTelemetryItem(
                     name = createStringTelemetryItem(name),
                     manufacturer = createStringTelemetryItem(manufacturer),
-                    year = createNumericTelemetryItem(year?.toFloat(), 0)
+                    year = createNumericTelemetryItem(year?.toFloat(), 0),
+                    batteryCapacity = createNumericTelemetryItem(batteryCapacity, 0)
                 )
             )
         }

package/android/src/main/java/com/margelo/nitro/swe/iternio/reactnativeautoplay/SignInWithGoogleActivity.kt

@@ -34,7 +34,10 @@ class SignInWithGoogleActivity : ComponentActivity() {
         val googleSignInClient = GoogleSignIn.getClient(
             this,
             GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                .requestServerAuthCode(serverClientId).requestEmail().build()
+                .requestServerAuthCode(serverClientId)
+                .requestEmail()
+                .requestIdToken(serverClientId)
+                .build()
         )
         activityResultLauncher.launch(googleSignInClient.signInIntent)
     }

package/lib/types/Telemetry.d.ts

@@ -41,6 +41,7 @@ type VehicleTelemetryItem = {
     name?: StringTelemetryItem;
     year?: NumericTelemetryItem;
     manufacturer?: StringTelemetryItem;
+    batteryCapacity?: NumericTelemetryItem;
 };
 export declare enum VehicleGear {
     Neutral = 1,

package/nitrogen/generated/android/c++/JVehicleTelemetryItem.hpp

@@ -42,10 +42,13 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
       jni::local_ref<JNumericTelemetryItem> year = this->getFieldValue(fieldYear);
       static const auto fieldManufacturer = clazz->getField<JStringTelemetryItem>("manufacturer");
       jni::local_ref<JStringTelemetryItem> manufacturer = this->getFieldValue(fieldManufacturer);
+      static const auto fieldBatteryCapacity = clazz->getField<JNumericTelemetryItem>("batteryCapacity");
+      jni::local_ref<JNumericTelemetryItem> batteryCapacity = this->getFieldValue(fieldBatteryCapacity);
       return VehicleTelemetryItem(
         name != nullptr ? std::make_optional(name->toCpp()) : std::nullopt,
         year != nullptr ? std::make_optional(year->toCpp()) : std::nullopt,
-        manufacturer != nullptr ? std::make_optional(manufacturer->toCpp()) : std::nullopt
+        manufacturer != nullptr ? std::make_optional(manufacturer->toCpp()) : std::nullopt,
+        batteryCapacity != nullptr ? std::make_optional(batteryCapacity->toCpp()) : std::nullopt
       );
     }
 
@@ -55,14 +58,15 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
      */
     [[maybe_unused]]
     static jni::local_ref<JVehicleTelemetryItem::javaobject> fromCpp(const VehicleTelemetryItem& value) {
-      using JSignature = JVehicleTelemetryItem(jni::alias_ref<JStringTelemetryItem>, jni::alias_ref<JNumericTelemetryItem>, jni::alias_ref<JStringTelemetryItem>);
+      using JSignature = JVehicleTelemetryItem(jni::alias_ref<JStringTelemetryItem>, jni::alias_ref<JNumericTelemetryItem>, jni::alias_ref<JStringTelemetryItem>, jni::alias_ref<JNumericTelemetryItem>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
         clazz,
         value.name.has_value() ? JStringTelemetryItem::fromCpp(value.name.value()) : nullptr,
         value.year.has_value() ? JNumericTelemetryItem::fromCpp(value.year.value()) : nullptr,
-        value.manufacturer.has_value() ? JStringTelemetryItem::fromCpp(value.manufacturer.value()) : nullptr
+        value.manufacturer.has_value() ? JStringTelemetryItem::fromCpp(value.manufacturer.value()) : nullptr,
+        value.batteryCapacity.has_value() ? JNumericTelemetryItem::fromCpp(value.batteryCapacity.value()) : nullptr
       );
     }
   };

package/nitrogen/generated/android/kotlin/com/margelo/nitro/swe/iternio/reactnativeautoplay/VehicleTelemetryItem.kt

@@ -25,7 +25,10 @@ data class VehicleTelemetryItem(
   val year: NumericTelemetryItem?,
   @DoNotStrip
   @Keep
-  val manufacturer: StringTelemetryItem?
+  val manufacturer: StringTelemetryItem?,
+  @DoNotStrip
+  @Keep
+  val batteryCapacity: NumericTelemetryItem?
 ) {
   /* primary constructor */
 
@@ -37,8 +40,8 @@ data class VehicleTelemetryItem(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(name: StringTelemetryItem?, year: NumericTelemetryItem?, manufacturer: StringTelemetryItem?): VehicleTelemetryItem {
-      return VehicleTelemetryItem(name, year, manufacturer)
+    private fun fromCpp(name: StringTelemetryItem?, year: NumericTelemetryItem?, manufacturer: StringTelemetryItem?, batteryCapacity: NumericTelemetryItem?): VehicleTelemetryItem {
+      return VehicleTelemetryItem(name, year, manufacturer, batteryCapacity)
     }
   }
 }

package/nitrogen/generated/shared/c++/VehicleTelemetryItem.hpp

@@ -47,10 +47,11 @@ namespace margelo::nitro::swe::iternio::reactnativeautoplay {
     std::optional<StringTelemetryItem> name     SWIFT_PRIVATE;
     std::optional<NumericTelemetryItem> year     SWIFT_PRIVATE;
     std::optional<StringTelemetryItem> manufacturer     SWIFT_PRIVATE;
+    std::optional<NumericTelemetryItem> batteryCapacity     SWIFT_PRIVATE;
 
   public:
     VehicleTelemetryItem() = default;
-    explicit VehicleTelemetryItem(std::optional<StringTelemetryItem> name, std::optional<NumericTelemetryItem> year, std::optional<StringTelemetryItem> manufacturer): name(name), year(year), manufacturer(manufacturer) {}
+    explicit VehicleTelemetryItem(std::optional<StringTelemetryItem> name, std::optional<NumericTelemetryItem> year, std::optional<StringTelemetryItem> manufacturer, std::optional<NumericTelemetryItem> batteryCapacity): name(name), year(year), manufacturer(manufacturer), batteryCapacity(batteryCapacity) {}
 
   public:
     friend bool operator==(const VehicleTelemetryItem& lhs, const VehicleTelemetryItem& rhs) = default;
@@ -68,7 +69,8 @@ namespace margelo::nitro {
       return margelo::nitro::swe::iternio::reactnativeautoplay::VehicleTelemetryItem(
         JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "name"))),
         JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "year"))),
-        JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "manufacturer")))
+        JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "manufacturer"))),
+        JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "batteryCapacity")))
       );
     }
     static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::swe::iternio::reactnativeautoplay::VehicleTelemetryItem& arg) {
@@ -76,6 +78,7 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "name"), JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::toJSI(runtime, arg.name));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "year"), JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::toJSI(runtime, arg.year));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "manufacturer"), JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::toJSI(runtime, arg.manufacturer));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "batteryCapacity"), JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::toJSI(runtime, arg.batteryCapacity));
       return obj;
     }
     static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
@@ -89,6 +92,7 @@ namespace margelo::nitro {
       if (!JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "name")))) return false;
       if (!JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "year")))) return false;
       if (!JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::StringTelemetryItem>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "manufacturer")))) return false;
+      if (!JSIConverter<std::optional<margelo::nitro::swe::iternio::reactnativeautoplay::NumericTelemetryItem>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "batteryCapacity")))) return false;
       return true;
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iternio/react-native-auto-play",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",

package/src/types/Telemetry.ts

@@ -49,6 +49,7 @@ type VehicleTelemetryItem = {
   name?: StringTelemetryItem;
   year?: NumericTelemetryItem;
   manufacturer?: StringTelemetryItem;
+  batteryCapacity?: NumericTelemetryItem;
 };
 
 export enum VehicleGear {