Skip to content

fix: 防止乘車通知顯示目前站 ETA #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
itousouta15 merged 1 commit into from
Sep 25, 2026
Merged

fix: 防止乘車通知顯示目前站 ETA #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion android/app/src/main/kotlin/tw/avianjay/taiwanbus/flutter/RouteTripMonitorService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ import kotlin.math.abs
import org.json.JSONArray
import org.json.JSONObject

internal fun buildOnboardTripSubText(nearestStopName: String): String =
"已上車 · 最近站牌 $nearestStopName"

class RouteTripMonitorService : Service() {
private val ioExecutor = Executors.newSingleThreadExecutor()
private val mainHandler = Handler(Looper.getMainLooper())
Expand Down Expand Up @@ -815,7 +818,7 @@ class RouteTripMonitorService : Service() {
remainingStops == 0 -> "已接近 ${destinationStop.stopName}"
else -> "距離 ${destinationStop.stopName} 還有 $remainingStops 站 · $destinationEtaText"
},
subText = "已上車 · 最近站牌 ${nearestStop.stopName}",
subText = buildOnboardTripSubText(nearestStop.stopName),
progressMax = toProgressMax(journeyPointCount),
progressValue = toProgressValue(currentProgressPoint, journeyPointCount),
shortCriticalText = buildShortCriticalText(
Expand Down
15 changes: 15 additions & 0 deletions android/app/src/test/kotlin/tw/avianjay/taiwanbus/flutter/TripNotificationTextTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package tw.avianjay.taiwanbus.flutter

import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Test

class TripNotificationTextTest {
@Test
fun onboardSubTextOmitsCurrentStopEta() {
val subText = buildOnboardTripSubText("目前站")

assertEquals("已上車 · 最近站牌 目前站", subText)
assertFalse(subText.contains("3 分"))
}
}
Loading