From b5b650695a81778836cff113ac1ab7def730bd22 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Wed, 19 Mar 2025 10:46:43 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=80=E9=83=A8=E3=81=AE=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E5=88=97=E8=BB=8A=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/webViewInjectjavascript.ts | 86 +++++++++++++++++----------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts index dfbf1a2..38f5521 100644 --- a/lib/webViewInjectjavascript.ts +++ b/lib/webViewInjectjavascript.ts @@ -465,53 +465,53 @@ export const injectJavascriptData: InjectJavascriptData = ( setStationIcon(e.querySelector("img"),'https://storage.haruk.in/ef210a.png'); break; - // 普通列車系統、6000系運用 - //61運用 - case "1213M": - case "1214M": - case "143M": - case "147M": - //62運用 - case "114M": - //961運用 - case "143M": - case "147M": - //962運用 - case "114M": - setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s6000p.png'); - break; + // // 普通列車系統、6000系運用 + // //61運用 + // case "1213M": + // case "1214M": + // case "143M": + // case "147M": + // //62運用 + // case "114M": + // //961運用 + // case "143M": + // case "147M": + // //962運用 + // case "114M": + // setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s6000p.png'); + // break; - // 土讃線普通列車系統(include ごな線) - // ごな線 - case "5851D": //219D併結 [ToDo: 219Dとの分割対策] - case "5854D": - setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640jgr.png'); - break; + // // 土讃線普通列車系統(include ごな線) + // // ごな線 + // case "5851D": //219D併結 [ToDo: 219Dとの分割対策] + // case "5854D": + // setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640jgr.png'); + // break; - //JR車両乗り入れ運用 - case "5858D": - case "5869D": - setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png'); - break; - //併結運用の併結される側 [ToDo: 分割対策] - case "5845D": - case "5851D": - case "5818D": - case "5820D": - setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640.png'); - break; - // 土讃線単体列車のキハ32運用 - case "715D": - case "718D": - setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32ns.png'); - break; + // //JR車両乗り入れ運用 + // case "5858D": + // case "5869D": + // setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png'); + // break; + // //併結運用の併結される側 [ToDo: 分割対策] + // case "5845D": + // case "5851D": + // case "5818D": + // case "5820D": + // setStationIcon(e.querySelector("img"),'https://storage.haruk.in/tosa9640.png'); + // break; + // // 土讃線単体列車のキハ32運用 + // case "715D": + // case "718D": + // setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s32ns.png'); + // break; - // サンライズに伴う気動車代走 - case "6219D": - case "6222D": - setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png'); - break; + // // サンライズに伴う気動車代走 + // case "6219D": + // case "6222D": + // setStationIcon(e.querySelector("img"),'https://storage.haruk.in/s1000.png'); + // break; // // それ以外の土讃線ごな線直通列車 // case "5811D": // case "5813D": From 6a888e6e1243f9067be193add69577f7ee624fb1 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Wed, 19 Mar 2025 11:31:41 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=80=E9=83=A8=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/webViewInjectjavascript.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts index 38f5521..1b0158a 100644 --- a/lib/webViewInjectjavascript.ts +++ b/lib/webViewInjectjavascript.ts @@ -1179,7 +1179,7 @@ export const injectJavascriptData: InjectJavascriptData = ( case "4334D": case "4342D": case "4350D": - case "4360D": + case "4368D": viaData = "牟岐線直通"; isWanman = true; break; From 740815704eb2a87ff8fd2a45c5f96d4dd793ddfb Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Wed, 19 Mar 2025 15:37:07 +0000 Subject: [PATCH 3/3] =?UTF-8?q?WESTLIVE=E8=87=A8=E6=99=82=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/originData/trainList.ts | 5 +++++ components/custom-train-data.ts | 19 ++++++++++++++++++- lib/webViewInjectjavascript.ts | 8 ++++++++ stateBox/useAllTrainDiagram.js | 6 +++++- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/assets/originData/trainList.ts b/assets/originData/trainList.ts index 07bb931..52ca867 100644 --- a/assets/originData/trainList.ts +++ b/assets/originData/trainList.ts @@ -921,4 +921,9 @@ "581D":"徳島,発,20:30#阿波富田,発,20:33#二軒屋,発,20:36#文化の森,発,20:39#地蔵橋,発,20:42#中田,発,20:47#南小松島,発,20:51#阿波赤石,発,20:55#立江,発,20:58#羽ノ浦,発,21:07#西原,発,21:10#阿波中島,発,21:14#阿南,着,21:18#", "583D":"徳島,発,21:30#阿波富田,発,21:33#二軒屋,発,21:36#文化の森,発,21:38#地蔵橋,発,21:42#中田,発,21:46#南小松島,発,21:50#阿波赤石,発,21:54#立江,発,21:57#羽ノ浦,発,22:14#西原,発,22:17#阿波中島,発,22:20#阿南,発,22:26#見能林,発,22:29#阿波橘,発,22:32#桑野,発,22:37#新野,発,22:41#阿波福井,発,22:45#由岐,発,22:54#木岐,発,22:58#北河内,発,23:03#日和佐,発,23:06#山河内,発,23:14#辺川,発,23:23#牟岐,着,23:29#", "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":"高松,発,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#WEST LIVE TOUR 2025臨/三本松,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#普通 三本松行,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#", +"9174M":"高松,発,22:00#坂出,発,22:16#児島,発,22:39#茶屋町,発,22:55#早島,発,22:59#妹尾,発,23:03#岡山,着,23:12#WEST LIVE TOUR 2025臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#快速マリンライナー94号 岡山行,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#", + } \ No newline at end of file diff --git a/components/custom-train-data.ts b/components/custom-train-data.ts index 86e6d3a..1827696 100644 --- a/components/custom-train-data.ts +++ b/components/custom-train-data.ts @@ -612,7 +612,24 @@ export const customTrainDataDetector = (TrainNumber: string) => { trainNumDistance: null, info: "", }; - + case "9174M": + return { + type: "SPCL", + trainName: "[快速]マリンライナー94号", + trainIcon: "https://storage.haruk.in/s5001.png", + infoUrl: "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/marine.html", + trainNumDistance: null, + info: "WEST LIVE TOUR 2025臨 3/21,22のみ運転", + }; + case "9395D": + return { + type: "SPCL", + trainName: "普通列車", + trainIcon: "", + infoUrl: "", + trainNumDistance: null, + info: "WEST LIVE TOUR 2025臨 3/21,22のみ運転", + }; default: if ( new RegExp(/^4[1-9]\d\d[DM]$/).test(TrainNumber) || diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts index 1b0158a..e4d9542 100644 --- a/lib/webViewInjectjavascript.ts +++ b/lib/webViewInjectjavascript.ts @@ -1228,6 +1228,14 @@ export const injectJavascriptData: InjectJavascriptData = ( viaData = "ごめん・なはり線[快速]"; ToData = "(後免にて解結)土佐山田/奈半利"; break; + case "9395D": + viaData = "[臨時]普通"; + ToData = "三本松"; + break; + case "9174M": + viaData = "[臨時]マリンライナー94号"; + ToData = "岡山"; + break; default: if(new RegExp(/^58[1-3][1,3,5,7,9][DM]$/).test(列番データ)){ viaData = "ごめん・なはり線[快速]"; diff --git a/stateBox/useAllTrainDiagram.js b/stateBox/useAllTrainDiagram.js index f6c643c..f474dd9 100644 --- a/stateBox/useAllTrainDiagram.js +++ b/stateBox/useAllTrainDiagram.js @@ -15,7 +15,11 @@ export const AllTrainDiagramProvider = ({ children }) => { () => allTrainDiagram && setKeyList(Object.keys(allTrainDiagram)), [allTrainDiagram] ); - const customData = {}; + const customData = { + "9395D":"高松,発,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#WEST LIVE TOUR 2025臨/三本松,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#普通 三本松行,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#", + "9174M":"高松,発,22:00#坂出,発,22:16#児島,発,22:39#茶屋町,発,22:55#早島,発,22:59#妹尾,発,23:03#岡山,着,23:12#WEST LIVE TOUR 2025臨,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#快速マリンライナー94号 岡山行,提,https://www.jr-shikoku.co.jp/03_news/pdf/20250228_20250323_west-live-tour-2025.pdf#", + + }; useEffect(() => { fetch( "https://n8n.haruk.in/webhook/CrowdTh%E2%82%AC71m3Ra7!ngLead%E2%82%ACr$"