feat: implement time window algorithm

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
+</adaptive-icon>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#000000</color>
+</resources>

ios/Runner.xcodeproj/project.pbxproj

@@ -427,7 +427,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -484,7 +484,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}

lib/screens/history_screen.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
+import 'package:geolocator/geolocator.dart';
 import 'package:scrollview_observer/scrollview_observer.dart';
 import '../models/merged_record.dart';
 import '../services/database_service.dart';
@@ -45,6 +46,10 @@ class HistoryScreenState extends State<HistoryScreen> {
   final Map<String, double> _mapOptimalZoom = {};
   final Map<String, bool> _mapCalculating = {};
 
+  LatLng? _currentUserLocation;
+  bool _isLocationPermissionGranted = false;
+  Timer? _locationTimer;
+
   int getSelectedCount() => _selectedRecords.length;
   Set<String> getSelectedRecordIds() => _selectedRecords;
   List<Object> getDisplayItems() => _displayItems;
@@ -81,7 +86,10 @@ class HistoryScreenState extends State<HistoryScreen> {
       }
     });
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (mounted) loadRecords();
+      if (mounted) {
+        loadRecords();
+        _startLocationUpdates();
+      }
     });
   }
 
@@ -89,6 +97,7 @@ class HistoryScreenState extends State<HistoryScreen> {
   void dispose() {
     _scrollController.dispose();
     _observerController.controller?.dispose();
+    _locationTimer?.cancel();
     super.dispose();
   }
 
@@ -459,23 +468,64 @@ class HistoryScreenState extends State<HistoryScreen> {
     );
   }
 
+  String _formatLocoInfo(TrainRecord record) {
+    final locoType = record.locoType.trim();
+    final loco = record.loco.trim();
+
+    if (locoType.isNotEmpty && loco.isNotEmpty) {
+      final shortLoco =
+          loco.length > 5 ? loco.substring(loco.length - 5) : loco;
+      return "$locoType-$shortLoco";
+    } else if (locoType.isNotEmpty) {
+      return locoType;
+    } else if (loco.isNotEmpty) {
+      return loco;
+    }
+    return "";
+  }
+
   String _getDifferingInfo(
       TrainRecord record, TrainRecord latest, GroupBy groupBy) {
     final train = record.train.trim();
     final loco = record.loco.trim();
+    final locoType = record.locoType.trim();
     final latestTrain = latest.train.trim();
     final latestLoco = latest.loco.trim();
+    final latestLocoType = latest.locoType.trim();
 
     switch (groupBy) {
       case GroupBy.trainOnly:
-        return loco != latestLoco && loco.isNotEmpty ? loco : "";
+        if (loco != latestLoco && loco.isNotEmpty) {
+          return _formatLocoInfo(record);
+        }
+        return "";
       case GroupBy.locoOnly:
         return train != latestTrain && train.isNotEmpty ? train : "";
       case GroupBy.trainOrLoco:
-        if (train.isNotEmpty && train != latestTrain) return train;
-        if (loco.isNotEmpty && loco != latestLoco) return loco;
+        final trainDiff = train.isNotEmpty && train != latestTrain ? train : "";
+        final locoDiff = loco.isNotEmpty && loco != latestLoco
+            ? _formatLocoInfo(record)
+            : "";
+
+        if (trainDiff.isNotEmpty && locoDiff.isNotEmpty) {
+          return "$trainDiff $locoDiff";
+        } else if (trainDiff.isNotEmpty) {
+          return trainDiff;
+        } else if (locoDiff.isNotEmpty) {
+          return locoDiff;
+        }
         return "";
       case GroupBy.trainAndLoco:
+        if (train.isNotEmpty && train != latestTrain) {
+          final locoInfo = _formatLocoInfo(record);
+          if (locoInfo.isNotEmpty) {
+            return "$train $locoInfo";
+          }
+          return train;
+        }
+        if (loco.isNotEmpty && loco != latestLoco) {
+          return _formatLocoInfo(record);
+        }
         return "";
     }
   }
@@ -619,6 +669,7 @@ class HistoryScreenState extends State<HistoryScreen> {
             center: bounds.center,
             zoom: zoomLevel,
             groupKey: groupKey,
+            currentUserLocation: _currentUserLocation,
           ))
     ]);
   }
@@ -629,6 +680,51 @@ class HistoryScreenState extends State<HistoryScreen> {
     return 10.0;
   }
 
+  Future<void> _requestLocationPermission() async {
+    bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
+    if (!serviceEnabled) {
+      return;
+    }
+
+    LocationPermission permission = await Geolocator.checkPermission();
+    if (permission == LocationPermission.denied) {
+      permission = await Geolocator.requestPermission();
+    }
+
+    if (permission == LocationPermission.deniedForever) {
+      return;
+    }
+
+    setState(() {
+      _isLocationPermissionGranted = true;
+    });
+
+    _getCurrentLocation();
+  }
+
+  Future<void> _getCurrentLocation() async {
+    try {
+      Position position = await Geolocator.getCurrentPosition(
+        desiredAccuracy: LocationAccuracy.high,
+        forceAndroidLocationManager: true,
+      );
+
+      setState(() {
+        _currentUserLocation = LatLng(position.latitude, position.longitude);
+      });
+    } catch (e) {}
+  }
+
+  void _startLocationUpdates() {
+    _requestLocationPermission();
+
+    _locationTimer = Timer.periodic(const Duration(seconds: 30), (timer) {
+      if (_isLocationPermissionGranted) {
+        _getCurrentLocation();
+      }
+    });
+  }
+
   Widget _buildRecordCard(TrainRecord record,
       {bool isSubCard = false, Key? key}) {
     final isSelected = _selectedRecords.contains(record.uniqueId);
@@ -663,26 +759,6 @@ class HistoryScreenState extends State<HistoryScreen> {
                   }
                   widget.onSelectionChanged();
                 });
-              } else if (!isSubCard) {
-                if (isExpanded) {
-                  final shouldUpdate =
-                      _expandedStates[record.uniqueId] == true ||
-                          _mapOptimalZoom.containsKey(record.uniqueId) ||
-                          _mapCalculating.containsKey(record.uniqueId);
-                  if (shouldUpdate) {
-                    setState(() {
-                      _expandedStates[record.uniqueId] = false;
-                      _mapOptimalZoom.remove(record.uniqueId);
-                      _mapCalculating.remove(record.uniqueId);
-                    });
-                  }
-                } else {
-                  if (_expandedStates[record.uniqueId] != true) {
-                    setState(() {
-                      _expandedStates[record.uniqueId] = true;
-                    });
-                  }
-                }
               }
             },
             onLongPress: () {
@@ -920,6 +996,7 @@ class HistoryScreenState extends State<HistoryScreen> {
             position: position,
             zoom: zoomLevel,
             recordId: record.uniqueId,
+            currentUserLocation: _currentUserLocation,
           ))
     ]);
   }
