From c9a90809c6b178d5b85d51d47521d2541bbed7f6 Mon Sep 17 00:00:00 2001 From: harukin-expo-dev-env Date: Mon, 16 Sep 2024 16:31:14 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=B9=E3=81=8C?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=83=90?= =?UTF-8?q?=E3=82=B0=E3=81=8C=E7=99=BA=E7=94=9F/=E6=9A=AB=E5=AE=9A?= =?UTF-8?q?=E7=9A=84=E6=8E=AA=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Top.js | 17 +++++++++++++++++ stateBox/useTrainMenu.js | 11 +---------- 2 files changed, 18 insertions(+), 10 deletions(-) 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 });