diff --git a/components/Settings/SettingTopPage.js b/components/Settings/SettingTopPage.js index 783b275..07b943e 100644 --- a/components/Settings/SettingTopPage.js +++ b/components/Settings/SettingTopPage.js @@ -14,7 +14,7 @@ import { ListItem } from "native-base"; import { SwitchArea } from "../atom/SwitchArea"; import { useNotification } from "../../stateBox/useNotifications"; -const versionCode = "5.6"; +const versionCode = "5.6.0.1"; export const SettingTopPage = ({ navigate, diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts index f8149fe..ffdeebd 100644 --- a/lib/webViewInjectjavascript.ts +++ b/lib/webViewInjectjavascript.ts @@ -761,6 +761,7 @@ export const injectJavascriptData: InjectJavascriptData = ( case "104M": case "5210M": case "5108M": + case "4108M": case "110M": case "112M": case "118M": diff --git a/stateBox/useBusAndTrainData.js b/stateBox/useBusAndTrainData.js index f7d4562..f7f0aa4 100644 --- a/stateBox/useBusAndTrainData.js +++ b/stateBox/useBusAndTrainData.js @@ -279,14 +279,14 @@ export const BusAndTrainDataProvider = ({ children }) => { case "5479D": returnArray.push("570D"); break; - case new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum): - if (trainList["5" + trainNum.substring(1)]) - returnArray.push("5" + trainNum.substring(1)); - break; - case new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum): - if (trainList["4" + trainNum.substring(1)]) - returnArray.push("4" + trainNum.substring(1)); - break; + } + if(new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum)){ + if (trainList["5" + trainNum.substring(1)]) + returnArray.push("5" + trainNum.substring(1)); + } + if(new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum)){ + if (trainList["4" + trainNum.substring(1)]) + returnArray.push("4" + trainNum.substring(1)); } if ( // 列番が4xxDまたは5xxDの場合はxxDの列番を検索 diff --git a/stateBox/useNotifications.tsx b/stateBox/useNotifications.tsx index bb3ec4c..294ea60 100644 --- a/stateBox/useNotifications.tsx +++ b/stateBox/useNotifications.tsx @@ -36,25 +36,25 @@ async function registerForPushNotificationsAsync() { if (Platform.OS === "android") { Notifications.setNotificationChannelAsync("default", { name: "default", - importance: Notifications.AndroidImportance.MAX, + importance: Notifications.AndroidImportance.DEFAULT, vibrationPattern: [0, 250, 250, 250], lightColor: "#FF231F7C", }); Notifications.setNotificationChannelAsync("運行情報", { name: "運行情報", - importance: Notifications.AndroidImportance.MAX, + importance: Notifications.AndroidImportance.DEFAULT, vibrationPattern: [0, 250, 250, 250], lightColor: "#FF231F7C", }); Notifications.setNotificationChannelAsync("遅延速報EX", { name: "遅延速報EX", - importance: Notifications.AndroidImportance.MAX, + importance: Notifications.AndroidImportance.LOW, vibrationPattern: [0, 250, 250, 250], lightColor: "#FF231F7C", }); Notifications.setNotificationChannelAsync("怪レい列車BOT", { name: "怪レい列車BOT", - importance: Notifications.AndroidImportance.MAX, + importance: Notifications.AndroidImportance.LOW, vibrationPattern: [0, 250, 250, 250], lightColor: "#FF231F7C", });