@@ -1060,12 +1137,14 @@ class _DelayedMapWithMarker extends StatefulWidget {
   final LatLng position;
   final double zoom;
   final String recordId;
+  final LatLng? currentUserLocation;
 
   const _DelayedMapWithMarker({
     Key? key,
     required this.position,
     required this.zoom,
     required this.recordId,
+    this.currentUserLocation,
   }) : super(key: key);
 
   @override
@@ -1123,6 +1202,44 @@ class _DelayedMapWithMarkerState extends State<_DelayedMapWithMarker> {
 
   @override
   Widget build(BuildContext context) {
+    final markers = <Marker>[
+      Marker(
+        point: widget.position,
+        width: 24,
+        height: 24,
+        child: Container(
+          decoration: BoxDecoration(
+            color: Colors.red,
+            borderRadius: BorderRadius.circular(12),
+            border: Border.all(color: Colors.white, width: 1.5),
+          ),
+          child: const Icon(Icons.train, color: Colors.white, size: 12),
+        ),
+      ),
+    ];
+
+    if (widget.currentUserLocation != null) {
+      markers.add(
+        Marker(
+          point: widget.currentUserLocation!,
+          width: 24,
+          height: 24,
+          child: Container(
+            decoration: BoxDecoration(
+              color: Colors.blue,
+              shape: BoxShape.circle,
+              border: Border.all(color: Colors.white, width: 1.5),
+            ),
+            child: const Icon(
+              Icons.my_location,
+              color: Colors.white,
+              size: 12,
+            ),
+          ),
+        ),
+      );
+    }
+
     if (_isInitializing) {
       return FlutterMap(
         options: MapOptions(
@@ -1135,19 +1252,7 @@ class _DelayedMapWithMarkerState extends State<_DelayedMapWithMarker> {
           TileLayer(
               urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
               userAgentPackageName: 'org.noxylva.lbjconsole'),
-          MarkerLayer(markers: [
-            Marker(
-                point: widget.position,
-                width: 40,
-                height: 40,
-                child: Container(
-                    decoration: BoxDecoration(
-                        color: Colors.red,
-                        borderRadius: BorderRadius.circular(20),
-                        border: Border.all(color: Colors.white, width: 2)),
-                    child:
-                        const Icon(Icons.train, color: Colors.white, size: 20)))
-          ])
+          MarkerLayer(markers: markers),
         ],
       );
     }
@@ -1161,19 +1266,7 @@ class _DelayedMapWithMarkerState extends State<_DelayedMapWithMarker> {
         TileLayer(
             urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
             userAgentPackageName: 'org.noxylva.lbjconsole'),
-        MarkerLayer(markers: [
-          Marker(
-              point: widget.position,
-              width: 40,
-              height: 40,
-              child: Container(
-                  decoration: BoxDecoration(
-                      color: Colors.red,
-                      borderRadius: BorderRadius.circular(20),
-                      border: Border.all(color: Colors.white, width: 2)),
-                  child:
-                      const Icon(Icons.train, color: Colors.white, size: 20)))
-        ])
+        MarkerLayer(markers: markers),
       ],
     );
   }
@@ -1184,6 +1277,7 @@ class _DelayedMultiMarkerMap extends StatefulWidget {
   final LatLng center;
   final double zoom;
   final String groupKey;
+  final LatLng? currentUserLocation;
 
   const _DelayedMultiMarkerMap({
     Key? key,
@@ -1191,6 +1285,7 @@ class _DelayedMultiMarkerMap extends StatefulWidget {
     required this.center,
     required this.zoom,
     required this.groupKey,
+    this.currentUserLocation,
   }) : super(key: key);
 
   @override
@@ -1250,6 +1345,41 @@ class _DelayedMultiMarkerMapState extends State<_DelayedMultiMarkerMap> {
 
   @override
   Widget build(BuildContext context) {
+    final markers = <Marker>[
+      ...widget.positions.map((pos) => Marker(
+          point: pos,
+          width: 24,
+          height: 24,
+          child: Container(
+              decoration: BoxDecoration(
+                  color: Colors.red.withOpacity(0.8),
+                  shape: BoxShape.circle,
+                  border: Border.all(color: Colors.white, width: 1.5)),
+              child: const Icon(Icons.train, color: Colors.white, size: 12)))),
+    ];
+
+    if (widget.currentUserLocation != null) {
+      markers.add(
+        Marker(
+          point: widget.currentUserLocation!,
+          width: 24,
+          height: 24,
+          child: Container(
+            decoration: BoxDecoration(
+              color: Colors.blue,
+              shape: BoxShape.circle,
+              border: Border.all(color: Colors.white, width: 1.5),
+            ),
+            child: const Icon(
+              Icons.my_location,
+              color: Colors.white,
+              size: 12,
+            ),
+          ),
+        ),
+      );
+    }
+
     return FlutterMap(
       options: MapOptions(
         onPositionChanged: (position, hasGesture) => _onCameraMove(),
@@ -1262,20 +1392,7 @@ class _DelayedMultiMarkerMapState extends State<_DelayedMultiMarkerMap> {
           urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
           userAgentPackageName: 'org.noxylva.lbjconsole',
         ),
-        MarkerLayer(
-            markers: widget.positions
-                .map((pos) => Marker(
-                    point: pos,
-                    width: 40,
-                    height: 40,
-                    child: Container(
-                        decoration: BoxDecoration(
-                            color: Colors.red.withOpacity(0.8),
-                            shape: BoxShape.circle,
-                            border: Border.all(color: Colors.white, width: 2)),
-                        child: const Icon(Icons.train,
-                            color: Colors.white, size: 20))))
-                .toList()),
+        MarkerLayer(markers: markers),
       ],
     );
   }

lib/screens/map_screen.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:math' show sin, cos, sqrt, atan2, pi;
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:latlong2/latlong.dart';
@@ -29,14 +30,73 @@ class _MapScreenState extends State<MapScreen> {
   bool _isLocationPermissionGranted = false;
   Timer? _locationTimer;
 
+  String _selectedTimeFilter = 'unlimited';
+  final Map<String, Duration> _timeFilterOptions = {
+    'unlimited': Duration.zero,
+    '1hour': Duration(hours: 1),
+    '6hours': Duration(hours: 6),
+    '12hours': Duration(hours: 12),
+    '24hours': Duration(hours: 24),
+    '7days': Duration(days: 7),
+    '30days': Duration(days: 30),
+  };
 
   @override
   void initState() {
     super.initState();
     _initializeMap();
-    _loadTrainRecords();
-    _loadSettings();
-    _startLocationUpdates();
+
+    _checkDatabaseSettings();
+
+    _loadSettings().then((_) {
+      _loadTrainRecords().then((_) {
+        _startLocationUpdates();
+      });
+    });
+  }
+
+  Future<void> _checkDatabaseSettings() async {
+    try {
+      final dbInfo = await DatabaseService.instance.getDatabaseInfo();
+
+      final settings = await DatabaseService.instance.getAllSettings();
+
+      if (settings != null) {
+        final lat = settings['mapCenterLat'];
+        final lon = settings['mapCenterLon'];
+
+        if (lat != null && lon != null) {
+          if (lat == 39.9042 && lon == 116.4074) {
+          } else if (lat == 0.0 && lon == 0.0) {
+          } else {
+            final beijingLat = 39.9042;
+            final beijingLon = 116.4074;
+            final distance =
+                _calculateDistance(lat, lon, beijingLat, beijingLon);
+
+            if (distance < 50) {}
+          }
+        }
+      }
+    } catch (e) {}
+  }
+
+  double _calculateDistance(
+      double lat1, double lon1, double lat2, double lon2) {
+    const earthRadius = 6371;
+    final dLat = _degreesToRadians(lat2 - lat1);
+    final dLon = _degreesToRadians(lon2 - lon1);
+    final a = sin(dLat / 2) * sin(dLat / 2) +
+        cos(_degreesToRadians(lat1)) *
+            cos(_degreesToRadians(lat2)) *
+            sin(dLon / 2) *
+            sin(dLon / 2);
+    final c = 2 * atan2(sqrt(a), sqrt(1 - a));
+    return earthRadius * c;
+  }
+
+  double _degreesToRadians(double degrees) {
+    return degrees * pi / 180;
   }
 
   @override
@@ -80,19 +140,23 @@ class _MapScreenState extends State<MapScreen> {
     try {
       Position position = await Geolocator.getCurrentPosition(
         desiredAccuracy: LocationAccuracy.high,
+        forceAndroidLocationManager: true,
       );
 
+      final newLocation = LatLng(position.latitude, position.longitude);
       setState(() {
-        _userLocation = LatLng(position.latitude, position.longitude);
+        _userLocation = newLocation;
       });
 
-    } catch (e) {
-    }
+      if (!_isMapInitialized) {
+        _initializeMapPosition();
+      }
+    } catch (e) {}
   }
 
   void _startLocationUpdates() {
     _requestLocationPermission();
-    
+
     _locationTimer = Timer.periodic(const Duration(seconds: 30), (timer) {
       if (_isLocationPermissionGranted) {
         _getCurrentLocation();
@@ -101,24 +165,22 @@ class _MapScreenState extends State<MapScreen> {
   }
 
   Future<void> _forceUpdateLocation() async {
-    
     try {
       Position position = await Geolocator.getCurrentPosition(
         desiredAccuracy: LocationAccuracy.best,
+        forceAndroidLocationManager: true,
       );
 
       final newLocation = LatLng(position.latitude, position.longitude);
-      
+
       setState(() {
         _userLocation = newLocation;
       });
 
       _mapController.move(newLocation, 15.0);
-    } catch (e) {
-    }
+    } catch (e) {}
   }
 
-
   Future<void> _loadSettings() async {
     try {
       final settings = await DatabaseService.instance.getAllSettings();
@@ -129,14 +191,19 @@ class _MapScreenState extends State<MapScreen> {
           _currentZoom = (settings['mapZoomLevel'] as num?)?.toDouble() ?? 10.0;
           _currentRotation =
               (settings['mapRotation'] as num?)?.toDouble() ?? 0.0;
+          _selectedTimeFilter =
+              settings['mapTimeFilter'] as String? ?? 'unlimited';
 
           final lat = (settings['mapCenterLat'] as num?)?.toDouble();
           final lon = (settings['mapCenterLon'] as num?)?.toDouble();
 
-          if (lat != null && lon != null) {
+          if (lat != null && lon != null && lat != 0.0 && lon != 0.0) {
             _currentLocation = LatLng(lat, lon);
           }
         });
+        if (!_isMapInitialized) {
+          _initializeMapPosition();
+        }
       }
     } catch (e) {}
   }
@@ -144,20 +211,30 @@ class _MapScreenState extends State<MapScreen> {
   Future<void> _saveSettings() async {
     try {
       final center = _mapController.camera.center;
-      await DatabaseService.instance.updateSettings({
+
+      final isDefaultLocation =
+          center.latitude == 39.9042 && center.longitude == 116.4074;
+
+      final settings = {
         'mapRailwayLayerVisible': _railwayLayerVisible ? 1 : 0,
         'mapZoomLevel': _currentZoom,
-        'mapCenterLat': center.latitude,
-        'mapCenterLon': center.longitude,
         'mapRotation': _currentRotation,
-      });
+        'mapTimeFilter': _selectedTimeFilter,
+      };
+
+      if (!isDefaultLocation) {
+        settings['mapCenterLat'] = center.latitude;
+        settings['mapCenterLon'] = center.longitude;
+      }
+
+      await DatabaseService.instance.updateSettings(settings);
     } catch (e) {}
   }
 
   Future<void> _loadTrainRecords() async {
     setState(() => _isLoading = true);
     try {
-      final records = await DatabaseService.instance.getAllRecords();
+      final records = await _getFilteredRecords();
       setState(() {
         _trainRecords.clear();
         _trainRecords.addAll(records);
@@ -175,13 +252,28 @@ class _MapScreenState extends State<MapScreen> {
           }
         }
 
-        _initializeMapPosition();
+        if (!_isMapInitialized) {
+          _initializeMapPosition();
+        }
       });
     } catch (e) {
       setState(() => _isLoading = false);
     }
   }
 
+  Future<List<TrainRecord>> _getFilteredRecords() async {
+    if (_selectedTimeFilter == 'unlimited') {
+      return await DatabaseService.instance.getAllRecords();
+    } else {
+      final duration = _timeFilterOptions[_selectedTimeFilter];
+      if (duration != null && duration != Duration.zero) {
+        return await DatabaseService.instance
+            .getRecordsWithinReceivedTimeRange(duration);
+      }
+      return await DatabaseService.instance.getAllRecords();
+    }
+  }
+
   void _initializeMapPosition() {
     if (_isMapInitialized) return;
 
@@ -189,21 +281,21 @@ class _MapScreenState extends State<MapScreen> {
 
     if (_currentLocation != null) {
       targetLocation = _currentLocation;
-    } else if (_userLocation != null) {
-      targetLocation = _userLocation;
     } else if (_lastTrainLocation != null) {
       targetLocation = _lastTrainLocation;
+    } else if (_userLocation != null) {
+      targetLocation = _userLocation;
     } else {
-      _isMapInitialized = true;
-      return;
+      targetLocation = const LatLng(39.9042, 116.4074);
     }
 
-    _centerMap(targetLocation!, zoom: _currentZoom);
+    _centerMap(targetLocation!, zoom: _currentZoom, rotation: _currentRotation);
     _isMapInitialized = true;
   }
 
-  void _centerMap(LatLng location, {double? zoom}) {
+  void _centerMap(LatLng location, {double? zoom, double? rotation}) {
     _mapController.move(location, zoom ?? _currentZoom);
+    _mapController.rotate(rotation ?? _currentRotation);
   }
 
   LatLng? _parseDmsCoordinate(String? positionInfo) {
@@ -228,9 +320,7 @@ class _MapScreenState extends State<MapScreen> {
           return LatLng(lat, lng);
         }
       }
-    } catch (e) {
-      print('解析DMS坐标失败: $e');
-    }
+    } catch (e) {}
 
     return null;
   }
@@ -294,41 +384,27 @@ class _MapScreenState extends State<MapScreen> {
           Marker(
             point: position,
             width: 80,
-            height: 60,
+            height: 16,
             child: GestureDetector(
               onTap: () => position != null
                   ? _showTrainDetailsDialog(record, position)
                   : null,
               child: Column(
                 mainAxisSize: MainAxisSize.min,
+                mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  Container(
-                    width: 36,
-                    height: 36,
-                    decoration: BoxDecoration(
-                      color: Colors.red,
-                      borderRadius: BorderRadius.circular(18),
-                      border: Border.all(color: Colors.white, width: 2),
-                    ),
-                    child: const Icon(
-                      Icons.train,
-                      color: Colors.white,
-                      size: 18,
-                    ),
-                  ),
-                  const SizedBox(height: 2),
                   Container(
                     padding:
-                        const EdgeInsets.symmetric(horizontal: 4, vertical: 1),
+                        const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
                     decoration: BoxDecoration(
-                      color: Colors.black.withOpacity(0.7),
-                      borderRadius: BorderRadius.circular(2),
+                      color: Colors.black.withOpacity(0.8),
+                      borderRadius: BorderRadius.circular(3),
                     ),
                     child: Text(
                       trainDisplay,
                       style: const TextStyle(
                         color: Colors.white,
-                        fontSize: 10,
+                        fontSize: 8,
                         fontWeight: FontWeight.bold,
                       ),
                       overflow: TextOverflow.ellipsis,
@@ -347,7 +423,9 @@ class _MapScreenState extends State<MapScreen> {
   }
 
   void _centerToMyLocation() {
-    _centerMap(_lastTrainLocation ?? const LatLng(39.9042, 116.4074), zoom: 15.0);
+    if (_userLocation != null) {
+      _centerMap(_userLocation!, zoom: 15.0, rotation: _currentRotation);
+    }
   }
 
   void _centerToLastTrain() {
@@ -364,11 +442,73 @@ class _MapScreenState extends State<MapScreen> {
       }
 
       if (targetPosition != null) {
-        _centerMap(targetPosition, zoom: 15.0);
+        _centerMap(targetPosition, zoom: 15.0, rotation: _currentRotation);
       }
     }
   }
 
+  void _showTimeFilterDialog() {
+    showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('时间筛选'),
+          content: SizedBox(
+            width: double.minPositive,
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: _timeFilterOptions.keys.map((key) {
+                return RadioListTile<String>(
+                  title: Text(_getTimeFilterLabel(key)),
+                  value: key,
+                  groupValue: _selectedTimeFilter,
+                  onChanged: (String? value) {
+                    if (value != null) {
+                      setState(() {
+                        _selectedTimeFilter = value;
+                      });
+                      _loadTrainRecords();
+                      Navigator.pop(context);
+                    }
+                  },
+                  contentPadding: EdgeInsets.zero,
+                  dense: true,
+                );
+              }).toList(),
+            ),
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context),
+              child: const Text('取消'),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  String _getTimeFilterLabel(String key) {
+    switch (key) {
+      case 'unlimited':
+        return '全部时间';
+      case '1hour':
+        return '最近1小时';
+      case '6hours':
+        return '最近6小时';
+      case '12hours':
+        return '最近12小时';
+      case '24hours':
+        return '最近24小时';
+      case '7days':
+        return '最近7天';
+      case '30days':
+        return '最近30天';
+      default:
+        return '未知';
+    }
+  }
+
   void _showTrainDetailsDialog(TrainRecord record, LatLng position) {
     showModalBottomSheet(
       context: context,
@@ -429,16 +569,26 @@ class _MapScreenState extends State<MapScreen> {
                     child: Column(
                       children: [
                         _buildMaterial3DetailRow(
-                            context, "时间", record.formattedTime),
+                            context, "时间", _getDisplayTime(record)),
                         _buildMaterial3DetailRow(
-                            context, "日期", record.formattedDate),
+                            context, "日期", _getDisplayDate(record)),
                         _buildMaterial3DetailRow(
                             context, "类型", record.trainType),
+                        _buildMaterial3DetailRow(context, "速度",
+                            "${record.speed.replaceAll(' ', '')} km/h"),
                         _buildMaterial3DetailRow(
-                            context, "速度", "${record.speed.replaceAll(' ', '')} km/h"),
+                            context,
+                            "位置",
+                            record.position.trim().endsWith('.')
+                                ? '${record.position.trim().substring(0, record.position.trim().length - 1)}K'
+                                : '${record.position.trim()}K'),
                         _buildMaterial3DetailRow(
-                            context, "位置", record.position.trim().endsWith('.') ? '${record.position.trim().substring(0, record.position.trim().length - 1)}K' : '${record.position.trim()}K'),
-                        _buildMaterial3DetailRow(context, "路线", record.route.trim().endsWith('.') ? record.route.trim().substring(0, record.route.trim().length - 1) : record.route.trim()),
+                            context,
+                            "路线",
+                            record.route.trim().endsWith('.')
+                                ? record.route.trim().substring(
+                                    0, record.route.trim().length - 1)
+                                : record.route.trim()),
                         _buildMaterial3DetailRow(
                             context, "机车", "${record.locoType}-${record.loco}"),
                         _buildMaterial3DetailRow(context, "坐标",
@@ -461,7 +611,8 @@ class _MapScreenState extends State<MapScreen> {
                       child: FilledButton(
                         onPressed: () {
                           Navigator.pop(context);
-                          _centerMap(position, zoom: 17.0);
+                          _centerMap(position,
+                              zoom: 17.0, rotation: _currentRotation);
                         },
                         child: const Row(
                           mainAxisAlignment: MainAxisAlignment.center,
@@ -507,6 +658,25 @@ class _MapScreenState extends State<MapScreen> {
     );
   }
 
+  String _getDisplayTime(TrainRecord record) {
+    if (record.time == "<NUL>" || record.time.isEmpty) {
+      final receivedTime = record.receivedTimestamp;
+      return '${receivedTime.hour.toString().padLeft(2, '0')}:${receivedTime.minute.toString().padLeft(2, '0')}:${receivedTime.second.toString().padLeft(2, '0')}';
+    } else {
+      return record.time.split("\n")[0];
+    }
+  }
+
+  String _getDisplayDate(TrainRecord record) {
+    if (record.time == "<NUL>" || record.time.isEmpty) {
+      final receivedTime = record.receivedTimestamp;
+      return '${receivedTime.year}-${receivedTime.month.toString().padLeft(2, '0')}-${receivedTime.day.toString().padLeft(2, '0')}';
+    } else {
+      final now = DateTime.now();
+      return '${now.year}-${now.month.toString().padLeft(2, '0')}-${now.day.toString().padLeft(2, '0')}';
+    }
+  }
+
   Widget _buildMaterial3DetailRow(
       BuildContext context, String label, String value) {
     return Padding(
@@ -546,18 +716,18 @@ class _MapScreenState extends State<MapScreen> {
       markers.add(
         Marker(
           point: _userLocation!,
-          width: 40,
-          height: 40,
+          width: 24,
+          height: 24,
           child: Container(
             decoration: BoxDecoration(
               color: Colors.blue,
-              shape: BoxShape.circle,
-              border: Border.all(color: Colors.white, width: 2),
+              borderRadius: BorderRadius.circular(12),
+              border: Border.all(color: Colors.white, width: 1),
             ),
             child: const Icon(
               Icons.my_location,
               color: Colors.white,
-              size: 20,
+              size: 12,
             ),
           ),
         ),
@@ -571,21 +741,22 @@ class _MapScreenState extends State<MapScreen> {
           FlutterMap(
             mapController: _mapController,
             options: MapOptions(
-              initialCenter: _lastTrainLocation ?? const LatLng(39.9042, 116.4074),
+              initialCenter: _currentLocation ??
+                  _lastTrainLocation ??
+                  _userLocation ??
+                  const LatLng(39.9042, 116.4074),
               initialZoom: _currentZoom,
               initialRotation: _currentRotation,
               minZoom: 4.0,
               maxZoom: 18.0,
-
               onPositionChanged: (MapCamera camera, bool hasGesture) {
-                if (hasGesture) {
-                  setState(() {
-                    _currentLocation = camera.center;
-                    _currentZoom = camera.zoom;
-                    _currentRotation = camera.rotation;
-                  });
-                  _saveSettings();
-                }
+                setState(() {
+                  _currentLocation = camera.center;
+                  _currentZoom = camera.zoom;
+                  _currentRotation = camera.rotation;
+                });
+
+                _saveSettings();
               },
             ),
             children: [
@@ -616,6 +787,13 @@ class _MapScreenState extends State<MapScreen> {
             top: 40,
             child: Column(
               children: [
+                FloatingActionButton.small(
+                  heroTag: 'timeFilter',
+                  backgroundColor: const Color(0xFF1E1E1E),
+                  onPressed: _showTimeFilterDialog,
+                  child: const Icon(Icons.filter_list, color: Colors.white),
+                ),
+                const SizedBox(height: 8),
                 FloatingActionButton.small(
                   heroTag: 'railwayLayer',
                   backgroundColor: const Color(0xFF1E1E1E),

lib/services/background_service.dart

@@ -20,9 +20,9 @@ class BackgroundService {
     if (_isInitialized) return;
 
     final service = FlutterBackgroundService();
-    
+
     final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
-    
+
     if (Platform.isAndroid) {
       const AndroidNotificationChannel channel = AndroidNotificationChannel(
         _notificationChannelId,
@@ -34,10 +34,12 @@ class BackgroundService {
         playSound: false,
       );
 
-      await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<
-          AndroidFlutterLocalNotificationsPlugin>()?.createNotificationChannel(channel);
+      await flutterLocalNotificationsPlugin
+          .resolvePlatformSpecificImplementation<
+              AndroidFlutterLocalNotificationsPlugin>()
+          ?.createNotificationChannel(channel);
     }
-    
+
     await service.configure(
       androidConfiguration: AndroidConfiguration(
         onStart: _onStart,
@@ -81,8 +83,9 @@ class BackgroundService {
     if (service is AndroidServiceInstance) {
       await Future.delayed(const Duration(seconds: 1));
       if (await service.isForegroundService()) {
-        final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
-        
+        final flutterLocalNotificationsPlugin =
+            FlutterLocalNotificationsPlugin();
+
         try {
           const AndroidNotificationChannel channel = AndroidNotificationChannel(
             _notificationChannelId,
@@ -94,8 +97,10 @@ class BackgroundService {
             playSound: false,
           );
 
-          await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<
-              AndroidFlutterLocalNotificationsPlugin>()?.createNotificationChannel(channel);
+          await flutterLocalNotificationsPlugin
+              .resolvePlatformSpecificImplementation<
+                  AndroidFlutterLocalNotificationsPlugin>()
+              ?.createNotificationChannel(channel);
 
           await flutterLocalNotificationsPlugin.show(
             _notificationId,
@@ -122,10 +127,7 @@ class BackgroundService {
               ),
             ),
           );
-          print('前台服务通知显示成功');
-        } catch (e) {
-          print('前台服务通知显示失败: $e');
-        }
+        } catch (e) {}
       }
     }
 
@@ -136,8 +138,9 @@ class BackgroundService {
             final bleService = BLEService();
             final isConnected = bleService.isConnected;
             final deviceStatus = bleService.deviceStatus;
-            
-            final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
+
+            final flutterLocalNotificationsPlugin =
+                FlutterLocalNotificationsPlugin();
             await flutterLocalNotificationsPlugin.show(
               _notificationId,
               'LBJ Console',
@@ -163,9 +166,7 @@ class BackgroundService {
                 ),
               ),
             );
-          } catch (e) {
-            print('前台服务通知更新失败: $e');
-          }
+          } catch (e) {}
         }
       }
     });
@@ -179,7 +180,7 @@ class BackgroundService {
   static Future<void> startService() async {
     await initialize();
     final service = FlutterBackgroundService();
-    
+
     if (Platform.isAndroid) {
       final isRunning = await service.isRunning();
       if (!isRunning) {
@@ -208,4 +209,4 @@ class BackgroundService {
       service.invoke('setAsBackground');
     }
   }
-}
+}

lib/services/ble_service.dart

@@ -319,6 +319,10 @@ class BLEService {
             '${now.millisecondsSinceEpoch}_${Random().nextInt(9999)}';
         recordData['receivedTimestamp'] = now.millisecondsSinceEpoch;
 
+        if (!recordData.containsKey('timestamp')) {
+          recordData['timestamp'] = now.millisecondsSinceEpoch;
+        }
+
         _lastReceivedTime = now;
         _lastReceivedTimeController.add(_lastReceivedTime);
 
@@ -326,9 +330,7 @@ class BLEService {
         _dataController.add(trainRecord);
         DatabaseService.instance.insertRecord(trainRecord);
       }
-    } catch (e) {
-      print("$TAG: JSON Decode Error: $e, Data: $jsonData");
-    }
+    } catch (e) {}
   }
 
   void _updateConnectionState(bool connected, String status) {

lib/services/database_service.dart

@@ -13,7 +13,7 @@ class DatabaseService {
   DatabaseService._internal();
 
   static const String _databaseName = 'train_database';
-  static const _databaseVersion = 2;
+  static const _databaseVersion = 4;
 
   static const String trainRecordsTable = 'train_records';
   static const String appSettingsTable = 'app_settings';
@@ -43,6 +43,17 @@ class DatabaseService {
       await db.execute(
           'ALTER TABLE $appSettingsTable ADD COLUMN hideTimeOnlyRecords INTEGER NOT NULL DEFAULT 0');
     }
+    if (oldVersion < 3) {
+      await db.execute(
+          'ALTER TABLE $appSettingsTable ADD COLUMN mapTimeFilter TEXT NOT NULL DEFAULT "unlimited"');
+    }
+    if (oldVersion < 4) {
+      try {
+        await db.execute(
+            'ALTER TABLE $appSettingsTable ADD COLUMN mapTimeFilter TEXT NOT NULL DEFAULT "unlimited"');
+      } catch (e) {
+      }
+    }
   }
 
   Future<void> _onCreate(Database db, int version) async {
@@ -89,7 +100,8 @@ class DatabaseService {
         mergeRecordsEnabled INTEGER NOT NULL DEFAULT 0,
         hideTimeOnlyRecords INTEGER NOT NULL DEFAULT 0,
         groupBy TEXT NOT NULL DEFAULT 'trainAndLoco',
-        timeWindow TEXT NOT NULL DEFAULT 'unlimited'
+        timeWindow TEXT NOT NULL DEFAULT 'unlimited',
+        mapTimeFilter TEXT NOT NULL DEFAULT 'unlimited'
       )
     ''');
 
@@ -114,6 +126,7 @@ class DatabaseService {
       'hideTimeOnlyRecords': 0,
       'groupBy': 'trainAndLoco',
       'timeWindow': 'unlimited',
+      'mapTimeFilter': 'unlimited',
     });
   }
 
@@ -135,6 +148,31 @@ class DatabaseService {
     return result.map((json) => TrainRecord.fromDatabaseJson(json)).toList();
   }
 
+  Future<List<TrainRecord>> getRecordsWithinTimeRange(Duration duration) async {
+    final db = await database;
+    final cutoffTime = DateTime.now().subtract(duration).millisecondsSinceEpoch;
+    final result = await db.query(
+      trainRecordsTable,
+      where: 'timestamp >= ?',
+      whereArgs: [cutoffTime],
+      orderBy: 'timestamp DESC',
+    );
+    return result.map((json) => TrainRecord.fromDatabaseJson(json)).toList();
+  }
+
+  Future<List<TrainRecord>> getRecordsWithinReceivedTimeRange(
+      Duration duration) async {
+    final db = await database;
+    final cutoffTime = DateTime.now().subtract(duration).millisecondsSinceEpoch;
+    final result = await db.query(
+      trainRecordsTable,
+      where: 'receivedTimestamp >= ?',
+      whereArgs: [cutoffTime],
+      orderBy: 'receivedTimestamp DESC',
+    );
+    return result.map((json) => TrainRecord.fromDatabaseJson(json)).toList();
+  }
+
   Future<int> deleteRecord(String uniqueId) async {
     final db = await database;
     return await db.delete(

lib/services/location_service.dart

@@ -0,0 +1,84 @@
+import 'dart:async';
+import 'package:geolocator/geolocator.dart';
+import 'package:latlong2/latlong.dart';
+
+class LocationService {
+  static final LocationService _instance = LocationService._internal();
+  factory LocationService() => _instance;
+  LocationService._internal();
+
+  static LocationService get instance => _instance;
+
+  LatLng? _currentLocation;
+  Timer? _locationTimer;
+  bool _isLocationPermissionGranted = false;
+  final StreamController<LatLng?> _locationStreamController =
+      StreamController<LatLng?>.broadcast();
+
+  Stream<LatLng?> get locationStream => _locationStreamController.stream;
+  LatLng? get currentLocation => _currentLocation;
+  bool get isLocationPermissionGranted => _isLocationPermissionGranted;
+
+  Future<void> initialize() async {
+    await _requestLocationPermission();
+    if (_isLocationPermissionGranted) {
+      await _getCurrentLocation();
+      _startLocationUpdates();
+    }
+  }
+
+  Future<void> _requestLocationPermission() async {
+    try {
+      bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
+      if (!serviceEnabled) {
+        return;
+      }
+
+      LocationPermission permission = await Geolocator.checkPermission();
+      if (permission == LocationPermission.denied) {
+        permission = await Geolocator.requestPermission();
+      }
+
+      if (permission == LocationPermission.deniedForever) {
+        return;
+      }
+
+      _isLocationPermissionGranted = true;
+    } catch (e) {}
+  }
+
+  Future<void> _getCurrentLocation() async {
+    if (!_isLocationPermissionGranted) return;
+
+    try {
+      Position position = await Geolocator.getCurrentPosition(
+        desiredAccuracy: LocationAccuracy.high,
+        forceAndroidLocationManager: true,
+      );
+
+      _currentLocation = LatLng(position.latitude, position.longitude);
+      _locationStreamController.add(_currentLocation);
+    } catch (e) {}
+  }
+
+  void _startLocationUpdates() {
+    _locationTimer?.cancel();
+    _locationTimer = Timer.periodic(const Duration(seconds: 30), (timer) {
+      if (_isLocationPermissionGranted) {
+        _getCurrentLocation();
+      }
+    });
+  }
+
+  Future<void> forceUpdateLocation() async {
+    if (!_isLocationPermissionGranted) {
+      await _requestLocationPermission();
+    }
+    await _getCurrentLocation();
+  }
+
+  void dispose() {
+    _locationTimer?.cancel();
+    _locationStreamController.close();
+  }
+}

lib/services/map_state_service.dart

@@ -9,7 +9,7 @@ class MapStateService {
   MapStateService._internal();
 
   static const String _tableName = 'record_map_states';
-  
+
   final Map<String, MapState> _memoryCache = {};
 
   Future<void> _ensureTableExists() async {
@@ -34,10 +34,10 @@ class MapStateService {
   Future<void> saveMapState(String key, MapState state) async {
     try {
       _memoryCache[key] = state;
-      
+
       final db = await DatabaseService.instance.database;
       await _ensureTableExists();
-      
+
       await db.insert(
         _tableName,
         {
@@ -47,9 +47,7 @@ class MapStateService {
         },
         conflictAlgorithm: ConflictAlgorithm.replace,
       );
-    } catch (e) {
-      print('保存地图状态失败: $e');
-    }
+    } catch (e) {}
   }
 
   Future<MapState?> getMapState(String key) async {
@@ -60,7 +58,7 @@ class MapStateService {
     try {
       final db = await DatabaseService.instance.database;
       await _ensureTableExists();
-      
+
       final result = await db.query(
         _tableName,
         where: 'key = ?',
@@ -74,16 +72,14 @@ class MapStateService {
         _memoryCache[key] = state;
         return state;
       }
-    } catch (e) {
-      print('读取地图状态失败: $e');
-    }
-    
+    } catch (e) {}
+
     return null;
   }
 
   Future<void> deleteMapState(String key) async {
     _memoryCache.remove(key);
-    
+
     try {
       final db = await DatabaseService.instance.database;
       await db.delete(
@@ -91,23 +87,19 @@ class MapStateService {
         where: 'key = ?',
         whereArgs: [key],
       );
-    } catch (e) {
-      print('删除地图状态失败: $e');
-    }
+    } catch (e) {}
   }
 
   Future<void> clearAllMapStates() async {
     _memoryCache.clear();
-    
+
     try {
       final db = await DatabaseService.instance.database;
       await db.delete(_tableName);
-    } catch (e) {
-      print('清空地图状态失败: $e');
-    }
+    } catch (e) {}
   }
 
   void clearMemoryCache() {
     _memoryCache.clear();
   }
-}
+}

lib/services/merge_service.dart

@@ -5,7 +5,8 @@ class MergeService {
   static String? _generateGroupKey(TrainRecord record, GroupBy groupBy) {
     final train = record.train.trim();
     final loco = record.loco.trim();
-    final hasTrain = train.isNotEmpty && train != "<NUL>" && !train.contains("-----");
+    final hasTrain =
+        train.isNotEmpty && train != "<NUL>" && !train.contains("-----");
     final hasLoco = loco.isNotEmpty && loco != "<NUL>";
 
     switch (groupBy) {
@@ -14,8 +15,13 @@ class MergeService {
       case GroupBy.locoOnly:
         return hasLoco ? loco : null;
       case GroupBy.trainOrLoco:
-        if (hasTrain) return train;
-        if (hasLoco) return loco;
+        if (hasTrain && hasLoco) {
+          return "train:$train|loco:$loco";
+        } else if (hasTrain) {
+          return "train:$train";
+        } else if (hasLoco) {
+          return "loco:$loco";
+        }
         return null;
       case GroupBy.trainAndLoco:
         return (hasTrain && hasLoco) ? "${train}_$loco" : null;
@@ -30,17 +36,15 @@ class MergeService {
       return allRecords;
     }
 
-    final now = DateTime.now();
-    final validRecords = settings.timeWindow.duration == null
-        ? allRecords
-        : allRecords
-            .where((r) =>
-                now.difference(r.receivedTimestamp) <=
-                settings.timeWindow.duration!)
-            .toList();
+    allRecords
+        .sort((a, b) => b.receivedTimestamp.compareTo(a.receivedTimestamp));
+
+    if (settings.groupBy == GroupBy.trainOrLoco) {
+      return _groupByTrainOrLocoWithTimeWindow(allRecords, settings.timeWindow);
+    }
 
     final groupedRecords = <String, List<TrainRecord>>{};
-    for (final record in validRecords) {
+    for (final record in allRecords) {
       final key = _generateGroupKey(record, settings.groupBy);
       if (key != null) {
         groupedRecords.putIfAbsent(key, () => []).add(record);
@@ -49,23 +53,32 @@ class MergeService {
 
     final List<MergedTrainRecord> mergedRecords = [];
     final Set<String> mergedRecordIds = {};
+    final List<TrainRecord> discardedRecords = [];
 
     groupedRecords.forEach((key, group) {
-      if (group.length >= 2) {
-        group
-            .sort((a, b) => b.receivedTimestamp.compareTo(a.receivedTimestamp));
-        final latestRecord = group.first;
+      final processedGroup = _applyTimeWindow(group, settings.timeWindow);
+
+      if (processedGroup.length >= 2) {
         mergedRecords.add(MergedTrainRecord(
           groupKey: key,
-          records: group,
-          latestRecord: latestRecord,
+          records: processedGroup,
+          latestRecord: processedGroup.first,
         ));
-        for (final record in group) {
+        for (final record in processedGroup) {
           mergedRecordIds.add(record.uniqueId);
         }
       }
+
+      for (final record in group) {
+        if (!processedGroup.contains(record)) {
+          discardedRecords.add(record);
+        }
+      }
     });
 
+    final reusedRecords = _reuseDiscardedRecords(
+        discardedRecords, mergedRecordIds, settings.groupBy);
+
     final singleRecords =
         allRecords.where((r) => !mergedRecordIds.contains(r.uniqueId)).toList();
 
@@ -82,4 +95,253 @@ class MergeService {
 
     return mixedList;
   }
+
+  static List<TrainRecord> _applyTimeWindow(
+      List<TrainRecord> group, TimeWindow timeWindow) {
+    if (timeWindow.duration == null) {
+      return group;
+    }
+
+    group.sort((a, b) => a.receivedTimestamp.compareTo(b.receivedTimestamp));
+
+    while (group.length > 1) {
+      final timeSpan = group.last.receivedTimestamp
+          .difference(group.first.receivedTimestamp);
+
+      if (timeSpan <= timeWindow.duration!) {
+        break;
+      }
+
+      group.removeAt(0);
+    }
+
+    group.sort((a, b) => b.receivedTimestamp.compareTo(a.receivedTimestamp));
+    return group;
+  }
+
+  static List<TrainRecord> _reuseDiscardedRecords(
+      List<TrainRecord> discardedRecords,
+      Set<String> mergedRecordIds,
+      GroupBy groupBy) {
+    final reusedRecords = <TrainRecord>[];
+
+    for (final record in discardedRecords) {
+      if (mergedRecordIds.contains(record.uniqueId)) continue;
+
+      final key = _generateGroupKey(record, groupBy);
+      if (key != null) {
+        reusedRecords.add(record);
+      }
+    }
+
+    return reusedRecords;
+  }
+
+  static List<Object> _groupByTrainOrLocoWithTimeWindow(
+      List<TrainRecord> records, TimeWindow timeWindow) {
+    final List<MergedTrainRecord> mergedRecords = [];
+    final List<TrainRecord> singleRecords = [];
+    final Set<String> usedRecordIds = {};
+
+    for (int i = 0; i < records.length; i++) {
+      final record = records[i];
+      if (usedRecordIds.contains(record.uniqueId)) continue;
+
+      final group = <TrainRecord>[record];
+
+      for (int j = i + 1; j < records.length; j++) {
+        final otherRecord = records[j];
+        if (usedRecordIds.contains(otherRecord.uniqueId)) continue;
+
+        final recordTrain = record.train.trim();
+        final otherTrain = otherRecord.train.trim();
+        final recordLoco = record.loco.trim();
+        final otherLoco = otherRecord.loco.trim();
+
+        final trainMatch = recordTrain.isNotEmpty &&
+            recordTrain != "<NUL>" &&
+            !recordTrain.contains("-----") &&
+            otherTrain.isNotEmpty &&
+            otherTrain != "<NUL>" &&
+            !otherTrain.contains("-----") &&
+            recordTrain == otherTrain;
+
+        final locoMatch = recordLoco.isNotEmpty &&
+            recordLoco != "<NUL>" &&
+            otherLoco.isNotEmpty &&
+            otherLoco != "<NUL>" &&
+            recordLoco == otherLoco;
+
+        final bothTrainEmpty = (recordTrain.isEmpty ||
+                recordTrain == "<NUL>" ||
+                recordTrain.contains("----")) &&
+            (otherTrain.isEmpty ||
+                otherTrain == "<NUL>" ||
+                otherTrain.contains("----"));
+
+        if (trainMatch || locoMatch || (bothTrainEmpty && locoMatch)) {
+          group.add(otherRecord);
+        }
+      }
+
+      final processedGroup = _applyTimeWindow(group, timeWindow);
+
+      if (processedGroup.length >= 2) {
+        for (final record in processedGroup) {
+          usedRecordIds.add(record.uniqueId);
+        }
+
+        final firstRecord = processedGroup.first;
+        final train = firstRecord.train.trim();
+        final loco = firstRecord.loco.trim();
+        String uniqueGroupKey;
+
+        if (train.isNotEmpty &&
+            train != "<NUL>" &&
+            !train.contains("-----") &&
+            loco.isNotEmpty &&
+            loco != "<NUL>") {
+          uniqueGroupKey = "train_or_loco:${train}_$loco";
+        } else if (train.isNotEmpty &&
+            train != "<NUL>" &&
+            !train.contains("-----") &&
+            loco.isEmpty) {
+          uniqueGroupKey = "train_or_loco:train:$train";
+        } else if (loco.isNotEmpty && loco != "<NUL>") {
+          uniqueGroupKey = "train_or_loco:loco:$loco";
+        } else {
+          uniqueGroupKey = "train_or_loco:group_${mergedRecords.length}";
+        }
+
+        mergedRecords.add(MergedTrainRecord(
+          groupKey: uniqueGroupKey,
+          records: processedGroup,
+          latestRecord: processedGroup.first,
+        ));
+      } else {
+        // 处理被丢弃的记录
+        for (final record in group) {
+          if (!processedGroup.contains(record)) {
+            singleRecords.add(record);
+            usedRecordIds.add(record.uniqueId);
+          }
+        }
+
+        if (processedGroup.isNotEmpty) {
+          singleRecords.add(processedGroup.first);
+          usedRecordIds.add(processedGroup.first.uniqueId);
+        }
+      }
+    }
+
+    final List<Object> result = [...mergedRecords, ...singleRecords];
+    result.sort((a, b) {
+      final aTime = a is MergedTrainRecord
+          ? a.latestRecord.receivedTimestamp
+          : (a as TrainRecord).receivedTimestamp;
+      final bTime = b is MergedTrainRecord
+          ? b.latestRecord.receivedTimestamp
+          : (b as TrainRecord).receivedTimestamp;
+      return bTime.compareTo(aTime);
+    });
+
+    return result;
+  }
+
+  static List<Object> _groupByTrainOrLoco(List<TrainRecord> records) {
+    final List<MergedTrainRecord> mergedRecords = [];
+    final List<TrainRecord> singleRecords = [];
+    final Set<String> usedRecordIds = {};
+
+    for (int i = 0; i < records.length; i++) {
+      final record = records[i];
+      if (usedRecordIds.contains(record.uniqueId)) continue;
+
+      final group = <TrainRecord>[record];
+
+      for (int j = i + 1; j < records.length; j++) {
+        final otherRecord = records[j];
+        if (usedRecordIds.contains(otherRecord.uniqueId)) continue;
+
+        final recordTrain = record.train.trim();
+        final otherTrain = otherRecord.train.trim();
+        final recordLoco = record.loco.trim();
+        final otherLoco = otherRecord.loco.trim();
+
+        final trainMatch = recordTrain.isNotEmpty &&
+            recordTrain != "<NUL>" &&
+            !recordTrain.contains("-----") &&
+            otherTrain.isNotEmpty &&
+            otherTrain != "<NUL>" &&
+            !otherTrain.contains("-----") &&
+            recordTrain == otherTrain;
+
+        final locoMatch = recordLoco.isNotEmpty &&
+            recordLoco != "<NUL>" &&
+            otherLoco.isNotEmpty &&
+            otherLoco != "<NUL>" &&
+            recordLoco == otherLoco;
+
+        final bothTrainEmpty = (recordTrain.isEmpty ||
+                recordTrain == "<NUL>" ||
+                recordTrain.contains("----")) &&
+            (otherTrain.isEmpty ||
+                otherTrain == "<NUL>" ||
+                otherTrain.contains("----"));
+
+        if (trainMatch || locoMatch || (bothTrainEmpty && locoMatch)) {
+          group.add(otherRecord);
+        }
+      }
+
+      if (group.length >= 2) {
+        for (final record in group) {
+          usedRecordIds.add(record.uniqueId);
+        }
+
+        final firstRecord = group.first;
+        final train = firstRecord.train.trim();
+        final loco = firstRecord.loco.trim();
+        String uniqueGroupKey;
+
+        if (train.isNotEmpty &&
+            train != "<NUL>" &&
+            !train.contains("-----") &&
+            loco.isNotEmpty &&
+            loco != "<NUL>") {
+          uniqueGroupKey = "train_or_loco:${train}_$loco";
+        } else if (train.isNotEmpty &&
+            train != "<NUL>" &&
+            !train.contains("-----")) {
+          uniqueGroupKey = "train_or_loco:train:$train";
+        } else if (loco.isNotEmpty && loco != "<NUL>") {
+          uniqueGroupKey = "train_or_loco:loco:$loco";
+        } else {
+          uniqueGroupKey = "train_or_loco:group_${mergedRecords.length}";
+        }
+
+        mergedRecords.add(MergedTrainRecord(
+          groupKey: uniqueGroupKey,
+          records: group,
+          latestRecord: group.first,
+        ));
+      } else {
+        singleRecords.add(record);
+        usedRecordIds.add(record.uniqueId);
+      }
+    }
+
+    final List<Object> result = [...mergedRecords, ...singleRecords];
+    result.sort((a, b) {
+      final aTime = a is MergedTrainRecord
+          ? a.latestRecord.receivedTimestamp
+          : (a as TrainRecord).receivedTimestamp;
+      final bTime = b is MergedTrainRecord
+          ? b.latestRecord.receivedTimestamp
+          : (b as TrainRecord).receivedTimestamp;
+      return bTime.compareTo(aTime);
+    });
+
+    return result;
+  }
 }

lib/services/notification_service.dart

@@ -90,20 +90,32 @@ class NotificationService {
   String _buildNotificationContent(TrainRecord record) {
     final buffer = StringBuffer();
 
-    buffer.writeln('车次: ${record.fullTrainNumber}');
-    buffer.writeln('线路: ${record.route}');
-    buffer.writeln('方向: ${record.directionText}');
+    buffer.write(record.fullTrainNumber);
+    if (_isValidValue(record.route)) {
+      buffer.write(' ${record.route}');
+    }
+    if (_isValidValue(record.directionText)) {
+      buffer.write(' ${record.directionText}');
+    }
+    if (_isValidValue(record.positionInfo)) {
+      buffer.write(' ${record.positionInfo}');
+    }
+    buffer.writeln();
+    if (_isValidValue(record.locoType) && _isValidValue(record.loco)) {
+      final shortLoco = record.loco.length > 5
+          ? record.loco.substring(record.loco.length - 5)
+          : record.loco;
+      buffer.write('${record.locoType}-$shortLoco');
+    } else if (_isValidValue(record.locoType)) {
+      buffer.write(record.locoType);
+    } else if (_isValidValue(record.loco)) {
+      buffer.write(record.loco);
+    }
 
     if (_isValidValue(record.speed)) {
-      buffer.writeln('速度: ${record.speed} km/h');
+      buffer.write(' ${record.speed}km/h');
     }
 
-    if (_isValidValue(record.positionInfo)) {
-      buffer.writeln('位置: ${record.positionInfo}');
-    }
-
-    buffer.writeln('时间: ${record.formattedTime}');
-
     return buffer.toString().trim();
   }
 

pubspec.lock

@@ -358,6 +358,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.14.4"
   flutter_lints:
     dependency: "direct dev"
     description:

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.3.0-flutter+30
+version: 0.4.0-flutter+40
 
 environment:
   sdk: ^3.5.4
@@ -67,6 +67,7 @@ dev_dependencies:
   flutter_lints: ^4.0.0
   hive_generator: ^2.0.1
   build_runner: ^2.4.6
+  flutter_launcher_icons: ^0.14.1
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
@@ -110,6 +111,13 @@ flutter:
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/to/font-from-package
 
+flutter_launcher_icons:
+  android: true
+  ios: true
+  image_path: "assets/icon.png"
+  adaptive_icon_background: "#000000"
+  adaptive_icon_foreground: "assets/icon.png"
+
 msix_config:
   display_name: LBJ Console
   publisher_display_name: Noxylva