From 577e793af9398c72bc06fb6e57e4a28c239b055f Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Thu, 10 Apr 2025 18:40:04 +0000 Subject: [PATCH] =?UTF-8?q?getStationList=E3=81=AE=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EachTrainInfo/TrainDataView.js | 2 +- .../EachTrainInfoCore.js | 3 +- .../TrainMenuLineSelector.js | 9 ++-- components/Apps/WebView.jsx | 3 +- components/trainMenu.js | 3 +- components/trainMenu.web.js | 3 +- .../LED_inside_Component/TrainPosition.tsx | 1 - lib/checkDuplicateTrainData.ts | 3 +- lib/getStationList.ts | 35 ++++++++++++++ lib/getStationList2.ts | 46 ------------------- stateBox/useStationList.tsx | 3 +- stateBox/useTrainMenu.js | 2 +- 12 files changed, 47 insertions(+), 66 deletions(-) delete mode 100644 lib/getStationList2.ts diff --git a/components/ActionSheetComponents/EachTrainInfo/TrainDataView.js b/components/ActionSheetComponents/EachTrainInfo/TrainDataView.js index 36c685c..120af56 100644 --- a/components/ActionSheetComponents/EachTrainInfo/TrainDataView.js +++ b/components/ActionSheetComponents/EachTrainInfo/TrainDataView.js @@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react"; import { View, TouchableOpacity, useWindowDimensions } from "react-native"; import { StateBox } from "./StateBox"; import { useDeviceOrientationChange } from "../../../stateBox/useDeviceOrientationChange"; -import { getStationList2 } from "../../../lib/getStationList2"; +import { getStationList2 } from "../../../lib/getStationList"; import { useCurrentTrain } from "../../../stateBox/useCurrentTrain"; import { SheetManager } from "react-native-actions-sheet"; import { trainPosition } from "../../../lib/trainPositionTextArray"; diff --git a/components/ActionSheetComponents/EachTrainInfoCore.js b/components/ActionSheetComponents/EachTrainInfoCore.js index 31e8e3a..c419bb7 100644 --- a/components/ActionSheetComponents/EachTrainInfoCore.js +++ b/components/ActionSheetComponents/EachTrainInfoCore.js @@ -12,7 +12,7 @@ import { import { SheetManager } from "react-native-actions-sheet"; import { useScrollHandlers } from "react-native-actions-sheet"; import { AS } from "../../storageControl"; -import { lineListPair } from "../../lib/getStationList"; +import { lineListPair, stationIDPair } from "../../lib/getStationList"; import { useCurrentTrain } from "../../stateBox/useCurrentTrain"; import { checkDuplicateTrainData } from "../../lib/checkDuplicateTrainData"; import { getTrainType } from "../../lib/getTrainType"; @@ -33,7 +33,6 @@ import { ShowSpecialTrain } from "./EachTrainInfo/ShowSpecialTrain"; import { useTrainMenu } from "../../stateBox/useTrainMenu"; import { HeaderText } from "./EachTrainInfoCore/HeaderText"; import { useStationList } from "../../stateBox/useStationList"; -import { stationIDPair } from "../../lib/getStationList2"; import { useAllTrainDiagram } from "@/stateBox/useAllTrainDiagram"; export const EachTrainInfoCore = ({ diff --git a/components/ActionSheetComponents/TrainMenuLineSelector.js b/components/ActionSheetComponents/TrainMenuLineSelector.js index 5b45c5b..9d2541f 100644 --- a/components/ActionSheetComponents/TrainMenuLineSelector.js +++ b/components/ActionSheetComponents/TrainMenuLineSelector.js @@ -11,8 +11,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context"; import { useTrainMenu } from "../../stateBox/useTrainMenu"; import { useCurrentTrain } from "../../stateBox/useCurrentTrain"; import lineColorList from "../../assets/originData/lineColorList"; -import { stationIDPair } from "../../lib/getStationList2"; -import { lineListPair } from "../../lib/getStationList"; +import { stationIDPair, lineListPair } from "../../lib/getStationList"; export const TrainMenuLineSelector = () => { const { @@ -20,7 +19,7 @@ export const TrainMenuLineSelector = () => { setSelectedLine, mapsStationData: stationData, } = useTrainMenu(); - const { webview } = useCurrentTrain(); + const { webview } = useCurrentTrain(); const actionSheetRef = useRef(null); const insets = useSafeAreaInsets(); const platformIs = Platform.OS == "android"; @@ -55,7 +54,7 @@ export const TrainMenuLineSelector = () => { onPress={() => { SheetManager.hide("TrainMenuLineSelector"); const s = selectedLine == d ? undefined : d; - if(!s) return; + if (!s) return; setSelectedLine(s); Object.keys(stationData).forEach((data, indexBase) => { stationData[data].forEach((D, index) => { @@ -66,7 +65,7 @@ export const TrainMenuLineSelector = () => { "" ).split(","); if (latlng.length == 0) return null; - if (index == 0 ) { + if (index == 0) { webview.current ?.injectJavaScript(`MoveDisplayStation('${data}_${D.MyStation}_${D.Station_JP}'); document.getElementById("disp").insertAdjacentHTML("afterbegin", "
");`); diff --git a/components/Apps/WebView.jsx b/components/Apps/WebView.jsx index 468bd48..28e19dc 100644 --- a/components/Apps/WebView.jsx +++ b/components/Apps/WebView.jsx @@ -2,7 +2,7 @@ import React from "react"; import { Platform, LayoutAnimation } from "react-native"; import { WebView } from "react-native-webview"; -import { lineList } from "../../lib/getStationList"; +import { lineList, stationNamePair } from "../../lib/getStationList"; import { checkDuplicateTrainData } from "../../lib/checkDuplicateTrainData"; import { useFavoriteStation } from "../../stateBox/useFavoriteStation"; import { useCurrentTrain } from "../../stateBox/useCurrentTrain"; @@ -11,7 +11,6 @@ import { SheetManager } from "react-native-actions-sheet"; import { useNavigation } from "@react-navigation/native"; import { useTrainMenu } from "../../stateBox/useTrainMenu"; -import { stationNamePair } from "../../lib/getStationList2"; import { useStationList } from "../../stateBox/useStationList"; export const AppsWebView = ({ openStationACFromEachTrainInfo }) => { const { webview, currentTrain } = useCurrentTrain(); diff --git a/components/trainMenu.js b/components/trainMenu.js index 954a5cd..fa05fed 100644 --- a/components/trainMenu.js +++ b/components/trainMenu.js @@ -4,8 +4,7 @@ import MapView from "react-native-maps"; import { useCurrentTrain } from "../stateBox/useCurrentTrain"; import { useNavigation } from "@react-navigation/native"; import lineColorList from "../assets/originData/lineColorList"; -import { stationIDPair } from "../lib/getStationList2"; -import { lineListPair } from "../lib/getStationList"; +import { lineListPair, stationIDPair } from "../lib/getStationList"; import { SheetManager } from "react-native-actions-sheet"; import { useTrainMenu } from "../stateBox/useTrainMenu"; import { MapPin } from "./TrainMenu/MapPin"; diff --git a/components/trainMenu.web.js b/components/trainMenu.web.js index 0835101..47372cd 100644 --- a/components/trainMenu.web.js +++ b/components/trainMenu.web.js @@ -4,8 +4,7 @@ import { View, Text, TouchableOpacity, Linking } from "react-native"; import { useCurrentTrain } from "../stateBox/useCurrentTrain"; import { useNavigation } from "@react-navigation/native"; import lineColorList from "../assets/originData/lineColorList"; -import { stationIDPair } from "../lib/getStationList2"; -import { lineListPair } from "../lib/getStationList"; +import { lineListPair, stationIDPair } from "../lib/getStationList"; import { SheetManager } from "react-native-actions-sheet"; import { useTrainMenu } from "../stateBox/useTrainMenu"; //import { MapPin } from "./TrainMenu/MapPin"; diff --git a/components/発車時刻表/LED_inside_Component/TrainPosition.tsx b/components/発車時刻表/LED_inside_Component/TrainPosition.tsx index e53e8ef..5f830a0 100644 --- a/components/発車時刻表/LED_inside_Component/TrainPosition.tsx +++ b/components/発車時刻表/LED_inside_Component/TrainPosition.tsx @@ -5,7 +5,6 @@ import { trainDataType, trainPosition, } from "../../../lib/trainPositionTextArray"; -import { lineList } from "../../../lib/getStationList"; import { getStationID } from "../../../lib/eachTrainInfoCoreLib/getStationData"; import { useCurrentTrain } from "../../../stateBox/useCurrentTrain"; diff --git a/lib/checkDuplicateTrainData.ts b/lib/checkDuplicateTrainData.ts index 3e2e3b5..8a1c33a 100644 --- a/lib/checkDuplicateTrainData.ts +++ b/lib/checkDuplicateTrainData.ts @@ -1,6 +1,5 @@ import { trainDataType } from "./trainPositionTextArray"; -import { getStationID } from "./eachTrainInfoCoreLib/getStationData"; -import { stationIDPair } from "../lib/getStationList2"; +import { stationIDPair } from "../lib/getStationList"; export const checkDuplicateTrainData = ( currentTrainArray: trainDataType[], diff --git a/lib/getStationList.ts b/lib/getStationList.ts index 76a3bf5..1a851f3 100644 --- a/lib/getStationList.ts +++ b/lib/getStationList.ts @@ -40,6 +40,41 @@ export const lineListPair = { N: "鳴門線(池谷-鳴門間)[N]", M: "瀬戸大橋線(児島-宇多津間)[M]", }; +export const getStationList2 = async () => { + return { + yosan, + uwajima, + uwajima2, + dosan, + dosan2, + koutoku, + tokushima, + naruto, + seto, + }; +}; +export const stationIDPair = { + yosan: "Y", + uwajima: "U", + uwajima2: "S", + dosan: "D", + dosan2: "K", + koutoku: "T", + tokushima: "B", + naruto: "N", + seto: "M", +}; +export const stationNamePair = { + "予讃線(高松 - 松山)": "yosan", + "予讃線・内子線(松山 - 内子 - 宇和島)": "uwajima", + "予讃線・伊予灘線(向井原 - 伊予大洲)": "uwajima2", + "土讃線(多度津 - 高知)": "dosan", + "土讃線(高知 - 窪川)": "dosan2", + "高徳線(高松 - 徳島)": "koutoku", + "徳島線(徳島 - 阿波池田)": "tokushima", + "鳴門線(池谷 - 鳴門)": "naruto", + "瀬戸大橋線(児島 - 宇多津)": "seto", +}; export const getStationList = async () => { if (status) return status; diff --git a/lib/getStationList2.ts b/lib/getStationList2.ts deleted file mode 100644 index 6d5bb5c..0000000 --- a/lib/getStationList2.ts +++ /dev/null @@ -1,46 +0,0 @@ -import yosan from "../assets/originData/yosan"; -import uwajima from "../assets/originData/uwajima"; -import uwajima2 from "../assets/originData/uwajima2"; -import dosan from "../assets/originData/dosan"; -import dosan2 from "../assets/originData/dosan2"; -import koutoku from "../assets/originData/koutoku"; -import tokushima from "../assets/originData/tokushima"; -import naruto from "../assets/originData/naruto"; -import seto from "../assets/originData/seto"; -export const getStationList2 = async () => { - return { - yosan, - uwajima, - uwajima2, - dosan, - dosan2, - koutoku, - tokushima, - naruto, - seto, - }; -}; - -export const stationIDPair = { - yosan: "Y", - uwajima: "U", - uwajima2: "S", - dosan: "D", - dosan2: "K", - koutoku: "T", - tokushima: "B", - naruto: "N", - seto: "M", -}; - -export const stationNamePair = { - "予讃線(高松 - 松山)": "yosan", - "予讃線・内子線(松山 - 内子 - 宇和島)": "uwajima", - "予讃線・伊予灘線(向井原 - 伊予大洲)": "uwajima2", - "土讃線(多度津 - 高知)": "dosan", - "土讃線(高知 - 窪川)": "dosan2", - "高徳線(高松 - 徳島)": "koutoku", - "徳島線(徳島 - 阿波池田)": "tokushima", - "鳴門線(池谷 - 鳴門)": "naruto", - "瀬戸大橋線(児島 - 宇多津)": "seto", -}; diff --git a/stateBox/useStationList.tsx b/stateBox/useStationList.tsx index c064c12..f718064 100644 --- a/stateBox/useStationList.tsx +++ b/stateBox/useStationList.tsx @@ -5,8 +5,7 @@ import React, { useEffect, FC, } from "react"; -import { getStationList } from "../lib/getStationList"; -import { lineList } from "../lib/getStationList"; +import { lineList, getStationList } from "../lib/getStationList"; type initialStateType = { originalStationList: any[][]; diff --git a/stateBox/useTrainMenu.js b/stateBox/useTrainMenu.js index 8fcf424..cb5925e 100644 --- a/stateBox/useTrainMenu.js +++ b/stateBox/useTrainMenu.js @@ -2,7 +2,7 @@ import React, { createContext, useContext, useState, useEffect } from "react"; import { ASCore } from "../storageControl"; -import { getStationList2 } from "../lib/getStationList2"; +import { getStationList2 } from "../lib/getStationList"; import { injectJavascriptData } from "../lib/webViewInjectjavascript"; const initialState = {