feat: update locomotive type support and optimized position display format

- Move the loading and saving operations of TrainRecordManager to the IO goroutine for execution
- Optimize the data structure of recentRecords in MainActivity to be a mutableStateList
- Improve the interaction effect and device connection status display of ConnectionDialog
- Delete the MergedHistoryScreen file that is no longer in use
- Increase the number of threads for map tile downloads and file system operations

.gitignore

@@ -13,9 +13,12 @@ captures
 .externalNativeBuild
 .cxx
 local.properties
-local.properties
 *.ps1
 .*.bat
 *.jks
 *.keystore
-*.base64
+*.base64
+docs
+linux
+windows
+android_original

.idea/.name

@@ -1 +1 @@
-LBJ Receiver
+LBJ_Console

README.md

@@ -1,12 +1,20 @@
 # LBJ Console
 
-LBJ Console is an Android app designed to receive and display LBJ messages via BLE from the [SX1276_Receive_LBJ](https://github.com/undef-i/SX1276_Receive_LBJ) device.
+LBJ Console 是一款 Android 应用程序，用于通过 BLE 从 [SX1276_Receive_LBJ](https://github.com/undef-i/SX1276_Receive_LBJ) 设备接收并显示列车预警消息，功能包括：
 
-## Roadmap
-- Record filtering (train number, time range)
-- Record management page optimization
-- Optional train merge by locomotive/number
+- 接收列车预警消息，支持可选的手机推送通知。
+- 在地图上显示预警消息的 GPS 信息。
+- 基于内置数据文件显示机车配属，机车类型和车次类型。
 
-# License
 
-This project is licensed under the GNU General Public License v3.0 (GPLv3). This license ensures that the software remains free and open source, requiring that any modifications or derivative works must also be released under the same license terms.
+## 数据文件
+
+LBJ Console 依赖以下数据文件，位于 `app/src/main/assets/` 目录，用于支持机车配属和车次信息的展示：
+- `loco_info.csv`：包含机车配属信息，格式为 `机车型号,机车编号起始值,机车编号结束值,所属铁路局及机务段,备注`。
+- `loco_type_info.csv`：包含机车类型编码信息，格式为 `机车类型编码,机车类型`。
+- `train_info.csv`：包含车次类型信息，格式为 `正则表达式,车次类型`。
+
+
+# 许可证
+
+该项目采用 GNU 通用公共许可证 v3.0（GPLv3）授权。该许可证确保软件保持免费和开源，要求任何修改或衍生作品也必须在相同许可证条款下发布。

app/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -12,8 +13,8 @@ android {
         applicationId = "org.noxylva.lbjconsole"
         minSdk = 29
         targetSdk = 35
-        versionCode = 4
-        versionName = "0.0.4"
+        versionCode = 13
+        versionName = "0.1.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -59,6 +60,7 @@ android {
     }
     lint {
         disable += "NullSafeMutableLiveData"
+        warning += "MissingPermission"
     }
 }
 
@@ -81,8 +83,13 @@ dependencies {
     debugImplementation(libs.androidx.ui.test.manifest)
     implementation("org.json:json:20231013")
     implementation("androidx.compose.material:material-icons-extended:1.5.4")
-    
+    implementation("androidx.appcompat:appcompat:1.6.1")
     
     implementation("org.osmdroid:osmdroid-android:6.1.16")
     implementation("org.osmdroid:osmdroid-mapsforge:6.1.16")
+    
+    implementation(libs.androidx.room.runtime)
+    implementation(libs.androidx.room.ktx)
+    ksp(libs.androidx.room.compiler)
+    implementation(libs.androidx.startup.runtime)
 }

app/src/main/AndroidManifest.xml

@@ -11,6 +11,10 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="true"/>
 
@@ -22,14 +26,14 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.LBJReceiver"
+        android:theme="@style/Theme.LBJConsole"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.LBJReceiver">
+            android:theme="@style/Theme.LBJConsole">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,6 +41,19 @@
             </intent-filter>
         </activity>
         
+        <activity
+            android:name=".SettingsActivity"
+            android:exported="false"
+            android:label="Settings"
+            android:parentActivityName=".MainActivity"
+            android:theme="@style/Theme.LBJConsole" />
+        
+        <service
+            android:name=".BackgroundService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="dataSync" />
+        
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

app/src/main/assets/loco_type_info.csv

@@ -0,0 +1,142 @@
+001,解放
+003,前进
+005,建设
+006,KD7
+055,蓝箭控车
+081,东风21
+101,东风
+102,东风2
+103,东风3
+104,东风4
+105,东风4客
+106,东风4C
+107,东风5
+108,东风5宽
+109,东风6
+110,东风7
+111,东风8
+112,东风9
+113,东风10
+114,东方红1
+115,东方红2
+116,东方红3
+117,东方红5
+118,北京
+119,北京宽
+120,ND2
+121,ND3
+122,ND4
+123,ND5
+124,NY5
+125,NY6
+126,NY7
+127,轻油
+128,东方红21
+129,东风7B
+130,东风5S
+131,东风7C
+132,东风7S
+133,工矿1
+134,工矿1F
+135,东风4E
+136,东风7D
+137,工矿1A
+138,东风11
+139,天安
+140,东风10F
+141,东风4D
+142,东风8B
+143,东风12
+144,东风7E
+145,NYJ1
+146,NZJ1
+147,NZJ2
+148,东风4DJ
+149,新曙光
+150,神州
+151,NJ2
+152,东风7G
+153,NDJ3
+157,FXN3D
+158,东风11G
+160,HXN3
+161,HXN5
+162,HXN3B
+163,HXN5B
+167,FXN3B
+169,FXN3C
+170,FXN5C
+171,FXN3-J
+201,8G
+202,8K
+203,6G
+204,6K
+205,韶山1
+206,韶山3
+207,韶山4
+208,韶山5
+209,韶山6
+210,韶山3B
+211,韶山7
+212,韶山8
+213,韶山7B
+214,韶山7C
+215,韶山6B
+216,韶山9
+217,韶山7D
+218,DJ熊猫
+219,DJ1
+220,DJ2
+221,DJF
+222,蓝箭动车
+223,先锋号
+224,韶山7E
+225,韶山4G
+226,韶山3C
+228,天梭
+229,DJ4和谐
+230,KTT
+231,HXD1
+232,HXD2
+233,HXD3
+234,HXD1B
+235,HXD2B
+236,HXD3B
+237,HXD1C
+238,HXD2C
+239,HXD3C
+240,HXD1D
+241,HXD2D
+242,HXD3D
+243,FXD1B
+244,FXD2B
+245,FXD1
+246,FXD3
+247,FXD1-J
+248,FXD3-J
+249,KZ25TA
+251,KZ25TB
+252,HXD1D-J
+254,FXD1H
+300,雪域神州
+301,CRH1
+302,CRH2
+303,CRH3
+305,CRH5
+306,CRH380A
+307,CRH380B
+308,CRH380C
+309,CRH380D
+310,CRH6A
+311,CR400AF
+312,CR400BF
+313,CR300AF
+314,CR300BF
+315,CRH2E
+316,CRH6F
+330,CJ1
+331,CJ2
+332,CJ3
+333,CJ4
+334,CJ5
+335,CJ6

app/src/main/assets/train_number_info.csv

@@ -0,0 +1,82 @@
+"^[Gg](4000|[1-3]\d{3}|[1-9]\d{0,2})$","直通图定高速动车组"
+"^[Gg](400[1-9]|40[1-9]\d|4[1-8]\d{2}|49[0-8]\d|499[0-8])$","直通临客高速动车组"
+"^[Gg](9000|[6-8]\d{3}|500[1-9]|50[1-9]\d|5[1-9]\d{2})$","管内图定高速动车组"
+"^[Gg](900[1-9]|90[1-9]\d|9[1-8]\d{2}|99[0-8]\d|999[0-8])$","管内临客高速动车组"
+"^[Cc]([1-8]\d{3}|9000)$","图定城际动车组"
+"^[Cc](900[1-9]|90[1-9]\d|9[1-8]\d{2}|99[0-8]\d|999[0-8])$","临客城际动车组"
+"^[Cc][1-9]\d{2}$","动力集中城际动车组"
+"^[IDid](4000|[1-3]\d{3}|[1-9]\d{0,2})$","直通图定动车组"
+"^[IDid](400[1-9]|40[1-9]\d|4[1-8]\d{2}|49[0-8]\d|499[0-8])$","直通临客动车组"
+"^[IDid](9000|[6-8]\d{3}|500[1-9]|50[1-9]\d|5[1-9]\d{2})$","管内图定动车组"
+"^[IDid](900[1-9]|90[1-9]\d|9[1-8]\d{2}|99[0-8]\d|999[0-8])$","管内临客动车组"
+"^[IDid](8([0-8]\d|9[0-8])|7(0[1-9]|[1-9]\d))$","动力集中动车组"
+"^[IDid](300|[12]\d{2}|[1-9]\d?)$","跨局动力集中动车组"
+"^[PZpz](4000|[1-3]\d{3}|[1-9]\d{0,2})$","直通图定直达特快旅客列车"
+"^[PZpz](400[1-9]|40[1-9]\d|4[1-8]\d{2}|49[0-8]\d|499[0-8])$","直通临客直达特快旅客列车"
+"^[PZpz](9000|[6-8]\d{3}|500[1-9]|50[1-9]\d|5[1-9]\d{2})$","管内图定直达特快旅客列车"
+"^[PZpz](900[1-9]|90[1-9]\d|9[1-8]\d{2}|99[0-8]\d|999[0-8])$","管内临客直达特快旅客列车"
+"^[QTqt](3000|[12]\d{3}|[1-9]\d{0,2})$","直通图定特快旅客列车"
+"^[QTqt](300[1-9]|30[1-9]\d|3[1-8]\d{2}|39[0-8]\d|399[0-8])$","直通临客特快旅客列车"
+"^[QTqt](4(00[1-9]|0[1-9]\d|[1-8]\d{2}|9[0-8]\d|99[0-8]))$","管内临客特快旅客列车"
+"^[QTqt]([5-8]\d{3}|9([0-8]\d{2}|9[0-8]\d|99[0-8])|500[1-9]|50[1-9]\d|5[1-9]\d{2})$","管内图定特快旅客列车"
+"^[WKwk](4000|[1-3]\d{3}|[1-9]\d{0,2})$","直通图定快速旅客列车"
+"^[WKwk](400[1-9]|40[1-9]\d|4[1-8]\d{2}|49[0-8]\d|499[0-8])$","直通临客快速旅客列车"
+"^[WKwk](6([0-8]\d{2}|9[0-8]\d|99[0-8])|500[1-9]|50[1-9]\d|5[1-9]\d{2})$","管内临客快速旅客列车"
+"^[WKwk](8\d{3}|9([0-8]\d{2}|9[0-8]\d|99[0-8])|7(00[1-9]|0[1-9]\d|[1-9]\d{2}))$","管内图定快速旅客列车"
+"^[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](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}))$","通勤列车"
+"^[Yy](500|[1-4]\d{2}|[1-9]\d?)$","跨局旅游列车"
+"^[Yy](50[1-9]|5[1-9]\d|[6-9]\d{2})$","管内旅游列车"
+"^[Ss][1-9]\d{0,3}$","市郊旅客列车"
+"^[Ll](6([0-8]\d{2}|9[0-8]\d|99[0-8])|[1-5]\d{3}|[1-9]\d{0,2})$","直通临时旅客列车"
+"^[Ll]([7-9]\d{3})$","管内临时旅客列车"
+"^[Xx](19[0-8]|1[0-8]\d|[1-9]\d?)$","特快货物班列"
+"^[Xx](39[0-8]|3[0-8]\d|2[1-9]\d|20[1-9])$","快速货物班列"
+"^[Xx]2(40[1-9]|4[1-9]\d|[5-9]\d{2})$","直通货物快运列车"
+"^[Xx]([4-9]\d{2}|4[1-9]\d|40[1-9])$","管内货物快运列车"
+"^[Xx]8\d{3}$","中欧中亚集装箱班列"
+"^[Xx]9([0-4]\d{2}|500)$","中亚集装箱班列"
+"^[Xx]9(50[1-9]|5[1-9]\d|[6-9]\d{2})$","水铁联运班列"
+"^[Xx][1-4]\d{4}$","加挂零散快运车辆货物列车"
+"^1(000[1-9]|00[1-9]\d|0[1-9]\d{2}|[1-9]\d{3})$","技术直达列车"
+"^2\d{4}$","直通货物列车"
+"^3\d{4}$","区段摘挂列车"
+"^4([0-3]\d{3}|4([0-8]\d{2}|9[0-8]\d|99[0-8]))$","摘挂列车"
+"^4(500[1-9]|50[1-9]\d|5[1-9]\d{2}|[6-9]\d{3})$","小运转列车"
+"^6\d{4}$","自备列车"
+"^70\d{3}$","超限货物列车"
+"^7([1-6]\d{3}|7([0-8]\d{2}|9[0-8]\d|99[0-8]))$","重载货物列车"
+"^78\d{3}$","保温列车"
+"^8(0\d{3}|1([0-8]\d{2}|9[0-8]\d|99[0-8]))$","普快货物班列"
+"^8(200[1-9]|20[1-9]\d|2[1-9]\d{2}|[34]\d{3})$","煤炭直达列车"
+"^85\d{3}$","石油直达列车"
+"^86\d{3}$","始发直达列车"
+"^87\d{3}$","空车直达列车"
+"^(90\d{3}|91([0-8]\d{2}|9[0-8]\d|99[0-8]))$","军用列车"
+"^50\d{3}$","客车单机"
+"^51\d{3}$","货车单机"
+"^52\d{3}$","小运转单机"
+"^5(3\d{3}|4([0-8]\d{2}|9[0-8]\d|99[0-8]))$","补机列车"
+"^55(300|[0-2]\d{2})$","普通客货试运转列车"
+"^55(500|30[1-9]|3[1-9]\d|4\d{2})$","高速动车组试运转列车"
+"^55(50[1-9]|5[1-9]\d|[6-9]\d{2})$","普通动车组试运转列车"
+"^56\d{3}$","轻油动车与轨道车"
+"^57\d{3}$","路用列车"
+"^58(10[1-9]|1[1-9]\d|[2-8]\d{2}|9([0-8]\d|9[0-8]))$","救援列车"
+"^DJ(400|[1-3]\d{2}|[1-9]\d?)$","动车组检测列车300直通"
+"^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}$","管内动车组确认列车"
+"^[Ff][GDCZTKgdcztk]?\d{1,4}$","因故折返旅客列车"
+"^0[GDCZTKgdcztk]\d{1,4}$","回送图定客车底"
+"^00(100|[1-9]\d?)$","有火回送动车组车底"
+"^00(10[1-9]|1[1-9]\d|2([0-8]\d|9[0-8]))$","无火回送动车组车底"
+"^00(30[1-9]|3[1-9]\d|4([0-8]\d|9[0-8]))$","无火回送普速客车底"

app/src/main/java/org/noxylva/lbjconsole/BLEClient.kt

@@ -45,6 +45,16 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
     private var lastKnownDeviceAddress: String? = null
     private var connectionAttempts = 0
     private var isReconnecting = false
+    private var highFrequencyReconnect = true
+    private var reconnectHandler = Handler(Looper.getMainLooper())
+    private var reconnectRunnable: Runnable? = null
+    private var connectionLostCallback: (() -> Unit)? = null
+    private var connectionSuccessCallback: ((String) -> Unit)? = null
+    private var specifiedDeviceAddress: String? = null
+    private var targetDeviceAddress: String? = null
+    private var isDialogOpen = false
+    private var isManualDisconnect = false
+    private var isAutoConnectBlocked = false
     
     private val leScanCallback = object : ScanCallback() {
         override fun onScanResult(callbackType: Int, result: ScanResult) {
@@ -56,24 +66,7 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
                     deviceName != null && deviceName.equals(targetDeviceName, ignoreCase = true)
                 }
                 else -> {
-                    deviceName != null && (
-                        deviceName.contains("LBJ", ignoreCase = true) ||
-                        deviceName.contains("Receiver", ignoreCase = true) ||
-                        deviceName.contains("Train", ignoreCase = true) ||
-                        deviceName.contains("Console", ignoreCase = true) ||
-                        deviceName.contains("ESP", ignoreCase = true) ||
-                        deviceName.contains("Arduino", ignoreCase = true) ||
-                        deviceName.contains("BLE", ignoreCase = true) ||
-                        deviceName.contains("UART", ignoreCase = true) ||
-                        deviceName.contains("Serial", ignoreCase = true)
-                    ) && !(
-                        deviceName.contains("Midea", ignoreCase = true) ||
-                        deviceName.contains("TV", ignoreCase = true) ||
-                        deviceName.contains("Phone", ignoreCase = true) ||
-                        deviceName.contains("Watch", ignoreCase = true) ||
-                        deviceName.contains("Headset", ignoreCase = true) ||
-                        deviceName.contains("Speaker", ignoreCase = true)
-                    )
+                    true
                 }
             }
             
@@ -82,18 +75,25 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
                 scanCallback?.invoke(device)
             }
             
