props宣言の変更
This commit is contained in:
parent
26111e7ce8
commit
f5491200eb
@ -40,7 +40,12 @@ let diagramData = undefined;
|
|||||||
* 9031M サンライズ瀬戸琴平(延長)(臨時?)
|
* 9031M サンライズ瀬戸琴平(延長)(臨時?)
|
||||||
* 9062D 四国まんなか千年ものがたり(臨時?)
|
* 9062D 四国まんなか千年ものがたり(臨時?)
|
||||||
*/
|
*/
|
||||||
export default function LED_vision(props) {
|
export default function LED_vision({
|
||||||
|
station,
|
||||||
|
navigate,
|
||||||
|
setTrainInfo,
|
||||||
|
EachTrainInfoAsSR,
|
||||||
|
}) {
|
||||||
const HeaderConfig = {
|
const HeaderConfig = {
|
||||||
headers: {
|
headers: {
|
||||||
referer: "https://train.jr-shikoku.co.jp/sp.html",
|
referer: "https://train.jr-shikoku.co.jp/sp.html",
|
||||||
@ -91,12 +96,12 @@ export default function LED_vision(props) {
|
|||||||
}
|
}
|
||||||
let returnData = {};
|
let returnData = {};
|
||||||
Object.keys(trainDiagram).forEach((key) => {
|
Object.keys(trainDiagram).forEach((key) => {
|
||||||
if (trainDiagram[key].match(props.station.Station_JP + ",")) {
|
if (trainDiagram[key].match(station.Station_JP + ",")) {
|
||||||
returnData[key] = trainDiagram[key];
|
returnData[key] = trainDiagram[key];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
setStationDiagram(returnData);
|
setStationDiagram(returnData);
|
||||||
}, [trainDiagram, props.station]);
|
}, [trainDiagram, station]);
|
||||||
|
|
||||||
const getCurrentTrain = () =>
|
const getCurrentTrain = () =>
|
||||||
fetch(
|
fetch(
|
||||||
@ -157,7 +162,7 @@ export default function LED_vision(props) {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
//現在の駅に停車する列車から時刻を切り出してLEDベースにフォーマット
|
//現在の駅に停車する列車から時刻を切り出してLEDベースにフォーマット
|
||||||
if (objectIsEmpty(stationDiagram)) return () => {};
|
if (objectIsEmpty(stationDiagram)) return () => {};
|
||||||
const getTimeData = getTime(stationDiagram, props.station);
|
const getTimeData = getTime(stationDiagram, station);
|
||||||
setTrainTimeAndNumber(getTimeData);
|
setTrainTimeAndNumber(getTimeData);
|
||||||
}, [stationDiagram]);
|
}, [stationDiagram]);
|
||||||
|
|
||||||
@ -211,9 +216,9 @@ export default function LED_vision(props) {
|
|||||||
props={props}
|
props={props}
|
||||||
currentTrain={currentTrain}
|
currentTrain={currentTrain}
|
||||||
customTrainDataDetector={customTrainDataDetector}
|
customTrainDataDetector={customTrainDataDetector}
|
||||||
navigate={props.navigate}
|
navigate={navigate}
|
||||||
setTrainInfo={props.setTrainInfo}
|
setTrainInfo={setTrainInfo}
|
||||||
EachTrainInfoAsSR={props.EachTrainInfoAsSR}
|
EachTrainInfoAsSR={EachTrainInfoAsSR}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
<Footer
|
<Footer
|
||||||
@ -353,6 +358,7 @@ const EachData = ({
|
|||||||
const openTrainInfo = (d) => {
|
const openTrainInfo = (d) => {
|
||||||
console.log(train);
|
console.log(train);
|
||||||
console.log(d);
|
console.log(d);
|
||||||
|
console.log(currentTrain);
|
||||||
let TrainNumber = "";
|
let TrainNumber = "";
|
||||||
if (train.trainNumDistance != undefined) {
|
if (train.trainNumDistance != undefined) {
|
||||||
const timeInfo =
|
const timeInfo =
|
||||||
@ -479,7 +485,7 @@ const StatusAndDelay = ({ currentTrain, d, props, trainDescriptionSwitch }) => {
|
|||||||
const delay = current.delay;
|
const delay = current.delay;
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case delay === "入線":
|
case delay === "入線":
|
||||||
if (current.Pos === props.station.Station_JP) {
|
if (current.Pos === station.Station_JP) {
|
||||||
setStatus("当駅始発");
|
setStatus("当駅始発");
|
||||||
break;
|
break;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user