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

originalStationListの整理

Browse Source
This commit is contained in:
harukin-expo-dev-env 2024-09-02 08:52:19 +00:00
parent f54ac90e8b
commit 4ac4c7d1c3
9 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/ActionSheetComponents/EachTrainInfoCore.js
View File

@ -234,7 +234,6 @@ export const EachTrainInfoCore = ({
}${TrainNumber}`,
},
navigate,
originalStationList,
from: from == "LED" ? "LED2" : "NearTrainDiagramView",
};
if (isLandscape) {

9
components/ActionSheetComponents/StationDeteilView.js
View File

@ -23,7 +23,6 @@ export const StationDeteilView = (props) => {
if (!props.payload) return <></>;
const {
currentStation,
originalStationList,
navigate,
onExit,
goTo,
@ -99,7 +98,6 @@ export const StationDeteilView = (props) => {
>
<Sign
currentStation={currentStation}
originalStationList={originalStationList}
oP={() => {
usePDFView == "true"
? Linking.openURL(currentStation[0].StationTimeTable)
@ -114,13 +112,6 @@ export const StationDeteilView = (props) => {
/>
</View>
)}
{/* {currentStation &&
currentStation.map((d) => (
<NexPreStationLine
currentStation={d}
originalStationList={originalStationList}
/>
))} */}
{currentStation &&
currentStation[0].JrHpUrl &&
currentStation[0].StationNumber != "M12" && (

4
components/AllTrainDiagramView.js
View File

@ -16,12 +16,11 @@ import { getStationList } from "../lib/getStationList";
import { getTrainType } from "../lib/getTrainType";
import { SheetManager } from "react-native-actions-sheet";
import { useNavigation } from "@react-navigation/native";
import { useTrainMenu } from "../stateBox/useTrainMenu";
export default function AllTrainDiagramView() {
const { navigate } = useNavigation();
const { allTrainDiagram } = useAllTrainDiagram();
const [originalStationList, setOriginalStationList] = useState(); // 第一要素
const [keyList, setKeyList] = useState(); // 第二要素
useEffect(() => getStationList().then(setOriginalStationList), []);
useEffect(
() => allTrainDiagram && setKeyList(Object.keys(allTrainDiagram)),
[]
@ -59,7 +58,6 @@ export default function AllTrainDiagramView() {
}${TrainNumber}`,
},
navigate,
originalStationList,
from: "AllTrainIDList",
};
SheetManager.show("EachTrainInfo", {

1
components/Apps.js
View File

@ -61,7 +61,6 @@ export default function Apps() {
if (returnDataBase.length) {
const payload = {
currentStation: returnDataBase,
originalStationList,
navigate,
goTo: "Apps",
useShow: () => SheetManager.show("StationDetailView", { payload }),

2
components/Apps/WebView.jsx
View File

@ -77,7 +77,6 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
if (returnDataBase.length) {
const payload = {
currentStation: returnDataBase,
originalStationList: originalStationList,
navigate: navigate,
goTo: "Apps",
useShow: () =>
@ -103,7 +102,6 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
const payload = {
data: { trainNum, limited },
navigate,
originalStationList,
openStationACFromEachTrainInfo,
};
SheetManager.show("EachTrainInfo", { payload });

8
components/発車時刻表/LED_vidion.js
View File

@ -13,7 +13,7 @@ import { SheetManager } from "react-native-actions-sheet";
import { AS } from "../../storageControl";
import { Footer } from "./LED_Vision_Component/Footer";
import { Header } from "./LED_Vision_Component/Header";
import { useTrainMenu } from "../../stateBox/useTrainMenu";
/**
*
@ -50,7 +50,6 @@ export default function LED_vision(props) {
trainDiagram,
getCurrentTrain,
navigate,
originalStationList,
openStationACFromEachTrainInfo,
} = props;
const { currentTrain } = useCurrentTrain();
@ -207,7 +206,6 @@ export default function LED_vision(props) {
trainDescriptionSwitch,
customTrainDataDetector,
navigate,
originalStationList,
openStationACFromEachTrainInfo,
}}
station={station[0]}
@ -235,8 +233,6 @@ export default function LED_vision(props) {
);
}
const EachData = (props) => {
const {
d,
@ -245,7 +241,6 @@ const EachData = (props) => {
station,
customTrainDataDetector,
navigate,
originalStationList,
openStationACFromEachTrainInfo,
} = props;
const { currentTrain } = useCurrentTrain();
@ -265,7 +260,6 @@ const EachData = (props) => {
}${TrainNumber}`,
},
navigate,
originalStationList,
openStationACFromEachTrainInfo,
from: "LED",
};

3
components/駅名表/Sign.js
View File

@ -11,17 +11,18 @@ import { StationNameArea } from "./StationNameArea";
import { StationNumberMaker } from "./StationNumberMaker";
import { NextPreStationLine } from "./NextPreStationLine";
import { LottieDelayView } from "./LottieDelayView";
import { useTrainMenu } from "../../stateBox/useTrainMenu";
export default function Sign(props) {
const {
currentStation,
originalStationList,
oP,
oLP,
isCurrentStation = false,
} = props;
const { favoriteStation, setFavoriteStation } = useFavoriteStation();
const [nexPrePosition, setNexPrePosition] = useState(0);
const { originalStationList} = useTrainMenu();
const [preStation, setPreStation] = useState();
const [nexStation, setNexStation] = useState();

8
menu.js
View File

@ -30,10 +30,12 @@ import { useFavoriteStation } from "./stateBox/useFavoriteStation";
import { SheetManager } from "react-native-actions-sheet";
import { useTrainDelayData } from "./stateBox/useTrainDelayData";
import { useNavigation } from "@react-navigation/native";
import { useTrainMenu } from "./stateBox/useTrainMenu";
export default function Menu({ getCurrentTrain }) {
const { navigate } = useNavigation();
const { favoriteStation } = useFavoriteStation();
const { originalStationList } = useTrainMenu();
//位置情報
const [locationStatus, setLocationStatus] = useState(null);
@ -90,9 +92,6 @@ export default function Menu({ getCurrentTrain }) {
const [currentStation, setCurrentStation] = useState(undefined); //第三要素
const [originalStationList, setOriginalStationList] = useState([]); // 第一要素
useEffect(() => getStationList().then(setOriginalStationList), []);
const carouselRef = useRef();
const [selectedCurrentStation, setSelectedCurrentStation] = useState(0);
@ -171,7 +170,6 @@ export default function Menu({ getCurrentTrain }) {
>
<Sign
currentStation={item}
originalStationList={originalStationList}
isCurrentStation={item == currentStation}
oP={() => {
const payload = {
@ -179,7 +177,6 @@ export default function Menu({ getCurrentTrain }) {
originalStationList &&
allStationData.length != 0 &&
allStationData[selectedCurrentStation],
originalStationList: originalStationList,
navigate: navigate,
goTo: "menu",
useShow: () =>
@ -210,7 +207,6 @@ export default function Menu({ getCurrentTrain }) {
trainDiagram={trainDiagram}
getCurrentTrain={getCurrentTrain}
navigate={navigate}
originalStationList={originalStationList}
openStationACFromEachTrainInfo={() => {}}
/>
)}

4
stateBox/useTrainMenu.js
View File

@ -27,7 +27,7 @@ const initialState = {
trainData: undefined,
},
setTrainInfo: () => {},
originalStationList: undefined,
originalStationList: [],
setOriginalStationList: () => {},
trainMenu: "true",
setTrainMenu: () => {},
@ -61,7 +61,7 @@ export const TrainMenuProvider = ({ children }) => {
});
//駅情報画面用
const [originalStationList, setOriginalStationList] = useState();
const [originalStationList, setOriginalStationList] = useState([]);
const [trainMenu, setTrainMenu] = useState("true");
useEffect(() => getStationList().then(setOriginalStationList), []);