From 65bf7b52c6154a2fb3e950d7703ea9a275ffbb56 Mon Sep 17 00:00:00 2001 From: undef-i Date: Tue, 5 Aug 2025 19:29:46 +0800 Subject: [PATCH] fix: correct the error in train_number_info.csv --- .gitignore | 3 +-- Task | 0 app/build.gradle.kts | 4 ++-- app/src/main/assets/train_number_info.csv | 8 ++++---- app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt | 7 +++++++ .../org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt | 4 ++-- .../java/org/noxylva/lbjconsole/util/LocationUtils.kt | 2 +- 7 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 Task diff --git a/.gitignore b/.gitignore index cc95778..c03c112 100644 --- a/.gitignore +++ b/.gitignore @@ -18,5 +18,4 @@ local.properties *.jks *.keystore *.base64 -docs -gradle.properties \ No newline at end of file +docs \ No newline at end of file diff --git a/Task b/Task deleted file mode 100644 index e69de29..0000000 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 74aa3ca..6001726 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,8 +13,8 @@ android { applicationId = "org.noxylva.lbjconsole" minSdk = 29 targetSdk = 35 - versionCode = 10 - versionName = "0.1.1" + versionCode = 11 + versionName = "0.1.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/assets/train_number_info.csv b/app/src/main/assets/train_number_info.csv index 4b6f1e4..9213b85 100644 --- a/app/src/main/assets/train_number_info.csv +++ b/app/src/main/assets/train_number_info.csv @@ -26,8 +26,8 @@ "^[Vv1](00[1-9]|0[1-9]\d|[1-9]\d{2})$","跨三局及以上图定普通旅客快车" "^[Bb2](00[1-9]|0[1-9]\d|[1-9]\d{2})$","跨两局图定普通旅客快车" "^3(00[1-9]|0[1-9]\d|[1-9]\d{2})$","跨局临时普通旅客快车" -"^[Uu4](00[1-9]|0[1-9]\d|[1-9]\d{2})$","管内图定普通旅客快车四字头" -"^[Xx5]([0-8]\d{2}|9[0-8]\d|99[0-8])$","管内图定普通旅客快车五字头" +"^[Uu4](00[1-9]|0[1-9]\d|[1-9]\d{2})$","管内图定普通旅客快车" +"^[Xx5](000|1[9][9]|200|3[9][9]|400)$","管内图定普通旅客快车" "^6(19[0-8]|1[0-8]\d|0[1-9]\d|00[1-9])$","直通普通旅客慢车" "^(6(20[1-9]|2[1-9]\d|[3-9]\d{2})|7([0-4]\d{2}|5([0-8]\d|9[0-8])))$","管内普通旅客慢车" "^(8([0-8]\d{2}|9[0-8]\d|99[0-8])|7(60[1-9]|6[1-9]\d|[7-9]\d{2}))$","通勤列车" @@ -73,8 +73,8 @@ "^DJ([4-9]\d{2}|40[1-9]|4[1-9]\d)$","动车组检测列车300管内" "^DJ1(400|[0-3]\d{2})$","动车组检测列车250直通" "^DJ1(40[1-9]|4[1-9]\d|[5-9]\d{2})$","动车组检测列车250管内" -"^DJ[56]\d{3}$","动车组确认列车直通" -"^DJ[78]\d{3}$","动车组确认列车管内" +"^DJ[56]\d{3}$","直通动车组确认列车" +"^DJ[78]\d{3}$","管内动车组确认列车" "^[Ff][GDCZTKgdcztk]?\d{1,4}$","因故折返旅客列车" "^0[GDCZTKgdcztk]\d{1,4}$","回送图定客车底" "^00(100|[1-9]\d?)$","有火回送动车组车底" diff --git a/app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt b/app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt index 7534ae1..8c820f1 100644 --- a/app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt +++ b/app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt @@ -845,6 +845,13 @@ class MainActivity : ComponentActivity() { } } + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + Log.d(TAG, "onNewIntent called") + currentTab = 0 + forceUiRefresh() + } + override fun onResume() { super.onResume() Log.d(TAG, "App resumed") diff --git a/app/src/main/java/org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt b/app/src/main/java/org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt index 36d7a9f..925f7ab 100644 --- a/app/src/main/java/org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt +++ b/app/src/main/java/org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt @@ -782,7 +782,7 @@ fun MergedTrainRecordItem( controller.setZoom(mapViewState.zoom) controller.setCenter(mapViewState.center) } else if (allValidCoordinates.size > 1) { - val boundingBox = BoundingBox.fromGeoPoints(allValidCoordinates) + val boundingBox = BoundingBox.fromGeoPoints(allValidCoordinates.filter { it.latitude != 0.0 || it.longitude != 0.0 }) val layoutListener = object : android.view.View.OnLayoutChangeListener { override fun onLayoutChange(v: android.view.View?, left: Int, top: Int, right: Int, bottom: Int, oldLeft: Int, oldTop: Int, oldRight: Int, oldBottom: Int) { if (width > 0 && height > 0) { @@ -805,7 +805,7 @@ fun MergedTrainRecordItem( addOnLayoutChangeListener(layoutListener) } else if (allValidCoordinates.isNotEmpty()) { val center = allValidCoordinates.first() - val zoom = 14.0 + val zoom = 10.0 controller.setZoom(zoom) controller.setCenter(center) onMapViewStateChange(CardMapView(center, zoom)) diff --git a/app/src/main/java/org/noxylva/lbjconsole/util/LocationUtils.kt b/app/src/main/java/org/noxylva/lbjconsole/util/LocationUtils.kt index f62e5e0..5ceea7a 100644 --- a/app/src/main/java/org/noxylva/lbjconsole/util/LocationUtils.kt +++ b/app/src/main/java/org/noxylva/lbjconsole/util/LocationUtils.kt @@ -52,7 +52,7 @@ object LocationUtils { val minuteEndIndex = dmsString.indexOf('′') if (minuteEndIndex == -1) { - return degrees + return null } val minutes = dmsString.substring(degreeIndex + 1, minuteEndIndex).toDouble()