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

Merge commit '087f6c882968bdef782bfe2aa0005a67fe436c7c'

Browse Source
This commit is contained in:
harukin-expo-dev-env
2025-08-24 11:30:06 +00:00
parent deb9b40949 087f6c8829
commit 4480c161d1
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/ActionSheetComponents/EachTrainInfoCore.js
View File

@@ -100,6 +100,7 @@ export const EachTrainInfoCore = ({
useEffect(() => { useEffect(() => {
const stopStationList = trainData.map((i) => { const stopStationList = trainData.map((i) => {
const [station, se, time] = i.split(","); const [station, se, time] = i.split(",");
if(se == "通編") setHaveThrough(true);
return stationList.map((a) => a.filter((d) => d.StationName == station)); return stationList.map((a) => a.filter((d) => d.StationName == station));
}); });
const allThroughStationList = stopStationList.map((i, index, array) => { const allThroughStationList = stopStationList.map((i, index, array) => {

2
components/Settings/SettingTopPage.js
View File

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

1
components/発車時刻表/EachData.tsx
View File

@@ -209,6 +209,7 @@ export const EachData: FC<Props> = (props) => {
trainIDSwitch={trainIDSwitch} trainIDSwitch={trainIDSwitch}
trainID={d.train} trainID={d.train}
type={train.type} type={train.type}
isThrew={d.isThrough}
/> />
<LastStation lastStation={d.lastStation} ToData={train.ToData} /> <LastStation lastStation={d.lastStation} ToData={train.ToData} />
<DependTime time={d.time} /> <DependTime time={d.time} />

5
components/発車時刻表/LED_inside_Component/TrainName.tsx
View File

@@ -7,9 +7,10 @@ type Props = {
trainIDSwitch: boolean; trainIDSwitch: boolean;
trainID: string; trainID: string;
type: string; type: string;
isThrew: boolean;
}; };
export const TrainName: FC<Props> = (props) => { export const TrainName: FC<Props> = (props) => {
const { trainName, trainNumDistance, trainIDSwitch, trainID, type } = props; const { trainName, trainNumDistance, trainIDSwitch, trainID, type, isThrew } = props;
const { name, color } = getTrainType(type); const { name, color } = getTrainType(type);
const TrainNumber = const TrainNumber =
trainNumDistance != undefined trainNumDistance != undefined
@@ -26,7 +27,7 @@ export const TrainName: FC<Props> = (props) => {
fontWeight: "bold", fontWeight: "bold",
}} }}
> >
{trainIDSwitch ? trainID : `${name} ${trainName}${TrainNumber}`} {trainIDSwitch ? trainID : `${isThrew ? `★通過列車★` : `${name} ${trainName}${TrainNumber}`} `}
</Text> </Text>
</View> </View>
); );