Compare commits

..

No commits in common. "0aaf171477659e632a23aeb6af39e83d5acf70c2" and "2776f17681ac2bf76a70c268c4db8921c5888a4f" have entirely different histories.

5 changed files with 19 additions and 9 deletions

View File

@ -14,7 +14,7 @@ import { ListItem } from "native-base";
import { SwitchArea } from "../atom/SwitchArea"; import { SwitchArea } from "../atom/SwitchArea";
import { useNotification } from "../../stateBox/useNotifications"; import { useNotification } from "../../stateBox/useNotifications";
const versionCode = "5.6.0.2"; const versionCode = "5.6.0.1";
export const SettingTopPage = ({ export const SettingTopPage = ({
navigate, navigate,

View File

@ -536,7 +536,7 @@ export const customTrainDataDetector = (TrainNumber: string) => {
return { return {
type: "LTDEXP", type: "LTDEXP",
trainName: "しまんと", trainName: "しまんと",
trainIcon: "https://storage.haruk.in/s2700_smn.png", trainIcon: "https://storage.haruk.in/s2000_smn.png",
infoUrl: infoUrl:
"http://jr-shikoku.co.jp/01_trainbus/vehicle-info/shimanto.html", "http://jr-shikoku.co.jp/01_trainbus/vehicle-info/shimanto.html",
trainNumDistance: 2000, trainNumDistance: 2000,

View File

@ -116,7 +116,7 @@ export default function LED_vision(props) {
if (data.split(",")[0] === station.Station_JP) { if (data.split(",")[0] === station.Station_JP) {
if (data.match(",発,")) { if (data.match(",発,")) {
trainData.time = data.split(",発,")[1]; trainData.time = data.split(",発,")[1];
} else if(data.match(",着,")){ } else {
trainData.time = data.split(",着,")[1]; trainData.time = data.split(",着,")[1];
trainData.lastStation = "当駅止"; trainData.lastStation = "当駅止";
} }
@ -127,7 +127,7 @@ export default function LED_vision(props) {
time: trainData.time, time: trainData.time,
lastStation: trainData.lastStation, lastStation: trainData.lastStation,
}; };
}).filter((d) => d.time); });
return returnData.sort((a, b) => { return returnData.sort((a, b) => {
switch (true) { switch (true) {
case parseInt(a.time.split(":")[0]) < parseInt(b.time.split(":")[0]): case parseInt(a.time.split(":")[0]) < parseInt(b.time.split(":")[0]):
@ -138,8 +138,6 @@ export default function LED_vision(props) {
return -1; return -1;
case parseInt(a.time.split(":")[1]) > parseInt(b.time.split(":")[1]): case parseInt(a.time.split(":")[1]) > parseInt(b.time.split(":")[1]):
return 1; return 1;
default:
return 0;
} }
}); });
}; };

View File

@ -5,7 +5,7 @@ type nameString =
| "SPCL" | "SPCL"
| "Normal" | "Normal"
| string; | string;
type colorString = "aqua" | "red" | "#297bff" | "white"; type colorString = "aqua" | "red" | "blue" | "white";
type trainTypeString = type trainTypeString =
| "快速" | "快速"
| "特急" | "特急"
@ -29,7 +29,7 @@ export const getTrainType: getTrainType = (nameString) => {
case "NightLTDEXP": case "NightLTDEXP":
return { color: "red", name: "寝台特急", data: "express" }; return { color: "red", name: "寝台特急", data: "express" };
case "SPCL": case "SPCL":
return { color: "#297bff", name: "臨時", data: "normal" }; return { color: "blue", name: "臨時", data: "normal" };
case "OneMan": case "OneMan":
return { color: "white", name: "普通列車(ワンマン)", data: "normal" }; return { color: "white", name: "普通列車(ワンマン)", data: "normal" };
case "Normal": case "Normal":

14
menu.js
View File

@ -131,7 +131,19 @@ export default function Menu({ getCurrentTrain }) {
const [trainDiagram, setTrainDiagram] = useState(null); // 全列車のダイヤを列番ベースで整理 const [trainDiagram, setTrainDiagram] = useState(null); // 全列車のダイヤを列番ベースで整理
useEffect(() => { useEffect(() => {
//全列車リストを生成する副作用[無条件初回実行] //全列車リストを生成する副作用[無条件初回実行]
setTrainDiagram(trainList); fetch(
"https://train.jr-shikoku.co.jp/g?arg1=station&arg2=traintimeinfo&arg3=dia",
HeaderConfig
)
.then((response) => response.text())
.then((d) => {
if (d.indexOf("<title>404 Not Found</title>") != -1) throw Error;
setTrainDiagram(parseAllTrainDiagram(d));
})
.catch(() => {
console.log("fallback");
setTrainDiagram(trainList);
});
}, []); }, []);
const oPSign = () => { const oPSign = () => {