文字がはみ出ている問題を修正

App.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { NavigationContainer } from "@react-navigation/native";
 import {
   createStackNavigator,
@@ -8,14 +8,25 @@ import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
 import { AntDesign, Ionicons } from "@expo/vector-icons";
 import { Platform, UIManager } from "react-native";
 import { UpdateAsync } from "./UpdateAsync.js";
+import { getStationList2 } from "./lib/getStationList2";
+import { AS } from "./storageControl";
 import Apps from "./Apps";
-import tndView from "./ndView";
-import trainbase from "./trainbaseview";
-import howto from "./howto";
-import menu from "./menu";
+import TNDView from "./ndView";
+import TrainBase from "./trainbaseview";
+import HowTo from "./howto";
+import Menu from "./menu";
 import News from "./components/news.js";
 import Setting from "./components/settings.js";
-import trainMenu from "./components/trainMenu.js";
+import TrainMenu from "./components/trainMenu.js";
+import FavoriteList from "./components/FavoriteList.js";
+import { LogBox } from "react-native";
+import useInterval from "./lib/useInterval";
+import { HeaderConfig } from "./lib/HeaderConfig";
+
+LogBox.ignoreLogs([
+  "ViewPropTypes will be removed",
+  "ColorPropType will be removed",
+]);
 const Stack = createStackNavigator();
 const Tab = createBottomTabNavigator();
 if (Platform.OS === "android") {
@@ -24,96 +35,312 @@ if (Platform.OS === "android") {
   }
 }
 export default function App() {
-  const navigationRef = useRef();
-  useEffect(UpdateAsync, []);
+  useEffect(() => {
+    UpdateAsync();
+  }, []);
+  const [favoriteStation, setFavoriteStation] = useState([]);
+
+  useEffect(() => {
+    AS.getItem("favoriteStation")
+      .then((d) => {
+        const returnData = JSON.parse(d);
+        setFavoriteStation(returnData);
+      })
+      .catch((d) => console.log(d));
+  }, []);
+  const [busAndTrainData, setBusAndTrainData] = useState([]);
+  useEffect(() => {
+    AS.getItem("busAndTrain")
+      .then((d) => {
+        const returnData = JSON.parse(d);
+        setBusAndTrainData(returnData);
+      })
+      .catch((d) => {
+        fetch(
+          "https://script.google.com/macros/s/AKfycbw0UW6ZeCDgUYFRP0zxpc_Oqfy-91dBdbWv-cM8n3narKp14IyCd2wy5HW7taXcW7E/exec"
+        )
+          .then((d) => d.json())
+          .then((d) => {
+            setBusAndTrainData(d);
+            AS.setItem("busAndTrain", JSON.stringify(d));
+          });
+      });
+  }, []);
+
+  const [currentTrain, setCurrentTrain] = useState([]); //現在在線中の全列車 { num: 列車番号, delay: 遅延時分(状態), Pos: 位置情報 }
+  const [currentTrainLoading, setCurrentTrainLoading] = useState("loading"); // success, error, loading
+  const getCurrentTrain = () =>
+    fetch(
+      "https://train.jr-shikoku.co.jp/g?arg1=train&arg2=train",
+      HeaderConfig
+    )
+      .then((response) => response.json())
+      .then((d) =>
+        d.map((x) => ({ num: x.TrainNum, delay: x.delay, Pos: x.Pos }))
+      )
+      .then((d) => {
+        setCurrentTrain(d);
+        setCurrentTrainLoading("success");
+      })
+      .catch((e) => {
+        console.log("えらー");
+        setCurrentTrainLoading("error");
+      });
+
+  useEffect(getCurrentTrain, []); //初回だけ現在の全在線列車取得
+
+  useInterval(getCurrentTrain, 15000); //15秒毎に全在線列車取得
+
   return (
-    <NavigationContainer name="Root" ref={navigationRef} style={{ flex: 1 }}>
-      <Tab.Navigator>
-        <Stack.Screen
+    <NavigationContainer name="Root" style={{ flex: 1 }}>
+      <Tab.Navigator detachInactiveScreens={false}>
+        <Tab.Screen
           name="login"
-          component={top}
           options={{
             tabBarLabel: "位置情報",
             headerTransparent: true,
             gestureEnabled: true,
-            tabBarIcon: () => <AntDesign name="barchart" size={32} />,
+            tabBarIcon: initIcon("barchart", "AntDesign"),
           }}
+        >
+          {(props) => (
+            <Top
+              {...props}
+              favoriteStation={favoriteStation}
+              setFavoriteStation={setFavoriteStation}
+              busAndTrainData={busAndTrainData}
+              currentTrainState={{ currentTrain, setCurrentTrain }}
+              currentTrainLoadingState={{
+                currentTrainLoading,
+                setCurrentTrainLoading,
+              }}
+              getCurrentTrain={getCurrentTrain}
             />
-        <Stack.Screen
+          )}
+        </Tab.Screen>
+        <Tab.Screen
           name="menuPage"
-          component={menuPage}
           options={{
             tabBarLabel: "リンク",
             headerTransparent: true,
             gestureEnabled: true,
-            tabBarIcon: () => <Ionicons name="ios-radio" size={32} />,
+            tabBarIcon: initIcon("ios-radio", "Ionicons"),
           }}
+        >
+          {(props) => (
+            <MenuPage
+              {...props}
+              favoriteStation={favoriteStation}
+              setFavoriteStation={setFavoriteStation}
+              busAndTrainData={busAndTrainData}
+              currentTrainState={{ currentTrain, setCurrentTrain }}
+              currentTrainLoadingState={{
+                currentTrainLoading,
+                setCurrentTrainLoading,
+              }}
+              getCurrentTrain={getCurrentTrain}
             />
-        <Stack.Screen
+          )}
+        </Tab.Screen>
+        <Tab.Screen
           name="home"
-          component={tndView}
           options={{
             tabBarLabel: "運行情報",
             headerTransparent: true,
             gestureEnabled: true,
-            tabBarIcon: () => <Ionicons name="md-train" size={32} />,
+            tabBarIcon: initIcon("md-train", "Ionicons"),
           }}
-        />
+        >
+          {(props) => <TNDView {...props} />}
+        </Tab.Screen>
       </Tab.Navigator>
     </NavigationContainer>
   );
 }
-function top() {
+
+const initIcon = (name, type) => {
+  switch (type) {
+    case "Ionicons":
+      return ({ focused, color, size }) => (
+        <Ionicons name={name} size={32} color={focused ? "#0099CC" : "black"} />
+      );
+    case "AntDesign":
+      return ({ focused, color, size }) => (
+        <AntDesign
+          name={name}
+          size={32}
+          color={focused ? "#0099CC" : "black"}
+        />
+      );
+  }
+};
+
+const Top = ({
+  navigation,
+  favoriteStation,
+  setFavoriteStation,
+  busAndTrainData,
+  currentTrainState,
+  currentTrainLoadingState,
+  getCurrentTrain,
+}) => {
+  const webview = useRef();
+
+  //地図用
+  const [mapsStationData, setMapsStationData] = useState(undefined);
+
+  useEffect(() => {
+    getStationList2().then(setMapsStationData);
+  }, []);
+
+  useEffect(() => {
+    const unsubscribe = navigation.addListener("tabLongPress", (e) => {
+      navigation.navigate("favoriteList");
+    });
+
+    return unsubscribe;
+  }, [navigation]);
+
   return (
     <Stack.Navigator>
       <Stack.Screen
         name="Apps"
-        component={Apps}
         options={{
           headerShown: false,
           gestureEnabled: true,
           headerTransparent: true,
         }}
+      >
+        {(props) => (
+          <Apps
+            {...props}
+            webview={webview}
+            favoriteStation={favoriteStation}
+            setFavoriteStation={setFavoriteStation}
+            busAndTrainData={busAndTrainData}
+            stationData={mapsStationData}
+            currentTrainState={currentTrainState}
+            currentTrainLoadingState={currentTrainLoadingState}
+            getCurrentTrain={getCurrentTrain}
           />
+        )}
+      </Stack.Screen>
       <Stack.Screen
         name="trainbase"
-        component={trainbase}
         options={{
           title: "トレインビジョン",
           gestureEnabled: true,
           ...TransitionPresets.SlideFromRightIOS,
         }}
-      />
+      >
+        {(props) => <TrainBase {...props} />}
+      </Stack.Screen>
       <Stack.Screen
         name="howto"
-        component={howto}
         options={{
-          title: "使い方",
           ...optionData,
         }}
+      >
+        {(props) => <HowTo {...props} />}
+      </Stack.Screen>
+      <Stack.Screen name="news" options={optionData}>
+        {(props) => <News {...props} />}
+      </Stack.Screen>
+      <Stack.Screen name="trainMenu" options={optionData}>
+        {(props) => (
+          <TrainMenu
+            {...props}
+            webview={webview}
+            stationData={mapsStationData}
           />
-      <Stack.Screen name="news" component={News} options={optionData} />
+        )}
+      </Stack.Screen>
       <Stack.Screen
-        name="trainMenu"
-        component={trainMenu}
-        options={optionData}
+        name="favoriteList"
+        options={{ ...optionData, gestureEnabled: false }}
+      >
+        {(props) => (
+          <FavoriteList
+            {...props}
+            webview={webview}
+            stationData={mapsStationData}
+            favoriteStation={favoriteStation}
+            setFavoriteStation={setFavoriteStation}
           />
+        )}
+      </Stack.Screen>
     </Stack.Navigator>
   );
-}
-function menuPage() {
+};
+function MenuPage({
+  navigation,
+  favoriteStation,
+  setFavoriteStation,
+  busAndTrainData,
+  currentTrainState,
+  currentTrainLoadingState,
+  getCurrentTrain,
+}) {
+  useEffect(() => {
+    const unsubscribe = navigation.addListener("tabPress", (e) => {
+      AS.getItem("favoriteStation")
+        .then((d) => {
+          const returnData = JSON.parse(d);
+          if (favoriteStation.toString() != d) {
+            setFavoriteStation(returnData);
+          }
+        })
+        .catch((d) => console.log(d));
+    });
+
+    return unsubscribe;
+  }, [navigation]);
   return (
     <Stack.Navigator>
       <Stack.Screen
         name="menu"
-        component={menu}
         options={{
           headerShown: false,
           gestureEnabled: true,
           headerTransparent: true,
         }}
+      >
+        {(props) => (
+          <Menu
+            {...props}
+            favoriteStation={favoriteStation}
+            setFavoriteStation={setFavoriteStation}
+            busAndTrainData={busAndTrainData}
+            currentTrainState={currentTrainState}
+            currentTrainLoadingState={currentTrainLoadingState}
+            getCurrentTrain={getCurrentTrain}
           />
-      <Stack.Screen name="setting" component={Setting} options={optionData} />
+        )}
+      </Stack.Screen>
+      <Stack.Screen name="setting" options={optionData}>
+        {(props) => <Setting {...props} />}
+      </Stack.Screen>
+      <Stack.Screen
+        name="trainbase"
+        options={{
+          ...TransitionPresets.ModalPresentationIOS,
+          cardOverlayEnabled: true,
+          headerShown: false,
+          gestureEnabled: true,
+          headerTransparent: true,
+          gestureResponseDistance: { vertical: 300 },
+        }}
+      >
+        {(props) => <TrainBase {...props} />}
+      </Stack.Screen>
+      <Stack.Screen
+        name="howto"
+        options={{
+          ...optionData,
+        }}
+      >
+        {(props) => <HowTo {...props} />}
+      </Stack.Screen>
     </Stack.Navigator>
   );
 }

Apps.js

@@ -8,138 +8,195 @@ import {
 } from "react-native";
 import { WebView } from "react-native-webview";
 import Constants from "expo-constants";
-import AsyncStorage from "@react-native-async-storage/async-storage";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import { AS } from "./storageControl";
 import { news } from "./config/newsUpdate";
-import { getStationList } from "./lib/getStationList";
+import { getStationList, lineList } from "./lib/getStationList";
 import { StationDeteilView } from "./components/ActionSheetComponents/StationDeteilView";
 import { injectJavascriptData } from "./lib/webViewInjectjavascript";
 import { getStationList2 } from "./lib/getStationList2";
+import { EachTrainInfo } from "./components/ActionSheetComponents/EachTrainInfo";
+import { checkDuplicateTrainData } from "./lib/checkDuplicateTrainData";
 /* 
 import StatusbarDetect from './StatusbarDetect';
 var Status = StatusbarDetect(); */
 
-export default function Apps(props) {
-  const {
-    navigation: { navigate },
-  } = props;
+export default function Apps({
+  navigation,
+  webview,
+  favoriteStation,
+  setFavoriteStation,
+  busAndTrainData,
+  stationData,
+  currentTrainState,
+  currentTrainLoadingState,
+  getCurrentTrain,
+}) {
+  const { currentTrain, setCurrentTrain } = currentTrainState;
+  const { currentTrainLoading, setCurrentTrainLoading } =
+    currentTrainLoadingState;
+  const { navigate } = navigation;
   var urlcache = "";
-  const webview = useRef();
+
   //画面表示関連
   const [iconSetting, setIconSetting] = useState(undefined);
   const [mapSwitch, setMapSwitch] = useState(undefined);
   const [stationMenu, setStationMenu] = useState(undefined);
 
-  //地図用
-  const [mapsStationData, setMapsStationData] = useState(undefined);
-  useEffect(() => {
-    getStationList2().then((data) => {
-      console.log(data);
-      setMapsStationData(data);
+  //列車情報表示関連
+  const EachTrainInfoAsSR = useRef(null);
+  const [trainInfo, setTrainInfo] = useState({
+    trainNum: undefined,
+    limited: undefined,
+    trainData: undefined,
   });
-  }, []);
 
   //駅情報画面用
   const StationBoardAcSR = useRef(null);
   const [stationBoardData, setStationBoardData] = useState(undefined);
   const [originalStationList, setOriginalStationList] = useState();
   const [selectedStation, setSelectedStation] = useState(undefined);
-  useEffect(() => getStationList().then(setOriginalStationList), []);
+  const [trainMenu, setTrainMenu] = useState("true");
+  let once = false;
+  useEffect(() => {
+    getStationList().then(setOriginalStationList);
+  }, []);
 
+  useEffect(() => {}, [stationData, favoriteStation]);
   //地図表示テキスト
   const injectJavascript = injectJavascriptData(
     mapSwitch,
     iconSetting,
-    stationMenu
+    stationMenu,
+    trainMenu
   );
 
   useEffect(() => {
     //ニュース表示
-    AsyncStorage.getItem("status")
+    AS.getItem("status")
       .then((d) => {
         if (d != news) navigate("news");
       })
       .catch((e) => navigate("news"));
+  }, []);
 
+  useEffect(() => {
     //列車アイコンスイッチ
-    AsyncStorage.getItem("iconSwitch")
+    AS.getItem("iconSwitch")
       .then((d) => {
         if (d) {
           setIconSetting(d);
         } else {
-          AsyncStorage.setItem("iconSwitch", "true").then(() =>
-            Updates.reloadAsync()
-          );
+          AS.setItem("iconSwitch", "true").then(Updates.reloadAsync);
         }
       })
-      .catch((d) =>
-        AsyncStorage.setItem("iconSwitch", "true").then(() =>
-          Updates.reloadAsync()
-        )
-      );
+      .catch((d) => AS.setItem("iconSwitch", "true").then(Updates.reloadAsync));
+  }, []);
 
+  useEffect(() => {
     //地図スイッチ
-    AsyncStorage.getItem("mapSwitch")
+    AS.getItem("mapSwitch")
       .then((d) => {
         if (d) {
           setMapSwitch(d);
         } else {
-          AsyncStorage.setItem("mapSwitch", "false").then(() =>
-            Updates.reloadAsync()
-          );
+          AS.setItem("mapSwitch", "false").then(Updates.reloadAsync);
         }
       })
-      .catch((d) =>
-        AsyncStorage.setItem("mapSwitch", "false").then(() =>
-          Updates.reloadAsync()
-        )
-      );
+      .catch((d) => AS.setItem("mapSwitch", "false").then(Updates.reloadAsync));
+  }, []);
+
+  useEffect(() => {
     //駅メニュースイッチ
-    AsyncStorage.getItem("stationSwitch")
+    AS.getItem("stationSwitch")
       .then((d) => {
         if (d) {
           setStationMenu(d);
         } else {
-          AsyncStorage.setItem("stationSwitch", "true").then(() =>
-            Updates.reloadAsync()
-          );
+          AS.setItem("stationSwitch", "true").then(Updates.reloadAsync);
         }
       })
       .catch((d) =>
-        AsyncStorage.setItem("stationSwitch", "true").then(() =>
-          Updates.reloadAsync()
-        )
+        AS.setItem("stationSwitch", "true").then(Updates.reloadAsync)
+      );
+  }, []);
+  useEffect(() => {
+    //列車メニュースイッチ
+    AS.getItem("trainSwitch")
+      .then((d) => {
+        if (d) {
+          setTrainMenu(d);
+        } else {
+          AS.setItem("trainSwitch", "true").then(Updates.reloadAsync);
+        }
+      })
+      .catch((d) =>
+        AS.setItem("trainSwitch", "true").then(Updates.reloadAsync)
       );
   }, []);
 
-  return (
-    <View
-      style={{
-        height: "100%",
-        paddingTop: Platform.OS == "ios" ? Constants.statusBarHeight : 0,
-      }}
-    >
-      {/* {Status} */}
-      <WebView
-        useWebKit={true}
-        ref={webview}
-        source={{ uri: "https://train.jr-shikoku.co.jp/sp.html" }}
-        originWhitelist={[
-          "https://train.jr-shikoku.co.jp",
-          "https://train.jr-shikoku.co.jp/sp.html",
-        ]}
-        mixedContentMode={"compatibility"}
-        javaScriptEnabled={true}
-        allowsBackForwardNavigationGestures={true}
-        setSupportMultipleWindows={true}
-        onNavigationStateChange={(event) => {
+  const onMessage = (event) => {
+    if (event.nativeEvent.data.includes("train.html")) {
+      navigate("trainbase", { info: event.nativeEvent.data, from: "Train" });
+      return;
+    }
+    if (!originalStationList) {
+      alert("駅名標データを取得中...");
+      return;
+    }
+    const dataSet = JSON.parse(event.nativeEvent.data);
+    switch (dataSet.type) {
+      case "PopUpMenu": {
+        const selectedStationPDFAddress = dataSet.pdf;
+        const findStationEachLine = (selectLine) => {
+          let NearStation = selectLine.filter(
+            (d) => d.StationTimeTable == selectedStationPDFAddress
+          );
+          return NearStation;
+        };
+        let returnDataBase = lineList
+          .map((d) => findStationEachLine(originalStationList[d]))
+          .filter((d) => d.length > 0)
+          .reduce((pre, current) => {
+            pre.push(...current);
+            return pre;
+          }, []);
+
+        if (returnDataBase.length) {
+          setStationBoardData(returnDataBase);
+          StationBoardAcSR.current?.show();
+        } else {
+          setStationBoardData(undefined);
+          StationBoardAcSR.current?.hide();
+        }
+        return;
+      }
+      case "ShowTrainTimeInfo": {
+        const { trainNum, limited } = dataSet;
+        //alert(trainNum, limited);
+        setTrainInfo({
+          trainNum,
+          limited,
+          trainData: checkDuplicateTrainData(
+            currentTrain.filter((a) => a.num == trainNum)
+          ),
+        }); //遅延情報は未実装
+        EachTrainInfoAsSR.current?.show();
+        return;
+      }
+      default: {
+        return;
+      }
+    }
+  };
+
+  const onNavigationStateChange = (event) => {
     if (event.url != urlcache) {
       //URL二重判定回避
       urlcache = event.url;
 
-            if (
-              event.url.includes("https://train.jr-shikoku.co.jp/usage.htm")
-            ) {
-              if (Platform.OS === "android") navigate("howto");
+      if (event.url.includes("https://train.jr-shikoku.co.jp/usage.htm")) {
+        if (Platform.OS === "android") navigate("howto", { info: event.url });
         webview?.current.goBack();
         //Actions.howto();
       } else if (
@@ -151,36 +208,32 @@ export default function Apps(props) {
         webview?.current.goBack();
       }
     }
-        }}
-        onMessage={(event) => {
-          if (!originalStationList) {
-            alert("駅名標データを取得中...");
-            return;
-          }
-          if (event.nativeEvent.data.includes("PopUpMenu")) {
-            const selectedStationPDFAddress = event.nativeEvent.data
-              .split(",")[3]
-              .replace("'", "")
-              .replace("'", "");
+  };
+  function sleep(waitSec, callbackFunc) {
+    // 経過時間（秒）
+    var spanedSec = 0;
 
+    // 1秒間隔で無名関数を実行
+    var id = setInterval(function () {
+      spanedSec++;
+
+      // 経過時間 >= 待機時間の場合、待機終了。
+      if (spanedSec >= waitSec) {
+        // タイマー停止
+        clearInterval(id);
+
+        // 完了時、コールバック関数を実行
+        if (callbackFunc) callbackFunc();
+      }
+    }, 1);
+  }
+
+  const openStationACFromEachTrainInfo = (stationName) => {
+    EachTrainInfoAsSR.current?.hide();
     const findStationEachLine = (selectLine) => {
-              let NearStation = selectLine.filter(
-                (d) => d.StationTimeTable == selectedStationPDFAddress
-              );
+      let NearStation = selectLine.filter((d) => d.Station_JP == stationName);
       return NearStation;
     };
-
-            const lineList = [
-              "予讃線",
-              "松宇線",
-              "伊予灘線",
-              "土讃線",
-              "窪川線",
-              "高徳線",
-              "徳島線",
-              "鳴門線",
-              "瀬戸大橋線",
-            ];
     let returnDataBase = lineList
       .map((d) => findStationEachLine(originalStationList[d]))
       .filter((d) => d.length > 0)
@@ -189,29 +242,99 @@ export default function Apps(props) {
         return pre;
       }, []);
     if (returnDataBase.length) {
-              let currentStation =
-                currentStation == undefined ? [] : currentStation;
       setStationBoardData(returnDataBase);
-              StationBoardAcSR.current?.setModalVisible();
+      sleep(25, function () {
+        StationBoardAcSR.current?.show();
+      });
     } else {
       setStationBoardData(undefined);
       StationBoardAcSR.current?.hide();
     }
-
-            return;
-          }
-          navigate("trainbase", { info: event.nativeEvent.data });
+  };
+  return (
+    <View
+      style={{
+        height: "100%",
+        paddingTop: Platform.OS == "ios" ? Constants.statusBarHeight : 0,
       }}
+    >
+      {/* {Status} */}
+      <WebView
+        useWebKit
+        ref={webview}
+        source={{ uri: "https://train.jr-shikoku.co.jp/sp.html" }}
+        originWhitelist={[
+          "https://train.jr-shikoku.co.jp",
+          "https://train.jr-shikoku.co.jp/sp.html",
+        ]}
+        mixedContentMode={"compatibility"}
+        javaScriptEnabled
+        allowsBackForwardNavigationGestures
+        setSupportMultipleWindows
+        onNavigationStateChange={onNavigationStateChange}
+        onMessage={onMessage}
         injectedJavaScript={injectJavascript}
         onTouchMove={() => StationBoardAcSR.current?.hide()}
-      />
-      <TouchableOpacity
-        onPress={() =>
-          navigate("trainMenu", { webview, stationData: mapsStationData })
+        onLoadEnd={() => {
+          if (once) return () => {};
+          if (!stationData) return () => {};
+          if (favoriteStation.length > 0) {
+            const getStationLine = (now) => {
+              const returnData = Object.keys(stationData).filter((d) => {
+                const cache = stationData[d].findIndex(
+                  (data) => data.Station_JP == now.Station_JP
+                );
+                return cache != -1;
+              });
+              return returnData[0];
+            };
+            const lineName = getStationLine(favoriteStation[0][0]);
+            webview.current?.injectJavaScript(
+              `MoveDisplayStation('${lineName}_${favoriteStation[0][0].MyStation}_${favoriteStation[0][0].Station_JP}')`
+            );
+            once = true;
           }
-        style={{
+        }}
+      />
+      <MapsButton
+        onPress={() => navigate("trainMenu", { webview })}
+        top={Platform.OS == "ios" ? Constants.statusBarHeight : 0}
+        mapSwitch={mapSwitch == "true" ? "flex" : "none"}
+      />
+      <ReloadButton
+        onPress={() => webview.current.reload()}
+        top={Platform.OS == "ios" ? Constants.statusBarHeight : 0}
+      />
+
+      <StationDeteilView
+        StationBoardAcSR={StationBoardAcSR}
+        currentStation={stationBoardData}
+        originalStationList={originalStationList}
+        favoriteStation={favoriteStation}
+        setFavoriteStation={setFavoriteStation}
+        busAndTrainData={busAndTrainData}
+        navigate={navigate}
+        onExit={() => {
+          StationBoardAcSR.current?.setModalVisible();
+          navigate("Apps");
+        }}
+      />
+      <EachTrainInfo
+        setRef={EachTrainInfoAsSR}
+        data={trainInfo}
+        navigate={navigate}
+        originalStationList={originalStationList}
+        openStationACFromEachTrainInfo={openStationACFromEachTrainInfo}
+      />
+    </View>
+  );
+}
+
+const MapsButton = ({ onPress, top, mapSwitch }) => {
+  const styles = {
+    touch: {
       position: "absolute",
-          top: Platform.OS == "ios" ? Constants.statusBarHeight : 0,
+      top,
       left: 10,
       width: 50,
       height: 50,
@@ -223,30 +346,58 @@ export default function Apps(props) {
       alignContent: "center",
       alignSelf: "center",
       alignItems: "center",
-          display: mapSwitch == "true" ? "flex" : "none",
-        }}
-      >
-        <View style={{ flex: 1 }} />
-        <Text
-          style={{
+      display: mapSwitch,
+    },
+    text: {
       textAlign: "center",
       width: "auto",
       height: "auto",
       textAlignVertical: "center",
       fontWeight: "bold",
       color: "white",
-          }}
-        >
-          三
-        </Text>
+    },
+  };
+  return (
+    <TouchableOpacity onPress={onPress} style={styles.touch}>
+      <View style={{ flex: 1 }} />
+      <Text style={styles.text}>三</Text>
       <View style={{ flex: 1 }} />
     </TouchableOpacity>
-
-      <StationDeteilView
-        StationBoardAcSR={StationBoardAcSR}
-        currentStation={stationBoardData}
-        originalStationList={originalStationList}
-      />
-    </View>
   );
-}
+};
+
+const ReloadButton = ({ onPress, top, mapSwitch }) => {
+  const styles = {
+    touch: {
+      position: "absolute",
+      top,
+      right: 10,
+      width: 50,
+      height: 50,
+      backgroundColor: "#0099CC",
+      borderColor: "white",
+      borderStyle: "solid",
+      borderWidth: 1,
+      borderRadius: 50,
+      alignContent: "center",
+      alignSelf: "center",
+      alignItems: "center",
+      display: mapSwitch,
+    },
+    text: {
+      textAlign: "center",
+      width: "auto",
+      height: "auto",
+      textAlignVertical: "center",
+      fontWeight: "bold",
+      color: "white",
+    },
+  };
+  return (
+    <TouchableOpacity onPress={onPress} style={styles.touch}>
+      <View style={{ flex: 1 }} />
+      <Ionicons name="reload" color="white" size={30} />
+      <View style={{ flex: 1 }} />
+    </TouchableOpacity>
+  );
+};

UpdateAsync.js

@@ -1,7 +1,7 @@
 import { ToastAndroid } from "react-native";
 import * as Updates from "expo-updates";
 
-export const UpdateAsync = () =>
+export const UpdateAsync = () => {
   Updates.checkForUpdateAsync()
     .then((update) => {
       if (!update.isAvailable) return;
@@ -34,3 +34,4 @@ export const UpdateAsync = () =>
     .finally(() => {
       return;
     });
+};

app.json

@@ -3,8 +3,11 @@
     "name": "JR四国運行状況",
     "slug": "jrshikoku",
     "privacy": "public",
-    "platforms": ["ios", "android"],
-    "version": "4.4",
+    "platforms": [
+      "ios",
+      "android"
+    ],
+    "version": "4.5",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "splash": {
@@ -15,9 +18,11 @@
     "updates": {
       "fallbackToCacheTimeout": 0
     },
-    "assetBundlePatterns": ["**/*"],
+    "assetBundlePatterns": [
+      "**/*"
+    ],
     "ios": {
-      "buildNumber": "22",
+      "buildNumber": "28",
       "supportsTablet": true,
       "bundleIdentifier": "jrshikokuinfo.xprocess.hrkn",
       "config": {
@@ -26,14 +31,21 @@
     },
     "android": {
       "package": "jrshikokuinfo.xprocess.hrkn",
-      "versionCode": 16,
-      "permissions": ["ACCESS_FINE_LOCATION"],
+      "versionCode": 18,
+      "permissions": [
+        "ACCESS_FINE_LOCATION"
+      ],
       "googleServicesFile": "./google-services.json",
       "config": {
         "googleMaps": {
           "apiKey": "AIzaSyAmFb-Yj033bXZWlSzNrfq_0jc1PgRrWcE"
         }
       }
+    },
+    "extra": {
+      "eas": {
+        "projectId": "398abf60-57a7-11e9-970c-8f04356d08bf"
+      }
     }
   }
 }

assets/originData/lineColorList.js

@@ -0,0 +1,11 @@
+export default {
+  Y: "#F5AC13",
+  U: "#F5AC13",
+  S: "#9AA7D7",
+  D: "#DC4586",
+  K: "#DC4586",
+  B: "#366481",
+  N: "#881F61",
+  T: "#87CA3B",
+  M: "#0071be",
+};

assets/originData/uwajima.js

@@ -14,7 +14,7 @@ export default [
 {"Station_JP" : "八幡浜",   "Station_EN" : "Yawatahama",    "MyStation" : "11", "StationNumber" : "U18", "DispNum" : "3", "StationTimeTable" : "http://www.jr-shikoku.co.jp/01_trainbus/jikoku/pdf/yawatahama.pdf",    "StationMap":"https://www.google.co.jp/maps/place/33.458146,132.436002", "JrHpUrl" : "http://www.jr-shikoku.co.jp/01_trainbus/kakueki/yawatahama/"},
 {"Station_JP" : "双岩",     "Station_EN" : "Futaiwa",       "MyStation" : "12", "StationNumber" : "U19", "DispNum" : "2", "StationTimeTable" : "http://www.jr-shikoku.co.jp/01_trainbus/jikoku/pdf/futaiwa.pdf",       "StationMap":"https://www.google.co.jp/maps/place/33.424669,132.457934", "JrHpUrl" : ""},
 {"Station_JP" : "伊予石城", "Station_EN" : "Iyo-Iwaki",     "MyStation" : "13", "StationNumber" : "U20", "DispNum" : "2", "StationTimeTable" : "http://www.jr-shikoku.co.jp/01_trainbus/jikoku/pdf/iyo-iwaki.pdf",     "StationMap":"https://www.google.co.jp/maps/place/33.391413,132.473259", "JrHpUrl" : ""},
-{"Station_JP" : "卯之町",   "Station_EN" : "Unomachi",      "MyStation" : "14", "StationNumber" : "U22", "DispNum" : "3", "StationTimeTable" : "http://www.jr-shikoku.co.jp/01_trainbus/jikoku/pdf/unomachi.pdf",      "StationMap":"https://www.google.co.jp/maps/place/33.363175,132.509959", "JrHpUrl" : "http://www.jr-shikoku.co.jp/01_trainbus/kakueki/unomachi/"},
+{"Station_JP" : "卯之町",   "Station_EN" : "Unomachi",      "MyStation" : "14", "StationNumber" : "U22", "DispNum" : "3", "StationTimeTable" : "http://www.jr-shikoku.co.jp/01_trainbus/jikoku/pdf/unomachi.pdf",      "StationMap":"https://www.google.co.jp/maps/place/33.363175,132.509959", "JrHpUrl" : ""},
 {"Station_JP" : "下宇和",   "Station_EN" : "Shimo-Uwa",     "MyStation" : "15", "StationNumber" : "U23", "DispNum" : "2", "StationTimeTable" : "http://www.jr-shikoku.co.jp/01_trainbus/jikoku/pdf/shimo-uwa.pdf",     "StationMap":"https://www.google.co.jp/maps/place/33.349786,132.531172", "JrHpUrl" : ""},
 {"Station_JP" : "立間",     "Station_EN" : "Tachima",       "MyStation" : "16", "StationNumber" : "U24", "DispNum" : "2", "StationTimeTable" : "http://www.jr-shikoku.co.jp/01_trainbus/jikoku/pdf/tachima.pdf",       "StationMap":"https://www.google.co.jp/maps/place/33.296721,132.539509", "JrHpUrl" : ""},
 {"Station_JP" : "伊予吉田", "Station_EN" : "Iyo-Yoshida",   "MyStation" : "17", "StationNumber" : "U25", "DispNum" : "2", "StationTimeTable" : "http://www.jr-shikoku.co.jp/01_trainbus/jikoku/pdf/iyo-yoshida.pdf",   "StationMap":"https://www.google.co.jp/maps/place/33.273287,132.544098", "JrHpUrl" : ""},

components/ActionSheetComponents/EachTrainInfo.js

@@ -0,0 +1,714 @@
+import React, { useEffect, useState } from "react";
+import {
+  View,
+  LayoutAnimation,
+  ScrollView,
+  Linking,
+  Text,
+  TouchableOpacity,
+  TouchableWithoutFeedback,
+  TouchableHighlight,
+  Platform,
+} from "react-native";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import ActionSheet from "react-native-actions-sheet";
+import { AS } from "../../storageControl";
+import LottieView from "lottie-react-native";
+import trainList from "../../assets/originData/trainList";
+import { lineList } from "../../lib/getStationList";
+import {
+  heightPercentageToDP,
+  widthPercentageToDP,
+} from "react-native-responsive-screen";
+import lineColorList from "../../assets/originData/lineColorList";
+
+export const EachTrainInfo = ({
+  setRef,
+  data,
+  navigate,
+  originalStationList,
+  openStationACFromEachTrainInfo,
+  from,
+}) => {
+  const [trainData, setTrainData] = useState([]);
+  const [isTop, setIsTop] = useState(true);
+  const [currentPosition, setCurrentPosition] = useState([]);
+
+  const [trainPositionSwitch, setTrainPositionSwitch] = useState("false");
+
+  useEffect(() => {
+    //列車現在地アイコン表示スイッチ
+    AS.getItem("trainPositionSwitch")
+      .then((d) => {
+        if (d) {
+          setTrainPositionSwitch(d);
+        } else {
+        }
+      })
+      .catch((d) => AS.setItem("trainPositionSwitch", "false"));
+  }, []);
+
+  const getStationData = (stationName) => {
+    const Stations = stationList.map((a) =>
+      a.filter((d) => d.StationName == stationName)
+    );
+    const Station =
+      Stations &&
+      Stations.reduce((newArray, e) => {
+        return newArray.concat(e);
+      }, []);
+    if (!Station[0]) return [];
+    return Station.map((d) => d.StationNumber)[0];
+  };
+  useEffect(() => {
+    //data.trainData.Pos = "鴨川～端岡"; //test
+    if (!data.trainData?.Pos) return;
+    if (data.trainData?.Pos.match("～")) {
+      const pos = data.trainData?.Pos.replace("（下り）", "")
+        .replace("（上り）", "")
+        .split("～");
+      setCurrentPosition([getStationData(pos[0]), getStationData(pos[1])]);
+    } else {
+      setCurrentPosition([getStationData(data.trainData?.Pos)]);
+    }
+  }, [data.trainData]);
+
+  const stationList =
+    originalStationList &&
+    lineList.map((d) =>
+      originalStationList[d].map((a) => ({
+        StationNumber: a.StationNumber,
+        StationName: a.Station_JP,
+      }))
+    );
+  const stopStationIDList = trainData.map((i, index) => {
+    const [station, se, time] = i.split(",");
+    const Stations = stationList.map((a) =>
+      a.filter((d) => d.StationName == station)
+    );
+    const StationNumbers =
+      Stations &&
+      Stations.reduce((newArray, e) => {
+        return newArray.concat(e);
+      }, [])
+        .filter((d) => d.StationNumber)
+        .map((d) => d.StationNumber);
+    return StationNumbers[0];
+  });
+  function findReversalPoints(array) {
+    // arrayは現在位置の駅ID(駅在宅の場合は1つの配列、駅間の場合は2つの配列)
+    // stopStationIDListは停車駅の駅IDの配列
+    if (!stopStationIDList.length) return [];
+    const arrayNumber = array.map((d) => ({
+      line: d
+        .split("")
+        .filter((s) => "A" < s && s < "Z")
+        .join(""),
+      ID: d
+        .split("")
+        .filter((s) => "0" <= s && s <= "9")
+        .join(""),
+    }));
+    const stopStationIDListNumber = stopStationIDList.map((d) => {
+      if (!d) return { line: [], ID: [] };
+      return {
+        line: d
+          .split("")
+          .filter((s) => "A" < s && s < "Z")
+          .join(""),
+        ID: d
+          .split("")
+          .filter((s) => "0" <= s && s <= "9")
+          .join(""),
+      };
+    });
+    // 完全一致
+    if (array.length == 1) {
+      const index = stopStationIDList.indexOf(array[0]);
+      if (index != -1) return [index];
+      // 通過駅の場合
+      for (let i = 0; i < stopStationIDListNumber.length - 1; i++) {
+        if (stopStationIDListNumber[i].ID < arrayNumber[0].ID) {
+          if (stopStationIDListNumber[i + 1].ID > arrayNumber[0].ID) {
+            return [i + 1];
+          }
+        }
+        if (stopStationIDListNumber[i].ID > arrayNumber[0].ID) {
+          if (stopStationIDListNumber[i + 1].ID < arrayNumber[0].ID) {
+            return [i + 1];
+          }
+        }
+      }
+    }
+    // 駅間の場合
+    if (array.length == 2) {
+      const index1 = stopStationIDList.indexOf(array[0]);
+      const index2 = stopStationIDList.indexOf(array[1]);
+      if (index1 != -1 && index2 != -1) {
+        // 駅間で通過駅も無い場合
+        if (index1 < index2) {
+          if (index1 + 1 == index2) {
+            return [index2];
+          } else {
+            const returnArray = [];
+            for (let i = index1 + 1; i <= index2; i++) {
+              returnArray.push(i);
+            }
+            return returnArray;
+          }
+        }
+        if (index1 > index2) {
+          if (index2 + 1 == index1) return [index1];
+          else {
+            const returnArray = [];
+            for (let i = index2 + 1; i <= index1; i++) {
+              returnArray.push(i);
+            }
+            return returnArray;
+          }
+        }
+      } else {
+        const getNearStationID = (stationID) => {
+          for (let i = 0; i <= stopStationIDListNumber.length; i++) {
+            if (stopStationIDListNumber[i].ID < stationID) {
+              if (stopStationIDListNumber[i + 1].ID > stationID) {
+                return i + 1;
+              }
+            }
+            if (stopStationIDListNumber[i].ID > stationID) {
+              if (stopStationIDListNumber[i + 1].ID < stationID) {
+                return i + 1;
+              }
+            }
+          }
+        };
+        let newIndex1 = index1;
+        let newIndex2 = index2;
+        if (index1 == -1) {
+          newIndex1 = getNearStationID(arrayNumber[0].ID);
+        }
+        if (index2 == -1) {
+          newIndex2 = getNearStationID(arrayNumber[1].ID);
+        }
+        if (newIndex1 && newIndex2) {
+          return [newIndex1, newIndex2];
+        }
+
+        // 通過駅の場合
+      }
+
+      return [];
+    }
+  }
+  // 使用例
+  const points =
+    trainPositionSwitch == "true" ? findReversalPoints(currentPosition) : [];
+
+  useEffect(() => {
+    setIsTop(true);
+    if (!data.trainNum) return;
+    const TD = trainList[data.trainNum];
+    if (!TD) {
+      setTrainData([]);
+      return;
+    }
+    setTrainData(TD.split("#").filter((d) => d != ""));
+  }, [data]);
+  const getType = (string) => {
+    switch (string) {
+      case "express":
+        return "特急";
+      case "rapid":
+        return "快速";
+      default:
+        return "";
+    }
+  };
+
+  const migrateTrainName = (string) => {
+    return string
+      .replace("マリン", "マリンライナー")
+      .replace("ライナーライナー", "ライナー");
+  };
+
+  return (
+    <ActionSheet
+      ref={setRef}
+      gestureEnabled={isTop}
+      CustomHeaderComponent={<></>}
+    >
+      <View
+        style={{
+          backgroundColor: "#0099CC",
+          borderRadius: 5,
+          borderColor: "dark",
+          borderWidth: 1,
+        }}
+      >
+        <View style={{ height: 26, width: "100%" }}>
+          <View
+            style={{
+              height: 6,
+              width: 45,
+              borderRadius: 100,
+              backgroundColor: "#f0f0f0",
+              marginVertical: 10,
+              alignSelf: "center",
+            }}
+          />
+        </View>
+        <View
+          style={{ padding: 10, flexDirection: "row", alignItems: "center" }}
+        >
+          <Text style={{ fontSize: 20, fontWeight: "bold", color: "white" }}>
+            {data.limited
+              ? getType(data.limited.split(":")[0]) +
+                migrateTrainName(
+                  data.limited.split(":")[1] ||
+                    (trainData.length > 0
+                      ? trainData[trainData.length - 1].split(",")[0] + "行き"
+                      : " ")
+                )
+              : ""}
+          </Text>
+          <View style={{ flex: 1 }} />
+          <Text style={{ fontSize: 20, fontWeight: "bold", color: "white" }}>
+            {data.trainNum}
+          </Text>
+          {data.limited != undefined &&
+            getType(data.limited.split(":")[0]) &&
+            !data.limited.split(":")[1].match("サンポート") && (
+              <Ionicons
+                name="subway"
+                color="white"
+                size={30}
+                style={{ margin: 5 }}
+                onPress={() => {
+                  LayoutAnimation.easeInEaseOut(); //setLoadingDelayData(true);
+                  navigate("trainbase", {
+                    info: "train.html?tn=" + data.trainNum,
+                    from,
+                  });
+                  setRef.current?.hide();
+                }}
+              />
+            )}
+        </View>
+        <ScrollView
+          style={{
+            flexDirection: "row",
+            //width: widthPercentageToDP("200%"),
+            minHeight: 200,
+            height: heightPercentageToDP("20%"),
+          }}
+          horizontal
+          pagingEnabled
+        >
+          <View
+            style={{
+              flexDirection: "row",
+              minHeight: 200,
+              height: heightPercentageToDP("20%"),
+              width: widthPercentageToDP("100%"),
+            }}
+          >
+            <View
+              style={{
+                flex: 1,
+                backgroundColor: "white",
+                borderRadius: 10,
+                padding: 10,
+                margin: 10,
+              }}
+            >
+              <Text style={{ fontSize: 15, color: "#0099CC" }}>
+                現在地 {currentPosition.toString()}
+              </Text>
+              <View style={{ flex: 1 }} />
+              {data.trainData?.Pos && data.trainData?.Pos.match("～") ? (
+                <>
+                  <Text
+                    style={{
+                      fontSize: 28,
+                      color: "#0099CC",
+                      textAlign: "right",
+                    }}
+                  >
+                    {
+                      data.trainData?.Pos.replace("（下り）", "")
+                        .replace("（上り）", "")
+                        .split("～")[0]
+                    }
+                  </Text>
+                  <Text style={{ color: "#0099CC", textAlign: "right" }}>
+                    ～
+                  </Text>
+                  <Text
+                    style={{
+                      fontSize: 28,
+                      color: "#0099CC",
+                      textAlign: "right",
+                    }}
+                  >
+                    {
+                      data.trainData?.Pos.replace("（下り）", "")
+                        .replace("（上り）", "")
+                        .split("～")[1]
+                    }
+                  </Text>
+                </>
+              ) : (
+                <Text
+                  style={{ fontSize: 28, color: "#0099CC", textAlign: "right" }}
+                >
+                  {data.trainData?.Pos}
+                </Text>
+              )}
+            </View>
+            <View style={{ flex: 1, flexDirection: "column" }}>
+              <View
+                style={{
+                  flex: 1,
+                  backgroundColor: "white",
+                  borderRadius: 10,
+                  padding: 10,
+                  margin: 10,
+                }}
+              >
+                <Text style={{ fontSize: 15, color: "#0099CC" }}>
+                  {isNaN(data.trainData?.delay) ? "状態" : "遅延時分"}
+                </Text>
+                <View style={{ flex: 1 }} />
+                <Text
+                  style={{
+                    fontSize: 32,
+                    color: "#0099CC",
+                    textAlign: "right",
+                  }}
+                >
+                  {data.trainData?.delay}
+                  {isNaN(data.trainData?.delay) ? "" : "分"}
+                </Text>
+              </View>
+              <View
+                style={{
+                  flex: 1,
+                  backgroundColor: "white",
+                  borderRadius: 10,
+                  padding: 10,
+                  margin: 10,
+                }}
+              >
+                <Text style={{ fontSize: 15, color: "#0099CC" }}>列番</Text>
+                <Text
+                  style={{
+                    fontSize: 32,
+                    color: "#0099CC",
+                    textAlign: "right",
+                  }}
+                >
+                  {data.trainData?.num}
+                </Text>
+              </View>
+            </View>
+          </View>
+          {/* <View
+            style={{
+              flexDirection: "column",
+              height: heightPercentageToDP("20%"),
+              flex: 1,
+              width: widthPercentageToDP("100%"),
+            }}
+          >
+            <View style={{ flex: 1, flexDirection: "row" }}>
+              <View
+                style={{
+                  flex: 1,
+                  backgroundColor: "white",
+                  borderRadius: 10,
+                  padding: 10,
+                  margin: 10,
+                }}
+              >
+                <Text style={{ fontSize: 15, color: "#0099CC" }}>行先</Text>
+                <View style={{ flex: 1 }} />
+                <Text
+                  style={{
+                    fontSize: 20,
+                    color: "#0099CC",
+                    textAlign: "right",
+                  }}
+                >
+                  岡山
+                </Text>
+              </View>
+
+              <View
+                style={{
+                  flex: 3,
+                  backgroundColor: "white",
+                  borderRadius: 10,
+                  padding: 10,
+                  margin: 10,
+                }}
+              >
+                <Text style={{ fontSize: 15, color: "#0099CC" }}>車両案内</Text>
+                <View style={{ flex: 1 }} />
+                <Text
+                  style={{
+                    fontSize: 20,
+                    color: "#0099CC",
+                    textAlign: "right",
+                  }}
+                >
+                  宇多津でうずしお号と連結
+                </Text>
+              </View>
+            </View>
+            <View style={{ flex: 1, flexDirection: "row" }}>
+              <View
+                style={{
+                  flex: 1,
+                  backgroundColor: "white",
+                  borderRadius: 10,
+                  padding: 10,
+                  margin: 10,
+                }}
+              >
+                <Text style={{ fontSize: 15, color: "#0099CC" }}>
+                  編成(使用車両：2700系)
+                </Text>
+                <View style={{ flex: 1 }} />
+                <Text
+                  style={{
+                    fontSize: 20,
+                    color: "#0099CC",
+                    textAlign: "left",
+                  }}
+                >
+                  {"[<自][自>][アン自|指>][アン指|G>]"}
+                </Text>
+              </View>
+            </View>
+          </View> */}
+        </ScrollView>
+        <ScrollView
+          style={{ maxHeight: heightPercentageToDP("55%") }}
+          nestedScrollEnabled
+          onScroll={(e) => {
+            if (!Platform.OS !== "android") return;
+            setIsTop(e.nativeEvent.contentOffset.y < 0);
+          }}
+        >
+          <View
+            style={{
+              padding: 10,
+              backgroundColor: "white",
+              borderBottomLeftRadius: 5,
+              borderBottomRightRadius: 5,
+            }}
+          >
+            <View style={{ alignItems: "center" }}>
+              {/* <LottieView
+                autoPlay
+                loop
+                style={{ width: 150, height: 150, backgroundColor: "#fff" }}
+                source={require("../../assets/51690-loading-diamonds.json")}
+              />
+              <Text>ほげほげふがふが</Text> */}
+              <View style={{ flexDirection: "row" }}>
+                <View
+                  style={{
+                    padding: 8,
+                    flexDirection: "row",
+                    borderBottomWidth: 1,
+                    borderBottomColor: "#f0f0f0",
+                    flex: 1,
+                  }}
+                >
+                  <Text style={{ fontSize: 20 }}>停車駅</Text>
+                  <View style={{ flex: 1 }} />
+                  <View style={{ flexDirection: "row" }}>
+                    {!isNaN(data.trainData?.delay) &&
+                      data.trainData?.delay != 0 && (
+                        <Text
+                          style={{
+                            fontSize: 15,
+                            color: "black",
+                            position: "absolute",
+                            right: 110,
+                            textAlign: "right",
+                            textDecorationLine: "line-through",
+                          }}
+                        >
+                          (定刻)
+                        </Text>
+                      )}
+                    <Text
+                      style={{
+                        fontSize: 20,
+                        color: isNaN(data.trainData?.delay)
+                          ? "black"
+                          : data.trainData?.delay == 0
+                          ? "black"
+                          : "red",
+                        width: 60,
+                      }}
+                    >
+                      見込
+                    </Text>
+                    <Text style={{ fontSize: 20, width: 50 }}></Text>
+                  </View>
+                </View>
+              </View>
+              {trainData.map((i, index) => {
+                const [station, se, time] = i.split(",");
+                const Stations = stationList.map((a) =>
+                  a.filter((d) => d.StationName == station)
+                );
+                const StationNumbers =
+                  Stations &&
+                  Stations.reduce((newArray, e) => {
+                    return newArray.concat(e);
+                  }, [])
+                    .filter((d) => d.StationNumber)
+                    .map((d) => d.StationNumber);
+
+                const colorIDs =
+                  StationNumbers != null
+                    ? StationNumbers.map((d) => {
+                        return d.split("").filter((s) => "A" < s && s < "Z");
+                      }).reduce((newArray, e) => {
+                        return newArray.concat(e);
+                      }, [])
+                    : [];
+                const EachIDs =
+                  StationNumbers != null
+                    ? StationNumbers.map((d) => {
+                        return d
+                          .split("")
+                          .filter((s) => "0" <= s && s <= "9")
+                          .join("");
+                      })
+                    : [];
+                const date = new Date();
+                if (time) {
+                  date.setHours(time.split(":")[0], time.split(":")[1]);
+                }
+                if (!isNaN(data.trainData?.delay)) {
+                  date.setMinutes(date.getMinutes() + data.trainData?.delay);
+                }
+                const timeString = date.toTimeString().split(" ")[0].split(":");
+                return (
+                  <TouchableWithoutFeedback
+                    onPress={() => openStationACFromEachTrainInfo(station)}
+                    key={station}
+                  >
+                    <View style={{ flexDirection: "row" }}>
+                      <View
+                        style={{
+                          width: 35,
+                          position: "relative",
+                          marginHorizontal: 15,
+                          flexDirection: "row",
+                          height: "101%",
+                        }}
+                      >
+                        {colorIDs.map((color, index) => (
+                          <View
+                            style={{
+                              backgroundColor: lineColorList[color],
+                              flex: 1,
+                            }}
+                            key={color}
+                          >
+                            <View style={{ flex: 1 }} />
+                            <Text
+                              style={{
+                                color: "white",
+                                textAlign: "center",
+                                fontSize: 10,
+                                fontWeight: "bold",
+                              }}
+                            >
+                              {colorIDs[index]}
+                            </Text>
+                            <Text
+                              style={{
+                                color: "white",
+                                textAlign: "center",
+                                fontSize: 10,
+                                fontWeight: "bold",
+                              }}
+                            >
+                              {EachIDs[index]}
+                            </Text>
+                            <View style={{ flex: 1 }} />
+                          </View>
+                        ))}
+                      </View>
+                      <View
+                        style={{
+                          padding: 8,
+                          flexDirection: "row",
+                          borderBottomWidth: 1,
+                          borderBottomColor: "#f0f0f0",
+                          flex: 1,
+                        }}
+                      >
+                        <Text style={{ fontSize: 20 }}>{station}</Text>
+                        <View style={{ flex: 1 }} />
+                        {points.findIndex((d) => d == index) >= 0 ? (
+                          <Text
+                            style={{
+                              fontSize: 20,
+                              marginRight: 70,
+                            }}
+                          >
+                            🚊
+                          </Text>
+                        ) : null}
+                        {!isNaN(data.trainData?.delay) &&
+                          data.trainData?.delay != 0 && (
+                            <Text
+                              style={{
+                                fontSize: 15,
+                                color: "black",
+                                width: 60,
+                                position: "absolute",
+                                right: 120,
+                                textAlign: "right",
+                                textDecorationLine: "line-through",
+                              }}
+                            >
+                              {time}
+                            </Text>
+                          )}
+                        <Text
+                          style={{
+                            fontSize: 20,
+                            color: isNaN(data.trainData?.delay)
+                              ? "black"
+                              : data.trainData?.delay == 0
+                              ? "black"
+                              : "red",
+                            width: 60,
+                          }}
+                        >
+                          {timeString[0]}:{timeString[1]}
+                        </Text>
+                        <Text style={{ fontSize: 18, width: 50 }}>
+                          {se?.replace("発", "出発").replace("着", "到着")}
+                        </Text>
+                      </View>
+                    </View>
+                  </TouchableWithoutFeedback>
+                );
+              })}
+            </View>
+          </View>
+        </ScrollView>
+      </View>
+    </ActionSheet>
+  );
+};

components/ActionSheetComponents/JRSTraInfo.js

@@ -1,7 +1,5 @@
-import React, { Component, useRef, useState, useEffect } from "react";
+import React from "react";
 import {
-  StatusBar,
-  Platform,
   View,
   LayoutAnimation,
   ScrollView,
@@ -9,30 +7,9 @@ import {
   Text,
   TouchableOpacity,
 } from "react-native";
-import Image from "react-native-remote-svg";
-import Constants from "expo-constants";
-import { List, ListItem } from "native-base";
-import Icon from "react-native-vector-icons/Entypo";
-import * as Location from "expo-location";
-import StatusbarDetect from "../../StatusbarDetect";
-var Status = StatusbarDetect();
-import { useNavigation } from "@react-navigation/native";
-import AutoHeightImage from "react-native-auto-height-image";
-import {
-  widthPercentageToDP as wp,
-  heightPercentageToDP as hp,
-} from "react-native-responsive-screen";
-import {
-  FontAwesome,
-  Fontisto,
-  Foundation,
-  Ionicons,
-  MaterialCommunityIcons,
-} from "@expo/vector-icons";
-import * as WebBrowser from "expo-web-browser";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import ActionSheet from "react-native-actions-sheet";
 import LottieView from "lottie-react-native";
-import SvgUri from "react-native-svg-uri";
 export const JRSTraInfo = (props) => {
   const {
     JRSTraInfoEXAcSR,
@@ -45,7 +22,7 @@ export const JRSTraInfo = (props) => {
     <ActionSheet
       ref={JRSTraInfoEXAcSR}
       gestureEnabled
-      CustomHeaderComponent={() => { }}
+      CustomHeaderComponent={<></>}
     >
       <View
         style={{
@@ -116,7 +93,7 @@ export const JRSTraInfo = (props) => {
               delayData.map((d) => {
                 let data = d.split(" ");
                 return (
-                  <View style={{ flexDirection: "row" }}>
+                  <View style={{ flexDirection: "row" }} key={data[1]}>
                     <Text style={{ flex: 15, fontSize: 20 }}>
                       {data[0].replace("\n", "")}
                     </Text>

components/ActionSheetComponents/StationDeteilView.js

@@ -1,21 +1,59 @@
-import React from "react";
-import { View, ScrollView, Linking } from "react-native";
-import StatusbarDetect from "../../StatusbarDetect";
-var Status = StatusbarDetect();
+import React, { useState, useEffect } from "react";
+import {
+  StatusBar,
+  View,
+  LayoutAnimation,
+  ScrollView,
+  Linking,
+  Text,
+  TouchableOpacity,
+} from "react-native";
+import AutoHeightImage from "react-native-auto-height-image";
 import { FontAwesome, Foundation, Ionicons } from "@expo/vector-icons";
 import ActionSheet from "react-native-actions-sheet";
 import Sign from "../../components/駅名表/Sign";
+import { useInterval } from "../../lib/useInterval";
 
 import { TicketBox } from "../atom/TicketBox";
+import {
+  widthPercentageToDP as wp,
+  heightPercentageToDP as hp,
+} from "react-native-responsive-screen";
+import lineColorList from "../../assets/originData/lineColorList";
+import { getPDFViewURL } from "../../lib/getPdfViewURL";
 
 export const StationDeteilView = (props) => {
-  const { StationBoardAcSR, currentStation, originalStationList } = props;
-
+  const {
+    StationBoardAcSR,
+    currentStation,
+    originalStationList,
+    favoriteStation,
+    setFavoriteStation,
+    busAndTrainData,
+    navigate,
+    onExit,
+  } = props;
+  const [trainBus, setTrainBus] = useState();
+  useEffect(() => {
+    if (!currentStation) return () => {};
+    const data = busAndTrainData.filter((d) => {
+      return d.name === currentStation[0].Station_JP;
+    });
+    if (data.length == 0) {
+      setTrainBus();
+    }
+    setTrainBus(data[0]);
+  }, [currentStation]);
+  const info =
+    currentStation &&
+    (currentStation[0].StationTimeTable.match(".pdf")
+      ? getPDFViewURL(currentStation[0].StationTimeTable)
+      : currentStation[0].StationTimeTable);
   return (
     <ActionSheet
       ref={StationBoardAcSR}
       gestureEnabled
-      CustomHeaderComponent={() => {}}
+      CustomHeaderComponent={<></>}
     >
       <View
         key={currentStation}
@@ -40,10 +78,57 @@ export const StationDeteilView = (props) => {
         </View>
         <View>
           {currentStation && (
+            <View
+              style={{
+                margin: 10,
+                marginHorizontal: wp("10%"),
+              }}
+            >
               <Sign
                 currentStation={currentStation}
                 originalStationList={originalStationList}
-              oP={() => Linking.openURL(currentStation[0].StationTimeTable)}
+                favoriteStation={favoriteStation}
+                setFavoriteStation={setFavoriteStation}
+                oP={() => {
+                  navigate("howto", {
+                    info,
+                    onExit,
+                  });
+                  StationBoardAcSR.current?.hide();
+                }}
+                oLP={() => Linking.openURL(currentStation[0].StationTimeTable)}
+              />
+            </View>
+          )}
+          {currentStation &&
+            currentStation.map((d) => (
+              <NexPreStationLine
+                currentStation={d}
+                originalStationList={originalStationList}
+                favoriteStation={favoriteStation}
+                setFavoriteStation={setFavoriteStation}
+              />
+            ))}
+          {currentStation &&
+            currentStation[0].JrHpUrl &&
+            currentStation[0].StationNumber != "M12" && (
+              <駅構内図 //高松/阿波池田&後免&須崎kounai.png児島例外/
+                oP={() => {
+                  navigate("howto", {
+                    info:
+                      currentStation[0].JrHpUrl.replace("/index.html", "/") +
+                      "/kounai_map.html",
+                    onExit,
+                  });
+                  StationBoardAcSR.current?.hide();
+                }}
+                oLP={() => {
+                  Linking.openURL(
+                    currentStation[0].JrHpUrl.replace("/index.html", "/") +
+                      "/kounai_map.html"
+                  );
+                }}
+                uri={currentStation[0].JrHpUrl.replace("/index.html", "/")}
               />
             )}
           {currentStation && (
@@ -53,7 +138,14 @@ export const StationDeteilView = (props) => {
                   backgroundColor={"#AD7FA8"}
                   icon={<Foundation name="web" color="white" size={50} />}
                   flex={1}
-                  onPressButton={() =>
+                  onPressButton={() => {
+                    navigate("howto", {
+                      info: currentStation[0].JrHpUrl,
+                      onExit,
+                    });
+                    StationBoardAcSR.current?.hide();
+                  }}
+                  onLongPressButton={() =>
                     Linking.openURL(currentStation[0].JrHpUrl)
                   }
                 >
@@ -65,7 +157,14 @@ export const StationDeteilView = (props) => {
                   backgroundColor={"#8F5902"}
                   icon={<FontAwesome name="table" color="white" size={50} />}
                   flex={1}
-                  onPressButton={() =>
+                  onPressButton={() => {
+                    navigate("howto", {
+                      info,
+                      onExit,
+                    });
+                    StationBoardAcSR.current?.hide();
+                  }}
+                  onLongPressButton={() =>
                     Linking.openURL(currentStation[0].StationTimeTable)
                   }
                 >
@@ -81,7 +180,24 @@ export const StationDeteilView = (props) => {
                     Linking.openURL(currentStation[0].StationMap)
                   }
                 >
-                  GoogleMap
+                  Map
+                </TicketBox>
+              )}
+              {!trainBus || (
+                <TicketBox
+                  backgroundColor={"#CE5C00"}
+                  icon={<Ionicons name="bus" color="white" size={50} />}
+                  flex={1}
+                  onPressButton={() => {
+                    navigate("howto", {
+                      info: trainBus.address,
+                      onExit,
+                    });
+                    StationBoardAcSR.current?.hide();
+                  }}
+                  onLongPressButton={() => Linking.openURL(trainBus.address)}
+                >
+                  並行バス
                 </TicketBox>
               )}
             </View>
@@ -91,3 +207,286 @@ export const StationDeteilView = (props) => {
     </ActionSheet>
   );
 };
+
+const StationName = (props) => {
+  const { stringData, ss } = props;
+  return (
+    <View style={ss}>
+      <Text style={styleSheet.下枠駅名}>{stringData.Station_JP}</Text>
+      <Text style={styleSheet.下枠駅名}>{stringData.Station_EN}</Text>
+    </View>
+  );
+};
+
+const NexPreStationLine = ({
+  currentStation,
+  originalStationList,
+  oP,
+  favoriteStation,
+  setFavoriteStation,
+}) => {
+  const [preStation, setPreStation] = useState();
+  const [nexStation, setNexStation] = useState();
+  const [lineName, setLineName] = useState();
+
+  useEffect(() => {
+    getPreNextStation(currentStation);
+  }, [currentStation]);
+
+  useEffect(() => {
+    if (!currentStation) return () => {};
+    getPreNextStation(currentStation);
+  }, []);
+  const getPreNextStation = (now) => {
+    const lineList = [
+      "予讃線(高松-松山間)[Y]",
+      "予讃線(松山-宇和島間)[U]",
+      "予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]",
+      "土讃線(多度津-高知間)[D]",
+      "土讃線(高知-窪川間)[K]",
+      "高徳線(高松-徳島間)[T]",
+      "徳島線(徳島-阿波池田)[B]",
+      "鳴門線(池谷-鳴門間)[N]",
+      "瀬戸大橋線(宇多津-児島間)[M]",
+    ];
+    let returnData;
+    lineList.forEach((d) => {
+      let cache = originalStationList[d].findIndex(
+        (data) => data.StationNumber == now.StationNumber
+      );
+      if (cache != -1) {
+        returnData = [
+          originalStationList[d][cache - 1],
+          originalStationList[d][cache + 1],
+          d,
+        ];
+      }
+    });
+    setPreStation(returnData[0]);
+    setNexStation(returnData[1]);
+    setLineName(returnData[2]);
+  };
+  return (
+    <View
+      style={{
+        height: 50,
+        backgroundColor: lineName
+          ? lineColorList[lineName.split("[")[1].replace("]", "")]
+          : "red",
+        flexDirection: "row",
+        alignContent: "center",
+        alignItems: "center",
+      }}
+    >
+      <View style={styleSheet.下枠フレーム}>
+        {preStation ? (
+          <>
+            <Text style={styleSheet.下枠左右マーク}>◀</Text>
+            {preStation.StationNumber ? (
+              <View style={styleSheet.下枠駅ナンバー}>
+                <View style={{ flex: 1 }} />
+                <Text
+                  style={{
+                    fontSize: parseInt("10%"),
+                    color: "white",
+                  }}
+                >
+                  {preStation.StationNumber}
+                </Text>
+                <View style={{ flex: 1 }} />
+              </View>
+            ) : (
+              <></>
+            )}
+            <StationName
+              stringData={preStation}
+              ss={{ flex: 1, alignItems: "flex-start" }}
+            />
+          </>
+        ) : (
+          <></>
+        )}
+      </View>
+
+      <Text
+        style={{
+          fontSize: parseInt("10%"),
+          color: "white",
+          textAlign: "center",
+        }}
+      >
+        {lineName &&
+          lineName
+            .split("(")
+            .map((d, index) => (index == 1 ? "(" + d : d))
+            .join("\n")}
+      </Text>
+      <View style={styleSheet.下枠フレーム}>
+        {nexStation ? (
+          <>
+            <StationName
+              stringData={nexStation}
+              ss={{ flex: 1, alignItems: "flex-end" }}
+            />
+            {nexStation.StationNumber ? (
+              <View style={styleSheet.下枠駅ナンバー}>
+                <View style={{ flex: 1 }} />
+                <Text style={{ fontSize: parseInt("15%"), color: "white" }}>
+                  {nexStation.StationNumber}
+                </Text>
+                <View style={{ flex: 1 }} />
+              </View>
+            ) : (
+              <></>
+            )}
+            <Text style={styleSheet.下枠左右マーク}>▶</Text>
+          </>
+        ) : (
+          <></>
+        )}
+      </View>
+    </View>
+  );
+};
+
+const 駅構内図 = (props) => {
+  const [open, setOpen] = useState(false);
+  return (
+    <>
+      <TouchableOpacity
+        style={{
+          height: 50,
+          backgroundColor: "#888A85",
+          flexDirection: "column",
+          alignContent: "center",
+          alignItems: "center",
+          margin: 2,
+        }}
+        onPress={props.oP}
+        onLongPress={props.oLP}
+        //onPress={() => setOpen(!open)}
+      >
+        <View style={{ flex: 1 }} />
+        <Text
+          style={{
+            color: "white",
+            textAlign: "center",
+            textAlignVertical: "center",
+            flex: 1,
+          }}
+        >
+          {open ? "駅構内図を非表示" : "駅構内図を表示"}
+        </Text>
+        <View style={{ flex: 1 }} />
+      </TouchableOpacity>
+      <View>
+        {open && (
+          <>
+            <AutoHeightImage
+              source={{ uri: props.uri + "images/kounai.gif" }}
+              resizeMode="contain"
+              width={wp("100%")}
+            />
+            <AutoHeightImage
+              source={{ uri: props.uri + "images/kounai.png" }}
+              resizeMode="contain"
+              width={wp("100%")}
+            />
+            <AutoHeightImage
+              source={{ uri: props.uri + "images/kounai_1f.gif" }}
+              resizeMode="contain"
+              width={wp("100%")}
+            />
+            <AutoHeightImage
+              source={{ uri: props.uri + "images/kounai_2f.png" }}
+              resizeMode="contain"
+              width={wp("100%")}
+            />
+          </>
+        )}
+      </View>
+    </>
+  );
+};
+
+const styleSheet = {
+  外枠: {
+    width: wp("80%"),
+    height: (wp("80%") / 20) * 9,
+    borderColor: "#2E94BB",
+    borderWidth: 1,
+    backgroundColor: "white",
+  },
+  下帯: {
+    position: "absolute",
+    bottom: "0%",
+    left: "0%",
+    width: "100%",
+    height: "30%",
+    backgroundColor: "#2E94BB",
+  },
+  JRStyle: {
+    position: "absolute",
+    top: "2%",
+    left: "2%",
+    fontWeight: "bold",
+    fontSize: parseInt("30%"),
+    color: "#2E94BB",
+  },
+  stationNameAreaOverWrap: {
+    position: "absolute",
+    top: "10%",
+    alignContent: "center",
+    flexDirection: "row",
+  },
+  Station_JP: {
+    fontWeight: "bold",
+    fontSize: parseInt("40%"),
+    color: "#005170",
+  },
+  Station_EN: {
+    fontWeight: "bold",
+    fontSize: parseInt("15%"),
+    color: "#005170",
+  },
+  下帯内容: {
+    position: "absolute",
+    bottom: "0%",
+    height: "30%",
+    width: "100%",
+    alignItems: "center",
+    flexDirection: "column",
+  },
+  下枠フレーム: {
+    flex: 1,
+    flexDirection: "row",
+    alignContent: "center",
+    height: wp("10%"),
+  },
+  下枠左右マーク: {
+    fontWeight: "bold",
+    fontSize: parseInt("20%"),
+    color: "white",
+    paddingHorizontal: 10,
+    textAlignVertical: "center",
+  },
+  下枠駅ナンバー: {
+    alignContent: "center",
+    alignItems: "center",
+    width: wp("8%"),
+    height: wp("8%"),
+    margin: wp("1%"),
+    borderColor: "white",
+    borderWidth: parseInt("2%"),
+    borderRadius: parseInt("100%"),
+  },
+  下枠駅名: {
+    fontWeight: "bold",
+    fontSize: parseInt("15%"),
+    color: "white",
+    flex: 1,
+    paddingHorizontal: 0,
+    marginVertical: 0,
+    textAlignVertical: "center",
+  },
+};

components/FavoriteList.js

@@ -0,0 +1,111 @@
+import React, { Component, useRef, useState, useEffect } from "react";
+import { View, Text, TouchableOpacity, ScrollView } from "react-native";
+import { WebView } from "react-native-webview";
+import { ListItem } from "native-base";
+import Icon from "react-native-vector-icons/Entypo";
+import StatusbarDetect from "../StatusbarDetect";
+import { AS } from "../storageControl";
+import { news } from "../config/newsUpdate";
+import { getStationList, lineList } from "../lib/getStationList";
+var Status = StatusbarDetect();
+export default function FavoriteList({
+  navigation,
+  webview,
+  stationData,
+  favoriteStation,
+  setFavoriteStation,
+}) {
+  const { navigate } = navigation;
+
+  return (
+    <View style={{ height: "100%", backgroundColor: "#0099CC" }}>
+      <Text
+        style={{
+          textAlign: "center",
+          fontSize: 25,
+          color: "white",
+          fontWeight: "bold",
+          paddingVertical: 10,
+        }}
+      >
+        位置情報クイック移動メニュー
+      </Text>
+      <ScrollView style={{ height: "100%", backgroundColor: "white" }}>
+        {favoriteStation
+          .filter((d) => d[0].StationMap)
+          .map((currentStation) => {
+            return (
+              <ListItem
+                onPress={() => {
+                  const getStationLine = (now) => {
+                    const returnData = Object.keys(stationData).filter((d) => {
+                      const cache = stationData[d].findIndex(
+                        (data) => data.Station_JP == now.Station_JP
+                      );
+                      return cache != -1;
+                    });
+                    return returnData[0];
+                  };
+                  const lineName = getStationLine(currentStation[0]);
+
+                  webview.current?.injectJavaScript(
+                    `MoveDisplayStation('${lineName}_${currentStation[0].MyStation}_${currentStation[0].Station_JP}')`
+                  );
+                  navigate("Apps");
+                }}
+              >
+                <Text style={{ fontSize: 20, flex: 2 }}>
+                  {currentStation
+                    .map((d) => d.StationNumber)
+                    .filter((d) => d !== null)
+                    .join("/")}
+                </Text>
+                <Text style={{ fontSize: 20, flex: 3 }}>
+                  {currentStation[0].Station_JP}
+                </Text>
+                <View
+                  style={{
+                    flex: 2,
+                    flexDirection: "row",
+                    alignContent: "center",
+                    alignItems: "center",
+                  }}
+                >
+                  <View style={{ flex: 1 }} />
+                  <Text style={{ fontSize: 20 }}>移動する</Text>
+                  <Icon name="chevron-right" size={20} />
+                </View>
+              </ListItem>
+            );
+          })}
+      </ScrollView>
+      <Text
+        style={{
+          backgroundColor: "white",
+          borderWidth: 1,
+          borderStyle: "solid",
+        }}
+      >
+        お気に入り登録した駅のうち、位置情報システムで移動可能な駅が表示されています。タップすることで位置情報システムの当該の駅に移動します。
+      </Text>
+      <TouchableOpacity
+        style={{
+          padding: 10,
+          flexDirection: "row",
+          borderColor: "white",
+          borderWidth: 1,
+          margin: 10,
+          borderRadius: 5,
+          alignItems: "center",
+        }}
+        onPress={() => navigation.goBack()}
+      >
+        <View style={{ flex: 1 }} />
+        <Text style={{ fontSize: 25, fontWeight: "bold", color: "white" }}>
+          閉じる
+        </Text>
+        <View style={{ flex: 1 }} />
+      </TouchableOpacity>
+    </View>
+  );
+}

components/atom/TicketBox.js

@@ -1,7 +1,14 @@
 import { TouchableOpacity, Text } from "react-native";
 
 export const TicketBox = (props) => {
-  const { icon, backgroundColor, flex, onPressButton, children } = props;
+  const {
+    icon,
+    backgroundColor,
+    flex,
+    onPressButton,
+    children,
+    onLongPressButton,
+  } = props;
   return (
     <TouchableOpacity
       style={{
@@ -14,6 +21,7 @@ export const TicketBox = (props) => {
         alignItems: "center",
       }}
       onPress={onPressButton}
+      onLongPress={onLongPressButton}
     >
       <Text style={{ color: "white", fontWeight: "bold", fontSize: 18 }}>
         {children}

components/custom-train-data.js

@@ -2,7 +2,6 @@ export const customTrainDataDetector = (TrainNumber) => {
   switch (TrainNumber) {
     //しおかぜメイン
     //8000 ノーマル
-    case "2M":
     case "4M":
     case "6M":
     case "14M":
@@ -27,10 +26,18 @@ export const customTrainDataDetector = (TrainNumber) => {
         trainNumDistance: 0,
         info: "いしづちと併結 / 8000系で運転",
       };
+    case "2M":
+      return {
+        type: "LTDEXP",
+        trainName: "しおかぜ",
+        trainIcon: "http://www.trainfrontview.net/b/s8000nr.png",
+        trainNumDistance: 0,
+        info: "8000系で運転",
+      };
     //8000 アンパン
-    case "10M":
     case "22M":
     case "9M":
+    case "10M":
     case "21M":
       return {
         type: "LTDEXP",
@@ -158,22 +165,36 @@ export const customTrainDataDetector = (TrainNumber) => {
 
     //南風 2700ノーマル
     case "34D":
+    case "58D":
+    case "31D":
+    case "51D":
+      return {
+        type: "LTDEXP",
+        trainName: "南風",
+        trainIcon: "http://www.trainfrontview.net/b/s2700.png",
+        trainNumDistance: 30,
+        info: "しまんとと併結 / 2700系で運転",
+      };
+    case "52D":
+    case "53D":
+      return {
+        type: "LTDEXP",
+        trainName: "南風",
+        trainIcon: "http://www.trainfrontview.net/b/s2700.png",
+        trainNumDistance: 30,
+        info: "うずしおと併結 / 2700系で運転",
+      };
     case "38D":
     case "40D":
     case "42D":
     case "46D":
     case "50D":
-    case "52D":
     case "54D":
-    case "58D":
-    case "31D":
     case "35D":
     case "39D":
     case "41D":
     case "43D":
     case "47D":
-    case "51D":
-    case "53D":
     case "55D":
       return {
         type: "LTDEXP",
@@ -182,14 +203,22 @@ export const customTrainDataDetector = (TrainNumber) => {
         trainNumDistance: 30,
         info: "2700系で運転",
       };
+
     //2700アンパン
-    case "32D":
     case "36D":
+    case "37D":
+      return {
+        type: "LTDEXP",
+        trainName: "南風",
+        trainIcon: "http://www.trainfrontview.net/f/s2700apr.png",
+        trainNumDistance: 30,
+        info: "うずしおと連結 / アンパンマン列車で運転",
+      };
+    case "32D":
     case "44D":
     case "48D":
     case "56D":
     case "33D":
-    case "37D":
     case "45D":
     case "49D":
     case "57D":
@@ -200,7 +229,6 @@ export const customTrainDataDetector = (TrainNumber) => {
         trainNumDistance: 30,
         info: "アンパンマン列車で運転",
       };
-      break;
 
     //うずしお
     //2700
@@ -213,7 +241,7 @@ export const customTrainDataDetector = (TrainNumber) => {
         trainName: "うずしお",
         trainIcon: "http://www.trainfrontview.net/b/s2700_uzu.png",
         trainNumDistance: 5000,
-        info: "南風と宇多津で併結 / 高松-宇多津間進行方向逆転 / 2700系で運転",
+        info: "南風と併結 / 高松-宇多津間進行方向逆転 / 2700系で運転",
       };
     case "3002D":
     case "3004D":
@@ -384,7 +412,9 @@ export const customTrainDataDetector = (TrainNumber) => {
     case "1052D":
     case "1056D":
     case "1058D":
+    case "1062D":
     case "1064D":
+    case "1068D":
     case "1070D":
     case "1074D":
     case "1076D":
@@ -392,7 +422,10 @@ export const customTrainDataDetector = (TrainNumber) => {
     case "1080D":
     case "1082D":
     case "1051D":
+    case "1053D":
+    case "1057D":
     case "1059D":
+    case "1063D":
     case "1065D":
     case "1069D":
     case "1071D":
@@ -400,7 +433,6 @@ export const customTrainDataDetector = (TrainNumber) => {
     case "1075D":
     case "1077D":
     case "1079D":
-    case "1053D":
       return {
         type: "LTDEXP",
         trainName: "宇和海",
@@ -411,14 +443,10 @@ export const customTrainDataDetector = (TrainNumber) => {
     //2000 アンパン込み
     case "1054D":
     case "1060D":
-    case "1062D":
     case "1066D":
-    case "1068D":
     case "1072D":
     case "1055D":
-    case "1057D":
     case "1061D":
-    case "1063D":
     case "1067D":
     case "1081D":
       return {
@@ -430,13 +458,9 @@ export const customTrainDataDetector = (TrainNumber) => {
       };
     //しまんと
     case "2002D":
-    case "2004D":
-    case "2006D":
     case "2008D":
     case "2001D":
-    case "2003D":
     case "2005D":
-    case "2007D":
       return {
         type: "LTDEXP",
         trainName: "しまんと",
@@ -444,6 +468,17 @@ export const customTrainDataDetector = (TrainNumber) => {
         trainNumDistance: 2000,
         info: "2700系で運転",
       };
+    case "2004D":
+    case "2006D":
+    case "2003D":
+    case "2007D":
+      return {
+        type: "LTDEXP",
+        trainName: "しまんと",
+        trainIcon: "http://www.trainfrontview.net/b/s2700_smn.png",
+        trainNumDistance: 2000,
+        info: "南風と併結 / 2700系で運転",
+      };
 
     //あしずり 2000
     case "2074D":
@@ -537,10 +572,10 @@ export const customTrainDataDetector = (TrainNumber) => {
       };
 
     //伊予灘ものがたり
-    case "8901D":
-    case "8903D":
-    case "8902D":
-    case "8904D":
+    case "8091D":
+    case "8093D":
+    case "8092D":
+    case "8094D":
       return {
         type: "LTDEXP",
         trainName: "伊予灘ものがたり",
@@ -584,3 +619,37 @@ export const customTrainDataDetector = (TrainNumber) => {
       break;
   }
 };
+export const getJRF = (num) => {
+  switch (num) {
+    case "71":
+      return "東京(タ)→高松(タ)\\n";
+    case "73":
+    case "75":
+      return "大阪(タ)→高松(タ)\\n";
+    case "3079":
+      return "高松(タ)→伊予三島\\n";
+    case "3071":
+    case "3077":
+      return "高松(タ)→新居浜\\n";
+    case "3073":
+      return "高松(タ)→松山貨物\\n";
+    case "70":
+      return "高松(タ)→東京(タ)\\n";
+    case "74":
+    case "76":
+      return "高松(タ)→大阪(タ)\\n";
+    case "3078":
+      return "伊予三島→高松(タ)\\n";
+    case "3070":
+      return "新居浜→高松(タ)\\n";
+    case "3076":
+      return "新居浜→高松(タ)\\n";
+    case "3072":
+      return "松山貨物→高松(タ)\\n";
+    case "9070":
+      return "臨時貨物\\n";
+    default:
+      JRF = true;
+      return null;
+  }
+};

components/news.js

@@ -2,7 +2,7 @@ import React from "react";
 import { View, Text, TouchableOpacity } from "react-native";
 import { WebView } from "react-native-webview";
 import StatusbarDetect from "../StatusbarDetect";
-import AsyncStorage from "@react-native-async-storage/async-storage";
+import { AS } from "../storageControl";
 import { news } from "../config/newsUpdate";
 var Status = StatusbarDetect();
 export default function News(props) {
@@ -30,7 +30,7 @@ export default function News(props) {
           alignItems: "center",
         }}
         onPress={() => {
-          AsyncStorage.setItem("status", news);
+          AS.setItem("status", news);
           navigate("Apps");
         }}
       >

components/settings.js

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import { View, Text, TouchableOpacity } from "react-native";
 import * as Updates from "expo-updates";
 import StatusbarDetect from "../StatusbarDetect";
-import AsyncStorage from "@react-native-async-storage/async-storage";
+import { AS } from "../storageControl";
 var Status = StatusbarDetect();
 import { Switch } from "react-native-elements";
 
@@ -13,10 +13,14 @@ export default function Setting(props) {
   const [iconSetting, setIconSetting] = useState(undefined);
   const [mapSwitch, setMapSwitch] = useState(undefined);
   const [stationMenu, setStationMenu] = useState(undefined);
+  const [trainMenu, setTrainMenu] = useState(undefined);
+  const [trainPosition, setTrainPosition] = useState(undefined);
   useEffect(() => {
-    AsyncStorage.getItem("iconSwitch").then(setIconSetting);
-    AsyncStorage.getItem("mapSwitch").then(setMapSwitch);
-    AsyncStorage.getItem("stationSwitch").then(setStationMenu);
+    AS.getItem("iconSwitch").then(setIconSetting);
+    AS.getItem("mapSwitch").then(setMapSwitch);
+    AS.getItem("stationSwitch").then(setStationMenu);
+    AS.getItem("trainSwitch").then(setTrainMenu);
+    AS.getItem("trainPositionSwitch").then(setTrainPosition);
   }, []);
   return (
     <View style={{ height: "100%", backgroundColor: "#0099CC" }}>
@@ -83,7 +87,7 @@ export default function Setting(props) {
                 textAlignVertical: "center",
               }}
             >
-              駅メニューを表示(beta)
+              駅メニューを表示
             </Text>
             <View style={{ flex: 1 }} />
             <Switch
@@ -102,7 +106,45 @@ export default function Setting(props) {
                 textAlignVertical: "center",
               }}
             >
-              内部バージョン: 4.4.2.3
+              列車メニュー
+            </Text>
+            <View style={{ flex: 1 }} />
+            <Switch
+              value={trainMenu == "true" ? true : false}
+              color={trainMenu == "true" ? "red" : null}
+              onValueChange={(value) => setTrainMenu(value.toString())}
+            />
+          </View>
+          <View style={{ flexDirection: "row", padding: 10 }}>
+            <Text
+              style={{
+                fontSize: 25,
+                alignItems: "center",
+                alignContent: "center",
+                textAlign: "center",
+                textAlignVertical: "center",
+              }}
+            >
+              →列車現在位置表示(alpha)
+            </Text>
+            <View style={{ flex: 1 }} />
+            <Switch
+              value={trainPosition == "true" ? true : false}
+              color={trainPosition == "true" ? "red" : null}
+              onValueChange={(value) => setTrainPosition(value.toString())}
+            />
+          </View>
+          <View style={{ flexDirection: "row", padding: 10 }}>
+            <Text
+              style={{
+                fontSize: 25,
+                alignItems: "center",
+                alignContent: "center",
+                textAlign: "center",
+                textAlignVertical: "center",
+              }}
+            >
+              内部バージョン: 4.5 beta-2
             </Text>
             <View style={{ flex: 1 }} />
           </View>
@@ -134,9 +176,11 @@ export default function Setting(props) {
         }}
         onPress={() => {
           Promise.all([
-            AsyncStorage.setItem("iconSwitch", iconSetting.toString()),
-            AsyncStorage.setItem("mapSwitch", mapSwitch.toString()),
-            AsyncStorage.setItem("stationSwitch", stationMenu.toString()),
+            AS.setItem("iconSwitch", iconSetting.toString()),
+            AS.setItem("mapSwitch", mapSwitch.toString()),
+            AS.setItem("stationSwitch", stationMenu.toString()),
+            AS.setItem("trainSwitch", trainMenu.toString()),
+            AS.setItem("trainPositionSwitch", trainPosition.toString()),
           ]).then(() => {
             Updates.reloadAsync();
           });

components/trainMenu.js

@@ -1,22 +1,11 @@
-import React, { useState, useEffect, useRef } from "react";
+import React, { useRef } from "react";
 import { View, Text, TouchableOpacity, Linking } from "react-native";
-import { WebView } from "react-native-webview";
-import StatusbarDetect from "../StatusbarDetect";
-import AsyncStorage from "@react-native-async-storage/async-storage";
-import MapView, { Marker, Geojson, PROVIDER_GOOGLE } from "react-native-maps";
-import {
-  FontAwesome,
-  Fontisto,
-  Foundation,
-  Ionicons,
-  MaterialCommunityIcons,
-} from "@expo/vector-icons";
-var Status = StatusbarDetect();
-export default function trainMenu({
-  route: {
-    params: { webview, stationData },
-  },
+import MapView, { Marker } from "react-native-maps";
+import { MaterialCommunityIcons } from "@expo/vector-icons";
+export default function TrainMenu({
   navigation: { navigate },
+  webview,
+  stationData,
 }) {
   const mapRef = useRef();
   return (
@@ -54,7 +43,6 @@ export default function trainMenu({
                     longitude: parseFloat(latlng[1]),
                   }}
                   onPress={() => {
-                    console.log(stationData);
                     webview.current?.injectJavaScript(
                       `MoveDisplayStation('${d}_${D.MyStation}_${D.Station_JP}')`
                     );
@@ -70,7 +58,11 @@ export default function trainMenu({
           backgroundColor={"#F89038"}
           icon="train-car"
           flex={1}
-          onPressButton={() => navigate("howto")}
+          onPressButton={() =>
+            navigate("howto", {
+              info: "https://train.jr-shikoku.co.jp/usage.htm",
+            })
+          }
         >
           使い方
         </UsefulBox>
@@ -78,12 +70,7 @@ export default function trainMenu({
           backgroundColor={"#EA4752"}
           icon="star"
           flex={1}
-          onPressButton={() =>
-            /* Linking.openURL(
-              "https://www.jr-shikoku.co.jp/01_trainbus/jikoku/sp/#mainprice-box"
-            ) */
-            alert("お気に入り駅登録機能は現在開発中です！レイアウト募集中！")
-          }
+          onPressButton={() => navigate("favoriteList")}
         >
           お気に入り
         </UsefulBox>
@@ -110,10 +97,7 @@ export default function trainMenu({
           borderRadius: 5,
           alignItems: "center",
         }}
-        onPress={() => {
-          AsyncStorage.setItem("status", "2022/04/14");
-          navigate("Apps");
-        }}
+        onPress={() => navigate("Apps")}
       >
         <View style={{ flex: 1 }} />
         <Text style={{ fontSize: 25, fontWeight: "bold", color: "white" }}>

components/発車時刻表/LED_vidion.js

@@ -1,20 +1,16 @@
-import React, { Component, useRef, useState, useEffect } from "react";
-import {
-  StatusBar,
-  View,
-  LayoutAnimation,
-  ScrollView,
-  Linking,
-  Text,
-  TouchableOpacity,
-} from "react-native";
+import React, { useState, useEffect } from "react";
+import { View, Text, TouchableOpacity } from "react-native";
 import { Switch } from "react-native-elements";
-import {
-  widthPercentageToDP as wp,
-  heightPercentageToDP as hp,
-} from "react-native-responsive-screen";
+import { widthPercentageToDP as wp } from "react-native-responsive-screen";
+import LottieView from "lottie-react-native";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import { customTrainDataDetector } from "../custom-train-data";
 import { useInterval } from "../../lib/useInterval";
+import { objectIsEmpty } from "../../lib/objectIsEmpty";
+import { getTrainType } from "../../lib/getTrainType";
+import { HeaderConfig } from "../../lib/HeaderConfig";
+import { getTrainDelayStatus } from "../../lib/getTrainDelayStatus";
+import { checkDuplicateTrainData } from "../../lib/checkDuplicateTrainData";
 
 let diagramData = undefined;
 
@@ -48,71 +44,80 @@ let diagramData = undefined;
  * 9062D 四国まんなか千年ものがたり(臨時？)
  */
 export default function LED_vision(props) {
-  const HeaderConfig = {
-    headers: {
-      referer: "https://train.jr-shikoku.co.jp/sp.html",
-    },
-  };
-  const [trainDiagram, setTrainDiagram] = useState(null);
-  const [stationDiagram, setStationDiagram] = useState(null);
-  const [currentTrain, setCurrentTrain] = useState(null);
+  const {
+    station,
+    setTrainInfo,
+    EachTrainInfoAsSR,
+    trainDiagram,
+    currentTrainState,
+    currentTrainLoadingState,
+    getCurrentTrain,
+  } = props;
+  const { currentTrain, setCurrentTrain } = currentTrainState;
+  const { currentTrainLoading, setCurrentTrainLoading } =
+    currentTrainLoadingState;
+  const [stationDiagram, setStationDiagram] = useState({}); //当該駅の全時刻表
   const [finalSwitch, setFinalSwitch] = useState(false);
   const [trainIDSwitch, setTrainIDSwitch] = useState(false);
   const [trainDescriptionSwitch, setTrainDescriptionSwitch] = useState(false);
 
   useEffect(() => {
-    fetch(
-      "https://train.jr-shikoku.co.jp/g?arg1=station&arg2=traintimeinfo&arg3=dia",
-      HeaderConfig
-    )
-      .then((response) => response.text())
-      .then((d) => {
-        const val = d.replace("[\r\n", "").split(",\r\n");
-        let trainDiagram = {};
-        val.forEach((element) => {
-          try {
-            let data = JSON.parse(element);
-            Object.keys(data).forEach((key) => (trainDiagram[key] = data[key]));
-          } catch (e) {}
-        });
-        setTrainDiagram(trainDiagram);
-        return trainDiagram;
-      })
-      .then((trainDiagram) => {
-        let returnData = {};
+    // 現在の駅に停車するダイヤを作成する副作用[列車ダイヤと現在駅情報]
     if (!trainDiagram) {
-          setStationDiagram(returnData);
+      setStationDiagram({});
       return;
     }
+    let returnData = {};
     Object.keys(trainDiagram).forEach((key) => {
-          if (trainDiagram[key].match(props.station.Station_JP)) {
+      if (trainDiagram[key].match(station.Station_JP + ",")) {
         returnData[key] = trainDiagram[key];
       }
     });
     setStationDiagram(returnData);
-      });
-  }, []);
+  }, [trainDiagram, station]);
 
-  const getTime = () => {
-    const returnData = [];
-    Object.keys(stationDiagram).forEach((d) => {
-      let a = {};
-      stationDiagram[d].split("#").forEach((data) => {
+  const [trainTimeAndNumber, setTrainTimeAndNumber] = useState(null);
+
+  useEffect(() => {
+    //現在の駅に停車する列車から時刻を切り出してLEDベースにフォーマット
+    if (objectIsEmpty(stationDiagram)) return () => {};
+    const getTimeData = getTime(stationDiagram, station);
+    setTrainTimeAndNumber(getTimeData);
+  }, [stationDiagram]);
+
+  const [selectedTrain, setSelectedTrain] = useState([]);
+  useEffect(() => {
+    if (!trainTimeAndNumber) return () => {};
+    if (!currentTrain) return () => {};
+    const data = trainTimeAndNumber
+      .filter((d) => currentTrain.map((m) => m.num).includes(d.train))
+      .filter(timeFiltering)
+      .filter((d) => !!finalSwitch || d.lastStation != "当駅止");
+    setSelectedTrain(data);
+  }, [trainTimeAndNumber, currentTrain, finalSwitch]);
+
+  const getTime = (stationDiagram, station) => {
+    const returnData = Object.keys(stationDiagram).map((trainNum) => {
+      let trainData = {};
+      stationDiagram[trainNum].split("#").forEach((data) => {
         if (data.match("着")) {
-          a.lastStation = data.split(",着,")[0];
+          trainData.lastStation = data.split(",着,")[0];
         }
-        if (data.match(props.station.Station_JP)) {
+        if (data.split(",")[0] === station.Station_JP) {
           if (data.match(",発,")) {
-            a.time = data.split(",発,")[1];
+            trainData.time = data.split(",発,")[1];
           } else {
-            a.time = data.split(",着,")[1];
-            a.lastStation = "当駅止";
+            trainData.time = data.split(",着,")[1];
+            trainData.lastStation = "当駅止";
           }
         }
       });
-      returnData.push({ train: d, time: a.time, lastStation: a.lastStation });
+      return {
+        train: trainNum,
+        time: trainData.time,
+        lastStation: trainData.lastStation,
+      };
     });
-
     return returnData.sort((a, b) => {
       switch (true) {
         case parseInt(a.time.split(":")[0]) < parseInt(b.time.split(":")[0]):
@@ -126,19 +131,6 @@ export default function LED_vision(props) {
       }
     });
   };
-  const trainTimeAndNumber = stationDiagram != null ? getTime() : null;
-  const getCurrentTrain = () =>
-    fetch(
-      "https://train.jr-shikoku.co.jp/g?arg1=train&arg2=train",
-      HeaderConfig
-    )
-      .then((response) => response.json())
-      .then((d) => d.map((x) => ({ num: x.TrainNum, delay: x.delay })))
-      .then(setCurrentTrain);
-
-  useEffect(getCurrentTrain, []);
-
-  useInterval(getCurrentTrain, 15000);
 
   const timeFiltering = (d) => {
     const date = new Date();
@@ -156,6 +148,7 @@ export default function LED_vision(props) {
 
     return false;
   };
+
   return (
     <View
       style={{
@@ -166,6 +159,39 @@ export default function LED_vision(props) {
         marginHorizontal: wp("1%"),
       }}
     >
+      <Header
+        currentTrainLoading={currentTrainLoading}
+        setCurrentTrainLoading={setCurrentTrainLoading}
+        getCurrentTrain={getCurrentTrain}
+      />
+      {selectedTrain.map((d, index) => (
+        <EachData
+          d={d}
+          trainIDSwitch={trainIDSwitch}
+          trainDescriptionSwitch={trainDescriptionSwitch}
+          station={station}
+          currentTrain={currentTrain}
+          customTrainDataDetector={customTrainDataDetector}
+          setTrainInfo={setTrainInfo}
+          EachTrainInfoAsSR={EachTrainInfoAsSR}
+        />
+      ))}
+      <Footer
+        trainIDSwitch={trainIDSwitch}
+        setTrainIDSwitch={setTrainIDSwitch}
+        trainDescriptionSwitch={trainDescriptionSwitch}
+        setTrainDescriptionSwitch={setTrainDescriptionSwitch}
+        finalSwitch={finalSwitch}
+        setFinalSwitch={setFinalSwitch}
+      />
+    </View>
+  );
+}
+const Header = ({
+  currentTrainLoading,
+  setCurrentTrainLoading,
+  getCurrentTrain,
+}) => (
   <View
     style={{
       alignContent: "center",
@@ -182,190 +208,234 @@ export default function LED_vision(props) {
       </Text>
       <Text style={{ fontSize: 15, color: "white" }}>Next Train</Text>
     </View>
-        <View style={{ flex: 1 }}></View>
-      </View>
-      {trainTimeAndNumber
-        ? currentTrain &&
-          trainTimeAndNumber
-            .filter((d) => currentTrain.map((m) => m.num).includes(d.train))
-            .filter(timeFiltering)
-            .filter((d) => !!finalSwitch || d.lastStation != "当駅止")
-            .map((d, index) => {
-              const train = customTrainDataDetector(d.train);
-              return [
-                <View
-                  style={{
-                    alignContent: "center",
-                    alignItems: "center",
-                    width: "94%",
-                    marginVertical: 5,
-                    marginHorizontal: "3%",
-                    backgroundColor: "#000",
-                    flexDirection: "row",
+    <View style={{ flex: 1, flexDirection: "row-reverse" }}>
+      {currentTrainLoading == "loading" ? (
+        <LottieView
+          autoPlay
+          loop
+          style={{ width: 40, height: 40, marginRight: 30 }}
+          source={require("../../assets/51690-loading-diamonds.json")}
+        />
+      ) : currentTrainLoading == "error" ? (
+        <Ionicons
+          name="reload"
+          color="white"
+          size={30}
+          style={{ marginRight: 30 }}
+          onPress={() => {
+            setCurrentTrainLoading("loading");
+            getCurrentTrain();
           }}
-                >
-                  <View style={{ flex: 9 }}>
-                    <Text
-                      style={{
-                        fontSize: train.trainName.length > 6 ? 15 : 20,
-                        color: (() => {
-                          switch (train.type) {
-                            case "Rapid":
-                              return "aqua";
-                            case "LTDEXP":
-                              return "red";
-                            case "NightLTDEXP":
-                              return "red";
-                            case "Normal":
-                              return "white";
-                          }
-                        })(),
-                        fontWeight: "bold",
-                      }}
-                    >
-                      {trainIDSwitch
-                        ? d.train
-                        : (() => {
-                            switch (train.type) {
-                              case "Rapid":
-                                return "快速";
-                              case "LTDEXP":
-                                return "特急";
-                              case "NightLTDEXP":
-                                return "寝台特急";
-                              case "Normal":
-                                return "普通列車";
-                            }
-                          })() +
-                          " " +
-                          train.trainName +
-                          (train.trainNumDistance == undefined
-                            ? ""
-                            : parseInt(
-                                d.train.replace("M", "").replace("D", "")
-                              ) -
-                              train.trainNumDistance +
-                              "号")}
-                    </Text>
-                  </View>
-                  <View style={{ flex: 4, flexDirection: "row" }}>
-                    <Text
-                      style={{
-                        fontSize: d.lastStation.length > 4 ? 15 : 20,
-                        color: "white",
-                        fontWeight: "bold",
-                      }}
-                    >
-                      {d.lastStation}
-                    </Text>
-                  </View>
-                  <View style={{ flex: 3 }}>
-                    <Text
-                      style={{
-                        fontSize: 20,
-                        color: "white",
-                        fontWeight: "bold",
-                      }}
-                    >
-                      {d.time}
-                    </Text>
-                  </View>
-                  <View style={{ flex: 4 }}>
-                    <Text
-                      style={{
-                        fontSize: 20,
-                        color: "white",
-                        fontWeight: "bold",
-                      }}
-                    >
-                      {(() => {
-                        const delay = currentTrain.filter(
-                          (a) => a.num == d.train
-                        )[0].delay;
-                        switch (true) {
-                          case isNaN(delay):
-                            return delay;
-                          case delay == 0:
-                            return "定刻通り";
-                          default:
-                            return delay + "分遅れ";
-                        }
-                      })()}
-                    </Text>
-                  </View>
-                </View>,
-                trainDescriptionSwitch && !!train.info && (
-                  <View
-                    style={{
-                      alignContent: "center",
-                      alignItems: "center",
-                      width: "94%",
-                      marginVertical: 5,
-                      marginHorizontal: "3%",
-                      backgroundColor: "#000",
-                      flexDirection: "row",
-                    }}
-                  >
-                    <View style={{ flex: 4 }}>
-                      <Text
-                        style={{
-                          fontSize: 20,
-                          color: "green",
-                          fontWeight: "bold",
-                        }}
-                      >
-                        {" "}
-                        &gt; {train.info}
-                      </Text>
+        />
+      ) : null}
     </View>
   </View>
-                ),
-              ];
-            })
-        : null}
-      <View style={{ flexDirection: "row", padding: 10 }}>
-        <Text
-          style={{
+);
+
+const Footer = (props) => {
+  const {
+    trainIDSwitch,
+    setTrainIDSwitch,
+    trainDescriptionSwitch,
+    setTrainDescriptionSwitch,
+    finalSwitch,
+    setFinalSwitch,
+  } = props;
+
+  const textStyle = {
     alignItems: "center",
     alignContent: "center",
     textAlign: "center",
     textAlignVertical: "center",
     color: "white",
-          }}
-        >
-          種別名 / 列番
-        </Text>
+  };
+
+  return (
+    <View style={{ flexDirection: "row", padding: 10, alignItems: "center" }}>
+      <Text style={textStyle}>種別名 / 列番</Text>
       <Switch value={trainIDSwitch} onValueChange={setTrainIDSwitch} />
       <View style={{ flex: 1 }} />
-        <Text
-          style={{
-            alignItems: "center",
-            alignContent: "center",
-            textAlign: "center",
-            textAlignVertical: "center",
-            color: "white",
-          }}
-        >
-          列車情報
-        </Text>
+      <Text style={textStyle}>列車情報</Text>
       <Switch
         value={trainDescriptionSwitch}
         onValueChange={setTrainDescriptionSwitch}
       />
       <View style={{ flex: 1 }} />
-        <Text
-          style={{
-            alignItems: "center",
-            alignContent: "center",
-            textAlign: "center",
-            textAlignVertical: "center",
-            color: "white",
-          }}
-        >
-          当駅止表示
-        </Text>
+      <Text style={textStyle}>当駅止表示</Text>
       <Switch value={finalSwitch} onValueChange={setFinalSwitch} />
     </View>
+  );
+};
+
+const EachData = ({
+  d,
+  trainIDSwitch,
+  trainDescriptionSwitch,
+  station,
+  currentTrain,
+  customTrainDataDetector,
+  setTrainInfo,
+  EachTrainInfoAsSR,
+}) => {
+  const openTrainInfo = (d) => {
+    let TrainNumber = "";
+    if (train.trainNumDistance != undefined) {
+      const timeInfo =
+        parseInt(d.train.replace("M", "").replace("D", "")) -
+        train.trainNumDistance;
+      TrainNumber = timeInfo + "号";
+    }
+    setTrainInfo({
+      trainNum: d.train,
+      limited: `${getTrainType(train.type).data}:${
+        train.trainName
+      }${TrainNumber}`,
+      trainData: checkDuplicateTrainData(
+        currentTrain.filter((a) => a.num == d.train)
+      ),
+    });
+    EachTrainInfoAsSR.current?.show();
+  };
+  const [train, setTrain] = useState(customTrainDataDetector(d.train));
+  useEffect(() => {
+    setTrain(customTrainDataDetector(d.train));
+  }, [currentTrain, d.train, trainDescriptionSwitch]);
+  // 土讃線複数存在対策
+  const trainDelayStatus = getTrainDelayStatus(
+    checkDuplicateTrainData(currentTrain.filter((a) => a.num == d.train)),
+    station.Station_JP
+  );
+  return (
+    <>
+      <TouchableOpacity
+        style={{
+          alignContent: "center",
+          alignItems: "center",
+          width: "94%",
+          marginVertical: 5,
+          marginHorizontal: "3%",
+          backgroundColor: "#000",
+          flexDirection: "row",
+        }}
+        onPress={() => openTrainInfo(d)}
+      >
+        <TrainName
+          trainName={train.trainName}
+          trainNumDistance={train.trainNumDistance}
+          trainIDSwitch={trainIDSwitch}
+          trainID={d.train}
+          type={train.type}
+        />
+        <LastStation lastStation={d.lastStation} />
+        <DependTime time={d.time} />
+        <StatusAndDelay trainDelayStatus={trainDelayStatus} />
+      </TouchableOpacity>
+      {trainDescriptionSwitch && !!train.info && (
+        <Description info={train.info} />
+      )}
+    </>
+  );
+};
+
+const TrainName = ({
+  trainName,
+  trainNumDistance,
+  trainIDSwitch,
+  trainID,
+  type,
+}) => {
+  const { name, color } = getTrainType(type);
+  let TrainNumber =
+    trainNumDistance != undefined
+      ? `${
+          parseInt(trainID.replace("M", "").replace("D", "")) - trainNumDistance
+        }号`
+      : "";
+  return (
+    <View style={{ flex: 9 }}>
+      <Text
+        style={{
+          fontSize: trainName.length > 6 ? parseInt("13%") : parseInt("18%"),
+          color: color,
+          fontWeight: "bold",
+        }}
+      >
+        {trainIDSwitch ? trainID : `${name} ${trainName}${TrainNumber}`}
+      </Text>
     </View>
   );
-}
+};
+
+const LastStation = ({ lastStation }) => {
+  return (
+    <View style={{ flex: 4, flexDirection: "row" }}>
+      <Text
+        style={{
+          fontSize: lastStation.length > 4 ? parseInt("13%") : parseInt("18%"),
+          color: "white",
+          fontWeight: "bold",
+        }}
+      >
+        {lastStation}
+      </Text>
+    </View>
+  );
+};
+
+const DependTime = ({ time }) => (
+  <View style={{ flex: 3 }}>
+    <Text
+      style={{
+        fontSize: parseInt("18%"),
+        color: "white",
+        fontWeight: "bold",
+      }}
+    >
+      {time}
+    </Text>
+  </View>
+);
+
+const StatusAndDelay = ({ trainDelayStatus }) => {
+  return (
+    <View style={{ flex: 4 }}>
+      <Text
+        style={{
+          fontSize: parseInt("18%"),
+          color: "white",
+          fontWeight: "bold",
+          paddingLeft: 1,
+        }}
+      >
+        {trainDelayStatus}
+      </Text>
+    </View>
+  );
+};
+
+const Description = ({ info }) => (
+  <View
+    style={{
+      alignContent: "center",
+      alignItems: "center",
+      width: "94%",
+      marginVertical: 5,
+      marginHorizontal: "3%",
+      backgroundColor: "#000",
+      flexDirection: "row",
+    }}
+  >
+    <View style={{ flex: 4 }}>
+      <Text
+        style={{
+          fontSize: parseInt("18%"),
+          color: "green",
+          fontWeight: "bold",
+        }}
+      >
+        {" "}
+        &gt; {info}
+      </Text>
+    </View>
+  </View>
+);

components/駅名表/Sign.js

@@ -12,21 +12,68 @@ import {
   widthPercentageToDP as wp,
   heightPercentageToDP as hp,
 } from "react-native-responsive-screen";
+import LottieView from "lottie-react-native";
 import { useInterval } from "../../lib/useInterval";
+import { AS } from "../../storageControl";
 
 export default function Sign(props) {
-  const { currentStation, originalStationList, oP } = props;
+  const {
+    currentStation,
+    originalStationList,
+    oP,
+    oLP,
+    favoriteStation,
+    setFavoriteStation,
+  } = props;
+  const [nexPrePosition, setNexPrePosition] = useState(0);
+
+  const [preStation, setPreStation] = useState();
+  const [nexStation, setNexStation] = useState();
+  const [testButtonStatus, setTestButtonStatus] = useState(false);
+
+  useEffect(() => {
+    const isFavorite = favoriteStation.filter((d) => {
+      const compare = JSON.stringify(d);
+      const current = JSON.stringify(currentStation);
+      if (compare === current) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+    setTestButtonStatus(isFavorite.length != 0);
+  }, [favoriteStation, currentStation]);
+
+  useInterval(() => {
+    if (currentStation.length == 1) {
+      setNexPrePosition(0);
+      return () => {};
+    }
+    setNexPrePosition(
+      nexPrePosition + 1 == currentStation.length ? 0 : nexPrePosition + 1
+    );
+  }, 2000);
+
+  useEffect(() => {
+    setNexPrePosition(0);
+    getPreNextStation(currentStation[0]);
+  }, [currentStation]);
+
+  useEffect(() => {
+    if (!currentStation[nexPrePosition]) return () => {};
+    getPreNextStation(currentStation[nexPrePosition]);
+  }, [nexPrePosition]);
   const getPreNextStation = (now) => {
     const lineList = [
-      "予讃線",
-      "松宇線",
-      "伊予灘線",
-      "土讃線",
-      "窪川線",
-      "高徳線",
-      "徳島線",
-      "鳴門線",
-      "瀬戸大橋線",
+      "予讃線(高松-松山間)[Y]",
+      "予讃線(松山-宇和島間)[U]",
+      "予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]",
+      "土讃線(多度津-高知間)[D]",
+      "土讃線(高知-窪川間)[K]",
+      "高徳線(高松-徳島間)[T]",
+      "徳島線(徳島-阿波池田)[B]",
+      "鳴門線(池谷-鳴門間)[N]",
+      "瀬戸大橋線(宇多津-児島間)[M]",
     ];
     let returnData;
     lineList.forEach((d) => {
@@ -40,34 +87,95 @@ export default function Sign(props) {
         ];
       }
     });
-    return returnData;
+    setPreStation(returnData[0]);
+    setNexStation(returnData[1]);
   };
-  const [nexPrePosition, setNexPrePosition] = useState(0);
-  useInterval(() => {
-    if (currentStation.length == 1) return;
-    LayoutAnimation.easeInEaseOut();
-    setNexPrePosition(
-      nexPrePosition + 1 == currentStation.length ? 0 : nexPrePosition + 1
-    );
-  }, 2000);
+  const lottieRef = useRef();
   return (
-    <TouchableOpacity style={styleSheet.外枠} onPress={oP}>
+    <TouchableOpacity style={styleSheet.外枠} onPress={oP} onLongPress={oLP}>
       <StationNumberMaker currentStation={currentStation} />
       <StationNameArea currentStation={currentStation} />
+      <TouchableOpacity
+        style={{ position: "absolute", right: -15, top: -20 }}
+        onPress={() => {
+          if (testButtonStatus) {
+            const otherData = favoriteStation.filter((d) => {
+              const compare = JSON.stringify(d);
+              const current = JSON.stringify(currentStation);
+              if (compare !== current) {
+                return true;
+              } else {
+                return false;
+              }
+            });
+            AS.setItem("favoriteStation", JSON.stringify(otherData));
+            setFavoriteStation(otherData);
+          } else {
+            let ret = favoriteStation;
+            ret.push(currentStation);
+            AS.setItem("favoriteStation", JSON.stringify(ret));
+            setFavoriteStation(ret);
+          }
+          setTestButtonStatus(!testButtonStatus);
+        }}
+      >
+        <LottieDelayView
+          progress={testButtonStatus ? 1 : 0}
+          speed={1.4}
+          style={{ width: 80, height: 80 }}
+          source={require("../../assets/939-star.json")}
+          lottieRef={lottieRef}
+          loop={false}
+        />
+      </TouchableOpacity>
+
       <Text style={styleSheet.JRStyle}>JR</Text>
       <View style={styleSheet.下帯} />
       <View style={styleSheet.下帯内容}>
-        {(() => {
-          let [preStation, nexStation] = getPreNextStation(
-            currentStation[nexPrePosition]
+        <NexPreStationLine preStation={preStation} nexStation={nexStation} />
+      </View>
+    </TouchableOpacity>
   );
+}
+
+const LottieDelayView = ({
+  progress,
+  speed,
+  style,
+  source,
+  lottieRef,
+  loop,
+}) => {
+  const [progressState, setProgressState] = useState(undefined);
+  useEffect(() => {
+    if (progress == 0) {
+      lottieRef.current.play(progressState !== undefined ? 35 : 7, 7);
+    } else {
+      lottieRef.current.play(progressState !== undefined ? 7 : 35, 35);
+    }
+  }, [progress]);
+  return (
+    <LottieView
+      progress={progressState}
+      speed={speed}
+      style={style}
+      source={source}
+      ref={lottieRef}
+      loop={loop}
+      onAnimationFinish={(isCanceled) => {
+        setProgressState(progress);
+      }}
+    />
+  );
+};
+const NexPreStationLine = ({ nexStation, preStation }) => {
   return (
     <View style={styleSheet.下枠フレーム}>
       <View style={styleSheet.下枠フレーム}>
-                {preStation && (
+        {preStation ? (
           <>
             <Text style={styleSheet.下枠左右マーク}>◀</Text>
-                    {preStation.StationNumber && (
+            {preStation.StationNumber ? (
               <View style={styleSheet.下枠駅ナンバー}>
                 <View style={{ flex: 1 }} />
                 <Text
@@ -80,61 +188,62 @@ export default function Sign(props) {
                 </Text>
                 <View style={{ flex: 1 }} />
               </View>
+            ) : (
+              <></>
             )}
             <StationName
               stringData={preStation}
               ss={{ flex: 1, alignItems: "flex-start" }}
             />
           </>
+        ) : (
+          <></>
         )}
       </View>
       <View style={styleSheet.下枠フレーム}>
-                {nexStation && (
+        {nexStation ? (
           <>
             <StationName
               stringData={nexStation}
               ss={{ flex: 1, alignItems: "flex-end" }}
             />
-                    {nexStation.StationNumber && (
+            {nexStation.StationNumber ? (
               <View style={styleSheet.下枠駅ナンバー}>
                 <View style={{ flex: 1 }} />
-                        <Text
-                          style={{ fontSize: parseInt("10%"), color: "white" }}
-                        >
+                <Text style={{ fontSize: parseInt("10%"), color: "white" }}>
                   {nexStation.StationNumber}
                 </Text>
                 <View style={{ flex: 1 }} />
               </View>
+            ) : (
+              <></>
             )}
             <Text style={styleSheet.下枠左右マーク}>▶</Text>
           </>
+        ) : (
+          <></>
         )}
       </View>
     </View>
   );
-        })()}
-      </View>
-    </TouchableOpacity>
-  );
-}
+};
 
 const StationNumberMaker = (props) => {
-  return props.currentStation
-    .filter((d) => (d.StationNumber ? true : false))
-    .map((d, index, array) => (
-      <View
-        key={d + index}
-        style={{
-          position: "absolute",
-          alignContent: "center",
-          alignItems: "center",
-          top:
-            (() => {
+  const getTop = (array, index) => {
     if (array.length == 1) return 20;
     else if (index == 0) return 5;
     else if (index == 1) return 35;
     else return 20;
-            })() + "%",
+  };
+  return props.currentStation
+    .filter((d) => (d.StationNumber ? true : false))
+    .map((d, index, array) => (
+      <View
+        style={{
+          position: "absolute",
+          alignContent: "center",
+          alignItems: "center",
+          top: getTop(array, index) + "%",
           right: "10%",
           width: wp("10%"),
           height: wp("10%"),
@@ -185,8 +294,7 @@ const styleSheet = {
     height: (wp("80%") / 20) * 9,
     borderColor: "#2E94BB",
     borderWidth: 1,
-    margin: 10,
-    marginHorizontal: wp("10%"),
+    backgroundColor: "white",
   },
   下帯: {
     position: "absolute",
@@ -232,6 +340,7 @@ const styleSheet = {
     flex: 1,
     flexDirection: "row",
     alignContent: "center",
+    alignItems: "center",
   },
   下枠左右マーク: {
     fontWeight: "bold",

config/newsUpdate.js

@@ -1 +1 @@
-export const news = "2022-9-30";
+export const news = "2023-7-16";

eas.json

@@ -15,6 +15,12 @@
     },
     "production": {
       "releaseChannel": "aliexpress"
+    },
+    "beta4.5": {
+      "releaseChannel": "base"
+    },
+    "production4.5": {
+      "releaseChannel": "buyma"
     }
   },
   "submit": {

howto.js

@@ -2,24 +2,13 @@ const WEBVIEW = "WEBVIEW";
 import React, { Component } from "react";
 import { StatusBar, View, TouchableOpacity, Text } from "react-native";
 import { WebView } from "react-native-webview";
-export default ({ navigation: { navigate } }) => (
-  <View style={{ height: "100%", backgroundColor: "#0099CC" }}>
-    <WebView
-      useWebKit={true}
-      source={{ uri: "https://train.jr-shikoku.co.jp/usage.htm" }}
-    />
-    <TouchableOpacity
-      style={{
-        padding: 10,
-        flexDirection: "row",
-        borderColor: "white",
-        borderWidth: 1,
-        margin: 10,
-        borderRadius: 5,
-        alignItems: "center",
-      }}
-      onPress={() => navigate("Apps")}
-    >
+export default ({ navigation: { navigate }, route }) => {
+  const { info, onExit = () => navigate("Apps") } = route.params;
+
+  return (
+    <View style={styles.View}>
+      <WebView useWebKit source={{ uri: info }} />
+      <TouchableOpacity style={styles.touch} onPress={onExit}>
         <View style={{ flex: 1 }} />
         <Text style={{ fontSize: 25, fontWeight: "bold", color: "white" }}>
           閉じる
@@ -27,4 +16,17 @@ export default ({ navigation: { navigate } }) => (
         <View style={{ flex: 1 }} />
       </TouchableOpacity>
     </View>
-);
+  );
+};
+const styles = {
+  View: { height: "100%", backgroundColor: "#0099CC" },
+  touch: {
+    padding: 10,
+    flexDirection: "row",
+    borderColor: "white",
+    borderWidth: 1,
+    margin: 10,
+    borderRadius: 5,
+    alignItems: "center",
+  },
+};

lib/HeaderConfig.js

@@ -0,0 +1,5 @@
+export const HeaderConfig = {
+  headers: {
+    referer: "https://train.jr-shikoku.co.jp/sp.html",
+  },
+};

lib/checkDuplicateTrainData.js

@@ -0,0 +1,6 @@
+export const checkDuplicateTrainData = (currentTrainArray) => {
+  const notNyujoData = currentTrainArray.filter((d) => d.delay !== "入線");
+  if (currentTrainArray.length == 1) return currentTrainArray[0];
+  if (notNyujoData.length == 0) return currentTrainArray[0];
+  else return notNyujoData[0];
+};

lib/getPdfViewURL.js

@@ -0,0 +1,7 @@
+import { Platform } from "react-native";
+
+export const getPDFViewURL = (url) => {
+  if (Platform.OS == "ios") return url;
+  else
+    return `https://docs.google.com/viewer?url=${encodeURI(url)}&embedded=true`;
+};

lib/getStationList.js

@@ -18,14 +18,21 @@ import train_lang from "../assets/originData/train_lang";
 
 let status = undefined;
 
+export const lineList = [
+  "予讃線(高松-松山間)[Y]",
+  "予讃線(松山-宇和島間)[U]",
+  "予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]",
+  "土讃線(多度津-高知間)[D]",
+  "土讃線(高知-窪川間)[K]",
+  "高徳線(高松-徳島間)[T]",
+  "徳島線(徳島-阿波池田)[B]",
+  "鳴門線(池谷-鳴門間)[N]",
+  "瀬戸大橋線(宇多津-児島間)[M]",
+];
+
 export const getStationList = async (props) => {
   if (status) return status;
   //駅リストイニシャライズ
-  const HeaderConfig = {
-    headers: {
-      referer: "https://train.jr-shikoku.co.jp/sp.html",
-    },
-  };
   return await Promise.all([
     yosan,
     uwajima,
@@ -41,15 +48,15 @@ export const getStationList = async (props) => {
   ]).then((values) => {
     let stationList = {};
     [
-      stationList.予讃線,
-      stationList.松宇線,
-      stationList.伊予灘線,
-      stationList.土讃線,
-      stationList.窪川線,
-      stationList.高徳線,
-      stationList.徳島線,
-      stationList.鳴門線,
-      stationList.瀬戸大橋線,
+      stationList["予讃線(高松-松山間)[Y]"],
+      stationList["予讃線(松山-宇和島間)[U]"],
+      stationList["予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]"],
+      stationList["土讃線(多度津-高知間)[D]"],
+      stationList["土讃線(高知-窪川間)[K]"],
+      stationList["高徳線(高松-徳島間)[T]"],
+      stationList["徳島線(徳島-阿波池田)[B]"],
+      stationList["鳴門線(池谷-鳴門間)[N]"],
+      stationList["瀬戸大橋線(宇多津-児島間)[M]"],
       stationList.駅間リスト,
       stationList.日英対応表,
     ] = values;
@@ -103,52 +110,55 @@ export const getStationList = async (props) => {
         return data;
       });
     };
-    stationList.予讃線 = addStationPosition(
-      concatBetweenStations(stationList.予讃線),
+    stationList["予讃線(高松-松山間)[Y]"] = addStationPosition(
+      concatBetweenStations(stationList["予讃線(高松-松山間)[Y]"]),
       予讃線,
       stationList.日英対応表
     );
-    stationList.松宇線 = addStationPosition(
-      concatBetweenStations(stationList.松宇線),
+    stationList["予讃線(松山-宇和島間)[U]"] = addStationPosition(
+      concatBetweenStations(stationList["予讃線(松山-宇和島間)[U]"]),
       予讃線,
       stationList.日英対応表
     );
-    stationList.伊予灘線 = addStationPosition(
-      concatBetweenStations(stationList.伊予灘線),
+    stationList["予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]"] =
+      addStationPosition(
+        concatBetweenStations(
+          stationList["予讃線/愛ある伊予灘線(向井原-伊予大洲間)[S]"]
+        ),
         予讃線,
         stationList.日英対応表
       );
-    stationList.土讃線 = addStationPosition(
-      concatBetweenStations(stationList.土讃線),
+    stationList["土讃線(多度津-高知間)[D]"] = addStationPosition(
+      concatBetweenStations(stationList["土讃線(多度津-高知間)[D]"]),
       土讃線,
       stationList.日英対応表
     );
-    stationList.窪川線 = addStationPosition(
-      concatBetweenStations(stationList.窪川線),
+    stationList["土讃線(高知-窪川間)[K]"] = addStationPosition(
+      concatBetweenStations(stationList["土讃線(高知-窪川間)[K]"]),
       土讃線,
       stationList.日英対応表
     );
-    stationList.高徳線 = addStationPosition(
-      concatBetweenStations(stationList.高徳線),
+    stationList["高徳線(高松-徳島間)[T]"] = addStationPosition(
+      concatBetweenStations(stationList["高徳線(高松-徳島間)[T]"]),
       高徳線,
       stationList.日英対応表
     );
-    stationList.鳴門線 = addStationPosition(
-      concatBetweenStations(stationList.鳴門線),
+    stationList["鳴門線(池谷-鳴門間)[N]"] = addStationPosition(
+      concatBetweenStations(stationList["鳴門線(池谷-鳴門間)[N]"]),
       鳴門線,
       stationList.日英対応表
     );
     const tokushimaCurrent = addStationPosition(
-      concatBetweenStations(stationList.徳島線),
+      concatBetweenStations(stationList["徳島線(徳島-阿波池田)[B]"]),
       徳島線,
       stationList.日英対応表
     );
-    stationList.徳島線 = [
+    stationList["徳島線(徳島-阿波池田)[B]"] = [
       tokushimaCurrent[tokushimaCurrent.length - 1],
       ...tokushimaCurrent,
     ];
-    stationList.徳島線.pop();
-    stationList.瀬戸大橋線 = [
+    stationList["徳島線(徳島-阿波池田)[B]"].pop();
+    stationList["瀬戸大橋線(宇多津-児島間)[M]"] = [
       {
         Station_JP: "坂出",
         Station_EN: "Sakaide",

lib/getTrainDelayStatus.js

@@ -0,0 +1,18 @@
+export const getTrainDelayStatus = (current, Station_JP) => {
+  if (!current) return () => {};
+  const delay = current.delay;
+  switch (true) {
+    case delay === "入線":
+      if (current.Pos === Station_JP) {
+        return "当駅始発";
+      } else {
+        return "発車前";
+      }
+    case isNaN(delay):
+      return delay;
+    case delay === 0:
+      return "定刻通り";
+    default:
+      return delay + "分遅れ";
+  }
+};

lib/getTrainType.js

@@ -0,0 +1,14 @@
+export const getTrainType = (nameString) => {
+  switch (nameString) {
+    case "Rapid":
+      return { color: "aqua", name: "快速", data: "rapid" };
+    case "LTDEXP":
+      return { color: "red", name: "特急", data: "express" };
+    case "NightLTDEXP":
+      return { color: "red", name: "寝台特急", data: "express" };
+    case "Normal":
+      return { color: "white", name: "普通列車", data: "normal" };
+    default:
+      return { color: "white", name: "その他", data: "normal" };
+  }
+};

lib/objectIsEmpty.js

@@ -0,0 +1,3 @@
+export const objectIsEmpty = (obj) => {
+  return !Object.keys(obj).length;
+};

lib/parseAllTrainDiagram.js

@@ -0,0 +1,11 @@
+export const parseAllTrainDiagram = (text) => {
+  const val = text.replace("[\r\n", "").split(",\r\n");
+  let trainDiagram = {};
+  val.forEach((element) => {
+    try {
+      let data = JSON.parse(element);
+      Object.keys(data).forEach((key) => (trainDiagram[key] = data[key]));
+    } catch (e) {}
+  });
+  return trainDiagram;
+};

menu.js

@@ -1,89 +1,82 @@
-import React, { Component, useRef, useState, useEffect } from "react";
+import React, { useRef, useState, useEffect } from "react";
+import Carousel from "react-native-snap-carousel";
 import {
-  StatusBar,
   Platform,
   View,
-  LayoutAnimation,
   ScrollView,
   Linking,
   Text,
   TouchableOpacity,
+  ToastAndroid,
 } from "react-native";
-import Image from "react-native-remote-svg";
 import Constants from "expo-constants";
-import { List, ListItem } from "native-base";
+import { ListItem } from "native-base";
 import Icon from "react-native-vector-icons/Entypo";
 import * as Location from "expo-location";
 import StatusbarDetect from "./StatusbarDetect";
 import { useNavigation } from "@react-navigation/native";
 import AutoHeightImage from "react-native-auto-height-image";
-import {
-  widthPercentageToDP as wp,
-  heightPercentageToDP as hp,
-} from "react-native-responsive-screen";
+import { widthPercentageToDP as wp } from "react-native-responsive-screen";
 import {
   FontAwesome,
-  Fontisto,
   Foundation,
   Ionicons,
   MaterialCommunityIcons,
 } from "@expo/vector-icons";
-import * as WebBrowser from "expo-web-browser";
-import ActionSheet from "react-native-actions-sheet";
 import LottieView from "lottie-react-native";
-import SvgUri from "react-native-svg-uri";
 import { StationDeteilView } from "./components/ActionSheetComponents/StationDeteilView";
+import { parseAllTrainDiagram } from "./lib/parseAllTrainDiagram";
+import trainList from "./assets/originData/trainList";
 
-import 予讃線 from "./assets/四国旅客鉄道予讃線.json";
-import 土讃線 from "./assets/四国旅客鉄道土讃線.json";
-import 高徳線 from "./assets/四国旅客鉄道高徳線.json";
-import 内子線 from "./assets/四国旅客鉄道内子線.json";
-import 徳島線 from "./assets/四国旅客鉄道徳島線.json";
-import 鳴門線 from "./assets/四国旅客鉄道鳴門線.json";
 import LED_vision from "./components/発車時刻表/LED_vidion";
 import Sign from "./components/駅名表/Sign";
 
 import { UsefulBox } from "./components/atom/UsefulBox";
 import { TicketBox } from "./components/atom/TicketBox";
 import { TextBox } from "./components/atom/TextBox";
-import { getStationList } from "./lib/getStationList";
+import { getStationList, lineList } from "./lib/getStationList";
 import { JRSTraInfo } from "./components/ActionSheetComponents/JRSTraInfo";
+import { EachTrainInfo } from "./components/ActionSheetComponents/EachTrainInfo";
+import useInterval from "./lib/useInterval";
+import { HeaderConfig } from "./lib/HeaderConfig";
 
 export default function Menu(props) {
   const {
     navigation: { navigate },
+    favoriteStation,
+    setFavoriteStation,
+    busAndTrainData,
+    currentTrainState,
+    currentTrainLoadingState,
+    getCurrentTrain,
   } = props;
   const JRSTraInfoEXAcSR = useRef(null);
   const StationBoardAcSR = useRef(null);
   const navigation = useNavigation();
 
   //位置情報
-  const [location, setLocation] = useState(null);
-  const [errorMsg, setErrorMsg] = useState(null);
+  const [locationStatus, setLocationStatus] = useState(null);
   useEffect(() => {
     Location.requestForegroundPermissionsAsync().then((data) => {
-      if (data.status !== "granted") {
-        setErrorMsg("Permission to access location was denied");
-        return () => {};
-      }
-      Location.getCurrentPositionAsync({}).then((location) =>
-        setLocation(location)
-      );
+      setLocationStatus(data.status);
     });
-    setInterval(() => {
-      Location.getCurrentPositionAsync({}).then((location) =>
-        setLocation(location)
-      );
-    }, 10000);
   }, []);
 
-  const [originalStationList, setOriginalStationList] = useState();
-  useEffect(() => getStationList().then(setOriginalStationList), []);
+  //列車情報表示関連
+  const EachTrainInfoAsSR = useRef(null);
+  const [trainInfo, setTrainInfo] = useState({
+    trainNum: undefined,
+    limited: undefined,
+    trainData: undefined,
+  });
 
-  const [stationName, setStationName] = useState(undefined);
-  const [currentStation, setCurrentStation] = useState(undefined);
-  useEffect(() => {
-    if (!location) return () => {};
+  const getCurrentPosition = () => {
+    if (locationStatus !== "granted") return () => {};
+    Location.getCurrentPositionAsync({}).then((location) =>
+      makeCurrentStation(location)
+    );
+  };
+  const makeCurrentStation = (location) => {
     if (!originalStationList) return () => {};
     const findStationEachLine = (selectLine) => {
       const searchArea = 0.0015;
@@ -102,17 +95,6 @@ export default function Menu(props) {
       return NearStation;
     };
 
-    const lineList = [
-      "予讃線",
-      "松宇線",
-      "伊予灘線",
-      "土讃線",
-      "窪川線",
-      "高徳線",
-      "徳島線",
-      "鳴門線",
-      "瀬戸大橋線",
-    ];
     let returnDataBase = lineList
       .map((d) => findStationEachLine(originalStationList[d]))
       .filter((d) => d.length > 0)
@@ -120,7 +102,6 @@ export default function Menu(props) {
         pre.push(...current);
         return pre;
       }, []);
-    LayoutAnimation.spring();
     if (returnDataBase.length) {
       let currentStation = currentStation == undefined ? [] : currentStation;
       if (currentStation.toString() != returnDataBase.toString()) {
@@ -128,14 +109,23 @@ export default function Menu(props) {
       }
     } else {
       setCurrentStation(undefined);
-      StationBoardAcSR.current?.hide();
     }
-  }, [location, originalStationList]);
+  };
+
+  useEffect(getCurrentPosition, [locationStatus]);
+  useInterval(getCurrentPosition, 5000);
+
+  const [currentStation, setCurrentStation] = useState(undefined); //第三要素
+
+  const [originalStationList, setOriginalStationList] = useState(); // 第一要素
+  useEffect(() => getStationList().then(setOriginalStationList), []);
 
   const [count, setCount] = useState(0);
   const [delayData, setDelayData] = useState(undefined);
   const [getTime, setGetTime] = useState(new Date());
   const [loadingDelayData, setLoadingDelayData] = useState(true);
+  const carouselRef = useRef();
+  const [selectedCurrentStation, setSelectedCurrentStation] = useState(0);
 
   useEffect(() => {
     fetch(
@@ -143,11 +133,72 @@ export default function Menu(props) {
     )
       .then((response) => response.text())
       .then((data) => setDelayData(data !== "" ? data.split("^") : null))
-      .then(LayoutAnimation.easeInEaseOut)
       .then(() => setGetTime(new Date()))
       .finally(() => setLoadingDelayData(false));
   }, [loadingDelayData]);
+  const allStationData = [currentStation, ...favoriteStation].filter(
+    (d) => d != undefined
+  );
+  useEffect(() => {
+    if (allStationData.length == 0) {
+      setSelectedCurrentStation(0);
+      return;
+    }
+    if (allStationData[selectedCurrentStation] == undefined) {
+      const count = selectedCurrentStation - 1;
+      setSelectedCurrentStation(count);
+    }
+  }, [selectedCurrentStation, currentStation, favoriteStation]);
+  useEffect(() => {
+    if (!carouselRef.current) return;
+    if (carouselRef.current?._itemToSnapTo != selectedCurrentStation) {
+      carouselRef.current.snapToItem(0);
+      carouselRef.current.snapToItem(selectedCurrentStation);
+    }
+  }, [selectedCurrentStation]);
 
+  //全列車ダイヤリストを作成するuseEffect
+  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((d) => {
+        console.log("fallback");
+        setTrainDiagram(trainList);
+      });
+  }, []);
+
+  const openStationACFromEachTrainInfo = (stationName) => {
+    // EachTrainInfoAsSR.current?.hide();
+    // const findStationEachLine = (selectLine) => {
+    //   let NearStation = selectLine.filter((d) => d.Station_JP == stationName);
+    //   return NearStation;
+    // };
+    // let returnDataBase = lineList
+    //   .map((d) => findStationEachLine(originalStationList[d]))
+    //   .filter((d) => d.length > 0)
+    //   .reduce((pre, current) => {
+    //     pre.push(...current);
+    //     return pre;
+    //   }, []);
+    // if (returnDataBase.length) {
+    //   setStationBoardData(returnDataBase);
+    //   sleep(30, function () {
+    //     StationBoardAcSR.current?.show();
+    //   });
+    // } else {
+    //   setStationBoardData(undefined);
+    //   StationBoardAcSR.current?.hide();
+    // }
+  };
   return (
     <View
       style={{
@@ -157,6 +208,103 @@ export default function Menu(props) {
       }}
     >
       <StatusbarDetect />
+      <TitleBar />
+      <ScrollView>
+        <FixedContentTop navigate={navigate} />
+        {originalStationList && allStationData.length != 0 && (
+          <Carousel
+            ref={carouselRef}
+            layout={"default"}
+            data={originalStationList && allStationData}
+            sliderWidth={wp("100%")}
+            itemWidth={wp("80%")}
+            enableMomentum
+            callbackOffsetMargin={1000}
+            activeAnimationOptions={0.3}
+            onSnapToItem={(d) => {
+              setSelectedCurrentStation(d);
+            }}
+            renderItem={({ item, index }) => {
+              return (
+                <View
+                  style={{ marginVertical: 10 }}
+                  key={item[0].StationNumber}
+                >
+                  <Sign
+                    currentStation={item}
+                    originalStationList={originalStationList}
+                    favoriteStation={favoriteStation}
+                    setFavoriteStation={setFavoriteStation}
+                    oP={StationBoardAcSR.current?.setModalVisible}
+                  />
+                </View>
+              );
+            }}
+          />
+        )}
+        {allStationData.length != 0 &&
+          originalStationList &&
+          allStationData[selectedCurrentStation] && (
+            <LED_vision
+              station={
+                originalStationList && allStationData[selectedCurrentStation][0]
+              }
+              setTrainInfo={setTrainInfo}
+              EachTrainInfoAsSR={EachTrainInfoAsSR}
+              trainDiagram={trainDiagram}
+              currentTrainState={currentTrainState}
+              currentTrainLoadingState={currentTrainLoadingState}
+              getCurrentTrain={getCurrentTrain}
+            />
+          )}
+        <JRSTraInfoBox
+          JRSTraInfoEXAcSR={JRSTraInfoEXAcSR}
+          getTime={getTime}
+          setLoadingDelayData={setLoadingDelayData}
+          loadingDelayData={loadingDelayData}
+          delayData={delayData}
+        />
+        <FixedContentBottom navigate={navigate} />
+      </ScrollView>
+
+      <StationDeteilView
+        StationBoardAcSR={StationBoardAcSR}
+        currentStation={
+          originalStationList &&
+          allStationData.length != 0 &&
+          allStationData[selectedCurrentStation]
+        }
+        originalStationList={originalStationList}
+        favoriteStation={favoriteStation}
+        setFavoriteStation={setFavoriteStation}
+        busAndTrainData={busAndTrainData}
+        navigate={navigate}
+        onExit={() => {
+          StationBoardAcSR.current?.setModalVisible();
+          navigate("menu");
+        }}
+      />
+      <JRSTraInfo
+        JRSTraInfoEXAcSR={JRSTraInfoEXAcSR}
+        getTime={getTime}
+        loadingDelayData={loadingDelayData}
+        setLoadingDelayData={setLoadingDelayData}
+        delayData={delayData}
+      />
+      <EachTrainInfo
+        setRef={EachTrainInfoAsSR}
+        data={trainInfo}
+        navigate={navigate}
+        originalStationList={originalStationList}
+        openStationACFromEachTrainInfo={openStationACFromEachTrainInfo}
+        from="LED"
+      />
+    </View>
+  );
+}
+
+const TitleBar = () => {
+  return (
     <View style={{ alignItems: "center" }}>
       <TouchableOpacity
         onPress={() => Linking.openURL("https://www.jr-shikoku.co.jp")}
@@ -168,102 +316,102 @@ export default function Menu(props) {
         />
       </TouchableOpacity>
     </View>
-      <ScrollView>
-        <View style={{ flexDirection: "row" }}>
-          <UsefulBox
-            backgroundColor={"#F89038"}
-            icon="train-car"
-            flex={1}
-            onPressButton={() =>
-              Linking.openURL("https://www.jr-shikoku.co.jp/01_trainbus/sp/")
-            }
-          >
-            駅・鉄道情報
-          </UsefulBox>
-          <UsefulBox
-            backgroundColor={"#EA4752"}
-            icon="google-spreadsheet"
-            flex={1}
-            onPressButton={() =>
+  );
+};
+
+const TopMenuButton = () => {
+  const buttonList = [
+    {
+      backgroundColor: "#F89038",
+      icon: "train-car",
+      onPress: () =>
+        Linking.openURL("https://www.jr-shikoku.co.jp/01_trainbus/sp/"),
+      title: "駅・鉄道情報",
+    },
+    {
+      backgroundColor: "#EA4752",
+      icon: "google-spreadsheet",
+      onPress: () =>
         Linking.openURL(
           "https://www.jr-shikoku.co.jp/01_trainbus/jikoku/sp/#mainprice-box"
-              )
-            }
-          >
-            運賃表
-          </UsefulBox>
+        ),
+      title: "運賃表",
+    },
+    {
+      backgroundColor: "#91C31F",
+      icon: "clipboard-list-outline",
+      onPress: () => Linking.openURL("https://www.jr-shikoku.co.jp/e5489/"),
+      title: "予約",
+    },
+  ];
+  return (
+    <View style={{ flexDirection: "row" }}>
+      {buttonList.map((d, index) => (
         <UsefulBox
-            backgroundColor={"#91C31F"}
-            icon="clipboard-list-outline"
+          backgroundColor={d.backgroundColor}
+          icon={d.icon}
           flex={1}
-            onPressButton={() =>
-              Linking.openURL("https://www.jr-shikoku.co.jp/e5489/")
-            }
+          onPressButton={d.onPress}
+          key={index + d.icon}
         >
-            予約
+          {d.title}
         </UsefulBox>
+      ))}
     </View>
-        <TextBox
-          backgroundColor="#0099CC"
-          flex={1}
-          onPressButton={() =>
-            Linking.openURL(
-              "https://www.jr-shikoku.co.jp/02_information/suspension/sp/"
-            )
-          }
-        >
-          <Text style={{ color: "white", fontWeight: "bold", fontSize: 18 }}>
-            新型コロナウイルスに関するお知らせ
-          </Text>
-          <Text style={{ color: "white", fontSize: 15 }}>
-            列車の運行計画・混雑状況・感染症対策への取り組み
-          </Text>
-        </TextBox>
-        {currentStation && (
-          <>
-            <Sign
-              currentStation={currentStation}
-              originalStationList={originalStationList}
-              oP={StationBoardAcSR.current?.setModalVisible}
-            />
-            <LED_vision station={currentStation[0]} />
-          </>
-        )}
-        <TouchableOpacity onPress={JRSTraInfoEXAcSR.current?.setModalVisible}>
-          <View
-            style={{
+  );
+};
+
+const JRSTraInfoBox = (props) => {
+  const {
+    JRSTraInfoEXAcSR,
+    getTime,
+    setLoadingDelayData,
+    loadingDelayData,
+    delayData,
+  } = props;
+  const styles = {
+    touch: {
       backgroundColor: "#0099CC",
       borderRadius: 5,
       margin: 10,
       borderColor: "black",
       borderWidth: 2,
       overflow: "hidden",
-            }}
-          >
-            <ScrollView
-              scrollEnabled={false}
-              style={{
+    },
+    scroll: {
       backgroundColor: "#0099CC",
       borderRadius: 5,
       maxHeight: 300,
-              }}
-            >
-              <View
-                style={{
-                  padding: 10,
-                  flexDirection: "row",
+    },
+    bottom: {
+      position: "absolute",
+      top: 250,
       alignItems: "center",
-                }}
+      width: "100%",
+      height: 50,
+      backgroundColor: "#007FCC88",
+    },
+    box: {
+      padding: 10,
+      backgroundColor: "white",
+      borderBottomLeftRadius: 5,
+      borderBottomRightRadius: 5,
+    },
+  };
+  return (
+    <TouchableOpacity
+      onPress={JRSTraInfoEXAcSR.current?.setModalVisible}
+      style={styles.touch}
     >
-                <Text
-                  style={{ fontSize: 30, fontWeight: "bold", color: "white" }}
+      <ScrollView scrollEnabled={false} style={styles.scroll}>
+        <View
+          style={{ padding: 10, flexDirection: "row", alignItems: "center" }}
         >
+          <Text style={{ fontSize: 30, fontWeight: "bold", color: "white" }}>
             列車遅延速報EX
           </Text>
           <View style={{ flex: 1 }} />
-                <Text
-                  style={{ fontSize: 30, fontWeight: "bold", color: "white" }}
-                >
+          <Text style={{ fontSize: 30, fontWeight: "bold", color: "white" }}>
             {getTime
               ? getTime.toLocaleTimeString("ja-JP").split(":")[0] +
                 ":" +
@@ -276,37 +424,25 @@ export default function Menu(props) {
             size={30}
             style={{ margin: 5 }}
             onPress={() => {
-                    LayoutAnimation.easeInEaseOut();
               setLoadingDelayData(true);
             }}
           />
         </View>
-              <View
-                style={{
-                  padding: 10,
-                  backgroundColor: "white",
-                  borderBottomLeftRadius: 5,
-                  borderBottomRightRadius: 5,
-                }}
-              >
+        <View style={styles.box}>
           {loadingDelayData ? (
             <View style={{ alignItems: "center" }}>
               <LottieView
                 autoPlay
                 loop
-                      style={{
-                        width: 150,
-                        height: 150,
-                        backgroundColor: "#fff",
-                      }}
+                style={{ width: 150, height: 150, backgroundColor: "#fff" }}
                 source={require("./assets/51690-loading-diamonds.json")}
               />
             </View>
           ) : delayData ? (
-                  delayData.map((d) => {
+            delayData.map((d, index) => {
               let data = d.split(" ");
               return (
-                      <View style={{ flexDirection: "row" }}>
+                <View style={{ flexDirection: "row" }} key={data[1] + "key"}>
                   <Text style={{ flex: 15, fontSize: 20 }}>
                     {data[0].replace("\n", "")}
                   </Text>
@@ -320,26 +456,28 @@ export default function Menu(props) {
           )}
         </View>
       </ScrollView>
-            <View
-              style={{
-                position: "absolute",
-                top: 250,
-                alignItems: "center",
-                width: "100%",
-                height: 50,
-                backgroundColor: "#007FCC88",
-              }}
-            >
+      <View style={styles.bottom}>
         <View style={{ flex: 1 }} />
-              <Text
-                style={{ color: "white", fontWeight: "bold", fontSize: 20 }}
-              >
+        <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
           詳細を見る
         </Text>
         <View style={{ flex: 1 }} />
       </View>
-          </View>
     </TouchableOpacity>
+  );
+};
+
+const FixedContentTop = (props) => {
+  return (
+    <>
+      <TopMenuButton />
+    </>
+  );
+};
+const FixedContentBottom = (props) => {
+  return (
+    <>
+      {props.children}
 
       <View style={{ flexDirection: "row" }}>
         <TicketBox
@@ -393,9 +531,7 @@ export default function Menu(props) {
         backgroundColor="#0099CC"
         flex={1}
         onPressButton={() =>
-            Linking.openURL(
-              "https://www.jr-shikoku.co.jp/sp/index.html#menu-box"
-            )
+          Linking.openURL("https://www.jr-shikoku.co.jp/sp/index.html#menu-box")
         }
       >
         <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
@@ -522,14 +658,7 @@ export default function Menu(props) {
             borderBottomRightRadius: 10,
           }}
         >
-            {((data) =>
-              data.map((d) => (
-                <ListItem onPress={() => Linking.openURL(d.url)}>
-                  <Text>{d.name}</Text>
-                  <View style={{ flex: 1 }} />
-                  <Icon name="chevron-right" size={20} />
-                </ListItem>
-              )))([
+          {[
             {
               url: "https://twitter.com/JRshikoku_eigyo",
               name: "JR四国営業部【公式】",
@@ -578,7 +707,13 @@ export default function Menu(props) {
               url: "https://twitter.com/Yoakemonogatari",
               name: "志国土佐　時代の夜明けのものがたり【公式】",
             },
-            ])}
+          ].map((d) => (
+            <ListItem onPress={() => Linking.openURL(d.url)}>
+              <Text>{d.name}</Text>
+              <View style={{ flex: 1 }} />
+              <Icon name="chevron-right" size={20} />
+            </ListItem>
+          ))}
         </View>
       </View>
       <Text style={{ fontWeight: "bold", fontSize: 20 }}>
@@ -604,7 +739,7 @@ export default function Menu(props) {
       <TextBox
         backgroundColor="black"
         flex={1}
-          onPressButton={() => navigate("setting")}
+        onPressButton={() => props.navigate("setting")}
       >
         <Text style={{ color: "white", fontWeight: "bold", fontSize: 20 }}>
           アプリの設定
@@ -619,19 +754,6 @@ export default function Menu(props) {
     height="200"
     source={require("./assets/トレインビジョン関係/1.svg")}
   /> */}
-      </ScrollView>
-      <StationDeteilView
-        StationBoardAcSR={StationBoardAcSR}
-        currentStation={currentStation}
-        originalStationList={originalStationList}
-      />
-      <JRSTraInfo
-        JRSTraInfoEXAcSR={JRSTraInfoEXAcSR}
-        getTime={getTime}
-        loadingDelayData={loadingDelayData}
-        setLoadingDelayData={setLoadingDelayData}
-        delayData={delayData}
-      />
-    </View>
+    </>
   );
-}
+};

ndView.js

@@ -1,8 +1,7 @@
-import React, { Component } from "react";
-import { StatusBar, View, Linking, Platform, Text } from "react-native";
+import React from "react";
+import { View, Platform } from "react-native";
 import { WebView } from "react-native-webview";
 import Constants from "expo-constants";
-import { TouchableOpacity } from "react-native-gesture-handler";
 export default function tndView() {
   return (
     <View

package.json

@@ -8,42 +8,43 @@
   },
   "dependencies": {
     "@expo/vector-icons": "^13.0.0",
-    "@react-native-async-storage/async-storage": "~1.17.3",
+    "@react-native-async-storage/async-storage": "1.17.11",
     "@react-native-community/masked-view": "0.1.10",
     "@react-navigation/bottom-tabs": "^5.11.11",
     "@react-navigation/native": "^5.9.4",
     "@react-navigation/stack": "^5.14.5",
-    "expo": "^45.0.0",
-    "expo-font": "~10.1.0",
-    "expo-location": "~14.2.2",
-    "expo-updates": "~0.13.4",
-    "expo-web-browser": "~10.2.1",
+    "expo": "^48.0.0",
+    "expo-font": "~11.1.1",
+    "expo-location": "~15.1.1",
+    "expo-updates": "~0.16.3",
+    "expo-web-browser": "~12.1.1",
     "firebase": "8.2.3",
-    "lottie-react-native": "5.0.1",
+    "lottie-react-native": "5.1.4",
     "native-base": "^2.15.2",
     "npm": "^7.18.1",
     "pushy-react-native": "^1.0.18",
-    "react": "17.0.2",
-    "react-native": "0.68.2",
+    "react": "18.2.0",
+    "react-native": "0.71.3",
     "react-native-actions-sheet": "^0.4.9",
     "react-native-auto-height-image": "^3.2.4",
     "react-native-elements": "^3.4.2",
-    "react-native-gesture-handler": "~2.2.1",
-    "react-native-maps": "0.30.2",
-    "react-native-reanimated": "~2.8.0",
+    "react-native-gesture-handler": "~2.9.0",
+    "react-native-maps": "1.3.2",
+    "react-native-reanimated": "~2.14.4",
     "react-native-remote-svg": "^2.0.6",
     "react-native-responsive-screen": "^1.4.2",
     "react-native-router-flux": "^4.3.1",
-    "react-native-safe-area-context": "4.2.4",
-    "react-native-screens": "~3.11.1",
+    "react-native-safe-area-context": "4.5.0",
+    "react-native-screens": "~3.20.0",
+    "react-native-snap-carousel": "^3.9.1",
     "react-native-storage": "^1.0.1",
-    "react-native-svg": "12.3.0",
+    "react-native-svg": "13.4.0",
     "react-native-svg-uri": "^1.2.3",
     "react-native-vector-icons": "^8.1.0",
-    "react-native-webview": "11.18.1"
+    "react-native-webview": "11.26.0"
   },
   "devDependencies": {
-    "babel-preset-expo": "~9.1.0"
+    "babel-preset-expo": "^9.3.0"
   },
   "private": true
 }

storageConfig.js

@@ -0,0 +1,27 @@
+import Storage from "react-native-storage";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+
+const storage = new Storage({
+  // maximum capacity, default 1000 key-ids
+  size: 10000,
+
+  // Use AsyncStorage for RN apps, or window.localStorage for web apps.
+  // If storageBackend is not set, data will be lost after reload.
+  storageBackend: AsyncStorage, // for web: window.localStorage
+
+  // expire time, default: 1 day (1000 * 3600 * 24 milliseconds).
+  // can be null, which means never expire.
+  defaultExpires: null,
+
+  // cache data in the memory. default is true.
+  enableCache: true,
+
+  // if data was not found in storage or expired data was found,
+  // the corresponding sync method will be invoked returning
+  // the latest data.
+  sync: {
+    // we'll talk about the details later.
+  },
+});
+
+export default storage;

storageControl.js

@@ -0,0 +1,14 @@
+import storage from "./storageConfig.js";
+
+export const AS = {
+  getItem: (key) => storage.load({ key }),
+  setItem: (key, data) =>
+    storage.save({
+      key, // Note: Do not use underscore("_") in key!
+      data,
+
+      // if expires not specified, the defaultExpires will be applied instead.
+      // if set to null, then it will never expire.
+      expires: null,
+    }),
+};

trainbaseview.js

@@ -1,9 +1,17 @@
 import React, { Component, useRef } from "react";
-import { StatusBar, Platform, View } from "react-native";
+import {
+  StatusBar,
+  Platform,
+  View,
+  TouchableOpacity,
+  Text,
+} from "react-native";
 import { WebView } from "react-native-webview";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 
-export default function TrainBase({ route }) {
-  const { info } = route.params;
+export default function TrainBase({ route, navigation }) {
+  const { info, from } = route.params;
+  const { navigate } = navigation;
   const webview = useRef();
   const jss = `document.getElementById('Footer').style.display = 'none';
   ${
@@ -28,6 +36,27 @@ export default function TrainBase({ route }) {
         setSupportMultipleWindows={false}
         onMessage={(event) => {}}
       />
+      {from == "LED" && (
+        <TouchableOpacity
+          style={{
+            padding: 10,
+            flexDirection: "row",
+            borderColor: "black",
+            borderWidth: 1,
+            margin: 10,
+            borderRadius: 5,
+            alignItems: "center",
+          }}
+          onPress={() => navigate("menu")}
+        >
+          <View style={{ flex: 1 }} />
+          <MaterialCommunityIcons name="close" color="black" size={30} />
+          <Text style={{ fontSize: 25, fontWeight: "bold", color: "black" }}>
+            閉じる
+          </Text>
+          <View style={{ flex: 1 }} />
+        </TouchableOpacity>
+      )}
     </View>
   );
 }