From dfe3c831bc4c683659bca632133822192c520882 Mon Sep 17 00:00:00 2001
From: harukin-OneMix4 <harukin@haruk.in>
Date: Thu, 6 Jul 2023 22:23:47 +0900
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BB=8A=E9=81=8B=E8=A1=8C=E6=83=85?=
 =?UTF-8?q?=E5=A0=B1=E3=81=AEstate=E3=82=92=E6=9C=80=E9=AB=98=E4=BD=8D?=
 =?UTF-8?q?=E3=81=AB=E7=A7=BB=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Apps.js                                       |  4 +-
 .../ActionSheetComponents/EachTrainInfo.js    | 60 ++++++++++++++++++-
 components/発車時刻表/LED_vidion.js      |  2 +-
 menu.js                                       |  2 +-
 4 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/Apps.js b/Apps.js
index 7545681..abc7d1d 100644
--- a/Apps.js
+++ b/Apps.js
@@ -47,7 +47,7 @@ export default function Apps({
   const [trainInfo, setTrainInfo] = useState({
     trainNum: undefined,
     limited: undefined,
-    delay: undefined,
+    trainData: undefined,
   });
 
   //駅情報画面用
@@ -160,7 +160,7 @@ export default function Apps({
         setTrainInfo({
           trainNum,
           limited,
-          delay: currentTrain.filter((t) => t.num == trainNum)[0].delay,
+          trainData: currentTrain.filter((t) => t.num == trainNum)[0],
         }); //遅延情報は未実装
         EachTrainInfoAsSR.current?.show();
         return;
diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js
index fefab4b..93c0f42 100644
--- a/components/ActionSheetComponents/EachTrainInfo.js
+++ b/components/ActionSheetComponents/EachTrainInfo.js
@@ -38,6 +38,7 @@ export const EachTrainInfo = ({
     );
 
   useEffect(() => {
+    console.log(data);
     setIsTop(true);
     if (!data.trainNum) return;
     const TD = trainList[data.trainNum];
@@ -129,6 +130,64 @@ export const EachTrainInfo = ({
             setIsTop(e.nativeEvent.contentOffset.y < 0);
           }}
         >
+          <View style={{ flexDirection: "row" }}>
+            <View
+              style={{
+                flex: 1,
+                backgroundColor: "black",
+                borderRadius: 10,
+                padding: 10,
+                margin: 10,
+              }}
+            >
+              <Text style={{ fontSize: 10, color: "white" }} t>
+                現在地
+              </Text>
+              <View style={{ flex: 1 }} />
+              <Text
+                style={{ fontSize: 30, color: "white", textAlign: "right" }}
+              >
+                {data.trainData?.Pos}
+              </Text>
+            </View>
+            <View style={{ flex: 1, flexDirection: "column" }}>
+              <View
+                style={{
+                  flex: 1,
+                  backgroundColor: "black",
+                  borderRadius: 10,
+                  padding: 10,
+                  margin: 10,
+                }}
+              >
+                <Text style={{ fontSize: 10, color: "white" }}>
+                  {isNaN(data.trainData?.delay) ? "状態" : "遅延時分"}
+                </Text>
+                <Text
+                  style={{ fontSize: 30, color: "white", textAlign: "right" }}
+                >
+                  {data.trainData?.delay}
+                  {isNaN(data.trainData?.delay) ? "" : "分"}
+                </Text>
+              </View>
+              <View
+                style={{
+                  flex: 1,
+                  backgroundColor: "black",
+                  borderRadius: 10,
+                  padding: 10,
+                  margin: 10,
+                }}
+              >
+                <Text style={{ fontSize: 10, color: "white" }}>列番</Text>
+                <Text
+                  style={{ fontSize: 30, color: "white", textAlign: "right" }}
+                >
+                  {data.trainData?.num}
+                </Text>
+              </View>
+            </View>
+          </View>
           <View
             style={{
               padding: 10,
@@ -138,7 +197,6 @@ export const EachTrainInfo = ({
             }}
           >
             <View style={{ alignItems: "center" }}>
-              <Text>{data.delay}</Text>
               {/* <LottieView
                 autoPlay
                 loop
diff --git a/components/発車時刻表/LED_vidion.js b/components/発車時刻表/LED_vidion.js
index b84f866..8274931 100644
--- a/components/発車時刻表/LED_vidion.js
+++ b/components/発車時刻表/LED_vidion.js
@@ -289,7 +289,7 @@ const EachData = ({
       limited: `${getTrainType(train.type).data}:${
         train.trainName
       }${TrainNumber}`,
-      delay: currentTrain.filter((t) => t.num == d.train)[0].delay,
+      trainData: currentTrain.filter((t) => t.num == d.train)[0],
     });
     EachTrainInfoAsSR.current?.show();
   };
diff --git a/menu.js b/menu.js
index dfc2952..d7a575a 100644
--- a/menu.js
+++ b/menu.js
@@ -67,7 +67,7 @@ export default function Menu(props) {
   const [trainInfo, setTrainInfo] = useState({
     trainNum: undefined,
     limited: undefined,
-    delay: undefined,
+    trainData: undefined,
   });
 
   const getCurrentPosition = () => {