コード修正
This commit is contained in:
parent
1a2d678ef3
commit
c9af861e71
@ -1,4 +1,4 @@
|
|||||||
import React, { useEffect, useMemo, useRef, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import {
|
import {
|
||||||
View,
|
View,
|
||||||
Text,
|
Text,
|
||||||
@ -28,8 +28,6 @@ import { ShortHeader } from "./EachTrainInfo/ShortHeader";
|
|||||||
import { ScrollStickyContent } from "./EachTrainInfo/ScrollStickyContent";
|
import { ScrollStickyContent } from "./EachTrainInfo/ScrollStickyContent";
|
||||||
import { getStationID } from "../../lib/eachTrainInfoCoreLib/getStationData";
|
import { getStationID } from "../../lib/eachTrainInfoCoreLib/getStationData";
|
||||||
import { findReversalPoints } from "../../lib/eachTrainInfoCoreLib/findReversalPoints";
|
import { findReversalPoints } from "../../lib/eachTrainInfoCoreLib/findReversalPoints";
|
||||||
import { migrateTrainName } from "../../lib/eachTrainInfoCoreLib/migrateTrainName";
|
|
||||||
import { getType } from "../../lib/eachTrainInfoCoreLib/getType";
|
|
||||||
import { searchSpecialTrain } from "../../lib/eachTrainInfoCoreLib/searchSpecialTrain";
|
import { searchSpecialTrain } from "../../lib/eachTrainInfoCoreLib/searchSpecialTrain";
|
||||||
import { openBackTrainInfo } from "../../lib/eachTrainInfoCoreLib/openBackTrainInfo";
|
import { openBackTrainInfo } from "../../lib/eachTrainInfoCoreLib/openBackTrainInfo";
|
||||||
import { ShowSpecialTrain } from "./EachTrainInfo/ShowSpecialTrain";
|
import { ShowSpecialTrain } from "./EachTrainInfo/ShowSpecialTrain";
|
||||||
@ -45,14 +43,11 @@ export const EachTrainInfoCore = ({
|
|||||||
from,
|
from,
|
||||||
navigate,
|
navigate,
|
||||||
}) => {
|
}) => {
|
||||||
// const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false);
|
|
||||||
const { currentTrain } = useCurrentTrain();
|
const { currentTrain } = useCurrentTrain();
|
||||||
const { originalStationList, stationList } = useStationList();
|
const { originalStationList, stationList } = useStationList();
|
||||||
const { setTrainInfo } = useTrainMenu();
|
const { setTrainInfo } = useTrainMenu();
|
||||||
const [currentTrainData, setCurrentTrainData] = useState();
|
const [currentTrainData, setCurrentTrainData] = useState();
|
||||||
|
|
||||||
// const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!currentTrain.length) return;
|
if (!currentTrain.length) return;
|
||||||
setCurrentTrainData(
|
setCurrentTrainData(
|
||||||
@ -196,29 +191,6 @@ export const EachTrainInfoCore = ({
|
|||||||
}
|
}
|
||||||
setIsJumped(true);
|
setIsJumped(true);
|
||||||
}, [points]);
|
}, [points]);
|
||||||
const trainName = useMemo(() => {
|
|
||||||
if (!data.limited) return "";
|
|
||||||
const limitedArray = data.limited.split(":");
|
|
||||||
const type = getType(limitedArray[0]);
|
|
||||||
|
|
||||||
switch (true) {
|
|
||||||
case !!limitedArray[1]:
|
|
||||||
// 特急の場合は、列車名を取得
|
|
||||||
return type + migrateTrainName(limitedArray[1]);
|
|
||||||
case trainData.length == 0:
|
|
||||||
// 特急以外の場合は、列車番号を取得
|
|
||||||
return type;
|
|
||||||
default:
|
|
||||||
// 行先がある場合は、行先を取得
|
|
||||||
return (
|
|
||||||
type +
|
|
||||||
migrateTrainName(
|
|
||||||
trainData[trainData.length - 1].split(",")[0] + "行き"
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}, [data.limited, trainData]);
|
|
||||||
|
|
||||||
const { height } = useWindowDimensions();
|
const { height } = useWindowDimensions();
|
||||||
const { isLandscape } = useDeviceOrientationChange();
|
const { isLandscape } = useDeviceOrientationChange();
|
||||||
const scrollHandlers = actionSheetRef
|
const scrollHandlers = actionSheetRef
|
||||||
@ -326,8 +298,7 @@ export const EachTrainInfoCore = ({
|
|||||||
});
|
});
|
||||||
const currentPos = currentPosID.filter((d) => d != false)[0];
|
const currentPos = currentPosID.filter((d) => d != false)[0];
|
||||||
if (currentPos) {
|
if (currentPos) {
|
||||||
if (direction == 0) setCurrentPosition(currentPos.reverse());
|
setCurrentPosition(direction == 0 ? currentPos.reverse() : currentPos);
|
||||||
else setCurrentPosition(currentPos);
|
|
||||||
} else if (direction == 0) {
|
} else if (direction == 0) {
|
||||||
setCurrentPosition([
|
setCurrentPosition([
|
||||||
getStationID(pos[1], stationList),
|
getStationID(pos[1], stationList),
|
||||||
|
@ -32,9 +32,9 @@ export const StationDeteilView = (props) => {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!currentStation) return () => {};
|
if (!currentStation) return () => {};
|
||||||
const data = busAndTrainData.filter((d) => {
|
const data = busAndTrainData.filter((d) =>
|
||||||
return d.name === currentStation[0].Station_JP;
|
d.name === currentStation[0].Station_JP
|
||||||
});
|
);
|
||||||
if (data.length == 0) {
|
if (data.length == 0) {
|
||||||
setTrainBus();
|
setTrainBus();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user