diff --git a/App.js b/App.js index bee5a0d..8a4557c 100644 --- a/App.js +++ b/App.js @@ -110,6 +110,18 @@ function menuPage() { }} /> + ); } diff --git a/Apps.js b/Apps.js index 1d5855e..6f8e9c5 100644 --- a/Apps.js +++ b/Apps.js @@ -109,7 +109,7 @@ export default function Apps(props) { const onMessage = (event) => { if (!event.nativeEvent.data.includes("PopUpMenu")) { - navigate("trainbase", { info: event.nativeEvent.data }); + navigate("trainbase", { info: event.nativeEvent.data, from: "Train" }); return; } if (!originalStationList) { diff --git a/components/発車時刻表/LED_vidion.js b/components/発車時刻表/LED_vidion.js index 723252a..ce30a62 100644 --- a/components/発車時刻表/LED_vidion.js +++ b/components/発車時刻表/LED_vidion.js @@ -1,5 +1,5 @@ import React, { useState, useEffect } from "react"; -import { View, Text } from "react-native"; +import { View, Text, TouchableOpacity } from "react-native"; import { Switch } from "react-native-elements"; import { widthPercentageToDP as wp } from "react-native-responsive-screen"; import { customTrainDataDetector } from "../custom-train-data"; @@ -92,7 +92,6 @@ export default function LED_vision(props) { returnData[key] = trainDiagram[key]; } }); - console.log(returnData); setStationDiagram(returnData); }, [trainDiagram, props.station]); @@ -132,7 +131,6 @@ export default function LED_vision(props) { }); return { train: d, time: a.time, lastStation: a.lastStation }; }); - console.log(returnData); return returnData.sort((a, b) => { switch (true) { case parseInt(a.time.split(":")[0]) < parseInt(b.time.split(":")[0]): @@ -152,7 +150,6 @@ export default function LED_vision(props) { useEffect(() => { //現在の駅に停車する列車から時刻を切り出してLEDベースにフォーマット if (objectIsEmpty(stationDiagram)) return () => {}; - console.log(stationDiagram); const getTimeData = getTime(stationDiagram, props.station); setTrainTimeAndNumber(getTimeData); }, [stationDiagram]); @@ -173,18 +170,7 @@ export default function LED_vision(props) { return false; }; - const getTrainType = (data) => { - switch (data) { - case "Rapid": - return { color: "aqua", name: "快速" }; - case "LTDEXP": - return { color: "red", name: "特急" }; - case "NightLTDEXP": - return { color: "red", name: "寝台特急" }; - case "Normal": - return { color: "white", name: "普通列車" }; - } - }; + const [selectedTrain, setSelectedTrain] = useState([]); useEffect(() => { if (!trainTimeAndNumber) return () => {}; @@ -194,7 +180,7 @@ export default function LED_vision(props) { .filter(timeFiltering) .filter((d) => !!finalSwitch || d.lastStation != "当駅止"); setSelectedTrain(data); - }, [trainTimeAndNumber, currentTrain]); + }, [trainTimeAndNumber, currentTrain, finalSwitch]); return ( ))}