Merge commit 'b2d85e29345653a0240bdb4062c302b3a442be00' into feature/platform-number-view

This commit is contained in:
harukin-expo-dev-env 2024-09-16 16:31:41 +00:00
commit ddd33a8b18
2 changed files with 18 additions and 10 deletions

17
Top.js
View File

@ -13,11 +13,28 @@ import { optionData } from "./lib/stackOption";
import { useNavigation } from "@react-navigation/native"; import { useNavigation } from "@react-navigation/native";
import { useCurrentTrain } from "./stateBox/useCurrentTrain"; import { useCurrentTrain } from "./stateBox/useCurrentTrain";
import { useTrainMenu } from "./stateBox/useTrainMenu"; import { useTrainMenu } from "./stateBox/useTrainMenu";
import { AS } from "./storageControl";
import { news } from "./config/newsUpdate";
const Stack = createStackNavigator(); const Stack = createStackNavigator();
export const Top = ({ navigationRef }) => { export const Top = ({ navigationRef }) => {
const { webview } = useCurrentTrain(); const { webview } = useCurrentTrain();
const { navigate, addListener } = useNavigation(); 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(); const { injectJavaScript, setInjectJavaScript, mapSwitch } = useTrainMenu();

View File

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