Merge commit '087f6c882968bdef782bfe2aa0005a67fe436c7c'
This commit is contained in:
@@ -100,6 +100,7 @@ export const EachTrainInfoCore = ({
|
||||
useEffect(() => {
|
||||
const stopStationList = trainData.map((i) => {
|
||||
const [station, se, time] = i.split(",");
|
||||
if(se == "通編") setHaveThrough(true);
|
||||
return stationList.map((a) => a.filter((d) => d.StationName == station));
|
||||
});
|
||||
const allThroughStationList = stopStationList.map((i, index, array) => {
|
||||
|
@@ -17,7 +17,7 @@ import { SwitchArea } from "../atom/SwitchArea";
|
||||
import { useNotification } from "../../stateBox/useNotifications";
|
||||
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 = ({
|
||||
testNFC,
|
||||
|
@@ -209,6 +209,7 @@ export const EachData: FC<Props> = (props) => {
|
||||
trainIDSwitch={trainIDSwitch}
|
||||
trainID={d.train}
|
||||
type={train.type}
|
||||
isThrew={d.isThrough}
|
||||
/>
|
||||
<LastStation lastStation={d.lastStation} ToData={train.ToData} />
|
||||
<DependTime time={d.time} />
|
||||
|
@@ -7,9 +7,10 @@ type Props = {
|
||||
trainIDSwitch: boolean;
|
||||
trainID: string;
|
||||
type: string;
|
||||
isThrew: boolean;
|
||||
};
|
||||
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 TrainNumber =
|
||||
trainNumDistance != undefined
|
||||
@@ -26,7 +27,7 @@ export const TrainName: FC<Props> = (props) => {
|
||||
fontWeight: "bold",
|
||||
}}
|
||||
>
|
||||
{trainIDSwitch ? trainID : `${name} ${trainName}${TrainNumber}`}
|
||||
{trainIDSwitch ? trainID : `${isThrew ? `★通過列車★` : `${name} ${trainName}${TrainNumber}`} `}
|
||||
</Text>
|
||||
</View>
|
||||
);
|
||||
|
Reference in New Issue
Block a user