mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2025-12-23 23:27:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

MapSurfaceCallback: workaround for coordinnate offset on Renault 5

Browse Source
This commit is contained in:
johan12345
2025-09-24 21:31:29 +02:00
parent adaf2f0c87
commit 3eaa97ea4f
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/net/vonforst/evmap/auto/MapSurfaceCallback.kt
View File

@@ -171,8 +171,9 @@ class MapSurfaceCallback(val ctx: CarContext, val lifecycleScope: LifecycleCorou
flingAnimator?.cancel()
val map = map ?: return
val offsetX = (focusX - mapView.width / 2) * (scaleFactor - 1f)
val offsetY = (offsetY(focusY) - mapView.height / 2) * (scaleFactor - 1f)
val (x, y) = offsetScreen(focusX, focusY)
val offsetX = (x - mapView.width / 2) * (scaleFactor - 1f)
val offsetY = (y - mapView.height / 2) * (scaleFactor - 1f)
Log.i("MapSurfaceCallback", "focus: $focusX, $focusY, scaleFactor: $scaleFactor")
if (scaleFactor == 2f) {
@@ -223,13 +224,13 @@ class MapSurfaceCallback(val ctx: CarContext, val lifecycleScope: LifecycleCorou
flingAnimator?.cancel()
val downTime: Long = SystemClock.uptimeMillis()
val eventTime: Long = downTime + 100
val yOffset = offsetY(y)
val (xOffset, yOffset) = offsetScreen(x, y)
val downEvent = MotionEvent.obtain(
downTime,
downTime,
MotionEvent.ACTION_DOWN,
x,
xOffset,
yOffset,
0
)
@@ -239,7 +240,7 @@ class MapSurfaceCallback(val ctx: CarContext, val lifecycleScope: LifecycleCorou
downTime,
eventTime,
MotionEvent.ACTION_UP,
x,
xOffset,
yOffset,
0
)
@@ -247,16 +248,24 @@ class MapSurfaceCallback(val ctx: CarContext, val lifecycleScope: LifecycleCorou
upEvent.recycle()
}
private fun offsetY(y: Float): Float {
private fun offsetScreen(x: Float, y: Float): Pair<Float, Float> {
if (BuildConfig.FLAVOR_automotive != "automotive") {
return y
return x to y
}
// On AAOS, touch locations seem to be offset by the status bar height
// On AAOS, touch locations don't seem to take into account system bar insets
// related: https://issuetracker.google.com/issues/256905247
val resId = ctx.resources.getIdentifier("status_bar_height", "dimen", "android")
val offset = resId.takeIf { it > 0 }?.let { ctx.resources.getDimensionPixelSize(it) } ?: 0
return y + offset
val yOffset = resId.takeIf { it > 0 }?.let { ctx.resources.getDimensionPixelSize(it) } ?: 0
val xOffset = if (Build.MODEL == "AIVI2 R FULL DOM" && width > height) {
// Renault 5 left system bar
120
} else {
0
}
return x + xOffset to y + yOffset
}
private fun createMap(ctx: Context): MapContainerView {