Changed test UI to test obd

osmandapp · Sep 25, 2024 · 47a3d0f · 47a3d0f
1 parent eaf9eee
commit 47a3d0f
Show file tree

Hide file tree

Showing 10 changed files with 538 additions and 296 deletions.
diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDataComputer.kt
@@ -101,9 +101,9 @@ object OBDDataComputer {
 		FUEL_LEFT_DISTANCE(true,
 			listOf(OBD_FUEL_LEVEL_COMMAND),
 			{ data -> OBDValue(OBD_FUEL_LEVEL_COMMAND, data) }),
-		FUEL_LEFT_LITERS(false,
-			listOf(OBD_FUEL_LEVEL_COMMAND),
-			{ data -> OBDValue(OBD_FUEL_LEVEL_COMMAND, data) }),
+//		FUEL_LEFT_LITERS(false,
+//			listOf(OBD_FUEL_LEVEL_COMMAND),
+//			{ data -> OBDValue(OBD_FUEL_LEVEL_COMMAND, data) }),
 		FUEL_LEFT_PERCENT(false,
 			listOf(OBD_FUEL_LEVEL_COMMAND),
 			{ data -> OBDValue(OBD_FUEL_LEVEL_COMMAND, data) }),
@@ -231,7 +231,7 @@ object OBDDataComputer {
 					null
 				}
 
-				FUEL_LEFT_LITERS,
+//				FUEL_LEFT_LITERS,
 				FUEL_LEFT_PERCENT -> {
 					if (locValues.size > 0) {
 						locValues[locValues.size - 1].doubleValue

diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDispatcher.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/obd/OBDDispatcher.kt
@@ -141,11 +141,17 @@ object OBDDispatcher {
 		readStatusListener = listener
 	}
 
-	fun setReadWriteStreams(readStream: Source, writeStream: Sink) {
+	fun setReadWriteStreams(readStream: Source?, writeStream: Sink?) {
 		scope?.cancel()
 		inputStream = readStream
 		outputStream = writeStream
-		startReadObdLooper()
+		if(readStream != null && writeStream != null) {
+			startReadObdLooper()
+		}
+	}
+
+	fun stopReading() {
+		setReadWriteStreams(null, null)
 	}
 
 	private fun consumeResponse(command: OBDCommand, result: String) {