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