From 9fee43d6ff6b55dea83c2940a8627886c9320688 Mon Sep 17 00:00:00 2001
From: harukin-OneMix4 <harukin@haruk.in>
Date: Tue, 27 Jun 2023 22:18:52 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E7=94=BB?=
 =?UTF-8?q?=E9=9D=A2=E3=81=A7=E3=81=AEtrainInfo=E7=94=BB=E9=9D=A2=E3=81=AE?=
 =?UTF-8?q?=E5=8B=95=E4=BD=9C=E8=A6=81=E4=BB=B6=E6=BA=96=E5=82=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActionSheetComponents/EachTrainInfo.js    |  6 ++-
 components/発車時刻表/LED_vidion.js      | 39 +++++++++++-----
 menu.js                                       | 45 ++++++++++---------
 3 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js
index 63eb1c2..8d2f316 100644
--- a/components/ActionSheetComponents/EachTrainInfo.js
+++ b/components/ActionSheetComponents/EachTrainInfo.js
@@ -23,6 +23,7 @@ export const EachTrainInfo = ({
   navigate,
   originalStationList,
   openStationACFromEachTrainInfo,
+  from,
 }) => {
   const [trainData, setTrainData] = useState([]);
   const stationList =
@@ -106,6 +107,7 @@ export const EachTrainInfo = ({
 
                   navigate("trainbase", {
                     info: "train.html?tn=" + data.trainNum,
+                    from,
                   });
                   setRef.current?.hide();
                 }}
@@ -175,8 +177,8 @@ export const EachTrainInfo = ({
                     >
                       <View
                         style={{
-                          width: 40,
-                          height: 40,
+                          width: 35,
+                          height: 41,
                           position: "absolute",
                           left: 10,
                           top: 0,
diff --git a/components/発車時刻表/LED_vidion.js b/components/発車時刻表/LED_vidion.js
index af069ef..c7e2334 100644
--- a/components/発車時刻表/LED_vidion.js
+++ b/components/発車時刻表/LED_vidion.js
@@ -212,6 +212,8 @@ export default function LED_vision(props) {
           currentTrain={currentTrain}
           customTrainDataDetector={customTrainDataDetector}
           navigate={props.navigate}
+          setTrainInfo={props.setTrainInfo}
+          EachTrainInfoAsSR={props.EachTrainInfoAsSR}
         />
       ))}
       <Footer
@@ -333,19 +335,39 @@ const EachData = ({
   currentTrain,
   customTrainDataDetector,
   navigate,
+  setTrainInfo,
+  EachTrainInfoAsSR,
 }) => {
   const getTrainType = (data) => {
     switch (data) {
       case "Rapid":
-        return { color: "aqua", name: "快速" };
+        return { color: "aqua", name: "快速", data: "rapid" };
       case "LTDEXP":
-        return { color: "red", name: "特急" };
+        return { color: "red", name: "特急", data: "express" };
       case "NightLTDEXP":
-        return { color: "red", name: "寝台特急" };
+        return { color: "red", name: "寝台特急", data: "express" };
       case "Normal":
-        return { color: "white", name: "普通列車" };
+        return { color: "white", name: "普通列車", data: "normal" };
     }
   };
+  const openTrainInfo = (d) => {
+    console.log(train);
+    console.log(d);
+    let TrainNumber = "";
+    if (train.trainNumDistance != undefined) {
+      const timeInfo =
+        parseInt(d.train.replace("M", "").replace("D", "")) -
+        train.trainNumDistance;
+      TrainNumber = timeInfo + "号";
+    }
+    setTrainInfo({
+      trainNum: d.train,
+      limited: `${getTrainType(train.type).data}:${
+        train.trainName
+      }${TrainNumber}`,
+    });
+    EachTrainInfoAsSR.current?.show();
+  };
   const [train, setTrain] = useState(customTrainDataDetector(d.train));
   useEffect(() => {
     setTrain(customTrainDataDetector(d.train));
@@ -362,14 +384,7 @@ const EachData = ({
           backgroundColor: "#000",
           flexDirection: "row",
         }}
-        onPress={() => {
-          if (train.type != "Normal") {
-            navigate("trainbase", {
-              info: "train.html?tn=" + d.train,
-              from: "LED",
-            });
-          }
-        }}
+        onPress={() => openTrainInfo(d)}
       >
         <TrainName
           train={train}
diff --git a/menu.js b/menu.js
index 0ccfaf4..561fb59 100644
--- a/menu.js
+++ b/menu.js
@@ -151,27 +151,27 @@ export default function Menu(props) {
   }, [selectedCurrentStation]);
 
   const openStationACFromEachTrainInfo = (stationName) => {
-    EachTrainInfoAsSR.current?.hide();
-    const findStationEachLine = (selectLine) => {
-      let NearStation = selectLine.filter((d) => d.Station_JP == stationName);
-      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);
-      sleep(30, function () {
-        StationBoardAcSR.current?.show();
-      });
-    } else {
-      setStationBoardData(undefined);
-      StationBoardAcSR.current?.hide();
-    }
+    // EachTrainInfoAsSR.current?.hide();
+    // const findStationEachLine = (selectLine) => {
+    //   let NearStation = selectLine.filter((d) => d.Station_JP == stationName);
+    //   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);
+    //   sleep(30, function () {
+    //     StationBoardAcSR.current?.show();
+    //   });
+    // } else {
+    //   setStationBoardData(undefined);
+    //   StationBoardAcSR.current?.hide();
+    // }
   };
   return (
     <View
@@ -224,6 +224,8 @@ export default function Menu(props) {
                 originalStationList && allStationData[selectedCurrentStation][0]
               }
               navigate={navigate}
+              setTrainInfo={setTrainInfo}
+              EachTrainInfoAsSR={EachTrainInfoAsSR}
             />
           )}
         <JRSTraInfoBox
@@ -266,6 +268,7 @@ export default function Menu(props) {
         navigate={navigate}
         originalStationList={originalStationList}
         openStationACFromEachTrainInfo={openStationACFromEachTrainInfo}
+        from="LED"
       />
     </View>
   );