From dc089cf8f0c3d4b6485f250459d6b837619271d6 Mon Sep 17 00:00:00 2001 From: harukin-DeskMini Date: Wed, 28 Sep 2022 19:13:10 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?= =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps.js | 2 -- UpdateAsync.js | 22 ++++++++++------------ components/trainMenu.js | 8 +------- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/Apps.js b/Apps.js index 5fd182a..23f9349 100644 --- a/Apps.js +++ b/Apps.js @@ -13,8 +13,6 @@ import AsyncStorage from "@react-native-async-storage/async-storage"; import StatusbarDetect from './StatusbarDetect'; var Status = StatusbarDetect(); */ -export var webview = null; - export default function Apps(props) { const { navigation: { navigate }, diff --git a/UpdateAsync.js b/UpdateAsync.js index a8cf7f9..3c26521 100644 --- a/UpdateAsync.js +++ b/UpdateAsync.js @@ -1,19 +1,18 @@ import { ToastAndroid } from "react-native"; import * as Updates from "expo-updates"; -export function UpdateAsync() { +export const UpdateAsync = () => Updates.checkForUpdateAsync() .then((update) => { - if (update.isAvailable) { - ToastAndroid.showWithGravityAndOffset( - "アプリのデータを更新しています。", - ToastAndroid.LONG, - ToastAndroid.BOTTOM, - 25, - 50 - ); - Updates.fetchUpdateAsync().then(() => Updates.reloadAsync()); - } + if (!update.isAvailable) return; + ToastAndroid.showWithGravityAndOffset( + "アプリのデータを更新しています。", + ToastAndroid.LONG, + ToastAndroid.BOTTOM, + 25, + 50 + ); + Updates.fetchUpdateAsync().then(() => Updates.reloadAsync()); }) .catch((e) => ToastAndroid.showWithGravityAndOffset( @@ -24,4 +23,3 @@ export function UpdateAsync() { 50 ) ); -} diff --git a/components/trainMenu.js b/components/trainMenu.js index b292cea..66dc8f7 100644 --- a/components/trainMenu.js +++ b/components/trainMenu.js @@ -55,13 +55,7 @@ export default function trainMenu({ }} onPress={() => { webview.current?.injectJavaScript( - "MoveDisplayStation('" + - d + - "_" + - D.MyStation + - "_" + - D.Station_JP + - "')" + `MoveDisplayStation('${d}_${D.MyStation}_${D.Station_JP}')` ); navigate("Apps"); }}