細かい仕様調整
This commit is contained in:
@@ -431,7 +431,7 @@ export const EachTrainInfoCore = ({
|
|||||||
)}
|
)}
|
||||||
{trainDataWidhThrough.map((i, index) =>
|
{trainDataWidhThrough.map((i, index) =>
|
||||||
i.split(",")[1] == "提" ? (
|
i.split(",")[1] == "提" ? (
|
||||||
<DataFromButton i={i} />
|
<DataFromButton i={i} key={i + "-data"} />
|
||||||
) : (
|
) : (
|
||||||
<EachStopList
|
<EachStopList
|
||||||
{...{
|
{...{
|
||||||
|
@@ -21,7 +21,7 @@ import { useEffect, useState } from "react";
|
|||||||
import { Text, TouchableOpacity, View } from "react-native";
|
import { Text, TouchableOpacity, View } from "react-native";
|
||||||
|
|
||||||
export const FixedStation = ({ stationID }) => {
|
export const FixedStation = ({ stationID }) => {
|
||||||
const { fixedPosition, setFixedPosition } = useCurrentTrain();
|
const { currentTrain, setFixedPosition } = useCurrentTrain();
|
||||||
const { getStationDataFromId } = useStationList();
|
const { getStationDataFromId } = useStationList();
|
||||||
const [station, setStation] = useState<StationProps[]>([]);
|
const [station, setStation] = useState<StationProps[]>([]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -38,7 +38,6 @@ export const FixedStation = ({ stationID }) => {
|
|||||||
const { areaInfo, areaStationID } = useAreaInfo();
|
const { areaInfo, areaStationID } = useAreaInfo();
|
||||||
const [stationDiagram, setStationDiagram] = useState({}); //当該駅の全時刻表
|
const [stationDiagram, setStationDiagram] = useState({}); //当該駅の全時刻表
|
||||||
const [isInfoArea, setIsInfoArea] = useState(false);
|
const [isInfoArea, setIsInfoArea] = useState(false);
|
||||||
const { currentTrain } = useCurrentTrain();
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// 現在の駅に停車するダイヤを作成する副作用[列車ダイヤと現在駅情報]
|
// 現在の駅に停車するダイヤを作成する副作用[列車ダイヤと現在駅情報]
|
||||||
|
@@ -105,10 +105,13 @@ export const EachData: FC<Props> = (props) => {
|
|||||||
const [isShow, setIsShow] = useState(true);
|
const [isShow, setIsShow] = useState(true);
|
||||||
const [isDepartureNow, setIsDepartureNow] = useState(false);
|
const [isDepartureNow, setIsDepartureNow] = useState(false);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
const [h, m] = d.time.split(":");
|
||||||
|
const IntH = parseInt(h);
|
||||||
|
const IntM = parseInt(m);
|
||||||
const currentTime = dayjs();
|
const currentTime = dayjs();
|
||||||
const trainTime = currentTime
|
const trainTime = currentTime
|
||||||
.set("hour", parseInt(d.time.split(":")[0]))
|
.set("hour", IntH < 4 ? IntH + 24 : IntH)
|
||||||
.set("minute", parseInt(d.time.split(":")[1]));
|
.set("minute", IntM);
|
||||||
const diff = trainTime.diff(currentTime, "minute");
|
const diff = trainTime.diff(currentTime, "minute");
|
||||||
if (diff < 2) setIsDepartureNow(true);
|
if (diff < 2) setIsDepartureNow(true);
|
||||||
else setIsDepartureNow(false);
|
else setIsDepartureNow(false);
|
||||||
|
4
menu.tsx
4
menu.tsx
@@ -139,8 +139,6 @@ export const Menu: FC<props> = (props) => {
|
|||||||
}, []);
|
}, []);
|
||||||
if (_stList.length == 0) setNearPositionStation([]);
|
if (_stList.length == 0) setNearPositionStation([]);
|
||||||
else {
|
else {
|
||||||
console.log("hoge");
|
|
||||||
console.log(_stList);
|
|
||||||
let returnData: StationProps[][] = [];
|
let returnData: StationProps[][] = [];
|
||||||
_stList.forEach((d, index, array) => {
|
_stList.forEach((d, index, array) => {
|
||||||
const stationName = d.Station_JP;
|
const stationName = d.Station_JP;
|
||||||
@@ -206,8 +204,6 @@ export const Menu: FC<props> = (props) => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (JSON.stringify(returnData) == JSON.stringify(listUpStation)) return;
|
if (JSON.stringify(returnData) == JSON.stringify(listUpStation)) return;
|
||||||
console.log("returnData");
|
|
||||||
console.log(returnData);
|
|
||||||
setListUpStation(returnData);
|
setListUpStation(returnData);
|
||||||
} else if (stationListMode == "position") {
|
} else if (stationListMode == "position") {
|
||||||
const returnData = nearPositionStation.filter((d) => d != undefined);
|
const returnData = nearPositionStation.filter((d) => d != undefined);
|
||||||
|
Reference in New Issue
Block a user