From 34413f522f517209267acd71e09d975edeb57a90 Mon Sep 17 00:00:00 2001
From: harukin-OneMix4 <harukin@haruk.in>
Date: Tue, 27 Jun 2023 00:24:56 +0900
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BB=8A=E6=83=85=E5=A0=B1=E3=83=9C?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=81=AE=E3=83=90=E3=83=83=E3=82=AF=E5=81=B4?=
 =?UTF-8?q?=E7=94=A8=E6=84=8F=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Apps.js                        | 56 ++++++++++++++++++++--------------
 lib/webViewInjectjavascript.js | 33 +++++++++-----------
 2 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/Apps.js b/Apps.js
index 9acea69..25dadb1 100644
--- a/Apps.js
+++ b/Apps.js
@@ -104,7 +104,7 @@ export default function Apps({
   }, []);
 
   const onMessage = (event) => {
-    if (!event.nativeEvent.data.includes("PopUpMenu")) {
+    if (event.nativeEvent.data.includes("train.html")) {
       navigate("trainbase", { info: event.nativeEvent.data, from: "Train" });
       return;
     }
@@ -113,30 +113,40 @@ export default function Apps({
       return;
     }
     const dataSet = JSON.parse(event.nativeEvent.data);
-    if (dataSet.type == "PopUpMenu") {
-      const selectedStationPDFAddress = dataSet.pdf;
-      const findStationEachLine = (selectLine) => {
-        let NearStation = selectLine.filter(
-          (d) => d.StationTimeTable == selectedStationPDFAddress
-        );
-        return NearStation;
-      };
-      let returnDataBase = lineList
-        .map((d) => findStationEachLine(originalStationList[d]))
-        .filter((d) => d.length > 0)
-        .reduce((pre, current) => {
-          pre.push(...current);
-          return pre;
-        }, []);
+    switch (dataSet.type) {
+      case "PopUpMenu": {
+        const selectedStationPDFAddress = dataSet.pdf;
+        const findStationEachLine = (selectLine) => {
+          let NearStation = selectLine.filter(
+            (d) => d.StationTimeTable == selectedStationPDFAddress
+          );
+          return NearStation;
+        };
+        let returnDataBase = lineList
+          .map((d) => findStationEachLine(originalStationList[d]))
+          .filter((d) => d.length > 0)
+          .reduce((pre, current) => {
+            pre.push(...current);
+            return pre;
+          }, []);
 
-      if (returnDataBase.length) {
-        setStationBoardData(returnDataBase);
-        StationBoardAcSR.current?.setModalVisible();
-      } else {
-        setStationBoardData(undefined);
-        StationBoardAcSR.current?.hide();
+        if (returnDataBase.length) {
+          setStationBoardData(returnDataBase);
+          StationBoardAcSR.current?.setModalVisible();
+        } else {
+          setStationBoardData(undefined);
+          StationBoardAcSR.current?.hide();
+        }
+        return;
+      }
+      case "ShowTrainTimeInfo": {
+        const { trainNum, limited } = dataSet;
+        //alert(trainNum, limited);
+        return;
+      }
+      default: {
+        return;
       }
-      return;
     }
   };
 
diff --git a/lib/webViewInjectjavascript.js b/lib/webViewInjectjavascript.js
index 73d3dc5..ac805bd 100644
--- a/lib/webViewInjectjavascript.js
+++ b/lib/webViewInjectjavascript.js
@@ -725,24 +725,21 @@ modal_observer.observe(modal_content, {
       ? 'function PopUpMenu(event,id,name,pdf,map,url,chk){window.ReactNativeWebView.postMessage(JSON.stringify({type:"PopUpMenu",event,id,name,pdf,map,url,chk}));}'
       : ``;
 
-  // const makeTrainMenu =
-  //   //trainMenu == "true"
-  //   true
-  //     ? `
-  //       function ShowTrainTimeInfo(trainNum,limited){
-  //         alert("hoge")
-  //       };
-  //     // if(!element.offclick){
-  //     //   element.offclick = element.onclick.toString();
-  //     // }
-  //     // element.onclick = () =>{
-  //     //   console.log("hoge")
-  //     //   window.ReactNativeWebView.postMessage(element.offclick);
-  //     // }
-  // `
-  //     : ``;
+  const makeTrainMenu =
+    //trainMenu == "true"
+    true
+      ? `
+        function ShowTrainTimeInfo(trainNum,limited){
+          window.ReactNativeWebView.postMessage(JSON.stringify({type:"ShowTrainTimeInfo",trainNum,limited}));
+        };
+  `
+      : ``;
   return (
-    bootData + makeTrainView + trainIconMaker + textInsert + makeStationMenu
-    //makeTrainMenu
+    bootData +
+    makeTrainView +
+    trainIconMaker +
+    textInsert +
+    makeTrainMenu +
+    makeStationMenu
   );
 };