Merge commit '63209ac88878f70d0896dca429277d09ef1bf492'

Top.js

@@ -13,11 +13,25 @@ import { optionData } from "./lib/stackOption";
 import { useNavigation } from "@react-navigation/native";
 import { useCurrentTrain } from "./stateBox/useCurrentTrain";
 import { useTrainMenu } from "./stateBox/useTrainMenu";
+import { AS } from "./storageControl";
+import { news } from "./config/newsUpdate";
 const Stack = createStackNavigator();
 export const Top = ({ navigationRef }) => {
   const { webview } = useCurrentTrain();
   const { navigate, addListener } = useNavigation();
 
+
+  useEffect(() => {
+    //ニュース表示
+    AS.getItem("status")
+      .then((d) => {
+        if (d != news) navigate("news");
+      })
+      .catch(() => navigate("news"));
+  }, []);
+
+
+
   //地図用
   const { injectJavaScript, setInjectJavaScript, mapSwitch } = useTrainMenu();
 

stateBox/useTrainMenu.js

@@ -1,6 +1,6 @@
 import React, { createContext, useContext, useState, useEffect } from "react";
 
-import { AS, ASCore } from "../storageControl";
+import { ASCore } from "../storageControl";
 
 import { getStationList2 } from "../lib/getStationList2";
 import { injectJavascriptData } from "../lib/webViewInjectjavascript";
@@ -68,15 +68,6 @@ export const TrainMenuProvider = ({ children }) => {
     trainMenu
   );
 
-  useEffect(() => {
-    //ニュース表示
-    AS.getItem("status")
-      .then((d) => {
-        if (d != news) navigate("news");
-      })
-      .catch(() => navigate("news"));
-  }, []);
-
   useEffect(() => {
     //列車アイコンスイッチ
     ASCore({ k: "iconSwitch", s: setIconSetting, d: "true", u: true });