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 ? ( - {isLandscape && trainInfo.trainData && ( + {isLandscape && trainInfo.trainNum && ( )} - {isLandscape && trainInfo.trainData && ( + {isLandscape && trainInfo.trainNum && ( { LayoutAnimation.easeInEaseOut(); @@ -390,7 +390,7 @@ export default function Apps({ navigation, webview, stationData }) { 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} /> 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(() => {