From d3c9bca4d3b35a8d3a7c376920e91b523d7f0b27 Mon Sep 17 00:00:00 2001
From: harukin-OneMix4 <harukin@haruk.in>
Date: Fri, 7 Jul 2023 00:07:32 +0900
Subject: [PATCH] =?UTF-8?q?=E5=9C=9F=E8=AE=83=E7=B7=9A=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=81=AE=E5=AF=BE=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Apps.js                                  |  5 ++++-
 components/発車時刻表/LED_vidion.js | 12 ++++--------
 lib/checkDuplicateTrainData.js           |  6 ++++++
 3 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 lib/checkDuplicateTrainData.js

diff --git a/Apps.js b/Apps.js
index abc7d1d..0c9e76b 100644
--- a/Apps.js
+++ b/Apps.js
@@ -16,6 +16,7 @@ import { StationDeteilView } from "./components/ActionSheetComponents/StationDet
 import { injectJavascriptData } from "./lib/webViewInjectjavascript";
 import { getStationList2 } from "./lib/getStationList2";
 import { EachTrainInfo } from "./components/ActionSheetComponents/EachTrainInfo";
+import { checkDuplicateTrainData } from "./lib/checkDuplicateTrainData";
 /* 
 import StatusbarDetect from './StatusbarDetect';
 var Status = StatusbarDetect(); */
@@ -160,7 +161,9 @@ export default function Apps({
         setTrainInfo({
           trainNum,
           limited,
-          trainData: currentTrain.filter((t) => t.num == trainNum)[0],
+          trainData: checkDuplicateTrainData(
+            currentTrain.filter((a) => a.num == trainNum)
+          ),
         }); //遅延情報は未実装
         EachTrainInfoAsSR.current?.show();
         return;
diff --git a/components/発車時刻表/LED_vidion.js b/components/発車時刻表/LED_vidion.js
index 8274931..91c586c 100644
--- a/components/発車時刻表/LED_vidion.js
+++ b/components/発車時刻表/LED_vidion.js
@@ -10,6 +10,7 @@ import { objectIsEmpty } from "../../lib/objectIsEmpty";
 import { getTrainType } from "../../lib/getTrainType";
 import { HeaderConfig } from "../../lib/HeaderConfig";
 import { getTrainDelayStatus } from "../../lib/getTrainDelayStatus";
+import { checkDuplicateTrainData } from "../../lib/checkDuplicateTrainData";
 
 let diagramData = undefined;
 
@@ -289,7 +290,9 @@ const EachData = ({
       limited: `${getTrainType(train.type).data}:${
         train.trainName
       }${TrainNumber}`,
-      trainData: currentTrain.filter((t) => t.num == d.train)[0],
+      trainData: checkDuplicateTrainData(
+        currentTrain.filter((a) => a.num == d.train)
+      ),
     });
     EachTrainInfoAsSR.current?.show();
   };
@@ -393,13 +396,6 @@ const DependTime = ({ time }) => (
   </View>
 );
 
-const checkDuplicateTrainData = (currentTrainArray) => {
-  const notNyujoData = currentTrainArray.filter((d) => d.delay !== "入線");
-  if (currentTrainArray.length == 1) return currentTrainArray[0];
-  if (notNyujoData.length == 0) return currentTrainArray[0];
-  else return notNyujoData[0];
-};
-
 const StatusAndDelay = ({ trainDelayStatus }) => {
   return (
     <View style={{ flex: 4 }}>
diff --git a/lib/checkDuplicateTrainData.js b/lib/checkDuplicateTrainData.js
new file mode 100644
index 0000000..e8b3813
--- /dev/null
+++ b/lib/checkDuplicateTrainData.js
@@ -0,0 +1,6 @@
+export const checkDuplicateTrainData = (currentTrainArray) => {
+  const notNyujoData = currentTrainArray.filter((d) => d.delay !== "入線");
+  if (currentTrainArray.length == 1) return currentTrainArray[0];
+  if (notNyujoData.length == 0) return currentTrainArray[0];
+  else return notNyujoData[0];
+};