trainDiagramをmenuトップに移動、HeaderConfigを分離統合、バグ修正

This commit is contained in:
harukin-OneMix4
2023-07-06 02:38:42 +09:00
parent 52b15288b9
commit 1b16e09633
5 changed files with 40 additions and 40 deletions

23
menu.js
View File

@@ -25,6 +25,8 @@ import {
} from "@expo/vector-icons";
import LottieView from "lottie-react-native";
import { StationDeteilView } from "./components/ActionSheetComponents/StationDeteilView";
import { parseAllTrainDiagram } from "./lib/parseAllTrainDiagram";
import trainList from "./assets/originData/trainList";
import LED_vision from "./components/発車時刻表/LED_vidion";
import Sign from "./components/駅名表/Sign";
@@ -36,6 +38,7 @@ import { getStationList, lineList } from "./lib/getStationList";
import { JRSTraInfo } from "./components/ActionSheetComponents/JRSTraInfo";
import { EachTrainInfo } from "./components/ActionSheetComponents/EachTrainInfo";
import useInterval from "./lib/useInterval";
import { HeaderConfig } from "./lib/HeaderConfig";
export default function Menu(props) {
const {
@@ -150,6 +153,25 @@ export default function Menu(props) {
}
}, [selectedCurrentStation]);
//全列車ダイヤリストを作成するuseEffect
const [trainDiagram, setTrainDiagram] = useState(null); // 全列車のダイヤを列番ベースで整理
useEffect(() => {
//全列車リストを生成する副作用[無条件初回実行]
fetch(
"https://train.jr-shikoku.co.jp/g?arg1=station&arg2=traintimeinfo&arg3=dia",
HeaderConfig
)
.then((response) => response.text())
.then((d) => {
if (d.indexOf("<title>404 Not Found</title>") != -1) throw Error;
setTrainDiagram(parseAllTrainDiagram(d));
})
.catch((d) => {
console.log("fallback");
setTrainDiagram(trainList);
});
}, []);
const openStationACFromEachTrainInfo = (stationName) => {
// EachTrainInfoAsSR.current?.hide();
// const findStationEachLine = (selectLine) => {
@@ -226,6 +248,7 @@ export default function Menu(props) {
navigate={navigate}
setTrainInfo={setTrainInfo}
EachTrainInfoAsSR={EachTrainInfoAsSR}
trainDiagram={trainDiagram}
/>
)}
<JRSTraInfoBox