diff --git a/Top.js b/Top.js index f2d6877..ff94cf1 100644 --- a/Top.js +++ b/Top.js @@ -32,20 +32,12 @@ export const Top = () => { const goToTrainMenu = () => { if (Platform.OS === "web") { Linking.openURL("https://train.jr-shikoku.co.jp/"); - setTimeout(() => { - navigate("topMenu", { screen: "menu" }); - }, 100); - + setTimeout(() => navigate("topMenu", { screen: "menu" }), 100); return; } - if (!isFocused()) { - navigate("positions", { screen: "Apps" }); - } - if (mapSwitch == "true") { - navigate("positions", { screen: "trainMenu" }); - } else { - webview.current?.injectJavaScript(`AccordionClassEvent()`); - } + if (!isFocused()) navigate("positions", { screen: "Apps" }); + else if (mapSwitch == "true") navigate("positions", { screen: "trainMenu" }); + else webview.current?.injectJavaScript(`AccordionClassEvent()`); return; }; diff --git a/assets/originData/trainList.ts b/assets/originData/trainList.ts index 75ca791..da6e20f 100644 --- a/assets/originData/trainList.ts +++ b/assets/originData/trainList.ts @@ -923,7 +923,7 @@ "585D":"徳島,発,22:55#阿波富田,発,22:58#二軒屋,発,23:01#文化の森,発,23:03#地蔵橋,発,23:07#中田,発,23:11#南小松島,発,23:15#阿波赤石,発,23:19#立江,発,23:22#羽ノ浦,発,23:26#西原,発,23:29#阿波中島,発,23:32#阿南,着,23:36#", // 臨時列車 -"9395D":"WEST LIVE TOUR 2025臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#高松,発,22:10#昭和町,発,22:12#栗林公園北口,発,22:15#栗林,発,22:18#木太町,発,22:22#屋島,発,22:26#古高松南,発,22:38#八栗口,発,22:41#讃岐牟礼,発,22:44#志度,発,22:48#オレンジタウン,発,22:52#造田,発,22:56#神前,発,22:59#讃岐津田,発,23:05#鶴羽,発,23:09#丹生,発,23:14#三本松,着,23:18#", -"9174M":"WEST LIVE TOUR 2025臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#高松,発,22:00#坂出,発,22:16#児島,発,22:39#茶屋町,発,22:55#早島,発,22:59#妹尾,発,23:03#岡山,着,23:12#", +"9395D":"RIZIN.50 香川大会臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250330_rizin-50-kagawa.pdf#高松,発,22:10#昭和町,発,22:12#栗林公園北口,発,22:15#栗林,発,22:18#木太町,発,22:22#屋島,発,22:26#古高松南,発,22:38#八栗口,発,22:41#讃岐牟礼,発,22:44#志度,発,22:48#オレンジタウン,発,22:52#造田,発,22:56#神前,発,22:59#讃岐津田,発,23:05#鶴羽,発,23:09#丹生,発,23:14#三本松,着,23:18#", +"9174M":"RIZIN.50 香川大会臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250330_rizin-50-kagawa.pdf#高松,発,22:00#坂出,発,22:16#児島,発,22:39#茶屋町,発,22:55#早島,発,22:59#妹尾,発,23:03#岡山,着,23:12#", } \ No newline at end of file diff --git a/components/custom-train-data.ts b/components/custom-train-data.ts index abe540f..35eb8b7 100644 --- a/components/custom-train-data.ts +++ b/components/custom-train-data.ts @@ -767,7 +767,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainIcon: "https://storage.haruk.in/s5001.png", infoUrl: "https://www.jr-shikoku.co.jp/01_trainbus/vehicle-info/marine.html", trainNumDistance: null, - info: "WEST LIVE TOUR 2025臨 3/21,22のみ運転", + info: "RIZIN.50 香川大会臨 3/30のみ運転", infogram: "G" }; case "9395D": @@ -777,7 +777,7 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainIcon: null, infoUrl: null, trainNumDistance: null, - info: "WEST LIVE TOUR 2025臨 3/21,22のみ運転", + info: "RIZIN.50 香川大会臨 3/30のみ運転", infogram: "" }; default: diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts index 5cf0625..517795e 100644 --- a/lib/webViewInjectjavascript.ts +++ b/lib/webViewInjectjavascript.ts @@ -47,12 +47,8 @@ export const injectJavascriptData: InjectJavascriptData = ( // 左か右かを判定してアイコンを設置する const trainIcon = ` const setStationIcon = (setIconElem,img,hasProblem) =>{ - if(setIconElem.getAttribute("style").includes("left")){ - setIconElem.insertAdjacentHTML('beforebegin', ""); - } - else{ - setIconElem.insertAdjacentHTML('beforebegin', ""); - } + const position = setIconElem.getAttribute("style").includes("left"); + setIconElem.insertAdjacentHTML('beforebegin', ""); setIconElem.remove(); } const setTrainIcon = (列番データ,e,hasProblem) =>{ @@ -1263,8 +1259,9 @@ export const injectJavascriptData: InjectJavascriptData = ( const returnText1 = (isWanman ? "ワンマン " : "") + trainName + viaData; const returnText2 = (ToData ? ToData+"行 " : ToData)+ TrainNumber; 行き先情報.innerText = ""; - 行き先情報.insertAdjacentHTML('beforebegin', "

" + returnText1 + (hasProblem ? "\[停止中\]" : "") + "

"); - 行き先情報.insertAdjacentHTML('beforebegin', "

" + (ToData ? ToData + "行 " : ToData) + "

" + TrainNumber + (JRF ? "":"レ") + "

"); + 行き先情報.insertAdjacentHTML('beforebegin', "

" + returnText1 + "

"); + 行き先情報.insertAdjacentHTML('beforebegin', "

" + (ToData ? ToData + "行 " : ToData) + "

" + TrainNumber + (JRF ? "":"レ") + "

"); + 行き先情報.insertAdjacentHTML('beforebegin', "

" + (hasProblem ? "‼️停止中‼️" : "") + "

"); } `; @@ -1281,7 +1278,10 @@ const setStrings = () =>{ var 行き先情報 = element.getElementsByTagName("p")[0]; var 列番データ = element.getAttribute('offclick').split('"')[1]; var 列車名データ = element.getAttribute('offclick').split('"')[3]; - const hasProblem = probremsData.find(e => e.TrainNum == 列番データ); + const trainData = trainPositionDatas.find(e => e.TrainNum == 列番データ); + const hasProblem = probremsData.find((e)=>{ + return e.TrainNum == trainData.TrainNum && e.Pos == trainData.Pos; + }); var flag=false; var TrainType = undefined; setTrainMenuDialog(element) diff --git a/stateBox/useAllTrainDiagram.js b/stateBox/useAllTrainDiagram.js index 9f72b17..c0f7f92 100644 --- a/stateBox/useAllTrainDiagram.js +++ b/stateBox/useAllTrainDiagram.js @@ -16,8 +16,8 @@ export const AllTrainDiagramProvider = ({ children }) => { [allTrainDiagram] ); const customData = { - "9395D":"WEST LIVE TOUR 2025臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#高松,発,22:10#昭和町,発,22:12#栗林公園北口,発,22:15#栗林,発,22:18#木太町,発,22:22#屋島,発,22:26#古高松南,発,22:38#八栗口,発,22:41#讃岐牟礼,発,22:44#志度,発,22:48#オレンジタウン,発,22:52#造田,発,22:56#神前,発,22:59#讃岐津田,発,23:05#鶴羽,発,23:09#丹生,発,23:14#三本松,着,23:18#", - "9174M":"WEST LIVE TOUR 2025臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#高松,発,22:00#坂出,発,22:16#児島,発,22:39#茶屋町,発,22:55#早島,発,22:59#妹尾,発,23:03#岡山,着,23:12#", + "9395D":"RIZIN.50 香川大会臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250330_rizin-50-kagawa.pdf#高松,発,22:10#昭和町,発,22:12#栗林公園北口,発,22:15#栗林,発,22:18#木太町,発,22:22#屋島,発,22:26#古高松南,発,22:38#八栗口,発,22:41#讃岐牟礼,発,22:44#志度,発,22:48#オレンジタウン,発,22:52#造田,発,22:56#神前,発,22:59#讃岐津田,発,23:05#鶴羽,発,23:09#丹生,発,23:14#三本松,着,23:18#", + "9174M":"RIZIN.50 香川大会臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250330_rizin-50-kagawa.pdf#高松,発,22:00#坂出,発,22:16#児島,発,22:39#茶屋町,発,22:55#早島,発,22:59#妹尾,発,23:03#岡山,着,23:12#", }; useEffect(() => {