Merge commit 'ec8c0559a08e37fad9b32586f14c2daa3250aa50' into patch/5.0.x

components/Settings/SettingTopPage.js

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

components/custom-train-data.ts

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

components/発車時刻表/LED_vidion.js

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

lib/getTrainType.ts

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

menu.js

@@ -131,19 +131,7 @@ export default function Menu({ getCurrentTrain }) {
   const [trainDiagram, setTrainDiagram] = useState(null); // 全列車のダイヤを列番ベースで整理
   useEffect(() => {
     //全列車リストを生成する副作用[無条件初回実行]
-    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 = () => {