Merge commit '2776f17681ac2bf76a70c268c4db8921c5888a4f'
This commit is contained in:
commit
e6b89842a3
@ -14,7 +14,7 @@ import { ListItem } from "native-base";
|
|||||||
import { SwitchArea } from "../atom/SwitchArea";
|
import { SwitchArea } from "../atom/SwitchArea";
|
||||||
import { useNotification } from "../../stateBox/useNotifications";
|
import { useNotification } from "../../stateBox/useNotifications";
|
||||||
|
|
||||||
const versionCode = "5.6";
|
const versionCode = "5.6.0.1";
|
||||||
|
|
||||||
export const SettingTopPage = ({
|
export const SettingTopPage = ({
|
||||||
navigate,
|
navigate,
|
||||||
|
@ -761,6 +761,7 @@ export const injectJavascriptData: InjectJavascriptData = (
|
|||||||
case "104M":
|
case "104M":
|
||||||
case "5210M":
|
case "5210M":
|
||||||
case "5108M":
|
case "5108M":
|
||||||
|
case "4108M":
|
||||||
case "110M":
|
case "110M":
|
||||||
case "112M":
|
case "112M":
|
||||||
case "118M":
|
case "118M":
|
||||||
|
@ -279,14 +279,14 @@ export const BusAndTrainDataProvider = ({ children }) => {
|
|||||||
case "5479D":
|
case "5479D":
|
||||||
returnArray.push("570D");
|
returnArray.push("570D");
|
||||||
break;
|
break;
|
||||||
case new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum):
|
}
|
||||||
|
if(new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum)){
|
||||||
if (trainList["5" + trainNum.substring(1)])
|
if (trainList["5" + trainNum.substring(1)])
|
||||||
returnArray.push("5" + trainNum.substring(1));
|
returnArray.push("5" + trainNum.substring(1));
|
||||||
break;
|
}
|
||||||
case new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum):
|
if(new RegExp(/^5[1-7]\d\d[DM]$/).test(trainNum)){
|
||||||
if (trainList["4" + trainNum.substring(1)])
|
if (trainList["4" + trainNum.substring(1)])
|
||||||
returnArray.push("4" + trainNum.substring(1));
|
returnArray.push("4" + trainNum.substring(1));
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
// 列番が4xxDまたは5xxDの場合はxxDの列番を検索
|
// 列番が4xxDまたは5xxDの場合はxxDの列番を検索
|
||||||
|
@ -36,25 +36,25 @@ async function registerForPushNotificationsAsync() {
|
|||||||
if (Platform.OS === "android") {
|
if (Platform.OS === "android") {
|
||||||
Notifications.setNotificationChannelAsync("default", {
|
Notifications.setNotificationChannelAsync("default", {
|
||||||
name: "default",
|
name: "default",
|
||||||
importance: Notifications.AndroidImportance.MAX,
|
importance: Notifications.AndroidImportance.DEFAULT,
|
||||||
vibrationPattern: [0, 250, 250, 250],
|
vibrationPattern: [0, 250, 250, 250],
|
||||||
lightColor: "#FF231F7C",
|
lightColor: "#FF231F7C",
|
||||||
});
|
});
|
||||||
Notifications.setNotificationChannelAsync("運行情報", {
|
Notifications.setNotificationChannelAsync("運行情報", {
|
||||||
name: "運行情報",
|
name: "運行情報",
|
||||||
importance: Notifications.AndroidImportance.MAX,
|
importance: Notifications.AndroidImportance.DEFAULT,
|
||||||
vibrationPattern: [0, 250, 250, 250],
|
vibrationPattern: [0, 250, 250, 250],
|
||||||
lightColor: "#FF231F7C",
|
lightColor: "#FF231F7C",
|
||||||
});
|
});
|
||||||
Notifications.setNotificationChannelAsync("遅延速報EX", {
|
Notifications.setNotificationChannelAsync("遅延速報EX", {
|
||||||
name: "遅延速報EX",
|
name: "遅延速報EX",
|
||||||
importance: Notifications.AndroidImportance.MAX,
|
importance: Notifications.AndroidImportance.LOW,
|
||||||
vibrationPattern: [0, 250, 250, 250],
|
vibrationPattern: [0, 250, 250, 250],
|
||||||
lightColor: "#FF231F7C",
|
lightColor: "#FF231F7C",
|
||||||
});
|
});
|
||||||
Notifications.setNotificationChannelAsync("怪レい列車BOT", {
|
Notifications.setNotificationChannelAsync("怪レい列車BOT", {
|
||||||
name: "怪レい列車BOT",
|
name: "怪レい列車BOT",
|
||||||
importance: Notifications.AndroidImportance.MAX,
|
importance: Notifications.AndroidImportance.LOW,
|
||||||
vibrationPattern: [0, 250, 250, 250],
|
vibrationPattern: [0, 250, 250, 250],
|
||||||
lightColor: "#FF231F7C",
|
lightColor: "#FF231F7C",
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user