diff --git a/Top.js b/Top.js index 5449cbb..ba8333c 100644 --- a/Top.js +++ b/Top.js @@ -13,11 +13,28 @@ 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(() => { + //ニュース表示 + alert("news"); + AS.getItem("status") + .then((d) => { + alert(d); + if (d != news) navigate("news"); + }) + .catch(() => navigate("news")); + alert("newsENd"); + }, []); + + + //地図用 const { injectJavaScript, setInjectJavaScript, mapSwitch } = useTrainMenu(); diff --git a/stateBox/useTrainMenu.js b/stateBox/useTrainMenu.js index fe66c3b..eabd0ec 100644 --- a/stateBox/useTrainMenu.js +++ b/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 });