add note that predictions are only for DC plugs

(in case it is relevant)
This commit is contained in:
johan12345
2022-10-08 13:29:11 +02:00
committed by Johan von Forstner
parent c28a5382d4
commit 5d47ca2e3a
5 changed files with 55 additions and 8 deletions

View File

@@ -19,6 +19,7 @@ import net.vonforst.evmap.api.fronyx.FronyxApi
import net.vonforst.evmap.api.fronyx.FronyxEvseIdResponse
import net.vonforst.evmap.api.fronyx.FronyxStatus
import net.vonforst.evmap.api.goingelectric.GEChargepoint
import net.vonforst.evmap.api.nameForPlugType
import net.vonforst.evmap.api.openchargemap.OCMConnection
import net.vonforst.evmap.api.openchargemap.OCMReferenceData
import net.vonforst.evmap.api.stringProvider
@@ -279,12 +280,37 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
}
}
private val predictedChargepoints = charger.map {
it.data?.let { charger ->
charger.chargepoints.filter { FronyxApi.isChargepointSupported(charger, it) }
}
}
val predictionMaxValue: LiveData<Int> by lazy {
charger.map {
it.data?.let { charger ->
charger.chargepoints.filter { FronyxApi.isChargepointSupported(charger, it) }
.sumOf { it.count }
} ?: 0
predictedChargepoints.map {
it?.sumOf { it.count } ?: 0
}
}
val predictionDescription: LiveData<String?> by lazy {
predictedChargepoints.map { predictedChargepoints ->
if (predictedChargepoints == null) return@map null
val allChargepoints = charger.value?.data?.chargepoints ?: return@map null
val predictedChargepointTypes = predictedChargepoints.map { it.type }.distinct()
if (allChargepoints == predictedChargepoints) {
null
} else if (predictedChargepointTypes.size == 1) {
application.getString(
R.string.prediction_only,
nameForPlugType(application.stringProvider(), predictedChargepointTypes[0])
)
} else {
application.getString(
R.string.prediction_only,
application.getString(R.string.prediction_dc_plugs_only)
)
}
}
}

View File

@@ -51,6 +51,10 @@
name="predictionMaxValue"
type="Integer" />
<variable
name="predictionDescription"
type="String" />
<variable
name="filteredAvailability"
type="Resource&lt;ChargeLocationStatus&gt;" />
@@ -357,18 +361,30 @@
<TextView
android:id="@+id/textView8"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="@string/utilization_prediction"
android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
android:textColor="?colorPrimary"
app:goneUnless="@{predictionGraph != null}"
app:layout_constraintEnd_toStartOf="@+id/btnPredictionHelp"
app:layout_constraintStart_toStartOf="@+id/guideline"
app:layout_constraintTop_toBottomOf="@+id/divider2" />
<TextView
android:id="@+id/textView29"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:textAppearance="@style/TextAppearance.Material3.BodySmall"
android:text="@{predictionDescription}"
app:goneUnless="@{predictionGraph != null}"
app:layout_constraintBaseline_toBaselineOf="@+id/textView8"
app:layout_constraintEnd_toStartOf="@+id/btnPredictionHelp"
app:layout_constraintStart_toEndOf="@+id/textView8"
tools:text="(DC plugs only)" />
<Button
android:id="@+id/btnPredictionHelp"
style="@style/Widget.Material3.Button.IconButton"

View File

@@ -197,6 +197,7 @@
app:filteredAvailability="@{vm.filteredAvailability}"
app:predictionGraph="@{vm.predictionGraph}"
app:predictionMaxValue="@{vm.predictionMaxValue}"
app:predictionDescription="@{vm.predictionDescription}"
app:chargeCards="@{vm.chargeCardMap}"
app:filteredChargeCards="@{vm.filteredChargeCards}"
app:distance="@{vm.chargerDistance}"

View File

@@ -279,4 +279,6 @@
</plurals>
<string name="pref_prediction_enabled">Auslastungsprognosen anzeigen</string>
<string name="pref_prediction_enabled_summary">für unterstützte Ladestationen\n(momentan nur Schnellader in Deutschland)</string>
<string name="prediction_only">(nur %s)</string>
<string name="prediction_dc_plugs_only">DC-Anschlüsse</string>
</resources>

View File

@@ -278,4 +278,6 @@
</plurals>
<string name="pref_prediction_enabled">Show utilization predictions</string>
<string name="pref_prediction_enabled_summary">for supported chargers\n(currently only DC in Germany)</string>
<string name="prediction_only">(%s only)</string>
<string name="prediction_dc_plugs_only">DC plugs</string>
</resources>