harukin/jrshikoku
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '28a3df44ccdd5a460c7f933c5c21ffb3fd23dd80' into patch/6.x

Browse Source
This commit is contained in:
harukin-expo-dev-env 2025-07-27 03:54:17 +00:00
commit 9b266c15f8
6 changed files with 135 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.json
View File

@ -7,7 +7,7 @@
"android",
"web"
],
"version": "6.0.2",
"version": "6.0.3",
"orientation": "default",
"icon": "./assets/icons/s8600.png",
"splash": {
@ -22,7 +22,7 @@
"**/*"
],
"ios": {
"buildNumber": "48",
"buildNumber": "49",
"supportsTablet": false,
"bundleIdentifier": "jrshikokuinfo.xprocess.hrkn",
"config": {

26
components/ActionSheetComponents/EachTrainInfoCore/HeaderText.tsx
View File

@ -56,28 +56,32 @@ export const HeaderText: FC<Props> = ({
);
const [type, fontAvailable, isOneMan] = (() => {
switch (customTrainData.type) {
case "LTDEXP":
return ["特急", true, false];
case "Rapid":
return ["快速", true, false];
case "Normal":
return ["普通", true, false];
case "OneManRapid":
return ["快速", true, true];
case "OneMan":
return ["普通", true, true];
case "Rapid":
return ["快速", true, false];
case "OneManRapid":
return ["快速", true, true];
case "LTDEXP":
return ["特急", true, false];
case "NightLTDEXP":
return ["特急", true, false];
case "SPCL":
return ["臨時", false, false];
case "SPCL_EXP":
return ["臨時特急", false, false];
case "SPCL_Rapid":
return ["臨時快速", true, false];
return ["臨時", true, false];
case "SPCL_Normal":
return ["臨時", true, false];
case "SPCL_Rapid":
return ["臨時快速", true, false];
case "SPCL_EXP":
return ["臨時特急", true, false];
case "Freight":
return ["貨物", false, false];
case "Forwarding":
return ["回送", false, false];
case "FreightForwarding":
return ["単機回送", false, false];
case "Other":
switch (true) {
case !!trainNum.includes("T"):

2
components/Settings/SettingTopPage.js
View File

@ -17,7 +17,7 @@ import { SwitchArea } from "../atom/SwitchArea";
import { useNotification } from "../../stateBox/useNotifications";
import { SheetHeaderItem } from "@/components/atom/SheetHeaderItem";
const versionCode = "6.1.1"; // Update this version code as needed
const versionCode = "6.1.2"; // Update this version code as needed
export const SettingTopPage = ({
testNFC,

16
lib/getTrainType.ts
View File

@ -13,6 +13,8 @@ type trainTypeString =
| "臨時"
| "普通列車"
| "普通列車(ワンマン)"
| "臨時快速"
| "臨時特急"
| "その他";
type trainTypeDataString = "rapid" | "express" | "normal";
type getTrainType = (d: nameString) => {
@ -22,6 +24,10 @@ type getTrainType = (d: nameString) => {
};
export const getTrainType: getTrainType = (nameString) => {
switch (nameString) {
case "Normal":
return { color: "white", name: "普通列車", data: "normal" };
case "OneMan":
return { color: "white", name: "普通列車(ワンマン)", data: "normal" };
case "Rapid":
case "OneManRapid":
return { color: "aqua", name: "快速", data: "rapid" };
@ -30,14 +36,12 @@ export const getTrainType: getTrainType = (nameString) => {
case "NightLTDEXP":
return { color: "pink", name: "寝台特急", data: "express" };
case "SPCL":
case "SPCL_Rapid":
case "SPCL_EXP":
case "SPCL_Normal":
return { color: "#297bff", name: "臨時", data: "normal" };
case "OneMan":
return { color: "white", name: "普通列車(ワンマン)", data: "normal" };
case "Normal":
return { color: "white", name: "普通列車", data: "normal" };
case "SPCL_Rapid":
return { color: "#297bff", name: "臨時快速", data: "normal" };
case "SPCL_EXP":
return { color: "#297bff", name: "臨時特急", data: "normal" };
default:
return { color: "white", name: "その他", data: "normal" };
}

133
lib/webViewInjectjavascript.ts
View File

@ -1274,30 +1274,37 @@ export const injectJavascriptData: InjectJavascriptData = (
case "OneMan":
trainTypeColor = "black";
return "普通";
case "Freight":
trainTypeColor = "black";
return "貨物";
case "SPCL_Normal":
trainTypeColor = "#297bff";
return "臨時";
case "SPCL_Rapid":
trainTypeColor = "#297bff";
return "臨時快速";
case "SPCL_LTDEXP":
trainTypeColor = "#297bff";
return "臨時特急";
case "Rapid":
trainTypeColor = "rgba(0, 140, 255, 1)";
return "快速";
case "OneManRapid":
trainTypeColor = "rgba(0, 140, 255, 1)";
return "快速";
case "LTDEXP":
trainTypeColor = "red";
return "特急";
case "NightLTDEXP":
trainTypeColor = "rgb(211, 0, 176)";
trainTypeColor = "#d300b0ff";
return "寝台特急";
case "OneManRapid":
trainTypeColor = "rgba(0, 140, 255, 1)";
return "快速";
case "Rapid":
trainTypeColor = "rgba(0, 140, 255, 1)";
return "快速";
case "SPCL":
case "SPCL_Normal":
trainTypeColor = "#000000ff";
return "臨時";
case "SPCL_Rapid":
trainTypeColor = "rgba(0, 81, 255, 1)";
return "臨時快速";
case "SPCL_EXP":
trainTypeColor = "#a52e2eff";
return "臨時特急";
case "Freight":
trainTypeColor = "#00869ecc";
return "貨物";
case "Forwarding":
trainTypeColor = "black";
return "回送";
case "FreightForwarding":
trainTypeColor = "black";
return "単機回送";
default:
return "";
}
@ -1337,11 +1344,27 @@ export const injectJavascriptData: InjectJavascriptData = (
getColors = stationLines.map(e => GetLineBarColor(e));
}
let yosan2Color = undefined;
if(viaData == "(内子経由)"){
yosan2Color ="#F5AC13";
}
else if(viaData == "(海経由)"){
yosan2Color = "#9AA7D7";
switch(viaData){
case "(内子経由)":
yosan2Color = "#F5AC13";
break;
case "(海経由)":
yosan2Color = "#9AA7D7";
break;
case "牟岐線直通":
yosan2Color = "#00b8bb";
break;
case "徳島線直通":
yosan2Color = "#2d506e";
break;
case "高徳線直通":
yosan2Color = "#87CA3B";
break;
case "鳴門線直通":
yosan2Color = "#881F61";
break;
default:
break;
}
const gradient = getColors.length > 1 ? "linear-gradient(130deg, " + getColors[0] + " 0%, "+ getColors[0]+"50%, "+ getColors[1]+"50%, " + getColors[1] + " 100%)" : getColors[0];
@ -1359,17 +1382,63 @@ export const injectJavascriptData: InjectJavascriptData = (
`
const setNewTrainItem = (element,hasProblem)=>{
const setNewTrainItem = (element,hasProblem,type)=>{
var 列番データ = element.getAttribute('offclick').split('"')[1];
const JRFTemp = getJRF(列番データ);
if(element.getAttribute('offclick').includes("express")){
element.style.borderColor = 'rgba(255, 0, 0, 1)';
}else if(element.getAttribute('offclick').includes("rapid")){
element.style.borderColor = 'rgba(0, 140, 255, 1)';
}else if(JRFTemp){
element.style.borderColor = 'rgba(0, 134, 158, 0.8)';
if(trainDataList.find(e => e.id === 列番データ) !== undefined){
const data = trainDataList.find(e => e.id === 列番データ);
switch (data.type) {
case "Normal":
element.style.borderColor = "black";
break;
case "OneMan":
element.style.borderColor = "black";
break;
case "Rapid":
element.style.borderColor = "rgba(0, 140, 255, 1)";
break;
case "OneManRapid":
element.style.borderColor = "rgba(0, 140, 255, 1)";
break;
case "LTDEXP":
element.style.borderColor = "red";
break;
case "NightLTDEXP":
element.style.borderColor = "#d300b0ff";
break;
case "SPCL":
case "SPCL_Normal":
element.style.borderColor = "#000000ff";
break;
case "SPCL_Rapid":
element.style.borderColor = "rgba(0, 81, 255, 1)";
break;
case "SPCL_EXP":
element.style.borderColor = "#a52e2eff";
break;
case "Freight":
element.style.borderColor = "#00869ecc";
break;
case "Forwarding":
element.style.borderColor = "black";
break;
case "FreightForwarding":
element.style.borderColor = "black";
break;
default:
element.style.borderColor = 'black';
break;
}
}else{
element.style.borderColor = 'black';
if(element.getAttribute('offclick').includes("express")){
element.style.borderColor = '#ff0000ff';
}else if(element.getAttribute('offclick').includes("rapid")){
element.style.borderColor = '#008cffff';
}else if(JRFTemp){
element.style.borderColor = '#00869ecc';
}else{
element.style.borderColor = 'black';
}
}
element.style.borderWidth = '2px';
element.style.borderStyle = 'solid';

12
stateBox/useBusAndTrainData.js
View File

@ -101,9 +101,6 @@ export const BusAndTrainDataProvider = ({ children }) => {
case "4452D":
returnArray.push("4545D");
break;
case "4456D":
returnArray.push("4549D");
break;
case "4466D":
returnArray.push("561D");
break;
@ -144,9 +141,6 @@ export const BusAndTrainDataProvider = ({ children }) => {
case "4545D":
returnArray.push("4452D");
break;
case "4549D":
returnArray.push("4456D");
break;
case "561D":
returnArray.push("4466D");
break;
@ -278,6 +272,12 @@ export const BusAndTrainDataProvider = ({ children }) => {
case "4368D":
returnArray.push("576D");
break;
case "3710D":
returnArray.push("710D");
break;
case "710D":
returnArray.push("3710D");
break;
}
if (new RegExp(/^4[1-9]\d\d[DM]$/).test(trainNum)) {
if (allTrainDiagram["5" + trainNum.substring(1)])