-            if (targetDeviceName != null && !isConnected && !isReconnecting) {
-                if (deviceName != null && deviceName.equals(targetDeviceName, ignoreCase = true)) {
-                    Log.i(TAG, "Found target device: $deviceName, auto-connecting")
-                    lastKnownDeviceAddress = device.address
-                    connectImmediately(device.address)
+            if (!isConnected && !isReconnecting && !isDialogOpen && !isAutoConnectBlocked) {
+                val deviceAddress = device.address
+                val isSpecifiedDevice = specifiedDeviceAddress == deviceAddress
+                val isTargetDevice = targetDeviceName != null && deviceName != null && deviceName.equals(targetDeviceName, ignoreCase = true)
+                val isKnownDevice = lastKnownDeviceAddress == deviceAddress
+                val isSpecificTargetAddress = targetDeviceAddress == deviceAddress
+                
+                if (isSpecificTargetAddress || isSpecifiedDevice || (specifiedDeviceAddress == null && isTargetDevice) || (specifiedDeviceAddress == null && isKnownDevice)) {
+                    val priority = when {
+                        isSpecificTargetAddress -> "specific target address"
+                        isSpecifiedDevice -> "specified device"
+                        isTargetDevice -> "target device name"
+                        else -> "known device"
+                    }
+                    Log.i(TAG, "Found device ($priority): $deviceName, auto-connecting")
+                    lastKnownDeviceAddress = deviceAddress
+                    connectImmediately(deviceAddress)
                 }
             }
-            
-            if (lastKnownDeviceAddress == device.address && !isConnected && !isReconnecting) {
-                Log.i(TAG, "Found known device, reconnecting immediately")
-                connectImmediately(device.address)
-            }
         }
         
         override fun onScanFailed(errorCode: Int) {
@@ -275,11 +275,97 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
     fun isConnected(): Boolean {
         return isConnected
     }
+    
+    @SuppressLint("MissingPermission")
+    fun checkActualConnectionState(): Boolean {
+        bluetoothGatt?.let { gatt ->
+            try {
+                val bluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+                val connectedDevices = bluetoothManager.getConnectedDevices(BluetoothProfile.GATT)
+                val isActuallyConnected = connectedDevices.any { it.address == deviceAddress }
+                
+                if (isActuallyConnected && !isConnected) {
+                    Log.d(TAG, "Found existing GATT connection, updating internal state")
+                    isConnected = true
+                    return true
+                } else if (!isActuallyConnected && isConnected) {
+                    Log.d(TAG, "GATT connection lost, updating internal state")
+                    isConnected = false
+                    return false
+                }
+                
+                return isActuallyConnected
+            } catch (e: Exception) {
+                Log.e(TAG, "Error checking actual connection state: ${e.message}")
+                return isConnected
+            }
+        }
+        return isConnected
+    }
 
 
     @SuppressLint("MissingPermission")
     fun disconnect() {
-        bluetoothGatt?.disconnect()
+        Log.d(TAG, "Manual disconnect initiated")
+        isConnected = false
+        isManualDisconnect = true
+        isAutoConnectBlocked = true
+        stopHighFrequencyReconnect()
+        stopScan()
+        
+        bluetoothGatt?.let { gatt ->
+            try {
+                gatt.disconnect()
+                Thread.sleep(100)
+                gatt.close()
+            } catch (e: Exception) {
+                Log.e(TAG, "Disconnect error: ${e.message}")
+            }
+        }
+        bluetoothGatt = null
+        
+        dataBuffer.clear()
+        connectionStateCallback = null
+        
+        Log.d(TAG, "Manual disconnect - auto connect blocked, deviceAddress preserved: $deviceAddress")
+    }
+    
+    @SuppressLint("MissingPermission")
+    fun connectManually(address: String, onConnectionStateChange: ((Boolean) -> Unit)? = null): Boolean {
+        Log.d(TAG, "Manual connection to device: $address")
+        
+        stopScan()
+        stopHighFrequencyReconnect()
+        
+        isManualDisconnect = false
+        isAutoConnectBlocked = false
+        autoReconnect = true
+        highFrequencyReconnect = true
+        return connect(address, onConnectionStateChange)
+    }
+    
+    @SuppressLint("MissingPermission")
+    fun closeManually() {
+        Log.d(TAG, "Manual close - will restore auto reconnect")
+        
+        isConnected = false
+        isManualDisconnect = false
+        isAutoConnectBlocked = false
+        bluetoothGatt?.let { gatt ->
+            try {
+                gatt.disconnect()
+                gatt.close()
+            } catch (e: Exception) {
+                Log.e(TAG, "Close error: ${e.message}")
+            }
+        }
+        bluetoothGatt = null
+        deviceAddress = null
+        
+        autoReconnect = true
+        highFrequencyReconnect = true
+        
+        Log.d(TAG, "Auto reconnect mechanism restored and GATT cleaned up")
     }
 
 
@@ -361,6 +447,7 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
                 try {
                     gatt.close()
                     bluetoothGatt = null
+                    bluetoothLeScanner = null
 
                     deviceAddress?.let { address ->
                         if (autoReconnect) {
@@ -389,10 +476,15 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
             BluetoothProfile.STATE_CONNECTED -> {
                 isConnected = true
                 isReconnecting = false
+                isManualDisconnect = false
                 connectionAttempts = 0
                 Log.i(TAG, "Connected to GATT server")
 
                 handler.post { connectionStateCallback?.invoke(true) }
+                
+                deviceAddress?.let { address ->
+                    handler.post { connectionSuccessCallback?.invoke(address) }
+                }
 
                 handler.post {
                     try {
@@ -406,17 +498,20 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
             BluetoothProfile.STATE_DISCONNECTED -> {
                 isConnected = false
                 isReconnecting = false
-                Log.i(TAG, "Disconnected from GATT server")
+                Log.i(TAG, "Disconnected from GATT server, manual=$isManualDisconnect")
 
-                handler.post { connectionStateCallback?.invoke(false) }
-
-
-                if (!deviceAddress.isNullOrBlank() && autoReconnect) {
-                    handler.post {
-                        Log.d(TAG, "Immediate reconnection after disconnect")
-                        connect(deviceAddress!!, connectionStateCallback)
+                handler.post { 
+                    connectionStateCallback?.invoke(false)
+                    if (!isManualDisconnect) {
+                        connectionLostCallback?.invoke()
                     }
                 }
+
+                if (!deviceAddress.isNullOrBlank() && autoReconnect && highFrequencyReconnect && !isManualDisconnect) {
+                    startHighFrequencyReconnect(deviceAddress!!)
+                } else if (isManualDisconnect) {
+                    Log.d(TAG, "Manual disconnect - no auto reconnect")
+                }
             }
         }
     }
@@ -439,7 +534,7 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
             String(it, StandardCharsets.UTF_8)
         } ?: return
 
-        Log.d(TAG, "Received data len=${newData.length} preview=${newData.take(50)}")
+        Log.d(TAG, "Received data len=${newData.length} preview=${newData}")
 
 
         dataBuffer.append(newData)
@@ -545,7 +640,7 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
     private fun processJsonString(jsonStr: String): Boolean {
         try {
             val jsonObject = JSONObject(jsonStr)
-            Log.d(TAG, "Parsed JSON len=${jsonStr.length} preview=${jsonStr.take(50)}")
+            Log.d(TAG, "Parsed JSON len=${jsonStr.length} preview=${jsonStr}")
 
 
             handler.post {
@@ -630,7 +725,122 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
         Log.d(TAG, "Auto reconnect set to: $enabled")
     }
     
+    fun setHighFrequencyReconnect(enabled: Boolean) {
+        highFrequencyReconnect = enabled
+        if (!enabled) {
+            stopHighFrequencyReconnect()
+        }
+        Log.d(TAG, "High frequency reconnect set to: $enabled")
+    }
+    
+    fun setConnectionLostCallback(callback: (() -> Unit)?) {
+        connectionLostCallback = callback
+    }
+    
+    fun setConnectionSuccessCallback(callback: ((String) -> Unit)?) {
+        connectionSuccessCallback = callback
+    }
+    
+    fun setSpecifiedDeviceAddress(address: String?) {
+        specifiedDeviceAddress = address
+        Log.d(TAG, "Set specified device address: $address")
+    }
+    
+    fun getSpecifiedDeviceAddress(): String? = specifiedDeviceAddress
+    
+    fun setDialogOpen(isOpen: Boolean) {
+        isDialogOpen = isOpen
+        Log.d(TAG, "Dialog open state set to: $isOpen")
+    }
+
+    fun setAutoConnectBlocked(blocked: Boolean) {
+        isAutoConnectBlocked = blocked
+        Log.d(TAG, "Auto connect blocked set to: $blocked")
+    }
+    
+    fun resetManualDisconnectState() {
+        isManualDisconnect = false
+        isAutoConnectBlocked = false
+        Log.d(TAG, "Manual disconnect state reset - auto reconnect enabled")
+    }
+    
+    fun setTargetDeviceAddress(address: String?) {
+        targetDeviceAddress = address
+        Log.d(TAG, "Set target device address: $address")
+    }
+    
+    fun getTargetDeviceAddress(): String? = targetDeviceAddress
+    
+    private fun startHighFrequencyReconnect(address: String) {
+        stopHighFrequencyReconnect()
+        
+        Log.d(TAG, "Starting high frequency reconnect for: $address")
+        
+        reconnectRunnable = Runnable {
+            if (!isConnected && autoReconnect && highFrequencyReconnect) {
+                Log.d(TAG, "High frequency reconnect attempt ${connectionAttempts + 1} for: $address")
+                connect(address, connectionStateCallback)
+                
+                if (!isConnected) {
+                    val delay = when {
+                        connectionAttempts < 10 -> 100L
+                        connectionAttempts < 30 -> 200L
+                        connectionAttempts < 60 -> 500L
+                        else -> 1000L
+                    }
+                    
+                    reconnectHandler.postDelayed(reconnectRunnable!!, delay)
+                }
+            }
+        }
+        
+        reconnectHandler.post(reconnectRunnable!!)
+    }
+    
+    private fun stopHighFrequencyReconnect() {
+        reconnectRunnable?.let {
+            reconnectHandler.removeCallbacks(it)
+            reconnectRunnable = null
+            Log.d(TAG, "Stopped high frequency reconnect")
+        }
+    }
+    
     fun getConnectionAttempts(): Int = connectionAttempts
     
     fun getLastKnownDeviceAddress(): String? = lastKnownDeviceAddress
+    
+    @SuppressLint("MissingPermission")
+    fun disconnectAndCleanup() {
+        isConnected = false
+        autoReconnect = false
+        highFrequencyReconnect = false
+        isManualDisconnect = false
+        isAutoConnectBlocked = false
+        stopHighFrequencyReconnect()
+        stopScan()
+        
+        bluetoothGatt?.let { gatt ->
+            try {
+                gatt.disconnect()
+                Thread.sleep(200)
+                gatt.close()
+                Log.d(TAG, "GATT connection cleaned up")
+            } catch (e: Exception) {
+                Log.e(TAG, "Cleanup error: ${e.message}")
+            }
+        }
+        bluetoothGatt = null
+        bluetoothLeScanner = null
+        deviceAddress = null
+        connectionAttempts = 0
+        
+        dataBuffer.clear()
+        connectionStateCallback = null
+        statusCallback = null
+        trainInfoCallback = null
+        connectionLostCallback = null
+        connectionSuccessCallback = null
+        
+        Log.d(TAG, "BLE client fully disconnected and cleaned up")
+    }
 }

app/src/main/java/org/noxylva/lbjconsole/BackgroundService.kt

@@ -0,0 +1,123 @@
+package org.noxylva.lbjconsole
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.IBinder
+import android.os.PowerManager
+import androidx.core.app.NotificationCompat
+
+class BackgroundService : Service() {
+    
+    companion object {
+        private const val NOTIFICATION_ID = 1001
+        private const val CHANNEL_ID = "background_service_channel"
+        private const val CHANNEL_NAME = "Background Service"
+        
+        fun startService(context: Context) {
+            try {
+                val intent = Intent(context, BackgroundService::class.java)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    context.startForegroundService(intent)
+                } else {
+                    context.startService(intent)
+                }
+            } catch (e: Exception) {
+                // Service start failed, ignore silently
+            }
+        }
+        
+        fun stopService(context: Context) {
+            val intent = Intent(context, BackgroundService::class.java)
+            context.stopService(intent)
+        }
+    }
+    
+    private var wakeLock: PowerManager.WakeLock? = null
+    
+    override fun onCreate() {
+        super.onCreate()
+        createNotificationChannel()
+        acquireWakeLock()
+    }
+    
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        try {
+            val notification = createNotification()
+            startForeground(NOTIFICATION_ID, notification)
+        } catch (e: Exception) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                stopSelf()
+                return START_NOT_STICKY
+            }
+        }
+        return START_STICKY
+    }
+    
+    override fun onDestroy() {
+        super.onDestroy()
+        releaseWakeLock()
+    }
+    
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+    
+    private fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                CHANNEL_ID,
+                CHANNEL_NAME,
+                NotificationManager.IMPORTANCE_LOW
+            ).apply {
+                description = "Keep app running in background"
+                setShowBadge(false)
+            }
+            
+            val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.createNotificationChannel(channel)
+        }
+    }
+    
+    private fun createNotification(): Notification {
+        val intent = Intent(this, MainActivity::class.java)
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+        
+        return NotificationCompat.Builder(this, CHANNEL_ID)
+            .setContentTitle("LBJ Console")
+            .setContentText("Running in background")
+            .setSmallIcon(R.drawable.ic_launcher_foreground)
+            .setContentIntent(pendingIntent)
+            .setOngoing(true)
+            .setPriority(NotificationCompat.PRIORITY_LOW)
+            .build()
+    }
+    
+    private fun acquireWakeLock() {
+        val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
+        wakeLock = powerManager.newWakeLock(
+            PowerManager.PARTIAL_WAKE_LOCK,
+            "LBJConsole::BackgroundWakeLock"
+        )
+        wakeLock?.acquire()
+    }
+    
+    private fun releaseWakeLock() {
+        wakeLock?.let {
+            if (it.isHeld) {
+                it.release()
+            }
+        }
+        wakeLock = null
+    }
+}

app/src/main/java/org/noxylva/lbjconsole/NotificationService.kt

@@ -0,0 +1,223 @@
+package org.noxylva.lbjconsole
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import kotlinx.coroutines.runBlocking
+import org.noxylva.lbjconsole.database.AppSettingsRepository
+import org.noxylva.lbjconsole.database.TrainDatabase
+import android.os.Build
+import android.util.Log
+import android.view.View
+import android.widget.RemoteViews
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import org.json.JSONObject
+import org.noxylva.lbjconsole.model.TrainRecord
+
+
+class NotificationService(private val context: Context) {
+    companion object {
+        const val TAG = "NotificationService"
+        const val CHANNEL_ID = "lbj_messages"
+        const val CHANNEL_NAME = "LBJ Messages"
+        const val NOTIFICATION_ID_BASE = 2000
+        const val PREFS_NAME = "notification_settings"
+        const val KEY_ENABLED = "notifications_enabled"
+    }
+
+    private val notificationManager = NotificationManagerCompat.from(context)
+    private val appSettingsRepository = AppSettingsRepository(context)
+    private var notificationIdCounter = NOTIFICATION_ID_BASE
+
+    init {
+        createNotificationChannel()
+    }
+
+    private fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                CHANNEL_ID,
+                CHANNEL_NAME,
+                NotificationManager.IMPORTANCE_DEFAULT
+            ).apply {
+                description = "Real-time LBJ train message notifications"
+                enableVibration(true)
+                setShowBadge(true)
+            }
+
+            val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            manager.createNotificationChannel(channel)
+            Log.d(TAG, "Notification channel created")
+        }
+    }
+
+    fun isNotificationEnabled(): Boolean {
+        return runBlocking {
+            appSettingsRepository.getSettings().notificationEnabled
+        }
+    }
+
+    fun setNotificationEnabled(enabled: Boolean) {
+        runBlocking {
+            appSettingsRepository.updateNotificationEnabled(enabled)
+        }
+        Log.d(TAG, "Notification enabled set to: $enabled")
+    }
+
+    private fun isValidValue(value: String): Boolean {
+        val trimmed = value.trim()
+        return trimmed.isNotEmpty() &&
+               trimmed != "NUL" &&
+               trimmed != "<NUL>" &&
+               trimmed != "NA" &&
+               trimmed != "<NA>" &&
+               !trimmed.all { it == '*' }
+    }
+
+    fun showTrainNotification(trainRecord: TrainRecord) {
+        if (!isNotificationEnabled()) {
+            Log.d(TAG, "Notifications disabled, skipping")
+            return
+        }
+
+        try {
+            val intent = Intent(context, MainActivity::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+            }
+
+            val pendingIntent = PendingIntent.getActivity(
+                context,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            )
+
+            val remoteViews = RemoteViews(context.packageName, R.layout.notification_train_record)
+            val trainDisplay = if (isValidValue(trainRecord.lbjClass) && isValidValue(trainRecord.train)) {
+                "${trainRecord.lbjClass.trim()}${trainRecord.train.trim()}"
+            } else if (isValidValue(trainRecord.lbjClass)) {
+                trainRecord.lbjClass.trim()
+            } else if (isValidValue(trainRecord.train)) {
+                trainRecord.train.trim()
+            } else "列车"
+            remoteViews.setTextViewText(R.id.notification_train_number, trainDisplay)
+            
+            val directionText = when (trainRecord.direction) {
+                1 -> "下"
+                3 -> "上"
+                else -> ""
+            }
+            if (directionText.isNotEmpty()) {
+                remoteViews.setTextViewText(R.id.notification_direction, directionText)
+                remoteViews.setViewVisibility(R.id.notification_direction, View.VISIBLE)
+            } else {
+                remoteViews.setViewVisibility(R.id.notification_direction, View.GONE)
+            }
+            
+            val locoInfo = when {
+                isValidValue(trainRecord.locoType) && isValidValue(trainRecord.loco) -> {
+                    val shortLoco = if (trainRecord.loco.length > 5) {
+                        trainRecord.loco.takeLast(5)
+                    } else {
+                        trainRecord.loco
+                    }
+                    "${trainRecord.locoType}-${shortLoco}"
+                }
+                isValidValue(trainRecord.locoType) -> trainRecord.locoType
+                isValidValue(trainRecord.loco) -> trainRecord.loco
+                else -> ""
+            }
+            if (locoInfo.isNotEmpty()) {
+                remoteViews.setTextViewText(R.id.notification_loco_info, locoInfo)
+                remoteViews.setViewVisibility(R.id.notification_loco_info, View.VISIBLE)
+            } else {
+                remoteViews.setViewVisibility(R.id.notification_loco_info, View.GONE)
+            }
+            
+            if (isValidValue(trainRecord.route)) {
+                remoteViews.setTextViewText(R.id.notification_route, trainRecord.route.trim())
+                remoteViews.setViewVisibility(R.id.notification_route, View.VISIBLE)
+            } else {
+                remoteViews.setViewVisibility(R.id.notification_route, View.GONE)
+            }
+            
+            if (isValidValue(trainRecord.position)) {
+                remoteViews.setTextViewText(R.id.notification_position, "${trainRecord.position.trim().removeSuffix(".")}K")
+                remoteViews.setViewVisibility(R.id.notification_position, View.VISIBLE)
+            } else {
+                remoteViews.setViewVisibility(R.id.notification_position, View.GONE)
+            }
+            
+            if (isValidValue(trainRecord.speed)) {
+                remoteViews.setTextViewText(R.id.notification_speed, "${trainRecord.speed.trim()} km/h")
+                remoteViews.setViewVisibility(R.id.notification_speed, View.VISIBLE)
+            } else {
+                remoteViews.setViewVisibility(R.id.notification_speed, View.GONE)
+            }
+            
+            remoteViews.setOnClickPendingIntent(R.id.notification_train_number, pendingIntent)
+
+            val summaryParts = mutableListOf<String>()
+            
+            val routeAndDirection = when {
+                isValidValue(trainRecord.route) && directionText.isNotEmpty() -> "${trainRecord.route.trim()}${directionText}行"
+                isValidValue(trainRecord.route) -> trainRecord.route.trim()
+                directionText.isNotEmpty() -> "${directionText}行"
+                else -> null
+            }
+            
+            routeAndDirection?.let { summaryParts.add(it) }
+            if (locoInfo.isNotEmpty()) summaryParts.add(locoInfo)
+            
+            val summaryText = summaryParts.joinToString(" • ")
+
+            val notification = NotificationCompat.Builder(context, CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_notification)
+                .setContentTitle(trainDisplay)
+                .setContentText(summaryText)
+                .setCustomContentView(remoteViews)
+                .setCustomBigContentView(remoteViews)
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setContentIntent(pendingIntent)
+                .setAutoCancel(true)
+                .setWhen(trainRecord.timestamp.time)
+                .build()
+
+            val notificationId = notificationIdCounter++
+            if (notificationIdCounter > NOTIFICATION_ID_BASE + 1000) {
+                notificationIdCounter = NOTIFICATION_ID_BASE
+            }
+
+            notificationManager.notify(notificationId, notification)
+            Log.d(TAG, "Custom notification sent for train: ${trainRecord.train}")
+
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to show notification: ${e.message}", e)
+        }
+    }
+
+    fun showTrainNotification(jsonData: JSONObject) {
+        if (!isNotificationEnabled()) {
+            Log.d(TAG, "Notifications disabled, skipping")
+            return
+        }
+
+        try {
+            val trainRecord = TrainRecord(jsonData)
+            showTrainNotification(trainRecord)
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to create TrainRecord from JSON: ${e.message}", e)
+        }
+    }
+
+    fun hasNotificationPermission(): Boolean {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            notificationManager.areNotificationsEnabled()
+        } else {
+            notificationManager.areNotificationsEnabled()
+        }
+    }
+}

