差分調整2
This commit is contained in:
parent
1fbbc37557
commit
c0e156ca7b
@ -73,7 +73,7 @@ export function MenuPage() {
|
|||||||
<Stack.Screen
|
<Stack.Screen
|
||||||
name="howto"
|
name="howto"
|
||||||
options={optionData}
|
options={optionData}
|
||||||
children={(props) => <HowTo {...props} />}
|
component={HowTo}
|
||||||
/>
|
/>
|
||||||
</Stack.Navigator>
|
</Stack.Navigator>
|
||||||
);
|
);
|
||||||
|
2
Top.js
2
Top.js
@ -28,6 +28,7 @@ export const Top = ({ navigationRef }) => {
|
|||||||
getStationList2().then(setMapsStationData);
|
getStationList2().then(setMapsStationData);
|
||||||
}, []);
|
}, []);
|
||||||
const [mapSwitch, setMapSwitch] = React.useState("false");
|
const [mapSwitch, setMapSwitch] = React.useState("false");
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
//地図スイッチ
|
//地図スイッチ
|
||||||
ASCore({ k: "mapSwitch", s: setMapSwitch, d: "false" });
|
ASCore({ k: "mapSwitch", s: setMapSwitch, d: "false" });
|
||||||
@ -60,7 +61,6 @@ export const Top = ({ navigationRef }) => {
|
|||||||
navigate("Apps");
|
navigate("Apps");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const unsubscribe = addListener("tabPress", goToTrainMenu);
|
const unsubscribe = addListener("tabPress", goToTrainMenu);
|
||||||
return unsubscribe;
|
return unsubscribe;
|
||||||
|
@ -100,7 +100,7 @@ export default function Apps() {
|
|||||||
if (returnDataBase.length) {
|
if (returnDataBase.length) {
|
||||||
const payload = {
|
const payload = {
|
||||||
currentStation: returnDataBase,
|
currentStation: returnDataBase,
|
||||||
navigate: navigate,
|
navigate,
|
||||||
goTo: "Apps",
|
goTo: "Apps",
|
||||||
useShow: () => SheetManager.show("StationDetailView", { payload }),
|
useShow: () => SheetManager.show("StationDetailView", { payload }),
|
||||||
onExit: () => SheetManager.hide("StationDetailView"),
|
onExit: () => SheetManager.hide("StationDetailView"),
|
||||||
@ -121,9 +121,6 @@ export default function Apps() {
|
|||||||
>
|
>
|
||||||
{!trainInfo.trainNum && isLandscape ? (
|
{!trainInfo.trainNum && isLandscape ? (
|
||||||
<TrainMenu
|
<TrainMenu
|
||||||
webview={webview}
|
|
||||||
stationData={mapsStationData}
|
|
||||||
navigation={{ navigate: null }}
|
|
||||||
style={{
|
style={{
|
||||||
width: (width / 100) * 40,
|
width: (width / 100) * 40,
|
||||||
height: "100%",
|
height: "100%",
|
||||||
@ -134,10 +131,7 @@ export default function Apps() {
|
|||||||
{/* {Status} */}
|
{/* {Status} */}
|
||||||
<AppsWebView
|
<AppsWebView
|
||||||
{...{
|
{...{
|
||||||
setLoadError,
|
|
||||||
setTrainInfo,
|
|
||||||
openStationACFromEachTrainInfo,
|
openStationACFromEachTrainInfo,
|
||||||
injectJavascript,
|
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
{isLandscape && trainInfo.trainNum && (
|
{isLandscape && trainInfo.trainNum && (
|
||||||
|
5
menu.js
5
menu.js
@ -36,6 +36,7 @@ export default function Menu({ getCurrentTrain }) {
|
|||||||
const { navigate } = useNavigation();
|
const { navigate } = useNavigation();
|
||||||
const { favoriteStation } = useFavoriteStation();
|
const { favoriteStation } = useFavoriteStation();
|
||||||
const { originalStationList } = useStationList();
|
const { originalStationList } = useStationList();
|
||||||
|
|
||||||
//位置情報
|
//位置情報
|
||||||
const [locationStatus, setLocationStatus] = useState(null);
|
const [locationStatus, setLocationStatus] = useState(null);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@ -91,7 +92,6 @@ export default function Menu({ getCurrentTrain }) {
|
|||||||
|
|
||||||
const [currentStation, setCurrentStation] = useState(undefined); //第三要素
|
const [currentStation, setCurrentStation] = useState(undefined); //第三要素
|
||||||
|
|
||||||
|
|
||||||
const carouselRef = useRef();
|
const carouselRef = useRef();
|
||||||
const [selectedCurrentStation, setSelectedCurrentStation] = useState(0);
|
const [selectedCurrentStation, setSelectedCurrentStation] = useState(0);
|
||||||
|
|
||||||
@ -177,7 +177,6 @@ export default function Menu({ getCurrentTrain }) {
|
|||||||
originalStationList &&
|
originalStationList &&
|
||||||
allStationData.length != 0 &&
|
allStationData.length != 0 &&
|
||||||
allStationData[selectedCurrentStation],
|
allStationData[selectedCurrentStation],
|
||||||
originalStationList: originalStationList,
|
|
||||||
navigate: navigate,
|
navigate: navigate,
|
||||||
goTo: "menu",
|
goTo: "menu",
|
||||||
useShow: () =>
|
useShow: () =>
|
||||||
@ -263,9 +262,7 @@ const TopMenuButton = () => {
|
|||||||
const JRSTraInfoBox = () => {
|
const JRSTraInfoBox = () => {
|
||||||
const {
|
const {
|
||||||
getTime,
|
getTime,
|
||||||
setGetTime,
|
|
||||||
delayData,
|
delayData,
|
||||||
setDelayData,
|
|
||||||
loadingDelayData,
|
loadingDelayData,
|
||||||
setLoadingDelayData,
|
setLoadingDelayData,
|
||||||
} = useTrainDelayData();
|
} = useTrainDelayData();
|
||||||
|
Loading…
Reference in New Issue
Block a user