From 4744d5f4e048e134ae27c79cd6d1dd59db9c4292 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Sat, 29 Mar 2025 05:20:23 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B5=B0=E8=A1=8C=E3=82=92=E5=86=8D?= =?UTF-8?q?=E9=96=8B=E3=81=97=E3=81=9F=E3=82=89=E9=97=87=E8=90=BD=E3=81=A1?= =?UTF-8?q?=E3=82=92=E8=A7=A3=E9=99=A4=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/webViewInjectjavascript.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts index 5cf0625..a8ce6c7 100644 --- a/lib/webViewInjectjavascript.ts +++ b/lib/webViewInjectjavascript.ts @@ -1281,7 +1281,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) From 2b9553a45b07d98f3690c882578441f5513adbce Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Sat, 29 Mar 2025 14:55:59 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E4=B8=AD=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=82=92=E6=94=B9=E8=89=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/webViewInjectjavascript.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts index a8ce6c7..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 ? "‼️停止中‼️" : "") + "

"); } `; From 3eb92564ef7c4d1c8b1c99b28d7d473f5f62f691 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Sat, 29 Mar 2025 15:00:42 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9C=AC=E5=AE=B6=E3=83=A1=E3=83=8B?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=81=A7=E4=BA=88=E6=9C=9F=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=81=A7?= =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=8C=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E3=83=90=E3=82=B0?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Top.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Top.js b/Top.js index f2d6877..fd155fa 100644 --- a/Top.js +++ b/Top.js @@ -41,7 +41,7 @@ export const Top = () => { if (!isFocused()) { navigate("positions", { screen: "Apps" }); } - if (mapSwitch == "true") { + else if (mapSwitch == "true") { navigate("positions", { screen: "trainMenu" }); } else { webview.current?.injectJavaScript(`AccordionClassEvent()`); From 0ae9d597587e4cfaeb2e4acf8eff8b2c467d0eee Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Sun, 30 Mar 2025 02:47:02 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9C=AC=E5=AE=B6=E3=83=A2=E3=83=BC?= =?UTF-8?q?=E3=83=89=E3=81=A7=E5=88=97=E8=BB=8A=E4=BD=8D=E7=BD=AE=E3=81=AB?= =?UTF-8?q?=E7=A7=BB=E5=8B=95=E3=81=97=E3=81=9F=E6=99=82=E3=81=AB=E5=BC=B7?= =?UTF-8?q?=E5=88=B6=E7=9A=84=E3=81=AB=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=81=8C=E5=B1=95=E9=96=8B=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=9F=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Top.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Top.js b/Top.js index fd155fa..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" }); - } - else 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; }; From af8f3333cd68ea507675ad02ec59ccf2f7959e00 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Sun, 30 Mar 2025 02:52:13 +0000 Subject: [PATCH 5/5] =?UTF-8?q?RIZIN.50=20=E9=A6=99=E5=B7=9D=E5=A4=A7?= =?UTF-8?q?=E4=BC=9A=E8=87=A8=E6=99=82=E6=83=85=E5=A0=B1=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/originData/trainList.ts | 4 ++-- components/custom-train-data.ts | 4 ++-- stateBox/useAllTrainDiagram.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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: "Ｇ" }; 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/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(() => {