From 35907df3c4ea9e04ba5d60a7e3b1da87d7589295 Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Tue, 27 Jun 2023 12:58:00 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BB=AE=E8=A1=A8=E7=A4=BA=E6=A9=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionSheetComponents/EachTrainInfo.js | 30 +++++++++------- components/custom-train-data.js | 35 +++++++++++++++++++ lib/webViewInjectjavascript.js | 7 ++-- 3 files changed, 58 insertions(+), 14 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index c3dd567..e656edd 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import { View, LayoutAnimation, @@ -10,9 +10,21 @@ import { import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; import ActionSheet from "react-native-actions-sheet"; import LottieView from "lottie-react-native"; +import trainList from "../../assets/originData/trainList"; export const EachTrainInfo = (props) => { const { setRef, data } = props; console.log(data); + const [trainData, setTrainData] = useState([]); + useEffect(() => { + if (!data.trainNum) return; + const TD = trainList[data.trainNum]; + if (!TD) { + setTrainData([]); + return; + } + console.log(TD); + setTrainData(TD.split("#")); + }, [data]); return ( }> { }} > - - ほげほげふがふが + ほげほげふがふが */} + {trainData.map((i, index) => { + return {i}; + })} - - - - 列車遅延情報EXについて - - - 列車遅延情報をJR四国公式列車運行情報より5分毎に取得します。Twitterにて投稿している内容と同一のものとなります。 - - diff --git a/components/custom-train-data.js b/components/custom-train-data.js index 3a52d4b..731f4a8 100644 --- a/components/custom-train-data.js +++ b/components/custom-train-data.js @@ -619,3 +619,38 @@ export const customTrainDataDetector = (TrainNumber) => { break; } }; +export const getJRF = (num) => { + switch (num) { + case "71": + return "東京(タ)→高松(タ)\\n"; + case "73": + case "75": + return "大阪(タ)→高松(タ)\\n"; + case "3079": + return "高松(タ)→伊予三島\\n"; + case "3071": + case "3077": + return "高松(タ)→新居浜\\n"; + case "3073": + return "高松(タ)→松山貨物\\n"; + case "70": + return "高松(タ)→東京(タ)\\n"; + case "74": + case "76": + return "高松(タ)→大阪(タ)\\n"; + case "3078": + return "伊予三島→高松(タ)\\n"; + case "3070": + return "新居浜→高松(タ)\\n"; + case "3076": + return "新居浜→高松(タ)\\n"; + case "3072": + return "松山貨物→高松(タ)\\n"; + case "9070": + return "臨時貨物\\n"; + default: + JRF = true; + return null; + } +}; +console.log(getJRF); diff --git a/lib/webViewInjectjavascript.js b/lib/webViewInjectjavascript.js index d1018d8..e4fbd18 100644 --- a/lib/webViewInjectjavascript.js +++ b/lib/webViewInjectjavascript.js @@ -1,3 +1,5 @@ +import { getJRF } from "../components/custom-train-data"; + export const injectJavascriptData = ( mapSwitch, iconSetting, @@ -498,7 +500,7 @@ export const injectJavascriptData = ( const JRF_name = ` let JRF = false; -const getJRF = num =>{ + const getJRF = num =>{ switch(num){ case "71": return "東京(タ)→高松(タ)"+"\\n"; @@ -532,7 +534,8 @@ const getJRF = num =>{ return null; } } -行き先情報.innerText = getJRF(列番データ)+行き先情報.innerText; +const data = getJRF(列番データ); +行き先情報.innerText = data != null ? data+行き先情報.innerText : 行き先情報.innerText; ` + JRF_icon;