From f3f9ee60c2d89616cdb1c555eb415779fdd3295e Mon Sep 17 00:00:00 2001
From: harukin-OneMix4 <harukin@haruk.in>
Date: Wed, 21 Feb 2024 05:51:14 +0900
Subject: [PATCH] =?UTF-8?q?=E6=A8=AA=E7=94=BB=E9=9D=A2=E3=81=A7=E7=94=BB?=
 =?UTF-8?q?=E9=9D=A2=E6=9B=B4=E6=96=B0=E3=81=8C=E4=B8=8D=E5=AE=8C=E5=85=A8?=
 =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=82=8B=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Apps.js                                       | 10 +++++-----
 .../EachTrainInfoCore.js                      | 19 +++++++++++++++----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Apps.js b/Apps.js
index 5afa461..0e9679b 100644
--- a/Apps.js
+++ b/Apps.js
@@ -298,7 +298,7 @@ export default function Apps({ navigation, webview, stationData }) {
       }}
       onLayout={handleLayout}
     >
-      {!trainInfo.trainData && isLandscape ? (
+      {!trainInfo.trainNum && isLandscape ? (
         <TrainMenu
           webview={webview}
           stationData={stationData}
@@ -347,7 +347,7 @@ export default function Apps({ navigation, webview, stationData }) {
           }
         }}
       />
-      {isLandscape && trainInfo.trainData && (
+      {isLandscape && trainInfo.trainNum && (
         <View
           style={{
             width: (width / 100) * 40,
@@ -357,7 +357,7 @@ export default function Apps({ navigation, webview, stationData }) {
         >
           <EachTrainInfoCore
             {...{
-              data: trainInfo.trainData ? trainInfo : undefined,
+              data: trainInfo.trainNum ? trainInfo : undefined,
               navigate,
               originalStationList,
               openStationACFromEachTrainInfo,
@@ -374,7 +374,7 @@ export default function Apps({ navigation, webview, stationData }) {
           mapSwitch={mapSwitch == "true" ? "flex" : "none"}
         />
       )}
-      {isLandscape && trainInfo.trainData && (
+      {isLandscape && trainInfo.trainNum && (
         <LandscapeBackButton
           onPress={() => {
             LayoutAnimation.easeInEaseOut();
@@ -390,7 +390,7 @@ export default function Apps({ navigation, webview, stationData }) {
       <ReloadButton
         onPress={() => webview.current.reload()}
         top={Platform.OS == "ios" ? Constants.statusBarHeight : 0}
-        right={isLandscape && trainInfo.trainData ? (width / 100) * 40 : 0}
+        right={isLandscape && trainInfo.trainNum ? (width / 100) * 40 : 0}
         LoadError={LoadError}
       />
     </View>
diff --git a/components/ActionSheetComponents/EachTrainInfoCore.js b/components/ActionSheetComponents/EachTrainInfoCore.js
index a7eb209..756c047 100644
--- a/components/ActionSheetComponents/EachTrainInfoCore.js
+++ b/components/ActionSheetComponents/EachTrainInfoCore.js
@@ -113,6 +113,9 @@ export const EachTrainInfoCore = ({
   useEffect(() => {
     if (!data.trainNum) return;
     const TD = trainList[data.trainNum];
+    setIsConcatNear(false);
+    setHeadStation();
+    setTailStation();
     if (!TD) {
       const specialTrainActualID = searchSpecialTrain(data.trainNum, trainList);
       setTrueTrainID(specialTrainActualID || undefined);
@@ -129,14 +132,22 @@ export const EachTrainInfoCore = ({
     setShowNearTrain(TDArray);
     if (trainData.length == 0) return;
     if (TDArray.length == 0) return;
+    let head;
+    let tail;
     TDArray.forEach((d) => {
       const [station, se, time] = d.split(",");
 
-      if (station == trainData[0].split(",")[0])
-        setHeadStation(trainData[0].split(",")[0]);
-      if (station == trainData[trainData.length - 1].split(",")[0])
-        setTailStation(trainData[trainData.length - 1].split(",")[0]);
+      if (station == trainData[0].split(",")[0]) {
+        head = trainData[0].split(",")[0];
+      }
+      if (station == trainData[trainData.length - 1].split(",")[0]) {
+        tail = trainData[trainData.length - 1].split(",")[0];
+      }
     });
+    if (head) setHeadStation(head);
+    else setHeadStation();
+    if (tail) setTailStation(tail);
+    else setTailStation();
   }, [trainData, data]);
 
   useEffect(() => {