fix: repair record processing logic

lib/models/train_record.dart

@@ -149,7 +149,7 @@ class TrainRecord {
     final lbjClassValue = lbjClass.trim();
     final trainValue = train.trim();
 
-    if (trainValue == "<NUL>") {
+    if (trainValue == "<NUL>" || trainValue.contains("-----")) {
       return "";
     }
 

lib/screens/history_screen.dart

@@ -580,17 +580,7 @@ class HistoryScreenState extends State<HistoryScreen> {
                       _buildRecordHeader(record),
                       _buildPositionAndSpeed(record),
                       _buildLocoInfo(record),
-                      AnimatedCrossFade(
+                      if (isExpanded) _buildExpandedContent(record),
-                        duration: const Duration(milliseconds: 300),
-                        firstChild: const SizedBox.shrink(),
-                        secondChild: _buildExpandedContent(record),
-                        crossFadeState: isExpanded
-                            ? CrossFadeState.showSecond
-                            : CrossFadeState.showFirst,
-                        firstCurve: Curves.easeInOut,
-                        secondCurve: Curves.easeInOut,
-                        sizeCurve: Curves.easeInOut,
-                      )
                     ]))));
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -623,7 +613,7 @@ class HistoryScreenState extends State<HistoryScreen> {
       formattedLocoInfo = record.loco;
     }
 
-    if (record.fullTrainNumber.isEmpty) {
+    if (record.fullTrainNumber.isEmpty && formattedLocoInfo.isEmpty) {
       return Text(
           (record.time == "<NUL>" || record.time.isEmpty)
               ? record.receivedTimestamp.toString().split(".")[0]
@@ -632,6 +622,11 @@ class HistoryScreenState extends State<HistoryScreen> {
           overflow: TextOverflow.ellipsis);
     }
 
+    final hasTrainNumber = record.fullTrainNumber.isNotEmpty;
+    final hasDirection = record.direction == 1 || record.direction == 3;
+    final hasLocoInfo = formattedLocoInfo.isNotEmpty && formattedLocoInfo != "<NUL>";
+    final shouldShowTrainRow = hasTrainNumber || hasDirection || hasLocoInfo;
+
     return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
       Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
         Flexible(
@@ -647,6 +642,7 @@ class HistoryScreenState extends State<HistoryScreen> {
                   style: const TextStyle(fontSize: 11, color: Colors.grey),
                   overflow: TextOverflow.ellipsis))
       ]),
+      if (shouldShowTrainRow) ...[
         const SizedBox(height: 2),
         Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -657,6 +653,7 @@ class HistoryScreenState extends State<HistoryScreen> {
                       mainAxisSize: MainAxisSize.min,
                       crossAxisAlignment: CrossAxisAlignment.center,
                       children: [
+                    if (hasTrainNumber)
                       Flexible(
                           child: Text(record.fullTrainNumber,
                               style: const TextStyle(
@@ -664,8 +661,8 @@ class HistoryScreenState extends State<HistoryScreen> {
                                   fontWeight: FontWeight.bold,
                                   color: Colors.white),
                               overflow: TextOverflow.ellipsis)),
-                  const SizedBox(width: 6),
+                    if (hasTrainNumber && hasDirection) const SizedBox(width: 6),
-                  if (record.direction == 1 || record.direction == 3)
+                    if (hasDirection)
                       Container(
                           width: 20,
                           height: 20,
@@ -679,11 +676,12 @@ class HistoryScreenState extends State<HistoryScreen> {
                                       fontWeight: FontWeight.bold,
                                       color: Colors.black))))
                   ])),
-            if (formattedLocoInfo.isNotEmpty && formattedLocoInfo != "<NUL>")
+              if (hasLocoInfo)
                 Text(formattedLocoInfo,
                     style: const TextStyle(fontSize: 14, color: Colors.white70))
             ]),
         const SizedBox(height: 2)
+      ]
     ]);
   }
 

lib/services/merge_service.dart

@@ -5,7 +5,7 @@ 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>";
+    final hasTrain = train.isNotEmpty && train != "<NUL>" && !train.contains("-----");
     final hasLoco = loco.isNotEmpty && loco != "<NUL>";
 
     switch (groupBy) {