一部動作がおかしくなるバグの修正

This commit is contained in:
harukin-OneMix4 2022-11-20 22:52:55 +09:00
parent cbce84a9ab
commit cf57f29e62
5 changed files with 41 additions and 56 deletions

2
App.js
View File

@ -6,7 +6,7 @@ import {
} from "@react-navigation/stack"; } from "@react-navigation/stack";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
import { AntDesign, Ionicons } from "@expo/vector-icons"; import { AntDesign, Ionicons } from "@expo/vector-icons";
import { ToastAndroid, Platform, UIManager } from "react-native"; import { Platform, UIManager } from "react-native";
import { UpdateAsync } from "./UpdateAsync.js"; import { UpdateAsync } from "./UpdateAsync.js";
import Apps from "./Apps"; import Apps from "./Apps";
import tndView from "./ndView"; import tndView from "./ndView";

View File

@ -152,13 +152,16 @@ export default function Apps(props) {
} }
}} }}
onMessage={(event) => { onMessage={(event) => {
if (!originalStationList) {
alert("駅名標データを取得中...");
return;
}
if (event.nativeEvent.data.includes("PopUpMenu")) { if (event.nativeEvent.data.includes("PopUpMenu")) {
const selectedStationPDFAddress = event.nativeEvent.data const selectedStationPDFAddress = event.nativeEvent.data
.split(",")[3] .split(",")[3]
.replace("'", "") .replace("'", "")
.replace("'", ""); .replace("'", "");
if (!originalStationList) alert("originalStationListがありません");
const findStationEachLine = (selectLine) => { const findStationEachLine = (selectLine) => {
let NearStation = selectLine.filter( let NearStation = selectLine.filter(
(d) => d.StationTimeTable == selectedStationPDFAddress (d) => d.StationTimeTable == selectedStationPDFAddress
@ -199,6 +202,7 @@ export default function Apps(props) {
navigate("trainbase", { info: event.nativeEvent.data }); navigate("trainbase", { info: event.nativeEvent.data });
}} }}
injectedJavaScript={injectJavascript} injectedJavaScript={injectJavascript}
onTouchMove={() => StationBoardAcSR.current?.hide()}
/> />
<TouchableOpacity <TouchableOpacity
onPress={() => onPress={() =>

View File

@ -5,21 +5,32 @@ export const UpdateAsync = () =>
Updates.checkForUpdateAsync() Updates.checkForUpdateAsync()
.then((update) => { .then((update) => {
if (!update.isAvailable) return; if (!update.isAvailable) return;
ToastAndroid.showWithGravityAndOffset( if (Platform.OS == "ios") {
"アプリのデータを更新しています。", alert("アプリのデータを更新しています。");
ToastAndroid.LONG, } else {
ToastAndroid.BOTTOM, ToastAndroid.showWithGravityAndOffset(
25, "アプリのデータを更新しています。",
50 ToastAndroid.LONG,
); ToastAndroid.BOTTOM,
Updates.fetchUpdateAsync().then(() => Updates.reloadAsync()); 25,
50
);
}
Updates.fetchUpdateAsync().then(Updates.reloadAsync);
return;
}) })
.catch((e) => .catch((e) => {
ToastAndroid.showWithGravityAndOffset( Platform.OS == "ios"
e.toString(), ? alert(e.toString())
ToastAndroid.LONG, : ToastAndroid.showWithGravityAndOffset(
ToastAndroid.BOTTOM, e.toString(),
25, ToastAndroid.LONG,
50 ToastAndroid.BOTTOM,
) 25,
); 50
);
return;
})
.finally(() => {
return;
});

View File

@ -1,43 +1,12 @@
import React, { Component, useRef, useState, useEffect } from "react"; import React from "react";
import { import { View, ScrollView, Linking } from "react-native";
StatusBar,
Platform,
View,
LayoutAnimation,
ScrollView,
Linking,
Text,
TouchableOpacity,
} from "react-native";
import Image from "react-native-remote-svg";
import Constants from "expo-constants";
import { List, ListItem } from "native-base";
import Icon from "react-native-vector-icons/Entypo";
import * as Location from "expo-location";
import StatusbarDetect from "../../StatusbarDetect"; import StatusbarDetect from "../../StatusbarDetect";
var Status = StatusbarDetect(); var Status = StatusbarDetect();
import { useNavigation } from "@react-navigation/native"; import { FontAwesome, Foundation, Ionicons } from "@expo/vector-icons";
import AutoHeightImage from "react-native-auto-height-image";
import {
widthPercentageToDP as wp,
heightPercentageToDP as hp,
} from "react-native-responsive-screen";
import {
FontAwesome,
Fontisto,
Foundation,
Ionicons,
MaterialCommunityIcons,
} from "@expo/vector-icons";
import * as WebBrowser from "expo-web-browser";
import ActionSheet from "react-native-actions-sheet"; import ActionSheet from "react-native-actions-sheet";
import LottieView from "lottie-react-native";
import SvgUri from "react-native-svg-uri";
import Sign from "../../components/駅名表/Sign"; import Sign from "../../components/駅名表/Sign";
import { UsefulBox } from "../atom/UsefulBox";
import { TicketBox } from "../atom/TicketBox"; import { TicketBox } from "../atom/TicketBox";
import { TextBox } from "../atom/TextBox";
export const StationDeteilView = (props) => { export const StationDeteilView = (props) => {
const { StationBoardAcSR, currentStation, originalStationList } = props; const { StationBoardAcSR, currentStation, originalStationList } = props;
@ -49,6 +18,7 @@ export const StationDeteilView = (props) => {
CustomHeaderComponent={() => {}} CustomHeaderComponent={() => {}}
> >
<View <View
key={currentStation}
style={{ style={{
backgroundColor: "white", backgroundColor: "white",
borderRadius: 5, borderRadius: 5,
@ -68,7 +38,7 @@ export const StationDeteilView = (props) => {
}} }}
/> />
</View> </View>
<ScrollView> <View>
{currentStation && ( {currentStation && (
<Sign <Sign
currentStation={currentStation} currentStation={currentStation}
@ -116,7 +86,7 @@ export const StationDeteilView = (props) => {
)} )}
</View> </View>
)} )}
</ScrollView> </View>
</View> </View>
</ActionSheet> </ActionSheet>
); );

View File

@ -102,7 +102,7 @@ export default function Setting(props) {
textAlignVertical: "center", textAlignVertical: "center",
}} }}
> >
内部バージョン: 4.4.2 内部バージョン: 4.4.2.1
</Text> </Text>
<View style={{ flex: 1 }} /> <View style={{ flex: 1 }} />
</View> </View>