app/src/main/java/org/noxylva/lbjconsole/SettingsActivity.kt

@@ -0,0 +1,66 @@
+package org.noxylva.lbjconsole
+
+import android.content.Context
+import android.os.Bundle
+import android.widget.Switch
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import org.noxylva.lbjconsole.database.AppSettingsRepository
+
+class SettingsActivity : AppCompatActivity() {
+    
+    companion object {
+        suspend fun isBackgroundServiceEnabled(context: Context): Boolean {
+            val repository = AppSettingsRepository(context)
+            return repository.getSettings().backgroundServiceEnabled
+        }
+        
+        suspend fun setBackgroundServiceEnabled(context: Context, enabled: Boolean) {
+            val repository = AppSettingsRepository(context)
+            repository.updateBackgroundServiceEnabled(enabled)
+        }
+    }
+    
+    private lateinit var backgroundServiceSwitch: Switch
+    private lateinit var appSettingsRepository: AppSettingsRepository
+    
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_settings)
+        
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.title = "Settings"
+        
+        appSettingsRepository = AppSettingsRepository(this)
+        
+        initViews()
+        setupListeners()
+    }
+    
+    private fun initViews() {
+        backgroundServiceSwitch = findViewById(R.id.switch_background_service)
+        lifecycleScope.launch {
+            backgroundServiceSwitch.isChecked = isBackgroundServiceEnabled(this@SettingsActivity)
+        }
+    }
+    
+    private fun setupListeners() {
+        backgroundServiceSwitch.setOnCheckedChangeListener { _, isChecked ->
+            lifecycleScope.launch {
+                setBackgroundServiceEnabled(this@SettingsActivity, isChecked)
+            }
+            
+            if (isChecked) {
+                BackgroundService.startService(this)
+            } else {
+                BackgroundService.stopService(this)
+            }
+        }
+    }
+    
+    override fun onSupportNavigateUp(): Boolean {
+        onBackPressed()
+        return true
+    }
+}

app/src/main/java/org/noxylva/lbjconsole/database/AppSettingsDao.kt

@@ -0,0 +1,31 @@
+package org.noxylva.lbjconsole.database
+
+import androidx.room.*
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface AppSettingsDao {
+    
+    @Query("SELECT * FROM app_settings WHERE id = 1")
+    suspend fun getSettings(): AppSettingsEntity?
+    
+    @Query("SELECT * FROM app_settings WHERE id = 1")
+    fun getSettingsFlow(): Flow<AppSettingsEntity?>
+    
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertSettings(settings: AppSettingsEntity)
+    
+    @Update
+    suspend fun updateSettings(settings: AppSettingsEntity)
+    
+    @Query("DELETE FROM app_settings")
+    suspend fun deleteAllSettings()
+    
+    @Query("UPDATE app_settings SET notificationEnabled = :enabled WHERE id = 1")
+    suspend fun updateNotificationEnabled(enabled: Boolean)
+    
+    @Transaction
+    suspend fun saveSettings(settings: AppSettingsEntity) {
+        insertSettings(settings)
+    }
+}

app/src/main/java/org/noxylva/lbjconsole/database/AppSettingsEntity.kt

@@ -0,0 +1,26 @@
+package org.noxylva.lbjconsole.database
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "app_settings")
+data class AppSettingsEntity(
+    @PrimaryKey val id: Int = 1,
+    val deviceName: String = "LBJReceiver",
+    val currentTab: Int = 0,
+    val historyEditMode: Boolean = false,
+    val historySelectedRecords: String = "",
+    val historyExpandedStates: String = "",
+    val historyScrollPosition: Int = 0,
+    val historyScrollOffset: Int = 0,
+    val settingsScrollPosition: Int = 0,
+    val mapCenterLat: Float? = null,
+    val mapCenterLon: Float? = null,
+    val mapZoomLevel: Float = 10.0f,
+    val mapRailwayLayerVisible: Boolean = true,
+    val specifiedDeviceAddress: String? = null,
+    val searchOrderList: String = "",
+    val autoConnectEnabled: Boolean = true,
+    val backgroundServiceEnabled: Boolean = false,
+    val notificationEnabled: Boolean = false
+)

app/src/main/java/org/noxylva/lbjconsole/database/AppSettingsRepository.kt

@@ -0,0 +1,127 @@
+package org.noxylva.lbjconsole.database
+
+import android.content.Context
+import android.content.SharedPreferences
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+
+class AppSettingsRepository(private val context: Context) {
+    private val dao = TrainDatabase.getDatabase(context).appSettingsDao()
+    private val sharedPrefs: SharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
+    
+    suspend fun getSettings(): AppSettingsEntity {
+        var settings = dao.getSettings()
+        
+        if (settings == null) {
+            settings = migrateFromSharedPreferences()
+            dao.saveSettings(settings)
+        }
+        
+        return settings
+    }
+    
+    fun getSettingsFlow(): Flow<AppSettingsEntity?> {
+        return dao.getSettingsFlow()
+    }
+    
+    suspend fun saveSettings(settings: AppSettingsEntity) {
+        dao.saveSettings(settings)
+    }
+    
+    suspend fun updateDeviceName(deviceName: String) {
+        val current = getSettings()
+        saveSettings(current.copy(deviceName = deviceName))
+    }
+    
+    suspend fun updateCurrentTab(tab: Int) {
+        val current = getSettings()
+        saveSettings(current.copy(currentTab = tab))
+    }
+    
+    suspend fun updateHistoryEditMode(editMode: Boolean) {
+        val current = getSettings()
+        saveSettings(current.copy(historyEditMode = editMode))
+    }
+    
+    suspend fun updateHistorySelectedRecords(selectedRecords: String) {
+        val current = getSettings()
+        saveSettings(current.copy(historySelectedRecords = selectedRecords))
+    }
+    
+    suspend fun updateHistoryExpandedStates(expandedStates: String) {
+        val current = getSettings()
+        saveSettings(current.copy(historyExpandedStates = expandedStates))
+    }
+    
+    suspend fun updateHistoryScrollPosition(position: Int, offset: Int = 0) {
+        val current = getSettings()
+        saveSettings(current.copy(historyScrollPosition = position, historyScrollOffset = offset))
+    }
+    
+    suspend fun updateSettingsScrollPosition(position: Int) {
+        val current = getSettings()
+        saveSettings(current.copy(settingsScrollPosition = position))
+    }
+    
+    suspend fun updateMapSettings(centerLat: Float?, centerLon: Float?, zoomLevel: Float, railwayLayerVisible: Boolean) {
+        val current = getSettings()
+        saveSettings(current.copy(
+            mapCenterLat = centerLat,
+            mapCenterLon = centerLon,
+            mapZoomLevel = zoomLevel,
+            mapRailwayLayerVisible = railwayLayerVisible
+        ))
+    }
+    
+    suspend fun updateSpecifiedDeviceAddress(address: String?) {
+        val current = getSettings()
+        saveSettings(current.copy(specifiedDeviceAddress = address))
+    }
+    
+    suspend fun updateSearchOrderList(orderList: String) {
+        val current = getSettings()
+        saveSettings(current.copy(searchOrderList = orderList))
+    }
+    
+    suspend fun updateAutoConnectEnabled(enabled: Boolean) {
+        val current = getSettings()
+        saveSettings(current.copy(autoConnectEnabled = enabled))
+    }
+    
+    suspend fun updateBackgroundServiceEnabled(enabled: Boolean) {
+        val current = getSettings()
+        saveSettings(current.copy(backgroundServiceEnabled = enabled))
+    }
+    
+    suspend fun updateNotificationEnabled(enabled: Boolean) {
+        val current = getSettings()
+        saveSettings(current.copy(notificationEnabled = enabled))
+    }
+    
+    private fun migrateFromSharedPreferences(): AppSettingsEntity {
+        return AppSettingsEntity(
+            deviceName = sharedPrefs.getString("device_name", "LBJReceiver") ?: "LBJReceiver",
+            currentTab = sharedPrefs.getInt("current_tab", 0),
+            historyEditMode = sharedPrefs.getBoolean("history_edit_mode", false),
+            historySelectedRecords = sharedPrefs.getString("history_selected_records", "") ?: "",
+            historyExpandedStates = sharedPrefs.getString("history_expanded_states", "") ?: "",
+            historyScrollPosition = sharedPrefs.getInt("history_scroll_position", 0),
+            historyScrollOffset = sharedPrefs.getInt("history_scroll_offset", 0),
+            settingsScrollPosition = sharedPrefs.getInt("settings_scroll_position", 0),
+            mapCenterLat = if (sharedPrefs.contains("map_center_lat")) sharedPrefs.getFloat("map_center_lat", 0f) else null,
+            mapCenterLon = if (sharedPrefs.contains("map_center_lon")) sharedPrefs.getFloat("map_center_lon", 0f) else null,
+            mapZoomLevel = sharedPrefs.getFloat("map_zoom_level", 10.0f),
+            mapRailwayLayerVisible = sharedPrefs.getBoolean("map_railway_layer_visible", true),
+            specifiedDeviceAddress = sharedPrefs.getString("specified_device_address", null),
+            searchOrderList = sharedPrefs.getString("search_order_list", "") ?: "",
+            autoConnectEnabled = sharedPrefs.getBoolean("auto_connect_enabled", true),
+            backgroundServiceEnabled = sharedPrefs.getBoolean("background_service_enabled", false),
+            notificationEnabled = context.getSharedPreferences("notification_settings", Context.MODE_PRIVATE)
+                .getBoolean("notifications_enabled", false)
+        )
+    }
+    
+    suspend fun clearSharedPreferences() {
+        sharedPrefs.edit().clear().apply()
+    }
+}

app/src/main/java/org/noxylva/lbjconsole/database/TrainDatabase.kt

