From 4edfb951d44c11e548a69ecb4ef9d3d2673b43a1 Mon Sep 17 00:00:00 2001
From: harukin-expo-dev-env <harukin@haruk.in>
Date: Sat, 13 Sep 2025 14:02:56 +0000
Subject: [PATCH] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=84=E4=BB=95=E6=A7=98?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ActionSheetComponents/EachTrainInfoCore.js | 2 +-
 components/Apps/FixedPositionBox/FixedStationBox.tsx  | 3 +--
 components/発車時刻表/EachData.tsx                    | 7 +++++--
 menu.tsx                                              | 4 ----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/components/ActionSheetComponents/EachTrainInfoCore.js b/components/ActionSheetComponents/EachTrainInfoCore.js
index ca5565c..82abb7c 100644
--- a/components/ActionSheetComponents/EachTrainInfoCore.js
+++ b/components/ActionSheetComponents/EachTrainInfoCore.js
@@ -431,7 +431,7 @@ export const EachTrainInfoCore = ({
         )}
         {trainDataWidhThrough.map((i, index) =>
           i.split(",")[1] == "提" ? (
-            <DataFromButton i={i} />
+            <DataFromButton i={i} key={i + "-data"} />
           ) : (
             <EachStopList
               {...{
diff --git a/components/Apps/FixedPositionBox/FixedStationBox.tsx b/components/Apps/FixedPositionBox/FixedStationBox.tsx
index 7896cc6..54683a5 100644
--- a/components/Apps/FixedPositionBox/FixedStationBox.tsx
+++ b/components/Apps/FixedPositionBox/FixedStationBox.tsx
@@ -21,7 +21,7 @@ import { useEffect, useState } from "react";
 import { Text, TouchableOpacity, View } from "react-native";
 
 export const FixedStation = ({ stationID }) => {
-  const { fixedPosition, setFixedPosition } = useCurrentTrain();
+  const { currentTrain, setFixedPosition } = useCurrentTrain();
   const { getStationDataFromId } = useStationList();
   const [station, setStation] = useState<StationProps[]>([]);
   useEffect(() => {
@@ -38,7 +38,6 @@ export const FixedStation = ({ stationID }) => {
   const { areaInfo, areaStationID } = useAreaInfo();
   const [stationDiagram, setStationDiagram] = useState({}); //当該駅の全時刻表
   const [isInfoArea, setIsInfoArea] = useState(false);
-  const { currentTrain } = useCurrentTrain();
 
   useEffect(() => {
     // 現在の駅に停車するダイヤを作成する副作用[列車ダイヤと現在駅情報]
diff --git a/components/発車時刻表/EachData.tsx b/components/発車時刻表/EachData.tsx
index 8ffda2c..2ed4337 100644
--- a/components/発車時刻表/EachData.tsx
+++ b/components/発車時刻表/EachData.tsx
@@ -105,10 +105,13 @@ export const EachData: FC<Props> = (props) => {
   const [isShow, setIsShow] = useState(true);
   const [isDepartureNow, setIsDepartureNow] = useState(false);
   useEffect(() => {
+    const [h, m] = d.time.split(":");
+    const IntH = parseInt(h);
+    const IntM = parseInt(m);
     const currentTime = dayjs();
     const trainTime = currentTime
-      .set("hour", parseInt(d.time.split(":")[0]))
-      .set("minute", parseInt(d.time.split(":")[1]));
+      .set("hour", IntH < 4 ? IntH + 24 : IntH)
+      .set("minute", IntM);
     const diff = trainTime.diff(currentTime, "minute");
     if (diff < 2) setIsDepartureNow(true);
     else setIsDepartureNow(false);
diff --git a/menu.tsx b/menu.tsx
index 1d0fc88..1954ad5 100644
--- a/menu.tsx
+++ b/menu.tsx
@@ -139,8 +139,6 @@ export const Menu: FC<props> = (props) => {
       }, []);
     if (_stList.length == 0) setNearPositionStation([]);
     else {
-      console.log("hoge");
-      console.log(_stList);
       let returnData: StationProps[][] = [];
       _stList.forEach((d, index, array) => {
         const stationName = d.Station_JP;
@@ -206,8 +204,6 @@ export const Menu: FC<props> = (props) => {
         });
       }
       if (JSON.stringify(returnData) == JSON.stringify(listUpStation)) return;
-      console.log("returnData");
-      console.log(returnData);
       setListUpStation(returnData);
     } else if (stationListMode == "position") {
       const returnData = nearPositionStation.filter((d) => d != undefined);