Add obd plugin #20818
Add obd plugin #20818
Conversation
| enum class OBDCommand( | ||
| val command: String, | ||
| private val responseParser: (String) -> String, | ||
| val isStale: Boolean = false) { |
There was a problem hiding this comment.
Not clear what is stale and why it always false
| @@ -0,0 +1,21 @@ | |||
| package net.osmand.shared.obd | |||
|
|
|||
| enum class OBDCommand( | |||
There was a problem hiding this comment.
Probably there should be abstract class AbstractOBDCommand and subclasses for each command
| fun setReadWriteStreams(readStream: Source, writeStream: Sink) { | ||
| inputStream = readStream | ||
| outputStream = writeStream | ||
| job?.cancel() |
There was a problem hiding this comment.
isn't scope?.cancel() enough?
| inputStream = readStream | ||
| outputStream = writeStream | ||
| job?.cancel() | ||
| scope?.cancel() |
There was a problem hiding this comment.
why cancelling scope and job after streams redefined? looks like potential bug
| } | ||
| log.info("response. ${command.name} **${response.replace('\\', '\\')}") | ||
| } | ||
| } catch (error: Throwable) { |
There was a problem hiding this comment.
You should process exceptions more carefully. For example CancellationException should be handled separately
|
|
||
| object OBDDispatcher { | ||
|
|
||
| private val commandQueue = ConcurrentMutableList<OBDCommand>() |
There was a problem hiding this comment.
use just List and KCollectionUtils for modifying
| object OBDDispatcher { | ||
|
|
||
| private val commandQueue = ConcurrentMutableList<OBDCommand>() | ||
| private val staleCommandsCache = ConcurrentMutableMap<OBDCommand, String>() |
There was a problem hiding this comment.
staleCommandsCache looks useless, since isStale is always false. Also staleCommandsCache never clears.
There was a problem hiding this comment.
added stale commands
| } | ||
|
|
||
| fun addResponseListener(responseListener: OBDResponseListener) { | ||
| responseListeners.add(responseListener) |
|
|
||
| object BLEUtils { | ||
|
|
||
| fun isBLEEnabled(activity: Activity?): Boolean { |
There was a problem hiding this comment.
Such parameter should not be nullable.
Why isBLEEnabled returns false if activity null? If activity parameter is null - means that activity is null, but not that BLE is disabled.
| return false | ||
| } | ||
|
|
||
| fun getBluetoothAdapter(activity: Activity?): BluetoothAdapter? { |
There was a problem hiding this comment.
Do not let such parameter be nullable! Verify it on caller side!
…gets formatting and calculations
| companion object { | ||
| fun fromCode(code: String): FuelType { | ||
| return when (code.uppercase()) { | ||
| "00" -> NO_PROVIDED |
| } | ||
|
|
||
| fun compute() { | ||
| val now: Long = Clock.System.now().toEpochMilliseconds() |
There was a problem hiding this comment.
There is extension currentTimeMillis()
| private fun averageDouble(values: List<OBDValue>): Any? { | ||
| if (values.isNotEmpty()) { | ||
| var sum = 0.0 | ||
| var cnt = 0 | ||
| for (o in values) { | ||
| sum += o.doubleValue | ||
| cnt++ | ||
| } | ||
| return sum / cnt | ||
| } | ||
| return null | ||
| } |
There was a problem hiding this comment.
private fun averageDouble(values: List<OBDValue>): Double? = if (values.isNotEmpty()) values.sumOf { it.doubleValue } / values.size else null
|
|
||
| private val log = LoggerFactory.getLogger("OBDDataComputer") | ||
|
|
||
| var locations: List<OBDLocation> = ArrayList() |
OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt
Show resolved
Hide resolved
|
|
||
| override fun updateSimpleWidgetInfo(drawSettings: DrawSettings?) { | ||
| val sensorData = plugin.getSensorData(fieldType) | ||
| val data = widgetComputer.computeValue() |
There was a problem hiding this comment.
cacheData needed to not setText frequently
|
|
||
| fun registerWidget( | ||
| type: OBDTypeWidget, | ||
| averageSeconds: Int, |
| formatter = OBDFuelTypeFormatter() | ||
| } | ||
| } | ||
| widgetComputer = OBDDataComputer.registerWidget(obdDataWidgetType, 15, formatter) |
There was a problem hiding this comment.
This is temporary value, should be changed when implementing UI for widgets. Added todo here
| } | ||
| } | ||
| } catch (e: IOException) { | ||
| e.printStackTrace() |
There was a problem hiding this comment.
Do not insert e.printStackTrace() anywhere in code
| } | ||
|
|
||
| fun getCommandQueue(): List<OBDCommand> { | ||
| return ArrayList(commandQueue) |
There was a problem hiding this comment.
commandQueue is immutable, do not create duplicate list
| } | ||
| } | ||
|
|
||
| fun addCommandToRead(command: OBDCommand) { |
There was a problem hiding this comment.
There should not be references to OBDCommand outside ODB backend. This is completely backend class. There should be some metrics types or classes for operating in UI.
No description provided.