Chargeprice: detect which connectors are compatible with vehicle before sending request (#82)

This commit is contained in:
johan12345
2021-04-20 23:20:04 +02:00
parent 52af10d549
commit c106bc40cc
11 changed files with 143 additions and 26 deletions

View File

@@ -132,13 +132,31 @@ class ChargepriceAdapter() :
}
class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
private var checkedItem: Int = 0
private var checkedItem: Int? = 0
var enabledConnectors: List<String>? = null
get() = field
set(value) {
field = value
checkedItem?.let {
if (value != null && getItem(it).type !in value) {
val index = currentList.indexOfFirst {
it.type in value
}
checkedItem = if (index == -1) null else index
onCheckedItemChangedListener?.invoke(getCheckedItem())
}
}
notifyDataSetChanged()
}
override fun getItemViewType(position: Int): Int = R.layout.item_connector_button
override fun onBindViewHolder(holder: ViewHolder<Chargepoint>, position: Int) {
super.bind(holder, getItem(position))
val item = getItem(position)
super.bind(holder, item)
val binding = holder.binding as ItemConnectorButtonBinding
binding.enabled = enabledConnectors?.let { item.type in it } ?: true
val root = binding.root as CheckableConstraintLayout
root.isChecked = checkedItem == position
root.setOnClickListener {
@@ -148,18 +166,18 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
if (checked) {
checkedItem = position
notifyDataSetChanged()
onCheckedItemChangedListener?.invoke(getCheckedItem())
onCheckedItemChangedListener?.invoke(getCheckedItem()!!)
}
}
}
fun getCheckedItem(): Chargepoint = getItem(checkedItem)
fun getCheckedItem(): Chargepoint? = checkedItem?.let { getItem(it) }
fun setCheckedItem(item: Chargepoint) {
checkedItem = currentList.indexOf(item)
fun setCheckedItem(item: Chargepoint?) {
checkedItem = item?.let { currentList.indexOf(item) } ?: null
}
var onCheckedItemChangedListener: ((Chargepoint) -> Unit)? = null
var onCheckedItemChangedListener: ((Chargepoint?) -> Unit)? = null
}
class ChargepriceTagsAdapter() :

View File