@@ -0,0 +1,145 @@
+package org.noxylva.lbjconsole.database
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+@Database(
+    entities = [TrainRecordEntity::class, AppSettingsEntity::class],
+    version = 4,
+    exportSchema = false
+)
+abstract class TrainDatabase : RoomDatabase() {
+    
+    abstract fun trainRecordDao(): TrainRecordDao
+    abstract fun appSettingsDao(): AppSettingsDao
+    
+    companion object {
+        @Volatile
+        private var INSTANCE: TrainDatabase? = null
+        
+        private val MIGRATION_1_2 = object : Migration(1, 2) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("""
+                    CREATE TABLE IF NOT EXISTS `app_settings` (
+                        `id` INTEGER NOT NULL,
+                        `deviceName` TEXT NOT NULL,
+                        `currentTab` INTEGER NOT NULL,
+                        `historyEditMode` INTEGER NOT NULL,
+                        `historySelectedRecords` TEXT NOT NULL,
+                        `historyExpandedStates` TEXT NOT NULL,
+                        `historyScrollPosition` INTEGER NOT NULL,
+                        `historyScrollOffset` INTEGER NOT NULL,
+                        `settingsScrollPosition` INTEGER NOT NULL,
+                        `mapCenterLat` REAL,
+                        `mapCenterLon` REAL,
+                        `mapZoomLevel` REAL NOT NULL,
+                        `mapRailwayLayerVisible` INTEGER NOT NULL,
+                        `specifiedDeviceAddress` TEXT,
+                        `searchOrderList` TEXT NOT NULL,
+                        `autoConnectEnabled` INTEGER NOT NULL,
+                        `backgroundServiceEnabled` INTEGER NOT NULL,
+                        PRIMARY KEY(`id`)
+                    )
+                """)
+            }
+        }
+        
+        val MIGRATION_2_3 = object : Migration(2, 3) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("ALTER TABLE app_settings ADD COLUMN notificationEnabled INTEGER NOT NULL DEFAULT 0")
+            }
+        }
+        
+        val MIGRATION_3_4 = object : Migration(3, 4) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                // Since we can't determine the exact schema change, we'll use fallback migration
+                // This will preserve data where possible while updating the schema
+                
+                // Create new table with correct schema
+                database.execSQL("""
+                    CREATE TABLE IF NOT EXISTS `app_settings_new` (
+                        `id` INTEGER NOT NULL,
+                        `deviceName` TEXT NOT NULL DEFAULT 'LBJReceiver',
+                        `currentTab` INTEGER NOT NULL DEFAULT 0,
+                        `historyEditMode` INTEGER NOT NULL DEFAULT 0,
+                        `historySelectedRecords` TEXT NOT NULL DEFAULT '',
+                        `historyExpandedStates` TEXT NOT NULL DEFAULT '',
+                        `historyScrollPosition` INTEGER NOT NULL DEFAULT 0,
+                        `historyScrollOffset` INTEGER NOT NULL DEFAULT 0,
+                        `settingsScrollPosition` INTEGER NOT NULL DEFAULT 0,
+                        `mapCenterLat` REAL,
+                        `mapCenterLon` REAL,
+                        `mapZoomLevel` REAL NOT NULL DEFAULT 10.0,
+                        `mapRailwayLayerVisible` INTEGER NOT NULL DEFAULT 1,
+                        `specifiedDeviceAddress` TEXT,
+                        `searchOrderList` TEXT NOT NULL DEFAULT '',
+                        `autoConnectEnabled` INTEGER NOT NULL DEFAULT 1,
+                        `backgroundServiceEnabled` INTEGER NOT NULL DEFAULT 0,
+                        `notificationEnabled` INTEGER NOT NULL DEFAULT 0,
+                        PRIMARY KEY(`id`)
+                    )
+                """)
+                
+                // Copy data from old table to new table, handling missing columns
+                try {
+                    database.execSQL("""
+                        INSERT INTO `app_settings_new` (
+                            id, deviceName, currentTab, historyEditMode, historySelectedRecords,
+                            historyExpandedStates, historyScrollPosition, historyScrollOffset,
+                            settingsScrollPosition, mapCenterLat, mapCenterLon, mapZoomLevel,
+                            mapRailwayLayerVisible
+                        )
+                        SELECT 
+                            COALESCE(id, 1),
+                            COALESCE(deviceName, 'LBJReceiver'),
+                            COALESCE(currentTab, 0),
+                            COALESCE(historyEditMode, 0),
+                            COALESCE(historySelectedRecords, ''),
+                            COALESCE(historyExpandedStates, ''),
+                            COALESCE(historyScrollPosition, 0),
+                            COALESCE(historyScrollOffset, 0),
+                            COALESCE(settingsScrollPosition, 0),
+                            mapCenterLat,
+                            mapCenterLon,
+                            COALESCE(mapZoomLevel, 10.0),
+                            COALESCE(mapRailwayLayerVisible, 1)
+                        FROM `app_settings`
+                    """)
+                } catch (e: Exception) {
+                    // If the old table doesn't exist or has different structure, insert default
+                    database.execSQL("""
+                        INSERT INTO `app_settings_new` (
+                            id, deviceName, currentTab, historyEditMode, historySelectedRecords,
+                            historyExpandedStates, historyScrollPosition, historyScrollOffset,
+                            settingsScrollPosition, mapZoomLevel, mapRailwayLayerVisible,
+                            searchOrderList, autoConnectEnabled, backgroundServiceEnabled,
+                            notificationEnabled
+                        ) VALUES (
+                            1, 'LBJReceiver', 0, 0, '', '', 0, 0, 0, 10.0, 1, '', 1, 0, 0
+                        )
+                    """)
+                }
+                
+                // Drop old table and rename new table
+                database.execSQL("DROP TABLE IF EXISTS `app_settings`")
+                database.execSQL("ALTER TABLE `app_settings_new` RENAME TO `app_settings`")
+            }
+        }
+        
+        fun getDatabase(context: Context): TrainDatabase {
+            return INSTANCE ?: synchronized(this) {
+                val instance = Room.databaseBuilder(
+                    context.applicationContext,
+                    TrainDatabase::class.java,
+                    "train_database"
+                ).addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4).build()
+                INSTANCE = instance
+                instance
+            }
+        }
+    }
+}

app/src/main/java/org/noxylva/lbjconsole/database/TrainRecordDao.kt

@@ -0,0 +1,50 @@
+package org.noxylva.lbjconsole.database
+
+import androidx.room.*
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface TrainRecordDao {
+    
+    @Query("SELECT * FROM train_records ORDER BY timestamp DESC")
+    suspend fun getAllRecords(): List<TrainRecordEntity>
+    
+    @Query("SELECT * FROM train_records ORDER BY timestamp DESC")
+    fun getAllRecordsFlow(): Flow<List<TrainRecordEntity>>
+    
+    @Query("SELECT * FROM train_records WHERE uniqueId = :uniqueId")
+    suspend fun getRecordById(uniqueId: String): TrainRecordEntity?
+    
+    @Query("SELECT COUNT(*) FROM train_records")
+    suspend fun getRecordCount(): Int
+    
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertRecord(record: TrainRecordEntity)
+    
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertRecords(records: List<TrainRecordEntity>)
+    
+    @Delete
+    suspend fun deleteRecord(record: TrainRecordEntity)
+    
+    @Delete
+    suspend fun deleteRecords(records: List<TrainRecordEntity>)
+    
+    @Query("DELETE FROM train_records")
+    suspend fun deleteAllRecords()
+    
+    @Query("DELETE FROM train_records WHERE uniqueId = :uniqueId")
+    suspend fun deleteRecordById(uniqueId: String)
+    
+    @Query("DELETE FROM train_records WHERE uniqueId IN (:uniqueIds)")
+    suspend fun deleteRecordsByIds(uniqueIds: List<String>)
+    
+    @Query("SELECT * FROM train_records WHERE train LIKE '%' || :train || '%' AND route LIKE '%' || :route || '%' AND (:direction = '全部' OR (:direction = '上行' AND direction = 3) OR (:direction = '下行' AND direction = 1)) ORDER BY timestamp DESC")
+    suspend fun getFilteredRecords(train: String, route: String, direction: String): List<TrainRecordEntity>
+    
+    @Query("SELECT * FROM train_records ORDER BY timestamp DESC LIMIT :limit")
+    suspend fun getLatestRecords(limit: Int): List<TrainRecordEntity>
+    
+    @Query("SELECT * FROM train_records WHERE timestamp >= :fromTime ORDER BY timestamp DESC")
+    suspend fun getRecordsFromTime(fromTime: Long): List<TrainRecordEntity>
+}

app/src/main/java/org/noxylva/lbjconsole/database/TrainRecordEntity.kt

@@ -0,0 +1,66 @@
+package org.noxylva.lbjconsole.database
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.noxylva.lbjconsole.model.TrainRecord
+import org.json.JSONObject
+import java.util.*
+
+@Entity(tableName = "train_records")
+data class TrainRecordEntity(
+    @PrimaryKey val uniqueId: String,
+    val timestamp: Long,
+    val receivedTimestamp: Long,
+    val train: String,
+    val direction: Int,
+    val speed: String,
+    val position: String,
+    val time: String,
+    val loco: String,
+    val locoType: String,
+    val lbjClass: String,
+    val route: String,
+    val positionInfo: String,
+    val rssi: Double
+) {
+    fun toTrainRecord(): TrainRecord {
+        val jsonData = JSONObject().apply {
+            put("uniqueId", uniqueId)
+            put("timestamp", timestamp)
+            put("receivedTimestamp", receivedTimestamp)
+            put("train", train)
+            put("dir", direction)
+            put("speed", speed)
+            put("pos", position)
+            put("time", time)
+            put("loco", loco)
+            put("loco_type", locoType)
+            put("lbj_class", lbjClass)
+            put("route", route)
+            put("position_info", positionInfo)
+            put("rssi", rssi)
+        }
+        return TrainRecord(jsonData)
+    }
+    
+    companion object {
+        fun fromTrainRecord(record: TrainRecord): TrainRecordEntity {
+            return TrainRecordEntity(
+                uniqueId = record.uniqueId,
+                timestamp = record.timestamp.time,
+                receivedTimestamp = record.receivedTimestamp.time,
+                train = record.train,
+                direction = record.direction,
+                speed = record.speed,
+                position = record.position,
+                time = record.time,
+                loco = record.loco,
+                locoType = record.locoType,
+                lbjClass = record.lbjClass,
+                route = record.route,
+                positionInfo = record.positionInfo,
+                rssi = record.rssi
+            )
+        }
+    }
+}

app/src/main/java/org/noxylva/lbjconsole/model/MergeSettings.kt

@@ -0,0 +1,53 @@
+package org.noxylva.lbjconsole.model
+
+data class MergeSettings(
+    val enabled: Boolean = true,
+    val groupBy: GroupBy = GroupBy.TRAIN_AND_LOCO,
+    val timeWindow: TimeWindow = TimeWindow.UNLIMITED
+)
+
+enum class GroupBy(val displayName: String) {
+    TRAIN_ONLY("车次号"),
+    LOCO_ONLY("机车号"),
+    TRAIN_OR_LOCO("车次号或机车号"),
+    TRAIN_AND_LOCO("车次号与机车号")
+}
+
+enum class TimeWindow(val displayName: String, val seconds: Long?) {
+    ONE_HOUR("1小时", 3600),
+    TWO_HOURS("2小时", 7200),
+    SIX_HOURS("6小时", 21600),
+    TWELVE_HOURS("12小时", 43200),
+    ONE_DAY("24小时", 86400),
+    UNLIMITED("不限时间", null)
+}
+
+fun generateGroupKey(record: TrainRecord, groupBy: GroupBy): String? {
+    return when (groupBy) {
+        GroupBy.TRAIN_ONLY -> {
+            val train = record.train.trim()
+            if (train.isNotEmpty() && train != "<NUL>") train else null
+        }
+        GroupBy.LOCO_ONLY -> {
+            val loco = record.loco.trim()
+            if (loco.isNotEmpty() && loco != "<NUL>") loco else null
+        }
+        GroupBy.TRAIN_OR_LOCO -> {
+            val train = record.train.trim()
+            val loco = record.loco.trim()
+            when {
+                train.isNotEmpty() && train != "<NUL>" -> train
+                loco.isNotEmpty() && loco != "<NUL>" -> loco
+                else -> null
+            }
+        }
+        GroupBy.TRAIN_AND_LOCO -> {
+            val train = record.train.trim()
+            val loco = record.loco.trim()
+            if (train.isNotEmpty() && train != "<NUL>" && 
+                loco.isNotEmpty() && loco != "<NUL>") {
+                "${train}_${loco}"
+            } else null
+        }
+    }
+}

app/src/main/java/org/noxylva/lbjconsole/model/MergedTrainRecord.kt

@@ -0,0 +1,20 @@
+package org.noxylva.lbjconsole.model
+
+import java.util.*
+
+data class MergedTrainRecord(
+    val groupKey: String,
+    val records: List<TrainRecord>,
+    val latestRecord: TrainRecord
+) {
+    val recordCount: Int get() = records.size
+    val timeSpan: Pair<Date, Date> get() = 
+        records.minByOrNull { it.timestamp }!!.timestamp to 
+        records.maxByOrNull { it.timestamp }!!.timestamp
+    
+    fun getAllCoordinates() = records.mapNotNull { it.getCoordinates() }
+    
+    fun getUniqueRoutes() = records.map { it.route }.filter { it.isNotEmpty() && it != "<NUL>" }.toSet()
+    
+    fun getUniquePositions() = records.map { it.position }.filter { it.isNotEmpty() && it != "<NUL>" }.toSet()
+}

app/src/main/java/org/noxylva/lbjconsole/model/TrainRecord.kt

@@ -1,16 +1,32 @@
 package org.noxylva.lbjconsole.model
 
+import android.content.Context
 import android.util.Log
 import org.json.JSONObject
 import java.util.*
 import org.osmdroid.util.GeoPoint
