From d4ddaeb17ee7ed292efe0715f4e3c14d0bfde9d2 Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Fri, 2 Feb 2024 02:32:26 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=E3=82=B9=E3=83=AF=E3=82=A4=E3=83=97?= =?UTF-8?q?=E3=82=92=E3=82=84=E3=82=81=E3=81=A6=E3=83=9C=E3=82=BF=E3=83=B3?= =?UTF-8?q?=E3=82=92=E6=8A=BC=E3=81=97=E3=81=A6=E6=8B=A1=E5=BC=B5=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionSheetComponents/EachTrainInfo.js | 247 +++++++++--------- 1 file changed, 130 insertions(+), 117 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index 84868d7..aeeb7ed 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -54,6 +54,8 @@ export const EachTrainInfo = (props) => { const [nearTrainIDList, setNearTrainIDList] = useState([]); const [showNearTrain, setShowNearTrain] = useState([]); const [isConcatNear, setIsConcatNear] = useState(false); + const [tailStation, setTailStation] = useState(); + const [headStation, setHeadStation] = useState(); //裏列車探索 useEffect(() => { @@ -85,10 +87,22 @@ export const EachTrainInfo = (props) => { const TDArray = TD.split("#").filter((d) => d != ""); setShowNearTrain(TDArray); }, [data]); + useEffect(() => { + if (trainData.length == 0) return; + showNearTrain.forEach((d) => { + const [station, se, time] = d.split(","); + + console.log(trainData); //trainDataは現在の列車の停車駅リスト + console.log(station); //showNearTrainは裏列車の停車駅リスト + console.log(trainData[0]); + if (station == trainData[0].split(",")[0]) + setHeadStation(trainData[0].split(",")[0]); + if (station == trainData[trainData.length - 1].split(",")[0]) + setTailStation(trainData[trainData.length - 1].split(",")[0]); + }); + }, [trainData, showNearTrain]); const openBackTrainInfo = (stationInfo, currentTrainIndex) => { - console.log(trainData); //trainDataは現在の列車の停車駅リスト - console.log(showNearTrain); //showNearTrainは裏列車の停車駅リスト const mainTrainStationPosition = trainData.findIndex( (d) => d.split(",")[0] == stationInfo ); @@ -98,7 +112,6 @@ export const EachTrainInfo = (props) => { : mainTrainStationPosition == trainData.length - 1 ? "tail" : "middle"; - console.log(relationMain); const subTrainStationPosition = showNearTrain.findIndex( (d) => d.split(",")[0] == stationInfo @@ -109,7 +122,6 @@ export const EachTrainInfo = (props) => { : subTrainStationPosition == showNearTrain.length - 1 ? "tail" : "middle"; - console.log(relationSub); switch (relationMain) { case "head": if (relationSub == "head") { @@ -622,6 +634,13 @@ export const EachTrainInfo = (props) => { backgroundColor: "white", }} > + {headStation && !isConcatNear && ( + openBackTrainInfo(headStation)}> + + 直通列車を表示 + + + )} {/* { /> ほげほげふがふが */} - {trainData.map((i, index) => (i.split(",")[1] == "提" ? : - d.split(",")[0])} - openBackTrainInfo={openBackTrainInfo} - isConcatNear={isConcatNear} - /> - ))} + {trainData.map((i, index) => + i.split(",")[1] == "提" ? ( + + ) : ( + d.split(",")[0])} + openBackTrainInfo={openBackTrainInfo} + isConcatNear={isConcatNear} + /> + ) + )} + {tailStation && !isConcatNear && ( + openBackTrainInfo(tailStation)}> + + 直通列車を表示 + + + )} { ); }; -const DataFromButton = ({i}) => { +const DataFromButton = ({ i }) => { const [station, se, time] = i.split(","); return ( { {station} - 提供元 + 提供元 + - ); -} +}; const StationButton = ({ i, @@ -744,114 +778,93 @@ const StationButton = ({ ); const swipagleRef = useRef(null); return ( - openStationACFromEachTrainInfo(station)} key={station} - onSwipeableOpen={() => { - openBackTrainInfo(station, index); - swipagleRef.current.close(); - }} - renderRightActions={ - isConnected && !isConcatNear - ? (progress, dragX) => { - //openBackTrainInfo(station, index); - return ; - } - : null - } > - openStationACFromEachTrainInfo(station)} - key={station} - > - - - {lineIDs.map((lineID, index) => ( - + + {lineIDs.map((lineID, index) => ( + + + - - - {lineIDs[index]} - {"\n"} - {EachIDs[index]} - - - - ))} - - - {station} - - {points && points.findIndex((d) => d == index) >= 0 ? ( - 🚊 - ) : null} - {!isNaN(currentTrainData?.delay) && - currentTrainData?.delay != 0 && ( - - {time} - - )} + {lineIDs[index]} + {"\n"} + {EachIDs[index]} + + + + ))} + + + {station} + + {points && points.findIndex((d) => d == index) >= 0 ? ( + 🚊 + ) : null} + {!isNaN(currentTrainData?.delay) && currentTrainData?.delay != 0 && ( - {timeString[0]}:{timeString[1]} + {time} - - {se?.replace("発", "出発").replace("着", "到着")} - - + )} + + {timeString[0]}:{timeString[1]} + + + {se?.replace("発", "出発").replace("着", "到着")} + - - + + ); }; From fd2fe310ab68df3fad0c5488fd98310be9005c33 Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Fri, 2 Feb 2024 02:40:40 +0900 Subject: [PATCH 2/8] =?UTF-8?q?CSS=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionSheetComponents/EachTrainInfo.js | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index aeeb7ed..fd32383 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -635,9 +635,22 @@ export const EachTrainInfo = (props) => { }} > {headStation && !isConcatNear && ( - openBackTrainInfo(headStation)}> - - 直通列車を表示 + openBackTrainInfo(headStation)} + style={{ + padding: 10, + flexDirection: "row", + borderColor: "blue", + borderWidth: 1, + margin: 10, + borderRadius: 5, + alignItems: "center", + }} + > + + 「本当の始発駅」を表示 )} @@ -667,10 +680,23 @@ export const EachTrainInfo = (props) => { ) )} {tailStation && !isConcatNear && ( - openBackTrainInfo(tailStation)}> - - 直通列車を表示 - + openBackTrainInfo(tailStation)} + style={{ + padding: 10, + flexDirection: "row", + borderColor: "blue", + borderWidth: 1, + margin: 10, + borderRadius: 5, + alignItems: "center", + }} + > + + 「本当の終着駅」を表示 + )} From a6d8f9ac3398cd70b204808de4d791a5c2f3f4d6 Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Fri, 2 Feb 2024 11:44:04 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=E6=96=87=E5=AD=97=E3=81=AE=E4=B8=8A?= =?UTF-8?q?=E3=81=ABView=E3=81=8C=E8=A2=AB=E3=81=A3=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=9F=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ActionSheetComponents/EachTrainInfo.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index fd32383..8b3feb4 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -647,11 +647,11 @@ export const EachTrainInfo = (props) => { alignItems: "center", }} > - - 「本当の始発駅」を表示 - + 「本当の始発駅」を表示 + )} {/* Date: Fri, 2 Feb 2024 12:11:32 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=E8=A3=8F=E5=88=97=E8=BB=8A=E6=8E=A2?= =?UTF-8?q?=E7=B4=A2=E3=82=92=E5=A4=96=E9=83=A8=E3=81=AB=E5=87=BA=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionSheetComponents/EachTrainInfo.js | 44 ++----------------- stateBox/useBusAndTrainData.js | 31 +++++++++++++ 2 files changed, 35 insertions(+), 40 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index 8b3feb4..4c81861 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -7,7 +7,6 @@ import { Text, TouchableOpacity, TouchableWithoutFeedback, - TouchableHighlight, Platform, } from "react-native"; import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; @@ -15,9 +14,7 @@ import ActionSheet, { SheetManager, useScrollHandlers, } from "react-native-actions-sheet"; -import { useSafeAreaInsets } from "react-native-safe-area-context"; import { AS } from "../../storageControl"; -import LottieView from "lottie-react-native"; import trainList from "../../assets/originData/trainList"; import { lineList } from "../../lib/getStationList"; import { @@ -31,7 +28,6 @@ import dayjs from "dayjs"; import { getTrainType } from "../../lib/getTrainType"; import { customTrainDataDetector } from "../custom-train-data"; import { useBusAndTrainData } from "../../stateBox/useBusAndTrainData"; -import { Swipeable } from "react-native-gesture-handler"; export const EachTrainInfo = (props) => { if (!props.payload) return <>; @@ -48,7 +44,7 @@ export const EachTrainInfo = (props) => { const [trainPositionSwitch, setTrainPositionSwitch] = useState("false"); const { currentTrain } = useCurrentTrain(); - const { initializeTrainPairList } = useBusAndTrainData(); + const { getInfluencedTrainData } = useBusAndTrainData(); const [currentTrainData, setCurrentTrainData] = useState([]); const [nearTrainIDList, setNearTrainIDList] = useState([]); @@ -59,36 +55,15 @@ export const EachTrainInfo = (props) => { //裏列車探索 useEffect(() => { - const trainPairList = initializeTrainPairList(); - - const returnArray = []; if (!data.trainNum) return; - if (trainPairList[data.trainNum]) { - returnArray.push(Object.keys(trainPairList[data.trainNum])[0]); - } - if ( - // 列番が4xxDまたは5xxDの場合はxxDの列番を検索 - new RegExp(/^4[1-9]\d\d[DM]$/).test(data.trainNum) || - new RegExp(/^5[1-7]\d\d[DM]$/).test(data.trainNum) - ) { - if (trainList[data.trainNum.substring(1)]) { - returnArray.push(data.trainNum.substring(1)); - } - } - if (new RegExp(/^[1-9]\d\d[DM]$/).test(data.trainNum)) { - // 列番がxxDの場合は4xxDと5xxDの列番を検索 - if (trainList["4" + data.trainNum]) returnArray.push("4" + data.trainNum); - if (trainList["5" + data.trainNum]) returnArray.push("5" + data.trainNum); - } + const [returnArray, TDArray] = getInfluencedTrainData(data.trainNum); setNearTrainIDList(returnArray); - if (!returnArray[0]) return; - const TD = trainList[returnArray[0]]; - if (!TD) return; - const TDArray = TD.split("#").filter((d) => d != ""); setShowNearTrain(TDArray); }, [data]); + useEffect(() => { if (trainData.length == 0) return; + if (showNearTrain.length == 0) return; showNearTrain.forEach((d) => { const [station, se, time] = d.split(","); @@ -673,9 +648,6 @@ export const EachTrainInfo = (props) => { points={points} currentTrainData={currentTrainData} openStationACFromEachTrainInfo={openStationACFromEachTrainInfo} - headAndTail={showNearTrain.map((d) => d.split(",")[0])} - openBackTrainInfo={openBackTrainInfo} - isConcatNear={isConcatNear} /> ) )} @@ -760,9 +732,6 @@ const StationButton = ({ points, currentTrainData, openStationACFromEachTrainInfo, - headAndTail, - openBackTrainInfo, - isConcatNear, }) => { const [station, se, time] = i.split(","); // 阿波池田,発,6:21 const Stations = stationList @@ -798,11 +767,6 @@ const StationButton = ({ .add(isNaN(currentTrainData?.delay) ? 0 : currentTrainData.delay, "minute"); const timeString = dates.format("HH:mm").split(":"); - const StationNames = Stations && Stations[0]?.StationName; - const [isConnected, setIsConnected] = useState( - headAndTail.includes(StationNames) - ); - const swipagleRef = useRef(null); return ( openStationACFromEachTrainInfo(station)} diff --git a/stateBox/useBusAndTrainData.js b/stateBox/useBusAndTrainData.js index 3c8311f..cbfaf86 100644 --- a/stateBox/useBusAndTrainData.js +++ b/stateBox/useBusAndTrainData.js @@ -1,10 +1,12 @@ import React, { createContext, useContext, useState } from "react"; +import trainList from "../assets/originData/trainList"; const initialState = { busAndTrainData: [], setBusAndTrainData: () => {}, trainPairData: [], setTrainPairData: () => {}, initializeTrainPairList: () => {}, + getInfluencedTrainData: () => {}, }; const BusAndTrainDataContext = createContext(initialState); @@ -23,6 +25,34 @@ export const BusAndTrainDataProvider = ({ children }) => { }); return trainPairList; }; + const getInfluencedTrainData = (trainNum) => { + const trainPairList = initializeTrainPairList(); + + const returnArray = []; + if (!trainNum) return; + if (trainPairList[trainNum]) { + returnArray.push(Object.keys(trainPairList[trainNum])[0]); + } + if ( + // 列番が4xxDまたは5xxDの場合はxxDの列番を検索 + new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum) || + new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum) + ) { + if (trainList[trainNum.substring(1)]) { + returnArray.push(trainNum.substring(1)); + } + } + if (new RegExp(/^[1-9]\d\d[DM]$/).test(trainNum)) { + // 列番がxxDの場合は4xxDと5xxDの列番を検索 + if (trainList["4" + trainNum]) returnArray.push("4" + trainNum); + if (trainList["5" + trainNum]) returnArray.push("5" + trainNum); + } + if (!returnArray[0]) return [[], []]; + const TD = trainList[returnArray[0]]; + if (!TD) return [[], []]; + const TDArray = TD.split("#").filter((d) => d != ""); + return [returnArray, TDArray]; + }; return ( { trainPairData, setTrainPairData, initializeTrainPairList, + getInfluencedTrainData, }} > {children} From e72cb03e08dcbbbff73d609de0d41bac85360e80 Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Fri, 2 Feb 2024 12:20:33 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionSheetComponents/EachTrainInfo.js | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index 4c81861..becdb0e 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -40,7 +40,6 @@ export const EachTrainInfo = (props) => { } = props.payload; const [trainData, setTrainData] = useState([]); const [currentPosition, setCurrentPosition] = useState([]); - const [trainPositionSwitch, setTrainPositionSwitch] = useState("false"); const { currentTrain } = useCurrentTrain(); @@ -81,22 +80,22 @@ export const EachTrainInfo = (props) => { const mainTrainStationPosition = trainData.findIndex( (d) => d.split(",")[0] == stationInfo ); - const relationMain = - mainTrainStationPosition == 0 - ? "head" - : mainTrainStationPosition == trainData.length - 1 - ? "tail" - : "middle"; + + const relationMain = (() => { + if (mainTrainStationPosition == 0) return "head"; + if (mainTrainStationPosition == trainData.length - 1) return "tail"; + return "middle"; + })(); const subTrainStationPosition = showNearTrain.findIndex( (d) => d.split(",")[0] == stationInfo ); - const relationSub = - subTrainStationPosition == 0 - ? "head" - : subTrainStationPosition == showNearTrain.length - 1 - ? "tail" - : "middle"; + const relationSub = (() => { + if (subTrainStationPosition == 0) return "head"; + if (subTrainStationPosition == showNearTrain.length - 1) return "tail"; + return "middle"; + })(); + switch (relationMain) { case "head": if (relationSub == "head") { From edaa16cf358ab6f4ca1e20e011ad4cdcd68446cb Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Fri, 2 Feb 2024 12:29:42 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=E7=B5=90=E5=90=88=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E9=96=A2=E6=95=B0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionSheetComponents/EachTrainInfo.js | 130 +++++++++--------- 1 file changed, 63 insertions(+), 67 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index becdb0e..84320ca 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -77,76 +77,72 @@ export const EachTrainInfo = (props) => { }, [trainData, showNearTrain]); const openBackTrainInfo = (stationInfo, currentTrainIndex) => { - const mainTrainStationPosition = trainData.findIndex( - (d) => d.split(",")[0] == stationInfo - ); + const migrationArray = (stationInfo) => { + const mainTrainStationPosition = trainData.findIndex( + (d) => d.split(",")[0] == stationInfo + ); - const relationMain = (() => { - if (mainTrainStationPosition == 0) return "head"; - if (mainTrainStationPosition == trainData.length - 1) return "tail"; - return "middle"; - })(); + const relationMain = (() => { + if (mainTrainStationPosition == 0) return "head"; + if (mainTrainStationPosition == trainData.length - 1) return "tail"; + return "middle"; + })(); - const subTrainStationPosition = showNearTrain.findIndex( - (d) => d.split(",")[0] == stationInfo - ); - const relationSub = (() => { - if (subTrainStationPosition == 0) return "head"; - if (subTrainStationPosition == showNearTrain.length - 1) return "tail"; - return "middle"; - })(); + const subTrainStationPosition = showNearTrain.findIndex( + (d) => d.split(",")[0] == stationInfo + ); + const relationSub = (() => { + if (subTrainStationPosition == 0) return "head"; + if (subTrainStationPosition == showNearTrain.length - 1) return "tail"; + return "middle"; + })(); - switch (relationMain) { - case "head": - if (relationSub == "head") { - break; - } else if (relationSub == "tail") { - const migrationTrainData = [ - ...showNearTrain.slice(0, subTrainStationPosition), - ...trainData, - ]; - setTrainData(migrationTrainData); - } else if (relationSub == "middle") { - const migrationTrainData = [ - ...showNearTrain.slice(0, subTrainStationPosition), - ...trainData, - ]; - setTrainData(migrationTrainData); - } - break; - case "tail": - if (relationSub == "head") { - const migrationTrainData = [ - ...trainData.slice(0, mainTrainStationPosition), - ...showNearTrain, - ]; - setTrainData(migrationTrainData); - } else if (relationSub == "tail") { - break; - } else if (relationSub == "middle") { - const migrationTrainData = [ - ...trainData.slice(0, mainTrainStationPosition), - ...showNearTrain.slice(subTrainStationPosition), - ]; - setTrainData(migrationTrainData); - } - break; - case "middle": - if (relationSub == "head") { - const migrationTrainData = [ - ...trainData.slice(0, mainTrainStationPosition), - ...showNearTrain, - ]; - setTrainData(migrationTrainData); - } else if (relationSub == "tail") { - const migrationTrainData = [ - ...showNearTrain.slice(0, subTrainStationPosition), - ...trainData.slice(mainTrainStationPosition), - ]; - setTrainData(migrationTrainData); - } - break; - } + switch (relationMain) { + case "head": + if (relationSub == "head") { + return; + } else if (relationSub == "tail") { + return [ + ...showNearTrain.slice(0, subTrainStationPosition), + ...trainData, + ]; + } else if (relationSub == "middle") { + return [ + ...showNearTrain.slice(0, subTrainStationPosition), + ...trainData, + ]; + } else return; + case "tail": + if (relationSub == "head") { + return [ + ...trainData.slice(0, mainTrainStationPosition), + ...showNearTrain, + ]; + } else if (relationSub == "tail") { + return; + } else if (relationSub == "middle") { + return [ + ...trainData.slice(0, mainTrainStationPosition), + ...showNearTrain.slice(subTrainStationPosition), + ]; + } else return; + case "middle": + if (relationSub == "head") { + return [ + ...trainData.slice(0, mainTrainStationPosition), + ...showNearTrain, + ]; + } else if (relationSub == "tail") { + return [ + ...showNearTrain.slice(0, subTrainStationPosition), + ...trainData.slice(mainTrainStationPosition), + ]; + } else return; + } + }; + const array = migrationArray(stationInfo); + if (!array) return; + setTrainData(array); setIsConcatNear(true); }; From e3a65b9127132cb1119063f33179b3ab4d5bdfcd Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Sat, 3 Feb 2024 02:30:36 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=E5=A4=9A=E5=B1=A4=E5=BB=BA=E3=81=A6?= =?UTF-8?q?=E5=88=97=E8=BB=8A=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionSheetComponents/EachTrainInfo.js | 69 +++++++++++++++---- 1 file changed, 54 insertions(+), 15 deletions(-) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index 84320ca..999a1ed 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -51,6 +51,7 @@ export const EachTrainInfo = (props) => { const [isConcatNear, setIsConcatNear] = useState(false); const [tailStation, setTailStation] = useState(); const [headStation, setHeadStation] = useState(); + // const [actionSheetHorizonalScroll, setActionSheetHorizonalScroll] = useState(false); //裏列車探索 useEffect(() => { @@ -165,7 +166,12 @@ export const EachTrainInfo = (props) => { originalStationList, from: "AllTrainDiagramView", }; - //SheetManager.show("EachTrainInfo", { payload }); + SheetManager.hide("EachTrainInfo").then(() => { + //0.1秒待機してから開く + setTimeout(() => { + SheetManager.show("EachTrainInfo", { payload }); + }, 1); + }); }; useEffect(() => { setCurrentTrainData( @@ -380,7 +386,7 @@ export const EachTrainInfo = (props) => { const scrollHandlers = useScrollHandlers("scrollview-1", actionSheetRef); return ( } ref={actionSheetRef} drawUnderStatusBar={false} @@ -448,6 +454,9 @@ export const EachTrainInfo = (props) => { {from == "AllTrainDiagramView" || ( setActionSheetHorizonalScroll(true)} + //onScrollEndDrag={() => setActionSheetHorizonalScroll(false)} + //onScrollBeginDrag={() => console.log("onScrollBeginDrag")} style={{ flexDirection: "row", //width: widthPercentageToDP("200%"), @@ -460,6 +469,8 @@ export const EachTrainInfo = (props) => { {/* { +const TrainDataView = ({ + currentTrainData, + currentPosition, + nearTrainIDList, + openTrainInfo, +}) => { return ( { } /> - - + + + + { + if (nearTrainIDList.length == 0) return; + openTrainInfo(nearTrainIDList[0]); + }} + > + {nearTrainIDList.length == 0 ? ( + + ) : ( + + )} + ); }; -const StateBox = ({ text, title }) => ( - - {title} +const StateBox = ({ text, title, style }) => ( + + {title} - + {text?.match("～") ? ( <> {text.split("～")[0]} @@ -917,7 +956,7 @@ const boxStyle = { margin: 10, }; const boxTextStyle = { - fontSize: 28, + fontSize: 25, color: "#0099CC", textAlign: "right", }; From cbcb0dc9c2fec766f563559a7d9303fb8d402e9a Mon Sep 17 00:00:00 2001 From: harukin-OneMix4 Date: Sat, 3 Feb 2024 02:34:58 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=E3=82=B8=E3=82=A7=E3=82=B9=E3=83=81?= =?UTF-8?q?=E3=83=A3=E3=83=BC=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=83=90?= =?UTF-8?q?=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ActionSheetComponents/EachTrainInfo.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/ActionSheetComponents/EachTrainInfo.js b/components/ActionSheetComponents/EachTrainInfo.js index 999a1ed..e88a619 100644 --- a/components/ActionSheetComponents/EachTrainInfo.js +++ b/components/ActionSheetComponents/EachTrainInfo.js @@ -386,6 +386,7 @@ export const EachTrainInfo = (props) => { const scrollHandlers = useScrollHandlers("scrollview-1", actionSheetRef); return ( } ref={actionSheetRef}