@@ -33,13 +33,18 @@ data class ChargepriceStation(
@Json(name = "charge_points") val chargePoints: List<ChargepriceChargepoint>
) {
companion object {
fun fromGoingelectric(geCharger: ChargeLocation): ChargepriceStation {
fun fromGoingelectric(
geCharger: ChargeLocation,
compatibleConnectors: List<String>
): ChargepriceStation {
return ChargepriceStation(
geCharger.coordinates.lng,
geCharger.coordinates.lat,
geCharger.address.country,
geCharger.network,
geCharger.chargepoints.map {
geCharger.chargepoints.filter {
it.type in compatibleConnectors
}.map {
ChargepriceChargepoint(it.power, it.type)
}
)

View File

@@ -107,14 +107,10 @@ class ChargepriceFragment : DialogFragment() {
)
}
vm.chargepriceMetaForChargepoint.observe(viewLifecycleOwner) {
chargepriceAdapter.meta = it.data
chargepriceAdapter.meta = it?.data
}
val connectorsAdapter = CheckableConnectorAdapter()
binding.connectorsList.apply {
adapter = connectorsAdapter
layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
}
val observer: Observer<Chargepoint> = Observer {
connectorsAdapter.setCheckedItem(it)
@@ -126,6 +122,15 @@ class ChargepriceFragment : DialogFragment() {
vm.chargepoint.observe(viewLifecycleOwner, observer)
}
vm.vehicleCompatibleConnectors.observe(viewLifecycleOwner) {
connectorsAdapter.enabledConnectors = it
}
binding.connectorsList.apply {
adapter = connectorsAdapter
layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
}
binding.imgChargepriceLogo.setOnClickListener {
(requireActivity() as MapsActivity).openUrl("https://www.chargeprice.app/?poi_id=${charger.id}&poi_source=going_electric")
}
@@ -150,8 +155,8 @@ class ChargepriceFragment : DialogFragment() {
}
}
vm.chargePricesForChargepoint.observe(viewLifecycleOwner, Observer { res ->
when (res.status) {
vm.chargePricesForChargepoint.observe(viewLifecycleOwner) { res ->
when (res?.status) {
Status.ERROR -> {
connectionErrorSnackbar?.dismiss()
connectionErrorSnackbar = Snackbar
@@ -166,13 +171,13 @@ class ChargepriceFragment : DialogFragment() {
}
connectionErrorSnackbar!!.show()
}
Status.SUCCESS -> {
Status.SUCCESS, null -> {
connectionErrorSnackbar?.dismiss()
}
Status.LOADING -> {
}
}
})
}
}
companion object {

View File

@@ -82,8 +82,11 @@ class SettingsFragment : PreferenceFragmentCompat(),
}
"chargeprice_my_vehicle" -> {
vm.vehicles.value?.data?.let { cars ->
myVehiclePreference.summary = cars.find { it.id == prefs.chargepriceMyVehicle }
?.let { "${it.brand} ${it.name}" }
val vehicle = cars.find { it.id == prefs.chargepriceMyVehicle }
vehicle?.let {
myVehiclePreference.summary = "${it.brand} ${it.name}"
prefs.chargepriceMyVehicleDcChargeports = it.dcChargePorts
}
}
}
}

View File

@@ -104,6 +104,13 @@ class PreferenceDataSource(val context: Context) {
sp.edit().putString("chargeprice_my_vehicle", value).apply()
}
var chargepriceMyVehicleDcChargeports: List<String>?
get() = sp.getString("chargeprice_my_vehicle_dc_chargeports", null)?.split(",")
set(value) {
sp.edit().putString("chargeprice_my_vehicle_dc_chargeports", value?.joinToString(","))
.apply()
}
var chargepriceNoBaseFee: Boolean
get() = sp.getBoolean("chargeprice_no_base_fee", false)
set(value) {

View File

@@ -7,6 +7,7 @@ import android.view.View
import android.view.ViewGroup.MarginLayoutParams
import android.widget.ImageView
import android.widget.TextView
import androidx.annotation.ColorInt
import androidx.core.content.ContextCompat
import androidx.core.content.res.use
import androidx.core.text.HtmlCompat
@@ -272,4 +273,22 @@ fun setRangeSliderListeners(slider: RangeSlider, attrChange: InverseBindingListe
slider.addOnChangeListener { _, _, _ ->
attrChange.onChange()
}
}
@ColorInt
fun colorEnabled(ctx: Context, enabled: Boolean): Int {
val attr = if (enabled) {
android.R.attr.textColorSecondary
} else {
android.R.attr.textColorHint
}
val typedValue = ctx.obtainStyledAttributes(intArrayOf(attr))
val color = typedValue.getColor(0, 0)
typedValue.recycle()
return color
}
@BindingAdapter("app:tint")
fun setImageTintList(view: ImageView, @ColorInt color: Int) {
view.imageTintList = ColorStateList.valueOf(color)
}

View File

@@ -32,6 +32,40 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
}
}
private val acConnectors = listOf(
Chargepoint.CEE_BLAU,
Chargepoint.CEE_ROT,
Chargepoint.SCHUKO,
Chargepoint.TYPE_1,
Chargepoint.TYPE_2
)
private val plugMapping = mapOf(
"ccs" to Chargepoint.CCS,
"tesla_suc" to Chargepoint.SUPERCHARGER,
"tesla_ccs" to Chargepoint.CCS,
"chademo" to Chargepoint.CHADEMO
)
val vehicleCompatibleConnectors: LiveData<List<String>> by lazy {
MutableLiveData<List<String>>().apply {
value = prefs.chargepriceMyVehicleDcChargeports?.map {
plugMapping.get(it)
}?.filterNotNull()?.plus(acConnectors)
}
}
val noCompatibleConnectors: LiveData<Boolean> by lazy {
MediatorLiveData<Boolean>().apply {
value = false
listOf(charger, vehicleCompatibleConnectors).forEach {
addSource(it) {
val charger = charger.value ?: return@addSource
val connectors = vehicleCompatibleConnectors.value ?: return@addSource
value = !charger.chargepoints.map { it.type }.any { it in connectors }
}
}
}
}
val batteryRange: MutableLiveData<List<Float>> by lazy {
MutableLiveData<List<Float>>().apply {
value = listOf(20f, 80f)
@@ -41,7 +75,7 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
val chargePrices: MediatorLiveData<Resource<List<ChargePrice>>> by lazy {
MediatorLiveData<Resource<List<ChargePrice>>>().apply {
value = Resource.loading(null)
listOf(charger, vehicle, batteryRange).forEach {
listOf(charger, vehicle, batteryRange, vehicleCompatibleConnectors).forEach {
addSource(it) {
loadPrices()
}
@@ -111,18 +145,21 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
chargePrices.value = Resource.loading(null)
val geCharger = charger.value
val car = vehicle.value
if (geCharger == null || car == null) {
val compatibleConnectors = vehicleCompatibleConnectors.value
if (geCharger == null || car == null || compatibleConnectors == null) {
chargePrices.value = Resource.error(null, null)
return
}
val cpStation = ChargepriceStation.fromGoingelectric(geCharger, compatibleConnectors)
loadPricesJob?.cancel()
loadPricesJob = viewModelScope.launch {
delay(800)
try {
val result = api.getChargePrices(ChargepriceRequest().apply {
dataAdapter = "going_electric"
station = ChargepriceStation.fromGoingelectric(geCharger)
station = cpStation
vehicle = HasOne(car)
options = ChargepriceOptions(
batteryRange = batteryRange.value!!.map { it.toDouble() },