-import org.noxylva.lbjconsole.util.LocationUtils
+import org.noxylva.lbjconsole.util.LocationUtil
+import org.noxylva.lbjconsole.util.LocoTypeUtil
 
 class TrainRecord(jsonData: JSONObject? = null) {
     companion object {
         const val TAG = "TrainRecord"
+        private var nextId = 0L
+        private var LocoTypeUtil: LocoTypeUtil? = null
+        
+        @Synchronized
+        private fun generateUniqueId(): String {
+            return "${System.currentTimeMillis()}_${++nextId}"
+        }
+        
+        fun initializeLocoTypeUtil(context: Context) {
+            if (LocoTypeUtil == null) {
+                LocoTypeUtil = LocoTypeUtil(context)
+            }
+        }
     }
     
+    val uniqueId: String
     var timestamp: Date = Date()
     var receivedTimestamp: Date = Date()
     var train: String = ""
@@ -29,10 +45,15 @@ class TrainRecord(jsonData: JSONObject? = null) {
     private var _coordinates: GeoPoint? = null
 
     init {
+        uniqueId = if (jsonData?.has("uniqueId") == true) {
+            jsonData.getString("uniqueId")
+        } else {
+            generateUniqueId()
+        }
+        
         jsonData?.let {
             try {
                 if (jsonData.has("timestamp")) {
-                    
                     timestamp = Date(jsonData.getLong("timestamp"))
                 }
             
@@ -63,20 +84,25 @@ class TrainRecord(jsonData: JSONObject? = null) {
             position = jsonData.optString("pos", "")
             time = jsonData.optString("time", "")
             loco = jsonData.optString("loco", "")
-            locoType = jsonData.optString("loco_type", "")
+            
+            locoType = if (loco.isNotEmpty()) {
+                val prefix = if (loco.length >= 3) loco.take(3) else loco
+                LocoTypeUtil?.getLocoTypeByCode(prefix) ?: ""
+            } else {
+                ""
+            }
+            
             lbjClass = jsonData.optString("lbj_class", "")
             route = jsonData.optString("route", "")
             positionInfo = jsonData.optString("position_info", "")
             rssi = jsonData.optDouble("rssi", 0.0)
             
-            
             _coordinates = null
             
-            Log.d(TAG, "Successfully parsed: train=$train, dir=$direction, speed=$speed")
+            Log.d(TAG, "Successfully parsed: train=$train, dir=$direction, speed=$speed, lbjClass='$lbjClass', locoType='$locoType'")
         } catch (e: Exception) {
             Log.e(TAG, "JSON parse error: ${e.message}", e)
             
-            
             try { train = jsonData.optString("train", "") } catch (e: Exception) { }
             try { direction = jsonData.optInt("dir", 0) } catch (e: Exception) { }
             try { speed = jsonData.optString("speed", "") } catch (e: Exception) { }
@@ -95,7 +121,7 @@ class TrainRecord(jsonData: JSONObject? = null) {
         }
         
         
-        _coordinates = LocationUtils.parsePositionInfo(positionInfo)
+        _coordinates = LocationUtil.parsePositionInfo(positionInfo)
         return _coordinates
     }
     private fun isValidValue(value: String): Boolean {
@@ -122,7 +148,7 @@ class TrainRecord(jsonData: JSONObject? = null) {
             lbjClass.trim()
         } else if (isValidValue(train)) {
             train.trim()
-        } else ""
+        } else null
         
         val map = mutableMapOf<String, String>()
         
@@ -131,14 +157,17 @@ class TrainRecord(jsonData: JSONObject? = null) {
         map["receivedTimestamp"] = dateFormat.format(receivedTimestamp)
         
         
-        if (trainDisplay.isNotEmpty()) map["train"] = trainDisplay
+        trainDisplay?.takeIf { it.isNotEmpty() }?.let { map["train"] = it }
+        
         if (directionText != "未知") map["direction"] = directionText
-        if (isValidValue(speed)) map["speed"] = "速度: ${speed.trim()} km/h"
-        if (isValidValue(position)) map["position"] = "位置: ${position.trim()} km"
+        if (isValidValue(speed)) map["speed"] = "${speed.trim()} km/h"
+        if (isValidValue(position)) {
+            map["position"] = "${position.trim().removeSuffix(".")} K"
+        }
         val timeToDisplay = if (showDetailedTime) {
             val dateFormat = java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss", java.util.Locale.getDefault())
             if (isValidValue(time)) {
-                "列车时间: $time\n接收时间: ${dateFormat.format(receivedTimestamp)}"
+                "$time\n${dateFormat.format(receivedTimestamp)}"
             } else {
                 dateFormat.format(receivedTimestamp)
             }
@@ -152,13 +181,13 @@ class TrainRecord(jsonData: JSONObject? = null) {
             }
         }
         map["time"] = timeToDisplay
-        if (isValidValue(loco)) map["loco"] = "机车号: ${loco.trim()}"
-        if (isValidValue(locoType)) map["loco_type"] = "型号: ${locoType.trim()}"
-        if (isValidValue(route)) map["route"] = "线路: ${route.trim()}"
+        if (isValidValue(loco)) map["loco"] = "${loco.trim()}"
+        if (isValidValue(locoType)) map["loco_type"] = "${locoType.trim()}"
+        if (isValidValue(route)) map["route"] = "${route.trim()}"
         if (isValidValue(positionInfo) && !positionInfo.trim().matches(Regex(".*(<NUL>|\\s)*.*"))) {
-            map["position_info"] = "位置信息: ${positionInfo.trim()}"
+            map["position_info"] = "${positionInfo.trim()}"
         }
-        if (rssi != 0.0) map["rssi"] = "信号强度: $rssi dBm"
+        if (rssi != 0.0) map["rssi"] = "$rssi dBm"
         
         return map
     }
@@ -166,6 +195,7 @@ class TrainRecord(jsonData: JSONObject? = null) {
     
     fun toJSON(): JSONObject {
         val json = JSONObject()
+        json.put("uniqueId", uniqueId)
         json.put("timestamp", timestamp.time)  
         json.put("receivedTimestamp", receivedTimestamp.time)
         json.put("train", train)
@@ -181,4 +211,14 @@ class TrainRecord(jsonData: JSONObject? = null) {
         json.put("rssi", rssi)
         return json
     }
+    
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is TrainRecord) return false
+        return uniqueId == other.uniqueId
+    }
+    
+    override fun hashCode(): Int {
+        return uniqueId.hashCode()
+    }
 }

app/src/main/java/org/noxylva/lbjconsole/model/TrainRecordManager.kt

@@ -4,8 +4,11 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.os.Environment
 import android.util.Log
+import kotlinx.coroutines.*
 import org.json.JSONArray
 import org.json.JSONObject
+import org.noxylva.lbjconsole.database.TrainDatabase
+import org.noxylva.lbjconsole.database.TrainRecordEntity
 import java.io.File
 import java.io.FileWriter
 import java.text.SimpleDateFormat
@@ -19,15 +22,50 @@ class TrainRecordManager(private val context: Context) {
         const val MAX_RECORDS = 1000
         private const val PREFS_NAME = "train_records"
         private const val KEY_RECORDS = "records"
+        private const val KEY_MERGE_SETTINGS = "merge_settings"
     }
 
     
     private val trainRecords = CopyOnWriteArrayList<TrainRecord>()
     private val recordCount = AtomicInteger(0)
     private val prefs: SharedPreferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+    private val database = TrainDatabase.getDatabase(context)
+    private val trainRecordDao = database.trainRecordDao()
+    private val ioScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+    
+    var mergeSettings = MergeSettings()
+        private set
     
     init {
-        loadRecords()
+        ioScope.launch {
+            migrateFromSharedPreferences()
+            loadRecords()
+            loadMergeSettings()
+        }
+    }
+    
+    private suspend fun migrateFromSharedPreferences() {
+        try {
+            val jsonStr = prefs.getString(KEY_RECORDS, null)
+            if (jsonStr != null && jsonStr != "[]") {
+                val jsonArray = JSONArray(jsonStr)
+                val records = mutableListOf<TrainRecordEntity>()
+                
+                for (i in 0 until jsonArray.length()) {
+                    val jsonObject = jsonArray.getJSONObject(i)
+                    val trainRecord = TrainRecord(jsonObject)
+                    records.add(TrainRecordEntity.fromTrainRecord(trainRecord))
+                }
+                
+                if (records.isNotEmpty()) {
+                    trainRecordDao.insertRecords(records)
+                    prefs.edit().remove(KEY_RECORDS).apply()
+                    Log.d(TAG, "Migrated ${records.size} records from SharedPreferences to Room database")
+                }
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to migrate records: ${e.message}")
+        }
     }
     
     
@@ -43,11 +81,16 @@ class TrainRecordManager(private val context: Context) {
         
         
         while (trainRecords.size > MAX_RECORDS) {
-            trainRecords.removeAt(trainRecords.size - 1)
+            val removedRecord = trainRecords.removeAt(trainRecords.size - 1)
+            ioScope.launch {
+                trainRecordDao.deleteRecordById(removedRecord.uniqueId)
+            }
         }
         
         recordCount.incrementAndGet()
-        saveRecords()
+        ioScope.launch {
+            trainRecordDao.insertRecord(TrainRecordEntity.fromTrainRecord(record))
+        }
         return record
     }
     
@@ -67,6 +110,16 @@ class TrainRecordManager(private val context: Context) {
         }
     }
     
+    suspend fun getFilteredRecordsFromDatabase(): List<TrainRecord> {
+        return try {
+            val entities = trainRecordDao.getFilteredRecords(filterTrain, filterRoute, filterDirection)
+            entities.map { it.toTrainRecord() }
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to get filtered records from database: ${e.message}")
+            emptyList()
+        }
+    }
+    
     
     private fun matchFilter(record: TrainRecord): Boolean {
         
@@ -109,63 +162,84 @@ class TrainRecordManager(private val context: Context) {
     }
     
     
+    suspend fun refreshRecordsFromDatabase() {
+        try {
+            val entities = trainRecordDao.getAllRecords()
+            trainRecords.clear()
+            entities.forEach { entity ->
+                trainRecords.add(entity.toTrainRecord())
+            }
+            recordCount.set(trainRecords.size)
+            Log.d(TAG, "Refreshed ${trainRecords.size} records from database")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to refresh records from database: ${e.message}")
+        }
+    }
+    
+    
     fun clearRecords() {
         trainRecords.clear()
         recordCount.set(0)
-        saveRecords()
+        ioScope.launch {
+            trainRecordDao.deleteAllRecords()
+        }
     }
     
     fun deleteRecord(record: TrainRecord): Boolean {
         val result = trainRecords.remove(record)
         if (result) {
             recordCount.decrementAndGet()
-            saveRecords()
+            ioScope.launch {
+                trainRecordDao.deleteRecordById(record.uniqueId)
+            }
         }
         return result
     }
 
     fun deleteRecords(records: List<TrainRecord>): Int {
         var deletedCount = 0
+        val idsToDelete = mutableListOf<String>()
+        
         records.forEach { record ->
             if (trainRecords.remove(record)) {
                 deletedCount++
+                idsToDelete.add(record.uniqueId)
             }
         }
         
         if (deletedCount > 0) {
             recordCount.addAndGet(-deletedCount)
-            saveRecords()
+            ioScope.launch {
+                trainRecordDao.deleteRecordsByIds(idsToDelete)
+            }
         }
         return deletedCount
     }
     
     private fun saveRecords() {
-        try {
-            val jsonArray = JSONArray()
-            for (record in trainRecords) {
-                jsonArray.put(record.toJSON())
+        ioScope.launch {
+            try {
+                val entities = trainRecords.map { TrainRecordEntity.fromTrainRecord(it) }
+                trainRecordDao.insertRecords(entities)
+                Log.d(TAG, "Saved ${trainRecords.size} records to database")
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to save records: ${e.message}")
             }
-            prefs.edit().putString(KEY_RECORDS, jsonArray.toString()).apply()
-            Log.d(TAG, "Saved ${trainRecords.size} records")
-        } catch (e: Exception) {
-            Log.e(TAG, "Failed to save records: ${e.message}")
         }
     }
     
     
-    private fun loadRecords() {
+    private suspend fun loadRecords() {
         try {
-            val jsonStr = prefs.getString(KEY_RECORDS, "[]")
-            val jsonArray = JSONArray(jsonStr)
+            val entities = trainRecordDao.getAllRecords()
             trainRecords.clear()
             
-            for (i in 0 until jsonArray.length()) {
-                val jsonObject = jsonArray.getJSONObject(i)
-                trainRecords.add(TrainRecord(jsonObject))
+            entities.forEach { entity ->
+                trainRecords.add(entity.toTrainRecord())
             }
             
             recordCount.set(trainRecords.size)
-            Log.d(TAG, "Loaded ${trainRecords.size} records")
+            Log.d(TAG, "Loaded ${trainRecords.size} records from database")
         } catch (e: Exception) {
             Log.e(TAG, "Failed to load records: ${e.message}")
         }
@@ -177,4 +251,213 @@ class TrainRecordManager(private val context: Context) {
     fun getRecordCount(): Int {
         return recordCount.get()
     }
+    
+    fun updateMergeSettings(newSettings: MergeSettings) {
+        mergeSettings = newSettings
+        saveMergeSettings()
+    }
+    
+    
+    fun getMergedRecords(): List<MergedTrainRecord> {
+        if (!mergeSettings.enabled) {
+            return emptyList()
+        }
+        
+        val records = getFilteredRecords()
+        return processRecordsForMerging(records, mergeSettings)
+    }
+    
+    fun getMixedRecords(): List<Any> {
+        if (!mergeSettings.enabled) {
+            return getFilteredRecords()
+        }
+        
+        val allRecords = getFilteredRecords()
+        val mergedRecords = processRecordsForMerging(allRecords, mergeSettings)
+        
+        val mergedRecordIds = mergedRecords.flatMap { merged ->
+            merged.records.map { it.uniqueId }
+        }.toSet()
+        
+        val singleRecords = allRecords.filter { record ->
+            !mergedRecordIds.contains(record.uniqueId)
+        }
+        
+        val mixedList = mutableListOf<Any>()
+        mixedList.addAll(mergedRecords)
+        mixedList.addAll(singleRecords)
+        
+        return mixedList.sortedByDescending { item ->
+            when (item) {
+                is MergedTrainRecord -> item.latestRecord.timestamp
+                is TrainRecord -> item.timestamp
+                else -> Date(0)
+            }
+        }
+    }
+    
+    private fun processRecordsForMerging(records: List<TrainRecord>, settings: MergeSettings): List<MergedTrainRecord> {
+        val validRecords = settings.timeWindow.seconds?.let { windowSeconds ->
+            val currentTime = Date()
+            records.filter { record ->
+                (currentTime.time - record.timestamp.time) / 1000 <= windowSeconds
+            }
+        } ?: records
+        
+        return when (settings.groupBy) {
+            GroupBy.TRAIN_OR_LOCO -> processTrainOrLocoMerging(validRecords)
+            else -> {
+                val groupedRecords = mutableMapOf<String, MutableList<TrainRecord>>()
+                validRecords.forEach { record ->
+                    val groupKey = generateGroupKey(record, settings.groupBy)
+                    if (groupKey != null) {
+                        groupedRecords.getOrPut(groupKey) { mutableListOf() }.add(record)
+                    }
+                }
+                
+                groupedRecords.mapNotNull { (groupKey, groupRecords) ->
+                    if (groupRecords.size >= 2) {
+                        val latestRecord = if (groupRecords.size > 1) {
+                            groupRecords.maxByOrNull { it.timestamp } ?: groupRecords.last()
+                        } else {
+                            groupRecords.last()
+                        }
+                        MergedTrainRecord(
+                            groupKey = groupKey,
+                            records = groupRecords.toList(),
+                            latestRecord = latestRecord
+                        )
+                    } else null
+                }.sortedByDescending { it.latestRecord.timestamp }
+            }
+        }
+    }
+    
+    private fun processTrainOrLocoMerging(records: List<TrainRecord>): List<MergedTrainRecord> {
+        val trainGroups = mutableMapOf<String, MutableList<TrainRecord>>()
+        val locoGroups = mutableMapOf<String, MutableList<TrainRecord>>()
+        val mergedGroups = mutableSetOf<MutableList<TrainRecord>>()
+        
+        records.forEach { record ->
+            val train = record.train.trim()
+            val loco = record.loco.trim()
+            
+            if ((train.isEmpty() || train == "<NUL>") && (loco.isEmpty() || loco == "<NUL>")) {
+                return@forEach
+            }
+            
+            var targetGroup: MutableList<TrainRecord>? = null
+            
+            if (train.isNotEmpty() && train != "<NUL>") {
+                targetGroup = trainGroups[train]
+            }
+            
+            if (targetGroup == null && loco.isNotEmpty() && loco != "<NUL>") {
+                targetGroup = locoGroups[loco]
+            }
+            
+            if (targetGroup != null) {
+                targetGroup.add(record)
+                if (train.isNotEmpty() && train != "<NUL>") {
+                    trainGroups[train] = targetGroup
+                }
+                if (loco.isNotEmpty() && loco != "<NUL>") {
+                    locoGroups[loco] = targetGroup
+                }
+            } else {
+                val newGroup = mutableListOf(record)
+                mergedGroups.add(newGroup)
+                
+                if (train.isNotEmpty() && train != "<NUL>") {
+                    trainGroups[train] = newGroup
+                }
+                if (loco.isNotEmpty() && loco != "<NUL>") {
+                    locoGroups[loco] = newGroup
+                }
+            }
+        }
+        
+        return mergedGroups.mapNotNull { groupRecords ->
+            if (groupRecords.size >= 2) {
+                val latestRecord = groupRecords.maxByOrNull { it.timestamp } ?: groupRecords.lastOrNull() ?: return@mapNotNull null
+                val groupKey = "${latestRecord.train}_OR_${latestRecord.loco}"
+                MergedTrainRecord(
+                    groupKey = groupKey,
+                    records = groupRecords.toList(),
+                    latestRecord = latestRecord
+                )
+            } else null
+        }.sortedByDescending { it.latestRecord.timestamp }
+    }
+    
+    private fun saveMergeSettings() {
+        ioScope.launch {
+            try {
+                val json = JSONObject().apply {
+                    put("enabled", mergeSettings.enabled)
+                    put("groupBy", mergeSettings.groupBy.name)
+                    put("timeWindow", mergeSettings.timeWindow.name)
+                }
+                prefs.edit().putString(KEY_MERGE_SETTINGS, json.toString()).apply()
+                Log.d(TAG, "Saved merge settings")
+            } catch (e: Exception) {
+                Log.e(TAG, "Failed to save merge settings: ${e.message}")
+            }
+        }
+    }
+    
+    private fun loadMergeSettings() {
+        try {
+            val jsonStr = prefs.getString(KEY_MERGE_SETTINGS, null)
+            if (jsonStr != null) {
+                val json = JSONObject(jsonStr)
+                mergeSettings = MergeSettings(
+                    enabled = json.getBoolean("enabled"),
+                    groupBy = GroupBy.valueOf(json.getString("groupBy")),
+                    timeWindow = TimeWindow.valueOf(json.getString("timeWindow"))
+                )
+            }
+            Log.d(TAG, "Loaded merge settings: $mergeSettings")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to load merge settings: ${e.message}")
+            mergeSettings = MergeSettings()
+        }
+    }
+    
+    suspend fun exportRecordsToJson(): JSONArray {
+        val jsonArray = JSONArray()
+        try {
+            val entities = trainRecordDao.getAllRecords()
+            entities.forEach { entity ->
+                val record = entity.toTrainRecord()
+                jsonArray.put(record.toJSON())
+            }
+            Log.d(TAG, "Exported ${entities.size} records to JSON")
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to export records to JSON: ${e.message}")
+        }
+        return jsonArray
+    }
+    
+    suspend fun importRecordsFromJson(jsonArray: JSONArray): Int {
+        var importedCount = 0
+        try {
+            val records = mutableListOf<TrainRecordEntity>()
+            for (i in 0 until jsonArray.length()) {
+                val jsonObject = jsonArray.getJSONObject(i)
+                val trainRecord = TrainRecord(jsonObject)
+                records.add(TrainRecordEntity.fromTrainRecord(trainRecord))
+            }
+            
+            if (records.isNotEmpty()) {
+                trainRecordDao.insertRecords(records)
+                importedCount = records.size
+                refreshRecordsFromDatabase()
+                Log.d(TAG, "Imported $importedCount records from JSON")
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to import records from JSON: ${e.message}")
+        }
+        return importedCount
+    }
 }

app/src/main/java/org/noxylva/lbjconsole/ui/components/TrainDetailDialog.kt

@@ -1,172 +0,0 @@
-package org.noxylva.lbjconsole.ui.components
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
-import androidx.compose.ui.window.Dialog
-import androidx.compose.ui.window.DialogProperties
-import org.osmdroid.tileprovider.tilesource.TileSourceFactory
-import org.osmdroid.views.MapView
-import org.osmdroid.views.overlay.Marker
-import org.noxylva.lbjconsole.model.TrainRecord
-
-@Composable
-fun TrainDetailDialog(
-    trainRecord: TrainRecord,
-    onDismiss: () -> Unit
-) {
-    val recordMap = trainRecord.toMap()
-    val coordinates = remember { trainRecord.getCoordinates() }
-    
-    Dialog(
-        onDismissRequest = onDismiss,
-        properties = DialogProperties(
-            dismissOnBackPress = true,
-            dismissOnClickOutside = true
-        )
-    ) {
-        Card(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp),
-            elevation = CardDefaults.cardElevation(defaultElevation = 8.dp)
-        ) {
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp)
-                    .verticalScroll(rememberScrollState())
-            ) {
-                
-                Text(
-                    text = "列车详情",
-                    style = MaterialTheme.typography.titleLarge,
-                    fontWeight = FontWeight.Bold,
-                    modifier = Modifier.padding(bottom = 16.dp)
-                )
-                
-                
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.SpaceBetween
-                ) {
-                    DetailItem("列车号", recordMap["train"] ?: "--")
-                    DetailItem("方向", recordMap["direction"] ?: "未知")
-                }
-                
-                HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
-                
-                
-                DetailItem("接收时间", recordMap["timestamp"] ?: "--")
-                DetailItem("列车时间", recordMap["time"] ?: "--")
-                
-                HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
-                
-                
-                DetailItem("速度", recordMap["speed"] ?: "--")
-                DetailItem("位置", recordMap["position"] ?: "--")
-                DetailItem("位置信息", recordMap["position_info"] ?: "--")
-                
-                HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
-                
-                
-                DetailItem("机车号", recordMap["loco"] ?: "--")
-                DetailItem("机车类型", recordMap["loco_type"] ?: "--")
-                DetailItem("列车类型", recordMap["lbj_class"] ?: "--")
-                
-                HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
-                
-                
-                DetailItem("路线", recordMap["route"] ?: "--")
-                DetailItem("信号强度", recordMap["rssi"] ?: "--")
-                
-                if (coordinates != null) {
-                    HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
-                    
-                    DetailItem(
-                        label = "经纬度",
-                        value = "纬度: ${coordinates.latitude}, 经度: ${coordinates.longitude}"
-                    )
-                    
-                    
-                    Spacer(modifier = Modifier.height(8.dp))
-                    
-                    
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(200.dp)
-                            .padding(vertical = 8.dp),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        AndroidView(
-                            factory = { context ->
-                                MapView(context).apply {
-                                    setTileSource(TileSourceFactory.MAPNIK)
-                                    setMultiTouchControls(true)
-                                    controller.setZoom(15.0)
-                                    controller.setCenter(coordinates)
-                                    
-                                    
-                                    val marker = Marker(this)
-                                    marker.position = coordinates
-                                    marker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
-                                    marker.title = recordMap["train"] ?: "列车"
-                                    overlays.add(marker)
-                                }
-                            },
-                            update = { mapView ->
-                                mapView.controller.setCenter(coordinates)
-                                mapView.invalidate()
-                            }
-                        )
-                    }
-                }
-                
-                Spacer(modifier = Modifier.height(16.dp))
-                
-                
-                Button(
-                    onClick = onDismiss,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(top = 8.dp)
-                ) {
-                    Text("关闭")
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun DetailItem(
-    label: String,
-    value: String,
-    modifier: Modifier = Modifier
-) {
-    Column(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(vertical = 4.dp)
-    ) {
-        Text(
-            text = label,
-            style = MaterialTheme.typography.labelMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        
-        Text(
-            text = value,
-            style = MaterialTheme.typography.bodyLarge
-        )
-    }
-}

app/src/main/java/org/noxylva/lbjconsole/ui/components/TrainInfoCard.kt

@@ -1,153 +0,0 @@
-package org.noxylva.lbjconsole.ui.components
-
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.material3.HorizontalDivider
-import org.noxylva.lbjconsole.model.TrainRecord
-
-@Composable
-fun TrainInfoCard(
-    trainRecord: TrainRecord,
-    modifier: Modifier = Modifier
-) {
-    val recordMap = trainRecord.toMap()
-    
-    Card(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(vertical = 4.dp, horizontal = 6.dp),
-        elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
-    ) {
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(10.dp)
-        ) {
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text(
-                        text = recordMap["train"]?.toString() ?: "",
-                        fontWeight = FontWeight.Bold,
-                        fontSize = 16.sp
-                    )
-                    
-                    Spacer(modifier = Modifier.width(4.dp))
-                    
-                    val directionStr = recordMap["direction"]?.toString() ?: ""
-                    val directionColor = when(directionStr) {
-                        "上行" -> MaterialTheme.colorScheme.primary
-                        "下行" -> MaterialTheme.colorScheme.secondary
-                        else -> MaterialTheme.colorScheme.onSurface
-                    }
-                    
-                    Surface(
-                        shape = RoundedCornerShape(4.dp),
-                        color = directionColor.copy(alpha = 0.1f),
-                        modifier = Modifier.padding(horizontal = 2.dp)
-                    ) {
-                        Text(
-                            text = directionStr,
-                            modifier = Modifier.padding(horizontal = 4.dp, vertical = 2.dp),
-                            fontSize = 12.sp,
-                            color = directionColor
-                        )
-                    }
-                }
-                
-                Text(
-                    text = run {
-                        val trainTime = trainRecord.time.trim()
-                        if (trainTime.isNotEmpty() && trainTime != "NUL" && trainTime != "<NUL>" && trainTime != "NA" && trainTime != "<NA>") {
-                            trainTime
-                        } else {
-                            val receivedTime = recordMap["receivedTimestamp"]?.toString() ?: ""
-                            if (receivedTime.contains(" ")) {
-                                receivedTime.split(" ")[1]
-                            } else {
-                                java.text.SimpleDateFormat("HH:mm:ss", java.util.Locale.getDefault()).format(trainRecord.receivedTimestamp)
-                            }
-                        }
-                    },
-                    fontSize = 12.sp,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                )
-            }
-            
-            Spacer(modifier = Modifier.height(4.dp))
-            
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceBetween
-            ) {
-                Text(
-                    text = "速度: ${recordMap["speed"] ?: ""}",
-                    fontSize = 14.sp,
-                    fontWeight = FontWeight.Medium
-                )
-                
-                Text(
-                    text = "位置: ${recordMap["position"] ?: ""}",
-                    fontSize = 14.sp,
-                    fontWeight = FontWeight.Medium
-                )
-            }
-            
-            Spacer(modifier = Modifier.height(4.dp))
-            HorizontalDivider(thickness = 0.5.dp)
-            Spacer(modifier = Modifier.height(4.dp))
-            
-            Row(
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                Column(modifier = Modifier.weight(1f)) {
-                    CompactInfoItem(label = "机车号", value = recordMap["loco"]?.toString() ?: "")
-                    CompactInfoItem(label = "线路", value = recordMap["route"]?.toString() ?: "")
-                }
-                
-                Column(modifier = Modifier.weight(1f)) {
-                    CompactInfoItem(label = "类型", value = recordMap["lbj_class"]?.toString() ?: "")
-                    CompactInfoItem(label = "信号", value = recordMap["rssi"]?.toString() ?: "")
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun CompactInfoItem(
-    label: String,
-    value: String,
-    modifier: Modifier = Modifier
-) {
-    Row(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(vertical = 2.dp)
-    ) {
-        Text(
-            text = "$label: ",
-            fontWeight = FontWeight.Medium,
-            fontSize = 12.sp,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        
-        Text(
-            text = value,
-            fontSize = 12.sp,
-            color = MaterialTheme.colorScheme.onSurface
-        )
-    }
-}

app/src/main/java/org/noxylva/lbjconsole/ui/components/TrainRecordsList.kt

@@ -1,331 +0,0 @@
-package org.noxylva.lbjconsole.ui.components
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Clear
-import androidx.compose.material.icons.filled.FilterList
-import androidx.compose.material.icons.filled.Share
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import org.noxylva.lbjconsole.model.TrainRecord
-import java.text.SimpleDateFormat
-import java.util.*
-
-@Composable
-fun TrainRecordsList(
-    records: List<TrainRecord>,
-    onRecordClick: (TrainRecord) -> Unit,
-    modifier: Modifier = Modifier
-) {
-    Box(
-        modifier = modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center
-    ) {
-        if (records.isEmpty()) {
-            Text(
-                text = "暂无历史记录",
-                modifier = Modifier.padding(16.dp),
-                textAlign = TextAlign.Center,
-                color = MaterialTheme.colorScheme.onSurfaceVariant
-            )
-        } else {
-            LazyColumn(
-                modifier = Modifier.fillMaxSize(),
-                contentPadding = PaddingValues(vertical = 4.dp, horizontal = 8.dp)
-            ) {
-                items(records) { record ->
-                    Card(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(vertical = 2.dp)
-                            .clickable { onRecordClick(record) },
-                        elevation = CardDefaults.cardElevation(defaultElevation = 1.dp)
-                    ) {
-                        Row(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(8.dp),
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            
-                            Column {
-                                Row(
-                                    verticalAlignment = Alignment.CenterVertically
-                                ) {
-                                    Text(
-                                        text = record.train,
-                                        fontWeight = FontWeight.Bold,
-                                        fontSize = 15.sp
-                                    )
-                                    
-                                    Spacer(modifier = Modifier.width(4.dp))
-                                    
-                                    
-                                    val directionText = when (record.direction) {
-                                        1 -> "下行"
-                                        3 -> "上行"
-                                        else -> "未知"
-                                    }
-                                    
-                                    val directionColor = when(record.direction) {
-                                        1 -> MaterialTheme.colorScheme.secondary
-                                        3 -> MaterialTheme.colorScheme.primary
-                                        else -> MaterialTheme.colorScheme.onSurface
-                                    }
-                                    
-                                    Surface(
-                                        color = directionColor.copy(alpha = 0.1f),
-                                        shape = MaterialTheme.shapes.small
-                                    ) {
-                                        Text(
-                                            text = directionText,
-                                            modifier = Modifier.padding(horizontal = 4.dp, vertical = 1.dp),
-                                            fontSize = 11.sp,
-                                            color = directionColor
-                                        )
-                                    }
-                                }
-                                
-                                Spacer(modifier = Modifier.height(2.dp))
-                                
-                                
-                                Text(
-                                    text = "位置: ${record.position} km",
-                                    fontSize = 12.sp,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                                )
-                            }
-                            
-                            
-                            Column(
-                                horizontalAlignment = Alignment.End
-                            ) {
-                                Text(
-                                    text = "${record.speed} km/h",
-                                    fontWeight = FontWeight.Medium,
-                                    fontSize = 14.sp
-                                )
-                                
-                                Spacer(modifier = Modifier.height(2.dp))
-                                
-                                
-                                val timeStr = SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(record.timestamp)
-                                Text(
-                                    text = timeStr,
-                                    fontSize = 11.sp,
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                                )
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun TrainRecordsListWithToolbar(
-    records: List<TrainRecord>,
-    onRecordClick: (TrainRecord) -> Unit,
-    onFilterClick: () -> Unit,
-    onClearClick: () -> Unit,
-    onDeleteRecords: (List<TrainRecord>) -> Unit,
-    modifier: Modifier = Modifier
-) {
-    var selectedRecords by remember { mutableStateOf<MutableSet<TrainRecord>>(mutableSetOf()) }
-    var selectionMode by remember { mutableStateOf(false) }
-
-    Column(modifier = modifier.fillMaxSize()) {
-        
-        @OptIn(ExperimentalMaterial3Api::class)
-        Surface(
-            modifier = Modifier.fillMaxWidth(),
-            color = MaterialTheme.colorScheme.surface,
-            tonalElevation = 3.dp,
-            shadowElevation = 3.dp
-        ) {
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 16.dp, vertical = 12.dp),
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Text(
-                    text = if (selectionMode) "已选择 ${selectedRecords.size} 条" else "历史记录 (${records.size})",
-                    style = MaterialTheme.typography.titleMedium
-                )
-
-                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                    if (selectionMode) {
-                        TextButton(
-                            onClick = {
-                                if (selectedRecords.isNotEmpty()) {
-                                    onDeleteRecords(selectedRecords.toList())
-                                }
-                                selectionMode = false
-                                selectedRecords = mutableSetOf()
-                            },
-                            colors = ButtonDefaults.textButtonColors(
-                                contentColor = MaterialTheme.colorScheme.error
-                            )
-                        ) {
-                            Text("删除")
-                        }
-                        TextButton(onClick = {
-                            selectionMode = false
-                            selectedRecords = mutableSetOf()
-                        }) {
-                            Text("取消")
-                        }
-                    } else {
-                        IconButton(onClick = onFilterClick) {
-                            Icon(
-                                imageVector = Icons.Default.FilterList, 
-                                contentDescription = "筛选"
-                            )
-                        }
-                    }
-                }
-            }
-        }
-        
-        
-        LazyColumn(
-            modifier = Modifier.weight(1f),
-            contentPadding = PaddingValues(vertical = 4.dp, horizontal = 8.dp),
-            verticalArrangement = Arrangement.spacedBy(4.dp)
-        ) {
-            items(records.chunked(2)) { rowRecords ->
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = 4.dp),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp)
-                ) {
-                    rowRecords.forEach { record ->
-                        val isSelected = selectedRecords.contains(record)
-                        Card(
-                            modifier = Modifier
-                                .weight(1f)
-                                .clickable {
-                                    if (selectionMode) {
-                                        if (isSelected) {
-                                            selectedRecords.remove(record)
-                                        } else {
-                                            selectedRecords.add(record)
-                                        }
-                                        if (selectedRecords.isEmpty()) {
-                                            selectionMode = false
-                                        }
-                                    } else {
-                                        onRecordClick(record)
-                                    }
-                                }
-                                .padding(vertical = 2.dp),
-                            elevation = CardDefaults.cardElevation(defaultElevation = 1.dp)
-                        ) {
-                            Row(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(8.dp),
-                                horizontalArrangement = Arrangement.SpaceBetween,
-                                verticalAlignment = Alignment.CenterVertically
-                            ) {
-                                
-                                Column(modifier = Modifier.weight(1f)) {
-                                    Row(
-                                        verticalAlignment = Alignment.CenterVertically,
-                                        modifier = Modifier.fillMaxWidth()
-                                    ) {
-                                        if (selectionMode) {
-                                            Checkbox(
-                                                checked = isSelected,
-                                                onCheckedChange = { checked ->
-                                                    if (checked) {
-                                                        selectedRecords.add(record)
-                                                    } else {
-                                                        selectedRecords.remove(record)
-                                                    }
-                                                    if (selectedRecords.isEmpty()) {
-                                                        selectionMode = false
-                                                    }
-                                                },
-                                                modifier = Modifier.padding(end = 8.dp)
-                                            )
-                                        }
-                                        
-                                        Text(
-                                            text = record.train,
-                                            fontWeight = FontWeight.Bold,
-                                            fontSize = 15.sp,
-                                            modifier = Modifier.weight(1f)
-                                        )
-                                        
-                                        if (!selectionMode) {
-                                            IconButton(
-                                                onClick = {
-                                                    selectionMode = true
-                                                    selectedRecords = mutableSetOf(record)
-                                                },
-                                                modifier = Modifier.size(32.dp)
-                                            ) {
-                                                Icon(
-                                                    imageVector = Icons.Default.Clear,
-                                                    contentDescription = "删除",
-                                                    modifier = Modifier.size(16.dp),
-                                                    tint = MaterialTheme.colorScheme.error
-                                                )
-                                            }
-                                        }
-                                    }
-                                    
-                                    if (record.speed.isNotEmpty() || record.position.isNotEmpty()) {
-                                        Row(
-                                            modifier = Modifier.fillMaxWidth(),
-                                            horizontalArrangement = Arrangement.SpaceBetween
-                                        ) {
-                                            if (record.speed.isNotEmpty()) {
-                                                Text(
-                                                    text = "${record.speed} km/h",
-                                                    fontSize = 12.sp,
-                                                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                                                )
-                                            }
-                                            if (record.position.isNotEmpty()) {
-                                                Text(
-                                                    text = "${record.position} km",
-                                                    fontSize = 12.sp,
-                                                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                                                )
-                                            }
-                                        }
-                                    }
-                                    
-                                    val timeStr = SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(record.timestamp)
-                                    Text(
-                                        text = timeStr,
-                                        fontSize = 11.sp,
-                                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                                    )
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

app/src/main/java/org/noxylva/lbjconsole/ui/screens/MapScreen.kt

@@ -7,7 +7,12 @@ import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.util.Log
 import android.view.ViewGroup
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material.icons.filled.MyLocation
@@ -16,11 +21,16 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.viewinterop.AndroidView
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import kotlinx.coroutines.launch
@@ -99,6 +109,48 @@ fun MapScreen(
     
     var railwayLayerVisibleState by remember(railwayLayerVisible) { mutableStateOf(railwayLayerVisible) }
     
+    fun updateMarkers() {
+        val mapView = mapViewRef.value ?: return
+        
+        mapView.overlays.removeAll { it is Marker }
+        
+        validRecords.forEach { record ->
+            record.getCoordinates()?.let { point ->
+                val marker = Marker(mapView).apply {
+                    position = point
+                    setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
+                    
+                    val recordMap = record.toMap()
+                    title = recordMap["train"]?.toString() ?: "列车"
+                    val latStr = String.format("%.4f", point.latitude)
+                    val lonStr = String.format("%.4f", point.longitude)
+                    val coordStr = "${latStr}°N, ${lonStr}°E"
+                    snippet = coordStr
+                    
+                    setInfoWindowAnchor(Marker.ANCHOR_CENTER, 0f)
+                    
+                    setOnMarkerClickListener { clickedMarker, _ ->
+                        selectedRecord = record
+                        dialogPosition = point
+                        showDetailDialog = true
+                        true
+                    }
+                }
+                
+                mapView.overlays.add(marker)
+                marker.showInfoWindow()
+            }
+        }
+        
+        mapView.invalidate()
+    }
+    
+    LaunchedEffect(records) {
+        if (isMapInitialized) {
+            updateMarkers()
+        }
+    }
+    
     
     DisposableEffect(lifecycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
@@ -135,50 +187,7 @@ fun MapScreen(
         }
     }
     
-    
-    fun updateMarkers() {
-        val mapView = mapViewRef.value ?: return
-        
-        
-        mapView.overlays.removeAll { it is Marker }
-        
-        
-        validRecords.forEach { record ->
-            record.getCoordinates()?.let { point ->
-                val marker = Marker(mapView).apply {
-                    position = point
 
-                    setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
-                    
-                    val recordMap = record.toMap()
-                    title = recordMap["train"]?.toString() ?: "列车"
-                    
-                    val latStr = String.format("%.4f", point.latitude)
-                    val lonStr = String.format("%.4f", point.longitude)
-                    val coordStr = "${latStr}°N, ${lonStr}°E"
-                    snippet = coordStr
-                    
-                    setInfoWindowAnchor(Marker.ANCHOR_CENTER, 0f)
-                    
-                    setOnMarkerClickListener { clickedMarker, _ ->
-                        selectedRecord = record
-                        dialogPosition = point
-                        showDetailDialog = true
-                        true
-                    }
-                }
-                
-                mapView.overlays.add(marker)
-                marker.showInfoWindow()
-            }
-        }
-        
-        
-        mapView.invalidate()
-        
-        
-
-    }
     
     
     fun updateRailwayLayerVisibility(visible: Boolean) {
@@ -574,8 +583,8 @@ fun Context.getCompactMarkerDrawable(color: Int): Drawable {
 
 
 private fun Int.directionText(): String = when (this) {
-    1 -> "↓"
-    3 -> "↑"
+    1 -> "下行"
+    3 -> "上行"
     else -> "?"
 }
 
@@ -585,50 +594,143 @@ private fun TrainMarkerDialog(
     position: GeoPoint?,
     onDismiss: () -> Unit
 ) {
+    val recordMap = record.toMap()
+    
+    val displayItems = recordMap.filterKeys { 
+        it !in setOf("train", "direction", "time") 
+    }.toList()
+    
     AlertDialog(
         onDismissRequest = onDismiss,
         title = {
-            
-            val recordMap = record.toMap()
             Row(verticalAlignment = Alignment.CenterVertically) {
-                Text(text = recordMap["train"]?.toString() ?: "列车", style = MaterialTheme.typography.titleLarge)
+                Text(
+                    text = recordMap["train"]?.toString() ?: "列车",
+                    style = MaterialTheme.typography.headlineSmall,
+                    modifier = Modifier.weight(1f)
+                )
                 recordMap["direction"]?.let { direction ->
-                    Spacer(modifier = Modifier.width(8.dp))
                     Text(
-                        text = direction,
-                        style = MaterialTheme.typography.bodyMedium,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
+                        text = (direction as? Int)?.directionText() ?: direction.toString(),
+                        style = MaterialTheme.typography.bodyMedium.copy(
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            fontSize = 12.sp
+                        ),
+                        modifier = Modifier.padding(start = 8.dp)
                     )
                 }
             }
         },
         text = {
-            Column {
-                
-                record.toMap().forEach { (key, value) ->
-                    if (key != "train" && key != "direction") {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .verticalScroll(rememberScrollState())
+                    .padding(vertical = 8.dp)
+            ) {
+                displayItems.forEach { (key, value) ->
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(vertical = 4.dp),
+                        horizontalArrangement = Arrangement.SpaceBetween
+                    ) {
+                        val title = when (key) {
+                            "speed" -> "速度"
+                            "position" -> "位置"
+                            "time" -> "时间"
+                            "loco" -> "机车号"
+                            "loco_type" -> "机车型号"
+                            "route" -> "线路"
+                            "rssi" -> "信号强度"
+                            "timestamp" -> "时间"
+                            "receivedTimestamp" -> "接收时间"
+                            else -> key
+                        }
+                        
                         Text(
-                            text = value,
-                            style = MaterialTheme.typography.bodyMedium,
-                            modifier = Modifier.padding(vertical = 2.dp)
+                            text = title,
+                            style = MaterialTheme.typography.titleMedium
+                        )
+                        Text(
+                            text = value.toString(),
+                            style = MaterialTheme.typography.bodyMedium
                         )
                     }
                 }
                 
-                
                 position?.let {
-                    Spacer(modifier = Modifier.height(4.dp))
-                    Text(
-                        text = "坐标: ${String.format("%.6f", it.latitude)}, ${String.format("%.6f", it.longitude)}",
-                        style = MaterialTheme.typography.bodyMedium
-                    )
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(vertical = 4.dp),
+                        horizontalArrangement = Arrangement.SpaceBetween
+                    ) {
+                        Text(
+                            text = "坐标信息",
+                            style = MaterialTheme.typography.titleMedium
+                        )
+                        Text(
+                            text = "${String.format("%.6f", it.latitude)}, ${String.format("%.6f", it.longitude)}",
+                            style = MaterialTheme.typography.bodyMedium
+                        )
+                    }
                 }
             }
         },
         confirmButton = {
             TextButton(onClick = onDismiss) {
-                Text("确定")
+                Text("关闭")
             }
         }
     )
+}
+
+@Composable
+private fun InfoSection(title: String, items: List<Pair<String, String>>) {
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.titleMedium,
+            modifier = Modifier.padding(bottom = 4.dp)
+        )
+        Card(
+            colors = CardDefaults.cardColors(
+                containerColor = MaterialTheme.colorScheme.surfaceVariant
+            ),
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Column(modifier = Modifier.padding(12.dp)) {
+                items.forEach { (key, value) ->
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(vertical = 2.dp),
+                        horizontalArrangement = Arrangement.SpaceBetween
+                    ) {
+                        Text(
+                            text = value.toString(),
+                            style = MaterialTheme.typography.bodyMedium
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun InfoSectionSimple(title: String, items: List<Pair<String, String>>) {
+    Column(modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp)) {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.titleMedium
+        )
+        items.forEach { (key, value) ->
+            Text(
+                text = value.toString(),
+                style = MaterialTheme.typography.bodyMedium
+            )
+        }
+    }
 }

app/src/main/java/org/noxylva/lbjconsole/ui/screens/MonitorScreen.kt

@@ -1,251 +0,0 @@
-package org.noxylva.lbjconsole.ui.screens
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.font.FontWeight
-
-import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import kotlinx.coroutines.delay
-import org.noxylva.lbjconsole.model.TrainRecord
-import org.noxylva.lbjconsole.ui.components.TrainDetailDialog
-import java.text.SimpleDateFormat
-import java.util.*
-
-@Composable
-fun MonitorScreen(
-    latestRecord: TrainRecord?,
-    recentRecords: List<TrainRecord>,
-    lastUpdateTime: Date?,
-    temporaryStatusMessage: String? = null,
-    onRecordClick: (TrainRecord) -> Unit,
-    onClearLog: () -> Unit
-) {
-    var showDetailDialog by remember { mutableStateOf(false) }
-    var selectedRecord by remember { mutableStateOf<TrainRecord?>(null) }
-    
-    
-    val timeSinceLastUpdate = remember { mutableStateOf<String?>(null) }
-    LaunchedEffect(key1 = lastUpdateTime) {
-        if (lastUpdateTime != null) {
-            while (true) {
-                val now = Date()
-                val diffInSec = (now.time - lastUpdateTime.time) / 1000
-                timeSinceLastUpdate.value = when {
-                    diffInSec < 60 -> "${diffInSec}秒前"
-                    diffInSec < 3600 -> "${diffInSec / 60}分钟前"
-                    else -> "${diffInSec / 3600}小时前"
-                }
-                val updateInterval = if (diffInSec < 60) 500L else if (diffInSec < 3600) 30000L else 300000L
-                delay(updateInterval)
-            }
-        }
-    }
-    
-    
-    Box(modifier = Modifier.fillMaxSize().padding(16.dp)) {
-        Card(modifier = Modifier.fillMaxSize()) {
-            Column(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(20.dp)
-            ) {
-                
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.End,
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text(
-                        text = timeSinceLastUpdate.value ?: "暂无数据",
-                        fontSize = 14.sp,
-                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                    )
-                }
-                
-                Spacer(modifier = Modifier.height(16.dp))
-                
-                
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .weight(1f)
-                ) {
-                    if (latestRecord != null) {
-                        
-                        Column(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(8.dp)
-                                .clickable {
-                                    selectedRecord = latestRecord
-                                    showDetailDialog = true
-                                    onRecordClick(latestRecord)
-                                }
-                        ) {
-                            
-                            val recordMap = latestRecord.toMap()
-                            
-                            
-                            Row(
-                                modifier = Modifier.fillMaxWidth(),
-                                horizontalArrangement = Arrangement.SpaceBetween
-                            ) {
-                                Text(
-                                    text = recordMap["train"]?.toString() ?: "",
-                                    fontWeight = FontWeight.Bold,
-                                    fontSize = 20.sp,
-                                    color = MaterialTheme.colorScheme.primary
-                                )
-                                
-                                Text(
-                                    text = recordMap["direction"]?.toString() ?: "",
-                                    fontWeight = FontWeight.Bold,
-                                    fontSize = 16.sp,
-                                    color = when(recordMap["direction"]?.toString()) {
-                                        "上行" -> MaterialTheme.colorScheme.primary
-                                        "下行" -> MaterialTheme.colorScheme.secondary
-                                        else -> MaterialTheme.colorScheme.onSurface
-                                    }
-                                )
-                            }
-                            
-                            Spacer(modifier = Modifier.height(6.dp))
-                            
-                            
-                            if (recordMap.containsKey("time")) {
-                                recordMap["time"]?.split("\n")?.forEach { timeLine ->
-                                    Text(
-                                        text = timeLine,
-                                        fontSize = 14.sp,
-                                        color = MaterialTheme.colorScheme.onSurfaceVariant
-                                    )
-                                    Spacer(modifier = Modifier.height(4.dp))
-                                }
-                            }
-                            
-                            HorizontalDivider(thickness = 0.5.dp)
-                            Spacer(modifier = Modifier.height(8.dp))
-                            
-                            
-                            Row(
-                                modifier = Modifier.fillMaxWidth(),
-                                horizontalArrangement = Arrangement.SpaceBetween
-                            ) {
-                                recordMap["speed"]?.let { speed ->
-                                    Text(
-                                        text = speed,
-                                        fontSize = 14.sp,
-                                        color = MaterialTheme.colorScheme.onSurface
-                                    )
-                                }
-                                recordMap["position"]?.let { position ->
-                                    Text(
-                                        text = position,
-                                        fontSize = 14.sp,
-                                        color = MaterialTheme.colorScheme.onSurface
-                                    )
-                                }
-                            }
-                            Spacer(modifier = Modifier.height(8.dp))
-                            
-                            
-                            Row(
-                                modifier = Modifier.fillMaxWidth()
-                            ) {
-                                Column(modifier = Modifier.fillMaxWidth()) {
-                                    recordMap.forEach { (key, value) ->
-                                        when (key) {
-                                            "timestamp", "train", "direction", "time", "speed", "position", "position_info" -> {}
-                                            else -> {
-                                                Text(
-                                                    text = value,
-                                                    fontSize = 14.sp,
-                                                    color = MaterialTheme.colorScheme.onSurface
-                                                )
-                                                Spacer(modifier = Modifier.height(4.dp))
-                                            }
-                                        }
-                                    }
-                                    
-                                    
-                                    if (recordMap.containsKey("position_info")) {
-                                        Spacer(modifier = Modifier.height(4.dp))
-                                        Text(
-                                            text = recordMap["position_info"] ?: "",
-                                            fontSize = 14.sp,
-                                            color = MaterialTheme.colorScheme.onSurface
-                                        )
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        
-                        Box(
-                            modifier = Modifier.fillMaxSize(),
-                            contentAlignment = Alignment.Center
-                        ) {
-                            Column(horizontalAlignment = Alignment.CenterHorizontally) {
-                                Text(
-                                    "暂无列车信息",
-                                    style = MaterialTheme.typography.titleLarge,
-                                    color = MaterialTheme.colorScheme.outline
-                                )
-                                
-                                if (lastUpdateTime != null) {
-                                    Spacer(modifier = Modifier.height(8.dp))
-                                    Text(
-                                        "上次接收数据: ${SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(lastUpdateTime)}",
-                                        style = MaterialTheme.typography.bodyMedium,
-                                        color = MaterialTheme.colorScheme.outline.copy(alpha = 0.7f)
-                                    )
-                                }
-                            }
-                        }
-                    }
-                }
-                
-            }
-        }
-    }
-    
-    
-    if (showDetailDialog && selectedRecord != null) {
-        TrainDetailDialog(
-            trainRecord = selectedRecord!!,
-            onDismiss = { showDetailDialog = false }
-        )
-    }
-}
-
-@Composable
-private fun InfoItem(
-    label: String,
-    value: String,
-    fontSize: TextUnit = 14.sp
-) {
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(vertical = 2.dp)
-    ) {
-        Text(
-            text = "$label: ",
-            fontWeight = FontWeight.Medium,
-            fontSize = fontSize,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        
-        Text(
-            text = value,
-            fontSize = fontSize,
-            color = MaterialTheme.colorScheme.onSurface
-        )
-    }
-}

app/src/main/java/org/noxylva/lbjconsole/ui/screens/SettingsScreen.kt

@@ -2,12 +2,29 @@ package org.noxylva.lbjconsole.ui.screens
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
+import org.noxylva.lbjconsole.model.MergeSettings
+import org.noxylva.lbjconsole.model.GroupBy
+import org.noxylva.lbjconsole.model.TimeWindow
+import org.noxylva.lbjconsole.SettingsActivity
+import org.noxylva.lbjconsole.BackgroundService
+import org.noxylva.lbjconsole.NotificationService
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.runtime.DisposableEffect
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -15,44 +32,410 @@ fun SettingsScreen(
     deviceName: String,
     onDeviceNameChange: (String) -> Unit,
     onApplySettings: () -> Unit,
-    appVersion: String = "Unknown"
+    appVersion: String = "Unknown",
+    mergeSettings: MergeSettings,
+    onMergeSettingsChange: (MergeSettings) -> Unit,
+    scrollPosition: Int = 0,
+    onScrollPositionChange: (Int) -> Unit = {},
+    specifiedDeviceAddress: String? = null,
+    searchOrderList: List<String> = emptyList(),
+    onSpecifiedDeviceSelected: (String?) -> Unit = {},
+    autoConnectEnabled: Boolean = true,
+    onAutoConnectEnabledChange: (Boolean) -> Unit = {}
 ) {
     val uriHandler = LocalUriHandler.current
+    val scrollState = rememberScrollState(initial = scrollPosition)
+    
+    DisposableEffect(Unit) {
+        onDispose {
+            onScrollPositionChange(scrollState.value)
+        }
+    }
     
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(16.dp),
-        horizontalAlignment = Alignment.CenterHorizontally
+            .verticalScroll(scrollState)
+            .padding(20.dp),
+        verticalArrangement = Arrangement.spacedBy(20.dp)
     ) {
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.spacedBy(16.dp)
+        Card(
+            modifier = Modifier.fillMaxWidth(),
+            colors = CardDefaults.cardColors(
+                containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
+            ),
+            shape = RoundedCornerShape(16.dp)
         ) {
-            OutlinedTextField(
-                value = deviceName,
-                onValueChange = onDeviceNameChange,
-                label = { Text("蓝牙设备名称") },
-                modifier = Modifier.fillMaxWidth(),
-            )
-
-            Button(
-                onClick = onApplySettings,
-                modifier = Modifier.fillMaxWidth()
+            Column(
+                modifier = Modifier.padding(20.dp),
+                verticalArrangement = Arrangement.spacedBy(16.dp)
             ) {
-                Text("应用设置")
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Bluetooth,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.primary
+                    )
+                    Text(
+                        "蓝牙设备",
+                        style = MaterialTheme.typography.titleMedium,
+                        fontWeight = FontWeight.SemiBold
+                    )
+                }
+                
+                OutlinedTextField(
+                    value = deviceName,
+                    onValueChange = onDeviceNameChange,
+                    label = { Text("设备名称") },
+                    leadingIcon = {
+                        Icon(
+                            imageVector = Icons.Default.DeviceHub,
+                            contentDescription = null
+                        )
+                    },
+                    modifier = Modifier.fillMaxWidth(),
+                    shape = RoundedCornerShape(12.dp)
+                )
+                
+                if (searchOrderList.isNotEmpty()) {
+                    var deviceAddressExpanded by remember { mutableStateOf(false) }
+                    
+                    ExposedDropdownMenuBox(
+                        expanded = deviceAddressExpanded,
+                        onExpandedChange = { deviceAddressExpanded = !deviceAddressExpanded }
+                    ) {
+                        OutlinedTextField(
+                            value = specifiedDeviceAddress ?: "无",
+                            onValueChange = {},
+                            readOnly = true,
+                            label = { Text("指定设备地址") },
+                            leadingIcon = {
+                                Icon(
+                                    imageVector = Icons.Default.LocationOn,
+                                    contentDescription = null
+                                )
+                            },
+                            trailingIcon = {
+                                ExposedDropdownMenuDefaults.TrailingIcon(expanded = deviceAddressExpanded)
+                            },
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .menuAnchor(),
+                            shape = RoundedCornerShape(12.dp)
+                        )
+                        ExposedDropdownMenu(
+                            expanded = deviceAddressExpanded,
+                            onDismissRequest = { deviceAddressExpanded = false }
+                        ) {
+                            DropdownMenuItem(
+                                text = { Text("无") },
+                                onClick = {
+                                    onSpecifiedDeviceSelected(null)
+                                    deviceAddressExpanded = false
+                                }
+                            )
+                            searchOrderList.forEach { address ->
+                                DropdownMenuItem(
+                                    text = { 
+                                        Row(verticalAlignment = Alignment.CenterVertically) {
+                                            Text(address)
+                                            if (address == specifiedDeviceAddress) {
+                                                Spacer(modifier = Modifier.width(8.dp))
+                                                Icon(
+                                                    imageVector = Icons.Default.Check,
+                                                    contentDescription = "已指定",
+                                                    tint = MaterialTheme.colorScheme.primary,
+                                                    modifier = Modifier.size(16.dp)
+                                                )
+                                            }
+                                        }
+                                    },
+                                    onClick = {
+                                        onSpecifiedDeviceSelected(address)
+                                        deviceAddressExpanded = false
+                                    }
+                                )
+                            }
+                        }
+                    }
+                }
             }
         }
         
-        Spacer(modifier = Modifier.weight(1f))
-        
-        Text(
-            text = "LBJ Console v$appVersion by undef-i",
-            style = MaterialTheme.typography.bodySmall,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-            modifier = Modifier.clickable {
-                uriHandler.openUri("https://github.com/undef-i")
+        Card(
+            modifier = Modifier.fillMaxWidth(),
+            colors = CardDefaults.cardColors(
+                containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
+            ),
+            shape = RoundedCornerShape(16.dp)
+        ) {
+            Column(
+                modifier = Modifier.padding(20.dp),
+                verticalArrangement = Arrangement.spacedBy(16.dp)
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Settings,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.primary
+                    )
+                    Text(
+                        "应用设置",
+                        style = MaterialTheme.typography.titleMedium,
+                        fontWeight = FontWeight.SemiBold
+                    )
+                }
+                
+                val context = LocalContext.current
+                val notificationService = remember(context) { NotificationService(context) }
+
+                var backgroundServiceEnabled by remember { mutableStateOf<Boolean?>(null) }
+                val coroutineScope = rememberCoroutineScope()
+
+                LaunchedEffect(context) {
+                    backgroundServiceEnabled = SettingsActivity.isBackgroundServiceEnabled(context)
+                }
+
+                var notificationEnabled by remember(context, notificationService) {
+                    mutableStateOf(notificationService.isNotificationEnabled())
+                }
+                
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Column {
+                        Text(
+                            "后台保活服务",
+                            style = MaterialTheme.typography.bodyMedium,
+                            fontWeight = FontWeight.Medium
+                        )
+                        Text(
+                            "保持应用在后台运行",
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+                    if (backgroundServiceEnabled == null) {
+                        CircularProgressIndicator(modifier = Modifier.size(24.dp))
+                    } else {
+                        Switch(
+                            checked = backgroundServiceEnabled!!,
+                            onCheckedChange = { enabled ->
+                                backgroundServiceEnabled = enabled
+                                coroutineScope.launch {
+                                    SettingsActivity.setBackgroundServiceEnabled(context, enabled)
+                                    if (enabled) {
+                                        BackgroundService.startService(context)
+                                    } else {
+                                        BackgroundService.stopService(context)
+                                    }
+                                }
+                            }
+                        )
+                    }
+                }
+                
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Column {
+                        Text(
+                            "LBJ消息通知",
+                            style = MaterialTheme.typography.bodyMedium,
+                            fontWeight = FontWeight.Medium
+                        )
+                        Text(
+                            "实时接收列车LBJ消息通知",
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+                    Switch(
+                        checked = notificationEnabled,
+                        onCheckedChange = { enabled ->
+                            notificationEnabled = enabled
+                            notificationService.setNotificationEnabled(enabled)
+                        }
+                    )
+                }
+                
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Column {
+                        Text(
+                            "自动连接",
+                            style = MaterialTheme.typography.bodyMedium,
+                            fontWeight = FontWeight.Medium
+                        )
+                        Text(
+                            "自动连接蓝牙设备",
+                            style = MaterialTheme.typography.bodySmall,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+                    Switch(
+                        checked = autoConnectEnabled,
+                        onCheckedChange = onAutoConnectEnabledChange
+                    )
+                }
             }
-        )
+        }
+        
+        Card(
+            modifier = Modifier.fillMaxWidth(),
+            colors = CardDefaults.cardColors(
+                containerColor = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.3f)
+            ),
+            shape = RoundedCornerShape(16.dp)
+        ) {
+            Column(
+                modifier = Modifier.padding(20.dp),
+                verticalArrangement = Arrangement.spacedBy(16.dp)
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.MergeType,
+                        contentDescription = null,
+                        tint = MaterialTheme.colorScheme.primary
+                    )
+                    Text(
+                        "记录合并",
+                        style = MaterialTheme.typography.titleMedium,
+                        fontWeight = FontWeight.SemiBold
+                    )
+                }
+                
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text(
+                         "启用记录合并",
+                         style = MaterialTheme.typography.bodyMedium
+                     )
+                    Switch(
+                        checked = mergeSettings.enabled,
+                        onCheckedChange = { enabled ->
+                            onMergeSettingsChange(mergeSettings.copy(enabled = enabled))
+                        }
+                    )
+                }
+                
+                if (mergeSettings.enabled) {
+                    var groupByExpanded by remember { mutableStateOf(false) }
+                    var timeWindowExpanded by remember { mutableStateOf(false) }
+                    
+                    ExposedDropdownMenuBox(
+                        expanded = groupByExpanded,
+                        onExpandedChange = { groupByExpanded = !groupByExpanded }
+                    ) {
+                        OutlinedTextField(
+                            value = mergeSettings.groupBy.displayName,
+                            onValueChange = {},
+                            readOnly = true,
+                            label = { Text("分组方式") },
+                            leadingIcon = {
+                                Icon(
+                                    imageVector = Icons.Default.Group,
+                                    contentDescription = null
+                                )
+                            },
+                            trailingIcon = {
+                                ExposedDropdownMenuDefaults.TrailingIcon(expanded = groupByExpanded)
+                            },
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .menuAnchor(),
+                            shape = RoundedCornerShape(12.dp)
+                        )
+                        ExposedDropdownMenu(
+                            expanded = groupByExpanded,
+                            onDismissRequest = { groupByExpanded = false }
+                        ) {
+                            GroupBy.values().forEach { groupBy ->
+                                DropdownMenuItem(
+                                    text = { Text(groupBy.displayName) },
+                                    onClick = {
+                                        onMergeSettingsChange(mergeSettings.copy(groupBy = groupBy))
+                                        groupByExpanded = false
+                                    }
+                                )
+                            }
+                        }
+                    }
+                    
+                    ExposedDropdownMenuBox(
+                        expanded = timeWindowExpanded,
+                        onExpandedChange = { timeWindowExpanded = !timeWindowExpanded }
+                    ) {
+                        OutlinedTextField(
+                            value = mergeSettings.timeWindow.displayName,
+                            onValueChange = {},
+                            readOnly = true,
+                            label = { Text("时间窗口") },
+                            leadingIcon = {
+                                Icon(
+                                    imageVector = Icons.Default.Schedule,
+                                    contentDescription = null
+                                )
+                            },
+                            trailingIcon = {
+                                ExposedDropdownMenuDefaults.TrailingIcon(expanded = timeWindowExpanded)
+                            },
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .menuAnchor(),
+                            shape = RoundedCornerShape(12.dp)
+                        )
+                        ExposedDropdownMenu(
+                            expanded = timeWindowExpanded,
+                            onDismissRequest = { timeWindowExpanded = false }
+                        ) {
+                            TimeWindow.values().forEach { timeWindow ->
+                                DropdownMenuItem(
+                                    text = { Text(timeWindow.displayName) },
+                                    onClick = {
+                                        onMergeSettingsChange(mergeSettings.copy(timeWindow = timeWindow))
+                                        timeWindowExpanded = false
+                                    }
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+
+        Text(
+             text = "LBJ Console v$appVersion by undef-i",
+             style = MaterialTheme.typography.bodySmall,
+             color = MaterialTheme.colorScheme.onSurfaceVariant,
+             textAlign = TextAlign.Center,
+             modifier = Modifier
+                 .fillMaxWidth()
+                 .clip(RoundedCornerShape(12.dp))
+                 .clickable {
+                     uriHandler.openUri("https://github.com/undef-i/LBJ_Console")
+                 }
+                 .padding(12.dp)
+         )
     }
-}
+}

app/src/main/java/org/noxylva/lbjconsole/ui/theme/Theme.kt

@@ -24,7 +24,7 @@ private val LightColorScheme = lightColorScheme(
 )
 
 @Composable
-fun LBJReceiverTheme(
+fun LBJConsoleTheme(
     darkTheme: Boolean = true, 
     
     dynamicColor: Boolean = true,

app/src/main/java/org/noxylva/lbjconsole/util/LocationUtil.kt

@@ -4,8 +4,8 @@ import android.util.Log
 import org.osmdroid.util.GeoPoint
 
 
-object LocationUtils {
-    private const val TAG = "LocationUtils"
+object LocationUtil {
+    private const val TAG = "LocationUtil"
 
     
     fun parsePositionInfo(positionInfo: String): GeoPoint? {
@@ -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()

app/src/main/java/org/noxylva/lbjconsole/util/LocoTypeUtil.kt

@@ -0,0 +1,42 @@
+package org.noxylva.lbjconsole.util
+
+import android.content.Context
+import java.io.BufferedReader
+import java.io.InputStreamReader
+
+class LocoTypeUtil(private val context: Context) {
+    private val locoTypeMap = mutableMapOf<String, String>()
+    
+    init {
+        loadLocoTypeMapping()
+    }
+    
+    private fun loadLocoTypeMapping() {
+        try {
+            context.assets.open("loco_type_info.csv").use { inputStream ->
+                BufferedReader(InputStreamReader(inputStream)).use { reader ->
+                    reader.lines().forEach { line ->
+                        val parts = line.split(",")
+                        if (parts.size >= 2) {
+                            val code = parts[0].trim()
+                            val type = parts[1].trim()
+                            locoTypeMap[code] = type
+                        }
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+    
+    fun getLocoTypeByCode(code: String): String? {
+        return locoTypeMap[code]
+    }
+    
+    fun getLocoTypeByLocoNumber(locoNumber: String): String? {
+        if (locoNumber.length < 3) return null
+        val prefix = locoNumber.take(3)
+        return getLocoTypeByCode(prefix)
+    }
+}

app/src/main/java/org/noxylva/lbjconsole/util/TrainTypeUtil.kt

@@ -0,0 +1,66 @@
+package org.noxylva.lbjconsole.util
+
+import android.content.Context
+import java.io.BufferedReader
+import java.io.InputStreamReader
+import java.util.regex.Pattern
+
+class TrainTypeUtil(private val context: Context) {
+    private val trainTypePatterns = mutableListOf<Pair<Pattern, String>>()
+    
+    init {
+        loadTrainTypePatterns()
+    }
+    
+    private fun loadTrainTypePatterns() {
+        try {
+            val inputStream = context.assets.open("train_number_info.csv")
+            val reader = BufferedReader(InputStreamReader(inputStream))
+            
+            reader.useLines { lines ->
+                lines.forEach { line ->
+                    if (line.isNotBlank()) {
+                        val firstQuoteEnd = line.indexOf('"', 1)
+                        if (firstQuoteEnd > 0 && firstQuoteEnd < line.length - 1) {
+                            val regex = line.substring(1, firstQuoteEnd)
+                            val remainingPart = line.substring(firstQuoteEnd + 1).trim()
+                            if (remainingPart.startsWith(",\"") && remainingPart.endsWith("\"")) {
+                                val type = remainingPart.substring(2, remainingPart.length - 1)
+                                try {
+                                    val pattern = Pattern.compile(regex)
+                                    trainTypePatterns.add(Pair(pattern, type))
+                                } catch (e: Exception) {
+                                    e.printStackTrace()
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+    
+    fun getTrainType(locoType: String, train: String): String? {
+        if (train.isEmpty()) {
+            return null
+        }
+        
+        val actualTrain = if (locoType == "NA") {
+            train
+        } else {
+            locoType + train
+        }
+        
+        for ((pattern, type) in trainTypePatterns) {
+            if (pattern.matcher(actualTrain).matches()) {
+                return type
+            }
+        }
+        
+        return null
+    }
+    
+
+}

app/src/main/res/drawable/ic_notification.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@android:color/white">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09C6.04,10.33 6,10.66 6,11v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>

app/src/main/res/layout/activity_settings.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:padding="16dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Background Service"
+                android:textSize="16sp"
+                android:textColor="@android:color/black"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Keep app running in background"
+                android:textSize="14sp"
+                android:textColor="@android:color/darker_gray"
+                android:layout_marginTop="4dp" />
+
+        </LinearLayout>
+
+        <Switch
+            android:id="@+id/switch_background_service"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@android:color/darker_gray"
+        android:layout_marginHorizontal="16dp" />
+
+</LinearLayout>

app/src/main/res/layout/notification_train_record.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="4dp"
+    android:background="@android:color/transparent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginBottom="4dp"
+        android:gravity="center_vertical">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/notification_train_number"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="G1234"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="?android:attr/textColorPrimary"
+                android:layout_marginEnd="4dp" />
+
+            <TextView
+                android:id="@+id/notification_direction"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:text="下"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                android:textColor="@android:color/white"
+                android:background="@android:color/black"
+                android:gravity="center"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/notification_loco_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="CRH380D-1234"
+            android:textSize="12sp"
+            android:textColor="?android:attr/textColorPrimary" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/notification_route"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="京沪高铁"
+                android:textSize="14sp"
+                android:textColor="?android:attr/textColorPrimary"
+                android:layout_marginEnd="4dp" />
+
+            <TextView
+                android:id="@+id/notification_position"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="1234K"
+                android:textSize="14sp"
+                android:textColor="?android:attr/textColorPrimary" />
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/notification_speed"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="300 km/h"
+            android:textSize="14sp"
+            android:textColor="?android:attr/textColorPrimary" />
+
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/values/themes.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.LBJReceiver" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.LBJConsole" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>

gradle.properties

@@ -20,4 +20,4 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true

gradle/libs.versions.toml

@@ -8,6 +8,8 @@ espressoCore = "3.6.1"
 lifecycleRuntimeKtx = "2.9.0"
 activityCompose = "1.10.1"
 composeBom = "2024.04.01"
+room = "2.6.1"
+startup = "1.1.1"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -24,9 +26,14 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
 androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
+androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
+androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+androidx-startup-runtime = { group = "androidx.startup", name = "startup-runtime", version.ref = "startup" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+ksp = { id = "com.google.devtools.ksp", version = "2.0.0-1.0.21" }
 

settings.gradle.kts

@@ -19,6 +19,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "LBJ Receiver"
+rootProject.name = "LBJ_Console"
 include(":app")