From 0c64f7af4528dbc14d5f91f187ece5d3516210d7 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Sun, 31 Aug 2025 15:43:25 +0000 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BB=8A=E8=B5=B0=E8=A1=8C=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E3=81=B8=E3=81=AE=E3=82=B8=E3=83=A3=E3=83=B3=E3=83=97?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92useCurrentTrain=E3=81=B8=E7=A7=BB?= =?UTF-8?q?=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EachTrainInfoCore.js | 116 +++++------------- .../StationTrainPositionButton.tsx | 16 +-- components/Apps/WebView.jsx | 8 +- stateBox/useCurrentTrain.js | 116 ++++++++++++++++++ 4 files changed, 163 insertions(+), 93 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfoCore.js b/components/ActionSheetComponents/EachTrainInfoCore.js index 710ceee..db31578 100644 --- a/components/ActionSheetComponents/EachTrainInfoCore.js +++ b/components/ActionSheetComponents/EachTrainInfoCore.js @@ -42,7 +42,8 @@ export const EachTrainInfoCore = ({ from, navigate, }) => { - const { currentTrain } = useCurrentTrain(); + const { currentTrain, getCurrentStationData, getPosition } = + useCurrentTrain(); const { originalStationList, stationList } = useStationList(); const { allTrainDiagram: trainList, allCustomTrainData } = useAllTrainDiagram(); @@ -50,13 +51,10 @@ export const EachTrainInfoCore = ({ const [currentTrainData, setCurrentTrainData] = useState(); useEffect(() => { - if (!currentTrain.length) return; - setCurrentTrainData( - checkDuplicateTrainData( - currentTrain.filter((d) => d.num == data.trainNum), - stationList - ) - ); + const stationData = getCurrentStationData(data.trainNum); + if (stationData) { + setCurrentTrainData(stationData); + } }, [currentTrain, data.trainNum]); useEffect(() => { @@ -100,7 +98,7 @@ export const EachTrainInfoCore = ({ useEffect(() => { const stopStationList = trainData.map((i) => { const [station, se, time] = i.split(","); - if(se == "通編") setHaveThrough(true); + if (se == "通編") setHaveThrough(true); return stationList.map((a) => a.filter((d) => d.StationName == station)); }); const allThroughStationList = stopStationList.map((i, index, array) => { @@ -205,7 +203,10 @@ export const EachTrainInfoCore = ({ setHeadStation([]); setTailStation([]); if (!TD) { - const specialTrainActualIDs = searchSpecialTrain(data.trainNum, trainList); + const specialTrainActualIDs = searchSpecialTrain( + data.trainNum, + trainList + ); setTrueTrainID(specialTrainActualIDs || []); setTrainData([]); return; @@ -247,71 +248,8 @@ export const EachTrainInfoCore = ({ }, [trainData, data]); useEffect(() => { - //currentTrainData.Pos = "鴨川～端岡"; //test - if (!currentTrainData) return; - if (!currentTrainData?.Pos) return; - if (currentTrainData?.Pos.match("～")) { - const pos = currentTrainData?.Pos.replace("（下り）", "") - .replace("（上り）", "") - .replace("（徳島線）", "") - .replace("（高徳線）", "") - .split("～"); - const direction = parseInt(currentTrainData?.Direction) || 0; - if (pos[0] == "児島" && pos[1] == "宇多津") { - setCurrentPosition(["M12", "Y09"]); - return; - } else if (pos[1] == "児島" && pos[0] == "宇多津") { - setCurrentPosition(["Y09", "M12"]); - return; - } else if (pos[0] == "伊予若宮" && pos[1] == "伊予白滝") { - setCurrentPosition(["S18", "S14"]); - return; - } else if (pos[0] == "伊予白滝" && pos[1] == "伊予若宮") { - setCurrentPosition(["S14", "S18"]); - return; - } else if (pos[0] == "伊予大洲" && pos[1] == "伊予若宮") { - setCurrentPosition(["U14", "U14"]); - return; - } else if (pos[0] == "伊予若宮" && pos[1] == "伊予大洲") { - setCurrentPosition(["U14", "U14"]); - return; - } - const currentPosID = Object.keys(originalStationList).map((key) => { - let firstStation = false; - let firstStationID = ""; - let secondStation = false; - let secondStationID = ""; - originalStationList[key].forEach((station) => { - if (station.Station_JP === pos[0]) { - firstStation = true; - firstStationID = station.StationNumber; - } - if (station.Station_JP === pos[1]) { - secondStation = true; - secondStationID = station.StationNumber; - } - }); - if (firstStation && secondStation) { - return [firstStationID, secondStationID]; - } else return false; - }); - const currentPos = currentPosID.filter((d) => d != false)[0]; - if (currentPos) { - setCurrentPosition(direction == 0 ? currentPos.reverse() : currentPos); - } else if (direction == 0) { - setCurrentPosition([ - getStationID(pos[1], stationList), - getStationID(pos[0], stationList), - ]); - } else { - setCurrentPosition([ - getStationID(pos[0], stationList), - getStationID(pos[1], stationList), - ]); - } - } else { - setCurrentPosition([getStationID(currentTrainData?.Pos, stationList)]); - } + const position = getPosition(currentTrainData); + if (position) setCurrentPosition(position); }, [currentTrainData]); useEffect(() => { @@ -393,7 +331,12 @@ export const EachTrainInfoCore = ({ containerProps={{ style: { maxHeight: isLandscape ? height - 94 : (height / 100) * 70, - backgroundColor:getTrainType(customTrainDataDetector(data.trainNum, allCustomTrainData).type).data === "notService" ? "#777777ff" :"white" + backgroundColor: + getTrainType( + customTrainDataDetector(data.trainNum, allCustomTrainData).type + ).data === "notService" + ? "#777777ff" + : "white", }, }} shortHeader={ @@ -424,7 +367,13 @@ export const EachTrainInfoCore = ({ /> } > - {getTrainType(customTrainDataDetector(data.trainNum, allCustomTrainData).type).data === "notService" &&この列車には乗車できません。} + {getTrainType( + customTrainDataDetector(data.trainNum, allCustomTrainData).type + ).data === "notService" && ( + + この列車には乗車できません。 + + )} {headStation.length != 0 && headStation.map((i, index) => showHeadStation.findIndex((d) => d == index) == -1 ? ( @@ -473,10 +422,11 @@ export const EachTrainInfoCore = ({ borderWidth: 1, margin: 10, borderRadius: 5, - alignItems: "center", backgroundColor:"#ffffffc2" + alignItems: "center", + backgroundColor: "#ffffffc2", }} > - + Twitterで検索 @@ -494,12 +444,14 @@ export const EachTrainInfoCore = ({ currentTrainData, openStationACFromEachTrainInfo, showThrew, - key: i + "-stop" }} + key={i + "-stop"} /> ) )} - 時刻が斜体,青色になっている時刻はコミュニティで追加されている独自データです。 + + 時刻が斜体,青色になっている時刻はコミュニティで追加されている独自データです。 + {tailStation.length != 0 && tailStation.map(({ station, dia }, index) => showTailStation.findIndex((d) => d == index) == -1 ? ( @@ -540,7 +492,7 @@ export const EachTrainInfoCore = ({ flexDirection: "row", borderBottomWidth: 1, borderBottomColor: "#f0f0f0", - backgroundColor:"#ffffffc2", + backgroundColor: "#ffffffc2", flex: 1, }} > diff --git a/components/ActionSheetComponents/StationDeteilView/StationTrainPositionButton.tsx b/components/ActionSheetComponents/StationDeteilView/StationTrainPositionButton.tsx index dcc0a84..dfe3d5a 100644 --- a/components/ActionSheetComponents/StationDeteilView/StationTrainPositionButton.tsx +++ b/components/ActionSheetComponents/StationDeteilView/StationTrainPositionButton.tsx @@ -1,6 +1,5 @@ import { FC } from "react"; import { TouchableOpacity, View, Text, Linking } from "react-native"; -import { useStationList } from "@/stateBox/useStationList"; import { useCurrentTrain } from "@/stateBox/useCurrentTrain"; import AntDesign from "react-native-vector-icons/AntDesign"; type Props = { @@ -10,10 +9,7 @@ type Props = { }; export const StationTrainPositionButton: FC = (props) => { const { stationNumber, onExit, navigate } = props; - const { - inject, - } = useCurrentTrain(); - const { getInjectJavascriptAddress } = useStationList(); + const { setInjectData } = useCurrentTrain(); return ( = (props) => { alignContent: "center", alignItems: "center", margin: 2, - flex: 1 + flex: 1, + }} + onLongPress={() => { + navigate("positions", { screen: "Apps" }); + setInjectData({ type: "station", stationNumber, fixed: true }); + onExit(); }} onPress={() => { navigate("positions", { screen: "Apps" }); - const script = getInjectJavascriptAddress(stationNumber); - inject(script); + setInjectData({ type: "station", stationNumber, fixed: false }); onExit(); }} > diff --git a/components/Apps/WebView.jsx b/components/Apps/WebView.jsx index 9cd2c11..92aceb5 100644 --- a/components/Apps/WebView.jsx +++ b/components/Apps/WebView.jsx @@ -23,7 +23,8 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => { const { navigate } = useNavigation(); const { favoriteStation } = useFavoriteStation(); const { isLandscape } = useDeviceOrientationChange(); - const { originalStationList, stationList, getInjectJavascriptAddress } = useStationList(); + const { originalStationList, stationList, getInjectJavascriptAddress } = + useStationList(); const { setSelectedLine, mapsStationData: stationData, @@ -51,7 +52,6 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => { break; } }; - const onMessage = (event) => { const { data } = event.nativeEvent; /** @@ -137,7 +137,9 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => { if (!stationData) return () => {}; if (!originalStationList) return () => {}; if (favoriteStation.length < 1) return () => {}; - const string = getInjectJavascriptAddress(favoriteStation[0][0].StationNumber); + const string = getInjectJavascriptAddress( + favoriteStation[0][0].StationNumber + ); if (!string) return () => {}; webview?.current.injectJavaScript(string); once = true; diff --git a/stateBox/useCurrentTrain.js b/stateBox/useCurrentTrain.js index d5f7cef..96b3899 100644 --- a/stateBox/useCurrentTrain.js +++ b/stateBox/useCurrentTrain.js @@ -8,6 +8,9 @@ import React, { import { HeaderConfig } from "../lib/HeaderConfig"; import useInterval from "../lib/useInterval"; +import { useStationList } from "./useStationList"; +import { checkDuplicateTrainData } from "@/lib/checkDuplicateTrainData"; +import { getStationID } from "@/lib/eachTrainInfoCoreLib/getStationData"; const initialState = { webview: {}, currentTrain: [], @@ -16,6 +19,11 @@ const initialState = { setCurrentTrainLoading: () => {}, getCurrentTrain: () => {}, inject: (i) => {}, + fixedPosition: null, + setFixedPosition: () => {}, + setInjectData: (e) => {}, + getCurrentStationData: (e) => {}, + getPosition: (e) => {}, }; const CurrentTrainContext = createContext(initialState); @@ -27,6 +35,111 @@ export const useCurrentTrain = () => { export const CurrentTrainProvider = ({ children }) => { const [currentTrain, setCurrentTrain] = useState([]); //現在在線中の全列車 { num: 列車番号, delay: 遅延時分(状態), Pos: 位置情報 } const [currentTrainLoading, setCurrentTrainLoading] = useState("loading"); // success, error, loading + + const { getInjectJavascriptAddress, stationList, originalStationList } = + useStationList(); + + const [fixedPosition, setFixedPosition] = useState(null); + const [_, setIntervalState] = useInterval( + () => { + if (!webview.current) return; + inject(fixedPosition); + }, + 60000, + false + ); + useEffect(() => { + if (fixedPosition) { + setIntervalState.start(); + } else { + setIntervalState.stop(); + } + }, [fixedPosition]); + const getPosition = (currentTrainData) => { + console.log(currentTrainData); + //currentTrainData.Pos = "鴨川～端岡"; //test + if (!currentTrainData) return; + if (!currentTrainData?.Pos) return; + if (currentTrainData?.Pos.match("～")) { + const pos = currentTrainData?.Pos.replace("（下り）", "") + .replace("（上り）", "") + .replace("（徳島線）", "") + .replace("（高徳線）", "") + .split("～"); + const direction = parseInt(currentTrainData?.Direction) || 0; + if (pos[0] == "児島" && pos[1] == "宇多津") { + return ["M12", "Y09"]; + } else if (pos[1] == "児島" && pos[0] == "宇多津") { + return ["Y09", "M12"]; + } else if (pos[0] == "伊予若宮" && pos[1] == "伊予白滝") { + return ["S18", "S14"]; + } else if (pos[0] == "伊予白滝" && pos[1] == "伊予若宮") { + return ["S14", "S18"]; + } else if (pos[0] == "伊予大洲" && pos[1] == "伊予若宮") { + return ["U14", "U14"]; + } else if (pos[0] == "伊予若宮" && pos[1] == "伊予大洲") { + return ["U14", "U14"]; + } + const currentPosID = Object.keys(originalStationList).map((key) => { + let firstStation = false; + let firstStationID = ""; + let secondStation = false; + let secondStationID = ""; + originalStationList[key].forEach((station) => { + if (station.Station_JP === pos[0]) { + firstStation = true; + firstStationID = station.StationNumber; + } + if (station.Station_JP === pos[1]) { + secondStation = true; + secondStationID = station.StationNumber; + } + }); + if (firstStation && secondStation) { + return [firstStationID, secondStationID]; + } else return false; + }); + const currentPos = currentPosID.filter((d) => d != false)[0]; + if (currentPos) { + return direction == 0 ? currentPos.reverse() : currentPos; + } else if (direction == 0) { + return [ + getStationID(pos[1], stationList), + getStationID(pos[0], stationList), + ]; + } else { + return [ + getStationID(pos[0], stationList), + getStationID(pos[1], stationList), + ]; + } + } else { + return [getStationID(currentTrainData?.Pos, stationList)]; + } + }; + const setInjectData = ({ type, number, fixed }) => { + if (type === "station") { + const script = getInjectJavascriptAddress(number); + inject(script); + if (fixed) { + setFixedPosition(script); + } + } else if (type === "station") { + const script = getInjectJavascriptAddress(number); + inject(script); + if (fixed) { + setFixedPosition(script); + } + } + }; + const getCurrentStationData = (e) => { + //e:trainNumber + if (!currentTrain.length) return; + return checkDuplicateTrainData( + currentTrain.filter((d) => d.num == e), + stationList + ); + }; const getCurrentTrain = () => { fetch("https://n8n.haruk.in/webhook/c501550c-7d1b-4e50-927b-4429fe18931a") .then((response) => response.json()) @@ -88,6 +201,9 @@ export const CurrentTrainProvider = ({ children }) => { setCurrentTrainLoading, getCurrentTrain, inject, + setInjectData, + getCurrentStationData, + getPosition, }} > {children}