Compare commits
71 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 907ddf9dae | |||
| 929c444474 | |||
| b6800d6566 | |||
| b0a0d62344 | |||
| bfd90b50e4 | |||
| 553735ac1d | |||
| 5f1641ff90 | |||
| 351854f128 | |||
| e6f0391484 | |||
| b1cfad4528 | |||
| 76b13a70a9 | |||
| eec2fd2bb7 | |||
| 8c2930c814 | |||
| c7fdf6f0b1 | |||
| 9746a4d041 | |||
| 740c825122 | |||
| f6b25ce5d3 | |||
| 390ab3ac69 | |||
| 2eb926890c | |||
| bf2e68a3a5 | |||
| dd4892f6b7 | |||
| 61548ea3f9 | |||
| bf0c4d90d9 | |||
| 47d6f043b4 | |||
| aacae06743 | |||
| dab60c47fa | |||
| 39fe154b33 | |||
| a8582c9fd6 | |||
| 3133535606 | |||
| a5e1b7d297 | |||
| 021a9b0101 | |||
| 6cea1ed4e8 | |||
| 17f4db58bc | |||
| 9740a7639b | |||
| 191a536f5c | |||
| 07514bf92d | |||
| 997d910d1c | |||
| 9ea9d6764b | |||
| cf3995fcbe | |||
| 983c453322 | |||
| c69585b257 | |||
| c6d4fca881 | |||
| 9c67190509 | |||
| 956b660b4f | |||
| f056fe593a | |||
| ca8d3225d1 | |||
| 0ebc6bc153 | |||
| fbd342d640 | |||
| b6e6d2e809 | |||
| 9eff185351 | |||
| 10e9aece2b | |||
| a1b9144851 | |||
| 16a62aa3ba | |||
| f8395d7270 | |||
| 5a0fb9f43c | |||
| 9d188198a9 | |||
| cb1d2665d8 | |||
| 3bbdd9d0a6 | |||
| 159f91e55e | |||
| daf261b4f8 | |||
| 50fa4de919 | |||
| ab2061b2bd | |||
| 4dd0775640 | |||
| 4f81431ccd | |||
| 6371787b47 | |||
| 0ced766608 | |||
| 26b61cdbc9 | |||
| 0e6763d954 | |||
| f9b2786809 | |||
| a88f7bac09 | |||
| 37e147e3be |
+2
-1
@@ -59,4 +59,5 @@ ios/
|
||||
!modules/**/ios/
|
||||
*.ipa
|
||||
*.apk
|
||||
*.aab
|
||||
*.aab
|
||||
.env.local
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"mcpServers": {
|
||||
"Sentry": {
|
||||
"url": "https://mcp.sentry.dev/mcp/xprocess-m5/jr-shikoku-unofficial-apps"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import {
|
||||
useRealWindowDimensions,
|
||||
} from "./utils/dexDimensionOverride";
|
||||
import { Linking, Platform, UIManager, View } from "react-native";
|
||||
import { enableFreeze, enableScreens } from "react-native-screens";
|
||||
import { GestureHandlerRootView } from "react-native-gesture-handler";
|
||||
import "./utils/disableFontScaling"; // グローバルなフォントスケーリング無効化
|
||||
import { AppContainer } from "./Apps";
|
||||
@@ -25,22 +26,98 @@ import { buildProvidersTree } from "./lib/providerTreeProvider";
|
||||
import { StationListProvider } from "./stateBox/useStationList";
|
||||
import { NotificationProvider } from "./stateBox/useNotifications";
|
||||
import { UserPositionProvider } from "./stateBox/useUserPosition";
|
||||
import { rootNavigationRef, stackAwareNavigate } from "./lib/rootNavigation";
|
||||
import {
|
||||
markStartupExplicitTarget,
|
||||
resolveStartupNavigationSource,
|
||||
rootNavigationRef,
|
||||
stackAwareNavigate,
|
||||
} from "./lib/rootNavigation";
|
||||
import { AppThemeProvider } from "./lib/theme";
|
||||
import StatusbarDetect from "./StatusbarDetect";
|
||||
import * as Sentry from '@sentry/react-native';
|
||||
import {
|
||||
startAppLifecycleCrashSentinel,
|
||||
stopAppLifecycleCrashSentinel,
|
||||
} from "./lib/observability/appLifecycleCrashSentinel";
|
||||
|
||||
Sentry.init({
|
||||
dsn: 'https://1090312e4cf501f5a455d523eff2d538@o4511646874664960.ingest.us.sentry.io/4511646880432128',
|
||||
|
||||
// Adds more context data to events (IP address, cookies, user, etc.)
|
||||
// For more information, visit: https://docs.sentry.io/platforms/react-native/data-management/data-collected/
|
||||
sendDefaultPii: true,
|
||||
|
||||
// Enable Logs
|
||||
enableLogs: true,
|
||||
|
||||
// Configure Session Replay
|
||||
replaysSessionSampleRate: 0.1,
|
||||
replaysOnErrorSampleRate: 1,
|
||||
integrations: [Sentry.mobileReplayIntegration(), Sentry.feedbackIntegration()],
|
||||
|
||||
tracesSampleRate: __DEV__ ? 1.0 : 0.05,
|
||||
|
||||
beforeSend(event) {
|
||||
const dataFetch = event.contexts?.data_fetch as any;
|
||||
if (dataFetch?.responseHead && typeof dataFetch.responseHead === "string") {
|
||||
dataFetch.responseHead = dataFetch.responseHead.slice(0, 300);
|
||||
}
|
||||
return event;
|
||||
},
|
||||
|
||||
// uncomment the line below to enable Spotlight (https://spotlightjs.com)
|
||||
// spotlight: __DEV__,
|
||||
});
|
||||
|
||||
LogBox.ignoreLogs([
|
||||
"ViewPropTypes will be removed",
|
||||
"ColorPropType will be removed",
|
||||
]);
|
||||
|
||||
const nativeScreensDisabled =
|
||||
Platform.OS === "ios" || Platform.OS === "android";
|
||||
|
||||
if (nativeScreensDisabled) {
|
||||
enableFreeze(false);
|
||||
enableScreens(false);
|
||||
}
|
||||
|
||||
if (Platform.OS === "android") {
|
||||
if (UIManager.setLayoutAnimationEnabledExperimental) {
|
||||
UIManager.setLayoutAnimationEnabledExperimental(true);
|
||||
}
|
||||
}
|
||||
|
||||
export default function App() {
|
||||
export default Sentry.wrap(function App() {
|
||||
useEffect(() => {
|
||||
const nativeScreensMode = nativeScreensDisabled
|
||||
? "screens-disabled"
|
||||
: "default";
|
||||
const rootTabSceneMode =
|
||||
Platform.OS === "android" ? "opacity-fixed-z-v1" : "default";
|
||||
Sentry.setTag("native_screens_mode", nativeScreensMode);
|
||||
Sentry.setTag("root_tab_scene_mode", rootTabSceneMode);
|
||||
Sentry.setContext("runtime_navigation_flags", {
|
||||
platform: Platform.OS,
|
||||
nativeScreensMode,
|
||||
rootTabSceneMode,
|
||||
});
|
||||
Sentry.addBreadcrumb({
|
||||
category: "runtime.flags",
|
||||
level: "info",
|
||||
message: "runtime navigation flags applied",
|
||||
data: {
|
||||
platform: Platform.OS,
|
||||
nativeScreensMode,
|
||||
rootTabSceneMode,
|
||||
},
|
||||
});
|
||||
void startAppLifecycleCrashSentinel({ nativeScreensMode });
|
||||
return () => {
|
||||
stopAppLifecycleCrashSentinel();
|
||||
};
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
UpdateAsync();
|
||||
}, []);
|
||||
@@ -78,46 +155,69 @@ export default function App() {
|
||||
|
||||
const routeFromUrl = (url: string, retryCount = 0) => {
|
||||
const normalized = (url || "").toLowerCase();
|
||||
if (!normalized) return;
|
||||
if (!normalized) return false;
|
||||
|
||||
if (
|
||||
normalized.includes("felicahistorypage") ||
|
||||
normalized.includes("open/felica")
|
||||
) {
|
||||
markStartupExplicitTarget();
|
||||
navigateWhenReady(() => openFelicaPage(), url, retryCount);
|
||||
} else if (normalized.includes("open/traininfo")) {
|
||||
return true;
|
||||
}
|
||||
if (normalized.includes("open/traininfo")) {
|
||||
markStartupExplicitTarget();
|
||||
navigateWhenReady(() => {
|
||||
stackAwareNavigate("topMenu", { screen: "menu" });
|
||||
setTimeout(() => {
|
||||
SheetManager.show("JRSTraInfo");
|
||||
}, 450);
|
||||
}, url, retryCount);
|
||||
} else if (normalized.includes("open/operation")) {
|
||||
return true;
|
||||
}
|
||||
if (normalized.includes("open/operation")) {
|
||||
markStartupExplicitTarget();
|
||||
navigateWhenReady(() => {
|
||||
stackAwareNavigate("information");
|
||||
}, url, retryCount);
|
||||
} else if (normalized.includes("open/settings")) {
|
||||
return true;
|
||||
}
|
||||
if (normalized.includes("open/settings")) {
|
||||
markStartupExplicitTarget();
|
||||
navigateWhenReady(() => {
|
||||
stackAwareNavigate("topMenu", {
|
||||
screen: "setting",
|
||||
});
|
||||
}, url, retryCount);
|
||||
} else if (normalized.includes("open/topmenu")) {
|
||||
return true;
|
||||
}
|
||||
if (normalized.includes("open/topmenu")) {
|
||||
markStartupExplicitTarget();
|
||||
navigateWhenReady(() => {
|
||||
stackAwareNavigate("topMenu", {
|
||||
screen: "menu",
|
||||
});
|
||||
}, url, retryCount);
|
||||
} else if (normalized.includes("positions/apps")) {
|
||||
return true;
|
||||
}
|
||||
if (normalized.includes("positions/apps")) {
|
||||
markStartupExplicitTarget();
|
||||
navigateWhenReady(() => {
|
||||
stackAwareNavigate("positions");
|
||||
}, url, retryCount);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
Linking.getInitialURL().then((url) => {
|
||||
if (url) routeFromUrl(url);
|
||||
});
|
||||
Linking.getInitialURL()
|
||||
.then((url) => {
|
||||
if (url) routeFromUrl(url);
|
||||
})
|
||||
.finally(() => {
|
||||
resolveStartupNavigationSource();
|
||||
});
|
||||
|
||||
const sub = Linking.addEventListener("url", ({ url }) => {
|
||||
routeFromUrl(url);
|
||||
@@ -157,7 +257,7 @@ export default function App() {
|
||||
</DeviceOrientationChangeProvider>
|
||||
</AppThemeProvider>
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* 低密度ディスプレイ(DeX等)で全体を transform scale で拡大。
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import React from "react";
|
||||
import { NavigationContainer, DarkTheme, DefaultTheme } from "@react-navigation/native";
|
||||
import { NavigationContainer, DarkTheme, DefaultTheme, type EventArg } from "@react-navigation/native";
|
||||
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
|
||||
import { Animated, Platform, ActivityIndicator, View, StyleSheet, StatusBar } from "react-native";
|
||||
import { Animated, Platform, ActivityIndicator, View, StyleSheet, StatusBar, useWindowDimensions, InteractionManager } from "react-native";
|
||||
import { useNavigationState } from "@react-navigation/native";
|
||||
import { useFonts } from "expo-font";
|
||||
import { LinearGradient } from "expo-linear-gradient";
|
||||
@@ -14,9 +14,21 @@ import { useTrainMenu } from "./stateBox/useTrainMenu";
|
||||
import lineColorList from "./assets/originData/lineColorList";
|
||||
import { stationIDPair } from "./lib/getStationList";
|
||||
import "./components/ActionSheetComponents/sheets";
|
||||
import { rootNavigationRef } from "./lib/rootNavigation";
|
||||
import { lastObservedRootRouteRef, positionsLifecycleRef, rootNavigationRef } from "./lib/rootNavigation";
|
||||
import {
|
||||
startupExplicitTargetRef,
|
||||
waitForStartupNavigationResolution,
|
||||
} from "./lib/rootNavigation";
|
||||
import { fixedColors } from "./lib/theme/colors";
|
||||
import { useThemeColors } from "./lib/theme";
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
import WebView from "react-native-webview";
|
||||
import { AS } from "./storageControl";
|
||||
import { STORAGE_KEYS } from "./constants/storage";
|
||||
import {
|
||||
recordAppLifecycleRootNavigation,
|
||||
setAppLifecycleWebViewActive,
|
||||
} from "./lib/observability/appLifecycleCrashSentinel";
|
||||
|
||||
type RootTabParamList = {
|
||||
positions: undefined;
|
||||
@@ -35,10 +47,219 @@ type TabProps = {
|
||||
|
||||
const Tab = createBottomTabNavigator<RootTabParamList>();
|
||||
|
||||
const HiddenStartupPreloadWebViews = ({
|
||||
shouldPreloadPositions,
|
||||
shouldPreloadInformation,
|
||||
}: {
|
||||
shouldPreloadPositions: boolean;
|
||||
shouldPreloadInformation: boolean;
|
||||
}) => {
|
||||
const [positionsLoaded, setPositionsLoaded] = React.useState(false);
|
||||
const [informationLoaded, setInformationLoaded] = React.useState(false);
|
||||
|
||||
React.useEffect(() => {
|
||||
Sentry.setContext("startup_hidden_preload", {
|
||||
shouldPreloadPositions,
|
||||
shouldPreloadInformation,
|
||||
positionsLoaded,
|
||||
informationLoaded,
|
||||
});
|
||||
}, [informationLoaded, positionsLoaded, shouldPreloadInformation, shouldPreloadPositions]);
|
||||
|
||||
const hiddenStyle = React.useMemo(() => ({
|
||||
position: "absolute" as const,
|
||||
width: 1,
|
||||
height: 1,
|
||||
opacity: 0,
|
||||
left: -1000,
|
||||
top: -1000,
|
||||
pointerEvents: "none" as const,
|
||||
}), []);
|
||||
|
||||
const showPositions = shouldPreloadPositions && !positionsLoaded;
|
||||
const showInformation = shouldPreloadInformation && !informationLoaded;
|
||||
|
||||
if (!showPositions && !showInformation) return null;
|
||||
|
||||
return (
|
||||
<View pointerEvents="none" style={hiddenStyle}>
|
||||
{showPositions ? (
|
||||
<WebView
|
||||
source={{ uri: "https://train.jr-shikoku.co.jp/" }}
|
||||
originWhitelist={["https://train.jr-shikoku.co.jp"]}
|
||||
javaScriptEnabled
|
||||
setSupportMultipleWindows={false}
|
||||
onLoadStart={() => {
|
||||
setAppLifecycleWebViewActive("startup_hidden_positions", true);
|
||||
Sentry.addBreadcrumb({
|
||||
category: "startup.preload",
|
||||
level: "info",
|
||||
message: "positions hidden preload loadStart",
|
||||
});
|
||||
}}
|
||||
onLoadEnd={() => {
|
||||
setAppLifecycleWebViewActive("startup_hidden_positions", false);
|
||||
Sentry.addBreadcrumb({
|
||||
category: "startup.preload",
|
||||
level: "info",
|
||||
message: "positions hidden preload loadEnd",
|
||||
});
|
||||
setPositionsLoaded(true);
|
||||
}}
|
||||
onError={() => {
|
||||
setAppLifecycleWebViewActive("startup_hidden_positions", false);
|
||||
Sentry.addBreadcrumb({
|
||||
category: "startup.preload",
|
||||
level: "error",
|
||||
message: "positions hidden preload error",
|
||||
});
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
{showInformation ? (
|
||||
<WebView
|
||||
source={{ uri: "https://www.jr-shikoku.co.jp/info/" }}
|
||||
originWhitelist={["https://www.jr-shikoku.co.jp"]}
|
||||
javaScriptEnabled
|
||||
setSupportMultipleWindows={false}
|
||||
onLoadStart={() => {
|
||||
setAppLifecycleWebViewActive("startup_hidden_operation", true);
|
||||
Sentry.addBreadcrumb({
|
||||
category: "startup.preload",
|
||||
level: "info",
|
||||
message: "operation hidden preload loadStart",
|
||||
});
|
||||
}}
|
||||
onLoadEnd={() => {
|
||||
setAppLifecycleWebViewActive("startup_hidden_operation", false);
|
||||
Sentry.addBreadcrumb({
|
||||
category: "startup.preload",
|
||||
level: "info",
|
||||
message: "operation hidden preload loadEnd",
|
||||
});
|
||||
setInformationLoaded(true);
|
||||
}}
|
||||
onError={() => {
|
||||
setAppLifecycleWebViewActive("startup_hidden_operation", false);
|
||||
Sentry.addBreadcrumb({
|
||||
category: "startup.preload",
|
||||
level: "error",
|
||||
message: "operation hidden preload error",
|
||||
});
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
</View>
|
||||
);
|
||||
};
|
||||
|
||||
const PositionsRootGateContext = React.createContext({
|
||||
shouldActivate: false,
|
||||
isRootFocused: false,
|
||||
});
|
||||
|
||||
const InformationRootGateContext = React.createContext({
|
||||
shouldActivate: false,
|
||||
isRootFocused: false,
|
||||
});
|
||||
|
||||
const DeferredPositionsRoot = ({ shouldActivate, isRootFocused }: { shouldActivate: boolean; isRootFocused: boolean }) => {
|
||||
const [hasActivated, setHasActivated] = React.useState(false);
|
||||
|
||||
React.useEffect(() => {
|
||||
Sentry.setContext("positions_root_gate", {
|
||||
focused: isRootFocused,
|
||||
activated: hasActivated,
|
||||
shouldActivate,
|
||||
});
|
||||
}, [hasActivated, isRootFocused, shouldActivate]);
|
||||
|
||||
React.useEffect(() => {
|
||||
if (!shouldActivate || hasActivated) return;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.root",
|
||||
level: "info",
|
||||
message: "positions root activation",
|
||||
data: {
|
||||
reason: "first_root_visit",
|
||||
},
|
||||
});
|
||||
setHasActivated(true);
|
||||
}, [hasActivated, shouldActivate]);
|
||||
|
||||
if (!hasActivated) {
|
||||
return <View style={{ flex: 1 }} />;
|
||||
}
|
||||
|
||||
return <Top />;
|
||||
};
|
||||
|
||||
const PositionsTabScreen = React.memo(() => {
|
||||
const { shouldActivate, isRootFocused } = React.useContext(PositionsRootGateContext);
|
||||
return (
|
||||
<DeferredPositionsRoot
|
||||
shouldActivate={shouldActivate}
|
||||
isRootFocused={isRootFocused}
|
||||
/>
|
||||
);
|
||||
});
|
||||
PositionsTabScreen.displayName = "PositionsTabScreen";
|
||||
|
||||
|
||||
const DeferredInformationRoot = ({ shouldActivate, isRootFocused }: { shouldActivate: boolean; isRootFocused: boolean }) => {
|
||||
const [hasActivated, setHasActivated] = React.useState(false);
|
||||
|
||||
React.useEffect(() => {
|
||||
Sentry.setContext("operation_root_gate", {
|
||||
focused: isRootFocused,
|
||||
activated: hasActivated,
|
||||
shouldActivate,
|
||||
});
|
||||
}, [hasActivated, isRootFocused, shouldActivate]);
|
||||
|
||||
React.useEffect(() => {
|
||||
if (!shouldActivate || hasActivated) return;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "operation.root",
|
||||
level: "info",
|
||||
message: "operation root activation",
|
||||
data: {
|
||||
reason: isRootFocused ? "first_focus" : "background_prewarm",
|
||||
},
|
||||
});
|
||||
setHasActivated(true);
|
||||
}, [hasActivated, isRootFocused, shouldActivate]);
|
||||
|
||||
if (!hasActivated) {
|
||||
return <View style={{ flex: 1 }} />;
|
||||
}
|
||||
|
||||
return <TNDView />;
|
||||
};
|
||||
|
||||
const InformationTabScreen = React.memo(() => {
|
||||
const { shouldActivate, isRootFocused } = React.useContext(InformationRootGateContext);
|
||||
return (
|
||||
<DeferredInformationRoot
|
||||
shouldActivate={shouldActivate}
|
||||
isRootFocused={isRootFocused}
|
||||
/>
|
||||
);
|
||||
});
|
||||
InformationTabScreen.displayName = "InformationTabScreen";
|
||||
|
||||
export function AppContainer() {
|
||||
const { areaInfo, areaIconBadgeText, isInfo } = useAreaInfo();
|
||||
const { selectedLine } = useTrainMenu();
|
||||
const { width, height } = useWindowDimensions();
|
||||
const [isExtraWindowOpen, setIsExtraWindowOpen] = React.useState(false);
|
||||
const [startupInitialRoute, setStartupInitialRoute] = React.useState<keyof RootTabParamList | null>(null);
|
||||
const [hasVisitedPositions, setHasVisitedPositions] = React.useState(false);
|
||||
const [hasVisitedInformation, setHasVisitedInformation] = React.useState(false);
|
||||
const [currentRootRoute, setCurrentRootRoute] = React.useState<keyof RootTabParamList | null>(null);
|
||||
const [navigationReady, setNavigationReady] = React.useState(false);
|
||||
const startupPrewarmAttemptedRef = React.useRef(false);
|
||||
const informationStartupPrewarmAttemptedRef = React.useRef(false);
|
||||
|
||||
// フェードアニメーション用 (0=通常, 1=追加ウィンドウ青)
|
||||
const fadeAnim = React.useRef(new Animated.Value(0)).current;
|
||||
@@ -62,7 +283,47 @@ export function AppContainer() {
|
||||
return `#${[r, g, b].map((v) => Math.min(255, v).toString(16).padStart(2, "0")).join("")}`;
|
||||
};
|
||||
const { isDark } = useThemeColors();
|
||||
const lastRootNavStateRef = React.useRef("");
|
||||
const lineColorDark = lineColor ? darkenHex(lineColor, 0.78) : null;
|
||||
|
||||
React.useEffect(() => {
|
||||
let cancelled = false;
|
||||
|
||||
void (async () => {
|
||||
await waitForStartupNavigationResolution();
|
||||
if (cancelled) return;
|
||||
|
||||
let nextInitialRoute: keyof RootTabParamList = "topMenu";
|
||||
if (!startupExplicitTargetRef.current) {
|
||||
try {
|
||||
const startPage = await AS.getItem(STORAGE_KEYS.START_PAGE);
|
||||
if (startPage === "true") {
|
||||
nextInitialRoute = "positions";
|
||||
}
|
||||
} catch {
|
||||
// Keep the default route when the setting is unset or unreadable.
|
||||
}
|
||||
}
|
||||
|
||||
if (cancelled) return;
|
||||
|
||||
setStartupInitialRoute(nextInitialRoute);
|
||||
setHasVisitedPositions(nextInitialRoute === "positions");
|
||||
Sentry.addBreadcrumb({
|
||||
category: "nav.root",
|
||||
level: "info",
|
||||
message: "startup initial root route resolved",
|
||||
data: {
|
||||
startupExplicitTarget: startupExplicitTargetRef.current,
|
||||
initialRoute: nextInitialRoute,
|
||||
},
|
||||
});
|
||||
})();
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, []);
|
||||
const linking = {
|
||||
prefixes: ["jrshikoku://"],
|
||||
config: {
|
||||
@@ -99,17 +360,152 @@ export function AppContainer() {
|
||||
tabBarLabel: label,
|
||||
headerShown: false,
|
||||
gestureEnabled: true,
|
||||
unmountOnBlur: false,
|
||||
tabBarIcon: initIcon(icon as any, iconFamily, tabBarBadge, isInfo),
|
||||
|
||||
},
|
||||
});
|
||||
const applyRootNavigationState = React.useCallback((state: any, source: "ready" | "change") => {
|
||||
const activeRoute = state?.routes?.[state?.index ?? 0];
|
||||
const hasExtra = (activeRoute?.state?.index ?? 0) > 0;
|
||||
const nestedState = activeRoute?.state;
|
||||
const nestedRoute = nestedState?.routes?.[nestedState.index ?? 0]?.name ?? null;
|
||||
const signature = JSON.stringify({
|
||||
rootIndex: state?.index ?? 0,
|
||||
rootRoute: activeRoute?.name ?? null,
|
||||
nestedIndex: nestedState?.index ?? 0,
|
||||
nestedRoute,
|
||||
hasExtra,
|
||||
});
|
||||
if (lastRootNavStateRef.current !== signature) {
|
||||
lastRootNavStateRef.current = signature;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "nav.root",
|
||||
level: "info",
|
||||
message: source === "ready" ? "root state initialized" : "root state change",
|
||||
data: {
|
||||
rootIndex: state?.index ?? 0,
|
||||
rootRoute: activeRoute?.name ?? null,
|
||||
nestedIndex: nestedState?.index ?? 0,
|
||||
nestedRoute,
|
||||
hasExtra,
|
||||
source,
|
||||
},
|
||||
});
|
||||
}
|
||||
const rootRouteName = (activeRoute?.name ?? null) as keyof RootTabParamList | null;
|
||||
if (rootRouteName) {
|
||||
lastObservedRootRouteRef.current = rootRouteName;
|
||||
}
|
||||
recordAppLifecycleRootNavigation({
|
||||
rootIndex: state?.index ?? 0,
|
||||
rootRoute: rootRouteName,
|
||||
nestedIndex: nestedState?.index ?? 0,
|
||||
nestedRoute,
|
||||
source,
|
||||
});
|
||||
Sentry.setTag("root_tab", rootRouteName ?? "unknown");
|
||||
Sentry.setContext("root_navigation", {
|
||||
rootIndex: state?.index ?? 0,
|
||||
rootRoute: rootRouteName,
|
||||
nestedIndex: nestedState?.index ?? 0,
|
||||
nestedRoute,
|
||||
hasExtra,
|
||||
source,
|
||||
operationOrientation: width > height ? "landscape" : "portrait",
|
||||
hasVisitedPositions,
|
||||
hasVisitedInformation,
|
||||
});
|
||||
setCurrentRootRoute(rootRouteName);
|
||||
setIsExtraWindowOpen(hasExtra);
|
||||
}, [hasVisitedInformation, hasVisitedPositions, width, height]);
|
||||
|
||||
const [fontLoaded, error] = useFonts({
|
||||
"JR-Nishi": require("./assets/fonts/jr-nishi.otf"),
|
||||
"JR-WEST-PLUS": require("./assets/fonts/JR-WEST-PLUS.otf"),
|
||||
Zou: require("./assets/fonts/DelaGothicOne-Regular.ttf"),
|
||||
"JNR-font": require("./assets/fonts/JNRfont_pict.ttf"),
|
||||
"DiaPro": require("./assets/fonts/DiaPro-Regular.otf"),
|
||||
});
|
||||
if (!fontLoaded) {
|
||||
React.useEffect(() => {
|
||||
if (!navigationReady || !fontLoaded) return;
|
||||
if (startupPrewarmAttemptedRef.current) return;
|
||||
if (hasVisitedPositions) {
|
||||
startupPrewarmAttemptedRef.current = true;
|
||||
return;
|
||||
}
|
||||
if (currentRootRoute === null || currentRootRoute === "positions") return;
|
||||
|
||||
startupPrewarmAttemptedRef.current = true;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.root",
|
||||
level: "info",
|
||||
message: "positions startup prewarm scheduled",
|
||||
data: {
|
||||
currentRootRoute,
|
||||
},
|
||||
});
|
||||
|
||||
let cancelled = false;
|
||||
const timer = setTimeout(() => {
|
||||
if (cancelled || hasVisitedPositions) return;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.root",
|
||||
level: "info",
|
||||
message: "positions startup prewarm activated",
|
||||
data: {
|
||||
currentRootRoute,
|
||||
},
|
||||
});
|
||||
setHasVisitedPositions(true);
|
||||
}, 500);
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
clearTimeout(timer);
|
||||
};
|
||||
}, [currentRootRoute, fontLoaded, hasVisitedPositions, navigationReady]);
|
||||
|
||||
React.useEffect(() => {
|
||||
if (!navigationReady || !fontLoaded) return;
|
||||
if (informationStartupPrewarmAttemptedRef.current) return;
|
||||
if (hasVisitedInformation) {
|
||||
informationStartupPrewarmAttemptedRef.current = true;
|
||||
return;
|
||||
}
|
||||
if (currentRootRoute === null || currentRootRoute === "information") return;
|
||||
|
||||
informationStartupPrewarmAttemptedRef.current = true;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "operation.root",
|
||||
level: "info",
|
||||
message: "operation startup prewarm scheduled",
|
||||
data: {
|
||||
currentRootRoute,
|
||||
},
|
||||
});
|
||||
|
||||
let cancelled = false;
|
||||
const timer = setTimeout(() => {
|
||||
if (cancelled || hasVisitedInformation) return;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "operation.root",
|
||||
level: "info",
|
||||
message: "operation startup prewarm activated",
|
||||
data: {
|
||||
currentRootRoute,
|
||||
},
|
||||
});
|
||||
setHasVisitedInformation(true);
|
||||
}, 500);
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
clearTimeout(timer);
|
||||
};
|
||||
}, [currentRootRoute, fontLoaded, hasVisitedInformation, navigationReady]);
|
||||
|
||||
if (!fontLoaded || !startupInitialRoute) {
|
||||
return (
|
||||
<View style={{ flex: 1, justifyContent: "center", alignItems: "center" }}>
|
||||
<ActivityIndicator size="large" />
|
||||
@@ -121,14 +517,123 @@ export function AppContainer() {
|
||||
ref={rootNavigationRef}
|
||||
linking={linking}
|
||||
theme={isDark ? DarkTheme : DefaultTheme}
|
||||
onReady={() => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "nav.root",
|
||||
level: "info",
|
||||
message: "navigation ready",
|
||||
});
|
||||
applyRootNavigationState(rootNavigationRef.getRootState?.() ?? rootNavigationRef.getState?.(), "ready");
|
||||
setNavigationReady(true);
|
||||
}}
|
||||
onStateChange={(state) => {
|
||||
const activeRoute = state?.routes?.[state?.index ?? 0];
|
||||
const hasExtra = (activeRoute?.state?.index ?? 0) > 0;
|
||||
setIsExtraWindowOpen(hasExtra);
|
||||
applyRootNavigationState(state, "change");
|
||||
}}
|
||||
>
|
||||
<PositionsRootGateContext.Provider
|
||||
value={{
|
||||
shouldActivate: hasVisitedPositions,
|
||||
isRootFocused: currentRootRoute === "positions",
|
||||
}}
|
||||
>
|
||||
<InformationRootGateContext.Provider
|
||||
value={{
|
||||
shouldActivate: hasVisitedInformation,
|
||||
isRootFocused: currentRootRoute === "information",
|
||||
}}
|
||||
>
|
||||
<Tab.Navigator
|
||||
initialRouteName="topMenu"
|
||||
id="rootTabs"
|
||||
detachInactiveScreens={false}
|
||||
initialRouteName={startupInitialRoute}
|
||||
screenListeners={({ route }) => ({
|
||||
tabPress: (event: EventArg<"tabPress", true>) => {
|
||||
const rootState = rootNavigationRef.getState();
|
||||
const activeRootRouteName =
|
||||
(rootState?.routes?.[rootState.index ?? 0]?.name as keyof RootTabParamList | undefined) ??
|
||||
currentRootRoute ??
|
||||
null;
|
||||
const leavingUnstablePositions =
|
||||
route.name !== "positions" &&
|
||||
positionsLifecycleRef.current.isUnstable;
|
||||
const blockingUnstableExit =
|
||||
route.name !== "positions" &&
|
||||
positionsLifecycleRef.current.blockTabExit;
|
||||
|
||||
Sentry.addBreadcrumb({
|
||||
category: "nav.tab",
|
||||
level: "info",
|
||||
message: blockingUnstableExit
|
||||
? "root tabPress blocked while positions unstable"
|
||||
: leavingUnstablePositions
|
||||
? "root tabPress intercepted for unstable positions"
|
||||
: "root tabPress",
|
||||
data: {
|
||||
route: route.name,
|
||||
currentRootRoute,
|
||||
activeRootRouteName,
|
||||
unstablePositions: positionsLifecycleRef.current.isUnstable,
|
||||
blockTabExit: positionsLifecycleRef.current.blockTabExit,
|
||||
},
|
||||
});
|
||||
|
||||
if (blockingUnstableExit) {
|
||||
event.preventDefault();
|
||||
positionsLifecycleRef.current.resetBeforeLeave?.();
|
||||
requestAnimationFrame(() => {
|
||||
setTimeout(() => {
|
||||
rootNavigationRef.navigate(route.name as never);
|
||||
}, 0);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (leavingUnstablePositions) {
|
||||
event.preventDefault();
|
||||
positionsLifecycleRef.current.resetBeforeLeave?.();
|
||||
requestAnimationFrame(() => {
|
||||
setTimeout(() => {
|
||||
rootNavigationRef.navigate(route.name as never);
|
||||
}, 0);
|
||||
});
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.root",
|
||||
level: "info",
|
||||
message: "positions root exit reset and continued while session unstable",
|
||||
data: {
|
||||
route: route.name,
|
||||
},
|
||||
});
|
||||
}
|
||||
},
|
||||
focus: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "nav.tab",
|
||||
level: "info",
|
||||
message: "root tab focus",
|
||||
data: { route: route.name },
|
||||
});
|
||||
},
|
||||
blur: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "nav.tab",
|
||||
level: "info",
|
||||
message: "root tab blur",
|
||||
data: { route: route.name },
|
||||
});
|
||||
},
|
||||
state: (event) => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "nav.tab",
|
||||
level: "info",
|
||||
message: "root tab state",
|
||||
data: {
|
||||
route: route.name,
|
||||
stateType: event.type,
|
||||
},
|
||||
});
|
||||
},
|
||||
})}
|
||||
screenOptions={({ route }) => {
|
||||
const showGradient = route.name === "positions" && !!lineColor && !!lineColorDark;
|
||||
const defaultBg = isDark ? "#1c1c1e" : "white";
|
||||
@@ -136,6 +641,7 @@ export function AppContainer() {
|
||||
const defaultInactive = isDark ? "#8e8e93" : "#8e8e93";
|
||||
return {
|
||||
lazy: false,
|
||||
freezeOnBlur: false,
|
||||
sceneContainerStyle: { backgroundColor: defaultBg },
|
||||
tabBarActiveTintColor: (showGradient || isExtraWindowOpen) ? "white" : defaultActive,
|
||||
tabBarInactiveTintColor: (showGradient || isExtraWindowOpen) ? "rgba(255,255,255,0.75)" : defaultInactive,
|
||||
@@ -169,7 +675,32 @@ export function AppContainer() {
|
||||
>
|
||||
<Tab.Screen
|
||||
{...getTabProps("positions", "走行位置", "bar-chart", "AntDesign")}
|
||||
component={Top}
|
||||
component={PositionsTabScreen}
|
||||
listeners={{
|
||||
tabPress: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.root",
|
||||
level: "info",
|
||||
message: "positions root tabPress activation",
|
||||
});
|
||||
setHasVisitedPositions(true);
|
||||
},
|
||||
focus: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.root",
|
||||
level: "info",
|
||||
message: "positions root focus activation",
|
||||
});
|
||||
setHasVisitedPositions(true);
|
||||
},
|
||||
blur: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.root",
|
||||
level: "info",
|
||||
message: "positions root blur preserved",
|
||||
});
|
||||
},
|
||||
}}
|
||||
/>
|
||||
<Tab.Screen
|
||||
{...getTabProps("topMenu", "トップメニュー", "radio", "Ionicons")}
|
||||
@@ -185,9 +716,40 @@ export function AppContainer() {
|
||||
areaInfo ? areaIconBadgeText : undefined,
|
||||
isInfo
|
||||
)}
|
||||
children={TNDView}
|
||||
component={InformationTabScreen}
|
||||
listeners={{
|
||||
tabPress: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "operation.root",
|
||||
level: "info",
|
||||
message: "operation root tabPress activation",
|
||||
});
|
||||
setHasVisitedInformation(true);
|
||||
},
|
||||
focus: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "operation.root",
|
||||
level: "info",
|
||||
message: "operation root focus activation",
|
||||
});
|
||||
setHasVisitedInformation(true);
|
||||
},
|
||||
blur: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "operation.root",
|
||||
level: "info",
|
||||
message: "operation root blur preserved",
|
||||
});
|
||||
},
|
||||
}}
|
||||
/>
|
||||
</Tab.Navigator>
|
||||
</InformationRootGateContext.Provider>
|
||||
</PositionsRootGateContext.Provider>
|
||||
<HiddenStartupPreloadWebViews
|
||||
shouldPreloadPositions={navigationReady && fontLoaded && currentRootRoute === "topMenu" && !hasVisitedPositions}
|
||||
shouldPreloadInformation={navigationReady && fontLoaded && currentRootRoute === "topMenu" && !hasVisitedInformation}
|
||||
/>
|
||||
</NavigationContainer>
|
||||
);
|
||||
}
|
||||
|
||||
+254
-49
@@ -1,5 +1,5 @@
|
||||
import React from "react";
|
||||
import { Alert, ActivityIndicator, AppState, AppStateStatus, BackHandler, StyleSheet, Text, TouchableOpacity, View } from "react-native";
|
||||
import { Alert, ActivityIndicator, BackHandler, StyleSheet, Text, TouchableOpacity, View } from "react-native";
|
||||
import * as FileSystem from "expo-file-system/legacy";
|
||||
import * as Sharing from "expo-sharing";
|
||||
import { WebView } from "react-native-webview";
|
||||
@@ -9,21 +9,124 @@ import { useFocusEffect, useNavigation } from "@react-navigation/native";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
import { AS } from "./storageControl";
|
||||
import { STORAGE_KEYS } from "@/constants";
|
||||
import { useTrainMenu } from "@/stateBox/useTrainMenu";
|
||||
import {
|
||||
DEFAULT_JR_DATA_SYSTEM_ENV,
|
||||
normalizeJrDataSystemEnvironment,
|
||||
rewriteJrDataSystemUrl,
|
||||
} from "@/lib/jrDataSystemEnvironment";
|
||||
|
||||
const RECORDING_DOWNLOAD_BRIDGE_SCRIPT = `
|
||||
(() => {
|
||||
if (window.__JRS_RECORDING_DOWNLOAD_BRIDGE__) return true;
|
||||
window.__JRS_RECORDING_DOWNLOAD_BRIDGE__ = true;
|
||||
|
||||
const blobUrls = new Map();
|
||||
const post = (payload) => {
|
||||
window.ReactNativeWebView?.postMessage(JSON.stringify(payload));
|
||||
};
|
||||
const isLikelyRecordingDownload = (url, anchor) => {
|
||||
if (!url) return false;
|
||||
const lowerUrl = String(url).toLowerCase();
|
||||
const downloadName = anchor?.getAttribute?.('download') || '';
|
||||
const lowerName = String(downloadName).toLowerCase();
|
||||
return Boolean(downloadName)
|
||||
|| lowerUrl.includes('recording')
|
||||
|| lowerUrl.includes('recordings')
|
||||
|| lowerUrl.includes('download')
|
||||
|| lowerUrl.includes('export')
|
||||
|| lowerUrl.includes('json')
|
||||
|| lowerName.includes('recording')
|
||||
|| lowerName.endsWith('.json');
|
||||
};
|
||||
const readUrlAsText = async (url) => {
|
||||
if (blobUrls.has(url)) {
|
||||
return blobUrls.get(url).text();
|
||||
}
|
||||
const response = await fetch(url, { credentials: 'include' });
|
||||
if (!response.ok) throw new Error('HTTP ' + response.status);
|
||||
return response.text();
|
||||
};
|
||||
const importFromUrl = async (url) => {
|
||||
try {
|
||||
const text = await readUrlAsText(url);
|
||||
post({ type: 'importRecordingDownload', text, sourceUrl: url });
|
||||
} catch (error) {
|
||||
post({
|
||||
type: 'importRecordingDownloadError',
|
||||
message: error?.message || String(error),
|
||||
sourceUrl: url,
|
||||
});
|
||||
}
|
||||
};
|
||||
const findAnchor = (target) => {
|
||||
let node = target;
|
||||
while (node && node !== document) {
|
||||
if (node.tagName === 'A' && node.href) return node;
|
||||
node = node.parentNode;
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
if (window.URL?.createObjectURL) {
|
||||
const originalCreateObjectURL = window.URL.createObjectURL.bind(window.URL);
|
||||
window.URL.createObjectURL = (object) => {
|
||||
const url = originalCreateObjectURL(object);
|
||||
if (object instanceof Blob) blobUrls.set(url, object);
|
||||
return url;
|
||||
};
|
||||
}
|
||||
|
||||
document.addEventListener('click', (event) => {
|
||||
const anchor = findAnchor(event.target);
|
||||
if (!anchor || !isLikelyRecordingDownload(anchor.href, anchor)) return;
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
importFromUrl(anchor.href);
|
||||
}, true);
|
||||
|
||||
if (window.HTMLAnchorElement?.prototype?.click) {
|
||||
const originalClick = window.HTMLAnchorElement.prototype.click;
|
||||
window.HTMLAnchorElement.prototype.click = function patchedClick() {
|
||||
if (isLikelyRecordingDownload(this.href, this)) {
|
||||
importFromUrl(this.href);
|
||||
return;
|
||||
}
|
||||
return originalClick.apply(this, arguments);
|
||||
};
|
||||
}
|
||||
|
||||
return true;
|
||||
})();
|
||||
true;
|
||||
`;
|
||||
|
||||
const isLikelyRecordingDownloadUrl = (url: string) => {
|
||||
const lowerUrl = url.toLowerCase();
|
||||
return lowerUrl.includes('recording')
|
||||
|| lowerUrl.includes('recordings')
|
||||
|| lowerUrl.includes('download')
|
||||
|| lowerUrl.includes('export')
|
||||
|| lowerUrl.includes('json')
|
||||
|| lowerUrl.endsWith('.json');
|
||||
};
|
||||
|
||||
export default ({ route }) => {
|
||||
if (!route.params) {
|
||||
return null;
|
||||
}
|
||||
const { uri, useExitButton = true } = route.params;
|
||||
const {
|
||||
uri,
|
||||
useExitButton = true,
|
||||
importRecordingDownloads = false,
|
||||
} = route.params;
|
||||
const { goBack } = useNavigation();
|
||||
const { fixed } = useThemeColors();
|
||||
const { importRecordingsFromText } = useTrainMenu();
|
||||
const webViewRef = React.useRef<WebView>(null);
|
||||
const [canGoBack, setCanGoBack] = React.useState(false);
|
||||
const nativeCanGoBackRef = React.useRef(false);
|
||||
const historyStackRef = React.useRef<string[]>([]);
|
||||
const [selectedEnvironment, setSelectedEnvironment] = React.useState(
|
||||
DEFAULT_JR_DATA_SYSTEM_ENV,
|
||||
);
|
||||
@@ -35,8 +138,6 @@ export default ({ route }) => {
|
||||
const [errorMessage, setErrorMessage] = React.useState("");
|
||||
// WebViewをforce remountするためのkey
|
||||
const [webViewKey, setWebViewKey] = React.useState(0);
|
||||
// バックグラウンド移行時刻の記録
|
||||
const backgroundedAt = React.useRef<number | null>(null);
|
||||
// RN-side watchdog: WebViewプロセスの死活確認用
|
||||
const lastPongAt = React.useRef<number>(Date.now());
|
||||
const isLoadingRef = React.useRef(true);
|
||||
@@ -62,12 +163,15 @@ export default ({ route }) => {
|
||||
const applyEnvironment = (value: unknown) => {
|
||||
if (!isMounted) return;
|
||||
const nextEnvironment = normalizeJrDataSystemEnvironment(value);
|
||||
const rawUri = typeof uri === "string" ? uri : "";
|
||||
historyStackRef.current = [];
|
||||
nativeCanGoBackRef.current = false;
|
||||
setCanGoBack(false);
|
||||
setSelectedEnvironment(nextEnvironment);
|
||||
setResolvedUri(
|
||||
rewriteJrDataSystemUrl(
|
||||
typeof uri === "string" ? uri : "",
|
||||
nextEnvironment,
|
||||
),
|
||||
importRecordingDownloads
|
||||
? rawUri
|
||||
: rewriteJrDataSystemUrl(rawUri, nextEnvironment),
|
||||
);
|
||||
setIsEnvironmentReady(true);
|
||||
};
|
||||
@@ -79,7 +183,7 @@ export default ({ route }) => {
|
||||
return () => {
|
||||
isMounted = false;
|
||||
};
|
||||
}, [uri]);
|
||||
}, [uri, importRecordingDownloads]);
|
||||
|
||||
const handleReload = () => {
|
||||
lastPongAt.current = Date.now();
|
||||
@@ -90,29 +194,84 @@ export default ({ route }) => {
|
||||
setWebViewKey((k) => k + 1);
|
||||
};
|
||||
|
||||
// AppState監視: バックグラウンド10秒超で復帰したらWebViewを再マウント
|
||||
React.useEffect(() => {
|
||||
const onAppStateChange = (nextState: AppStateStatus) => {
|
||||
if (nextState.match(/inactive|background/)) {
|
||||
backgroundedAt.current = Date.now();
|
||||
} else if (nextState === "active" && backgroundedAt.current !== null) {
|
||||
const elapsed = Date.now() - backgroundedAt.current;
|
||||
backgroundedAt.current = null;
|
||||
if (elapsed > 10_000) {
|
||||
remount();
|
||||
}
|
||||
const syncCanGoBack = React.useCallback((nativeCanGoBack: boolean) => {
|
||||
nativeCanGoBackRef.current = nativeCanGoBack;
|
||||
setCanGoBack(nativeCanGoBack || historyStackRef.current.length > 1);
|
||||
}, []);
|
||||
|
||||
const pushHistoryEntry = React.useCallback((url: string) => {
|
||||
if (!url) return;
|
||||
const stack = historyStackRef.current;
|
||||
if (stack[stack.length - 1] === url) return;
|
||||
stack.push(url);
|
||||
if (stack.length > 30) {
|
||||
stack.splice(0, stack.length - 30);
|
||||
}
|
||||
}, []);
|
||||
|
||||
const handlePseudoBack = React.useCallback(() => {
|
||||
const stack = historyStackRef.current;
|
||||
if (stack.length <= 1) return false;
|
||||
stack.pop();
|
||||
const previousUrl = stack[stack.length - 1];
|
||||
if (!previousUrl) return false;
|
||||
setResolvedUri(previousUrl);
|
||||
syncCanGoBack(false);
|
||||
remount();
|
||||
return true;
|
||||
}, [remount, syncCanGoBack]);
|
||||
|
||||
const handleWebViewBack = React.useCallback(() => {
|
||||
if (nativeCanGoBackRef.current) {
|
||||
webViewRef.current?.goBack();
|
||||
return true;
|
||||
}
|
||||
return handlePseudoBack();
|
||||
}, [handlePseudoBack]);
|
||||
|
||||
const handleImportRecordingText = React.useCallback(
|
||||
async (content: string) => {
|
||||
try {
|
||||
const result = await importRecordingsFromText(content);
|
||||
Alert.alert(
|
||||
"録画データを読み込みました",
|
||||
result.overwrittenCount > 0
|
||||
? `${result.importedCount}件を読み込みました。${result.overwrittenCount}件は同じIDのため上書きしました。`
|
||||
: `${result.importedCount}件を読み込みました。`,
|
||||
);
|
||||
} catch (error) {
|
||||
Alert.alert(
|
||||
"録画データを読み込めませんでした",
|
||||
(error as Error).message || "ファイル内容を確認してください。",
|
||||
);
|
||||
}
|
||||
};
|
||||
const subscription = AppState.addEventListener("change", onAppStateChange);
|
||||
return () => subscription.remove();
|
||||
}, [remount]);
|
||||
},
|
||||
[importRecordingsFromText],
|
||||
);
|
||||
|
||||
const handleImportRecordingUrl = React.useCallback(
|
||||
async (url: string) => {
|
||||
try {
|
||||
const response = await fetch(url);
|
||||
if (!response.ok) {
|
||||
throw new Error(`HTTP ${response.status}`);
|
||||
}
|
||||
await handleImportRecordingText(await response.text());
|
||||
} catch (error) {
|
||||
Alert.alert(
|
||||
"録画データを取得できませんでした",
|
||||
(error as Error).message || "通信状態を確認してください。",
|
||||
);
|
||||
}
|
||||
},
|
||||
[handleImportRecordingText],
|
||||
);
|
||||
|
||||
useFocusEffect(
|
||||
React.useCallback(() => {
|
||||
const onHardwareBack = () => {
|
||||
if (canGoBack) {
|
||||
webViewRef.current?.goBack();
|
||||
return true;
|
||||
if (handleWebViewBack()) return true;
|
||||
}
|
||||
goBack();
|
||||
return true;
|
||||
@@ -120,7 +279,7 @@ export default ({ route }) => {
|
||||
|
||||
const subscription = BackHandler.addEventListener("hardwareBackPress", onHardwareBack);
|
||||
return () => subscription.remove();
|
||||
}, [canGoBack, goBack])
|
||||
}, [canGoBack, goBack, handleWebViewBack])
|
||||
);
|
||||
return (
|
||||
<View style={{ height: "100%", backgroundColor: fixed.primary }}>
|
||||
@@ -130,8 +289,11 @@ export default ({ route }) => {
|
||||
source={{ uri: resolvedUri }}
|
||||
contentMode="mobile"
|
||||
allowsBackForwardNavigationGestures
|
||||
setSupportMultipleWindows={false}
|
||||
ref={webViewRef}
|
||||
injectedJavaScriptBeforeContentLoaded={`true;`}
|
||||
injectedJavaScriptBeforeContentLoaded={
|
||||
importRecordingDownloads ? RECORDING_DOWNLOAD_BRIDGE_SCRIPT : `true;`
|
||||
}
|
||||
onLoadStart={() => {
|
||||
isLoadingRef.current = true;
|
||||
setHasError(false);
|
||||
@@ -173,34 +335,77 @@ export default ({ route }) => {
|
||||
return true;
|
||||
}
|
||||
|
||||
const rewrittenUrl = rewriteJrDataSystemUrl(
|
||||
request.url,
|
||||
selectedEnvironment,
|
||||
);
|
||||
if (rewrittenUrl !== request.url) {
|
||||
setResolvedUri(rewrittenUrl);
|
||||
if (
|
||||
importRecordingDownloads &&
|
||||
isLikelyRecordingDownloadUrl(request.url) &&
|
||||
request.url !== resolvedUri
|
||||
) {
|
||||
void handleImportRecordingUrl(request.url);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!importRecordingDownloads) {
|
||||
const rewrittenUrl = rewriteJrDataSystemUrl(
|
||||
request.url,
|
||||
selectedEnvironment,
|
||||
);
|
||||
if (rewrittenUrl !== request.url) {
|
||||
setResolvedUri(rewrittenUrl);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}}
|
||||
onNavigationStateChange={(navState) => {
|
||||
setCanGoBack(navState.canGoBack);
|
||||
// SPA内遷移中は白画面誤検知を防ぐためblankCountをリセット
|
||||
if (navState.loading) blankCountRef.current = 0;
|
||||
if (navState.url === "https://unyohub.2pd.jp/integration/succeeded.php") {
|
||||
webViewRef.current?.goBack();
|
||||
if (!hasAlerted.current) {
|
||||
hasAlerted.current = true;
|
||||
Alert.alert("鉄道運用HUBへの投稿完了", "運用HUBからのこのアプリへのデータ反映には暫く時間がかかりますので、しばらくお待ちください。", [
|
||||
{ text: "完了" },
|
||||
]);
|
||||
onFileDownload={(event) => {
|
||||
if (!importRecordingDownloads) return;
|
||||
const downloadUrl = event.nativeEvent.downloadUrl;
|
||||
if (downloadUrl) {
|
||||
void handleImportRecordingUrl(downloadUrl);
|
||||
}
|
||||
}
|
||||
}}
|
||||
}}
|
||||
onNavigationStateChange={(navState) => {
|
||||
if (navState.url) {
|
||||
const nextUrl = importRecordingDownloads
|
||||
? navState.url
|
||||
: rewriteJrDataSystemUrl(navState.url, selectedEnvironment);
|
||||
setResolvedUri((current) => (current === nextUrl ? current : nextUrl));
|
||||
if (nextUrl !== "https://unyohub.2pd.jp/integration/succeeded.php") {
|
||||
pushHistoryEntry(nextUrl);
|
||||
}
|
||||
}
|
||||
syncCanGoBack(navState.canGoBack);
|
||||
// SPA内遷移中は白画面誤検知を防ぐためblankCountをリセット
|
||||
if (navState.loading) blankCountRef.current = 0;
|
||||
if (navState.url === "https://unyohub.2pd.jp/integration/succeeded.php") {
|
||||
webViewRef.current?.goBack();
|
||||
if (!hasAlerted.current) {
|
||||
hasAlerted.current = true;
|
||||
Alert.alert("鉄道運用HUBへの投稿完了", "運用HUBからのこのアプリへのデータ反映には暫く時間がかかりますので、しばらくお待ちください。", [
|
||||
{ text: "完了" },
|
||||
]);
|
||||
}
|
||||
}
|
||||
}}
|
||||
onMessage={(event) => {
|
||||
const { data } = event.nativeEvent;
|
||||
const parsed = JSON.parse(data);
|
||||
let parsed: any;
|
||||
try {
|
||||
parsed = JSON.parse(data);
|
||||
} catch {
|
||||
return;
|
||||
}
|
||||
const { type } = parsed;
|
||||
if (type === "importRecordingDownload") {
|
||||
void handleImportRecordingText(String(parsed.text ?? ""));
|
||||
return;
|
||||
}
|
||||
if (type === "importRecordingDownloadError") {
|
||||
Alert.alert(
|
||||
"録画データを取得できませんでした",
|
||||
parsed.message || "ダウンロード内容を読み取れませんでした。",
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (type === "pong") {
|
||||
lastPongAt.current = Date.now();
|
||||
const bodyLen: number = parsed.bodyLen ?? 0;
|
||||
@@ -235,7 +440,7 @@ export default ({ route }) => {
|
||||
})();
|
||||
return;
|
||||
}
|
||||
if (type === "back") return webViewRef.current?.goBack();
|
||||
if (type === "back") return handleWebViewBack();
|
||||
if (type === "windowClose") return goBack();
|
||||
}}
|
||||
/>
|
||||
|
||||
+82
-12
@@ -18,11 +18,12 @@ import Setting from "@/components/Settings/settings";
|
||||
import { useFavoriteStation } from "@/stateBox/useFavoriteStation";
|
||||
import { optionData } from "@/lib/stackOption";
|
||||
import { AllTrainDiagramView } from "@/components/AllTrainDiagramView";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import { useNavigation, useIsFocused } from "@react-navigation/native";
|
||||
import { news } from "@/config/newsUpdate";
|
||||
import { useBottomTabBarHeight } from "@react-navigation/bottom-tabs";
|
||||
import GeneralWebView from "@/GeneralWebView";
|
||||
import { StationDiagramView } from "@/components/StationDiagram/StationDiagramView";
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
const Stack = createStackNavigator();
|
||||
|
||||
export function MenuPage() {
|
||||
@@ -32,18 +33,38 @@ export function MenuPage() {
|
||||
const tabBarHeight = useBottomTabBarHeight();
|
||||
const navigation = useNavigation<any>();
|
||||
const { addListener } = navigation;
|
||||
const isFocused = useIsFocused();
|
||||
const isDark = useColorScheme() === "dark";
|
||||
const bgColor = isDark ? "#1c1c1e" : "#ffffff";
|
||||
useEffect(() => {
|
||||
AS.getItem(STORAGE_KEYS.START_PAGE)
|
||||
.then((res) => {
|
||||
if (res == "true") navigation.navigate("positions");
|
||||
})
|
||||
.catch((e) => {
|
||||
//6.0以降false
|
||||
AS.setItem(STORAGE_KEYS.START_PAGE, "false");
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "topMenu.screen",
|
||||
level: "info",
|
||||
message: "top menu mounted",
|
||||
});
|
||||
return () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "topMenu.screen",
|
||||
level: "info",
|
||||
message: "top menu unmounted",
|
||||
});
|
||||
};
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "topMenu.screen",
|
||||
level: "info",
|
||||
message: isFocused ? "top menu focused" : "top menu blurred",
|
||||
data: {
|
||||
width,
|
||||
height,
|
||||
},
|
||||
});
|
||||
}, [height, isFocused, width]);
|
||||
|
||||
useEffect(() => {
|
||||
//ニュース表示
|
||||
AS.getItem(STORAGE_KEYS.NEWS_STATUS)
|
||||
.then((d) => {
|
||||
@@ -55,10 +76,20 @@ export function MenuPage() {
|
||||
if (isSetIcon == "true") SheetManager.show("TrainIconUpdate");
|
||||
})
|
||||
.catch((error) => logger.error("Error fetching icon setting:", error));
|
||||
|
||||
return undefined;
|
||||
}, []);
|
||||
|
||||
const scrollRef = useRef(null);
|
||||
const [mapMode, setMapMode] = useState(false);
|
||||
useEffect(() => {
|
||||
Sentry.setContext("top_menu_screen", {
|
||||
focused: isFocused,
|
||||
width,
|
||||
height,
|
||||
mapMode,
|
||||
});
|
||||
}, [height, isFocused, mapMode, width]);
|
||||
const [mapHeight, setMapHeight] = useState(0);
|
||||
const mapHeightRef = useRef(0);
|
||||
const favoriteStationRef = useRef(favoriteStation);
|
||||
@@ -85,6 +116,16 @@ export function MenuPage() {
|
||||
}, [height, tabBarHeight, width]);
|
||||
useEffect(() => {
|
||||
const unsubscribe = addListener("tabPress", (e: any) => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "topMenu.screen",
|
||||
level: "info",
|
||||
message: "top menu tabPress handler",
|
||||
data: {
|
||||
focused: navigation.isFocused(),
|
||||
stackIndex: stackNavRef.current?.getState()?.index ?? null,
|
||||
mapMode,
|
||||
},
|
||||
});
|
||||
if (navigation.isFocused() && stackNavRef.current) {
|
||||
if (stackNavRef.current.getState()?.index > 0) {
|
||||
e.preventDefault();
|
||||
@@ -118,10 +159,39 @@ export function MenuPage() {
|
||||
return (
|
||||
<Stack.Navigator
|
||||
id={null}
|
||||
detachInactiveScreens={false}
|
||||
screenOptions={{ cardStyle: { backgroundColor: bgColor } }}
|
||||
screenListeners={({ navigation: stackNav }) => {
|
||||
screenListeners={({ route, navigation: stackNav }) => {
|
||||
stackNavRef.current = stackNav;
|
||||
return {};
|
||||
return {
|
||||
focus: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "topMenu.screen",
|
||||
level: "info",
|
||||
message: "top menu stack focus",
|
||||
data: { route: route.name },
|
||||
});
|
||||
},
|
||||
blur: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "topMenu.screen",
|
||||
level: "info",
|
||||
message: "top menu stack blur",
|
||||
data: { route: route.name },
|
||||
});
|
||||
},
|
||||
state: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "topMenu.screen",
|
||||
level: "info",
|
||||
message: "top menu stack state",
|
||||
data: {
|
||||
route: route.name,
|
||||
stackIndex: stackNav.getState()?.index ?? null,
|
||||
},
|
||||
});
|
||||
},
|
||||
};
|
||||
}}
|
||||
>
|
||||
<Stack.Screen
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React, { useCallback, useEffect, useRef } from "react";
|
||||
import React, { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { createStackNavigator } from "@react-navigation/stack";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import { useIsFocused, useNavigation } from "@react-navigation/native";
|
||||
import { useColorScheme } from "react-native";
|
||||
import Apps from "./components/Apps";
|
||||
import TrainBase from "./components/trainbaseview";
|
||||
@@ -13,16 +13,20 @@ import { useCurrentTrain } from "./stateBox/useCurrentTrain";
|
||||
import { useTrainMenu } from "./stateBox/useTrainMenu";
|
||||
import { AS } from "./storageControl";
|
||||
import { news } from "./config/newsUpdate";
|
||||
import { Linking, Platform } from "react-native";
|
||||
import { InteractionManager, Linking, Platform, View } from "react-native";
|
||||
import GeneralWebView from "./GeneralWebView";
|
||||
import { StationDiagramView } from "@/components/StationDiagram/StationDiagramView";
|
||||
import { positionsStackNavRef } from "./lib/rootNavigation";
|
||||
import { positionsLifecycleRef, positionsStackNavRef } from "./lib/rootNavigation";
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
const Stack = createStackNavigator();
|
||||
export const Top = () => {
|
||||
const { webview } = useCurrentTrain();
|
||||
const { navigate, addListener, isFocused } = useNavigation<any>();
|
||||
const navigation = useNavigation<any>();
|
||||
const { navigate, addListener } = navigation;
|
||||
const isTabFocused = useIsFocused();
|
||||
const isDark = useColorScheme() === "dark";
|
||||
const bgColor = isDark ? "#1c1c1e" : "#ffffff";
|
||||
const [hasActivatedStack, setHasActivatedStack] = useState(false);
|
||||
|
||||
//地図用
|
||||
const { mapSwitch } = useTrainMenu();
|
||||
@@ -31,24 +35,136 @@ export const Top = () => {
|
||||
mapSwitchRef.current = mapSwitch;
|
||||
}, [mapSwitch]);
|
||||
|
||||
const goToFavoriteList = () =>
|
||||
const goToFavoriteList = (event?: any) => {
|
||||
if (!hasActivatedStack) {
|
||||
event?.preventDefault?.();
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions tabLongPress ignored before stack activation",
|
||||
});
|
||||
return;
|
||||
}
|
||||
navigate("positions", { screen: "favoriteList" });
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
const unsubscribe = addListener("tabLongPress", goToFavoriteList);
|
||||
return unsubscribe;
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions stack mounted",
|
||||
});
|
||||
return () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions stack unmounted",
|
||||
});
|
||||
};
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (hasActivatedStack) return;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions stack activation scheduled",
|
||||
data: {
|
||||
reason: isTabFocused ? "first_focus" : "background_prewarm",
|
||||
},
|
||||
});
|
||||
let cancelled = false;
|
||||
const activate = () => {
|
||||
if (cancelled) return;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions stack activation committed",
|
||||
data: {
|
||||
reason: isTabFocused ? "first_focus" : "background_prewarm",
|
||||
},
|
||||
});
|
||||
setHasActivatedStack(true);
|
||||
};
|
||||
|
||||
if (isTabFocused) {
|
||||
const task = InteractionManager.runAfterInteractions(() => {
|
||||
setTimeout(activate, 0);
|
||||
});
|
||||
return () => {
|
||||
cancelled = true;
|
||||
task.cancel?.();
|
||||
};
|
||||
}
|
||||
|
||||
const timer = setTimeout(activate, 300);
|
||||
return () => {
|
||||
cancelled = true;
|
||||
clearTimeout(timer);
|
||||
};
|
||||
}, [hasActivatedStack, isTabFocused]);
|
||||
|
||||
useEffect(() => {
|
||||
Sentry.setContext("positions_stack", {
|
||||
focused: isTabFocused,
|
||||
activated: hasActivatedStack,
|
||||
mapSwitch,
|
||||
});
|
||||
}, [hasActivatedStack, isTabFocused, mapSwitch]);
|
||||
|
||||
const stackNavRef = positionsStackNavRef;
|
||||
|
||||
useEffect(() => {
|
||||
positionsLifecycleRef.current = {
|
||||
...positionsLifecycleRef.current,
|
||||
deactivateStack: null,
|
||||
};
|
||||
return () => {
|
||||
positionsLifecycleRef.current = {
|
||||
...positionsLifecycleRef.current,
|
||||
deactivateStack: null,
|
||||
};
|
||||
};
|
||||
}, []);
|
||||
|
||||
const goToTrainMenu = useCallback((e: any) => {
|
||||
const stackNav = stackNavRef.current;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions tabPress handler",
|
||||
data: {
|
||||
platform: Platform.OS,
|
||||
focused: isTabFocused,
|
||||
mapSwitch: mapSwitchRef.current,
|
||||
stackIndex: stackNav?.getState()?.index ?? null,
|
||||
},
|
||||
});
|
||||
if (Platform.OS === "web") {
|
||||
Linking.openURL("https://train.jr-shikoku.co.jp/");
|
||||
setTimeout(() => navigate("topMenu", { screen: "menu" }), 100);
|
||||
return;
|
||||
}
|
||||
if (!isFocused()) return;
|
||||
const stackNav = stackNavRef.current;
|
||||
if (!hasActivatedStack || !stackNav) {
|
||||
e?.preventDefault?.();
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions tabPress ignored before stack activation",
|
||||
data: {
|
||||
focused: isTabFocused,
|
||||
activated: hasActivatedStack,
|
||||
hasStackNav: !!stackNav,
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!isTabFocused) return;
|
||||
if (stackNav && stackNav.getState()?.index > 0) {
|
||||
e.preventDefault();
|
||||
stackNav.goBack();
|
||||
@@ -58,20 +174,75 @@ export const Top = () => {
|
||||
navigate("positions", { screen: "trainMenu" });
|
||||
else webview.current?.injectJavaScript(`AccordionClassEvent()`);
|
||||
return;
|
||||
}, [isFocused, navigate, webview]);
|
||||
}, [hasActivatedStack, isTabFocused, navigate, webview]);
|
||||
|
||||
useEffect(() => {
|
||||
const unsubscribe = addListener("tabPress", goToTrainMenu);
|
||||
return unsubscribe;
|
||||
}, [addListener, goToTrainMenu]);
|
||||
|
||||
if (!hasActivatedStack) {
|
||||
return <View style={{ flex: 1, backgroundColor: bgColor }} />;
|
||||
}
|
||||
|
||||
return (
|
||||
<Stack.Navigator
|
||||
id={null}
|
||||
detachInactiveScreens={false}
|
||||
screenOptions={{ cardStyle: { backgroundColor: bgColor } }}
|
||||
screenListeners={({ navigation: stackNav }) => {
|
||||
screenListeners={({ route, navigation: stackNav }) => {
|
||||
stackNavRef.current = stackNav;
|
||||
return {};
|
||||
return {
|
||||
focus: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions stack focus",
|
||||
data: { route: route.name },
|
||||
});
|
||||
},
|
||||
blur: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions stack blur",
|
||||
data: { route: route.name },
|
||||
});
|
||||
},
|
||||
transitionStart: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions stack transitionStart",
|
||||
data: {
|
||||
route: route.name,
|
||||
stackIndex: stackNav.getState()?.index ?? null,
|
||||
},
|
||||
});
|
||||
},
|
||||
transitionEnd: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions stack transitionEnd",
|
||||
data: {
|
||||
route: route.name,
|
||||
stackIndex: stackNav.getState()?.index ?? null,
|
||||
},
|
||||
});
|
||||
},
|
||||
state: () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.stack",
|
||||
level: "info",
|
||||
message: "positions stack state",
|
||||
data: {
|
||||
route: route.name,
|
||||
stackIndex: stackNav.getState()?.index ?? null,
|
||||
},
|
||||
});
|
||||
},
|
||||
};
|
||||
}}
|
||||
>
|
||||
<Stack.Screen
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
"android",
|
||||
"web"
|
||||
],
|
||||
"version": "7.0.0",
|
||||
"version": "7.1.0",
|
||||
"userInterfaceStyle": "automatic",
|
||||
"orientation": "default",
|
||||
"icon": "./assets/icons/s8600.png",
|
||||
@@ -24,7 +24,7 @@
|
||||
"**/*"
|
||||
],
|
||||
"ios": {
|
||||
"buildNumber": "63",
|
||||
"buildNumber": "66",
|
||||
"supportsTablet": true,
|
||||
"bundleIdentifier": "jrshikokuinfo.xprocess.hrkn",
|
||||
"appleTeamId": "54CRDT797G",
|
||||
@@ -33,6 +33,8 @@
|
||||
},
|
||||
"infoPlist": {
|
||||
"NFCReaderUsageDescription": "To read FeliCa card",
|
||||
"NSPhotoLibraryUsageDescription": "運行情報画像を共有または保存するために写真ライブラリへのアクセスを使用します。",
|
||||
"NSPhotoLibraryAddUsageDescription": "運行情報画像を写真ライブラリに保存するために使用します。",
|
||||
"com.apple.developer.nfc.readersession.felica.systemcodes": [
|
||||
"0003",
|
||||
"FE00"
|
||||
@@ -55,7 +57,7 @@
|
||||
},
|
||||
"android": {
|
||||
"package": "jrshikokuinfo.xprocess.hrkn",
|
||||
"versionCode": 30,
|
||||
"versionCode": 32,
|
||||
"intentFilters": [
|
||||
{
|
||||
"action": "VIEW",
|
||||
@@ -115,6 +117,7 @@
|
||||
{
|
||||
"fonts": [
|
||||
"./assets/fonts/jr-nishi.otf",
|
||||
"./assets/fonts/JR-WEST-PLUS.otf",
|
||||
"./assets/fonts/DelaGothicOne-Regular.ttf",
|
||||
"./assets/fonts/JNRfont_pict.ttf",
|
||||
"./assets/fonts/DiaPro-Regular.otf"
|
||||
@@ -970,13 +973,29 @@
|
||||
"expo-web-browser",
|
||||
"expo-asset",
|
||||
"expo-sharing",
|
||||
[
|
||||
"react-native-share",
|
||||
{
|
||||
"ios": [],
|
||||
"android": [],
|
||||
"enableBase64ShareAndroid": false
|
||||
}
|
||||
],
|
||||
[
|
||||
"react-native-maps",
|
||||
{
|
||||
"iosGoogleMapsApiKey": "AIzaSyAVGDTjBkR_0wkQiNkoo5WDLhqXCjrjk8Y",
|
||||
"androidGoogleMapsApiKey": "AIzaSyAmFb-Yj033bXZWlSzNrfq_0jc1PgRrWcE"
|
||||
}
|
||||
],
|
||||
[
|
||||
"@sentry/react-native/expo",
|
||||
{
|
||||
"url": "https://sentry.io/",
|
||||
"project": "jr-shikoku-unofficial-apps",
|
||||
"organization": "xprocess-m5"
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,27 @@
|
||||
西日本方向ロゴ拡張「JR-WEST-PLUS」
|
||||
|
||||
2026/07/11 by Mameh1nata
|
||||
|
||||
「回送」とか専用の書体の方がかっこよくね?と思い制作したフォントです
|
||||
現時点で対応している種別は以下の通りです
|
||||
回送 試運転 貸切 修学旅行 救援 配給 訓練 検測 競技 検定 教習
|
||||
|
||||
ver1.0 プライベート公開
|
||||
ver1.01 修学旅行を追加
|
||||
ver1.1 救援 配給 訓練の追加
|
||||
ver1.2 競技 検定 教習の追加
|
||||
|
||||
-注意-
|
||||
・このフォントは西日本方向幕ロゴの制作者とは何の関係もありません
|
||||
・常識の範囲内で使うことをお勧めします(常識の範囲外でも自己責任でお願いします)
|
||||
・文字サイズが多少違ったりするかもしれませんがご了承ください
|
||||
・フォント初制作なのであまりにも致命的なミス以外は許してください
|
||||
|
||||
配布元: https://uu.getuploader.com/mameh1nata_dustbox/download/1
|
||||
|
||||
アプリ同梱版の調整:
|
||||
・JR-Nishi と字面を揃えるため、各グリフの表示領域を 1040 units に正規化
|
||||
・送り幅は 930 units とし、広げた字形の右側はアプリ側で小幅の DiaPro NBSP を付加して保護
|
||||
・縦の表示領域を 836 units、ベースラインを -86〜750 に正規化
|
||||
・フォント全体の ascender / descender を JR-Nishi と同じ 781 / -118 に調整
|
||||
・文字コードと内部フォント名は元ファイルから維持
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { FC, useMemo, useState } from "react";
|
||||
import React, { FC, useMemo } from "react";
|
||||
import { Text, View, TextStyle, TouchableOpacity } from "react-native";
|
||||
import { SheetManager } from "react-native-actions-sheet";
|
||||
import { migrateTrainName } from "../../../lib/eachTrainInfoCoreLib/migrateTrainName";
|
||||
@@ -16,7 +16,9 @@ import type { NavigateFunction } from "@/types";
|
||||
import { useUnyohub } from "@/stateBox/useUnyohub";
|
||||
import { useElesite } from "@/stateBox/useElesite";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
import { formatWrappedTrainType, shouldWrapTrainType } from "@/lib/trainTypeWrap";
|
||||
import { useResponsive } from "@/lib/responsive";
|
||||
import { normalizeIconDisplayMode } from "@/lib/iconDisplayMode";
|
||||
|
||||
type Props = {
|
||||
data: { trainNum: string; limited: string };
|
||||
@@ -47,11 +49,11 @@ export const HeaderText: FC<Props> = ({
|
||||
from,
|
||||
scrollRef,
|
||||
}) => {
|
||||
const { limited, trainNum } = data;
|
||||
const { trainNum } = data;
|
||||
|
||||
const { fixed } = useThemeColors();
|
||||
const { fontScale } = useResponsive();
|
||||
const { updatePermission } = useTrainMenu();
|
||||
const { iconSetting } = useTrainMenu();
|
||||
const { allCustomTrainData, getTodayOperationByTrainId } =
|
||||
useAllTrainDiagram();
|
||||
const { expoPushToken } = useNotification();
|
||||
@@ -63,19 +65,18 @@ export const HeaderText: FC<Props> = ({
|
||||
} = useUnyohub();
|
||||
const { getElesiteEntriesByTrainNumber, useElesite: elesiteEnabled } =
|
||||
useElesite();
|
||||
const iconDisplayMode = normalizeIconDisplayMode(iconSetting);
|
||||
|
||||
// 追加ソースのON/OFFをここで管理(将来ソースが増えたらここに足す)
|
||||
const additionalSources = {
|
||||
unyohub: unyohubEnabled,
|
||||
elesite: elesiteEnabled,
|
||||
};
|
||||
const hasAdditionalSources = Object.values(additionalSources).some(Boolean);
|
||||
|
||||
// 列車名、種別、フォントの取得
|
||||
const [
|
||||
typeName,
|
||||
trainName,
|
||||
fontAvailable,
|
||||
fontFamily,
|
||||
isOneMan,
|
||||
infogram,
|
||||
priority,
|
||||
@@ -96,7 +97,7 @@ export const HeaderText: FC<Props> = ({
|
||||
to_data,
|
||||
directions,
|
||||
} = result;
|
||||
const [typeString, fontAvailable, isOneMan] = getStringConfig(
|
||||
const [typeString, fontFamily, isOneMan] = getStringConfig(
|
||||
type,
|
||||
trainNum,
|
||||
);
|
||||
@@ -108,7 +109,7 @@ export const HeaderText: FC<Props> = ({
|
||||
(train_num_distance !== "" && !isNaN(parseInt(train_num_distance))
|
||||
? ` ${parseInt(trainNum) - parseInt(train_num_distance)}号`
|
||||
: ""),
|
||||
fontAvailable,
|
||||
fontFamily,
|
||||
isOneMan,
|
||||
infogram,
|
||||
priority,
|
||||
@@ -121,7 +122,7 @@ export const HeaderText: FC<Props> = ({
|
||||
return [
|
||||
typeString,
|
||||
"",
|
||||
fontAvailable,
|
||||
fontFamily,
|
||||
isOneMan,
|
||||
infogram,
|
||||
priority,
|
||||
@@ -133,8 +134,8 @@ export const HeaderText: FC<Props> = ({
|
||||
case to_data && to_data !== "":
|
||||
return [
|
||||
typeString,
|
||||
to_data + "行き",
|
||||
fontAvailable,
|
||||
`${to_data}行き`,
|
||||
fontFamily,
|
||||
isOneMan,
|
||||
infogram,
|
||||
priority,
|
||||
@@ -147,9 +148,9 @@ export const HeaderText: FC<Props> = ({
|
||||
return [
|
||||
typeString,
|
||||
migrateTrainName(
|
||||
trainData[trainData.length - 1].split(",")[0] + "行き",
|
||||
`${trainData[trainData.length - 1].split(",")[0]}行き`,
|
||||
),
|
||||
fontAvailable,
|
||||
fontFamily,
|
||||
isOneMan,
|
||||
infogram,
|
||||
priority,
|
||||
@@ -161,7 +162,7 @@ export const HeaderText: FC<Props> = ({
|
||||
}
|
||||
}, [trainData, trainNum, allCustomTrainData]);
|
||||
|
||||
const allTodayOperation = getTodayOperationByTrainId(trainNum);
|
||||
const allTodayOperation = getTodayOperationByTrainId(trainNum) ?? [];
|
||||
const todayOperation = allTodayOperation.filter((d) => d.state !== 100);
|
||||
|
||||
let iconTrainDirection =
|
||||
@@ -198,7 +199,6 @@ export const HeaderText: FC<Props> = ({
|
||||
: getUnyohubEntriesByTrainNumber(unyohubTrainNumForSourceScreen);
|
||||
const elesiteEntries = getElesiteEntriesByTrainNumber(trainNum);
|
||||
|
||||
// 車番(formations) がある場合のみ「運用Hub情報あり」と判定
|
||||
const hasUnyohubFormation = unyohubEntries.some(
|
||||
(e) => !!e.formations && e.formations.trim() !== "",
|
||||
);
|
||||
@@ -208,11 +208,20 @@ export const HeaderText: FC<Props> = ({
|
||||
|
||||
const hasExtraInfo =
|
||||
priority > 200 ||
|
||||
todayOperation?.length > 0 ||
|
||||
todayOperation.length > 0 ||
|
||||
hasUnyohubFormation ||
|
||||
hasElesiteFormation;
|
||||
|
||||
const [isWrapped, setIsWrapped] = useState(false);
|
||||
const wrapType = shouldWrapTrainType(typeName, trainName);
|
||||
|
||||
const openTrainInfoUrl = () => {
|
||||
if (!trainInfoUrl) return;
|
||||
const uri = trainInfoUrl.includes("pdf")
|
||||
? getPDFViewURL(trainInfoUrl)
|
||||
: trainInfoUrl;
|
||||
navigate("generalWebView", { uri, useExitButton: true });
|
||||
SheetManager.hide("EachTrainInfo");
|
||||
};
|
||||
|
||||
return (
|
||||
<View
|
||||
@@ -232,6 +241,7 @@ export const HeaderText: FC<Props> = ({
|
||||
from={from}
|
||||
todayOperation={todayOperation}
|
||||
direction={iconTrainDirection}
|
||||
iconDisplayMode={iconDisplayMode}
|
||||
/>
|
||||
|
||||
<View
|
||||
@@ -242,15 +252,23 @@ export const HeaderText: FC<Props> = ({
|
||||
}}
|
||||
>
|
||||
<Text
|
||||
numberOfLines={wrapType ? 2 : 1}
|
||||
style={{
|
||||
fontSize: fontScale(20),
|
||||
color: fixed.textOnPrimary,
|
||||
fontFamily: fontAvailable ? "JR-Nishi" : undefined,
|
||||
fontWeight: !fontAvailable ? "bold" : undefined,
|
||||
fontFamily,
|
||||
fontWeight: fontFamily ? undefined : "bold",
|
||||
marginRight: 5,
|
||||
flexShrink: 0,
|
||||
...(wrapType
|
||||
? { width: fontScale(44), lineHeight: fontScale(22) }
|
||||
: {}),
|
||||
}}
|
||||
>
|
||||
{isWrapped ? typeName.replace(/(.{2})/g, "$1\n").trim() : typeName}
|
||||
{wrapType ? formatWrappedTrainType(typeName) : typeName}
|
||||
{fontFamily === "JR-WEST-PLUS" ? (
|
||||
<Text style={{ fontFamily: "DiaPro", fontSize: 7 }}>{"\u00A0"}</Text>
|
||||
) : null}
|
||||
</Text>
|
||||
{isOneMan && <OneManText />}
|
||||
</View>
|
||||
@@ -270,26 +288,18 @@ export const HeaderText: FC<Props> = ({
|
||||
}
|
||||
: {}),
|
||||
}}
|
||||
onPress={() => {
|
||||
if (!trainInfoUrl) return;
|
||||
const uri = trainInfoUrl.includes("pdf")
|
||||
? getPDFViewURL(trainInfoUrl)
|
||||
: trainInfoUrl;
|
||||
navigate("generalWebView", { uri, useExitButton: true });
|
||||
SheetManager.hide("EachTrainInfo");
|
||||
}}
|
||||
onPress={openTrainInfoUrl}
|
||||
disabled={!trainInfoUrl}
|
||||
>
|
||||
<Text
|
||||
style={{
|
||||
...textConfig,
|
||||
color: fixed.textOnPrimary,
|
||||
...(trainName.length > 10 ? { fontSize: fontScale(16) } : { fontSize: fontScale(17) }),
|
||||
...(trainName.length > 10
|
||||
? { fontSize: fontScale(16) }
|
||||
: { fontSize: fontScale(17) }),
|
||||
flexShrink: 1,
|
||||
}}
|
||||
onTextLayout={(e) => {
|
||||
if (e.nativeEvent.lines.length > 1) setIsWrapped(true);
|
||||
}}
|
||||
>
|
||||
{trainName}
|
||||
</Text>
|
||||
@@ -328,7 +338,6 @@ export const HeaderText: FC<Props> = ({
|
||||
},
|
||||
});
|
||||
} else {
|
||||
// 追加ソースが全てオフ → 元の挙動(直接 DB ページを開く)
|
||||
const uri = `https://jr-shikoku-data-system.pages.dev/trainData/${trainNum}?userID=${expoPushToken}&from=eachTrainInfo`;
|
||||
navigate("generalWebView", { uri, useExitButton: false });
|
||||
SheetManager.hide("EachTrainInfo");
|
||||
|
||||
@@ -3,13 +3,14 @@ import { Text } from "react-native";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
type props = {
|
||||
infogram: string;
|
||||
fontSize?: number;
|
||||
}
|
||||
export const InfogramText: FC<props> = ({infogram}) => {
|
||||
export const InfogramText: FC<props> = ({infogram, fontSize = 20}) => {
|
||||
const { fixed } = useThemeColors();
|
||||
return (
|
||||
<Text
|
||||
style={{
|
||||
fontSize: 20,
|
||||
fontSize,
|
||||
color: fixed.textOnPrimary,
|
||||
fontFamily: "JNR-font",
|
||||
}}
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
import React, { ComponentProps, FC } from "react";
|
||||
import { Image, TouchableOpacity, View } from "react-native";
|
||||
import { Ionicons } from "@expo/vector-icons";
|
||||
import type { TrainIconEntry } from "@/lib/trainIconEntries";
|
||||
|
||||
type StackVariant = "header" | "list";
|
||||
type StatusIcon = ComponentProps<typeof Ionicons>;
|
||||
|
||||
type Props = {
|
||||
entries: TrainIconEntry[];
|
||||
direction?: boolean;
|
||||
hidden?: boolean;
|
||||
onPressEntry?: (entry: TrainIconEntry, index: number) => void;
|
||||
statusIcon?: StatusIcon;
|
||||
variant?: StackVariant;
|
||||
};
|
||||
|
||||
const iconSize = {
|
||||
header: {
|
||||
width: 24,
|
||||
height: 30,
|
||||
stackedWidth: 12,
|
||||
stackedHeight: 15,
|
||||
marginRight: 5,
|
||||
stackedMarginLeft: -10,
|
||||
stackedMarginTop: 10,
|
||||
statusSize: 24,
|
||||
},
|
||||
list: {
|
||||
width: 20,
|
||||
height: 22,
|
||||
stackedWidth: 10,
|
||||
stackedHeight: 12,
|
||||
marginRight: 2,
|
||||
stackedMarginLeft: -8,
|
||||
stackedMarginTop: 8,
|
||||
statusSize: 18,
|
||||
},
|
||||
} as const;
|
||||
|
||||
export const TrainIconStack: FC<Props> = ({
|
||||
entries,
|
||||
direction,
|
||||
hidden = false,
|
||||
onPressEntry,
|
||||
statusIcon,
|
||||
variant = "header",
|
||||
}) => {
|
||||
const size = iconSize[variant];
|
||||
|
||||
return (
|
||||
<View style={{ flexDirection: "row", alignItems: "flex-start" }}>
|
||||
{entries.map((entry, index) => {
|
||||
const trainIcon = direction
|
||||
? entry.vehicle_info_img
|
||||
: entry.vehicle_info_right_img || entry.vehicle_info_img;
|
||||
if (!trainIcon) return null;
|
||||
|
||||
const content = (
|
||||
<View>
|
||||
<View style={{ opacity: hidden ? 0 : 1 }}>
|
||||
<Image
|
||||
source={{ uri: trainIcon }}
|
||||
style={{
|
||||
height: index > 0 ? size.stackedHeight : size.height,
|
||||
width: index > 0 ? size.stackedWidth : size.width,
|
||||
marginRight: size.marginRight,
|
||||
marginLeft: index > 0 ? size.stackedMarginLeft : 0,
|
||||
marginTop: index > 0 ? size.stackedMarginTop : 0,
|
||||
}}
|
||||
resizeMethod="resize"
|
||||
/>
|
||||
</View>
|
||||
{statusIcon && hidden && (
|
||||
<View style={{ position: "absolute", top: 0, left: 0 }}>
|
||||
<Ionicons {...statusIcon} size={size.statusSize} />
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
);
|
||||
|
||||
if (!onPressEntry) {
|
||||
return <View key={`${trainIcon}-${index}`}>{content}</View>;
|
||||
}
|
||||
|
||||
return (
|
||||
<TouchableOpacity
|
||||
key={`${trainIcon}-${index}`}
|
||||
onPress={() => onPressEntry(entry, index)}
|
||||
disabled={!entry.vehicle_info_url}
|
||||
>
|
||||
{content}
|
||||
</TouchableOpacity>
|
||||
);
|
||||
})}
|
||||
</View>
|
||||
);
|
||||
};
|
||||
@@ -1,11 +1,12 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import { lineListPair, stationIDPair } from '@/lib/getStationList';
|
||||
import { useStationList } from '@/stateBox/useStationList';
|
||||
import { OriginalStationList } from '@/lib/CommonTypes';
|
||||
|
||||
const computeThroughStations = (
|
||||
trainData: string[],
|
||||
stationList: any[][],
|
||||
originalStationList: Record<string, any[]>
|
||||
originalStationList: OriginalStationList
|
||||
): { trainDataWithThrough: string[]; haveThrough: boolean } => {
|
||||
if (!trainData.length) return { trainDataWithThrough: [], haveThrough: false };
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import React, { ComponentProps, FC, useEffect, useState } from "react";
|
||||
import { View, Image, TouchableOpacity } from "react-native";
|
||||
import React, { ComponentProps, FC, useEffect, useMemo, useState } from "react";
|
||||
import { Ionicons } from "@expo/vector-icons";
|
||||
import dayjs from "dayjs";
|
||||
import { SheetManager } from "react-native-actions-sheet";
|
||||
@@ -8,6 +7,9 @@ import { useAllTrainDiagram } from "@/stateBox/useAllTrainDiagram";
|
||||
import { useInterval } from "@/lib/useInterval";
|
||||
import type { NavigateFunction } from "@/types";
|
||||
import { OperationLogs } from "@/lib/CommonTypes";
|
||||
import type { IconDisplayMode } from "@/lib/iconDisplayMode";
|
||||
import { resolveTrainIconEntries } from "@/lib/trainIconEntries";
|
||||
import { TrainIconStack } from "./TrainIconStack";
|
||||
|
||||
type GlyphNames = ComponentProps<typeof Ionicons>["name"];
|
||||
|
||||
@@ -17,94 +19,54 @@ type Props = {
|
||||
from: string;
|
||||
todayOperation: OperationLogs[];
|
||||
direction?: boolean;
|
||||
iconDisplayMode: IconDisplayMode;
|
||||
};
|
||||
type apt = {
|
||||
name: GlyphNames;
|
||||
color: string;
|
||||
};
|
||||
export const TrainIconStatus: FC<Props> = (props) => {
|
||||
const { data, navigate, from, todayOperation, direction } = props;
|
||||
const {
|
||||
data,
|
||||
navigate,
|
||||
from,
|
||||
todayOperation,
|
||||
direction,
|
||||
iconDisplayMode,
|
||||
} = props;
|
||||
const [anpanmanStatus, setAnpanmanStatus] = useState<apt>();
|
||||
const { allCustomTrainData } = useAllTrainDiagram();
|
||||
const [trainIconData, setTrainIcon] = useState<
|
||||
{ vehicle_info_img: string;vehicle_info_right_img: string; vehicle_info_url: string }[]
|
||||
>([]);
|
||||
const customTrainData = useMemo(
|
||||
() => customTrainDataDetector(data.trainNum, allCustomTrainData),
|
||||
[data.trainNum, allCustomTrainData],
|
||||
);
|
||||
const trainIconData = useMemo(
|
||||
() =>
|
||||
data.trainNum
|
||||
? resolveTrainIconEntries({
|
||||
trainNum: data.trainNum,
|
||||
customTrainData,
|
||||
todayOperation,
|
||||
iconDisplayMode,
|
||||
})
|
||||
: [],
|
||||
[data.trainNum, customTrainData, todayOperation, iconDisplayMode],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (!data.trainNum) return;
|
||||
const { train_info_img: vehicle_info_img, vehicle_info_url } =
|
||||
customTrainDataDetector(data.trainNum, allCustomTrainData);
|
||||
if (todayOperation.length !== 0) {
|
||||
const returnData =
|
||||
todayOperation
|
||||
.sort((a, b) => {
|
||||
// trainIdからカンマ以降の数字を抽出する関数
|
||||
const extractOrderNumber = (trainId: string): number => {
|
||||
const parts = trainId.split(',');
|
||||
if (parts.length > 1) {
|
||||
const num = parseInt(parts[1].trim(), 10);
|
||||
return isNaN(num) ? Infinity : num;
|
||||
}
|
||||
return Infinity; // カンマなし = 末尾に移動
|
||||
};
|
||||
|
||||
// data.trainNumと一致するtrainIdを探す関数
|
||||
const findMatchingTrainId = (operation: OperationLogs): string | null => {
|
||||
const allTrainIds = [
|
||||
...(operation.train_ids || []),
|
||||
...(operation.related_train_ids || []),
|
||||
];
|
||||
|
||||
// data.trainNumの接頭辞と一致するものを探す
|
||||
for (const trainId of allTrainIds) {
|
||||
const prefix = trainId.split(',')[0]; // カンマ前の部分
|
||||
if (prefix === data.trainNum) {
|
||||
return trainId;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
const aTrainId = findMatchingTrainId(a);
|
||||
const bTrainId = findMatchingTrainId(b);
|
||||
|
||||
// マッチしたものがない場合は元の順序を保持
|
||||
if (!aTrainId || !bTrainId) {
|
||||
return aTrainId ? -1 : bTrainId ? 1 : 0;
|
||||
}
|
||||
|
||||
const aOrder = extractOrderNumber(aTrainId);
|
||||
const bOrder = extractOrderNumber(bTrainId);
|
||||
|
||||
return aOrder - bOrder;
|
||||
})
|
||||
.map((op) => ({
|
||||
vehicle_info_img: op.vehicle_img || vehicle_info_img,
|
||||
vehicle_info_right_img: op.vehicle_img_right || op.vehicle_img || vehicle_info_img,
|
||||
vehicle_info_url: op.vehicle_info_url,
|
||||
})) || [];
|
||||
setTrainIcon(returnData);
|
||||
} else if (vehicle_info_img) {
|
||||
setTrainIcon([{ vehicle_info_img, vehicle_info_right_img: vehicle_info_img, vehicle_info_url }]);
|
||||
}
|
||||
|
||||
// アンパンマンステータスAPIのエンドポイント判定
|
||||
let anpanmanApiPath: string | null = null;
|
||||
switch (data.trainNum) {
|
||||
// 予讃線 → yosan-anpanman
|
||||
// しおかぜ 8000 アンパン
|
||||
case "10M":
|
||||
case "22M":
|
||||
case "9M":
|
||||
case "21M":
|
||||
// いしづち 8000 アンパン
|
||||
case "1010M":
|
||||
case "1022M":
|
||||
case "1009M":
|
||||
case "1021M":
|
||||
// いしづち 三桁 アンパン
|
||||
case "1041M":
|
||||
case "1044M":
|
||||
// 宇和海 2000 アンパン
|
||||
case "1058D":
|
||||
case "1066D":
|
||||
case "1074D":
|
||||
@@ -113,8 +75,6 @@ export const TrainIconStatus: FC<Props> = (props) => {
|
||||
case "1067D":
|
||||
anpanmanApiPath = "yosan-anpanman";
|
||||
break;
|
||||
// 土讃線 → dosan-anpanman
|
||||
// 南風 2700 アンパン
|
||||
case "32D":
|
||||
case "36D":
|
||||
case "44D":
|
||||
@@ -132,12 +92,12 @@ export const TrainIconStatus: FC<Props> = (props) => {
|
||||
fetch(
|
||||
`https://n8n.haruk.in/webhook/${anpanmanApiPath}?trainNum=${
|
||||
data.trainNum
|
||||
}&month=${dayjs().format("M")}&day=${dayjs().format("D")}`,{ cache: "no-store" }
|
||||
}&month=${dayjs().format("M")}&day=${dayjs().format("D")}`,
|
||||
{ cache: "no-store" },
|
||||
)
|
||||
.then((d) => d.json())
|
||||
.then((d) => {
|
||||
if (d.trainStatus == "〇" || d.trainStatus == "○") {
|
||||
//setAnpanmanStatus({name:"checkmark-circle-outline",color:"blue"});
|
||||
} else if (d.trainStatus == "▲") {
|
||||
setAnpanmanStatus({ name: "warning-outline", color: "yellow" });
|
||||
} else if (d.trainStatus == "×") {
|
||||
@@ -146,11 +106,8 @@ export const TrainIconStatus: FC<Props> = (props) => {
|
||||
})
|
||||
.catch(() => {});
|
||||
}
|
||||
}, [data.trainNum, allCustomTrainData, todayOperation]);
|
||||
}, [data.trainNum, allCustomTrainData, todayOperation, iconDisplayMode]);
|
||||
|
||||
// JSスレッドでの点滅(useInterval + useState)
|
||||
// reanimated の withRepeat はUIスレッドで毎フレーム更新し続けるため
|
||||
// ActionSheetのスプリングアニメーションと競合する
|
||||
const [showIcon, setShowIcon] = useState(false);
|
||||
useInterval(() => {
|
||||
if (anpanmanStatus) {
|
||||
@@ -159,47 +116,18 @@ export const TrainIconStatus: FC<Props> = (props) => {
|
||||
}, 1000, !!anpanmanStatus);
|
||||
|
||||
return (
|
||||
<>
|
||||
{trainIconData.map(
|
||||
({ vehicle_info_img: trainIcon, vehicle_info_right_img: trainIconRight, vehicle_info_url: address }, index) => (
|
||||
<TouchableOpacity
|
||||
key={`${trainIcon}-${index}`}
|
||||
onPress={() => {
|
||||
navigate("howto", {
|
||||
info: address,
|
||||
goTo: from == "LED" ? "menu" : from,
|
||||
});
|
||||
SheetManager.hide("EachTrainInfo");
|
||||
}}
|
||||
disabled={!address}
|
||||
>
|
||||
<View>
|
||||
<View style={{ opacity: anpanmanStatus && showIcon ? 0 : 1 }}>
|
||||
<Image
|
||||
source={{ uri: direction ? trainIcon : trainIconRight || trainIcon }}
|
||||
style={{
|
||||
height: index > 0 ? 15 : 30,
|
||||
width: index > 0 ? 12 : 24,
|
||||
marginRight: 5,
|
||||
marginLeft: index > 0 ? -10 : 0,
|
||||
marginTop: index > 0 ? 10 : 0,
|
||||
}}
|
||||
resizeMethod="resize"
|
||||
/>
|
||||
</View>
|
||||
{anpanmanStatus && showIcon && (
|
||||
<View style={{ position: "absolute", top: 0, left: 0 }}>
|
||||
<Ionicons
|
||||
{...anpanmanStatus}
|
||||
size={24}
|
||||
style={{ marginRight: 5 }}
|
||||
/>
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
)
|
||||
)}
|
||||
</>
|
||||
<TrainIconStack
|
||||
entries={trainIconData}
|
||||
direction={direction}
|
||||
hidden={!!anpanmanStatus && showIcon}
|
||||
statusIcon={anpanmanStatus}
|
||||
onPressEntry={(entry) => {
|
||||
navigate("howto", {
|
||||
info: entry.vehicle_info_url,
|
||||
goTo: from == "LED" ? "menu" : from,
|
||||
});
|
||||
SheetManager.hide("EachTrainInfo");
|
||||
}}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -48,7 +48,9 @@ export const StationDeteilView = (props) => {
|
||||
|
||||
const [usePDFView, setUsePDFView] = useState(undefined);
|
||||
useEffect(() => {
|
||||
AS.getItem(STORAGE_KEYS.USE_PDF_VIEW).then(setUsePDFView);
|
||||
AS.getItem(STORAGE_KEYS.USE_PDF_VIEW)
|
||||
.then(setUsePDFView)
|
||||
.catch(() => setUsePDFView("false"));
|
||||
}, []);
|
||||
const info =
|
||||
currentStation &&
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { FC, useState, useEffect, useRef } from "react";
|
||||
import React, { FC, useState, useEffect, useMemo, useRef } from "react";
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
@@ -21,7 +21,10 @@ import type { UnyohubData, ElesiteData } from "@/types/unyohub";
|
||||
import { useUnyohub } from "@/stateBox/useUnyohub";
|
||||
import { useElesite } from "@/stateBox/useElesite";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
import { sortElesiteEntriesByTrainNumber } from "@/lib/elesiteTrainOrder";
|
||||
import {
|
||||
buildElesiteLineGroups,
|
||||
type ElesiteLineGroup,
|
||||
} from "@/lib/elesiteTrainOrder";
|
||||
import ViewShot from "react-native-view-shot";
|
||||
import * as Sharing from "expo-sharing";
|
||||
|
||||
@@ -230,6 +233,80 @@ const ActiveFormationChipsCycler: FC<{ items: string[]; color: string }> = ({ it
|
||||
);
|
||||
};
|
||||
|
||||
const ElesiteLineGroupCycler: FC<{
|
||||
groups: ElesiteLineGroup[];
|
||||
color: string;
|
||||
onActiveGroupChange?: (group: ElesiteLineGroup | null) => void;
|
||||
}> = ({ groups, color, onActiveGroupChange }) => {
|
||||
const { colors } = useThemeColors();
|
||||
const [index, setIndex] = useState(0);
|
||||
const opacity = useRef(new Animated.Value(1)).current;
|
||||
|
||||
useEffect(() => {
|
||||
if (groups.length === 0) {
|
||||
onActiveGroupChange?.(null);
|
||||
return;
|
||||
}
|
||||
|
||||
if (index >= groups.length) {
|
||||
setIndex(0);
|
||||
return;
|
||||
}
|
||||
|
||||
onActiveGroupChange?.(groups[index]);
|
||||
}, [groups, index, onActiveGroupChange]);
|
||||
|
||||
useEffect(() => {
|
||||
if (groups.length <= 1) return;
|
||||
|
||||
const timer = setInterval(() => {
|
||||
Animated.timing(opacity, {
|
||||
toValue: 0,
|
||||
duration: 250,
|
||||
useNativeDriver: true,
|
||||
}).start(() => {
|
||||
setIndex((prev) => (prev + 1) % groups.length);
|
||||
Animated.timing(opacity, {
|
||||
toValue: 1,
|
||||
duration: 250,
|
||||
useNativeDriver: true,
|
||||
}).start();
|
||||
});
|
||||
}, 3000);
|
||||
|
||||
return () => clearInterval(timer);
|
||||
}, [groups.length]);
|
||||
|
||||
const group = groups[index];
|
||||
if (!group) return null;
|
||||
|
||||
return (
|
||||
<Animated.View style={{ opacity }}>
|
||||
{group.formationText ? (
|
||||
<View style={styles.elesiteFormationWrap}>
|
||||
<FormationChips text={group.formationText} color={color} />
|
||||
</View>
|
||||
) : (
|
||||
<Text style={[styles.subText, { color: colors.textSecondary }]}>
|
||||
本日の運用報告なし
|
||||
</Text>
|
||||
)}
|
||||
{(group.leftStation || group.rightStation || group.lineLabel) && (
|
||||
<RefDirectionBanner
|
||||
rows={[
|
||||
{
|
||||
leftLabel: group.leftStation ?? undefined,
|
||||
lineLabel: group.lineLabel ?? undefined,
|
||||
rightLabel: group.rightStation ?? undefined,
|
||||
},
|
||||
]}
|
||||
color={color}
|
||||
/>
|
||||
)}
|
||||
</Animated.View>
|
||||
);
|
||||
};
|
||||
|
||||
export const TrainDataSources: FC<{ payload?: TrainDataSourcesPayload }> = ({
|
||||
payload,
|
||||
}) => {
|
||||
@@ -338,8 +415,34 @@ export const TrainDataSources: FC<{ payload?: TrainDataSourcesPayload }> = ({
|
||||
const opCount = todayOperation.length;
|
||||
const unyoCount = unyohubEntries.length;
|
||||
const elesiteCount = elesiteEntries.length;
|
||||
const elesiteLineGroups = useMemo(
|
||||
() => buildElesiteLineGroups(elesiteEntries, trainNum),
|
||||
[elesiteEntries, trainNum],
|
||||
);
|
||||
const elesiteDisplayGroups = useMemo(
|
||||
() =>
|
||||
elesiteLineGroups.some((group) => group.hasFormations)
|
||||
? elesiteLineGroups.filter((group) => group.hasFormations)
|
||||
: elesiteLineGroups,
|
||||
[elesiteLineGroups],
|
||||
);
|
||||
const [activeElesiteGroupKey, setActiveElesiteGroupKey] = useState<string | null>(null);
|
||||
const hasTrainInfo = priority > 200;
|
||||
|
||||
useEffect(() => {
|
||||
if (elesiteDisplayGroups.length === 0) {
|
||||
setActiveElesiteGroupKey(null);
|
||||
return;
|
||||
}
|
||||
|
||||
if (
|
||||
!activeElesiteGroupKey ||
|
||||
!elesiteDisplayGroups.some((group) => group.key === activeElesiteGroupKey)
|
||||
) {
|
||||
setActiveElesiteGroupKey(elesiteDisplayGroups[0].key);
|
||||
}
|
||||
}, [activeElesiteGroupKey, elesiteDisplayGroups]);
|
||||
|
||||
// 運用情報: train_ids / related_train_ids の位置番号でソートして unit_ids を収集
|
||||
// "4565M,2" のようなカンマ区切り位置番号を解析
|
||||
// 上り(resolvedDirection=true)=ASC, 下り(false)=DESC
|
||||
@@ -529,36 +632,25 @@ export const TrainDataSources: FC<{ payload?: TrainDataSourcesPayload }> = ({
|
||||
</View>
|
||||
);
|
||||
|
||||
// えれサイト最終投稿時刻(last_reported_at が最新のエントリ)
|
||||
const elesiteLastReportedAt =
|
||||
elesiteEntries
|
||||
.map((e) => e.report_info?.last_reported_at)
|
||||
.filter((d): d is string => !!d)
|
||||
.sort()
|
||||
.at(-1) ?? null;
|
||||
|
||||
// えれサイト: units が1件以上あるエントリのみ「データあり」と判定
|
||||
const elesiteHasNonEmptyFormations = elesiteEntries.some(
|
||||
(e) => (e.formation_config?.units?.length ?? 0) > 0,
|
||||
const elesiteHasNonEmptyFormations = elesiteDisplayGroups.some(
|
||||
(group) => group.hasFormations,
|
||||
);
|
||||
const elesiteNonEmptyFormationEntries = sortElesiteEntriesByTrainNumber(
|
||||
elesiteEntries.filter((e) => (e.formation_config?.units?.length ?? 0) > 0),
|
||||
trainNum,
|
||||
);
|
||||
// えれサイト: 編成名テキスト(formation_config.units 優先)
|
||||
const elesiteFormationNames =
|
||||
elesiteNonEmptyFormationEntries
|
||||
.slice(0, 4)
|
||||
.map((e) => {
|
||||
const units = e.formation_config?.units;
|
||||
return units?.length
|
||||
? units.map((u) => u.formation).join("+")
|
||||
: e.formations;
|
||||
})
|
||||
.join("・") +
|
||||
(elesiteNonEmptyFormationEntries.length > 4
|
||||
? ` 他${elesiteNonEmptyFormationEntries.length - 4}件`
|
||||
: "");
|
||||
const activeElesiteGroup =
|
||||
elesiteDisplayGroups.find((group) => group.key === activeElesiteGroupKey) ??
|
||||
elesiteDisplayGroups[0] ??
|
||||
null;
|
||||
const activeElesiteGroupIndex = activeElesiteGroup
|
||||
? elesiteDisplayGroups.findIndex((group) => group.key === activeElesiteGroup.key)
|
||||
: 0;
|
||||
const elesiteBadgeCount = elesiteHasNonEmptyFormations
|
||||
? elesiteDisplayGroups.length
|
||||
: null;
|
||||
const activeElesiteGroupLabel =
|
||||
activeElesiteGroup?.lineLabel ||
|
||||
[activeElesiteGroup?.leftStation, activeElesiteGroup?.rightStation]
|
||||
.filter(Boolean)
|
||||
.join("〜") ||
|
||||
null;
|
||||
|
||||
// 列車情報 subテキスト
|
||||
const trainInfoSub = customTrainData?.vehicle_formation
|
||||
@@ -579,23 +671,15 @@ export const TrainDataSources: FC<{ payload?: TrainDataSourcesPayload }> = ({
|
||||
|
||||
const elesiteFormationDetail = (
|
||||
<View style={styles.operationDetailBlock}>
|
||||
{elesiteHasNonEmptyFormations && (
|
||||
<Text style={styles.unitIdText}>{elesiteFormationNames}</Text>
|
||||
{elesiteDisplayGroups.length > 0 && (
|
||||
<ElesiteLineGroupCycler
|
||||
groups={elesiteDisplayGroups}
|
||||
color="#44bb44"
|
||||
onActiveGroupChange={(group) =>
|
||||
setActiveElesiteGroupKey(group?.key ?? null)
|
||||
}
|
||||
/>
|
||||
)}
|
||||
{elesiteCount > 0
|
||||
? (() => {
|
||||
const fc = (elesiteNonEmptyFormationEntries[0] ?? elesiteEntries[0])
|
||||
?.formation_config;
|
||||
return fc?.left_station && fc?.right_station ? (
|
||||
<RefDirectionBanner
|
||||
rows={[
|
||||
{ leftLabel: fc.left_station, rightLabel: fc.right_station },
|
||||
]}
|
||||
color="#44bb44"
|
||||
/>
|
||||
) : null;
|
||||
})()
|
||||
: undefined}
|
||||
</View>
|
||||
);
|
||||
return (
|
||||
@@ -702,23 +786,20 @@ export const TrainDataSources: FC<{ payload?: TrainDataSourcesPayload }> = ({
|
||||
elesiteCount === 0
|
||||
? "この列車の運用データはありません"
|
||||
: !elesiteHasNonEmptyFormations
|
||||
? "本日の運用報告なし"
|
||||
: elesiteLastReportedAt
|
||||
? `最終投稿: ${formatHHMM(elesiteLastReportedAt)}`
|
||||
: ""
|
||||
? activeElesiteGroupLabel || "本日の運用報告なし"
|
||||
: elesiteDisplayGroups.length > 1
|
||||
? activeElesiteGroupLabel || ""
|
||||
: activeElesiteGroup?.lastReportedAt
|
||||
? `最終投稿: ${formatHHMM(activeElesiteGroup.lastReportedAt)}`
|
||||
: activeElesiteGroupLabel || ""
|
||||
}
|
||||
badge={elesiteHasNonEmptyFormations ? elesiteCount : null}
|
||||
badge={elesiteBadgeCount}
|
||||
badgeColor="#44bb44"
|
||||
detail={elesiteFormationDetail}
|
||||
disabled={elesiteCount === 0}
|
||||
onPress={() => {
|
||||
const matchedEntry =
|
||||
elesiteNonEmptyFormationEntries[0] ?? elesiteEntries[0];
|
||||
const matchedTrain = matchedEntry?.trains?.find(
|
||||
(t) => t.train_number.trim() === trainNum,
|
||||
);
|
||||
const url =
|
||||
matchedTrain?.timetable_url || "https://www.elesite-next.com/";
|
||||
activeElesiteGroup?.timetableUrl || "https://www.elesite-next.com/";
|
||||
SheetManager.hide("TrainDataSources");
|
||||
Linking.openURL(url);
|
||||
}}
|
||||
@@ -1001,7 +1082,7 @@ const TrainInfoDetail: FC<{
|
||||
uwasa,
|
||||
optional_text,
|
||||
} = data;
|
||||
const { fontAvailable } = getTrainType({
|
||||
const { fontFamily } = getTrainType({
|
||||
type: data.type,
|
||||
whiteMode: false,
|
||||
});
|
||||
@@ -1039,13 +1120,16 @@ const TrainInfoDetail: FC<{
|
||||
style={[
|
||||
styles.typeTagText,
|
||||
{
|
||||
fontFamily: fontAvailable ? "JR-Nishi" : undefined,
|
||||
fontWeight: !fontAvailable ? "bold" : undefined,
|
||||
paddingTop: fontAvailable ? 2 : 0,
|
||||
fontFamily,
|
||||
fontWeight: fontFamily ? undefined : "bold",
|
||||
paddingTop: fontFamily ? 2 : 0,
|
||||
},
|
||||
]}
|
||||
>
|
||||
{typeName}
|
||||
{fontFamily === "JR-WEST-PLUS" ? (
|
||||
<Text style={{ fontFamily: "DiaPro", fontSize: 7 }}>{"\u00A0"}</Text>
|
||||
) : null}
|
||||
</Text>
|
||||
</View>
|
||||
)}
|
||||
@@ -1400,6 +1484,11 @@ const styles = StyleSheet.create({
|
||||
subText: {
|
||||
fontSize: 12,
|
||||
},
|
||||
routePagerText: {
|
||||
fontSize: 11,
|
||||
fontWeight: "600",
|
||||
marginBottom: 4,
|
||||
},
|
||||
subNodeWrap: {
|
||||
marginTop: 2,
|
||||
},
|
||||
@@ -1435,6 +1524,9 @@ const styles = StyleSheet.create({
|
||||
color: "#0077aa",
|
||||
letterSpacing: 0.5,
|
||||
},
|
||||
elesiteFormationWrap: {
|
||||
marginBottom: 4,
|
||||
},
|
||||
footer: {
|
||||
height: 20,
|
||||
},
|
||||
|
||||
@@ -8,7 +8,6 @@ import {
|
||||
TextInput,
|
||||
ScrollView,
|
||||
Linking,
|
||||
Image,
|
||||
} from "react-native";
|
||||
import { useAllTrainDiagram } from "../stateBox/useAllTrainDiagram";
|
||||
import { useBottomTabBarHeight } from "@react-navigation/bottom-tabs";
|
||||
@@ -24,10 +23,18 @@ import { Switch } from "@rneui/themed";
|
||||
import { migrateTrainName } from "@/lib/eachTrainInfoCoreLib/migrateTrainName";
|
||||
import { OneManText } from "./ActionSheetComponents/EachTrainInfoCore/HeaderTextParts/OneManText";
|
||||
import { getStringConfig } from "@/lib/getStringConfig";
|
||||
import { useTrainMenu } from "@/stateBox/useTrainMenu";
|
||||
import { normalizeIconDisplayMode } from "@/lib/iconDisplayMode";
|
||||
import { InfogramText } from "./ActionSheetComponents/EachTrainInfoCore/HeaderTextParts/InfogramText";
|
||||
import { resolveTrainIconEntries } from "@/lib/trainIconEntries";
|
||||
import { TrainIconStack } from "./ActionSheetComponents/EachTrainInfoCore/TrainIconStack";
|
||||
import { formatWrappedTrainType, shouldWrapTrainType } from "@/lib/trainTypeWrap";
|
||||
|
||||
export const AllTrainDiagramView: FC = () => {
|
||||
const { colors, fixed } = useThemeColors();
|
||||
const { goBack, navigate } = useNavigation<any>();
|
||||
const { iconSetting } = useTrainMenu();
|
||||
const iconDisplayMode = normalizeIconDisplayMode(iconSetting);
|
||||
const tabBarHeight = useBottomTabBarHeight();
|
||||
const {
|
||||
keyList,
|
||||
@@ -80,12 +87,28 @@ export const AllTrainDiagramView: FC = () => {
|
||||
openTrainInfo: (d: string) => void;
|
||||
};
|
||||
const Item: FC<ItemProps> = ({ id, openTrainInfo }) => {
|
||||
const { train_info_img, train_name, type, train_num_distance, to_data } =
|
||||
customTrainDataDetector(id, allCustomTrainData);
|
||||
const todayOperation = getTodayOperationByTrainId(id).filter(d=> d.state !== 100);
|
||||
const [isWrapped, setIsWrapped] = useState(false);
|
||||
|
||||
const [typeString, fontAvailable, isOneMan] = getStringConfig(type, id);
|
||||
const customTrainData = customTrainDataDetector(id, allCustomTrainData);
|
||||
const {
|
||||
train_name,
|
||||
type,
|
||||
train_num_distance,
|
||||
to_data,
|
||||
infogram,
|
||||
directions,
|
||||
} = customTrainData;
|
||||
const todayOperation = (getTodayOperationByTrainId(id) ?? []).filter(d=> d.state !== 100);
|
||||
const trainIconData = resolveTrainIconEntries({
|
||||
trainNum: id,
|
||||
customTrainData,
|
||||
todayOperation,
|
||||
iconDisplayMode,
|
||||
});
|
||||
let iconTrainDirection =
|
||||
parseInt(id.replace(/[^\d]/g, "")) % 2 == 0 ? true : false;
|
||||
if (directions != undefined) {
|
||||
iconTrainDirection = directions ? true : false;
|
||||
}
|
||||
const [typeString, fontFamily, isOneMan] = getStringConfig(type, id);
|
||||
|
||||
const trainNameString = (() => {
|
||||
switch (true) {
|
||||
@@ -110,6 +133,7 @@ export const AllTrainDiagramView: FC = () => {
|
||||
return migrateTrainName(hoge + "行き");
|
||||
}
|
||||
})();
|
||||
const wrapType = shouldWrapTrainType(typeString, trainNameString);
|
||||
return (
|
||||
<TouchableOpacity
|
||||
style={{
|
||||
@@ -124,29 +148,11 @@ export const AllTrainDiagramView: FC = () => {
|
||||
onPress={() => openTrainInfo(id)}
|
||||
>
|
||||
<View style={{ marginHorizontal: 5, flexDirection: "row" }}>
|
||||
{todayOperation.length > 0
|
||||
? todayOperation.map((operation, index) => (
|
||||
<Image
|
||||
key={index}
|
||||
source={{ uri: operation.vehicle_img || train_info_img }}
|
||||
style={{
|
||||
width: 20,
|
||||
height: 22,
|
||||
marginHorizontal: 2,
|
||||
display: index == 0 ? "flex" : "none", //暫定対応:複数アイコンがある場合は最初のアイコンのみ表示
|
||||
}}
|
||||
/>
|
||||
))
|
||||
: train_info_img && (
|
||||
<Image
|
||||
source={{ uri: train_info_img }}
|
||||
style={{
|
||||
width: 20,
|
||||
height: 22,
|
||||
marginHorizontal: 2,
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<TrainIconStack
|
||||
entries={trainIconData}
|
||||
direction={iconTrainDirection}
|
||||
variant="list"
|
||||
/>
|
||||
</View>
|
||||
|
||||
<View
|
||||
@@ -158,37 +164,49 @@ export const AllTrainDiagramView: FC = () => {
|
||||
>
|
||||
{typeString && (
|
||||
<Text
|
||||
numberOfLines={wrapType ? 2 : 1}
|
||||
style={{
|
||||
fontSize: 20,
|
||||
color: fixed.textOnPrimary,
|
||||
fontFamily: fontAvailable ? "JR-Nishi" : undefined,
|
||||
fontWeight: !fontAvailable ? "bold" : undefined,
|
||||
fontFamily,
|
||||
fontWeight: fontFamily ? undefined : "bold",
|
||||
marginRight: 5,
|
||||
flexShrink: 0,
|
||||
...(wrapType
|
||||
? { width: 44, lineHeight: 22 }
|
||||
: {}),
|
||||
}}
|
||||
>
|
||||
{isWrapped
|
||||
? typeString.replace(/(.{2})/g, "$1\n").trim()
|
||||
: typeString}
|
||||
{wrapType ? formatWrappedTrainType(typeString) : typeString}
|
||||
{fontFamily === "JR-WEST-PLUS" ? (
|
||||
<Text style={{ fontFamily: "DiaPro", fontSize: 7 }}>{"\u00A0"}</Text>
|
||||
) : null}
|
||||
</Text>
|
||||
)}
|
||||
{isOneMan && <OneManText />}
|
||||
</View>
|
||||
{trainNameString && (
|
||||
<Text
|
||||
{(trainNameString || infogram) && (
|
||||
<View
|
||||
style={{
|
||||
fontSize: 20,
|
||||
fontWeight: "bold",
|
||||
color: fixed.textOnPrimary,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
flexShrink: 1,
|
||||
}}
|
||||
onTextLayout={(e) => {
|
||||
if (e.nativeEvent.lines.length > 1) {
|
||||
setIsWrapped(true);
|
||||
}
|
||||
}}
|
||||
>
|
||||
{trainNameString}
|
||||
</Text>
|
||||
{trainNameString && (
|
||||
<Text
|
||||
style={{
|
||||
fontSize: 20,
|
||||
fontWeight: "bold",
|
||||
color: fixed.textOnPrimary,
|
||||
flexShrink: 1,
|
||||
}}
|
||||
>
|
||||
{trainNameString}
|
||||
</Text>
|
||||
)}
|
||||
{infogram ? <InfogramText infogram={infogram} fontSize={18} /> : null}
|
||||
</View>
|
||||
)}
|
||||
<View style={{ flex: 1 }} />
|
||||
<Text style={{ fontSize: 20, fontWeight: "bold", color: fixed.textOnPrimary }}>
|
||||
|
||||
+275
-36
@@ -1,10 +1,12 @@
|
||||
import React from "react";
|
||||
import { InteractionManager } from "react-native";
|
||||
import {
|
||||
View,
|
||||
Platform,
|
||||
useWindowDimensions,
|
||||
StatusBar,
|
||||
useColorScheme,
|
||||
Button,
|
||||
} from "react-native";
|
||||
import * as Updates from "expo-updates";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
@@ -23,9 +25,11 @@ import { NewMenu } from "./Apps/NewMenu";
|
||||
import { MapsButton } from "./Apps/MapsButton";
|
||||
import { ReloadButton } from "./Apps/ReloadButton";
|
||||
import { useStationList } from "../stateBox/useStationList";
|
||||
import { positionsLifecycleRef } from "../lib/rootNavigation";
|
||||
import { FixedPositionBox } from "./Apps/FixedPositionBox";
|
||||
import { PlaybackTimeline } from "./Apps/PlaybackTimeline";
|
||||
import { RecordingStatusBar } from "./Apps/RecordingStatusBar";
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
|
||||
export default function Apps() {
|
||||
const { webview, fixedPosition, setFixedPosition } = useCurrentTrain();
|
||||
@@ -33,11 +37,15 @@ export default function Apps() {
|
||||
const { navigate } = useNavigation<any>();
|
||||
const { isLandscape } = useDeviceOrientationChange();
|
||||
const { top } = useSafeAreaInsets();
|
||||
const handleLayout = () => {};
|
||||
const { originalStationList } = useStationList();
|
||||
const { mapSwitch, trainInfo, setTrainInfo, selectedLine } = useTrainMenu();
|
||||
const isDark = useColorScheme() === "dark";
|
||||
const isFocused = useIsFocused();
|
||||
const [hasActivatedScreen, setHasActivatedScreen] = React.useState(false);
|
||||
const [hasActivatedWebView, setHasActivatedWebView] = React.useState(false);
|
||||
const [hasStableWebViewSession, setHasStableWebViewSession] = React.useState(false);
|
||||
const lastFocusSignatureRef = React.useRef("");
|
||||
const lastLayoutSignatureRef = React.useRef("");
|
||||
|
||||
const lineColor = selectedLine && stationIDPair[selectedLine]
|
||||
? lineColorList[stationIDPair[selectedLine]]
|
||||
@@ -84,20 +92,219 @@ export default function Apps() {
|
||||
}
|
||||
};
|
||||
const bgColor = isDark ? "#1c1c1e" : "#ffffff";
|
||||
|
||||
const resetTransientPositionsSession = React.useCallback(() => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: hasStableWebViewSession
|
||||
? "positions stable session preserved before leave"
|
||||
: "positions transient session reset before leave",
|
||||
data: {
|
||||
stableWebViewSession: hasStableWebViewSession,
|
||||
},
|
||||
});
|
||||
positionsLifecycleRef.current = {
|
||||
...positionsLifecycleRef.current,
|
||||
isUnstable: false,
|
||||
blockTabExit: false,
|
||||
};
|
||||
if (hasStableWebViewSession) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
webview.current?.stopLoading?.();
|
||||
} catch {}
|
||||
setHasActivatedWebView(false);
|
||||
setHasActivatedScreen(false);
|
||||
setHasStableWebViewSession(false);
|
||||
}, [hasStableWebViewSession, webview]);
|
||||
|
||||
React.useEffect(() => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: "positions screen mounted",
|
||||
});
|
||||
return () => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: "positions screen unmounted",
|
||||
});
|
||||
};
|
||||
}, []);
|
||||
|
||||
React.useEffect(() => {
|
||||
if (!isFocused) {
|
||||
if (!hasActivatedWebView && !hasStableWebViewSession) {
|
||||
// allow one hidden startup prewarm so the positions session can begin before first tab focus
|
||||
} else {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: "positions webview preserved on blur",
|
||||
data: {
|
||||
stableWebViewSession: hasStableWebViewSession,
|
||||
activatedWebView: hasActivatedWebView,
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (hasActivatedScreen && hasActivatedWebView) return;
|
||||
const activationReason = isFocused
|
||||
? (hasActivatedScreen ? "focus" : "first_focus")
|
||||
: "background_prewarm";
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: "positions screen activation scheduled",
|
||||
data: {
|
||||
reason: activationReason,
|
||||
},
|
||||
});
|
||||
let cancelled = false;
|
||||
const activate = () => {
|
||||
if (cancelled) {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: "positions screen activation cancelled before webview mount",
|
||||
data: {
|
||||
reason: activationReason,
|
||||
},
|
||||
});
|
||||
return;
|
||||
}
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: "positions screen activation committed",
|
||||
data: {
|
||||
reason: activationReason,
|
||||
},
|
||||
});
|
||||
setHasActivatedScreen(true);
|
||||
setHasActivatedWebView(true);
|
||||
};
|
||||
|
||||
if (isFocused) {
|
||||
const task = InteractionManager.runAfterInteractions(() => {
|
||||
setTimeout(activate, 250);
|
||||
});
|
||||
return () => {
|
||||
cancelled = true;
|
||||
task.cancel?.();
|
||||
};
|
||||
}
|
||||
|
||||
const timer = setTimeout(activate, 350);
|
||||
return () => {
|
||||
cancelled = true;
|
||||
clearTimeout(timer);
|
||||
};
|
||||
}, [hasActivatedScreen, hasActivatedWebView, hasStableWebViewSession, isFocused]);
|
||||
|
||||
React.useEffect(() => {
|
||||
const shouldGuardTabExit = isFocused && hasActivatedWebView && !hasStableWebViewSession;
|
||||
positionsLifecycleRef.current = {
|
||||
isUnstable: shouldGuardTabExit,
|
||||
blockTabExit: shouldGuardTabExit,
|
||||
resetBeforeLeave: resetTransientPositionsSession,
|
||||
deactivateStack: positionsLifecycleRef.current.deactivateStack,
|
||||
};
|
||||
return () => {
|
||||
positionsLifecycleRef.current = {
|
||||
isUnstable: false,
|
||||
blockTabExit: false,
|
||||
resetBeforeLeave: null,
|
||||
deactivateStack: positionsLifecycleRef.current.deactivateStack,
|
||||
};
|
||||
};
|
||||
}, [hasActivatedWebView, hasStableWebViewSession, isFocused, resetTransientPositionsSession]);
|
||||
|
||||
React.useEffect(() => {
|
||||
Sentry.setContext("positions_screen", {
|
||||
focused: isFocused,
|
||||
activatedScreen: hasActivatedScreen,
|
||||
activatedWebView: hasActivatedWebView,
|
||||
stableWebViewSession: hasStableWebViewSession,
|
||||
mapSwitch,
|
||||
selectedLine: selectedLine ?? null,
|
||||
trainNum: trainInfo?.trainNum ?? null,
|
||||
landscape: isLandscape,
|
||||
width,
|
||||
height,
|
||||
});
|
||||
}, [hasActivatedScreen, hasActivatedWebView, hasStableWebViewSession, height, isFocused, isLandscape, mapSwitch, selectedLine, trainInfo?.trainNum, width]);
|
||||
|
||||
React.useEffect(() => {
|
||||
const signature = JSON.stringify({
|
||||
focused: isFocused,
|
||||
mapSwitch,
|
||||
selectedLine: selectedLine ?? null,
|
||||
trainNum: trainInfo?.trainNum ?? null,
|
||||
landscape: isLandscape,
|
||||
});
|
||||
if (lastFocusSignatureRef.current === signature) return;
|
||||
lastFocusSignatureRef.current = signature;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: isFocused ? "positions focused" : "positions blurred",
|
||||
data: {
|
||||
mapSwitch,
|
||||
selectedLine: selectedLine ?? null,
|
||||
trainNum: trainInfo?.trainNum ?? null,
|
||||
landscape: isLandscape,
|
||||
},
|
||||
});
|
||||
}, [hasActivatedWebView, isFocused, isLandscape, mapSwitch, selectedLine, trainInfo?.trainNum]);
|
||||
|
||||
const handleLayout = React.useCallback((event) => {
|
||||
const layout = event?.nativeEvent?.layout;
|
||||
if (!layout) return;
|
||||
const signature = [Math.round(layout.width), Math.round(layout.height), isLandscape ? "landscape" : "portrait"].join(":");
|
||||
if (lastLayoutSignatureRef.current === signature) return;
|
||||
lastLayoutSignatureRef.current = signature;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: "positions layout",
|
||||
data: {
|
||||
width: Math.round(layout.width),
|
||||
height: Math.round(layout.height),
|
||||
landscape: isLandscape,
|
||||
},
|
||||
});
|
||||
}, [isLandscape]);
|
||||
|
||||
return (
|
||||
<View style={{ flex: 1, backgroundColor: bgColor }}>
|
||||
{isFocused && mapSwitch === "true" && lineColor && lineColorDark && (
|
||||
<LinearGradient
|
||||
colors={[lineColorDark, lineColor]}
|
||||
start={{ x: 0, y: 0 }}
|
||||
end={{ x: 0, y: 1 }}
|
||||
style={{ position: "absolute", top: 0, left: 0, right: 0, height: top }}
|
||||
/>
|
||||
)}
|
||||
{isFocused && mapSwitch !== "true" && (
|
||||
<View style={{ position: "absolute", top: 0, left: 0, right: 0, height: top, backgroundColor: "#0099CC" }} />
|
||||
)}
|
||||
{isFocused && (
|
||||
<View
|
||||
pointerEvents="none"
|
||||
style={{ position: "absolute", top: 0, left: 0, right: 0, height: top }}
|
||||
>
|
||||
{mapSwitch === "true" && lineColor && lineColorDark ? (
|
||||
<LinearGradient
|
||||
colors={[lineColorDark, lineColor]}
|
||||
start={{ x: 0, y: 0 }}
|
||||
end={{ x: 0, y: 1 }}
|
||||
style={{ flex: 1 }}
|
||||
/>
|
||||
) : (
|
||||
<View
|
||||
style={{
|
||||
flex: 1,
|
||||
backgroundColor: "#0099CC",
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</View>
|
||||
)}
|
||||
{isFocused && hasActivatedScreen && (
|
||||
<StatusBar barStyle="light-content" />
|
||||
)}
|
||||
<View
|
||||
@@ -108,32 +315,64 @@ export default function Apps() {
|
||||
}}
|
||||
onLayout={handleLayout}
|
||||
>
|
||||
<AppsWebView
|
||||
{...{
|
||||
openStationACFromEachTrainInfo,
|
||||
}}
|
||||
/>
|
||||
{hasActivatedScreen ? (
|
||||
<>
|
||||
{hasActivatedWebView ? (
|
||||
<AppsWebView
|
||||
openStationACFromEachTrainInfo={openStationACFromEachTrainInfo}
|
||||
onInitialLoadReady={() => {
|
||||
if (hasStableWebViewSession) return;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: "positions webview became stable",
|
||||
});
|
||||
positionsLifecycleRef.current = {
|
||||
...positionsLifecycleRef.current,
|
||||
isUnstable: false,
|
||||
blockTabExit: false,
|
||||
};
|
||||
setHasStableWebViewSession(true);
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<View style={{ flex: 1 }} />
|
||||
)}
|
||||
|
||||
<MapsButton
|
||||
onPress={() => {
|
||||
navigate("trainMenu", { webview });
|
||||
}}
|
||||
/>
|
||||
{isFocused && (
|
||||
<MapsButton
|
||||
onPress={() => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.screen",
|
||||
level: "info",
|
||||
message: "maps button press",
|
||||
data: {
|
||||
mapSwitch,
|
||||
selectedLine: selectedLine ?? null,
|
||||
hasActivatedWebView,
|
||||
},
|
||||
});
|
||||
navigate("trainMenu", { webview });
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
|
||||
{fixedPosition.type && <FixedPositionBox />}
|
||||
<PlaybackTimeline />
|
||||
<RecordingStatusBar />
|
||||
|
||||
{mapSwitch == "true" ? (
|
||||
<>
|
||||
<ReloadButton
|
||||
onPress={() => Updates.reloadAsync()}
|
||||
right={isLandscape && trainInfo.trainNum ? (width / 100) * 40 : 0}
|
||||
/>
|
||||
</>
|
||||
) : (
|
||||
<NewMenu />
|
||||
)}
|
||||
{isFocused && fixedPosition.type && <FixedPositionBox />}
|
||||
{isFocused && <PlaybackTimeline />}
|
||||
{isFocused && <RecordingStatusBar />}
|
||||
{isFocused &&
|
||||
(mapSwitch == "true" ? (
|
||||
<ReloadButton
|
||||
onPress={() => Updates.reloadAsync()}
|
||||
right={isLandscape && trainInfo.trainNum ? (width / 100) * 40 : 0}
|
||||
/>
|
||||
) : (
|
||||
<NewMenu />
|
||||
))}
|
||||
</>
|
||||
) : (
|
||||
<View style={{ flex: 1 }} />
|
||||
)}
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
|
||||
@@ -58,7 +58,7 @@ type props = {
|
||||
|
||||
export const FixedStation: FC<props> = ({ stationID }) => {
|
||||
const { colors, fixed } = useThemeColors();
|
||||
const { mapSwitch } = useTrainMenu();
|
||||
const { mapSwitch, playbackCurrentTimeIso } = useTrainMenu();
|
||||
const {
|
||||
currentTrain,
|
||||
fixedPosition,
|
||||
@@ -151,11 +151,11 @@ export const FixedStation: FC<props> = ({ stationID }) => {
|
||||
if (!currentTrain) return () => {};
|
||||
const data = trainTimeAndNumber
|
||||
.filter((d) => currentTrain.map((m) => m.num).includes(d.train)) //現在の列車に絞る[ToDo]
|
||||
.filter((d) => trainTimeFiltering({ d, currentTrain, station })) //時間フィルター
|
||||
.filter((d) => trainTimeFiltering({ d, currentTrain, station, stationList, now: playbackCurrentTimeIso })) //時間フィルター
|
||||
.filter((d) => !d.isThrough)
|
||||
.filter((d) => d.lastStation != station[0].Station_JP); //最終列車表示設定
|
||||
setSelectedTrain(data);
|
||||
}, [trainTimeAndNumber, currentTrain, tick /*liveActivity periodic refresh*/]);
|
||||
}, [trainTimeAndNumber, currentTrain, stationList, playbackCurrentTimeIso, tick /*liveActivity periodic refresh*/]);
|
||||
|
||||
useEffect(() => {
|
||||
liveNotifyIdRef.current = liveNotifyId;
|
||||
|
||||
@@ -26,6 +26,9 @@ import { Ionicons } from "@expo/vector-icons";
|
||||
import dayjs from "dayjs";
|
||||
import { useTrainMenu } from "@/stateBox/useTrainMenu";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
import { normalizeIconDisplayMode } from "@/lib/iconDisplayMode";
|
||||
import { resolveTrainDataIcon } from "@/lib/trainDataIcon";
|
||||
import { resolveTrainIconEntries } from "@/lib/trainIconEntries";
|
||||
import {
|
||||
startTrainFollowActivity,
|
||||
updateTrainFollowActivity,
|
||||
@@ -37,6 +40,45 @@ type props = {
|
||||
trainID: string;
|
||||
};
|
||||
|
||||
type TrainPathEntry = {
|
||||
raw: string;
|
||||
station: string;
|
||||
se: string;
|
||||
time: string;
|
||||
index: number;
|
||||
isThrough: boolean;
|
||||
hasTime: boolean;
|
||||
};
|
||||
|
||||
const normalizeTrainPosLabel = (value: string) =>
|
||||
value
|
||||
.replace(
|
||||
/(下り)|(上り)|\(下り\)|\(上り\)|(徳島線)|(高徳線)|(坂出方)|(児島方)/g,
|
||||
""
|
||||
)
|
||||
.trim();
|
||||
|
||||
const isHiddenThroughPointEntry = (raw: string) => {
|
||||
const [station = "", se = ""] = (raw || "").split(",");
|
||||
return station.startsWith(".") && se.includes("通");
|
||||
};
|
||||
|
||||
const calcDistanceMinute = (
|
||||
time: string,
|
||||
delayTime: number,
|
||||
playbackCurrentTimeIso?: string | null
|
||||
) => {
|
||||
if (!time || time === "") return null;
|
||||
const now = playbackCurrentTimeIso ? dayjs(playbackCurrentTimeIso) : dayjs();
|
||||
const hour = parseInt(time.split(":")[0], 10);
|
||||
const target = now
|
||||
.hour(hour < 4 ? hour + 24 : hour)
|
||||
.minute(parseInt(time.split(":")[1], 10));
|
||||
let diff = target.diff(now, "minute") + delayTime;
|
||||
if (now.hour() < 4 && hour < 4) diff -= 1440;
|
||||
return diff;
|
||||
};
|
||||
|
||||
export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
const { colors, fixed } = useThemeColors();
|
||||
const {
|
||||
@@ -48,8 +90,10 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
setFixedPositionSize,
|
||||
} = useCurrentTrain();
|
||||
|
||||
const { mapSwitch } = useTrainMenu();
|
||||
const { allCustomTrainData, allTrainDiagram } = useAllTrainDiagram();
|
||||
const { mapSwitch, iconSetting, playbackCurrentTimeIso } = useTrainMenu();
|
||||
const { allCustomTrainData, allTrainDiagram, getTodayOperationByTrainId } =
|
||||
useAllTrainDiagram();
|
||||
const iconDisplayMode = normalizeIconDisplayMode(iconSetting);
|
||||
|
||||
const [liveNotifyId, setLiveNotifyId] = useState<string | null>(null);
|
||||
const liveNotifyIdRef = useRef<string | null>(null);
|
||||
@@ -59,11 +103,28 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
const [customData, setCustomData] = useState<CustomTrainData>(
|
||||
getCurrentTrainData(trainID, currentTrain, allCustomTrainData)
|
||||
);
|
||||
const todayOperation = useMemo(
|
||||
() => (getTodayOperationByTrainId(trainID) ?? []).filter((d) => d.state !== 100),
|
||||
[getTodayOperationByTrainId, trainID]
|
||||
);
|
||||
const customTrainIcon = useMemo(() => {
|
||||
const iconEntry = resolveTrainIconEntries({
|
||||
trainNum: trainID,
|
||||
customTrainData: customData,
|
||||
todayOperation,
|
||||
iconDisplayMode,
|
||||
})[0];
|
||||
|
||||
return (
|
||||
iconEntry?.vehicle_info_img ||
|
||||
resolveTrainDataIcon(customData, iconDisplayMode)
|
||||
);
|
||||
}, [customData, iconDisplayMode, todayOperation, trainID]);
|
||||
useEffect(() => {
|
||||
setCustomData(
|
||||
getCurrentTrainData(trainID, currentTrain, allCustomTrainData)
|
||||
);
|
||||
}, [currentTrain, trainID]);
|
||||
}, [currentTrain, trainID, allCustomTrainData]);
|
||||
useEffect(() => {
|
||||
const stationData = getCurrentStationData(trainID);
|
||||
if (stationData) {
|
||||
@@ -85,8 +146,11 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
);
|
||||
|
||||
const computedTrainDataWithThrough = useMemo(() => {
|
||||
const trainData = allTrainDiagram[trainID]?.split("#");
|
||||
if (!trainData) return [];
|
||||
const trainData =
|
||||
allTrainDiagram[trainID]
|
||||
?.split("#")
|
||||
.filter((entry) => !isHiddenThroughPointEntry(entry)) ?? [];
|
||||
if (trainData.length === 0) return [];
|
||||
|
||||
// 駅名ごとに駅情報を集約するマップを構築
|
||||
const stationByNameMap = new Map();
|
||||
@@ -132,6 +196,8 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
originalStationList[
|
||||
lineListPair[stationIDPair[betweenStationLine]]
|
||||
].forEach((d) => {
|
||||
const isHiddenPassPoint = d.Station_JP?.startsWith(".");
|
||||
if (isHiddenPassPoint) return;
|
||||
if (
|
||||
d.StationNumber > baseStationNumberFirst &&
|
||||
d.StationNumber < baseStationNumberSecond
|
||||
@@ -189,6 +255,22 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
setStopStationList(computedStopStationIDList);
|
||||
}, [computedStopStationIDList]);
|
||||
const [currentPosition, setCurrentPosition] = useState<string[]>([]);
|
||||
const parsedTrainPath = useMemo<TrainPathEntry[]>(
|
||||
() =>
|
||||
trainDataWidhThrough.map((raw, index) => {
|
||||
const [station = "", se = "", time = ""] = (raw || "").split(",");
|
||||
return {
|
||||
raw,
|
||||
station,
|
||||
se,
|
||||
time,
|
||||
index,
|
||||
isThrough: se.includes("通"),
|
||||
hasTime: time !== "",
|
||||
};
|
||||
}),
|
||||
[trainDataWidhThrough]
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
let position = getPosition(train);
|
||||
@@ -223,96 +305,127 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
}
|
||||
}, [train, stopStationIDList]);
|
||||
|
||||
const [nextStationData, setNextStationData] = useState<StationProps[]>([]);
|
||||
const [untilStationData, setUntilStationData] = useState<StationProps[]>([]);
|
||||
const [currentPointData, setCurrentPointData] = useState<StationProps[]>([]);
|
||||
const [nextStopStationData, setNextStopStationData] = useState<StationProps[]>([]);
|
||||
const [untilStationData, setUntilStationData] = useState<string[]>([]);
|
||||
const [probably, setProbably] = useState(false);
|
||||
const [isCurrentPointDisplay, setIsCurrentPointDisplay] = useState(false);
|
||||
const [currentDisplayIndex, setCurrentDisplayIndex] = useState(0);
|
||||
const [tick, setTick] = useState(0);
|
||||
|
||||
useEffect(() => {
|
||||
if (playbackCurrentTimeIso) return;
|
||||
const interval = setInterval(() => setTick((value) => value + 1), 15000);
|
||||
return () => clearInterval(interval);
|
||||
}, [playbackCurrentTimeIso]);
|
||||
|
||||
useEffect(() => {
|
||||
//棒線駅判定を入れて、棒線駅なら時間を見て分数がマイナスならcontinue;
|
||||
const points = findReversalPoints(currentPosition, stopStationIDList);
|
||||
if (!points) return;
|
||||
if (points.length == 0) return;
|
||||
let searchCountFirst = points.findIndex((d) => d == true);
|
||||
let searchCountLast = points.findLastIndex((d) => d == true);
|
||||
if (!points || points.length === 0) return;
|
||||
|
||||
const delayTime = train?.delay == "入線" ? 0 : train?.delay;
|
||||
let additionalSkipCount = 0;
|
||||
const pointIndexes = points.reduce(
|
||||
(acc: number[], isCurrent, index) => {
|
||||
if (isCurrent) acc.push(index);
|
||||
return acc;
|
||||
},
|
||||
[] as number[]
|
||||
);
|
||||
if (!pointIndexes.length) return;
|
||||
|
||||
// 2駅間走行中の場合: ダイヤ順で後ろのインデックスが進行方向の駅
|
||||
// Direction に関係なく、travel-order で大きい方が「向かう駅」
|
||||
let searchStart: number;
|
||||
if (currentPosition.length === 2) {
|
||||
const idx0 = stopStationIDList.findIndex(d => d.includes(currentPosition[0]));
|
||||
const idx1 = stopStationIDList.findIndex(d => d.includes(currentPosition[1]));
|
||||
const aheadIdx = Math.max(
|
||||
idx0 >= 0 ? idx0 : -1,
|
||||
idx1 >= 0 ? idx1 : -1
|
||||
);
|
||||
searchStart = aheadIdx >= 0 ? aheadIdx : searchCountLast;
|
||||
} else {
|
||||
searchStart = searchCountFirst;
|
||||
}
|
||||
const firstMatchedIndex = pointIndexes[0];
|
||||
const isCurrentStationCluster = currentPosition.length <= 1;
|
||||
const delayTime =
|
||||
train?.delay == "入線" ? 0 : parseInt(String(train?.delay), 10) || 0;
|
||||
|
||||
for (
|
||||
let searchCount = searchStart;
|
||||
searchCount < trainDataWidhThrough.length;
|
||||
searchCount++
|
||||
) {
|
||||
const nextPos = trainDataWidhThrough[searchCount];
|
||||
let anchorIndex = firstMatchedIndex;
|
||||
let usedTimeEstimation = false;
|
||||
const shouldShowCurrentPoint = isCurrentStationCluster;
|
||||
const hasIntermediateCurrentPoints = pointIndexes.length > 1;
|
||||
|
||||
if (nextPos) {
|
||||
const [station, se, time] = nextPos.split(",");
|
||||
if (!isCurrentStationCluster && hasIntermediateCurrentPoints) {
|
||||
let upcomingTimedIndex = -1;
|
||||
let lastPassedTimedIndex = -1;
|
||||
|
||||
// 通過駅はスキップ
|
||||
if (se.includes("通")) {
|
||||
for (
|
||||
let searchCount = firstMatchedIndex;
|
||||
searchCount < parsedTrainPath.length;
|
||||
searchCount++
|
||||
) {
|
||||
const entry = parsedTrainPath[searchCount];
|
||||
if (!entry?.raw || !entry.hasTime) continue;
|
||||
|
||||
const distanceMinute = calcDistanceMinute(
|
||||
entry.time,
|
||||
delayTime,
|
||||
playbackCurrentTimeIso
|
||||
);
|
||||
if (distanceMinute == null) continue;
|
||||
|
||||
if (distanceMinute < 0) {
|
||||
lastPassedTimedIndex = searchCount;
|
||||
continue;
|
||||
}
|
||||
|
||||
// 駅に停車中(1点一致)の場合は時刻判定不要
|
||||
if (searchCountFirst == searchCountLast) {
|
||||
setNextStationData(getStationDataFromName(station));
|
||||
break;
|
||||
}
|
||||
|
||||
// 2駅間走行中: 時刻で既に通過済みか判定
|
||||
let distanceMinute = 0;
|
||||
if (time != "") {
|
||||
const now = dayjs();
|
||||
const hour = parseInt(time.split(":")[0]);
|
||||
const distanceTime = now
|
||||
.hour(hour < 4 ? hour + 24 : hour)
|
||||
.minute(parseInt(time.split(":")[1]));
|
||||
distanceMinute = distanceTime.diff(now, "minute") + delayTime;
|
||||
if (now.hour() < 4) {
|
||||
if (hour < 4) {
|
||||
distanceMinute = distanceMinute - 1440;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (distanceMinute >= 0) {
|
||||
setNextStationData(getStationDataFromName(station));
|
||||
break;
|
||||
} else {
|
||||
additionalSkipCount++;
|
||||
continue;
|
||||
}
|
||||
upcomingTimedIndex = searchCount;
|
||||
break;
|
||||
}
|
||||
|
||||
const baseIndex =
|
||||
lastPassedTimedIndex >= 0 ? lastPassedTimedIndex + 1 : firstMatchedIndex;
|
||||
|
||||
if (upcomingTimedIndex >= 0) {
|
||||
const hasUntimedGapBeforeUpcoming = parsedTrainPath
|
||||
.slice(baseIndex, upcomingTimedIndex)
|
||||
.some((entry) => entry?.raw && !entry.hasTime);
|
||||
|
||||
anchorIndex = hasUntimedGapBeforeUpcoming ? baseIndex : upcomingTimedIndex;
|
||||
} else if (lastPassedTimedIndex >= 0) {
|
||||
const lastPassedEntry = parsedTrainPath[lastPassedTimedIndex];
|
||||
anchorIndex = lastPassedEntry?.isThrough
|
||||
? Math.min(lastPassedTimedIndex + 1, parsedTrainPath.length - 1)
|
||||
: lastPassedTimedIndex;
|
||||
}
|
||||
|
||||
usedTimeEstimation = anchorIndex !== firstMatchedIndex;
|
||||
}
|
||||
let trainList = [];
|
||||
for (
|
||||
let searchCount = searchCountFirst - 1;
|
||||
searchCount < points.length;
|
||||
searchCount++
|
||||
) {
|
||||
trainList.push(trainDataWidhThrough[searchCount]);
|
||||
}
|
||||
if (additionalSkipCount > 0) {
|
||||
trainList = trainList.slice(additionalSkipCount);
|
||||
setProbably(true);
|
||||
} else {
|
||||
setProbably(false);
|
||||
}
|
||||
|
||||
const anchorEntry = parsedTrainPath[anchorIndex];
|
||||
const currentPointName = anchorEntry?.station || "";
|
||||
setCurrentPointData(
|
||||
currentPointName ? getStationDataFromName(currentPointName) : []
|
||||
);
|
||||
|
||||
const nextStopSearchStart = shouldShowCurrentPoint
|
||||
? anchorIndex + 1
|
||||
: anchorIndex;
|
||||
const nextStopEntry = parsedTrainPath.find(
|
||||
(entry, index) =>
|
||||
index >= nextStopSearchStart && !!entry?.station && !entry.isThrough
|
||||
);
|
||||
const nextStopName = nextStopEntry?.station || "";
|
||||
setNextStopStationData(
|
||||
nextStopName ? getStationDataFromName(nextStopName) : []
|
||||
);
|
||||
|
||||
const visibleStart = Math.max(anchorIndex - 1, 0);
|
||||
const trainList = parsedTrainPath
|
||||
.slice(visibleStart)
|
||||
.map((entry) => entry.raw)
|
||||
.filter((entry) => !!entry);
|
||||
|
||||
setProbably(usedTimeEstimation);
|
||||
setIsCurrentPointDisplay(shouldShowCurrentPoint);
|
||||
setCurrentDisplayIndex(Math.max(anchorIndex - visibleStart, 0));
|
||||
setUntilStationData(trainList);
|
||||
}, [currentPosition, trainDataWidhThrough]);
|
||||
}, [
|
||||
currentPosition,
|
||||
parsedTrainPath,
|
||||
playbackCurrentTimeIso,
|
||||
stopStationIDList,
|
||||
tick,
|
||||
train?.delay,
|
||||
getStationDataFromName,
|
||||
]);
|
||||
const [ToData, setToData] = useState("");
|
||||
useEffect(() => {
|
||||
if (customData.to_data && customData.to_data != "") {
|
||||
@@ -331,7 +444,9 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
setStation(data);
|
||||
}, [ToData]);
|
||||
const lineColor =
|
||||
station.length > 0
|
||||
customData.to_data_color && customData.to_data_color.length > 0
|
||||
? customData.to_data_color[0]
|
||||
: station.length > 0
|
||||
? lineColorList[station[0]?.StationNumber?.slice(0, 1)]
|
||||
: "black";
|
||||
//const lineColor = "red";
|
||||
@@ -351,7 +466,7 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
(last: number, d: string, i: number) => (d ? i : last), -1
|
||||
);
|
||||
const filteredTrainData = trainDataWidhThrough.filter((d, idx) => {
|
||||
if (!d) return false;
|
||||
if (!d || isHiddenThroughPointEntry(d)) return false;
|
||||
const [, se] = d.split(",");
|
||||
if (!se) return true;
|
||||
// 着を含み発を含まないエントリは終着駅のみ許可
|
||||
@@ -403,13 +518,22 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
};
|
||||
});
|
||||
|
||||
const shouldShowCurrentLabel =
|
||||
isCurrentPointDisplay || currentPointData[0]?.Station_JP === train?.Pos;
|
||||
const currentStationLabel = shouldShowCurrentLabel
|
||||
? currentPointData[0]?.Station_JP || train?.Pos || ""
|
||||
: train?.Pos || "";
|
||||
const bannerStationData = shouldShowCurrentLabel
|
||||
? currentPointData
|
||||
: nextStopStationData;
|
||||
|
||||
// 全駅リスト中の現在地インデックス
|
||||
const currentStationIndex = (() => {
|
||||
const pos = train?.Pos || "";
|
||||
const pos = currentStationLabel;
|
||||
if (!pos) return 0;
|
||||
// Pos は "駅名" (駅にいる時) or "駅A~駅B" (走行中) の形式
|
||||
const posStations = pos.split("~").map((s: string) =>
|
||||
s.replace(/(下り)|(上り)|\(下り\)|\(上り\)/g, "").trim()
|
||||
normalizeTrainPosLabel(s)
|
||||
);
|
||||
// 完全一致
|
||||
const firstIdx = allStations.findIndex((s) => s.name === posStations[0]);
|
||||
@@ -423,7 +547,7 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
})();
|
||||
|
||||
const nextStationIndex = (() => {
|
||||
const name = nextStationData[0]?.Station_JP;
|
||||
const name = nextStopStationData[0]?.Station_JP;
|
||||
if (!name) return -1;
|
||||
const idx = stationStops.indexOf(name);
|
||||
if (idx >= 0) return idx;
|
||||
@@ -448,11 +572,10 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
if (!liveNotifyId || !train) return;
|
||||
const delayNum = train.delay === "入線" ? 0 : parseInt(String(train.delay)) || 0;
|
||||
const delayStatus = delayNum > 0 ? `${delayNum}分遅れ` : "定刻";
|
||||
const positionStatus =
|
||||
nextStationData[0]?.Station_JP === train.Pos ? "ただいま" : "次は";
|
||||
const positionStatus = shouldShowCurrentLabel ? "ただいま" : "次は";
|
||||
updateTrainFollowActivity(liveNotifyId, {
|
||||
currentStation: train.Pos || "",
|
||||
nextStation: nextStationData[0]?.Station_JP || "",
|
||||
currentStation: currentStationLabel,
|
||||
nextStation: nextStopStationData[0]?.Station_JP || "",
|
||||
delayMinutes: delayNum,
|
||||
scheduledArrival: "",
|
||||
trainNumber: trainID,
|
||||
@@ -468,7 +591,16 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
allStations,
|
||||
currentStationIndex,
|
||||
}).catch(() => {});
|
||||
}, [train, nextStationData, liveNotifyId, stationStops, nextStationIndex, currentStationIndex]);
|
||||
}, [
|
||||
train,
|
||||
nextStopStationData,
|
||||
liveNotifyId,
|
||||
stationStops,
|
||||
nextStationIndex,
|
||||
currentStationIndex,
|
||||
currentStationLabel,
|
||||
shouldShowCurrentLabel,
|
||||
]);
|
||||
|
||||
// バナー表示と同時にLive Activityを自動開始
|
||||
// iOSのみ一時的に無効化中(Androidは有効)
|
||||
@@ -485,15 +617,14 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
}
|
||||
const delayNum = train?.delay === "入線" ? 0 : parseInt(String(train?.delay)) || 0;
|
||||
const delayStatus = delayNum > 0 ? `${delayNum}分遅れ` : "定刻";
|
||||
const positionStatus =
|
||||
nextStationData[0]?.Station_JP === train?.Pos ? "ただいま" : "次は";
|
||||
const positionStatus = shouldShowCurrentLabel ? "ただいま" : "次は";
|
||||
try {
|
||||
const id = await startTrainFollowActivity({
|
||||
trainNumber: trainID,
|
||||
lineName: "",
|
||||
destination: ToData,
|
||||
currentStation: train?.Pos || "",
|
||||
nextStation: nextStationData[0]?.Station_JP || "",
|
||||
currentStation: currentStationLabel,
|
||||
nextStation: nextStopStationData[0]?.Station_JP || "",
|
||||
delayMinutes: delayNum,
|
||||
scheduledArrival: "",
|
||||
trainType: customTrainType.shortName,
|
||||
@@ -513,7 +644,22 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
}
|
||||
};
|
||||
startActivity();
|
||||
}, [train]);
|
||||
}, [
|
||||
train,
|
||||
nextStopStationData,
|
||||
currentStationLabel,
|
||||
shouldShowCurrentLabel,
|
||||
ToData,
|
||||
trainID,
|
||||
customTrainType.shortName,
|
||||
trainNameText,
|
||||
customTrainType.color,
|
||||
lineColor,
|
||||
stationStops,
|
||||
nextStationIndex,
|
||||
allStations,
|
||||
currentStationIndex,
|
||||
]);
|
||||
|
||||
return (
|
||||
<View
|
||||
@@ -555,7 +701,7 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
}}
|
||||
>
|
||||
<Image
|
||||
source={{ uri: customData.train_info_img || "" }}
|
||||
source={{ uri: customTrainIcon }}
|
||||
width={fixedPositionSize === 226 ? 23 : 14}
|
||||
height={fixedPositionSize === 226 ? 26 : 17}
|
||||
style={{ margin: 5 }}
|
||||
@@ -572,19 +718,18 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
<Text
|
||||
style={{
|
||||
fontSize: trainNameText.length > 4 ? 12 : 14,
|
||||
fontFamily: customTrainType.fontAvailable
|
||||
? "JR-Nishi"
|
||||
: undefined,
|
||||
fontWeight: !customTrainType.fontAvailable
|
||||
? "bold"
|
||||
: undefined,
|
||||
marginTop: customTrainType.fontAvailable ? 3 : 0,
|
||||
fontFamily: customTrainType.fontFamily,
|
||||
fontWeight: customTrainType.fontFamily ? undefined : "bold",
|
||||
marginTop: customTrainType.fontFamily ? 3 : 0,
|
||||
color: fixed.textOnPrimary,
|
||||
textAlignVertical: "center",
|
||||
textAlign: "left",
|
||||
}}
|
||||
>
|
||||
{customTrainType.shortName}
|
||||
{customTrainType.fontFamily === "JR-WEST-PLUS" ? (
|
||||
<Text style={{ fontFamily: "DiaPro", fontSize: 7 }}>{"\u00A0"}</Text>
|
||||
) : null}
|
||||
</Text>
|
||||
{customData.train_name && (
|
||||
<Text
|
||||
@@ -689,9 +834,7 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
marginVertical: -1,
|
||||
}}
|
||||
>
|
||||
{nextStationData[0]?.Station_JP == train?.Pos
|
||||
? "ただいま"
|
||||
: "次は"}
|
||||
{shouldShowCurrentLabel ? "ただいま" : "次は"}
|
||||
</Text>
|
||||
{probably && (
|
||||
<Text
|
||||
@@ -709,7 +852,7 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
)}
|
||||
</View>
|
||||
<StationNumberMaker
|
||||
currentStation={nextStationData}
|
||||
currentStation={bannerStationData}
|
||||
singleSize={20}
|
||||
useEach={true}
|
||||
/>
|
||||
@@ -721,7 +864,7 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
flex: 1,
|
||||
}}
|
||||
>
|
||||
{nextStationData[0]?.Station_JP || "不明"}
|
||||
{bannerStationData[0]?.Station_JP || "不明"}
|
||||
</Text>
|
||||
{fixedPositionSize !== 226 && (
|
||||
<View
|
||||
@@ -745,6 +888,7 @@ export const FixedTrain: FC<props> = ({ trainID }) => {
|
||||
train={train}
|
||||
lineColor={lineColor}
|
||||
trainDataWithThrough={untilStationData}
|
||||
currentDisplayIndex={currentDisplayIndex}
|
||||
isSmall={fixedPositionSize !== 226}
|
||||
/>
|
||||
</View>
|
||||
@@ -871,6 +1015,7 @@ const CurrentPositionBox = ({
|
||||
train,
|
||||
lineColor,
|
||||
trainDataWithThrough,
|
||||
currentDisplayIndex,
|
||||
isSmall,
|
||||
}) => {
|
||||
const { colors } = useThemeColors();
|
||||
@@ -880,13 +1025,13 @@ const CurrentPositionBox = ({
|
||||
const { isBetween, Pos: PosData } = trainPosition(train);
|
||||
if (isBetween === true) {
|
||||
const { from, to } = PosData;
|
||||
firstText = from;
|
||||
secondText = to;
|
||||
firstText = normalizeTrainPosLabel(from);
|
||||
secondText = normalizeTrainPosLabel(to);
|
||||
marginText = "→";
|
||||
} else {
|
||||
const { Pos } = PosData;
|
||||
if (Pos !== "") {
|
||||
firstText = Pos;
|
||||
firstText = normalizeTrainPosLabel(Pos);
|
||||
}
|
||||
}
|
||||
const delayTime = train?.delay == "入線" ? 0 : parseInt(train?.delay);
|
||||
@@ -939,6 +1084,7 @@ const CurrentPositionBox = ({
|
||||
(() => {
|
||||
// 着→発ペアを同一駅で統合(EachStopListと同様)
|
||||
const merged: { d: string; arrivalTime: string | null }[] = [];
|
||||
let mergedCurrentDisplayIndex = Math.max(currentDisplayIndex, 0);
|
||||
for (let i = 0; i < trainDataWithThrough.length; i++) {
|
||||
const d = trainDataWithThrough[i];
|
||||
if (!d) continue;
|
||||
@@ -959,11 +1105,17 @@ const CurrentPositionBox = ({
|
||||
const [prevSt, prevSe, prevTime] = prev.split(",");
|
||||
if (prevSt === st && prevSe?.includes("着")) {
|
||||
merged.push({ d, arrivalTime: prevTime });
|
||||
if (i === currentDisplayIndex || i - 1 === currentDisplayIndex) {
|
||||
mergedCurrentDisplayIndex = merged.length - 1;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
merged.push({ d, arrivalTime: null });
|
||||
if (i === currentDisplayIndex) {
|
||||
mergedCurrentDisplayIndex = merged.length - 1;
|
||||
}
|
||||
}
|
||||
return merged.map(({ d, arrivalTime }, index) => (
|
||||
<EachStopData
|
||||
@@ -973,6 +1125,7 @@ const CurrentPositionBox = ({
|
||||
delayTime={delayTime}
|
||||
isSmall={isSmall}
|
||||
secondText={secondText}
|
||||
currentDisplayIndex={mergedCurrentDisplayIndex}
|
||||
arrivalTime={arrivalTime}
|
||||
/>
|
||||
));
|
||||
@@ -988,18 +1141,28 @@ type eachStopType = {
|
||||
isSmall: boolean;
|
||||
index: number;
|
||||
secondText: string;
|
||||
currentDisplayIndex: number;
|
||||
arrivalTime?: string | null;
|
||||
};
|
||||
|
||||
const EachStopData: FC<eachStopType> = (props) => {
|
||||
const { colors } = useThemeColors();
|
||||
const { d, delayTime, isSmall, index, secondText, arrivalTime } = props;
|
||||
const { playbackCurrentTimeIso } = useTrainMenu();
|
||||
const {
|
||||
d,
|
||||
delayTime,
|
||||
isSmall,
|
||||
index,
|
||||
secondText,
|
||||
currentDisplayIndex,
|
||||
arrivalTime,
|
||||
} = props;
|
||||
if (!d) return null;
|
||||
if (d == "") return null;
|
||||
const [station, se, time] = d.split(",");
|
||||
const calcMinute = (t: string) => {
|
||||
if (!t || t === "") return null;
|
||||
const now = dayjs();
|
||||
const now = playbackCurrentTimeIso ? dayjs(playbackCurrentTimeIso) : dayjs();
|
||||
const hour = parseInt(t.split(":")[0]);
|
||||
const dt = now
|
||||
.hour(hour < 4 ? hour + 24 : hour)
|
||||
@@ -1074,7 +1237,7 @@ const EachStopData: FC<eachStopType> = (props) => {
|
||||
style={{
|
||||
fontSize: isSmall ? 8 : 14,
|
||||
color:
|
||||
index == 1 && secondText == ""
|
||||
index === currentDisplayIndex && secondText === ""
|
||||
? "#ffe852ff"
|
||||
: se.includes("通")
|
||||
? "#020202ff"
|
||||
@@ -1084,14 +1247,14 @@ const EachStopData: FC<eachStopType> = (props) => {
|
||||
fontWeight: "bold",
|
||||
}}
|
||||
>
|
||||
{index == 1 && secondText == ""
|
||||
{index === currentDisplayIndex && secondText === ""
|
||||
? "→"
|
||||
: se.includes("通")
|
||||
? null
|
||||
: "●"}
|
||||
</Text>
|
||||
</View>
|
||||
{index == 0 && secondText != "" && (
|
||||
{index === 0 && secondText !== "" && (
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "column",
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useState, useEffect } from "react";
|
||||
import { useAllTrainDiagram } from "@/stateBox/useAllTrainDiagram";
|
||||
import { useStationList } from "@/stateBox/useStationList";
|
||||
import { OriginalStationList } from "@/lib/CommonTypes";
|
||||
|
||||
interface StationIDPair {
|
||||
[key: string]: string;
|
||||
@@ -10,12 +11,10 @@ interface LineListPair {
|
||||
[key: string]: string;
|
||||
}
|
||||
|
||||
interface OriginalStationList {
|
||||
[key: string]: Array<{
|
||||
Station_JP: string;
|
||||
StationNumber: string;
|
||||
}>;
|
||||
}
|
||||
const isHiddenThroughPointEntry = (raw: string) => {
|
||||
const [station = "", se = ""] = (raw || "").split(",");
|
||||
return station.startsWith(".") && se.includes("通");
|
||||
};
|
||||
|
||||
/**
|
||||
* 通過駅を含む列車データを生成するカスタムフック
|
||||
@@ -33,8 +32,11 @@ export const useTrainDataWithThrough = (
|
||||
const [trainDataWithThrough, setTrainDataWithThrough] = useState<string[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
const trainData = allTrainDiagram[trainID]?.split("#");
|
||||
if (!trainData) return;
|
||||
const trainData =
|
||||
allTrainDiagram[trainID]
|
||||
?.split("#")
|
||||
.filter((entry) => !isHiddenThroughPointEntry(entry)) ?? [];
|
||||
if (trainData.length === 0) return;
|
||||
|
||||
// 各停車駅の情報を取得
|
||||
const stopStationList = trainData.map((i) => {
|
||||
@@ -76,6 +78,8 @@ export const useTrainDataWithThrough = (
|
||||
if (!lineStations) return [];
|
||||
|
||||
lineStations.forEach((d) => {
|
||||
const isHiddenPassPoint = d.Station_JP?.startsWith(".");
|
||||
if (isHiddenPassPoint) return;
|
||||
// 順方向の判定
|
||||
if (
|
||||
d.StationNumber > baseStationNumberFirst &&
|
||||
|
||||
+222
-18
@@ -1,4 +1,4 @@
|
||||
import React, { useEffect, useRef } from "react";
|
||||
import React, { useCallback, useEffect, useRef } from "react";
|
||||
import { Platform } from "react-native";
|
||||
import { WebView } from "react-native-webview";
|
||||
|
||||
@@ -15,15 +15,19 @@ import { useCurrentTrain } from "../../stateBox/useCurrentTrain";
|
||||
import { useDeviceOrientationChange } from "../../stateBox/useDeviceOrientationChange";
|
||||
import { SheetManager } from "react-native-actions-sheet";
|
||||
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import { useNavigation, useIsFocused } from "@react-navigation/native";
|
||||
import { useTrainMenu } from "../../stateBox/useTrainMenu";
|
||||
import { useStationList } from "../../stateBox/useStationList";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
import { useWebViewRemount } from "@/lib/useWebViewRemount";
|
||||
import { generateMockUpdateScript } from "../../lib/mockApi/webviewXhrInterceptor";
|
||||
export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
import { setAppLifecycleWebViewActive } from "@/lib/observability/appLifecycleCrashSentinel";
|
||||
export const AppsWebView = ({ openStationACFromEachTrainInfo, onInitialLoadReady }) => {
|
||||
const initialPositionsUrl = "https://train.jr-shikoku.co.jp/sp.html";
|
||||
const { webview, currentTrain } = useCurrentTrain();
|
||||
const { navigate } = useNavigation<any>();
|
||||
const isFocused = useIsFocused();
|
||||
const { favoriteStation } = useFavoriteStation();
|
||||
const { isLandscape } = useDeviceOrientationChange();
|
||||
const { isDark } = useThemeColors();
|
||||
@@ -40,27 +44,138 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
|
||||
mockApiFeatureEnabled,
|
||||
mockTrainPositions,
|
||||
} = useTrainMenu();
|
||||
const { remountKey, remount, processHandlers } = useWebViewRemount();
|
||||
const addWebViewBreadcrumb = (
|
||||
message: string,
|
||||
data?: Record<string, string | number | boolean | null | undefined>
|
||||
) => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "positions.webview",
|
||||
level: "info",
|
||||
message,
|
||||
data,
|
||||
});
|
||||
};
|
||||
const { remountKey, remount, processHandlers, pingHandlers, webViewRef } = useWebViewRemount({
|
||||
pingEnabled: Platform.OS === "ios",
|
||||
backgroundThresholdMs: null,
|
||||
isFocused,
|
||||
pauseWatchdogWhenUnfocused: Platform.OS === "ios",
|
||||
ignoreProcessTerminationWhenUnfocused: Platform.OS === "ios",
|
||||
onRemount: (reason, data) => {
|
||||
addWebViewBreadcrumb("webview remount requested", {
|
||||
reason,
|
||||
...(data ?? {}),
|
||||
});
|
||||
},
|
||||
});
|
||||
const lastRemountKeyRef = useRef<typeof remountKey | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
setAppLifecycleWebViewActive("positions_main", true);
|
||||
return () => setAppLifecycleWebViewActive("positions_main", false);
|
||||
}, []);
|
||||
|
||||
// コマが変化したとき(再生・シーク)に WebView 内の _MOCK_TRAIN を差し替えて再描画
|
||||
const mountedRef = useRef(false);
|
||||
const urlCacheRef = useRef("");
|
||||
const initialInjectDoneRef = useRef(false);
|
||||
const pendingInitialInjectRef = useRef<string | null>(null);
|
||||
const loadEndTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
const focusedRef = useRef(isFocused);
|
||||
const initialLoadReadyNotifiedRef = useRef(false);
|
||||
const previousMockApiFeatureEnabledRef = useRef(mockApiFeatureEnabled);
|
||||
|
||||
useEffect(() => {
|
||||
const previousEnabled = previousMockApiFeatureEnabledRef.current;
|
||||
if (previousEnabled === mockApiFeatureEnabled) return;
|
||||
|
||||
previousMockApiFeatureEnabledRef.current = mockApiFeatureEnabled;
|
||||
addWebViewBreadcrumb("mock mode changed; remounting webview", {
|
||||
previousEnabled,
|
||||
enabled: mockApiFeatureEnabled,
|
||||
focused: focusedRef.current,
|
||||
});
|
||||
remount();
|
||||
}, [mockApiFeatureEnabled, remount]);
|
||||
|
||||
useEffect(() => {
|
||||
focusedRef.current = isFocused;
|
||||
addWebViewBreadcrumb(isFocused ? "webview focused" : "webview blurred", {
|
||||
landscape: isLandscape,
|
||||
mockApi: mockApiFeatureEnabled,
|
||||
});
|
||||
if (!isFocused) return;
|
||||
if (!pendingInitialInjectRef.current) return;
|
||||
addWebViewBreadcrumb("webview pending initial inject resumed on focus");
|
||||
webview?.current?.injectJavaScript(pendingInitialInjectRef.current);
|
||||
pendingInitialInjectRef.current = null;
|
||||
initialInjectDoneRef.current = true;
|
||||
}, [isFocused, isLandscape, mockApiFeatureEnabled]);
|
||||
|
||||
useEffect(() => {
|
||||
if (lastRemountKeyRef.current !== remountKey) {
|
||||
addWebViewBreadcrumb("webview remount key", { remountKey });
|
||||
lastRemountKeyRef.current = remountKey;
|
||||
initialInjectDoneRef.current = false;
|
||||
pendingInitialInjectRef.current = null;
|
||||
initialLoadReadyNotifiedRef.current = false;
|
||||
if (loadEndTimeoutRef.current) {
|
||||
clearTimeout(loadEndTimeoutRef.current);
|
||||
loadEndTimeoutRef.current = null;
|
||||
}
|
||||
}
|
||||
}, [remountKey]);
|
||||
|
||||
useEffect(() => {
|
||||
Sentry.setContext("positions_webview", {
|
||||
focused: isFocused,
|
||||
landscape: isLandscape,
|
||||
mockApi: mockApiFeatureEnabled,
|
||||
remountKey,
|
||||
currentUrl: urlCacheRef.current || null,
|
||||
});
|
||||
}, [isFocused, isLandscape, mockApiFeatureEnabled, remountKey]);
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
addWebViewBreadcrumb("webview cleanup start", {
|
||||
focused: focusedRef.current,
|
||||
currentUrl: urlCacheRef.current || null,
|
||||
});
|
||||
if (loadEndTimeoutRef.current) {
|
||||
clearTimeout(loadEndTimeoutRef.current);
|
||||
loadEndTimeoutRef.current = null;
|
||||
}
|
||||
addWebViewBreadcrumb("webview unmounted");
|
||||
};
|
||||
}, []);
|
||||
useEffect(() => {
|
||||
// 初回マウント時はスキップ(beforeContentLoaded で既に正しいデータが入っている)
|
||||
if (!mountedRef.current) {
|
||||
mountedRef.current = true;
|
||||
addWebViewBreadcrumb("mock positions effect skipped initial mount", {
|
||||
mockApi: mockApiFeatureEnabled,
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!mockApiFeatureEnabled || !mockTrainPositions) return;
|
||||
addWebViewBreadcrumb("mock positions injected", {
|
||||
positionCount: mockTrainPositions.length,
|
||||
});
|
||||
const script = generateMockUpdateScript(mockTrainPositions);
|
||||
webview?.current?.injectJavaScript(script);
|
||||
}, [mockTrainPositions]);
|
||||
var urlcache = "";
|
||||
let once = false;
|
||||
}, [mockApiFeatureEnabled, mockTrainPositions, webview]);
|
||||
|
||||
const attachWebViewRefs = useCallback((instance) => {
|
||||
webview.current = instance;
|
||||
webViewRef.current = instance;
|
||||
}, [webViewRef, webview]);
|
||||
|
||||
const onNavigationStateChange = ({ url }) => {
|
||||
if (url == urlcache) return;
|
||||
if (url == urlCacheRef.current) return;
|
||||
//URL二重判定回避
|
||||
urlcache = url;
|
||||
urlCacheRef.current = url;
|
||||
addWebViewBreadcrumb("webview navigation", { url });
|
||||
switch (true) {
|
||||
case url.includes("https://train.jr-shikoku.co.jp/usage.htm"):
|
||||
if (Platform.OS === "android") navigate("howto", { info: url });
|
||||
@@ -74,7 +189,20 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
|
||||
break;
|
||||
}
|
||||
};
|
||||
const getRestorableUrl = () => {
|
||||
const cachedUrl = urlCacheRef.current;
|
||||
if (!cachedUrl) return initialPositionsUrl;
|
||||
if (cachedUrl.includes("https://train.jr-shikoku.co.jp/usage.htm")) {
|
||||
return initialPositionsUrl;
|
||||
}
|
||||
if (cachedUrl.includes("https://train.jr-shikoku.co.jp/train.html")) {
|
||||
return initialPositionsUrl;
|
||||
}
|
||||
return cachedUrl;
|
||||
};
|
||||
|
||||
const onMessage = (event) => {
|
||||
pingHandlers.onMessage?.(event);
|
||||
const { data } = event.nativeEvent;
|
||||
/**
|
||||
* {type,trainNum,limited}
|
||||
@@ -82,14 +210,27 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
|
||||
* {type,event,id,name,pdf,map,url,chk}
|
||||
*/
|
||||
if (data.includes("train.html")) {
|
||||
addWebViewBreadcrumb("webview train link", { data });
|
||||
navigate("trainbase", { info: data, from: "Train" });
|
||||
return;
|
||||
}
|
||||
if (!originalStationList) {
|
||||
addWebViewBreadcrumb("webview message blocked waiting station data");
|
||||
alert("駅名標データを取得中...");
|
||||
return;
|
||||
}
|
||||
const dataSet = JSON.parse(data);
|
||||
let dataSet;
|
||||
try {
|
||||
dataSet = JSON.parse(data);
|
||||
} catch (error) {
|
||||
addWebViewBreadcrumb("webview message parse failed", {
|
||||
dataPreview: data.slice(0, 120),
|
||||
});
|
||||
throw error;
|
||||
}
|
||||
addWebViewBreadcrumb("webview message", {
|
||||
type: dataSet.type ?? "unknown",
|
||||
});
|
||||
switch (dataSet.type) {
|
||||
case "LoadError": {
|
||||
setLoadError(true);
|
||||
@@ -153,8 +294,30 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
|
||||
}
|
||||
};
|
||||
|
||||
const onLoadStart = () => {
|
||||
pingHandlers.onLoadStart?.();
|
||||
addWebViewBreadcrumb("webview loadStart", {
|
||||
focused: focusedRef.current,
|
||||
currentUrl: urlCacheRef.current || null,
|
||||
});
|
||||
};
|
||||
|
||||
const onLoadEnd = () => {
|
||||
if (once) return () => {};
|
||||
pingHandlers.onLoadEnd?.();
|
||||
addWebViewBreadcrumb("webview loadEnd", {
|
||||
focused: focusedRef.current,
|
||||
hasStationData: !!stationData,
|
||||
hasOriginalStationList: !!originalStationList,
|
||||
favoriteCount: favoriteStation.length,
|
||||
});
|
||||
if (!initialLoadReadyNotifiedRef.current) {
|
||||
initialLoadReadyNotifiedRef.current = true;
|
||||
addWebViewBreadcrumb("webview initial load ready", {
|
||||
focused: focusedRef.current,
|
||||
});
|
||||
onInitialLoadReady?.();
|
||||
}
|
||||
if (initialInjectDoneRef.current) return () => {};
|
||||
if (!stationData) return () => {};
|
||||
if (!originalStationList) return () => {};
|
||||
if (favoriteStation.length < 1) return () => {};
|
||||
@@ -162,17 +325,45 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
|
||||
favoriteStation[0][0].StationNumber
|
||||
);
|
||||
if (!string) return () => {};
|
||||
setTimeout(() => {
|
||||
if (loadEndTimeoutRef.current) {
|
||||
clearTimeout(loadEndTimeoutRef.current);
|
||||
}
|
||||
addWebViewBreadcrumb("webview initial inject scheduled", {
|
||||
focused: focusedRef.current,
|
||||
});
|
||||
loadEndTimeoutRef.current = setTimeout(() => {
|
||||
addWebViewBreadcrumb(
|
||||
focusedRef.current
|
||||
? "webview initial inject run"
|
||||
: "webview initial inject run while blurred",
|
||||
{
|
||||
focused: focusedRef.current,
|
||||
}
|
||||
);
|
||||
webview?.current?.injectJavaScript(string);
|
||||
}, 500);
|
||||
once = true;
|
||||
pendingInitialInjectRef.current = null;
|
||||
initialInjectDoneRef.current = true;
|
||||
loadEndTimeoutRef.current = null;
|
||||
}, focusedRef.current ? 500 : 700);
|
||||
};
|
||||
|
||||
const handleRenderProcessGone = (event) => {
|
||||
addWebViewBreadcrumb("webview render process gone", {
|
||||
didCrash: event.nativeEvent.didCrash,
|
||||
});
|
||||
processHandlers.onRenderProcessGone?.(event);
|
||||
};
|
||||
|
||||
const handleContentProcessDidTerminate = () => {
|
||||
addWebViewBreadcrumb("webview content process terminated");
|
||||
processHandlers.onContentProcessDidTerminate?.();
|
||||
};
|
||||
|
||||
return (
|
||||
<WebView
|
||||
key={(isDark ? 'dark' : 'light') + (mockApiFeatureEnabled ? '-mock' : '-live') + '-' + remountKey}
|
||||
ref={webview}
|
||||
source={{ uri: "https://train.jr-shikoku.co.jp/sp.html" }}
|
||||
key={`positions-webview-${remountKey}`}
|
||||
ref={attachWebViewRefs}
|
||||
source={{ uri: getRestorableUrl() }}
|
||||
originWhitelist={[
|
||||
"https://train.jr-shikoku.co.jp",
|
||||
"https://train.jr-shikoku.co.jp/sp.html",
|
||||
@@ -183,8 +374,21 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
|
||||
setSupportMultipleWindows
|
||||
contentMode="mobile"
|
||||
style={{ backgroundColor: bgColor }}
|
||||
onLoadStart={onLoadStart}
|
||||
onError={(event) => {
|
||||
addWebViewBreadcrumb("webview error", {
|
||||
description: event.nativeEvent.description || null,
|
||||
code: event.nativeEvent.code ?? null,
|
||||
});
|
||||
}}
|
||||
onHttpError={(event) => {
|
||||
addWebViewBreadcrumb("webview http error", {
|
||||
statusCode: event.nativeEvent.statusCode ?? null,
|
||||
});
|
||||
}}
|
||||
onRenderProcessGone={handleRenderProcessGone}
|
||||
onContentProcessDidTerminate={handleContentProcessDidTerminate}
|
||||
{...{ onMessage, onNavigationStateChange, onLoadEnd }}
|
||||
{...processHandlers}
|
||||
injectedJavaScriptBeforeContentLoaded={injectJavascriptBeforeContentLoaded}
|
||||
injectedJavaScript={injectJavascript}
|
||||
/>
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
TouchableOpacity,
|
||||
Text,
|
||||
ScrollView,
|
||||
Platform,
|
||||
} from "react-native";
|
||||
import Carousel, { ICarouselInstance } from "react-native-reanimated-carousel";
|
||||
import { SheetManager } from "react-native-actions-sheet";
|
||||
@@ -27,6 +28,10 @@ import Animated, {
|
||||
} from "react-native-reanimated";
|
||||
import { useSortMode } from "./useSortMode";
|
||||
import { StationSource } from "@/types";
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
|
||||
const isMissingStorageKeyError = (error: unknown) =>
|
||||
String(error).includes("Not Found!");
|
||||
|
||||
export const CarouselBox = ({
|
||||
originalStationList,
|
||||
@@ -45,6 +50,9 @@ export const CarouselBox = ({
|
||||
navigate: any;
|
||||
stationSource: StationSource;
|
||||
}) => {
|
||||
const isAndroid = Platform.OS === "android";
|
||||
const sortControlsEntering = isAndroid ? undefined : FadeIn.duration(200);
|
||||
const sortControlsExiting = isAndroid ? undefined : FadeOut.duration(150);
|
||||
const carouselRef = useRef<ICarouselInstance>(null);
|
||||
const { width } = useWindowDimensions();
|
||||
const { colors, fixed } = useThemeColors();
|
||||
@@ -109,6 +117,15 @@ export const CarouselBox = ({
|
||||
// コンテナ高さ(カルーセル ↔ グリッドで可変)
|
||||
const containerHeight = useSharedValue(carouselHeight);
|
||||
const containerHeightStyle = useAnimatedStyle(() => ({ height: containerHeight.value }));
|
||||
const androidContainerStyle = isAndroid ? { height: isSortMode ? gridHeight : carouselHeight } : null;
|
||||
const carouselModeProps = {
|
||||
mode: "parallax" as const,
|
||||
modeConfig: {
|
||||
parallaxScrollingScale: 1,
|
||||
parallaxScrollingOffset: 100,
|
||||
parallaxAdjacentItemScale: 0.8,
|
||||
},
|
||||
};
|
||||
|
||||
// ドットエリアのフェード
|
||||
const dotsOpacity = useSharedValue(1);
|
||||
@@ -122,6 +139,11 @@ export const CarouselBox = ({
|
||||
const gridAnimStyle = useAnimatedStyle(() => ({ opacity: gridOpacity.value }));
|
||||
|
||||
useEffect(() => {
|
||||
if (isAndroid) {
|
||||
setIsGridMounted(isSortMode);
|
||||
return;
|
||||
}
|
||||
|
||||
const duration = 250;
|
||||
if (isSortMode) {
|
||||
setIsGridMounted(true); // フェードイン前にマウント
|
||||
@@ -137,7 +159,7 @@ export const CarouselBox = ({
|
||||
if (finished) runOnJS(setIsGridMounted)(false); // フェードアウト完了後にアンマウント
|
||||
});
|
||||
}
|
||||
}, [isSortMode, gridHeight, carouselHeight]);
|
||||
}, [isAndroid, isSortMode, gridHeight, carouselHeight]);
|
||||
|
||||
// ソートモード終了直後フラグ(次の listIndex 変更でアニメーションをスキップ)
|
||||
const justExitedSortRef = useRef(false);
|
||||
@@ -150,11 +172,10 @@ export const CarouselBox = ({
|
||||
|
||||
// バッジからのインデックス変更をカルーセルに反映
|
||||
useEffect(() => {
|
||||
if (listIndex >= 0 && carouselRef.current) {
|
||||
const animated = !justExitedSortRef.current;
|
||||
justExitedSortRef.current = false;
|
||||
carouselRef.current.scrollTo({ index: listIndex, animated });
|
||||
}
|
||||
if (listIndex < 0) return;
|
||||
const animated = !justExitedSortRef.current;
|
||||
justExitedSortRef.current = false;
|
||||
carouselRef.current?.scrollTo({ index: listIndex, animated });
|
||||
}, [listIndex]);
|
||||
|
||||
// ドットのスクロール追従
|
||||
@@ -167,9 +188,39 @@ export const CarouselBox = ({
|
||||
|
||||
// ドット表示設定の読み込み
|
||||
useEffect(() => {
|
||||
AS.getItem("CarouselSettings/activeDotSettings").then((data) => {
|
||||
setDotButton(data === "true");
|
||||
Sentry.addBreadcrumb({
|
||||
category: "menu.carousel",
|
||||
level: "info",
|
||||
message: "carousel activeDotSettings read scheduled",
|
||||
});
|
||||
AS.getItem("CarouselSettings/activeDotSettings")
|
||||
.then((data) => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "menu.carousel",
|
||||
level: "info",
|
||||
message: "carousel activeDotSettings read success",
|
||||
data: {
|
||||
rawValue: data == null ? "<null>" : String(data),
|
||||
resolved: data === "true",
|
||||
},
|
||||
});
|
||||
setDotButton(data === "true");
|
||||
})
|
||||
.catch((error) => {
|
||||
setDotButton(false);
|
||||
if (isMissingStorageKeyError(error)) {
|
||||
return;
|
||||
}
|
||||
Sentry.addBreadcrumb({
|
||||
category: "menu.carousel",
|
||||
level: "error",
|
||||
message: "carousel activeDotSettings read failed",
|
||||
data: {
|
||||
errorName: error instanceof Error ? error.name : typeof error,
|
||||
errorMessage: error instanceof Error ? error.message : String(error),
|
||||
},
|
||||
});
|
||||
});
|
||||
}, []);
|
||||
|
||||
const oPSign = () => {
|
||||
@@ -199,7 +250,38 @@ export const CarouselBox = ({
|
||||
duration: 600,
|
||||
update: { type: "spring", springDamping: 0.5 },
|
||||
});
|
||||
AS.setItem("CarouselSettings/activeDotSettings", !dotButton ? "true" : "false");
|
||||
const nextValue = !dotButton ? "true" : "false";
|
||||
Sentry.addBreadcrumb({
|
||||
category: "menu.carousel",
|
||||
level: "info",
|
||||
message: "carousel activeDotSettings write scheduled",
|
||||
data: {
|
||||
nextValue,
|
||||
},
|
||||
});
|
||||
void AS.setItem("CarouselSettings/activeDotSettings", nextValue)
|
||||
.then(() => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "menu.carousel",
|
||||
level: "info",
|
||||
message: "carousel activeDotSettings write success",
|
||||
data: {
|
||||
nextValue,
|
||||
},
|
||||
});
|
||||
})
|
||||
.catch((error) => {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "menu.carousel",
|
||||
level: "error",
|
||||
message: "carousel activeDotSettings write failed",
|
||||
data: {
|
||||
nextValue,
|
||||
errorName: error instanceof Error ? error.name : typeof error,
|
||||
errorMessage: error instanceof Error ? error.message : String(error),
|
||||
},
|
||||
});
|
||||
});
|
||||
setDotButton(!dotButton);
|
||||
};
|
||||
|
||||
@@ -255,10 +337,10 @@ export const CarouselBox = ({
|
||||
return (
|
||||
<View style={{ flex: 1, paddingTop: 10 }}>
|
||||
{/* カルーセル / グリッド(同じ高さ領域を共用・クロスフェード) */}
|
||||
<Animated.View style={[{ overflow: "visible" }, containerHeightStyle]}>
|
||||
<Animated.View style={[{ overflow: "visible" }, isAndroid ? androidContainerStyle : containerHeightStyle]}>
|
||||
{/* カルーセル */}
|
||||
<Animated.View
|
||||
style={[{ position: "absolute", width }, carouselAnimStyle]}
|
||||
style={[{ position: "absolute", width }, isAndroid ? { opacity: isSortMode ? 0 : 1 } : carouselAnimStyle]}
|
||||
pointerEvents={isSortMode ? "none" : "auto"}
|
||||
>
|
||||
<Carousel
|
||||
@@ -270,13 +352,7 @@ export const CarouselBox = ({
|
||||
loop={false}
|
||||
width={width}
|
||||
style={{ width, alignContent: "center" }}
|
||||
mode="parallax"
|
||||
modeConfig={{
|
||||
parallaxScrollingScale: 1,
|
||||
parallaxScrollingOffset: 100,
|
||||
parallaxAdjacentItemScale: 0.8,
|
||||
}}
|
||||
scrollAnimationDuration={600}
|
||||
scrollAnimationDuration={isAndroid ? 450 : 600}
|
||||
onSnapToItem={setListIndex}
|
||||
renderItem={RenderItem}
|
||||
overscrollEnabled={false}
|
||||
@@ -285,6 +361,8 @@ export const CarouselBox = ({
|
||||
? 0
|
||||
: lastValidListIndexRef.current
|
||||
}
|
||||
enabled={!isSortMode}
|
||||
{...carouselModeProps}
|
||||
/>
|
||||
</Animated.View>
|
||||
|
||||
@@ -293,7 +371,7 @@ export const CarouselBox = ({
|
||||
<Animated.View
|
||||
style={[
|
||||
{ position: "absolute", width, height: gridHeight, paddingHorizontal: gridPad, overflow: "visible" },
|
||||
gridAnimStyle,
|
||||
isAndroid ? { opacity: 1 } : gridAnimStyle,
|
||||
]}
|
||||
>
|
||||
<Sortable.Grid
|
||||
@@ -311,7 +389,7 @@ export const CarouselBox = ({
|
||||
</Animated.View>
|
||||
|
||||
{/* ドットエリア:ソートモード時はフェードアウト */}
|
||||
<Animated.View style={dotsAnimStyle} pointerEvents={isSortMode ? "none" : "auto"}>
|
||||
<Animated.View style={isAndroid ? { opacity: isSortMode ? 0 : 1 } : dotsAnimStyle} pointerEvents={isSortMode ? "none" : "auto"}>
|
||||
<ScrollView
|
||||
horizontal
|
||||
showsHorizontalScrollIndicator={false}
|
||||
@@ -355,8 +433,8 @@ export const CarouselBox = ({
|
||||
{/* 並び替えコントロール:ソートモード時に最下部からスライドイン */}
|
||||
{isSortMode && (
|
||||
<Animated.View
|
||||
entering={FadeIn.duration(200)}
|
||||
exiting={FadeOut.duration(150)}
|
||||
entering={sortControlsEntering}
|
||||
exiting={sortControlsExiting}
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import React, { useState, useEffect, useRef } from "react";
|
||||
import React, { useState, useEffect } from "react";
|
||||
import {
|
||||
Alert,
|
||||
View,
|
||||
Text,
|
||||
ScrollView,
|
||||
@@ -12,7 +11,6 @@ import {
|
||||
import { Switch } from "@rneui/themed";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import { MaterialCommunityIcons } from "@expo/vector-icons";
|
||||
import Swipeable from "react-native-gesture-handler/Swipeable";
|
||||
import { SheetHeaderItem } from "@/components/atom/SheetHeaderItem";
|
||||
import { AS } from "../../storageControl";
|
||||
import { STORAGE_KEYS } from "@/constants";
|
||||
@@ -278,19 +276,7 @@ const ELESITE_FEATURES: Feature[] = [
|
||||
/* ------------------------------------------------------------------ */
|
||||
export const DataSourceSettings = () => {
|
||||
const navigation = useNavigation();
|
||||
const {
|
||||
updatePermission,
|
||||
mockApiFeatureEnabled,
|
||||
setMockApiFeatureEnabled,
|
||||
recorderState,
|
||||
recordingSnapshotCount,
|
||||
recordingList,
|
||||
startRecording,
|
||||
stopRecording,
|
||||
startPlayback,
|
||||
stopPlayback,
|
||||
deleteRecording,
|
||||
} = useTrainMenu();
|
||||
const { updatePermission } = useTrainMenu();
|
||||
const { colors, fixed } = useThemeColors();
|
||||
const showDebugSelector = __DEV__ || updatePermission;
|
||||
const [useUnyohub, setUseUnyohub] = useState(false);
|
||||
@@ -304,8 +290,6 @@ export const DataSourceSettings = () => {
|
||||
useState<JrDataSystemUiVariant>(
|
||||
getJrDataSystemUiVariant(DEFAULT_JR_DATA_SYSTEM_ENV),
|
||||
);
|
||||
const recordingSwipeRefs = useRef<Record<string, { close: () => void } | null>>({});
|
||||
|
||||
const applyJrDataSystemEnv = (env: JrDataSystemEnvironmentKey) => {
|
||||
setJrDataSystemEnv(env);
|
||||
setJrDataSystemTrack(getJrDataSystemTrack(env));
|
||||
@@ -361,28 +345,6 @@ export const DataSourceSettings = () => {
|
||||
applyJrDataSystemEnv(env);
|
||||
};
|
||||
|
||||
const closeRecordingSwipe = (id: string) => {
|
||||
recordingSwipeRefs.current[id]?.close();
|
||||
};
|
||||
|
||||
const confirmDeleteRecording = (id: string, label: string) => {
|
||||
closeRecordingSwipe(id);
|
||||
Alert.alert(
|
||||
"録画を削除",
|
||||
`${label} の録画を削除しますか?`,
|
||||
[
|
||||
{ text: "キャンセル", style: "cancel" },
|
||||
{
|
||||
text: "削除",
|
||||
style: "destructive",
|
||||
onPress: () => {
|
||||
void deleteRecording(id);
|
||||
},
|
||||
},
|
||||
],
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<View style={[styles.container, { backgroundColor: fixed.primary }]}>
|
||||
<SheetHeaderItem
|
||||
@@ -451,224 +413,6 @@ export const DataSourceSettings = () => {
|
||||
|
||||
{showDebugSelector && (
|
||||
<>
|
||||
<View
|
||||
style={[
|
||||
styles.debugSection,
|
||||
{
|
||||
backgroundColor: colors.surface,
|
||||
borderColor: colors.borderSecondary,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Text style={[styles.debugTitle, { color: colors.textPrimary }]}>
|
||||
デバッグ: モックAPI検証
|
||||
</Text>
|
||||
<Text
|
||||
style={[
|
||||
styles.debugDescription,
|
||||
{ color: colors.textSecondary },
|
||||
]}
|
||||
>
|
||||
公式サイトの代わりにサンプルデータを流し込みます。
|
||||
</Text>
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
marginTop: 8,
|
||||
}}
|
||||
>
|
||||
<Text
|
||||
style={[
|
||||
styles.debugCurrentText,
|
||||
{ color: colors.textPrimary, fontSize: 14 },
|
||||
]}
|
||||
>
|
||||
モックAPI検証機能
|
||||
</Text>
|
||||
<Switch
|
||||
value={mockApiFeatureEnabled}
|
||||
onValueChange={setMockApiFeatureEnabled}
|
||||
color={fixed.primary}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
{/* 録画・再生 */}
|
||||
<View
|
||||
style={[
|
||||
styles.debugSection,
|
||||
{ backgroundColor: colors.surface, borderColor: colors.borderSecondary },
|
||||
]}
|
||||
>
|
||||
<Text style={[styles.debugTitle, { color: colors.textPrimary }]}>
|
||||
デバッグ: 走行位置録画
|
||||
</Text>
|
||||
<Text style={[styles.debugDescription, { color: colors.textSecondary }]}>
|
||||
ライブデータを録画してモックとして再生します。録画中はモックOFFになります。
|
||||
</Text>
|
||||
|
||||
{/* ステータス行 */}
|
||||
<View style={{ flexDirection: "row", alignItems: "center", marginTop: 8, gap: 8 }}>
|
||||
<View
|
||||
style={{
|
||||
width: 10, height: 10, borderRadius: 5,
|
||||
backgroundColor:
|
||||
recorderState === 'recording' ? '#e53935' :
|
||||
recorderState === 'playing' ? '#43a047' : colors.borderSecondary,
|
||||
}}
|
||||
/>
|
||||
<Text style={[styles.debugCurrentText, { color: colors.textSecondary, fontSize: 13 }]}>
|
||||
{recorderState === 'recording'
|
||||
? `録画中… ${recordingSnapshotCount} スナップショット`
|
||||
: recorderState === 'playing'
|
||||
? '再生中'
|
||||
: `${recordingList.length} 件の録画`}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
{/* 録画開始 / 停止ボタン */}
|
||||
<View style={{ flexDirection: "row", gap: 8, marginTop: 10, flexWrap: "wrap" }}>
|
||||
{recorderState === 'idle' && (
|
||||
<TouchableOpacity
|
||||
onPress={startRecording}
|
||||
style={{
|
||||
backgroundColor: '#e53935', borderRadius: 8,
|
||||
paddingHorizontal: 14, paddingVertical: 8,
|
||||
}}
|
||||
>
|
||||
<Text style={{ color: '#fff', fontWeight: 'bold', fontSize: 13 }}>● 録画開始</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
{recorderState === 'recording' && (
|
||||
<TouchableOpacity
|
||||
onPress={stopRecording}
|
||||
style={{
|
||||
backgroundColor: colors.borderSecondary, borderRadius: 8,
|
||||
paddingHorizontal: 14, paddingVertical: 8,
|
||||
}}
|
||||
>
|
||||
<Text style={{ color: colors.textPrimary, fontWeight: 'bold', fontSize: 13 }}>■ 録画停止</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
{recorderState === 'playing' && (
|
||||
<TouchableOpacity
|
||||
onPress={stopPlayback}
|
||||
style={{
|
||||
backgroundColor: colors.borderSecondary, borderRadius: 8,
|
||||
paddingHorizontal: 14, paddingVertical: 8,
|
||||
}}
|
||||
>
|
||||
<Text style={{ color: colors.textPrimary, fontWeight: 'bold', fontSize: 13 }}>■ 再生停止</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
</View>
|
||||
|
||||
{/* 録画一覧 */}
|
||||
{recordingList.length > 0 && recorderState !== 'recording' && (
|
||||
<View style={{ marginTop: 10, gap: 6 }}>
|
||||
{recordingList.map((rec) => {
|
||||
const isPlaying = recorderState === 'playing';
|
||||
const durationSec = Math.round(rec.durationMs / 1000);
|
||||
const durationLabel = durationSec >= 60
|
||||
? `${Math.floor(durationSec / 60)}分${durationSec % 60}秒`
|
||||
: `${durationSec}秒`;
|
||||
const dateLabel = new Date(rec.recordedAt).toLocaleString('ja-JP', {
|
||||
month: 'numeric', day: 'numeric',
|
||||
hour: '2-digit', minute: '2-digit',
|
||||
});
|
||||
const recordingRow = (
|
||||
<TouchableOpacity
|
||||
onPress={() => startPlayback(rec.id)}
|
||||
disabled={isPlaying}
|
||||
activeOpacity={0.72}
|
||||
style={{
|
||||
flexDirection: 'row', alignItems: 'center',
|
||||
backgroundColor: colors.backgroundSecondary,
|
||||
borderRadius: 8, padding: 12, gap: 10,
|
||||
opacity: isPlaying ? 0.6 : 1,
|
||||
}}
|
||||
>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={{ color: colors.textPrimary, fontSize: 13, fontWeight: 'bold' }}>
|
||||
{dateLabel}
|
||||
</Text>
|
||||
<Text style={{ color: colors.textSecondary, fontSize: 11 }}>
|
||||
{rec.snapshotCount} コマ / {durationLabel}
|
||||
</Text>
|
||||
</View>
|
||||
<View style={{ alignItems: 'flex-end', gap: 4 }}>
|
||||
<View style={{ flexDirection: 'row', alignItems: 'center', gap: 4 }}>
|
||||
<MaterialCommunityIcons
|
||||
name={isPlaying ? 'pause-circle-outline' : 'play-circle-outline'}
|
||||
size={18}
|
||||
color={isPlaying ? colors.textTertiary : '#43a047'}
|
||||
/>
|
||||
<Text
|
||||
style={{
|
||||
color: isPlaying ? colors.textTertiary : colors.textPrimary,
|
||||
fontSize: 12,
|
||||
fontWeight: '600',
|
||||
}}
|
||||
>
|
||||
{isPlaying ? '再生中は操作不可' : 'タップで再生'}
|
||||
</Text>
|
||||
</View>
|
||||
{!isPlaying && (
|
||||
<Text style={{ color: colors.textTertiary, fontSize: 10 }}>
|
||||
左へスワイプで削除
|
||||
</Text>
|
||||
)}
|
||||
</View>
|
||||
<MaterialCommunityIcons
|
||||
name="chevron-right"
|
||||
size={18}
|
||||
color={colors.iconSecondary}
|
||||
/>
|
||||
</TouchableOpacity>
|
||||
);
|
||||
|
||||
if (isPlaying) {
|
||||
return <View key={rec.id}>{recordingRow}</View>;
|
||||
}
|
||||
|
||||
return (
|
||||
<Swipeable
|
||||
key={rec.id}
|
||||
ref={(instance) => {
|
||||
recordingSwipeRefs.current[rec.id] = instance;
|
||||
}}
|
||||
friction={2}
|
||||
overshootRight={false}
|
||||
rightThreshold={48}
|
||||
renderRightActions={() => (
|
||||
<View
|
||||
style={{
|
||||
width: 96,
|
||||
borderRadius: 8,
|
||||
backgroundColor: '#e53935',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
marginLeft: 6,
|
||||
}}
|
||||
>
|
||||
<MaterialCommunityIcons name="trash-can-outline" size={18} color="#fff" />
|
||||
<Text style={{ color: '#fff', fontSize: 11, fontWeight: 'bold', marginTop: 4 }}>
|
||||
削除
|
||||
</Text>
|
||||
</View>
|
||||
)}
|
||||
onSwipeableOpen={() => confirmDeleteRecording(rec.id, dateLabel)}
|
||||
>
|
||||
{recordingRow}
|
||||
</Swipeable>
|
||||
);
|
||||
})}
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
|
||||
<View
|
||||
style={[
|
||||
styles.debugSection,
|
||||
|
||||
@@ -24,23 +24,49 @@ export const LayoutSettings = ({
|
||||
setTrainPosition,
|
||||
headerSize,
|
||||
setHeaderSize,
|
||||
allowHubIcon = false,
|
||||
}) => {
|
||||
const { goBack } = useNavigation() as any;
|
||||
const { colors, fixed } = useThemeColors();
|
||||
const visibleIconSetting =
|
||||
allowHubIcon || iconSetting !== "hub" ? iconSetting : "original";
|
||||
return (
|
||||
<View style={{ height: "100%", backgroundColor: fixed.primary }}>
|
||||
<SheetHeaderItem title="レイアウト設定" LeftItem={{ title: "< 設定", onPress: goBack }} />
|
||||
<ScrollView style={{ flex: 1, backgroundColor: colors.background }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<SwitchArea
|
||||
str="列車アイコン表示"
|
||||
bool={iconSetting}
|
||||
setBool={setIconSetting}
|
||||
falseImage={require("../../assets/configuration/icon_default.jpg")}
|
||||
trueImage={require("../../assets/configuration/icon_original.jpg")}
|
||||
falseText={"本家\n(文字アイコン)"}
|
||||
trueText={"オリジナル\n(車種アイコン)"}
|
||||
/>
|
||||
<View
|
||||
style={{
|
||||
backgroundColor: "#00000010",
|
||||
borderRadius: 10,
|
||||
margin: 5,
|
||||
}}
|
||||
>
|
||||
<TripleSwitchArea
|
||||
str="列車アイコン表示"
|
||||
bool={visibleIconSetting}
|
||||
setBool={setIconSetting}
|
||||
firstItem={{
|
||||
firstImage: require("../../assets/configuration/icon_default.jpg"),
|
||||
firstText: "本家\n(文字アイコン)",
|
||||
firstValue: "default",
|
||||
}}
|
||||
secondItem={{
|
||||
secondImage: require("../../assets/configuration/icon_original.jpg"),
|
||||
secondText: "オリジナル\n(車種アイコン)",
|
||||
secondValue: "original",
|
||||
}}
|
||||
thirdItem={
|
||||
allowHubIcon
|
||||
? {
|
||||
thirdImage: require("../../assets/relationLogo/unyohub_logo.webp"),
|
||||
thirdText: "鉄道運用Hub\n(Hubアイコン)",
|
||||
thirdValue: "hub",
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
</View>
|
||||
<SwitchArea
|
||||
str="列車表示"
|
||||
bool={uiSetting}
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
import React from "react";
|
||||
import { View, Text, ScrollView } from "react-native";
|
||||
import { Switch } from "@rneui/themed";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import { SheetHeaderItem } from "@/components/atom/SheetHeaderItem";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
|
||||
type OperationInfoSettingsProps = {
|
||||
operationLandscapeEnabled: boolean;
|
||||
setOperationLandscapeEnabled: (value: boolean) => void;
|
||||
operationCaptureEnabled: boolean;
|
||||
setOperationCaptureEnabled: (value: boolean) => void;
|
||||
};
|
||||
|
||||
export const OperationInfoSettings = ({
|
||||
operationLandscapeEnabled,
|
||||
setOperationLandscapeEnabled,
|
||||
operationCaptureEnabled,
|
||||
setOperationCaptureEnabled,
|
||||
}: OperationInfoSettingsProps) => {
|
||||
const { goBack } = useNavigation();
|
||||
const { colors, fixed } = useThemeColors();
|
||||
|
||||
return (
|
||||
<View style={{ height: "100%", backgroundColor: fixed.primary }}>
|
||||
<SheetHeaderItem
|
||||
title="運行情報設定(β)"
|
||||
LeftItem={{ title: "< 設定", onPress: goBack }}
|
||||
/>
|
||||
<ScrollView style={{ flex: 1, backgroundColor: colors.background }}>
|
||||
<SettingRow
|
||||
title="横倒し表示機能"
|
||||
description="端末を横向きにしたとき、運行情報ページを見やすく再構成した専用表示を有効にします。"
|
||||
value={operationLandscapeEnabled}
|
||||
onValueChange={setOperationLandscapeEnabled}
|
||||
/>
|
||||
<SettingRow
|
||||
title="スクリーンショット切り出し機能"
|
||||
description="運行情報ページ内に、項目単位・全体単位の切り出しボタンを表示します。"
|
||||
value={operationCaptureEnabled}
|
||||
onValueChange={setOperationCaptureEnabled}
|
||||
/>
|
||||
</ScrollView>
|
||||
</View>
|
||||
);
|
||||
};
|
||||
|
||||
type SettingRowProps = {
|
||||
title: string;
|
||||
description: string;
|
||||
value: boolean;
|
||||
onValueChange: (value: boolean) => void;
|
||||
};
|
||||
|
||||
const SettingRow = ({ title, description, value, onValueChange }: SettingRowProps) => {
|
||||
const { colors, fixed } = useThemeColors();
|
||||
|
||||
return (
|
||||
<View
|
||||
style={{
|
||||
paddingHorizontal: 15,
|
||||
paddingVertical: 14,
|
||||
borderBottomWidth: 1,
|
||||
borderBottomColor: colors.borderSecondary ?? "#ccc",
|
||||
backgroundColor: colors.surface,
|
||||
gap: 8,
|
||||
}}
|
||||
>
|
||||
<View style={{ flexDirection: "row", alignItems: "center", gap: 12 }}>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={{ fontSize: 16, fontWeight: "600", color: colors.text }}>
|
||||
{title}
|
||||
</Text>
|
||||
<Text style={{ marginTop: 4, fontSize: 13, lineHeight: 19, color: colors.textSecondary }}>
|
||||
{description}
|
||||
</Text>
|
||||
</View>
|
||||
<Switch
|
||||
value={value}
|
||||
onValueChange={onValueChange}
|
||||
color={fixed.primary}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
};
|
||||
@@ -0,0 +1,528 @@
|
||||
import React, { useRef, useState } from "react";
|
||||
import {
|
||||
Alert,
|
||||
ScrollView,
|
||||
StyleSheet,
|
||||
Text,
|
||||
TouchableOpacity,
|
||||
View,
|
||||
} from "react-native";
|
||||
import { Switch } from "@rneui/themed";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import { MaterialCommunityIcons } from "@expo/vector-icons";
|
||||
import Swipeable from "react-native-gesture-handler/Swipeable";
|
||||
import { SheetHeaderItem } from "@/components/atom/SheetHeaderItem";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
import { useTrainMenu } from "@/stateBox/useTrainMenu";
|
||||
import { useNotification } from "@/stateBox/useNotifications";
|
||||
|
||||
export const ResearchToolsSettings = () => {
|
||||
const navigation = useNavigation<any>();
|
||||
const { colors, fixed } = useThemeColors();
|
||||
const { expoPushToken } = useNotification();
|
||||
const {
|
||||
updatePermission,
|
||||
mockApiFeatureEnabled,
|
||||
setMockApiFeatureEnabled,
|
||||
recorderState,
|
||||
recordingSnapshotCount,
|
||||
recordingList,
|
||||
startRecording,
|
||||
stopRecording,
|
||||
startPlayback,
|
||||
stopPlayback,
|
||||
deleteRecording,
|
||||
exportRecordingFile,
|
||||
exportAllRecordingsFile,
|
||||
importRecordingFile,
|
||||
} = useTrainMenu();
|
||||
const showResearchTools = __DEV__ || updatePermission;
|
||||
const recordingSwipeRefs = useRef<Record<string, { close: () => void } | null>>({});
|
||||
const [recordingFileStatus, setRecordingFileStatus] = useState<{
|
||||
type: "info" | "success" | "error";
|
||||
text: string;
|
||||
}>({ type: "info", text: "録画JSONの書き出しと読み込みができます。" });
|
||||
|
||||
const closeRecordingSwipe = (id: string) => {
|
||||
recordingSwipeRefs.current[id]?.close();
|
||||
};
|
||||
|
||||
const confirmDeleteRecording = (id: string, label: string) => {
|
||||
closeRecordingSwipe(id);
|
||||
Alert.alert("録画を削除", `${label} の録画を削除しますか?`, [
|
||||
{ text: "キャンセル", style: "cancel" },
|
||||
{
|
||||
text: "削除",
|
||||
style: "destructive",
|
||||
onPress: () => {
|
||||
void deleteRecording(id);
|
||||
},
|
||||
},
|
||||
]);
|
||||
};
|
||||
|
||||
const setFileStatus = (type: "info" | "success" | "error", text: string) => {
|
||||
setRecordingFileStatus({ type, text });
|
||||
};
|
||||
|
||||
const handleExportRecordingFile = async (id: string, label: string) => {
|
||||
try {
|
||||
await exportRecordingFile(id);
|
||||
setFileStatus("success", `${label} の録画JSONを書き出しました。`);
|
||||
} catch (error) {
|
||||
setFileStatus(
|
||||
"error",
|
||||
`録画JSONを書き出せませんでした: ${(error as Error).message}`,
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const handleExportAllRecordingsFile = async () => {
|
||||
try {
|
||||
await exportAllRecordingsFile();
|
||||
setFileStatus("success", `${recordingList.length}件の録画JSONを書き出しました。`);
|
||||
} catch (error) {
|
||||
setFileStatus(
|
||||
"error",
|
||||
`録画JSONを書き出せませんでした: ${(error as Error).message}`,
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const handleImportRecordingFile = async () => {
|
||||
try {
|
||||
const result = await importRecordingFile();
|
||||
if (!result) {
|
||||
setFileStatus("info", "録画JSONの読み込みをキャンセルしました。");
|
||||
return;
|
||||
}
|
||||
setFileStatus(
|
||||
"success",
|
||||
result.overwrittenCount > 0
|
||||
? `${result.importedCount}件を読み込みました。${result.overwrittenCount}件は同じIDのため上書きしました。`
|
||||
: `${result.importedCount}件を読み込みました。`,
|
||||
);
|
||||
} catch (error) {
|
||||
setFileStatus(
|
||||
"error",
|
||||
`録画JSONを読み込めませんでした: ${(error as Error).message}`,
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const openRecordingDatabase = () => {
|
||||
const uri = `https://experimental.shikoku-railinfo.haruk.in/position-board?from=eachTrainInfo&userID=${encodeURIComponent(expoPushToken || "")}`;
|
||||
const params = {
|
||||
uri,
|
||||
importRecordingDownloads: true,
|
||||
useExitButton: false,
|
||||
};
|
||||
const parentNavigation = navigation.getParent?.();
|
||||
if (parentNavigation) {
|
||||
parentNavigation.navigate("generalWebView", params);
|
||||
return;
|
||||
}
|
||||
navigation.navigate("generalWebView", params);
|
||||
};
|
||||
|
||||
return (
|
||||
<View style={[styles.container, { backgroundColor: fixed.primary }]}>
|
||||
<SheetHeaderItem
|
||||
title="調査ツール"
|
||||
LeftItem={{
|
||||
title: "< 戻る",
|
||||
onPress: () => navigation.goBack(),
|
||||
position: "left",
|
||||
}}
|
||||
/>
|
||||
<ScrollView
|
||||
style={[styles.content, { backgroundColor: colors.backgroundSecondary }]}
|
||||
contentContainerStyle={styles.contentInner}
|
||||
>
|
||||
{!showResearchTools ? (
|
||||
<View
|
||||
style={[
|
||||
styles.debugSection,
|
||||
{
|
||||
backgroundColor: colors.surface,
|
||||
borderColor: colors.borderSecondary,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Text style={[styles.debugTitle, { color: colors.textPrimary }]}>利用できる調査ツールはありません</Text>
|
||||
<Text style={[styles.debugDescription, { color: colors.textSecondary }]}>このページは開発・管理向けの調査機能を配置しています。</Text>
|
||||
</View>
|
||||
) : (
|
||||
<>
|
||||
<View
|
||||
style={[
|
||||
styles.debugSection,
|
||||
{
|
||||
backgroundColor: colors.surface,
|
||||
borderColor: colors.borderSecondary,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Text style={[styles.debugTitle, { color: colors.textPrimary }]}>デバッグ: モックAPI検証</Text>
|
||||
<Text style={[styles.debugDescription, { color: colors.textSecondary }]}>公式サイトの代わりにサンプルデータを流し込みます。</Text>
|
||||
<View style={styles.switchRow}>
|
||||
<Text style={[styles.debugCurrentText, { color: colors.textPrimary, fontSize: 14 }]}>モックAPI検証機能</Text>
|
||||
<Switch
|
||||
value={mockApiFeatureEnabled}
|
||||
onValueChange={setMockApiFeatureEnabled}
|
||||
color={fixed.primary}
|
||||
/>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
<View
|
||||
style={[
|
||||
styles.debugSection,
|
||||
{
|
||||
backgroundColor: colors.surface,
|
||||
borderColor: colors.borderSecondary,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Text style={[styles.debugTitle, { color: colors.textPrimary }]}>デバッグ: 走行位置録画</Text>
|
||||
<Text style={[styles.debugDescription, { color: colors.textSecondary }]}>ライブデータを録画してモックとして再生します。録画中はモックOFFになります。</Text>
|
||||
|
||||
<View style={styles.statusRow}>
|
||||
<View
|
||||
style={{
|
||||
width: 10,
|
||||
height: 10,
|
||||
borderRadius: 5,
|
||||
backgroundColor:
|
||||
recorderState === "recording"
|
||||
? "#e53935"
|
||||
: recorderState === "playing"
|
||||
? "#43a047"
|
||||
: colors.borderSecondary,
|
||||
}}
|
||||
/>
|
||||
<Text style={[styles.debugCurrentText, { color: colors.textSecondary, fontSize: 13 }]}>
|
||||
{recorderState === "recording"
|
||||
? `録画中… ${recordingSnapshotCount} スナップショット`
|
||||
: recorderState === "playing"
|
||||
? "再生中"
|
||||
: `${recordingList.length} 件の録画`}
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
<View style={styles.buttonRow}>
|
||||
{recorderState === "idle" && (
|
||||
<TouchableOpacity onPress={startRecording} style={styles.recordButton}>
|
||||
<Text style={styles.primaryButtonText}>● 録画開始</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
{recorderState === "recording" && (
|
||||
<TouchableOpacity onPress={stopRecording} style={[styles.neutralButton, { backgroundColor: colors.borderSecondary }]}>
|
||||
<Text style={[styles.neutralButtonText, { color: colors.textPrimary }]}>■ 録画停止</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
{recorderState === "playing" && (
|
||||
<TouchableOpacity onPress={stopPlayback} style={[styles.neutralButton, { backgroundColor: colors.borderSecondary }]}>
|
||||
<Text style={[styles.neutralButtonText, { color: colors.textPrimary }]}>■ 再生停止</Text>
|
||||
</TouchableOpacity>
|
||||
)}
|
||||
</View>
|
||||
|
||||
<View style={[styles.fileBox, { backgroundColor: colors.backgroundTertiary }]}>
|
||||
<Text style={{ color: colors.textPrimary, fontSize: 13, fontWeight: "600" }}>録画JSONファイル</Text>
|
||||
<View style={styles.buttonRow}>
|
||||
<TouchableOpacity
|
||||
onPress={() => {
|
||||
void handleImportRecordingFile();
|
||||
}}
|
||||
disabled={recorderState === "recording"}
|
||||
style={{
|
||||
backgroundColor: recorderState === "recording" ? colors.borderSecondary : fixed.primary,
|
||||
borderRadius: 8,
|
||||
paddingHorizontal: 12,
|
||||
paddingVertical: 8,
|
||||
opacity: recorderState === "recording" ? 0.6 : 1,
|
||||
}}
|
||||
>
|
||||
<Text style={{ color: fixed.textOnPrimary, fontWeight: "bold", fontSize: 12 }}>JSONを読み込む</Text>
|
||||
</TouchableOpacity>
|
||||
<TouchableOpacity
|
||||
onPress={() => {
|
||||
void handleExportAllRecordingsFile();
|
||||
}}
|
||||
disabled={recordingList.length === 0 || recorderState === "recording"}
|
||||
style={{
|
||||
backgroundColor:
|
||||
recordingList.length === 0 || recorderState === "recording"
|
||||
? colors.borderSecondary
|
||||
: colors.surface,
|
||||
borderRadius: 8,
|
||||
borderWidth: 1,
|
||||
borderColor: colors.borderSecondary,
|
||||
paddingHorizontal: 12,
|
||||
paddingVertical: 8,
|
||||
opacity: recordingList.length === 0 || recorderState === "recording" ? 0.6 : 1,
|
||||
}}
|
||||
>
|
||||
<Text style={{ color: colors.textPrimary, fontWeight: "bold", fontSize: 12 }}>全件を書き出す</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
<View
|
||||
style={{
|
||||
borderRadius: 8,
|
||||
paddingHorizontal: 10,
|
||||
paddingVertical: 8,
|
||||
backgroundColor:
|
||||
recordingFileStatus.type === "success"
|
||||
? "#43a04722"
|
||||
: recordingFileStatus.type === "error"
|
||||
? "#e5393522"
|
||||
: colors.surface,
|
||||
borderWidth: 1,
|
||||
borderColor:
|
||||
recordingFileStatus.type === "success"
|
||||
? "#43a04755"
|
||||
: recordingFileStatus.type === "error"
|
||||
? "#e5393555"
|
||||
: colors.borderSecondary,
|
||||
}}
|
||||
>
|
||||
<Text style={{ color: colors.textSecondary, fontSize: 12, lineHeight: 18 }}>{recordingFileStatus.text}</Text>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
{recordingList.length > 0 && recorderState !== "recording" && (
|
||||
<View style={styles.recordingList}>
|
||||
{recordingList.map((rec) => {
|
||||
const isPlaying = recorderState === "playing";
|
||||
const durationSec = Math.round(rec.durationMs / 1000);
|
||||
const durationLabel = durationSec >= 60
|
||||
? `${Math.floor(durationSec / 60)}分${durationSec % 60}秒`
|
||||
: `${durationSec}秒`;
|
||||
const dateLabel = new Date(rec.recordedAt).toLocaleString("ja-JP", {
|
||||
month: "numeric",
|
||||
day: "numeric",
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
});
|
||||
const recordingRow = (
|
||||
<TouchableOpacity
|
||||
onPress={() => startPlayback(rec.id)}
|
||||
onLongPress={() => {
|
||||
void handleExportRecordingFile(rec.id, dateLabel);
|
||||
}}
|
||||
disabled={isPlaying}
|
||||
activeOpacity={0.72}
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
backgroundColor: colors.backgroundSecondary,
|
||||
borderRadius: 8,
|
||||
padding: 12,
|
||||
gap: 10,
|
||||
opacity: isPlaying ? 0.6 : 1,
|
||||
}}
|
||||
>
|
||||
<View style={{ flex: 1 }}>
|
||||
<Text style={{ color: colors.textPrimary, fontSize: 13, fontWeight: "bold" }}>{dateLabel}</Text>
|
||||
<Text style={{ color: colors.textSecondary, fontSize: 11 }}>{rec.snapshotCount} コマ / {durationLabel}</Text>
|
||||
</View>
|
||||
<View style={{ alignItems: "flex-end", gap: 4 }}>
|
||||
<View style={styles.playbackHint}>
|
||||
<MaterialCommunityIcons
|
||||
name={isPlaying ? "pause-circle-outline" : "play-circle-outline"}
|
||||
size={18}
|
||||
color={isPlaying ? colors.textTertiary : "#43a047"}
|
||||
/>
|
||||
<Text
|
||||
style={{
|
||||
color: isPlaying ? colors.textTertiary : colors.textPrimary,
|
||||
fontSize: 12,
|
||||
fontWeight: "600",
|
||||
}}
|
||||
>
|
||||
{isPlaying ? "再生中は操作不可" : "タップで再生"}
|
||||
</Text>
|
||||
</View>
|
||||
{!isPlaying && (
|
||||
<Text style={{ color: colors.textTertiary, fontSize: 10 }}>長押しで書き出し / 左へスワイプで削除</Text>
|
||||
)}
|
||||
</View>
|
||||
<MaterialCommunityIcons name="chevron-right" size={18} color={colors.iconSecondary} />
|
||||
</TouchableOpacity>
|
||||
);
|
||||
|
||||
if (isPlaying) {
|
||||
return <View key={rec.id}>{recordingRow}</View>;
|
||||
}
|
||||
|
||||
return (
|
||||
<Swipeable
|
||||
key={rec.id}
|
||||
ref={(instance) => {
|
||||
recordingSwipeRefs.current[rec.id] = instance;
|
||||
}}
|
||||
friction={2}
|
||||
overshootRight={false}
|
||||
rightThreshold={48}
|
||||
renderRightActions={() => (
|
||||
<View style={styles.deleteAction}>
|
||||
<MaterialCommunityIcons name="trash-can-outline" size={18} color="#fff" />
|
||||
<Text style={styles.deleteActionText}>削除</Text>
|
||||
</View>
|
||||
)}
|
||||
onSwipeableOpen={() => confirmDeleteRecording(rec.id, dateLabel)}
|
||||
>
|
||||
{recordingRow}
|
||||
</Swipeable>
|
||||
);
|
||||
})}
|
||||
</View>
|
||||
)}
|
||||
|
||||
<TouchableOpacity
|
||||
onPress={openRecordingDatabase}
|
||||
activeOpacity={0.78}
|
||||
style={[
|
||||
styles.databaseButton,
|
||||
{
|
||||
backgroundColor: fixed.primary,
|
||||
borderColor: fixed.primary,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<MaterialCommunityIcons
|
||||
name="database-search-outline"
|
||||
size={18}
|
||||
color={fixed.textOnPrimary}
|
||||
/>
|
||||
<Text style={[styles.databaseButtonText, { color: fixed.textOnPrimary }]}>
|
||||
全録データベースを参照
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
|
||||
</View>
|
||||
</>
|
||||
)}
|
||||
</ScrollView>
|
||||
</View>
|
||||
);
|
||||
};
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
backgroundColor: "#0099CC",
|
||||
},
|
||||
content: {
|
||||
flex: 1,
|
||||
backgroundColor: "#f8f8fc",
|
||||
},
|
||||
contentInner: {
|
||||
paddingHorizontal: 14,
|
||||
paddingBottom: 40,
|
||||
paddingTop: 20,
|
||||
gap: 12,
|
||||
},
|
||||
debugSection: {
|
||||
borderRadius: 12,
|
||||
borderWidth: 1,
|
||||
padding: 14,
|
||||
gap: 10,
|
||||
},
|
||||
debugTitle: {
|
||||
fontSize: 15,
|
||||
fontWeight: "bold",
|
||||
},
|
||||
debugDescription: {
|
||||
fontSize: 12,
|
||||
lineHeight: 18,
|
||||
},
|
||||
debugCurrentText: {
|
||||
fontSize: 11,
|
||||
lineHeight: 16,
|
||||
},
|
||||
switchRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "space-between",
|
||||
marginTop: 8,
|
||||
},
|
||||
statusRow: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
marginTop: 8,
|
||||
gap: 8,
|
||||
},
|
||||
buttonRow: {
|
||||
flexDirection: "row",
|
||||
gap: 8,
|
||||
marginTop: 10,
|
||||
flexWrap: "wrap",
|
||||
},
|
||||
recordButton: {
|
||||
backgroundColor: "#e53935",
|
||||
borderRadius: 8,
|
||||
paddingHorizontal: 14,
|
||||
paddingVertical: 8,
|
||||
},
|
||||
neutralButton: {
|
||||
borderRadius: 8,
|
||||
paddingHorizontal: 14,
|
||||
paddingVertical: 8,
|
||||
},
|
||||
primaryButtonText: {
|
||||
color: "#fff",
|
||||
fontWeight: "bold",
|
||||
fontSize: 13,
|
||||
},
|
||||
neutralButtonText: {
|
||||
fontWeight: "bold",
|
||||
fontSize: 13,
|
||||
},
|
||||
fileBox: {
|
||||
marginTop: 4,
|
||||
gap: 8,
|
||||
borderRadius: 8,
|
||||
padding: 10,
|
||||
},
|
||||
recordingList: {
|
||||
marginTop: 10,
|
||||
gap: 6,
|
||||
},
|
||||
playbackHint: {
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
gap: 4,
|
||||
},
|
||||
deleteAction: {
|
||||
width: 96,
|
||||
borderRadius: 8,
|
||||
backgroundColor: "#e53935",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
marginLeft: 6,
|
||||
},
|
||||
deleteActionText: {
|
||||
color: "#fff",
|
||||
fontSize: 11,
|
||||
fontWeight: "bold",
|
||||
marginTop: 4,
|
||||
},
|
||||
databaseButton: {
|
||||
minHeight: 46,
|
||||
borderRadius: 10,
|
||||
borderWidth: 1,
|
||||
paddingHorizontal: 14,
|
||||
paddingVertical: 12,
|
||||
flexDirection: "row",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
gap: 8,
|
||||
marginTop: 4,
|
||||
},
|
||||
databaseButtonText: {
|
||||
fontSize: 14,
|
||||
fontWeight: "bold",
|
||||
},
|
||||
});
|
||||
@@ -16,8 +16,9 @@ import { SwitchArea } from "../atom/SwitchArea";
|
||||
import { useNotification } from "../../stateBox/useNotifications";
|
||||
import { SheetHeaderItem } from "@/components/atom/SheetHeaderItem";
|
||||
import { useThemeColors, type ColorThemePref } from "@/lib/theme/useThemeColors";
|
||||
import { useTrainMenu } from "@/stateBox/useTrainMenu";
|
||||
|
||||
const versionCode = "7.0.5"; // Update this version code as needed
|
||||
const versionCode = "7.1";
|
||||
|
||||
export const SettingTopPage = ({
|
||||
testNFC,
|
||||
@@ -29,6 +30,8 @@ export const SettingTopPage = ({
|
||||
const { expoPushToken } = useNotification();
|
||||
const { colors, fixed, colorTheme, setColorTheme } = useThemeColors();
|
||||
const navigation = useNavigation<any>();
|
||||
const { updatePermission } = useTrainMenu();
|
||||
const showResearchTools = __DEV__ || updatePermission;
|
||||
|
||||
return (
|
||||
<View style={{ height: "100%", backgroundColor: fixed.primary }}>
|
||||
@@ -118,6 +121,12 @@ export const SettingTopPage = ({
|
||||
navigation.navigate("setting", { screen: "SoundSettings" })
|
||||
}
|
||||
/>
|
||||
<SettingList
|
||||
string="運行情報設定(β)"
|
||||
onPress={() =>
|
||||
navigation.navigate("setting", { screen: "OperationInfoSettings" })
|
||||
}
|
||||
/>
|
||||
|
||||
<SectionHeader title="通知・データ" />
|
||||
<SettingList
|
||||
@@ -135,6 +144,14 @@ export const SettingTopPage = ({
|
||||
navigation.navigate("setting", { screen: "DataSourceSettings" })
|
||||
}
|
||||
/>
|
||||
{showResearchTools && (
|
||||
<SettingList
|
||||
string="調査ツール"
|
||||
onPress={() =>
|
||||
navigation.navigate("setting", { screen: "ResearchToolsSettings" })
|
||||
}
|
||||
/>
|
||||
)}
|
||||
|
||||
<SectionHeader title="その他" />
|
||||
<SettingList
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
ToastAndroid,
|
||||
} from "react-native";
|
||||
import { createStackNavigator } from "@react-navigation/stack";
|
||||
import { TransitionPresets } from "@react-navigation/stack";
|
||||
import { pushTransitionOptions } from "@/lib/stackOption";
|
||||
import * as ExpoFelicaReader from "../../modules/expo-felica-reader/src";
|
||||
import * as Updates from "expo-updates";
|
||||
import { AS } from "../../storageControl";
|
||||
@@ -22,15 +22,36 @@ import { FavoriteSettings } from "./FavoriteSettings";
|
||||
import { NotificationSettings } from "./NotificationSettings";
|
||||
import { LauncherIconSettings } from "./LauncherIconSettings";
|
||||
import { DataSourceSettings } from "./DataSourceSettings";
|
||||
import { ResearchToolsSettings } from "./ResearchToolsSettings";
|
||||
import { FelicaHistoryPage } from "./FelicaHistoryPage";
|
||||
import { SoundSettings } from "./SoundSettings";
|
||||
import { OperationInfoSettings } from "./OperationInfoSettings";
|
||||
import { useTrainMenu } from "@/stateBox/useTrainMenu";
|
||||
import {
|
||||
normalizeIconDisplayMode,
|
||||
type IconDisplayMode,
|
||||
} from "@/lib/iconDisplayMode";
|
||||
|
||||
const readStoredValue = async <T,>(
|
||||
key: string,
|
||||
fallback: T,
|
||||
mapValue?: (value: any) => T,
|
||||
) => {
|
||||
try {
|
||||
const value = await AS.getItem(key);
|
||||
return mapValue ? mapValue(value) : (value as T);
|
||||
} catch {
|
||||
return fallback;
|
||||
}
|
||||
};
|
||||
|
||||
const Stack = createStackNavigator();
|
||||
export default function Setting(props) {
|
||||
const {
|
||||
navigation: { navigate },
|
||||
} = props;
|
||||
const [iconSetting, setIconSetting] = useState(false);
|
||||
const { updatePermission } = useTrainMenu();
|
||||
const [iconSetting, setIconSetting] = useState<IconDisplayMode>("original");
|
||||
const [mapSwitch, setMapSwitch] = useState(false);
|
||||
const [stationMenu, setStationMenu] = useState(false);
|
||||
const [usePDFView, setUsePDFView] = useState(false);
|
||||
@@ -39,16 +60,54 @@ export default function Setting(props) {
|
||||
const [headerSize, setHeaderSize] = useState("default");
|
||||
const [startPage, setStartPage] = useState(false);
|
||||
const [uiSetting, setUiSetting] = useState("tokyo");
|
||||
const [operationLandscapeEnabled, setOperationLandscapeEnabled] = useState(false);
|
||||
const [operationCaptureEnabled, setOperationCaptureEnabled] = useState(false);
|
||||
useLayoutEffect(() => {
|
||||
AS.getItem(STORAGE_KEYS.ICON_SWITCH).then(setIconSetting);
|
||||
AS.getItem(STORAGE_KEYS.MAP_SWITCH).then(setMapSwitch);
|
||||
AS.getItem(STORAGE_KEYS.STATION_SWITCH).then(setStationMenu);
|
||||
AS.getItem(STORAGE_KEYS.USE_PDF_VIEW).then(setUsePDFView);
|
||||
AS.getItem(STORAGE_KEYS.TRAIN_SWITCH).then(setTrainMenu);
|
||||
AS.getItem(STORAGE_KEYS.TRAIN_POSITION_SWITCH).then(setTrainPosition);
|
||||
AS.getItem(STORAGE_KEYS.HEADER_SIZE).then(setHeaderSize);
|
||||
AS.getItem(STORAGE_KEYS.START_PAGE).then(setStartPage);
|
||||
AS.getItem(STORAGE_KEYS.UI_SETTING).then(setUiSetting);
|
||||
void Promise.all([
|
||||
readStoredValue(STORAGE_KEYS.ICON_SWITCH, "original", normalizeIconDisplayMode),
|
||||
readStoredValue(STORAGE_KEYS.MAP_SWITCH, false, (value) => value === true || value === "true"),
|
||||
readStoredValue(STORAGE_KEYS.STATION_SWITCH, false, (value) => value === true || value === "true"),
|
||||
readStoredValue(STORAGE_KEYS.USE_PDF_VIEW, false, (value) => value === true || value === "true"),
|
||||
readStoredValue(STORAGE_KEYS.TRAIN_SWITCH, false, (value) => value === true || value === "true"),
|
||||
readStoredValue(STORAGE_KEYS.TRAIN_POSITION_SWITCH, false, (value) => value === true || value === "true"),
|
||||
readStoredValue(STORAGE_KEYS.HEADER_SIZE, "default"),
|
||||
readStoredValue(STORAGE_KEYS.START_PAGE, false, (value) => value === true || value === "true"),
|
||||
readStoredValue(STORAGE_KEYS.UI_SETTING, "tokyo"),
|
||||
readStoredValue(
|
||||
STORAGE_KEYS.OPERATION_INFO_LANDSCAPE_ENABLED,
|
||||
false,
|
||||
(value) => value === true || value === "true",
|
||||
),
|
||||
readStoredValue(
|
||||
STORAGE_KEYS.OPERATION_INFO_CAPTURE_ENABLED,
|
||||
false,
|
||||
(value) => value === true || value === "true",
|
||||
),
|
||||
]).then(([
|
||||
nextIconSetting,
|
||||
nextMapSwitch,
|
||||
nextStationMenu,
|
||||
nextUsePdfView,
|
||||
nextTrainMenu,
|
||||
nextTrainPosition,
|
||||
nextHeaderSize,
|
||||
nextStartPage,
|
||||
nextUiSetting,
|
||||
nextOperationLandscapeEnabled,
|
||||
nextOperationCaptureEnabled,
|
||||
]) => {
|
||||
setIconSetting(nextIconSetting);
|
||||
setMapSwitch(nextMapSwitch);
|
||||
setStationMenu(nextStationMenu);
|
||||
setUsePDFView(nextUsePdfView);
|
||||
setTrainMenu(nextTrainMenu);
|
||||
setTrainPosition(nextTrainPosition);
|
||||
setHeaderSize(nextHeaderSize);
|
||||
setStartPage(nextStartPage);
|
||||
setUiSetting(nextUiSetting);
|
||||
setOperationLandscapeEnabled(nextOperationLandscapeEnabled);
|
||||
setOperationCaptureEnabled(nextOperationCaptureEnabled);
|
||||
});
|
||||
}, []);
|
||||
const testNFC = async () => {
|
||||
console.log("Testing NFC...");
|
||||
@@ -73,8 +132,10 @@ export default function Setting(props) {
|
||||
}
|
||||
};
|
||||
const updateAndReload = () => {
|
||||
const iconSettingToSave =
|
||||
updatePermission || iconSetting !== "hub" ? iconSetting : "original";
|
||||
Promise.all([
|
||||
AS.setItem(STORAGE_KEYS.ICON_SWITCH, iconSetting.toString()),
|
||||
AS.setItem(STORAGE_KEYS.ICON_SWITCH, iconSettingToSave.toString()),
|
||||
AS.setItem(STORAGE_KEYS.MAP_SWITCH, mapSwitch.toString()),
|
||||
AS.setItem(STORAGE_KEYS.STATION_SWITCH, stationMenu.toString()),
|
||||
AS.setItem(STORAGE_KEYS.USE_PDF_VIEW, usePDFView.toString()),
|
||||
@@ -83,6 +144,8 @@ export default function Setting(props) {
|
||||
AS.setItem(STORAGE_KEYS.HEADER_SIZE, headerSize),
|
||||
AS.setItem(STORAGE_KEYS.START_PAGE, startPage.toString()),
|
||||
AS.setItem(STORAGE_KEYS.UI_SETTING, uiSetting),
|
||||
AS.setItem(STORAGE_KEYS.OPERATION_INFO_LANDSCAPE_ENABLED, operationLandscapeEnabled.toString()),
|
||||
AS.setItem(STORAGE_KEYS.OPERATION_INFO_CAPTURE_ENABLED, operationCaptureEnabled.toString()),
|
||||
]).then(() => Updates.reloadAsync());
|
||||
};
|
||||
return (
|
||||
@@ -91,7 +154,7 @@ export default function Setting(props) {
|
||||
name="settingTopPage"
|
||||
options={{
|
||||
gestureEnabled: false,
|
||||
...TransitionPresets.SlideFromRightIOS,
|
||||
...pushTransitionOptions,
|
||||
cardOverlayEnabled: true,
|
||||
headerTransparent: true,
|
||||
headerShown: false,
|
||||
@@ -111,7 +174,7 @@ export default function Setting(props) {
|
||||
name="LayoutSettings"
|
||||
options={{
|
||||
gestureEnabled: true,
|
||||
...TransitionPresets.SlideFromRightIOS,
|
||||
...pushTransitionOptions,
|
||||
cardOverlayEnabled: true,
|
||||
headerTransparent: true,
|
||||
headerShown: false,
|
||||
@@ -136,6 +199,7 @@ export default function Setting(props) {
|
||||
setUiSetting={setUiSetting}
|
||||
headerSize={headerSize}
|
||||
setHeaderSize={setHeaderSize}
|
||||
allowHubIcon={updatePermission}
|
||||
/>
|
||||
)}
|
||||
</Stack.Screen>
|
||||
@@ -143,7 +207,7 @@ export default function Setting(props) {
|
||||
name="NotificationSettings"
|
||||
options={{
|
||||
//gestureEnabled: true,
|
||||
...TransitionPresets.SlideFromRightIOS,
|
||||
...pushTransitionOptions,
|
||||
cardOverlayEnabled: true,
|
||||
headerTransparent: true,
|
||||
headerShown: false,
|
||||
@@ -154,7 +218,7 @@ export default function Setting(props) {
|
||||
name="LauncherIconSettings"
|
||||
options={{
|
||||
gestureEnabled: true,
|
||||
...TransitionPresets.SlideFromRightIOS,
|
||||
...pushTransitionOptions,
|
||||
cardOverlayEnabled: true,
|
||||
headerTransparent: true,
|
||||
headerShown: false,
|
||||
@@ -165,7 +229,7 @@ export default function Setting(props) {
|
||||
name="FavoriteSettings"
|
||||
options={{
|
||||
gestureEnabled: true,
|
||||
...TransitionPresets.SlideFromRightIOS,
|
||||
...pushTransitionOptions,
|
||||
cardOverlayEnabled: true,
|
||||
headerTransparent: true,
|
||||
headerShown: false,
|
||||
@@ -176,18 +240,29 @@ export default function Setting(props) {
|
||||
name="DataSourceSettings"
|
||||
options={{
|
||||
gestureEnabled: true,
|
||||
...TransitionPresets.SlideFromRightIOS,
|
||||
...pushTransitionOptions,
|
||||
cardOverlayEnabled: true,
|
||||
headerTransparent: true,
|
||||
headerShown: false,
|
||||
}}
|
||||
component={DataSourceSettings}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="ResearchToolsSettings"
|
||||
options={{
|
||||
gestureEnabled: true,
|
||||
...pushTransitionOptions,
|
||||
cardOverlayEnabled: true,
|
||||
headerTransparent: true,
|
||||
headerShown: false,
|
||||
}}
|
||||
component={ResearchToolsSettings}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="FelicaHistoryPage"
|
||||
options={{
|
||||
gestureEnabled: true,
|
||||
...TransitionPresets.SlideFromRightIOS,
|
||||
...pushTransitionOptions,
|
||||
cardOverlayEnabled: true,
|
||||
headerTransparent: true,
|
||||
headerShown: false,
|
||||
@@ -198,13 +273,33 @@ export default function Setting(props) {
|
||||
name="SoundSettings"
|
||||
options={{
|
||||
gestureEnabled: true,
|
||||
...TransitionPresets.SlideFromRightIOS,
|
||||
...pushTransitionOptions,
|
||||
cardOverlayEnabled: true,
|
||||
headerTransparent: true,
|
||||
headerShown: false,
|
||||
}}
|
||||
component={SoundSettings}
|
||||
/>
|
||||
<Stack.Screen
|
||||
name="OperationInfoSettings"
|
||||
options={{
|
||||
gestureEnabled: true,
|
||||
...pushTransitionOptions,
|
||||
cardOverlayEnabled: true,
|
||||
headerTransparent: true,
|
||||
headerShown: false,
|
||||
}}
|
||||
>
|
||||
{(props) => (
|
||||
<OperationInfoSettings
|
||||
{...props}
|
||||
operationLandscapeEnabled={operationLandscapeEnabled}
|
||||
setOperationLandscapeEnabled={setOperationLandscapeEnabled}
|
||||
operationCaptureEnabled={operationCaptureEnabled}
|
||||
setOperationCaptureEnabled={setOperationCaptureEnabled}
|
||||
/>
|
||||
)}
|
||||
</Stack.Screen>
|
||||
</Stack.Navigator>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ export const ListViewItem: FC<{
|
||||
const [
|
||||
typeString,
|
||||
trainName,
|
||||
fontAvailable,
|
||||
fontFamily,
|
||||
isOneMan,
|
||||
infogram,
|
||||
priority,
|
||||
@@ -79,7 +79,7 @@ export const ListViewItem: FC<{
|
||||
to_data_color,
|
||||
train_number_override,
|
||||
} = customTrainDataDetector(d.trainNumber, allCustomTrainData);
|
||||
const [typeString, fontAvailable, isOneMan] = getStringConfig(
|
||||
const [typeString, fontFamily, isOneMan] = getStringConfig(
|
||||
type,
|
||||
d.trainNumber
|
||||
);
|
||||
@@ -111,7 +111,7 @@ export const ListViewItem: FC<{
|
||||
return [
|
||||
typeString,
|
||||
displayName,
|
||||
fontAvailable,
|
||||
fontFamily,
|
||||
isOneMan,
|
||||
infogram,
|
||||
priority,
|
||||
@@ -128,7 +128,7 @@ export const ListViewItem: FC<{
|
||||
return [
|
||||
typeString,
|
||||
"",
|
||||
fontAvailable,
|
||||
fontFamily,
|
||||
isOneMan,
|
||||
infogram,
|
||||
priority,
|
||||
@@ -145,7 +145,7 @@ export const ListViewItem: FC<{
|
||||
migrateTrainName(
|
||||
trainDataArray[trainDataArray.length - 1].split(",")[0] + "行き"
|
||||
),
|
||||
fontAvailable,
|
||||
fontFamily,
|
||||
isOneMan,
|
||||
infogram,
|
||||
priority,
|
||||
@@ -314,15 +314,18 @@ export const ListViewItem: FC<{
|
||||
<Text
|
||||
style={{
|
||||
fontSize: 15,
|
||||
fontFamily: fontAvailable ? "JR-Nishi" : undefined,
|
||||
fontWeight: !fontAvailable ? "bold" : undefined,
|
||||
paddingTop: fontAvailable ? 2 : 0,
|
||||
fontFamily,
|
||||
fontWeight: fontFamily ? undefined : "bold",
|
||||
paddingTop: fontFamily ? 2 : 0,
|
||||
paddingLeft: 10,
|
||||
color: isCancelled ? "gray" : color,
|
||||
textDecorationLine: isCancelled ? "line-through" : "none",
|
||||
}}
|
||||
>
|
||||
{typeString}
|
||||
{fontFamily === "JR-WEST-PLUS" ? (
|
||||
<Text style={{ fontFamily: "DiaPro", fontSize: 7 }}>{"\u00A0"}</Text>
|
||||
) : null}
|
||||
</Text>
|
||||
{showVehicle
|
||||
? (() => {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import React, { FC } from "react";
|
||||
import { Image, StyleSheet, View } from "react-native";
|
||||
import { Image, StyleSheet, View, Platform } from "react-native";
|
||||
import { Marker } from "react-native-maps";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import { useStationList } from "@/stateBox/useStationList";
|
||||
|
||||
@@ -21,7 +21,8 @@ export const SimpleSwitch = ({
|
||||
<View style={{ flex: 1 }}>
|
||||
<TouchableOpacity
|
||||
style={{
|
||||
backgroundColor: bool == value.toString() ? color : null,
|
||||
backgroundColor:
|
||||
bool === value || String(bool) === String(value) ? color : null,
|
||||
padding: 5,
|
||||
borderRadius: 5,
|
||||
margin: 10,
|
||||
@@ -32,7 +33,7 @@ export const SimpleSwitch = ({
|
||||
}}
|
||||
onPress={() => {
|
||||
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
|
||||
setBool(value.toString());
|
||||
setBool(value);
|
||||
}}
|
||||
>
|
||||
<Image
|
||||
|
||||
@@ -66,7 +66,7 @@ export const SwitchArea = ({
|
||||
subText={trueText}
|
||||
/>
|
||||
</View>
|
||||
{bool == "true" && children}
|
||||
{(bool === true || String(bool) === "true") && children}
|
||||
</View>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -5,11 +5,13 @@ export const TripleSwitchArea = ({
|
||||
str,
|
||||
bool,
|
||||
setBool,
|
||||
firstItem: { firstImage, firstText, firstValue },
|
||||
secondItem: { secondImage, secondText, secondValue },
|
||||
thirdItem: { thirdImage, thirdText, thirdValue },
|
||||
firstItem,
|
||||
secondItem,
|
||||
thirdItem,
|
||||
}) => {
|
||||
const { colors } = useThemeColors();
|
||||
const { firstImage, firstText, firstValue } = firstItem;
|
||||
const { secondImage, secondText, secondValue } = secondItem;
|
||||
return (
|
||||
<View style={{ flexDirection: "column", padding: 10 }}>
|
||||
<Text
|
||||
@@ -41,14 +43,16 @@ export const TripleSwitchArea = ({
|
||||
image={secondImage}
|
||||
subText={secondText}
|
||||
/>
|
||||
<SimpleSwitch
|
||||
bool={bool}
|
||||
setBool={setBool}
|
||||
color="red"
|
||||
value={thirdValue}
|
||||
image={thirdImage}
|
||||
subText={thirdText}
|
||||
/>
|
||||
{thirdItem ? (
|
||||
<SimpleSwitch
|
||||
bool={bool}
|
||||
setBool={setBool}
|
||||
color="red"
|
||||
value={thirdItem.thirdValue}
|
||||
image={thirdItem.thirdImage}
|
||||
subText={thirdItem.thirdText}
|
||||
/>
|
||||
) : null}
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React, { useRef, useState, useEffect, useLayoutEffect } from "react";
|
||||
import { View, Text, TouchableOpacity, Linking } from "react-native";
|
||||
import MapView from "react-native-maps";
|
||||
import { View, Text, TouchableOpacity, Linking, Platform } from "react-native";
|
||||
import MapView, { Marker } from "react-native-maps";
|
||||
import { useCurrentTrain } from "../stateBox/useCurrentTrain";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import lineColorList from "../assets/originData/lineColorList";
|
||||
@@ -12,6 +12,10 @@ import { UsefulBox } from "./TrainMenu/UsefulBox";
|
||||
import { MapsButton } from "./TrainMenu/MapsButton";
|
||||
import { useStationList } from "@/stateBox/useStationList";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
import { useUserPosition } from "@/stateBox/useUserPosition";
|
||||
const ANDROID_USER_LOCATION_MARKER_SIZE = 18;
|
||||
const ANDROID_USER_LOCATION_INNER_SIZE = 8;
|
||||
|
||||
export default function TrainMenu({ style }) {
|
||||
const { fixed, isDark } = useThemeColors();
|
||||
const { webview } = useCurrentTrain();
|
||||
@@ -24,6 +28,7 @@ export default function TrainMenu({ style }) {
|
||||
mapsStationData: stationData,
|
||||
} = useTrainMenu();
|
||||
const { originalStationList } = useStationList();
|
||||
const { position } = useUserPosition();
|
||||
useEffect(() => {
|
||||
const stationPinData = [];
|
||||
Object.keys(lineList_LineWebID).forEach((d, indexBase) => {
|
||||
@@ -49,7 +54,7 @@ export default function TrainMenu({ style }) {
|
||||
<View style={{ height: "100%", backgroundColor: fixed.primary, ...style }}>
|
||||
<MapView
|
||||
style={{ flex: 1, width: "100%", height: "100%" }}
|
||||
showsUserLocation={true}
|
||||
showsUserLocation={Platform.OS !== "android"}
|
||||
loadingEnabled={true}
|
||||
showsMyLocationButton={false}
|
||||
moveOnMarkerPress={false}
|
||||
@@ -64,6 +69,42 @@ export default function TrainMenu({ style }) {
|
||||
longitudeDelta: 1.8,
|
||||
}}
|
||||
>
|
||||
{Platform.OS === "android" && position ? (
|
||||
<Marker
|
||||
key="android-user-location"
|
||||
coordinate={{
|
||||
latitude: position.coords.latitude,
|
||||
longitude: position.coords.longitude,
|
||||
}}
|
||||
anchor={{ x: 0.5, y: 0.5 }}
|
||||
tracksViewChanges={false}
|
||||
zIndex={999}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
width: ANDROID_USER_LOCATION_MARKER_SIZE,
|
||||
height: ANDROID_USER_LOCATION_MARKER_SIZE,
|
||||
borderRadius: ANDROID_USER_LOCATION_MARKER_SIZE / 2,
|
||||
backgroundColor: "rgba(10, 132, 255, 0.24)",
|
||||
borderWidth: 1,
|
||||
borderColor: "rgba(10, 132, 255, 0.42)",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
}}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
width: ANDROID_USER_LOCATION_INNER_SIZE,
|
||||
height: ANDROID_USER_LOCATION_INNER_SIZE,
|
||||
borderRadius: ANDROID_USER_LOCATION_INNER_SIZE / 2,
|
||||
backgroundColor: "#0A84FF",
|
||||
borderWidth: 1,
|
||||
borderColor: "#ffffff",
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
</Marker>
|
||||
) : null}
|
||||
{stationPin.map(({ D, d, latlng, indexBase, index }) => (
|
||||
<MapPin
|
||||
index={index}
|
||||
|
||||
@@ -1,225 +1,9 @@
|
||||
import React, { useRef, useState, useEffect, useLayoutEffect } from "react";
|
||||
import { View, Text, TouchableOpacity, Linking } from "react-native";
|
||||
//import MapView from "react-native-maps";
|
||||
import { useCurrentTrain } from "../stateBox/useCurrentTrain";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import lineColorList from "../assets/originData/lineColorList";
|
||||
import { lineListPair, stationIDPair } from "../lib/getStationList";
|
||||
import { SheetManager } from "react-native-actions-sheet";
|
||||
import { useTrainMenu } from "../stateBox/useTrainMenu";
|
||||
//import { MapPin } from "./TrainMenu/MapPin";
|
||||
import { UsefulBox } from "./TrainMenu/UsefulBox";
|
||||
import { MapsButton } from "./TrainMenu/MapsButton";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
export default function TrainMenu({ style }) {
|
||||
const { fixed } = useThemeColors();
|
||||
import type { StyleProp, ViewStyle } from "react-native";
|
||||
|
||||
type TrainMenuProps = {
|
||||
style?: StyleProp<ViewStyle>;
|
||||
};
|
||||
|
||||
export default function TrainMenu(_props: TrainMenuProps) {
|
||||
return null;
|
||||
const { webview } = useCurrentTrain();
|
||||
const mapRef = useRef();
|
||||
const { navigate, goBack } = useNavigation();
|
||||
const [stationPin, setStationPin] = useState([]);
|
||||
const {
|
||||
selectedLine,
|
||||
setSelectedLine,
|
||||
mapsStationData: stationData,
|
||||
} = useTrainMenu();
|
||||
useEffect(() => {
|
||||
const stationPinData = [];
|
||||
Object.keys(stationData).forEach((d, indexBase) => {
|
||||
stationData[d].forEach((D, index) => {
|
||||
if (!D.StationMap) return null;
|
||||
if (selectedLine && selectedLine != d) return;
|
||||
const latlng = D.StationMap.replace(
|
||||
"https://www.google.co.jp/maps/place/",
|
||||
""
|
||||
).split(",");
|
||||
if (latlng.length == 0) return null;
|
||||
stationPinData.push({ D, d, latlng, indexBase: 0, index });
|
||||
});
|
||||
});
|
||||
setStationPin(stationPinData);
|
||||
}, [stationData, selectedLine]);
|
||||
useLayoutEffect(() => {
|
||||
mapRef.current.fitToCoordinates(
|
||||
stationPin.map(({ latlng }) => ({
|
||||
latitude: parseFloat(latlng[0]),
|
||||
longitude: parseFloat(latlng[1]),
|
||||
})),
|
||||
{ edgePadding: { top: 80, bottom: 120, left: 50, right: 50 } } // Add margin values here
|
||||
);
|
||||
}, [stationPin]);
|
||||
return (
|
||||
<View style={{ height: "100%", backgroundColor: fixed.primary, ...style }}>
|
||||
<MapView
|
||||
style={{ flex: 1, width: "100%", height: "100%" }}
|
||||
showsUserLocation={true}
|
||||
loadingEnabled={true}
|
||||
showsMyLocationButton={false}
|
||||
moveOnMarkerPress={false}
|
||||
showsCompass={false}
|
||||
ref={mapRef}
|
||||
//provider={PROVIDER_GOOGLE}
|
||||
initialRegion={{
|
||||
latitude: 33.774519,
|
||||
longitude: 133.533306,
|
||||
latitudeDelta: 1.8, //小さくなるほどズーム
|
||||
longitudeDelta: 1.8,
|
||||
}}
|
||||
>
|
||||
{stationPin.map(({ D, d, latlng, indexBase, index }) => (
|
||||
<MapPin
|
||||
index={index}
|
||||
indexBase={indexBase}
|
||||
latlng={latlng}
|
||||
D={D}
|
||||
d={d}
|
||||
navigate={navigate}
|
||||
webview={webview}
|
||||
key={D.StationNumber + d}
|
||||
/>
|
||||
))}
|
||||
</MapView>
|
||||
<View style={{ position: "relative" }}>
|
||||
<View
|
||||
style={{
|
||||
flexDirection: "row",
|
||||
position: "absolute",
|
||||
width: "100vw",
|
||||
bottom: 0,
|
||||
flex: 1,
|
||||
}}
|
||||
>
|
||||
<TouchableOpacity
|
||||
style={{
|
||||
backgroundColor: selectedLine
|
||||
? lineColorList[stationIDPair[selectedLine]]
|
||||
: fixed.primary,
|
||||
padding: 10,
|
||||
zIndex: 1,
|
||||
alignItems: "center",
|
||||
position: "absolute",
|
||||
bottom: 0,
|
||||
width: "100%",
|
||||
paddingBottom: 50,
|
||||
}}
|
||||
onPress={() => SheetManager.show("TrainMenuLineSelector")}
|
||||
>
|
||||
<Text
|
||||
style={{
|
||||
color: "white",
|
||||
fontWeight: "bold",
|
||||
fontSize: 10,
|
||||
textAlign: "center",
|
||||
}}
|
||||
>
|
||||
▲ ここを押して路線をフィルタリングできます ▲
|
||||
</Text>
|
||||
<Text
|
||||
style={{
|
||||
color: "white",
|
||||
fontWeight: "bold",
|
||||
fontSize: 20,
|
||||
textAlign: "center",
|
||||
}}
|
||||
>
|
||||
{selectedLine
|
||||
? lineListPair[stationIDPair[selectedLine]]
|
||||
: "JR四国 対象全駅"}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
<Text style={{ position: "absolute", bottom: 40 }}>
|
||||
路線記号からフィルタリング
|
||||
</Text>
|
||||
{Object.keys(stationData).map((d) => (
|
||||
<TouchableOpacity
|
||||
key={stationIDPair[d]}
|
||||
style={{
|
||||
flex: 1,
|
||||
backgroundColor: lineColorList[stationIDPair[d]],
|
||||
padding: 5,
|
||||
margin: 2,
|
||||
borderRadius: 10,
|
||||
borderColor: "white",
|
||||
borderWidth: 1,
|
||||
borderStyle: "solid",
|
||||
alignItems: "center",
|
||||
opacity: selectedLine == d ? 1 : !selectedLine ? 1 : 0.5,
|
||||
zIndex: 10,
|
||||
}}
|
||||
onPress={() => {
|
||||
const s = selectedLine == d ? undefined : d;
|
||||
if(!s) return;
|
||||
setSelectedLine(s);
|
||||
Object.keys(stationData).forEach((data, indexBase) => {
|
||||
stationData[data].forEach((D, index) => {
|
||||
if (!D.StationMap) return null;
|
||||
if (s && s != data) return;
|
||||
const latlng = D.StationMap.replace(
|
||||
"https://www.google.co.jp/maps/place/",
|
||||
""
|
||||
).split(",");
|
||||
if (latlng.length == 0) return null;
|
||||
if (index == 0 && stationPin.length > 0) {
|
||||
webview.current
|
||||
?.injectJavaScript(`MoveDisplayStation('${data}_${D.MyStation}_${D.Station_JP}');
|
||||
document.getElementById("disp").insertAdjacentHTML("afterbegin", "<div />");`);
|
||||
}
|
||||
});
|
||||
});
|
||||
}}
|
||||
>
|
||||
<Text
|
||||
style={{ color: "white", fontWeight: "bold", fontSize: 20 }}
|
||||
>
|
||||
{stationIDPair[d]}
|
||||
</Text>
|
||||
</TouchableOpacity>
|
||||
))}
|
||||
</View>
|
||||
</View>
|
||||
{navigate && (
|
||||
<View style={{ flexDirection: "row" }}>
|
||||
<UsefulBox
|
||||
backgroundColor={"#F89038"}
|
||||
icon="train-car"
|
||||
flex={1}
|
||||
onPressButton={() =>
|
||||
navigate("howto", {
|
||||
info: "https://train.jr-shikoku.co.jp/usage.htm",
|
||||
})
|
||||
}
|
||||
>
|
||||
使い方
|
||||
</UsefulBox>
|
||||
<UsefulBox
|
||||
backgroundColor={"#EA4752"}
|
||||
icon="star"
|
||||
flex={1}
|
||||
onPressButton={() => navigate("favoriteList")}
|
||||
>
|
||||
お気に入り
|
||||
</UsefulBox>
|
||||
<UsefulBox
|
||||
backgroundColor={"#91C31F"}
|
||||
icon="clipboard-list-outline"
|
||||
flex={1}
|
||||
onPressButton={() =>
|
||||
Linking.openURL(
|
||||
"https://nexcloud.haruk.in/apps/forms/ZRHjWFF7znr5Xjr2"
|
||||
)
|
||||
}
|
||||
>
|
||||
フィードバック
|
||||
</UsefulBox>
|
||||
</View>
|
||||
)}
|
||||
<MapsButton
|
||||
onPress={() => {
|
||||
goBack();
|
||||
}}
|
||||
top={0}
|
||||
mapSwitch={"flex"}
|
||||
/>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -28,6 +28,7 @@ import { getCurrentTrainData } from "@/lib/getCurrentTrainData";
|
||||
import type { NavigateFunction } from "@/types";
|
||||
import { PlatformNumber } from "./LED_inside_Component/PlatformNumber";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
import { useTrainMenu } from "@/stateBox/useTrainMenu";
|
||||
|
||||
type Props = {
|
||||
d: eachTrainDiagramType;
|
||||
@@ -48,6 +49,7 @@ export const EachData: FC<Props> = (props) => {
|
||||
} = props;
|
||||
const { currentTrain } = useCurrentTrain();
|
||||
const { stationList } = useStationList();
|
||||
const { playbackCurrentTimeIso } = useTrainMenu();
|
||||
const { allCustomTrainData } = useAllTrainDiagram();
|
||||
const { fixed } = useThemeColors();
|
||||
const openTrainInfo = (d: {
|
||||
@@ -134,7 +136,7 @@ export const EachData: FC<Props> = (props) => {
|
||||
const [h, m] = d.time.split(":");
|
||||
const IntH = parseInt(h);
|
||||
const IntM = parseInt(m);
|
||||
const currentTime = dayjs();
|
||||
const currentTime = playbackCurrentTimeIso ? dayjs(playbackCurrentTimeIso) : dayjs();
|
||||
const trainTime = currentTime
|
||||
.set("hour", IntH < 4 ? IntH + 24 : IntH)
|
||||
.set("minute", IntM);
|
||||
@@ -145,7 +147,7 @@ export const EachData: FC<Props> = (props) => {
|
||||
setIsDepartureNow(false);
|
||||
setIsShow(true);
|
||||
};
|
||||
}, [d.time, currentTrainData]);
|
||||
}, [d.time, currentTrainData, playbackCurrentTimeIso]);
|
||||
useInterval(() => {
|
||||
if (isDepartureNow) {
|
||||
setIsShow(!isShow);
|
||||
|
||||
@@ -3,11 +3,8 @@ import { Text, View, LayoutChangeEvent } from "react-native";
|
||||
import Animated, {
|
||||
useSharedValue,
|
||||
useAnimatedStyle,
|
||||
withTiming,
|
||||
withRepeat,
|
||||
withSequence,
|
||||
withDelay,
|
||||
cancelAnimation,
|
||||
useFrameCallback,
|
||||
} from "react-native-reanimated";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
|
||||
@@ -18,40 +15,65 @@ type Props = {
|
||||
export const ScrollingDescription: FC<Props> = ({ description }) => {
|
||||
const { fixed } = useThemeColors();
|
||||
const scrollX = useSharedValue(0);
|
||||
const isRunning = useSharedValue(false);
|
||||
const contentWidth = useSharedValue(0);
|
||||
const viewportWidth = useSharedValue(0);
|
||||
const [textWidth, setTextWidth] = useState(0);
|
||||
const [containerWidth, setContainerWidth] = useState(0);
|
||||
const gap = 20;
|
||||
const pixelsPerSecond = 84;
|
||||
|
||||
// 改行を削除して1行にする
|
||||
const singleLineDescription = description?.replace(/\n/g, " ") || "";
|
||||
|
||||
useEffect(() => {
|
||||
cancelAnimation(scrollX);
|
||||
contentWidth.value = textWidth;
|
||||
viewportWidth.value = containerWidth;
|
||||
|
||||
if (!singleLineDescription || textWidth === 0 || containerWidth === 0) {
|
||||
isRunning.value = false;
|
||||
scrollX.value = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
// テキストが画面幅より短い場合はスクロールしない
|
||||
if (textWidth <= containerWidth) {
|
||||
isRunning.value = false;
|
||||
scrollX.value = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
const distance = textWidth + containerWidth;
|
||||
const duration = distance * 6; // スクロール速度
|
||||
|
||||
// 初期位置を設定(画面の右端から開始)
|
||||
scrollX.value = containerWidth;
|
||||
|
||||
scrollX.value = withRepeat(
|
||||
withSequence(
|
||||
withDelay(500, withTiming(-textWidth - 20, { duration })),
|
||||
withDelay(500, withTiming(containerWidth, { duration: 0 }))
|
||||
),
|
||||
-1
|
||||
);
|
||||
isRunning.value = true;
|
||||
|
||||
return () => {
|
||||
isRunning.value = false;
|
||||
cancelAnimation(scrollX);
|
||||
};
|
||||
}, [singleLineDescription, textWidth, containerWidth]);
|
||||
}, [
|
||||
singleLineDescription,
|
||||
textWidth,
|
||||
containerWidth,
|
||||
scrollX,
|
||||
isRunning,
|
||||
contentWidth,
|
||||
viewportWidth,
|
||||
]);
|
||||
|
||||
useFrameCallback((frameInfo) => {
|
||||
"worklet";
|
||||
|
||||
if (!isRunning.value) {
|
||||
return;
|
||||
}
|
||||
|
||||
const elapsedMs = frameInfo.timeSincePreviousFrame ?? 16.67;
|
||||
const nextX = scrollX.value - (pixelsPerSecond * elapsedMs) / 1000;
|
||||
const resetPoint = -contentWidth.value - gap;
|
||||
|
||||
scrollX.value = nextX <= resetPoint ? viewportWidth.value : nextX;
|
||||
});
|
||||
|
||||
const animatedStyle = useAnimatedStyle(() => ({
|
||||
transform: [{ translateX: scrollX.value }],
|
||||
@@ -60,14 +82,20 @@ export const ScrollingDescription: FC<Props> = ({ description }) => {
|
||||
const handleTextLayout = (event: LayoutChangeEvent) => {
|
||||
const { width } = event.nativeEvent.layout;
|
||||
if (width > 0) {
|
||||
setTextWidth(Math.round(width));
|
||||
const nextWidth = Math.round(width);
|
||||
setTextWidth((currentWidth) =>
|
||||
currentWidth === nextWidth ? currentWidth : nextWidth
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const handleContainerLayout = (event: LayoutChangeEvent) => {
|
||||
const { width } = event.nativeEvent.layout;
|
||||
if (width > 0) {
|
||||
setContainerWidth(Math.round(width));
|
||||
const nextWidth = Math.round(width);
|
||||
setContainerWidth((currentWidth) =>
|
||||
currentWidth === nextWidth ? currentWidth : nextWidth
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -13,6 +13,17 @@ import { getTime, trainTimeFiltering } from "@/lib/trainTimeFiltering";
|
||||
import { eachTrainDiagramType, StationProps } from "@/lib/CommonTypes";
|
||||
import { useNavigation } from "@react-navigation/native";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
import { stackAwareNavigate } from "@/lib/rootNavigation";
|
||||
import { useStationList } from "@/stateBox/useStationList";
|
||||
import { useTrainMenu } from "@/stateBox/useTrainMenu";
|
||||
|
||||
const readBooleanSetting = async (key: string) => {
|
||||
try {
|
||||
return (await AS.getItem(key)) === "true";
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -49,8 +60,10 @@ type props = {
|
||||
export const LED_vision: FC<props> = (props) => {
|
||||
const { station } = props;
|
||||
|
||||
const { navigate, addListener, isFocused } = useNavigation();
|
||||
const { navigate } = useNavigation();
|
||||
const { currentTrain } = useCurrentTrain();
|
||||
const { stationList } = useStationList();
|
||||
const { playbackCurrentTimeIso } = useTrainMenu();
|
||||
const [stationDiagram, setStationDiagram] = useState<{
|
||||
[key: string]: string;
|
||||
}>({}); //当該駅の全時刻表
|
||||
@@ -63,14 +76,14 @@ export const LED_vision: FC<props> = (props) => {
|
||||
const { fixed } = useThemeColors();
|
||||
|
||||
useEffect(() => {
|
||||
AS.getItem("LEDSettings/trainIDSwitch").then((data) => {
|
||||
setTrainIDSwitch(data === "true");
|
||||
});
|
||||
AS.getItem("LEDSettings/trainDescriptionSwitch").then((data) => {
|
||||
setTrainDescriptionSwitch(data === "true");
|
||||
});
|
||||
AS.getItem("LEDSettings/finalSwitch").then((data) => {
|
||||
setFinalSwitch(data === "true");
|
||||
void Promise.all([
|
||||
readBooleanSetting("LEDSettings/trainIDSwitch"),
|
||||
readBooleanSetting("LEDSettings/trainDescriptionSwitch"),
|
||||
readBooleanSetting("LEDSettings/finalSwitch"),
|
||||
]).then(([nextTrainIdSwitch, nextTrainDescriptionSwitch, nextFinalSwitch]) => {
|
||||
setTrainIDSwitch(nextTrainIdSwitch);
|
||||
setTrainDescriptionSwitch(nextTrainDescriptionSwitch);
|
||||
setFinalSwitch(nextFinalSwitch);
|
||||
});
|
||||
}, []);
|
||||
|
||||
@@ -112,10 +125,10 @@ export const LED_vision: FC<props> = (props) => {
|
||||
if (!currentTrain) return () => {};
|
||||
const data = trainTimeAndNumber
|
||||
.filter((d) => currentTrain.map((m) => m.num).includes(d.train)) //現在の列車に絞る[ToDo]
|
||||
.filter((d) => trainTimeFiltering({ d, currentTrain, station })) //時間フィルター
|
||||
.filter((d) => trainTimeFiltering({ d, currentTrain, station, stationList, now: playbackCurrentTimeIso })) //時間フィルター
|
||||
.filter((d) => !!finalSwitch || d.lastStation != station[0].Station_JP); //最終列車表示設定
|
||||
setSelectedTrain(data);
|
||||
}, [trainTimeAndNumber, currentTrain, finalSwitch]);
|
||||
}, [trainTimeAndNumber, currentTrain, finalSwitch, stationList, playbackCurrentTimeIso]);
|
||||
|
||||
const { width } = useWindowDimensions();
|
||||
const adjustedWidth = width * 0.98;
|
||||
@@ -163,7 +176,7 @@ export const LED_vision: FC<props> = (props) => {
|
||||
<AreaDescription
|
||||
numberOfLines={1}
|
||||
areaInfo={areaInfo}
|
||||
onClick={() => alert(areaInfo)}
|
||||
onClick={() => stackAwareNavigate("information")}
|
||||
/>
|
||||
)}
|
||||
|
||||
|
||||
@@ -112,6 +112,12 @@ export const STORAGE_KEYS = {
|
||||
/** カラーテーマ設定 ("light" | "system" | "dark") */
|
||||
COLOR_THEME: 'colorTheme',
|
||||
|
||||
/** 運行情報横倒し機能の有効化スイッチ(β) */
|
||||
OPERATION_INFO_LANDSCAPE_ENABLED: 'operationInfoLandscapeEnabled',
|
||||
|
||||
/** 運行情報スクリーンショット切り出し機能の有効化スイッチ(β) */
|
||||
OPERATION_INFO_CAPTURE_ENABLED: 'operationInfoCaptureEnabled',
|
||||
|
||||
/** モックAPI検証機能の有効化スイッチ(admin専用) */
|
||||
MOCK_API_FEATURE_ENABLED: 'mockApiFeatureEnabled',
|
||||
|
||||
|
||||
@@ -0,0 +1,384 @@
|
||||
# JR四国非公式アプリ データ取得経路マップ
|
||||
|
||||
作成日: 2026-07-07
|
||||
|
||||
## 目的
|
||||
|
||||
Sentryで観測している `endpoint=positions / operation_info / train_operation / timetable` が、実際にどのURL、hook、画面、バックエンド、外部取得元に対応するかを整理する。
|
||||
|
||||
この文書は調査結果のみ。既存コードの変更案は含めるが、実装変更は行っていない。
|
||||
|
||||
## 対象範囲
|
||||
|
||||
- React Native / Expo アプリ側の `fetch`, `observedFetchJson`, `observedFetchText`
|
||||
- WebViewに注入しているJavaScript内の `fetch`
|
||||
- WebView内の公式サイトXHR、およびmock XHR interceptor
|
||||
- `lib/mockApi`
|
||||
- `stateBox` 配下のfetch
|
||||
- n8n webhook
|
||||
- Google Apps Script fallback
|
||||
- `jr-shikoku-backend-api-v1.haruk.in`
|
||||
- `jr-shikoku-backend-mock-api-v1.haruk.in`
|
||||
- `jr-shikoku-api-data-storage.haruk.in`
|
||||
- JR四国公式走行位置 `https://train.jr-shikoku.co.jp/sp.html`
|
||||
- JR四国公式運行情報 `https://www.jr-shikoku.co.jp/info/`
|
||||
- 鉄道運用Hub / えれサイトの集約JSON
|
||||
|
||||
## Sentry観測対象の取得一覧
|
||||
|
||||
| 論理endpoint | 呼び出し元ファイル | 関数/hook | 実URL/host | path | root_tab/screen | 取得タイミング | 更新間隔 | timeout | retry | cache | fallback | Sentry tag endpoint | 備考 |
|
||||
|---|---|---|---|---|---|---|---|---:|---|---|---|---|---|
|
||||
| positions current mock | `lib/mockApi/positionMasters.ts` | `fetchMockTrainPositions` | `jr-shikoku-backend-mock-api-v1.haruk.in` | `/train-positions/current` | positions / startup provider | mock API有効時、`useCurrentTrain` と `useTrainMenu` から呼ばれる | 15秒 | 8000ms | 最大1回 | module memory last-good | 前回成功データを返す | `positions_current` / source=`mock_api` / user_visible=`true` / preload=`false` / fetch_priority=`high` | Sentryでtimeout確認済みの主対象。バックエンド側計測が必要。 |
|
||||
| positions master mock | `lib/mockApi/positionMasters.ts` | `fetchPositionMasters` | `jr-shikoku-backend-mock-api-v1.haruk.in` | `/position-masters` | positions / settings-dependent | mock API有効化時、または起動時にmock有効なら取得 | 基本1回 | 8000ms | 最大1回 | module memory `_cache` | なし | `positions_master` / source=`mock_api` / user_visible=`false` / preload=`true` / fetch_priority=`medium` | PosNum+LineからPos文字列を補完。頻度は低い。 |
|
||||
| positions n8n | `stateBox/useCurrentTrain.tsx` | `getCurrentTrain` | `n8n.haruk.in` | `/webhook/c501550c-7d1b-4e50-927b-4429fe18931a` | positions | 起動時、mock切替時、interval | 15秒 | 8000ms | 最大1回 | なし | Google Apps Script fallback | `positions_current` / source=`n8n` / user_visible=`true` / preload=`false` / fetch_priority=`high` | mock API無効時の主経路。成功時は録画snapshotにも使う。 |
|
||||
| positions GAS fallback | `stateBox/useCurrentTrain.tsx` | `getCurrentTrain` catch内 | `script.google.com` | `/macros/s/AKfyc.../exec` | positions | n8n走行位置取得失敗時のみ | n8n失敗時のみ | 8000ms | 最大1回 | 既存データとmerge | 前回表示データ維持 | `positions_gas_fallback` / source=`gas` / user_visible=`true` / preload=`false` / fetch_priority=`high` | Direction等が欠けるため既存データとmerge。 |
|
||||
| timetable today | `stateBox/useAllTrainDiagram.tsx` | `getTrainDiagram` | `jr-shikoku-api-data-storage.haruk.in` | `/tmp/diagram-today.json` または `/tmp/diagram-today-beta.json` | provider全体 / timetable consumers | provider mount直後 | 30秒、background継続指定あり。ただしobservedFetch側はbackground開始を抑制 | 15000ms | 最大1回 | AsyncStorage `ALL_TRAIN_DIAGRAM` | cache失敗時はalert | `timetable_today` / source=`static_storage` / user_visible=`false` / preload=`true` / fetch_priority=`medium` | ダイヤ・発車標・列車詳細で広く使用。 |
|
||||
| train operation data | `stateBox/useAllTrainDiagram.tsx` | `getCustomTrainData` | `jr-shikoku-backend-api-v1.haruk.in` または beta | `/train-data` | provider全体 / train detail / diagram | provider mount直後 | 30秒、background継続指定あり。ただしobservedFetch側はbackground開始を抑制 | 15000ms | 最大1回 | なし | 失敗は握りつぶし | `train_operation_data` / source=`backend_api` / user_visible=`false` / preload=`true` / fetch_priority=`medium` | 約1MB級。WebView内でも別途取得される。 |
|
||||
| operation logs | `stateBox/useAllTrainDiagram.tsx` | `getTodayOperation` | `jr-shikoku-backend-api-v1.haruk.in` または beta | `/operation-logs` | provider全体 / topMenu / train detail | provider mount直後 | 30秒、background継続指定あり。ただしobservedFetch側はbackground開始を抑制 | 15000ms | 最大1回 | なし | 失敗は握りつぶし | `operation_logs` / source=`backend_api` / user_visible=`false` / preload=`true` / fetch_priority=`medium` | 列車別運行ログ。WebView内でも別途取得される。 |
|
||||
| operation flag | `stateBox/useAreaInfo.tsx` | `getAreaData` | `n8n.haruk.in` | `/webhook/jr-shikoku-trainfo-flag` | topMenu / information / provider全体 | mount後、InteractionManager後に1200ms遅延 | 60秒 | 10000ms | 最大1回 | なし | 失敗は握りつぶし | `operation_info_flag` / source=`n8n` / user_visible=`true` / preload=`true` / fetch_priority=`medium` | topMenuのバッジ・対象エリア判定。 |
|
||||
| operation text GAS | `stateBox/useAreaInfo.tsx` | `fetchAreaDescription` | `script.google.com` | `/macros/s/AKfycbz80.../exec` | topMenu / information | operation flagで対象駅ありの場合だけ800ms遅延 | flag結果依存 | 15000ms | なし | なし | 失敗は握りつぶし | `operation_info_text` / source=`gas` / user_visible=`true` / preload=`false` / fetch_priority=`medium` | 第1回観測でtimeout。現在は通常時の実行を抑制。 |
|
||||
|
||||
## WebView内の取得一覧
|
||||
|
||||
| 論理endpoint | 呼び出し元ファイル | 関数/hook | 実URL/host | path | root_tab/screen | 取得タイミング | 更新間隔 | timeout | retry | cache | fallback | Sentry tag endpoint | 備考 |
|
||||
|---|---|---|---|---|---|---|---|---:|---|---|---|---|---|
|
||||
| positions official page | `components/Apps/WebView.tsx` | `AppsWebView` | `train.jr-shikoku.co.jp` | `/sp.html` | positions | 走行位置root初回activate時 | WebView lifecycle依存 | WebView標準 | WebView標準 | WebView page cache / OS依存 | remount watchdog | 未計測 | RN SentryではWebView navigation breadcrumbのみ。 |
|
||||
| positions official XHR live | JR四国公式ページ内 | 公式サイトXHR | `train.jr-shikoku.co.jp` | `/g?arg1=train&arg2=train` | positions WebView | 公式ページロード後、公式サイト側ポーリング | 公式サイト実装依存。概ね数秒単位 | 公式サイト/ブラウザ依存 | 不明 | 公式サイト/ブラウザ依存 | mock interceptor可能 | 未計測 / 候補 `positions_webview` | RN wrapperを通らない。現状Sentryで通信詳細が見えない。 |
|
||||
| positions official XHR static | JR四国公式ページ内 | 公式サイトXHR | `train.jr-shikoku.co.jp` | `/g?arg1=lang...`, `/g?arg1=station...`, etc | positions WebView | 公式ページロード時 | 基本初回 | 公式サイト/ブラウザ依存 | 不明 | 公式サイト/ブラウザ依存 | mock static intercept optional | 未計測 | `lib/mockApi/webviewXhrInterceptor.ts` に一覧コメントあり。 |
|
||||
| positions WebView injected train-data | `lib/webViewInjectjavascript.ts` | `startPolling/DatalistUpdate` | `jr-shikoku-backend-api-v1.haruk.in` | `/train-data` | positions WebView | Phase 2後、polling開始 | 30秒 | なし | なし | WebView localStorage 1日 | 失敗は無視 | 未計測 / RN側は `train_operation` | RN側Providerと重複取得。WebView内なのでRN Sentryにspanなし。 |
|
||||
| positions WebView injected operation-logs | `lib/webViewInjectjavascript.ts` | `operationListUpdate` | `jr-shikoku-backend-api-v1.haruk.in` | `/operation-logs` | positions WebView | Phase 1、Phase 3 polling、visibility復帰 | 30秒 | なし | なし | WebView localStorage 1日 | 失敗は無視 | 未計測 / RN側は `operation_info` | RN側Providerと重複取得。 |
|
||||
| positions WebView injected diagram | `lib/webViewInjectjavascript.ts` | `TrainDiagramData2Update` | `jr-shikoku-api-data-storage.haruk.in` | `/tmp/diagram-today.json` | positions WebView | Phase 2、polling | 30秒 | なし | なし | WebView localStorage 1時間 | 失敗は無視 | 未計測 / RN側は `timetable` | RN側Providerと重複取得。環境切替URLが注入optionにあるが、現コード内fetch文字列は定数参照。 |
|
||||
| positions WebView injected station-list | `lib/webViewInjectjavascript.ts` | Phase 1 | `n8n.haruk.in` | `/webhook/jr-shikoku-station-list` | positions WebView | WebView注入script起動時 | 初回中心 | なし | なし | WebView localStorage 1週間 | 失敗は無視 | 未計測 / 候補 `station_info` | 走行位置WebView表示の補助データ。 |
|
||||
| positions WebView injected problems | `lib/webViewInjectjavascript.ts` | `getProblemsData` | `n8n.haruk.in` | `/webhook/jrshikoku-position-problems` | positions WebView | Phase 1、polling、visibility復帰 | 30秒 | なし | なし | WebView localStorage 1分 | 失敗は無視 | 未計測 / 候補 `positions_problem` | 位置情報問題データ。 |
|
||||
| positions WebView unyohub | `lib/webViewInjectjavascript.ts` | `unyohubDataUpdate` | `jr-shikoku-api-data-storage.haruk.in` | `/thirdparty/unyohub-unyo.json` | positions WebView | 設定ON時、Phase 3 | 30秒 | なし | なし | WebView localStorage 1時間 | 失敗はconsole | 未計測 / 候補 `thirdparty_unyohub` | 鉄道運用Hub由来の集約JSON。 |
|
||||
| positions WebView elesite | `lib/webViewInjectjavascript.ts` | `elesiteDataUpdate` | `jr-shikoku-api-data-storage.haruk.in` | `/thirdparty/elesite-unyo.json` | positions WebView | 設定ON時、Phase 3 | 30秒 | なし | なし | WebView localStorage 1時間 | 失敗はconsole | 未計測 / 候補 `thirdparty_elesite` | えれサイト由来の集約JSON。 |
|
||||
| operation official page | `ndView.tsx` | operation WebView | `www.jr-shikoku.co.jp` | `/info/` | information | 運行情報root初回activate時 | WebView lifecycle依存 | WebView標準 | WebView標準 | OS/WebView依存 | remount watchdog | 未計測 | injected scriptでページ内容を加工し、画像生成結果をpostMessage。 |
|
||||
| operation hidden preload | `Apps.tsx` | `HiddenStartupPreloadWebViews` | `www.jr-shikoku.co.jp` | `/info/` | startup hidden preload | 起動時preload条件成立時 | 1回 | WebView標準 | なし | OS/WebView依存 | なし | 未計測 | Sentry breadcrumb/contextのみ。 |
|
||||
| positions hidden preload | `Apps.tsx` | `HiddenStartupPreloadWebViews` | `train.jr-shikoku.co.jp` | `/` | startup hidden preload | 起動時preload条件成立時 | 1回 | WebView標準 | なし | OS/WebView依存 | なし | 未計測 | 走行位置WebViewの事前ウォームアップ。 |
|
||||
|
||||
## Sentry endpoint対象外だが存在するRN fetch
|
||||
|
||||
| 用途 | 呼び出し元ファイル | 実URL/host | path | タイミング | 更新間隔 | cache | 備考 |
|
||||
|---|---|---|---|---|---|---|---|
|
||||
| update権限 / 外部データ利用権限 | `stateBox/useTrainMenu.tsx` | `jr-shikoku-backend-api-v1.haruk.in` または beta | `/check-permission?user_id=...` | push token取得後 | token/backend変更時 | なし | Sentry未計測。queryにuser_idあり。 |
|
||||
| バス・列車データ | `stateBox/useBusAndTrainData.tsx` | `script.google.com` | GAS | mount時、AsyncStorage miss時 | 基本1回 | AsyncStorage `BUS_AND_TRAIN` | Sentry未計測。 |
|
||||
| train pair data | `stateBox/useBusAndTrainData.tsx` | `script.google.com` | GAS | mount時 | 基本1回 | なし | Sentry未計測。 |
|
||||
| 遅延速報EX | `stateBox/useTrainDelayData.tsx` | `script.google.com` | GAS | `loadingDelayData`変化時 | 手動/状態依存 | なし | Sentry未計測。Android widgetにも同URLあり。 |
|
||||
| 特急列車情報 | `components/Menu/SpecialTrainInfoBox.tsx` | `n8n.haruk.in` | `/webhook/sptrainfo` | component mount | 1回 | なし | Sentry未計測。 |
|
||||
| 位置ID補助情報 GET | `components/発車時刻表/LED_inside_Component/TrainPosition.tsx`, `components/ActionSheetComponents/EachTrainInfo/TrainDataView.tsx` | `n8n.haruk.in` | `/webhook/JR-shikoku-PosID-v3?PosId=...` | 列車詳細/LED表示時 | 表示対象変更ごと | なし | Sentry未計測。UI細部表示用。 |
|
||||
| 位置ID補助情報 POST/DELETE | `TrainPositionDataPush.tsx`, `TrainPositionDataDelete.tsx` | `n8n.haruk.in` | `/webhook/JR-shikoku-PosID-v3` | ユーザー投稿/削除要求 | 操作時 | なし | Sentry未計測。mutating request。 |
|
||||
| 通知設定登録 | `components/Settings/NotificationSettings.tsx` | `n8n.haruk.in` | `/webhook/jr-shikoku-notification-configurations` | 設定保存操作時 | 操作時 | AsyncStorageに設定保存 | Sentry未計測。tokenを送る。 |
|
||||
| unyohub RN hook | `stateBox/useUnyohub.tsx` | `jr-shikoku-api-data-storage.haruk.in` | `/thirdparty/unyohub-unyo.json` | 設定ON時 | 10分 | AsyncStorage | WebView内でも別取得あり。 |
|
||||
| elesite RN hook | `stateBox/useElesite.tsx` | `jr-shikoku-api-data-storage.haruk.in` | `/thirdparty/elesite-unyo.json` | 設定ON時 | 10分 | AsyncStorage | WebView内でも別取得あり。 |
|
||||
| 駅住所LOD | `components/駅名表/AddressText.tsx` | station別 `jslodApi` | `.json` | 駅名標表示時 | 表示対象変更ごと | なし | 外部LOD。Sentry未計測。 |
|
||||
| Anpanman列車状態 | `components/ActionSheetComponents/EachTrainInfoCore/trainIconStatus.tsx` | `n8n.haruk.in` | `/webhook/{anpanmanApiPath}?trainNum=...` | 対象列車詳細表示時 | 対象変更ごと | なし | Sentry未計測。 |
|
||||
| Android operation widget | `components/AndroidWidget/InfoWidget.tsx` | `script.google.com` | operation info GAS | widget更新時 | widget runtime依存 | なし | RN画面外。 |
|
||||
| Android delay widget | `components/AndroidWidget/TraInfoEXWidget.tsx` | `script.google.com` | delay GAS | widget更新時 | widget runtime依存 | なし | RN画面外。 |
|
||||
| GeneralWebView recording import | `GeneralWebView.tsx` | arbitrary / blob / resolvedUri内 | download URL | 録画importリンク操作時 | 操作時 | なし | 任意URL由来。Sentry endpoint化すべきではない。 |
|
||||
|
||||
## endpoint別依存関係
|
||||
|
||||
### positions
|
||||
|
||||
```text
|
||||
positions screen
|
||||
├─ RN provider: useCurrentTrain
|
||||
│ ├─ mock ON: jr-shikoku-backend-mock-api-v1 /train-positions/current
|
||||
│ │ └─ fallback: module memory last-good cache
|
||||
│ └─ mock OFF: n8n /webhook/c501550c...
|
||||
│ └─ fallback: Google Apps Script positions fallback
|
||||
│ └─ fallback: currentTrain previous state if present
|
||||
├─ RN provider: useTrainMenu
|
||||
│ ├─ mock ON: /position-masters
|
||||
│ └─ mock ON: /train-positions/current, then inject to WebView mock XHR
|
||||
└─ WebView: train.jr-shikoku.co.jp/sp.html
|
||||
├─ official XHR /g?arg1=train&arg2=train
|
||||
├─ official XHR static /g?... station/lang/etc
|
||||
└─ injected enhancement fetches backend/storage/n8n auxiliary data
|
||||
```
|
||||
|
||||
表示対象:
|
||||
- 走行位置画面
|
||||
- 列車詳細ActionSheet
|
||||
- 発車標/LED系
|
||||
- fixed position box
|
||||
|
||||
現Sentry tag:
|
||||
- `endpoint=positions`
|
||||
- WebView公式XHRは未計測。候補は `positions_webview`。
|
||||
|
||||
### operation_info
|
||||
|
||||
```text
|
||||
topMenu / information / train detail
|
||||
├─ useAreaInfo
|
||||
│ ├─ n8n /webhook/jr-shikoku-trainfo-flag
|
||||
│ └─ if active area exists: Google Apps Script operation text
|
||||
├─ useAllTrainDiagram
|
||||
│ └─ jr-shikoku-backend-api-v1 /operation-logs
|
||||
├─ information WebView
|
||||
│ └─ www.jr-shikoku.co.jp/info/ official page
|
||||
│ └─ injected script parses/captures page and postMessage to RN
|
||||
└─ widgets / delay providers
|
||||
├─ operation info GAS
|
||||
└─ delay GAS
|
||||
```
|
||||
|
||||
表示対象:
|
||||
- topMenuバッジ・運行情報カード
|
||||
- informationタブ
|
||||
- 列車詳細内の運行ログ表示
|
||||
- Android widgets
|
||||
|
||||
現Sentry tag:
|
||||
- `endpoint=operation_info`
|
||||
- WebView公式ページは未計測。
|
||||
|
||||
### train_operation
|
||||
|
||||
```text
|
||||
train detail / diagram / WebView enhancement
|
||||
├─ RN: useAllTrainDiagram -> backend /train-data
|
||||
└─ WebView injected JS -> backend /train-data
|
||||
└─ localStorage cache 1 day
|
||||
```
|
||||
|
||||
表示対象:
|
||||
- 列車詳細
|
||||
- ダイヤ/発車標
|
||||
- 走行位置WebViewの列車アイコン・編成/運用装飾
|
||||
|
||||
現Sentry tag:
|
||||
- RN fetch: `endpoint=train_operation`
|
||||
- WebView fetch: 未計測
|
||||
|
||||
### timetable
|
||||
|
||||
```text
|
||||
timetable / station diagram / train detail
|
||||
├─ RN: useAllTrainDiagram -> data-storage /tmp/diagram-today.json
|
||||
│ └─ fallback: AsyncStorage ALL_TRAIN_DIAGRAM
|
||||
└─ WebView injected JS -> data-storage /tmp/diagram-today.json
|
||||
└─ localStorage cache 1 hour
|
||||
```
|
||||
|
||||
表示対象:
|
||||
- 時刻表
|
||||
- 発車標
|
||||
- 列車詳細停車駅/通過駅
|
||||
- 走行位置WebView内の補助表示
|
||||
|
||||
現Sentry tag:
|
||||
- RN fetch: `endpoint=timetable`
|
||||
- WebView fetch: 未計測
|
||||
|
||||
## 画面別fetch一覧
|
||||
|
||||
### アプリ起動直後
|
||||
|
||||
Providerがmountされるため、現在の構成では表示タブに関係なく以下が走り得る。
|
||||
|
||||
| 取得 | 起動時挙動 | 備考 |
|
||||
|---|---|---|
|
||||
| `useCurrentTrain.getCurrentTrain` | 即時1回、その後15秒interval | positions。mock ON/OFFで経路が変わる。 |
|
||||
| `useAllTrainDiagram.getTrainDiagram` | 即時1回、その後30秒interval | timetable。AsyncStorage fallbackあり。 |
|
||||
| `useAllTrainDiagram.getCustomTrainData` | 即時1回、その後30秒interval | train_operation。 |
|
||||
| `useAllTrainDiagram.getTodayOperation` | 即時1回、その後30秒interval | operation_info。 |
|
||||
| `useAreaInfo.getAreaData` | InteractionManager後 + 1200ms遅延。その後60秒interval | operation_info flag。対象ありならGAS textも800ms遅延。 |
|
||||
| `useTrainMenu.check-permission` | push token取得後 | Sentry未計測。 |
|
||||
| hidden preload WebViews | preload条件成立時 | positions公式/operation公式を不可視WebViewでロード。 |
|
||||
|
||||
### topMenu表示中
|
||||
|
||||
| 取得 | 発生源 | 備考 |
|
||||
|---|---|---|
|
||||
| positions RN polling | `useCurrentTrain` provider | 表示タブに関係なく継続。ただしbackgroundではinterval停止。 |
|
||||
| timetable / train_operation / operation_logs | `useAllTrainDiagram` provider | 表示タブに関係なく30秒ごと。 |
|
||||
| operation flag / text | `useAreaInfo` | topMenu表示内容に直結。 |
|
||||
| special train info | `SpecialTrainInfoBox` | 該当Sheet表示時のみ。 |
|
||||
|
||||
### positions表示中
|
||||
|
||||
| 取得 | 発生源 | 備考 |
|
||||
|---|---|---|
|
||||
| positions RN polling | `useCurrentTrain` | 15秒。画面表示に必須。 |
|
||||
| train.jr-shikoku公式WebView | `AppsWebView` | 公式XHRはRN Sentry不可視。 |
|
||||
| WebView injected train-data / operation-logs / diagram / station-list / problems | `webViewInjectjavascript` | RN providerと重複取得あり。WebView localStorage cacheあり。 |
|
||||
| unyohub / elesite | WebView injected JS、またはRN hooks | 設定ON時のみ。 |
|
||||
|
||||
### information表示中
|
||||
|
||||
| 取得 | 発生源 | 備考 |
|
||||
|---|---|---|
|
||||
| JR四国公式運行情報WebView | `ndView.tsx` | `https://www.jr-shikoku.co.jp/info/`。RN Sentryではpage load breadcrumb中心。 |
|
||||
| operation flag/text | `useAreaInfo` | バッジ/本文補助。 |
|
||||
| operation logs | `useAllTrainDiagram` | 列車別運行ログ。 |
|
||||
|
||||
### バックグラウンド復帰時
|
||||
|
||||
| 取得 | 発生源 | 備考 |
|
||||
|---|---|---|
|
||||
| `useInterval` | AppState active復帰時に即時実行 | userStoppedでなければ即時fetch。observedFetch側はbackground開始を抑制。 |
|
||||
| positions WebView | `useWebViewRemount` / WebView lifecycle | iOSはunfocused時watchdog pause設定あり。 |
|
||||
| WebView injected `refreshAllData` | document visibilitychange/pageshow | WebView内で train-data / operation-logs / position-problems を再取得。RN Sentry不可視。 |
|
||||
| GeneralWebView | background 10秒超でremount | 汎用WebViewのみ。 |
|
||||
|
||||
## 起動時/タブ切替時fetchタイムライン
|
||||
|
||||
```text
|
||||
T+0ms app providers mount
|
||||
├─ useCurrentTrain -> positions current fetch
|
||||
├─ useAllTrainDiagram -> timetable fetch
|
||||
├─ useAllTrainDiagram -> train_operation fetch
|
||||
├─ useAllTrainDiagram -> operation_logs fetch
|
||||
└─ useTrainMenu -> settings/env load, maybe check-permission after token
|
||||
|
||||
T+after interactions + 1200ms
|
||||
└─ useAreaInfo -> operation_info_flag
|
||||
└─ if active area exists: +800ms -> operation_info_text GAS
|
||||
|
||||
TopMenu first screen
|
||||
└─ no page-specific heavy WebView, but provider fetches above continue
|
||||
|
||||
positions first activation
|
||||
├─ AppsWebView loads train.jr-shikoku.co.jp/sp.html
|
||||
├─ official site starts /g?... XHRs
|
||||
├─ injected JS Phase 0: WebView localStorage cache read
|
||||
├─ injected JS Phase 1: station-list, operation-logs, position-problems
|
||||
├─ injected JS Phase 2: train-data, diagram-today
|
||||
└─ injected JS Phase 3: 30s polling, optional unyohub/elesite
|
||||
|
||||
information first activation
|
||||
├─ ndView WebView loads www.jr-shikoku.co.jp/info/
|
||||
└─ injected script parses/captures page and postMessage to RN when user capture actions occur
|
||||
|
||||
Tab switch back to positions/information
|
||||
├─ root component is kept after activation
|
||||
├─ WebView retention depends on current navigation/root gating and OS WebView process
|
||||
└─ provider-level RN fetches generally continue independent of active tab
|
||||
```
|
||||
|
||||
## 危険度・制御方針
|
||||
|
||||
### High priority
|
||||
|
||||
| 取得 | 分類理由 | 推奨方針 |
|
||||
|---|---|---|
|
||||
| `/train-positions/current` | 表示中timeoutがユーザー体感に直結。Sentryで実測済み。 | server-side duration/upstream/cacheログ、backend last-known-good、app persistent stale cache。 |
|
||||
| `useCurrentTrain` n8n positions | mock OFF時の主経路。走行位置画面に必須。 | stale cache導入、失敗時UI全体error回避、endpoint細分化。 |
|
||||
| JR公式WebView `/g?arg1=train&arg2=train` | 走行位置WebViewの本体だがRN Sentry不可視。 | WebView postMessage計測、またはRN側 proxy/cache化を検討。 |
|
||||
| `/operation-logs` | WebView/RNで重複、列車詳細表示に影響。 | backend span/cache hit/miss、WebView側計測。 |
|
||||
| `/train-data` | 大きいレスポンス、RN/WebViewで重複。 | stale cache、conditional fetch、WebView/RN共有設計。 |
|
||||
|
||||
### Medium priority
|
||||
|
||||
| 取得 | 分類理由 | 推奨方針 |
|
||||
|---|---|---|
|
||||
| `diagram-today.json` | 広範囲で使うがAsyncStorage fallbackあり。 | stale cache明示、WebView側との重複削減。 |
|
||||
| `operation_info_flag` | topMenuバッジ/運行情報表示に影響。 | endpoint細分化、失敗時は前回状態維持。 |
|
||||
| `operation_info_text` GAS | 遅延/timeout履歴あり。必須ではない詳細本文。 | preloadではなく遅延維持、stale cache、cellular抑制候補。 |
|
||||
| station-list / position-problems WebView | 表示補助。WebView内でのみ見えにくい。 | WebView breadcrumb/postMessage計測。 |
|
||||
| unyohub / elesite | 設定ON時のみだがWebView内は30秒polling。 | cellular抑制、10分程度へ間引き、Sentry breadcrumb。 |
|
||||
|
||||
### Low priority
|
||||
|
||||
| 取得 | 分類理由 | 推奨方針 |
|
||||
|---|---|---|
|
||||
| bus/train GAS | 初回またはcache miss中心。 | observedFetch化は後回し。 |
|
||||
| train pair GAS | 補助データ。 | cache導入候補。 |
|
||||
| special train info | Sheet表示時のみ。 | 失敗UIだけ整備。 |
|
||||
| notification config | ユーザー操作時のみ。 | mutationとして個別エラーハンドリング。 |
|
||||
| station LOD address | 駅名標詳細のみ。 | 失敗しても無表示でよい。 |
|
||||
| Anpanman status | 装飾表示。 | 失敗してもUI全体に影響させない。 |
|
||||
|
||||
## stale cacheを入れるべき取得
|
||||
|
||||
| 優先度 | 取得 | 理由 | 推奨cache |
|
||||
|---|---|---|---|
|
||||
| High | `/train-positions/current` | 走行位置表示が直接壊れる | backend last-known-good + app persistent cache。TTL 30-120秒。 |
|
||||
| High | n8n positions | mock OFF時の主経路 | app persistent last-good。TTL 30-120秒。 |
|
||||
| High | JR公式WebView train XHR | WebView表示本体 | 公式XHRをRN/proxy化できるならstale。難しければWebView localStorage/postMessage。 |
|
||||
| Medium | `/operation-logs` | 列車詳細/運行情報補助 | backend/app cache。TTL 1-5分。 |
|
||||
| Medium | `/train-data` | 大容量かつ重複取得 | app/WebView共有cache。TTL 1日でも許容しやすい。 |
|
||||
| Medium | `diagram-today.json` | 既にAsyncStorage fallbackあり | 既存cacheをstale表示として明示。TTL 1日。 |
|
||||
| Medium | `operation_info_flag` | バッジ/エリア判定 | 前回状態維持。TTL 1-5分。 |
|
||||
| Medium | `operation_info_text` | GAS遅延に弱い | 前回本文保持。TTL 5-30分。 |
|
||||
| Low | unyohub / elesite | 設定ON時の補助 | 既存AsyncStorage/WebView localStorageを活用。TTL 10-60分。 |
|
||||
|
||||
## バックエンド側に計測を入れるべきAPI
|
||||
|
||||
| API | host | 理由 | 必要な計測 |
|
||||
|---|---|---|---|
|
||||
| `/train-positions/current` | `jr-shikoku-backend-mock-api-v1.haruk.in` | Sentryでforeground timeout確認済み。 | handler duration, upstream duration, cache hit/miss, stale served, status, bytes, upstream error kind。 |
|
||||
| `/position-masters` | `jr-shikoku-backend-mock-api-v1.haruk.in` | mock経路の基礎データ。頻度低いが失敗時mock表示品質に影響。 | handler duration, cache hit/miss, db/storage duration。 |
|
||||
| `/train-data` | `jr-shikoku-backend-api-v1.haruk.in` | 大容量・RN/WebView重複取得。 | handler duration, data source duration, response bytes, compression, cache status。 |
|
||||
| `/operation-logs` | `jr-shikoku-backend-api-v1.haruk.in` | operation_infoとしてRN/WebView重複取得。 | handler duration, query/upstream duration, cache status, filtered count。 |
|
||||
| `/check-permission` | `jr-shikoku-backend-api-v1.haruk.in` | user_id queryあり、失敗しても表示は続くが権限UIに影響。 | duration, auth/lookup duration, no PII logging。 |
|
||||
| `diagram-today.json` publish pipeline | `jr-shikoku-api-data-storage.haruk.in` | 静的配信だが生成元障害は広範囲影響。 | CDN/storage access log, generation timestamp, object age, size。 |
|
||||
| `thirdparty/unyohub-unyo.json` | `jr-shikoku-api-data-storage.haruk.in` | 外部由来の集約結果。 | generation timestamp, upstream scrape duration, source error count。 |
|
||||
| `thirdparty/elesite-unyo.json` | `jr-shikoku-api-data-storage.haruk.in` | 外部由来の集約結果。 | generation timestamp, upstream scrape duration, source error count。 |
|
||||
|
||||
## Sentry endpoint tag改善案
|
||||
|
||||
RN側observedFetchについては、4分類から以下の低カーディナリティな論理endpointへ細分化済み。`area=data_fetch`, `result`, `root_tab`, `status` は維持し、`source`, `user_visible`, `preload`, `fetch_priority` を追加した。
|
||||
|
||||
### 現在のRN側endpoint分類
|
||||
|
||||
低カーディナリティを維持するため、URL単位ではなく論理単位で増やす。
|
||||
|
||||
| 旧endpoint | 現endpoint | 対象 |
|
||||
|---|---|---|
|
||||
| `positions` | `positions_current` | 現在位置本体。n8n current / mock currentを含めるかは要検討。 |
|
||||
| `positions` | `positions_master` | `/position-masters`。 |
|
||||
| `positions` | `positions_gas_fallback` | Google Apps Script fallback。 |
|
||||
| 未計測 | `positions_webview` | JR公式WebView XHR / postMessage計測。 |
|
||||
| `operation_info` | `operation_info_flag` | n8n flag。 |
|
||||
| `operation_info` | `operation_info_text` | Google Apps Script text。 |
|
||||
| `operation_info` | `operation_logs` | backend `/operation-logs`。 |
|
||||
| `train_operation` | `train_operation_data` | backend `/train-data`。 |
|
||||
| `timetable` | `timetable_today` | `diagram-today.json`。 |
|
||||
| 未計測 | `thirdparty_unyohub` | unyohub集約JSON。 |
|
||||
| 未計測 | `thirdparty_elesite` | elesite集約JSON。 |
|
||||
|
||||
### 追加tag
|
||||
|
||||
- `source=rn_fetch|mock_api|n8n|gas|backend_api|static_storage|webview_fetch`
|
||||
- `user_visible=true|false`
|
||||
- `preload=true|false`
|
||||
- `fetch_priority=high|medium|low`
|
||||
|
||||
### 注意
|
||||
|
||||
- `endpoint` tagにURL全文やID入りpathは入れない。
|
||||
- `urlHost` と `urlPathTemplate` はcontextに維持する。
|
||||
- `positions_current` をn8n/mock/GASで分けすぎるとissue数は追いやすいが、全体のpositions失敗率は見にくくなる。`source` tagまたはcontextで `mock_api / n8n / gas` を分ける案も有効。
|
||||
|
||||
## 変更案の優先順位
|
||||
|
||||
### High
|
||||
|
||||
1. `positions_current` のendpoint細分化、または `source=mock_api|n8n|gas` 追加。
|
||||
2. WebView公式XHR `/g?arg1=train&arg2=train` のpostMessage計測。
|
||||
3. backend mock API `/train-positions/current` にserver-side span/cache/upstream durationを追加。
|
||||
4. positionsのpersistent stale cache。
|
||||
|
||||
### Medium
|
||||
|
||||
1. `operation_info` を `operation_info_flag / operation_info_text / operation_logs` に分離。
|
||||
2. WebView injected JS fetchの軽量postMessage計測。
|
||||
3. `/train-data` と `diagram-today.json` のRN/WebView重複取得を整理。
|
||||
4. unyohub/elesiteのWebView polling間隔を30秒から設定/TTLベースへ見直し。
|
||||
|
||||
### Low
|
||||
|
||||
1. LED/駅詳細/通知/Widget系の直接fetchをobservedFetch化。
|
||||
2. 任意URLを扱うGeneralWebView importはSentry endpoint化せず、操作エラーとして別分類。
|
||||
3. station LOD address fetchの失敗をUI非表示に統一。
|
||||
|
||||
## 現時点の結論
|
||||
|
||||
- Sentryで見えている `positions` のtimeoutは、RN側のmock currentまたはn8n/GAS経路のどれかに紐づく。今回観測された `urlHost=jr-shikoku-backend-mock-api-v1.haruk.in`, `urlPathTemplate=/train-positions/current` はmock currentで確定。
|
||||
- 走行位置画面ではRN provider fetchとWebView公式XHR、さらにWebView injected fetchが並行して走る。見えているSentry spanはRN provider側だけで、WebView内の公式取得は不可視。
|
||||
- `operation_info` はflag、GAS text、backend operation logs、公式WebViewの4系統が混在しているため、細分化した方が原因追跡しやすい。
|
||||
- `train_operation` と `timetable` はRNとWebViewで重複取得している。ユーザー体感の安定化には、stale cacheと重複削減が効きやすい。
|
||||
- バックエンド側で最優先に計測すべきは `/train-positions/current`。次点で `/train-data` と `/operation-logs`。
|
||||
@@ -0,0 +1,277 @@
|
||||
# 通信計測ロガー実装報告 2026-07-07
|
||||
|
||||
## 目的
|
||||
|
||||
走行位置・運行情報・時刻表まわりの RN 側データ取得について、Sentry 上で endpoint 別の成功/失敗、HTTP status、通信時間、レスポンスサイズ、JSON 期待時の HTML 返却、JSON parse 失敗、timeout を追えるようにした。
|
||||
|
||||
今回の実装は低リスクな第1段階として、WebView 内 fetch と stale cache の実装は対象外にした。既存のバックグラウンド WebView 保持・タブ保持挙動には触れていない。
|
||||
|
||||
## 実装内容
|
||||
|
||||
### 追加した共通実装
|
||||
|
||||
- `lib/observability/network/types.ts`
|
||||
- `lib/observability/network/endpoints.ts`
|
||||
- `lib/observability/network/networkError.ts`
|
||||
- `lib/observability/network/sentryNetwork.ts`
|
||||
- `lib/observability/network/observedFetch.ts`
|
||||
|
||||
主な API:
|
||||
|
||||
```ts
|
||||
observedFetchJson<T>(url, options)
|
||||
observedFetchText(url, options)
|
||||
```
|
||||
|
||||
記録する分類:
|
||||
|
||||
- `success`
|
||||
- `slow_success`
|
||||
- `timeout`
|
||||
- `network_error`
|
||||
- `http_error`
|
||||
- `non_json_response` / Sentry tag result は `non_json`
|
||||
- `json_parse_error` / Sentry tag result は `parse_error`
|
||||
- `empty_response`
|
||||
- `unknown`
|
||||
|
||||
### Sentry 設定
|
||||
|
||||
`App.tsx` の `Sentry.init` に以下を追加した。
|
||||
|
||||
- `tracesSampleRate: __DEV__ ? 1.0 : 0.05`
|
||||
- `beforeSend` で `contexts.data_fetch.responseHead` を最大300文字に制限
|
||||
|
||||
既存の Replay / Feedback / Logs 設定は維持した。
|
||||
|
||||
### 計測対象にした RN fetch
|
||||
|
||||
#### 走行位置
|
||||
|
||||
- `stateBox/useCurrentTrain.tsx`
|
||||
- n8n の走行位置 webhook
|
||||
- Google Apps Script fallback
|
||||
- `lib/mockApi/positionMasters.ts`
|
||||
- mock position masters
|
||||
- mock train positions current
|
||||
|
||||
endpoint tag: `positions`
|
||||
|
||||
#### 運行情報
|
||||
|
||||
- `stateBox/useAllTrainDiagram.tsx`
|
||||
- `/operation-logs`
|
||||
- `stateBox/useAreaInfo.tsx`
|
||||
- 運行情報本文 text
|
||||
- `jr-shikoku-trainfo-flag`
|
||||
|
||||
endpoint tag: `operation_info`
|
||||
|
||||
#### 運用・時刻表系
|
||||
|
||||
- `stateBox/useAllTrainDiagram.tsx`
|
||||
- `/train-data`
|
||||
- `diagram-today.json`
|
||||
|
||||
endpoint tag:
|
||||
|
||||
- `/train-data`: `train_operation`
|
||||
- `diagram-today.json`: `timetable`
|
||||
|
||||
## Sentry に入る情報
|
||||
|
||||
### tags
|
||||
|
||||
- `area=data_fetch`
|
||||
- `endpoint=positions|operation_info|train_operation|timetable`
|
||||
- `result=success|slow_success|timeout|network_error|http_error|non_json|parse_error|empty_response|unknown`
|
||||
- `root_tab=positions|topMenu|information|unknown`
|
||||
- `platform=android|ios`
|
||||
- `source=rn_fetch`
|
||||
- `status=200` など、HTTP response がある場合のみ
|
||||
|
||||
`root_tab` は呼び出し側で明示指定しない場合、`rootNavigationRef` の active root route から補完する。
|
||||
|
||||
### contexts.data_fetch
|
||||
|
||||
- `endpoint`
|
||||
- `method`
|
||||
- `status`
|
||||
- `ok`
|
||||
- `durationMs`
|
||||
- `timeoutMs`
|
||||
- `bytes`
|
||||
- `contentType`
|
||||
- `responseHead` 失敗時中心、最大300文字
|
||||
- `retryCount`
|
||||
- `urlHost`
|
||||
- `urlPathTemplate`
|
||||
- `appState`
|
||||
|
||||
URL 全文や query parameter は送らず、host と path template のみを送る方針にした。
|
||||
|
||||
## 挙動仕様
|
||||
|
||||
- timeout は wrapper 内の `AbortController` で実装。
|
||||
- `retry: true` の GET 系取得のみ、最大1回 retry。
|
||||
- retry 対象は `timeout`, `network_error`, HTTP `502/503/504`。
|
||||
- `non_json_response`, `json_parse_error`, `empty_response`, HTTP `4xx` は retry しない。
|
||||
- 成功は Issue 化しない。breadcrumb と span にのみ記録。
|
||||
- `slow_success` の captureMessage は第1段階では無効化した。breadcrumb/span には残る。
|
||||
- JSON endpoint は HTTP 200 だけでは success とせず、JSON parse 成功後に success 記録する。
|
||||
|
||||
## 未実装・次段階
|
||||
|
||||
- WebView 内 fetch の計測 hook は未実装。
|
||||
- stale cache fallback の共通化は未実装。
|
||||
- connection type の取得は未実装。必要なら `@react-native-community/netinfo` 等の導入可否を確認する。
|
||||
- Sentry metrics は未実装。今回は span / breadcrumb / warning/error event に限定。
|
||||
- slow success の warning event 化は無効。Sentry ノイズを見てから sample rate を上げる。
|
||||
|
||||
## 実機テスト観点
|
||||
|
||||
### 通常系
|
||||
|
||||
1. アプリを起動する。
|
||||
2. トップメニューを表示する。
|
||||
3. 走行位置タブを開く。
|
||||
4. 運行情報タブを開く。
|
||||
5. しばらく放置して 30 秒 interval の再取得を待つ。
|
||||
|
||||
期待:
|
||||
|
||||
- UI 挙動が従来と変わらない。
|
||||
- Sentry の event / span / breadcrumb に `area:data_fetch` が見える。
|
||||
- `endpoint:positions`, `endpoint:operation_info`, `endpoint:train_operation`, `endpoint:timetable` で絞れる。
|
||||
|
||||
### 失敗系
|
||||
|
||||
1. 機内モード、または通信不安定状態で起動する。
|
||||
2. 走行位置・運行情報を開く。
|
||||
|
||||
期待:
|
||||
|
||||
- `result:timeout` または `result:network_error` が Sentry に warning として出る。
|
||||
- `contexts.data_fetch.durationMs`, `timeoutMs`, `endpoint`, `root_tab` が入る。
|
||||
- 既存 UI の fallback / error 表示が大きく変わらない。
|
||||
|
||||
### non_json / parse_error
|
||||
|
||||
実機で一時的に endpoint を HTML 返却 URL に向ける場合のみ確認。通常の配信ビルドでは無理に発生させない。
|
||||
|
||||
期待:
|
||||
|
||||
- HTML 返却は `result:non_json` / `kind:non_json_response`。
|
||||
- JSON parse 失敗は `result:parse_error` / `kind:json_parse_error`。
|
||||
- `responseHead` は最大300文字。
|
||||
|
||||
## Sentry 確認クエリ
|
||||
|
||||
```text
|
||||
area:data_fetch
|
||||
area:data_fetch endpoint:positions
|
||||
area:data_fetch endpoint:operation_info
|
||||
area:data_fetch result:timeout
|
||||
area:data_fetch result:network_error
|
||||
area:data_fetch result:non_json
|
||||
area:data_fetch result:parse_error
|
||||
area:data_fetch platform:android
|
||||
area:data_fetch platform:ios
|
||||
area:data_fetch source:rn_fetch
|
||||
```
|
||||
|
||||
Performance / spans 側では `op:http.client`、span name `fetch positions` などで確認する。
|
||||
|
||||
## 検証状況
|
||||
|
||||
- `git diff --check` は対象ファイルで通過。
|
||||
- `npx tsc --noEmit` は失敗するが、今回追加した network observability 由来の TypeScript エラーは出ていない。
|
||||
- 残っている主な既存エラー:
|
||||
- `Apps.tsx` の `event.preventDefault` 型
|
||||
- `expo-live-activity` 型解決
|
||||
- `components/trainMenu.web.tsx` の web 側型エラー
|
||||
- `lib/felicaStationMap.ts` の重複 object key
|
||||
|
||||
## 2026-07-07 第1回観測後の追加修正
|
||||
|
||||
第1回観測で `operation_info` の `script.google.com` が timeout したため、以下を追加修正した。
|
||||
|
||||
- timeout 時の Sentry primary error が `AbortError` に寄らないよう、timeout では `ObservedFetchError("Network request timed out")` を primary として `captureException` する。timeout 時は元の AbortError を `cause` に入れない。
|
||||
- `root_tab` が `unknown` になりにくいよう、`rootNavigationRef` から現在 route を取れない場合は `lastObservedRootRouteRef` を fallback にする。
|
||||
- `Apps.tsx` の root navigation state 更新時に、最後に観測した root route を `lastObservedRootRouteRef` に保存する。
|
||||
- `operation_info` の Google Apps Script text 取得は通常時に必ず走らせず、n8n の flag 取得で対象エリアがある場合だけ遅延実行する。
|
||||
- 起動直後や `topMenu` 表示中の負荷を避けるため、初回 `operation_info` flag 取得は `InteractionManager.runAfterInteractions` と `setTimeout` で遅延する。
|
||||
- 自作 span は `name` / `description` ともに `fetch <endpoint>` に統一した。実 URL が出る自動 HTTP span は Sentry SDK 側の自動計測として許容する。
|
||||
|
||||
この変更により、通常時の `script.google.com` text 取得は発生しにくくなり、運行情報対象駅がある場合のみ補助テキストとして取得される。
|
||||
|
||||
## 注意
|
||||
|
||||
今回の変更は観測基盤の第1段階であり、通信失敗時の UI 改善や stale cache 表示は含まない。実機で `area:data_fetch` のイベント量とノイズを確認してから、WebView fetch 計測と stale fallback を次段階で検討する。
|
||||
|
||||
|
||||
## 第2回観測対応: positions timeout / background noise / huge span
|
||||
|
||||
Sentry観測で、foreground / positions表示中 / online / wifi の状態で `endpoint=positions` が timeout していた。
|
||||
対象は `jr-shikoku-backend-mock-api-v1.haruk.in/train-positions/current`。
|
||||
観測値は `durationMs ~= 8028ms`, `timeoutMs = 8000`, `retryCount = 1` で、これはユーザー体感に直結する取得失敗として扱う。
|
||||
|
||||
### 実装したアプリ側対策
|
||||
|
||||
- `observedFetch` のtimeoutを `AbortController` 依存だけでなく `Promise.race` に変更した。
|
||||
- React Native側のfetch abortが即時rejectしない場合でも、自作Sentry spanはtimeout時点で終了する。
|
||||
- `operation_info` の29分級spanは、この経路が主因候補。
|
||||
- retry前にruntime状態を再確認するようにした。
|
||||
- `AppState.currentState === "background"` ならretryしない。
|
||||
- `navigator.onLine === false` が取れる環境ではoffline時もretryしない。
|
||||
- background/offline由来の取得抑制は `aborted` breadcrumb に留め、Issue化しない。
|
||||
- fetch失敗後にruntimeがbackground/offlineなら `captureException` しない。
|
||||
- `positions` のmock API取得にアプリ内last-good cacheを追加した。
|
||||
- `/train-positions/current` がtimeout/network errorになっても、前回成功データがあればそれを返す。
|
||||
- stale cache利用時は `fetch:stale_cache` breadcrumb を残す。
|
||||
- 走行位置画面側でも、前回表示データがある場合は取得失敗で `currentTrainLoading=error` に落とさず `success` を維持する。
|
||||
- `operation_info` の遅延fetch timerをcleanupするようにした。
|
||||
- `InteractionManager.runAfterInteractions` 後の `setTimeout` がProvider破棄後に残る経路を潰した。
|
||||
- Google Apps Script詳細取得の遅延timerも多重起動時に前回timerをclearする。
|
||||
|
||||
### このリポジトリで実装できなかったバックエンド側項目
|
||||
|
||||
このリポジトリ内を検索したが、`/train-positions/current` のサーバー実装は含まれていない。
|
||||
見つかったのはフロント側の呼び出し元 `lib/mockApi/positionMasters.ts` のみ。
|
||||
そのため、以下はバックエンド側リポジトリで実装が必要。
|
||||
|
||||
- `/train-positions/current` handler全体のserver-side duration log
|
||||
- Sentry transaction/span
|
||||
- upstream JR四国取得duration
|
||||
- cache hit/miss
|
||||
- stale/last-known-good cache返却
|
||||
- upstream timeout時に200 + stale payloadを返すか、少なくとも短時間で明示的なfallback responseを返す設計
|
||||
|
||||
### 外部APIの簡易計測
|
||||
|
||||
2026-07-07時点で手元から直接 `curl` 計測した結果:
|
||||
|
||||
```
|
||||
http_code=200
|
||||
time_total=1.449047
|
||||
time_connect=0.358893
|
||||
time_starttransfer=1.448716
|
||||
size_download=4887
|
||||
```
|
||||
|
||||
この1回の計測では8秒遅延は再現していない。
|
||||
Sentry上のtimeoutは一過性の上流遅延、バックエンド側のcache miss、または該当時刻の外部取得詰まりを疑う。
|
||||
|
||||
### 次にSentryで見るポイント
|
||||
|
||||
- `area:data_fetch endpoint:positions result:timeout` がIssue化されるのは foreground / online のみになっているか。
|
||||
- timeout後に `fetch:stale_cache` breadcrumb が付くか。
|
||||
- `operation_info` のspan durationが15秒timeout近辺で止まり、29分級spanが再発しないか。
|
||||
- background中の `network_error` がIssue化されずbreadcrumbに留まるか。
|
||||
|
||||
### 残課題
|
||||
|
||||
- offline判定は現時点では `navigator.onLine` が取れる環境に限定される。
|
||||
React Nativeで確実に判定するなら `@react-native-community/netinfo` などの導入が必要。
|
||||
- last-good cacheはアプリプロセス内メモリのみ。アプリ再起動後もstale表示したい場合は永続cacheが必要。
|
||||
- 根本対策はバックエンド側で `/train-positions/current` のlast-known-good cacheを返すこと。
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,58 @@
|
||||
# 保存した運用録画のファイルインポート/エクスポート方針
|
||||
|
||||
## 目的
|
||||
|
||||
保存した走行位置録画を、クリップボードだけでなくファイルとして受け渡しできるようにする。
|
||||
録画データを JSON として書き出し、同じ JSON を選択して取り込める構成にする。
|
||||
|
||||
## 導入済みの必須ライブラリ
|
||||
|
||||
- `expo-file-system`: 録画 JSON を一時ファイルまたは Documents 配下へ書き出し、インポート時に選択済みファイルを読み込む。
|
||||
- `expo-document-picker`: ユーザーに録画 JSON ファイルを選ばせる。読み込み直後に扱いやすくするため、実装時は `copyToCacheDirectory: true` を使う。
|
||||
|
||||
既存の `expo-sharing` は単一ファイルの共有 fallback として残す。`react-native-share` は複数画像や複数ファイルの同時共有、共有先ごとの制御が必要なケースで使う。既存の `expo-clipboard` はコピペ export/import の fallback として残す。
|
||||
|
||||
## 実装済み
|
||||
|
||||
- 録画1件と全件の JSON envelope 書き出し。
|
||||
- `react-native-share` によるネイティブ共有/保存。
|
||||
- Web では `Blob` と `download` による JSON ダウンロード。
|
||||
- `expo-document-picker` と `expo-file-system` による JSON 読み込み。
|
||||
- 既存保存形式と同じ検証処理を通したインポート。
|
||||
- 録画本体は `Paths.document/train-recordings` 配下の JSON ファイルへ保存し、AsyncStorage/SQLite には軽量な一覧メタだけ保存する。
|
||||
- 旧SQLite保存の録画本体は、起動時/インポート時にファイルへ移行して旧キーを削除する。
|
||||
|
||||
## 想定する実装方針
|
||||
|
||||
### ネイティブ
|
||||
|
||||
1. 録画データを version 付き envelope JSON に変換する。
|
||||
2. `expo-file-system` で `cacheDirectory` に `.json` ファイルを書き出す。
|
||||
3. 単一 JSON は `expo-sharing` または `react-native-share` で共有する。
|
||||
4. 複数画像や複数ファイルを同時共有する場合は `react-native-share` の `urls` を使う。
|
||||
5. インポートは `expo-document-picker` で JSON を選択する。
|
||||
6. 選択したファイルを `expo-file-system` で読み込み、既存の検証処理を通して保存する。
|
||||
|
||||
### Web
|
||||
|
||||
Web ではローカル file URI の `expo-sharing` が使えないため、`Blob` と `URL.createObjectURL` による download を別実装にする。
|
||||
インポートはブラウザの file input 相当で読み込む方針にする。
|
||||
|
||||
|
||||
## 正式採用する共有ライブラリ
|
||||
|
||||
- `react-native-share`: 複数画像や複数ファイルを同時共有するために正式採用する。Expo config plugin は options 付きで登録し、初期状態では `ios` と `android` の query 追加を空配列にしている。特定アプリ向けの `shareSingle` や `isPackageInstalled` が必要になった時点で、対象アプリの scheme/package を追加する。
|
||||
- `enableBase64ShareAndroid`: 初期状態では `false`。ファイル URI 共有を基本にするため、Android の legacy storage permission を増やさない。base64 共有が必要になった場合だけ有効化する。
|
||||
|
||||
## 今回インストールしない候補
|
||||
|
||||
- `pako` または `fflate`: 録画 JSON が大きくなったときの gzip/deflate 圧縮候補。まずは plain JSON で運用し、共有できないサイズになった時点で入れる。
|
||||
- `expo-file-system` config plugin options: iOS の Files アプリからアプリ Documents を直接見せたい場合に `enableFileSharing` と `supportsOpeningDocumentsInPlace` を検討する。現時点では共有シートと DocumentPicker で足りる。
|
||||
- `expo-sharing` の共有受け取り設定: 他アプリから「このアプリで開く」導線を作る候補。まずはアプリ内のインポートボタンから選択する方式にする。
|
||||
- `react-native-blob-util`: 大容量/バックグラウンド/Android Storage Access Framework の細かい制御が必要になった場合の候補。Expo managed workflow では導入コストが上がるため、現時点では使わない。
|
||||
|
||||
## 参考
|
||||
|
||||
- https://docs.expo.dev/versions/latest/sdk/filesystem/
|
||||
- https://docs.expo.dev/versions/latest/sdk/document-picker/
|
||||
- https://docs.expo.dev/versions/latest/sdk/sharing/
|
||||
@@ -0,0 +1,372 @@
|
||||
# Sentry Crash 調査履歴
|
||||
|
||||
## 目的
|
||||
このメモは、現在追っているクラッシュ調査の経緯を ChatGPT 側で再考察しやすい形に整理したもの。
|
||||
|
||||
## 現象
|
||||
- `top menu` を表示した後、タブ切り替えや回転をきっかけにクラッシュする。
|
||||
- Android / iOS の両方で再現した。
|
||||
- 既存の `lazy` / `detachInactiveScreens` は必須前提として扱う。
|
||||
- 走行位置、運行情報、トップメニューの各画面で WebView / ネイティブ View のマウントが絡んでいる。
|
||||
|
||||
## 最初の主要シグナル
|
||||
- Sentry の主エラーは `RetryableMountingLayerException: Unable to find viewState for tag ...`
|
||||
- 典型的には Fabric / New Architecture のネイティブ UI ツリー更新失敗を示していた。
|
||||
- つまり JavaScript の例外というより、View の mount / unmount タイミング競合を疑うべき状態だった。
|
||||
|
||||
## 試した方向性の履歴
|
||||
|
||||
### 1. 遷移タイミングをずらす
|
||||
- `navigate` / `replace` / `reset` の直後に落ちるケースを疑い、遷移を一拍遅らせる案を検討した。
|
||||
- ただし症状は完全には止まらず、遷移先だけの問題ではなかった。
|
||||
|
||||
### 2. ライフサイクル依存の自動解放を抑える
|
||||
- iOS でブラウザや WebView がタブ切り替え時に開放される問題があり、`lazyload` を外す方向は破綻した。
|
||||
- そのため、WebView を「常時破棄しない」方向を維持する必要があった。
|
||||
|
||||
### 3. Sentry の観測点を増やす
|
||||
- 画面ごとに breadcrumb と context を追加した。
|
||||
- 追加した主な観測点:
|
||||
- `Apps.tsx`
|
||||
- `Top.tsx`
|
||||
- `components/Apps.tsx`
|
||||
- `components/Apps/WebView.tsx`
|
||||
- `MenuPage.tsx`
|
||||
- `ndView.tsx`
|
||||
- `lib/useWebViewRemount.ts`
|
||||
- これで「どの画面がいつ active になったか」「WebView がいつ remount されたか」を追えるようにした。
|
||||
|
||||
## 重要な発見
|
||||
|
||||
### 発見 1: 走行位置画面の WebView が、非表示なのに active 扱いになる
|
||||
- Sentry のイベントで、`root_tab = topMenu` なのに `positions_screen.activatedScreen = true` や `positions_webview.currentUrl = https://train.jr-shikoku.co.jp/sp.html` が見えていた。
|
||||
- Replay 上はトップメニューだけに見えても、内部 state は走行位置側が先に活性化していた。
|
||||
- これは「見た目では隠れているが、React Navigation / Fabric 的には既に mount されている」可能性を示した。
|
||||
|
||||
### 発見 2: `useIsFocused()` を初期 render の active 判定に使うのが危険
|
||||
- `useIsFocused()` 由来の初期状態が、ナビゲータ初期化直後に想定外の `true` を返す経路があった。
|
||||
- その結果、`positions` 側の root / stack / screen / webview が早すぎるタイミングで活性化した。
|
||||
- これが Fabric の mount 競合を起こしている可能性が高い。
|
||||
|
||||
### 発見 3: `positions` の gate を 1 枚かませても足りなかった
|
||||
- `DeferredPositionsRoot` を追加して root 側を遅延させたが、それでも crash は残った。
|
||||
- つまり root だけではなく、stack / screen / WebView 側にも同じ「初期 focused 扱い」の問題が潜んでいた。
|
||||
|
||||
## 反復した修正
|
||||
|
||||
### 実施した instrumentation
|
||||
- root navigation の state 変化を breadcrumb に残すようにした。
|
||||
- `positions_stack` / `positions_screen` / `positions_webview` / `operation_screen` などの context を追加した。
|
||||
- WebView remount の理由も記録するようにした。
|
||||
|
||||
### 実施した防御
|
||||
- 画面遷移時の WebView remount を観測しやすくした。
|
||||
- Android の回転時やバックグラウンド遷移時に何が起きるか追えるようにした。
|
||||
|
||||
## 現在の仮説
|
||||
- 根本原因は React Navigation そのものではなく、初期 render 時の `focused` 判定を前提にした activation が早すぎること。
|
||||
- その結果、非表示の `positions` ツリーが先に active になり、Fabric が mount state を失う。
|
||||
- 画面遷移先の問題というより、「起動直後の数タイミングで走行位置を経由したタブ遷移が入ると壊れる」挙動に近い。
|
||||
|
||||
## upstream issue 調査メモ
|
||||
- `software-mansion/react-native-reanimated#9785`
|
||||
- `open`
|
||||
- Android + Fabric + React Navigation stack animation 有効時に `SurfaceMountingManager` で crash。
|
||||
- Android だけ stack animation を `none` にすると止まる、という回避策まで一致している。
|
||||
- `software-mansion/react-native-reanimated#6908`
|
||||
- `closed`
|
||||
- Android Fabric で `entering/exiting animations` 使用時に大量 crash。
|
||||
- 本文中に `RetryableMountingLayerException: Unable to find viewState for tag ... Surface stopped: false` があり、Sentry の症状にかなり近い。
|
||||
- `software-mansion/react-native-reanimated#9636`
|
||||
- `closed`
|
||||
- `NativeProxy.preserveMountedTags` が Fabric の view preallocation 中に `Unable to find view for tag ... Surface stopped: false` で落ちる。
|
||||
- 重い native view が同期イベントを投げると crash しやすいという話で、WebView / map 系にも連想が効く。
|
||||
- `software-mansion/react-native-reanimated#8344`
|
||||
- `open`
|
||||
- multi-surface で `LayoutAnimationsProxy` が surface aware でない、という報告。
|
||||
- 直接 Android の同一事象ではないが、「surface をまたぐ animation / mount transaction が壊れる」という意味で構造が近い。
|
||||
|
||||
## 現時点での対策方針
|
||||
- Android の React Navigation stack animation は無効化する。
|
||||
- Android の Reanimated `entering/exiting/layout` は、実際に使っている箇所から順に止めて再現率を下げる。
|
||||
- 現在 repo 内で確認できた該当箇所は `components/Menu/Carousel/CarouselBox.tsx` の `FadeIn/FadeOut`。
|
||||
|
||||
## 直近の修正
|
||||
- `Apps.tsx`
|
||||
- `DeferredPositionsRoot` の activation 初期値を `false` に変更。
|
||||
- `Top.tsx`
|
||||
- positions stack の activation 初期値を `false` に変更。
|
||||
- `components/Apps.tsx`
|
||||
- positions screen / WebView の activation 初期値を `false` に変更。
|
||||
- `ndView.tsx`
|
||||
- operation WebView の activation 初期値を `false` に変更。
|
||||
|
||||
## 直近の OTA
|
||||
- branch: `gmarket`
|
||||
- message: `initialize tab activation gates from false`
|
||||
- update group ID: `82552333-cb5e-455f-ac58-65ada37f7acd`
|
||||
- Android update ID: `019f2133-c3e6-7050-911c-49052b6b17a1`
|
||||
- iOS update ID: `019f2133-c3e6-79b9-9776-88fd55ff72b8`
|
||||
- commit: `cf3995fcbe34366b32b09ee1cfb6b27a7e42982c`
|
||||
|
||||
## いま ChatGPT に見てほしい論点
|
||||
1. 初期 focused 判定を `false` にしても crash が続くなら、次はどの画面の mount ordering を疑うべきか。
|
||||
2. `positions` ツリーのどこまでが本当に先に active になるのかを、Sentry context と replay でどう切り分けるか。
|
||||
3. Fabric / New Architecture の mount race として扱うべきか、React Navigation の state propagation 問題として扱うべきか。
|
||||
|
||||
## 参考ファイル
|
||||
- [Apps.tsx](/home/ubuntu/jrshikoku/Apps.tsx)
|
||||
- [Top.tsx](/home/ubuntu/jrshikoku/Top.tsx)
|
||||
- [components/Apps.tsx](/home/ubuntu/jrshikoku/components/Apps.tsx)
|
||||
- [components/Apps/WebView.tsx](/home/ubuntu/jrshikoku/components/Apps/WebView.tsx)
|
||||
- [ndView.tsx](/home/ubuntu/jrshikoku/ndView.tsx)
|
||||
- [lib/useWebViewRemount.ts](/home/ubuntu/jrshikoku/lib/useWebViewRemount.ts)
|
||||
|
||||
|
||||
## 現在の安定化パッチの意味
|
||||
- 最新の `gmarket` 配信では、クラッシュ回避のために非表示タブの重い native view をかなり積極的に止めている。
|
||||
- その結果、クラッシュは減った一方で、以下の UX 劣化が意図的に入っている。
|
||||
- 走行位置 / 運行情報の WebView がタブ離脱後に再初期化されやすい
|
||||
- タブ間で状態保持されず、開き直しに見える
|
||||
- 動的ルーティングやバックグラウンド継続性が弱くなっている
|
||||
- トップメニューの重い要素は遷移直後に即 mount されない
|
||||
|
||||
## 現在の安定基準点
|
||||
- `gmarket` で配信済みの `topMenu` heavy mount 遅延パッチでは、少なくとも直近の再現テストでクラッシュ頻度は大きく下がっている。
|
||||
- したがって、ここを一旦「クラッシュしにくい基準点」として扱い、以降は UX を壊している防御を一つずつ戻していく方針が妥当。
|
||||
- この時点で重要なのは「全部戻す」ことではなく、「どの防御を戻すとクラッシュが再発するか」を Sentry で切り分けること。
|
||||
|
||||
## UX 劣化の主因になっている防御
|
||||
- `components/Apps.tsx`
|
||||
- `positions` の WebView を blur 時に teardown / deactivate している。
|
||||
- `Apps.tsx` / `Top.tsx` / `lib/rootNavigation.ts`
|
||||
- `positions` タブ離脱時に root / stack 側も落とす寄りの制御を入れている。
|
||||
- `ndView.tsx`
|
||||
- `information` の WebView も blur 中は deactivate している。
|
||||
- `menu.tsx`
|
||||
- `topMenu` の `MapView` / `CarouselBox` / `LED_vision` を Android で遅延 mount している。
|
||||
|
||||
## ここから戻す優先順位
|
||||
1. `positions` の blur 時 WebView teardown を部分的に戻す
|
||||
- 対象: `components/Apps.tsx`
|
||||
- 理由: 走行位置の開き直し、状態喪失、バックグラウンド継続切断に最も効いているため。
|
||||
2. `positions` の tab blur 時 stack / root teardown を緩める
|
||||
- 対象: `Apps.tsx`, `Top.tsx`, `lib/rootNavigation.ts`
|
||||
- 理由: タブ間データ共有、動的ルーティング、navigation state 維持の破綻に直結しているため。
|
||||
3. `information` の blur 時 WebView teardown を戻す
|
||||
- 対象: `ndView.tsx`
|
||||
- 理由: 運行情報の開き直しや iOS 側の裏ブラウザ保持に関係するため。
|
||||
4. `topMenu` の heavy mount 遅延を必要最小限まで縮める
|
||||
- 対象: `menu.tsx`
|
||||
- 理由: 初回表示のもたつき改善には効くが、状態維持より優先度は下。
|
||||
5. 最終的に teardown をやめて pause ベースに置き換える
|
||||
- 対象: `components/Apps.tsx`, `ndView.tsx` など
|
||||
- 理由: 安定性を維持しながら UX を戻す本命だが、切り分け後にやるべき段階。
|
||||
|
||||
## 次の実施方針
|
||||
- まず `positions` を中心に戻す。
|
||||
- 1 回の変更で戻す範囲は狭くし、再現したらその差分だけを Sentry で見る。
|
||||
- つまり今後の作業は「クラッシュ回避策の全撤廃」ではなく、「UX を壊している要素を優先順に切り戻し、再発ラインを特定する」ことが目的。
|
||||
|
||||
|
||||
## 2026-07-03 時点の基準点
|
||||
|
||||
### 現在の評価
|
||||
- 起動直後の `positions -> topMenu` / `positions -> information` で高頻度に落ちていた主クラッシュは、現時点ではかなり再現率が下がっている。
|
||||
- 少なくとも直近の観測では、以前の `RetryableMountingLayerException` 系の大崩れは前面には出ていない。
|
||||
- そのため、この時点は「主問題をかなり抑え込めた基準点」として保存する価値がある。
|
||||
|
||||
### この時点で残っている別系統の問題
|
||||
- `JR-SHIKOKU-UNOFFICIAL-APPS-S`
|
||||
- `Error: Unsupported top level event type "topUserLocationChange" dispatched`
|
||||
- `root_tab = positions`
|
||||
- `level = fatal`
|
||||
- `ReactFabric-prod` 起点
|
||||
- これは、今回の `topMenu / information / hidden prewarm` 系の問題とは別系統とみなす。
|
||||
- つまり、この時点での主クラッシュ対策の評価をする際は、この issue は切り離して考える。
|
||||
|
||||
### この時点での差分の分類
|
||||
|
||||
#### A. 主クラッシュ抑止のコア差分
|
||||
以下は、現時点の安定化に本質的に効いている可能性が高く、安易に戻さない。
|
||||
|
||||
- `Apps.tsx`
|
||||
- `DeferredPositionsRoot`
|
||||
- `hasVisitedPositions`
|
||||
- startup delayed prewarm
|
||||
- `detachInactiveScreens={false}`
|
||||
- root tab の `positionsLifecycleRef` 連携
|
||||
- `Top.tsx`
|
||||
- `positions stack` の background prewarm
|
||||
- stack activation gate
|
||||
- `components/Apps.tsx`
|
||||
- `positions screen` / `WebView` の activation gate
|
||||
- `hasStableWebViewSession`
|
||||
- blur 時 preserve
|
||||
- unstable session 中の tab exit guard
|
||||
- `components/Apps/WebView.tsx`
|
||||
- WebView 初回安定化通知
|
||||
- message / load / process termination の監視強化
|
||||
- `lib/rootNavigation.ts`
|
||||
- `positionsLifecycleRef`
|
||||
- `lib/useWebViewRemount.ts`
|
||||
- remount reason 付きの共通制御
|
||||
|
||||
#### B. 補助的な安定化差分
|
||||
以下は、主因とは言い切れないが、再現率低下に寄与している可能性がある。
|
||||
|
||||
- `menu.tsx`
|
||||
- top menu heavy content の delayed activation
|
||||
- Android で `MapView` や重い要素をすぐ mount しない制御
|
||||
- `ndView.tsx`
|
||||
- operation WebView の delayed activation
|
||||
- operation 側 remount / parse / settings load の観測
|
||||
- `lib/stackOption.ts`
|
||||
- Android で push animation を切る変更
|
||||
- `components/Settings/settings.tsx`
|
||||
- settings stack へ共通 animation option を適用
|
||||
|
||||
#### C. 観測専用で後から削れる差分
|
||||
以下は、挙動改善というより Sentry で成功/失敗比較を行うための記録であり、安定化の評価が済めば削減可能。
|
||||
|
||||
- `Apps.tsx` の `nav.root` / `nav.tab` / `positions.root` breadcrumb と context の大半
|
||||
- `Top.tsx` の `positions.stack` breadcrumb / context
|
||||
- `components/Apps.tsx` の `positions.screen` breadcrumb / context
|
||||
- `components/Apps/WebView.tsx` の `positions.webview` breadcrumb / context
|
||||
- `MenuPage.tsx` の `topMenu.screen` breadcrumb / context
|
||||
- `menu.tsx` の `top_menu_runtime` breadcrumb / context
|
||||
- `ndView.tsx` の `operation.screen` / `operation.settings` / `operation.webview` breadcrumb / context
|
||||
- `components/Menu/Carousel/CarouselBox.tsx` の `menu.carousel` breadcrumb
|
||||
|
||||
### この時点での重要な判断
|
||||
- 今の差分は広いが、全部が同じ重みではない。
|
||||
- まず守るべきなのは `positions` の activation / preserve / unstable guard 周辺であり、ここが今回の基礎。
|
||||
- 一方、Sentry breadcrumb の大半は観測用なので、安定化判断後にかなり整理できる。
|
||||
- `CarouselBox.tsx` は特に「Android fallback ロジック」と「breadcrumb」の両方が混ざっているため、後で整理する際は分離して扱う。
|
||||
|
||||
### 今後の戻し方の基準
|
||||
- 戻すときは、まず観測用差分からではなく、`UX を壊しているがコアではない差分` を対象にする。
|
||||
- つまり順番としては:
|
||||
1. 観測を維持したまま補助差分を少し戻す
|
||||
2. 再発しないことを確認する
|
||||
3. 最後に breadcrumb / context を掃除する
|
||||
- コア差分を先に剥がすと、再び「どこで壊れたか分からない状態」に戻るので避ける。
|
||||
|
||||
### この時点の結論
|
||||
- `positions` の hidden / delayed activation と lifecycle guard 群は、今回の主クラッシュ対策の核として維持する。
|
||||
- `topMenu` / `operation` / `carousel` 周辺の差分は、主因ではなく補助あるいは観測の可能性があるため、今後の整理対象にできる。
|
||||
- 新たに見つかった `topUserLocationChange` は別問題であり、この基準点の評価には混ぜない。
|
||||
|
||||
## 2026-07-04 iOS WebView 保持問題の解決メモ
|
||||
|
||||
### 解決した現象
|
||||
- iOS で `トップメニュー -> 走行位置 -> トップメニュー -> 走行位置` と遷移すると、走行位置 WebView が毎回開き直る問題。
|
||||
- iOS で `トップメニュー -> 運行情報 -> トップメニュー -> 運行情報` と遷移すると、運行情報 WebView が毎回開き直る問題。
|
||||
- ユーザー確認により、最新 `gmarket` OTA で iOS の上記挙動は完全に解消した。
|
||||
|
||||
### 解決に効いた差分
|
||||
- `App.tsx`
|
||||
- iOS のみ `react-native-screens` の最適化を起動時に無効化した。
|
||||
- `enableFreeze(false)`
|
||||
- `enableScreens(false)`
|
||||
- この結果、タブ切替時に native screen 最適化層が WebView を実質的に破棄・再生成する経路を避けられた。
|
||||
- したがって、iOS の WebView 保持問題については、現時点では `react-native-screens` / freeze / native screen detach 周辺が主因だったと扱う。
|
||||
|
||||
### 解決時点の OTA
|
||||
- branch: `gmarket`
|
||||
- message: `gmarket ios screens webview retention test`
|
||||
- update group ID: `8aec430f-eb6d-4017-af74-c2ae7dee7fd4`
|
||||
- Android update ID: `019f2dfb-69f6-72ab-8cdd-a3d1b9f4df8d`
|
||||
- iOS update ID: `019f2dfb-69f6-75dd-956b-435a73519a54`
|
||||
- commit: `6cea1ed4e86e30f356a7a1b5fc289f9fe1f9b5f5`
|
||||
|
||||
### この解決の扱い
|
||||
- iOS では `react-native-screens` を無効化したため、画面保持は戻った。
|
||||
- 一方で、screen 最適化を切ったことによる副作用は今後確認が必要。
|
||||
- iOS の画面遷移アニメーションが重くならないか。
|
||||
- トップメニューや設定画面のスクロールが再び重くならないか。
|
||||
- スタック画面が増えた状態でメモリ使用量が過剰にならないか。
|
||||
- ただし、今回のユーザー確認では iOS の走行位置・運行情報 WebView 保持は解決済みとして扱う。
|
||||
|
||||
|
||||
## 2026-07-04 以降に残る検証項目
|
||||
|
||||
### 優先度 高: Android のタブ切替クラッシュが再発していないか
|
||||
- iOS 向けの `enableScreens(false)` は `Platform.OS === "ios"` 限定なので、Android の挙動は直接変えていない。
|
||||
- これまで Android では、走行位置の読み込み中にトップメニュー・運行情報へタブ切替すると `RetryableMountingLayerException` 系のクラッシュが再発していた。
|
||||
- 確認手順:
|
||||
- Android で起動直後に走行位置を開く。
|
||||
- ページ読み込みが終わる前にトップメニューへ切り替える。
|
||||
- 同じく、ページ読み込みが終わる前に運行情報へ切り替える。
|
||||
- それぞれ複数回繰り返し、Sentry に新規 fatal が出るかを見る。
|
||||
- 判定:
|
||||
- fatal が出なければ、Android の現行 guard は維持。
|
||||
- fatal が出るなら、Sentry breadcrumb で `positions.root` / `positions.stack` / `positions.screen` / `positions.webview` のどこまで進んだかを確認する。
|
||||
|
||||
### 優先度 高: iOS の解決差分の副作用確認
|
||||
- iOS で screen 最適化を無効化したため、UX とメモリの確認が必要。
|
||||
- 確認手順:
|
||||
- 走行位置、トップメニュー、運行情報、設定画面を長時間行き来する。
|
||||
- 設定画面やトップメニューの縦スクロールが重くならないか確認する。
|
||||
- 運行情報の横画面表示、縦横切替、戻しを複数回試す。
|
||||
- バックグラウンド復帰後に走行位置・運行情報が保持されるか確認する。
|
||||
- 判定:
|
||||
- 体感劣化が軽微なら、iOS の `enableScreens(false)` は維持。
|
||||
- 明確な重さが出るなら、iOS だけ root tab 周辺を JS view ベースにしつつ、stack 側の screen 最適化だけ戻す案を検討する。
|
||||
|
||||
### 優先度 中: Android で `react-native-reanimated-carousel` を戻せるか
|
||||
- 過去に Android のカクつき・クラッシュ対策として carousel 周辺を弱めた。
|
||||
- ユーザー要望として、Android では `reanimated-carousel` をできれば使いたい。
|
||||
- 確認手順:
|
||||
- 現行の Android 安定性を先に確認する。
|
||||
- その後、carousel を段階的に戻す。
|
||||
- 戻す場合も Reanimated の `entering` / `exiting` / `layout` アニメーションとは分離して検証する。
|
||||
- 判定:
|
||||
- carousel 復帰で crash が出なければ採用。
|
||||
- `RetryableMountingLayerException` が戻るなら、Android では carousel 本体または Reanimated layout animation を避ける。
|
||||
|
||||
### 優先度 中: Android / iOS の Sentry ノイズ整理
|
||||
- 現在は切り分けのため breadcrumb / context が多い。
|
||||
- 安定化判断後は、Sentry に残すものと削るものを分ける。
|
||||
- 残す候補:
|
||||
- root tab 遷移
|
||||
- WebView remount reason
|
||||
- process termination
|
||||
- fatal 直前の active tab / orientation
|
||||
- 削る候補:
|
||||
- 通常 focus / blur の過剰な breadcrumb
|
||||
- loadStart / loadEnd の頻繁な記録
|
||||
- 一時的な activation gate の詳細 context
|
||||
|
||||
### 優先度 中: `topUserLocationChange` 系 fatal の別問題調査
|
||||
- 以前確認した `JR-SHIKOKU-UNOFFICIAL-APPS-S` は今回の WebView 保持問題とは別系統として扱う。
|
||||
- `Unsupported top level event type "topUserLocationChange" dispatched`
|
||||
- `root_tab = positions`
|
||||
- ReactFabric 起点。
|
||||
- 確認手順:
|
||||
- 位置情報取得中、走行位置表示中、タブ切替中のどのタイミングで出るか Sentry で再確認する。
|
||||
- `useUserPosition` / MapView / location watcher 周辺を優先して見る。
|
||||
|
||||
### 優先度 低: トップメニュー指定起動時のバックグラウンド preload
|
||||
- 過去の課題として、トップメニュー指定で起動した場合に走行位置・運行情報がバックグラウンドで読み込まれない問題が残っている。
|
||||
- iOS の WebView 保持が戻ったため、再度評価する価値がある。
|
||||
- 確認手順:
|
||||
- `topMenu` 初期起動。
|
||||
- 走行位置を開く前に、走行位置 WebView の prewarm が開始しているか Sentry context で見る。
|
||||
- 運行情報も同様に hidden prewarm されるか見る。
|
||||
- ただし、Android の起動直後クラッシュ再発リスクがあるため、優先度は低め。
|
||||
|
||||
### 優先度 低: 過去の回避策の整理
|
||||
- iOS WebView 保持は `enableScreens(false)` で解決したため、それ以前に入れた一部の回避策は不要になった可能性がある。
|
||||
- ただし Android のクラッシュ抑止にはまだ必要な可能性があるため、削除は Android 安定確認後に行う。
|
||||
- 整理候補:
|
||||
- `components/Apps/WebView.tsx` の iOS ping watchdog の必要性。
|
||||
- `lib/useWebViewRemount.ts` の blur grace window の必要性。
|
||||
- `Apps.tsx` の `PositionsTabScreen` 固定化の必要性。
|
||||
- `ndView.tsx` の operation WebView delayed activation の必要性。
|
||||
|
||||
### 次の実務順
|
||||
1. Android で走行位置読み込み中のタブ切替クラッシュが残っているか確認する。
|
||||
2. iOS で `enableScreens(false)` の副作用を確認する。
|
||||
3. Android が安定している場合のみ、`reanimated-carousel` 復帰検証に進む。
|
||||
4. 安定確認後、Sentry breadcrumb と暫定回避策を整理する。
|
||||
@@ -0,0 +1,525 @@
|
||||
# Sentry観測ログ整理メモ
|
||||
|
||||
作成日: 2026-07-07
|
||||
|
||||
対象配信:
|
||||
|
||||
- EAS channel: `gmarket`
|
||||
- Update group ID: `8fd66cda-2f4a-40e2-937f-7de8e62c72ec`
|
||||
- Runtime version: `exposdk:55.0.0`
|
||||
- Message: `gmarket app lifecycle crash sentinel`
|
||||
|
||||
## 目的
|
||||
|
||||
このメモは、現在のアプリがSentryへ送るはずのログ情報を、機能別に整理する。
|
||||
|
||||
今後、データ通信エラー、WebView白化、Sentryにfatal crashとして出ない体感クラッシュが発生したときに、どのSentry情報を見ればよいかを明確にする。
|
||||
|
||||
## 全体像
|
||||
|
||||
現在Sentryで観測できる主な系統は次の5つ。
|
||||
|
||||
| 系統 | 主な機能 | Sentry上の見え方 | 目的 |
|
||||
|---|---|---|---|
|
||||
| 通信計測 | RN側fetch wrapper | `area=data_fetch` のIssue、breadcrumb、span | endpoint別の失敗、timeout、HTTP status、JSON parse失敗を追う |
|
||||
| アプリライフサイクル | crash sentinel | `app.previous_session_unexpected_exit` | fatal crashとして出ない突然終了を次回起動で検知する |
|
||||
| root navigation | タブ遷移、root状態 | `root_navigation` context、`nav.root`/`nav.tab` breadcrumb | どのタブ、どの遷移直後に問題が起きたかを追う |
|
||||
| WebView状態 | 走行位置、運行情報、hidden preload | `active_webviews` context、各WebView breadcrumb | クラッシュ/白化直前にどのWebViewが生きていたかを見る |
|
||||
| 画面ゲート/プリロード | positions/information lazy activation | `positions_root_gate` / `operation_root_gate` context、root breadcrumb | preloadや初回activationのタイミング問題を追う |
|
||||
|
||||
## 1. 通信計測 data_fetch
|
||||
|
||||
実装場所:
|
||||
|
||||
- `lib/observability/network/observedFetch.ts`
|
||||
- `lib/observability/network/sentryNetwork.ts`
|
||||
- `lib/observability/network/endpoints.ts`
|
||||
- `lib/observability/network/types.ts`
|
||||
|
||||
### 何をしているか
|
||||
|
||||
RN側の通信を `observedFetchJson` / `observedFetchText` 経由にして、endpointごとに次を記録する。
|
||||
|
||||
- fetch開始 breadcrumb
|
||||
- 成功/失敗 breadcrumb
|
||||
- `http.client` span
|
||||
- 失敗時の `captureException`
|
||||
- timeout時の primary error: `ObservedFetchError("Network request timed out")`
|
||||
- JSON期待時のHTML返却検知
|
||||
- JSON parse失敗検知
|
||||
- retry回数
|
||||
- appState / online状態
|
||||
- URL全文ではなく host + path template
|
||||
|
||||
### Sentry tags
|
||||
|
||||
通信系Issueには主に次のtagが付く。
|
||||
|
||||
| tag | 値 | 用途 |
|
||||
|---|---|---|
|
||||
| `area` | `data_fetch` | 通信計測イベントの絞り込み |
|
||||
| `endpoint` | 低カーディナリティendpoint名 | どの論理取得か |
|
||||
| `result` | `timeout`, `network_error`, `http_error`, `non_json`, `parse_error`, `empty_response`, `success`, `slow_success`, `aborted` | 結果分類 |
|
||||
| `root_tab` | `positions`, `topMenu`, `information`, `unknown` | 発生時のroot tab |
|
||||
| `platform` | `ios`, `android` | OS差分 |
|
||||
| `source` | `rn_fetch`, `mock_api`, `n8n`, `gas`, `backend_api`, `static_storage`, `webview_fetch` | 取得元分類 |
|
||||
| `user_visible` | `true` / `false` | ユーザー体感に直結する取得か |
|
||||
| `preload` | `true` / `false` | preload扱いか |
|
||||
| `fetch_priority` | `high`, `medium`, `low` | 優先度 |
|
||||
| `status` | HTTP status文字列 | HTTP系の絞り込み |
|
||||
|
||||
### Sentry context: `data_fetch`
|
||||
|
||||
| context field | 内容 |
|
||||
|---|---|
|
||||
| `kind` | 失敗分類。captureException時に付く |
|
||||
| `endpoint` | 論理endpoint |
|
||||
| `method` | 現状ほぼ `GET` |
|
||||
| `status` | HTTP status |
|
||||
| `ok` | response.ok |
|
||||
| `durationMs` | 通信 + body read時間 |
|
||||
| `timeoutMs` | endpointごとのtimeout |
|
||||
| `bytes` | response body推定サイズ |
|
||||
| `contentType` | response content-type |
|
||||
| `responseHead` | 失敗時のみ最大300文字 |
|
||||
| `retryCount` | `0` または `1` |
|
||||
| `urlHost` | hostのみ |
|
||||
| `urlPathTemplate` | path templateのみ |
|
||||
| `appState` | `active`, `background`, `inactive` など |
|
||||
| `online` | `navigator.onLine` が取れた場合のオンライン状態 |
|
||||
|
||||
### breadcrumb
|
||||
|
||||
| category | message | level | 意味 |
|
||||
|---|---|---|---|
|
||||
| `data_fetch` | `fetch:start` | `info` | fetch開始 |
|
||||
| `data_fetch` | `fetch:success` | `info` | 成功 |
|
||||
| `data_fetch` | `fetch:slow_success` | `warning` | slowMs超過。ただしIssue化は現在無効 |
|
||||
| `data_fetch` | `fetch:timeout` | `error` | timeout |
|
||||
| `data_fetch` | `fetch:network_error` | `error` | fetch reject |
|
||||
| `data_fetch` | `fetch:http_error` | `error` | HTTP 4xx/5xx |
|
||||
| `data_fetch` | `fetch:non_json_response` | `error` | JSON期待だがJSONに見えない |
|
||||
| `data_fetch` | `fetch:json_parse_error` | `error` | JSON.parse失敗 |
|
||||
| `data_fetch` | `fetch:empty_response` | `error` | 空レスポンス |
|
||||
| `data_fetch` | `fetch:aborted` | `info` | background/offlineで開始抑制。Issue化しない |
|
||||
|
||||
### span
|
||||
|
||||
`Sentry.startSpan` が使える環境では次のspanを出す。
|
||||
|
||||
| field | 値 |
|
||||
|---|---|
|
||||
| `op` | `http.client` |
|
||||
| `name` | `fetch <endpoint>` |
|
||||
| `description` | `fetch <endpoint>` |
|
||||
| `app.area` | `data_fetch` |
|
||||
| `app.endpoint` | endpoint名 |
|
||||
| `app.root_tab` | root tab |
|
||||
| `http.method` | method |
|
||||
| `server.address` | URL host |
|
||||
|
||||
注意:
|
||||
|
||||
- 自作span名には実URLを入れない。
|
||||
- Sentry SDKの自動HTTP spanに実URLが出る可能性はある。
|
||||
|
||||
### Issue化ルール
|
||||
|
||||
| 結果 | Issue化 | level | 備考 |
|
||||
|---|---|---|---|
|
||||
| success | しない | breadcrumb/spanのみ | 正常系ノイズ防止 |
|
||||
| slow_success | 現在しない | warning予定 | `SLOW_SUCCESS_SAMPLE_RATE = 0` |
|
||||
| timeout | する | warning | `ObservedFetchError("Network request timed out")` |
|
||||
| network_error | active/onlineならする | warning | background/offline由来は抑制 |
|
||||
| http_error | する | warning | status付き |
|
||||
| non_json_response | する | warning | HTML返却調査用にresponseHead |
|
||||
| json_parse_error | する | error | 実装/データ形式不一致の疑い |
|
||||
| empty_response | する | warning | 空body |
|
||||
| aborted | しない | breadcrumbのみ | background/offline開始抑制 |
|
||||
|
||||
## 2. 現在の通信endpoint一覧
|
||||
|
||||
| endpoint | source | 機能 | 画面/利用箇所 | URL host/path | timeout | retry | user_visible | preload | priority |
|
||||
|---|---|---|---|---|---:|---|---|---|---|
|
||||
| `positions_current` | `n8n` | 現在走行位置 | 走行位置、列車詳細、発車標系 | `n8n.haruk.in` `/webhook/c501550c-7d1b-4e50-927b-4429fe18931a` | 8000ms | 最大1回 | true | false | high |
|
||||
| `positions_current` | `mock_api` | mock現在走行位置 | mock有効時の走行位置 | `jr-shikoku-backend-mock-api-v1.haruk.in` `/train-positions/current` | 8000ms | 最大1回 | true | false | high |
|
||||
| `positions_master` | `mock_api` | mock位置マスタ | mock有効時の補完データ | `jr-shikoku-backend-mock-api-v1.haruk.in` `/position-masters` | 8000ms | 最大1回 | false | true | medium |
|
||||
| `positions_gas_fallback` | `gas` | 走行位置fallback | n8n失敗時のみ | `script.google.com` GAS `/exec` | 8000ms | 最大1回 | true | false | high |
|
||||
| `operation_info_flag` | `n8n` | 運行情報フラグ/対象エリア | topMenu、information、badge | `n8n.haruk.in` `/webhook/jr-shikoku-trainfo-flag` | 10000ms | 最大1回 | true | true | medium |
|
||||
| `operation_info_text` | `gas` | 運行情報本文補助 | operation flagで対象ありの場合のみ | `script.google.com` GAS `/exec` | 15000ms | なし | true | false | medium |
|
||||
| `operation_logs` | `backend_api` | 列車別運行ログ | provider全体、列車詳細、WebView補助と重複 | `jr-shikoku-backend-api-v1.haruk.in` `/operation-logs` | 15000ms | 最大1回 | false | true | medium |
|
||||
| `train_operation_data` | `backend_api` | 編成/運用系データ | provider全体、列車詳細、走行位置WebView補助と重複 | `jr-shikoku-backend-api-v1.haruk.in` `/train-data` | 15000ms | 最大1回 | false | true | medium |
|
||||
| `timetable_today` | `static_storage` | 当日ダイヤJSON | provider全体、時刻表/発車標/列車詳細 | `jr-shikoku-api-data-storage.haruk.in` `/tmp/diagram-today.json` | 15000ms | 最大1回 | false | true | medium |
|
||||
|
||||
## 3. アプリライフサイクル crash sentinel
|
||||
|
||||
実装場所:
|
||||
|
||||
- `lib/observability/appLifecycleCrashSentinel.ts`
|
||||
- `App.tsx`
|
||||
- `Apps.tsx`
|
||||
- `components/Apps/WebView.tsx`
|
||||
- `ndView.tsx`
|
||||
|
||||
### 何をしているか
|
||||
|
||||
Sentryに `fatal`, `handled:false`, `event.type:crash` として出ない「ユーザー体感上の完全クラッシュ」を、次回起動時に検出する。
|
||||
|
||||
AsyncStorageに以下を保存する。
|
||||
|
||||
- `app_session_active=true`
|
||||
- `normal_background`
|
||||
- `sessionStartedAt`
|
||||
- `lastHeartbeatAt`
|
||||
- `lastKnownAppState`
|
||||
- `lastRootTab`
|
||||
- `previousRootNavigation`
|
||||
- `activeWebViews`
|
||||
- `nativeScreensMode`
|
||||
|
||||
稼働中は7秒ごとに `lastHeartbeatAt` を更新する。
|
||||
|
||||
AppStateが `background` になったら `normal_background=true` を記録する。
|
||||
|
||||
次回起動時、前回sessionが次を満たす場合だけ `app.previous_session_unexpected_exit` を送る。
|
||||
|
||||
- `app_session_active=true`
|
||||
- `normal_background=false`
|
||||
- `lastHeartbeatAt` が直近120秒以内
|
||||
- sessionが5秒以上続いていた
|
||||
- 同じ `sessionStartedAt` で未報告
|
||||
|
||||
### Sentry event
|
||||
|
||||
| event | level | 目的 |
|
||||
|---|---|---|
|
||||
| `app.previous_session_unexpected_exit` | warning | fatal crashとして出ない突然終了を補足 |
|
||||
|
||||
### tags
|
||||
|
||||
| tag | 内容 |
|
||||
|---|---|
|
||||
| `area=app_lifecycle` | lifecycle系の絞り込み |
|
||||
| `result=unexpected_exit` | 前回session異常終了 |
|
||||
| `platform` | `ios` / `android` |
|
||||
| `root_tab` | 起動時に把握できる現在root tab |
|
||||
| `last_root_tab` | 前回session最後のroot tab |
|
||||
| `native_screens_mode` | `screens-disabled` or `default` |
|
||||
|
||||
### context: `app_lifecycle`
|
||||
|
||||
| field | 内容 |
|
||||
|---|---|
|
||||
| `lastHeartbeatAt` | 前回session最後のheartbeat |
|
||||
| `sessionStartedAt` | 前回session開始時刻 |
|
||||
| `previousRootNavigation` | 前回最後に観測したroot/nested navigation |
|
||||
| `lastKnownAppState` | 前回最後のAppState |
|
||||
| `activeWebViews` | 前回最後にactive扱いだったWebView名 |
|
||||
| `memory` | `performance.memory` があればJS heap情報。RNではnullの可能性あり |
|
||||
| `expoUpdate` | `update_id`, `updateId`, `channel`, `runtimeVersion`, `createdAt`, `isEmbeddedLaunch` |
|
||||
| `normalBackground` | 前回正常background遷移したか |
|
||||
| `heartbeatAgeMs` | 現在から見た前回heartbeatの古さ |
|
||||
|
||||
### 関連context
|
||||
|
||||
| context | 内容 |
|
||||
|---|---|
|
||||
| `app_lifecycle_sentinel` | 現sessionの開始、heartbeat、appState、activeWebViews、expoUpdate |
|
||||
| `active_webviews` | 現在active扱いのWebView名一覧 |
|
||||
|
||||
### activeWebViews名
|
||||
|
||||
| name | 意味 |
|
||||
|---|---|
|
||||
| `positions_main` | 走行位置タブ本体のWebView |
|
||||
| `operation_info_main` | 運行情報タブ本体のWebView |
|
||||
| `startup_hidden_positions` | 起動時hidden preloadの走行位置WebView |
|
||||
| `startup_hidden_operation` | 起動時hidden preloadの運行情報WebView |
|
||||
|
||||
## 4. root navigation / tab操作ログ
|
||||
|
||||
実装場所:
|
||||
|
||||
- `Apps.tsx`
|
||||
- `lib/rootNavigation.ts`
|
||||
|
||||
### Sentry context: `root_navigation`
|
||||
|
||||
| field | 内容 |
|
||||
|---|---|
|
||||
| `rootIndex` | root tab index |
|
||||
| `rootRoute` | `positions`, `topMenu`, `information` |
|
||||
| `nestedIndex` | nested stack index |
|
||||
| `nestedRoute` | nested route名 |
|
||||
| `hasExtra` | 追加画面/stackが開いているか |
|
||||
| `source` | `ready` or `change` |
|
||||
| `operationOrientation` | `landscape` or `portrait` |
|
||||
| `hasVisitedPositions` | positions rootをactivate済みか |
|
||||
| `hasVisitedInformation` | information rootをactivate済みか |
|
||||
|
||||
### tags
|
||||
|
||||
| tag | 内容 |
|
||||
|---|---|
|
||||
| `root_tab` | 最後に観測したroot tab |
|
||||
| `native_screens_mode` | iOSは `screens-disabled`、Androidは `default` |
|
||||
|
||||
### breadcrumb
|
||||
|
||||
| category | message | 意味 |
|
||||
|---|---|---|
|
||||
| `runtime.flags` | `runtime navigation flags applied` | native screens/freeze設定 |
|
||||
| `nav.root` | `navigation ready` | NavigationContainer ready |
|
||||
| `nav.root` | `root state initialized` | 初期root state |
|
||||
| `nav.root` | `root state change` | root state変化 |
|
||||
| `nav.tab` | `root tabPress` | タブ押下 |
|
||||
| `nav.tab` | `root tabPress intercepted for unstable positions` | 不安定な走行位置離脱を検知 |
|
||||
| `nav.tab` | `root tabPress blocked while positions unstable` | 不安定な走行位置離脱をブロック |
|
||||
| `nav.tab` | `root tab focus` | root tab focus |
|
||||
| `nav.tab` | `root tab blur` | root tab blur |
|
||||
| `nav.tab` | `root tab state` | tab state event |
|
||||
|
||||
## 5. root gate / preloadログ
|
||||
|
||||
実装場所:
|
||||
|
||||
- `Apps.tsx`
|
||||
|
||||
### context
|
||||
|
||||
| context | 内容 |
|
||||
|---|---|
|
||||
| `positions_root_gate` | `focused`, `activated`, `shouldActivate` |
|
||||
| `operation_root_gate` | `focused`, `activated`, `shouldActivate` |
|
||||
| `startup_hidden_preload` | hidden preloadのshould/loaded状態 |
|
||||
|
||||
### breadcrumb
|
||||
|
||||
| category | message | 意味 |
|
||||
|---|---|---|
|
||||
| `positions.root` | `positions startup prewarm scheduled` | topMenu起動中にpositions prewarm予約 |
|
||||
| `positions.root` | `positions startup prewarm activated` | positions prewarm実行 |
|
||||
| `positions.root` | `positions root activation` | positions root初回activate |
|
||||
| `positions.root` | `positions root tabPress activation` | positionsタブ押下でactivate |
|
||||
| `positions.root` | `positions root focus activation` | positions focusでactivate |
|
||||
| `positions.root` | `positions root blur preserved` | blur後も保持 |
|
||||
| `positions.root` | `positions root exit blocked while session unstable` | 不安定セッションからの離脱ブロック |
|
||||
| `operation.root` | `operation startup prewarm scheduled` | information prewarm予約 |
|
||||
| `operation.root` | `operation startup prewarm activated` | information prewarm実行 |
|
||||
| `operation.root` | `operation root activation` | operation root初回activate |
|
||||
| `operation.root` | `operation root tabPress activation` | informationタブ押下でactivate |
|
||||
| `operation.root` | `operation root focus activation` | information focusでactivate |
|
||||
| `operation.root` | `operation root blur preserved` | blur後も保持 |
|
||||
| `startup.preload` | `positions hidden preload loadStart/loadEnd/error` | hidden positions WebViewのロード状態 |
|
||||
| `startup.preload` | `operation hidden preload loadStart/loadEnd/error` | hidden operation WebViewのロード状態 |
|
||||
|
||||
## 6. 走行位置WebViewログ
|
||||
|
||||
実装場所:
|
||||
|
||||
- `components/Apps/WebView.tsx`
|
||||
- `lib/useWebViewRemount.ts`
|
||||
|
||||
### context: `positions_webview`
|
||||
|
||||
| field | 内容 |
|
||||
|---|---|
|
||||
| `focused` | screen focus状態 |
|
||||
| `landscape` | 横画面か |
|
||||
| `mockApi` | mock API有効か |
|
||||
| `remountKey` | WebView remount key |
|
||||
| `currentUrl` | WebView現在URL。取れていない場合null |
|
||||
|
||||
### breadcrumb category: `positions.webview`
|
||||
|
||||
| message | 意味 |
|
||||
|---|---|
|
||||
| `webview focused` / `webview blurred` | focus変化 |
|
||||
| `webview pending initial inject resumed on focus` | focus復帰時に保留injectを実行 |
|
||||
| `webview remount key` | remount key変化 |
|
||||
| `webview remount requested` | WebView watchdog等でremount要求 |
|
||||
| `webview cleanup start` | unmount/cleanup開始 |
|
||||
| `webview unmounted` | unmount完了 |
|
||||
|
||||
注意:
|
||||
|
||||
- 公式サイト内XHR `/g?arg1=train&arg2=train` はRN側fetch wrapperを通らないため、現状 `data_fetch` には出ない。
|
||||
- WebView内部の公式通信や injected JS fetch は、現時点ではbreadcrumb/postMessage中心で、通信詳細は未計測。
|
||||
|
||||
## 7. 運行情報WebViewログ
|
||||
|
||||
実装場所:
|
||||
|
||||
- `ndView.tsx`
|
||||
- `lib/useWebViewRemount.ts`
|
||||
|
||||
### context: `operation_screen`
|
||||
|
||||
| field | 内容 |
|
||||
|---|---|
|
||||
| `focused` | information画面focus |
|
||||
| `orientation` | `portrait` / `landscape` |
|
||||
| `landscapeMode` | 運行情報横画面モード有効か |
|
||||
| `captureEnabled` | 画像切り出し有効か |
|
||||
| `activatedWebView` | WebView activate済みか |
|
||||
| `layoutWidth` / `layoutHeight` | root layout |
|
||||
| `contentTop` | safe area反映後top |
|
||||
| `signageSafeLeft` / `signageSafeRight` | 横画面safe area |
|
||||
| `remountKey` | WebView remount key |
|
||||
|
||||
### breadcrumb
|
||||
|
||||
| category | message | 意味 |
|
||||
|---|---|---|
|
||||
| `operation.screen` | `operation screen mounted/unmounted` | 画面mount状態 |
|
||||
| `operation.screen` | `operation focused/blurred` | focus変化 |
|
||||
| `operation.screen` | `operation layout` | layout/orientation変化 |
|
||||
| `operation.screen` | `operation webview activation scheduled` | WebView activate予約 |
|
||||
| `operation.screen` | `operation webview activated` | WebView activate実行 |
|
||||
| `operation.screen` | `operation appState` | AppState変化 |
|
||||
| `operation.settings` | `operation settings load scheduled/success/failed` | 運行情報設定の読込 |
|
||||
| `operation.webview` | `operation remount requested` | watchdog等のremount要求 |
|
||||
| `operation.webview` | `operation remount after background resume` | background復帰後remount |
|
||||
| `operation.webview` | `operation resume preserved existing webview` | background復帰後WebView保持 |
|
||||
| `operation.webview` | `operation script scheduled/injected` | injected script投入 |
|
||||
| `operation.webview` | `operation render process gone` | Android WebView render process gone |
|
||||
| `operation.webview` | `operation content process terminated` | iOS WebView content process termination |
|
||||
| `operation.webview` | `operation webview loadStart/loadEnd/error` | WebView load状態 |
|
||||
| `operation.webview` | `operation capture message received` | WebViewから画像切り出しmessage |
|
||||
| `operation.webview` | `operation message parse failed` | postMessage parse失敗 |
|
||||
|
||||
## 8. 調査時の優先クエリ
|
||||
|
||||
### 通信エラー全体
|
||||
|
||||
```text
|
||||
area:data_fetch
|
||||
```
|
||||
|
||||
### 走行位置の体感不具合
|
||||
|
||||
```text
|
||||
area:data_fetch endpoint:positions_current
|
||||
```
|
||||
|
||||
見る項目:
|
||||
|
||||
- `source`
|
||||
- `result`
|
||||
- `durationMs`
|
||||
- `timeoutMs`
|
||||
- `retryCount`
|
||||
- `root_tab`
|
||||
- `appState`
|
||||
- `online`
|
||||
- `urlHost`
|
||||
- `urlPathTemplate`
|
||||
|
||||
### GAS運行情報timeout
|
||||
|
||||
```text
|
||||
area:data_fetch endpoint:operation_info_text result:timeout
|
||||
```
|
||||
|
||||
見る項目:
|
||||
|
||||
- `durationMs`
|
||||
- `retryCount`
|
||||
- `root_tab`
|
||||
- `user_visible`
|
||||
- `preload`
|
||||
- `appState`
|
||||
|
||||
### background/offlineノイズ
|
||||
|
||||
```text
|
||||
area:data_fetch result:aborted
|
||||
```
|
||||
|
||||
原則Issue化されない。breadcrumbで確認する。
|
||||
|
||||
### JSONではなくHTMLが返ったケース
|
||||
|
||||
```text
|
||||
area:data_fetch result:non_json
|
||||
```
|
||||
|
||||
見る項目:
|
||||
|
||||
- `contentType`
|
||||
- `responseHead`
|
||||
- `status`
|
||||
- `urlHost`
|
||||
- `urlPathTemplate`
|
||||
|
||||
### Sentryにfatal crashが出ない体感クラッシュ
|
||||
|
||||
```text
|
||||
area:app_lifecycle result:unexpected_exit
|
||||
```
|
||||
|
||||
見る項目:
|
||||
|
||||
- `last_root_tab`
|
||||
- `app_lifecycle.lastHeartbeatAt`
|
||||
- `app_lifecycle.previousRootNavigation`
|
||||
- `app_lifecycle.lastKnownAppState`
|
||||
- `app_lifecycle.activeWebViews`
|
||||
- `app_lifecycle.expoUpdate.update_id`
|
||||
- `native_screens_mode`
|
||||
|
||||
### WebView白化/終了疑い
|
||||
|
||||
```text
|
||||
operation.webview
|
||||
positions.webview
|
||||
```
|
||||
|
||||
breadcrumbで見る。
|
||||
|
||||
関連context:
|
||||
|
||||
- `positions_webview`
|
||||
- `operation_screen`
|
||||
- `active_webviews`
|
||||
- `app_lifecycle`
|
||||
|
||||
## 9. 機能別に何が分かるか
|
||||
|
||||
| 機能 | Sentryで分かること | まだ分からないこと |
|
||||
|---|---|---|
|
||||
| RN走行位置取得 | n8n/mock/GASのどれが失敗したか、timeout/HTTP/parse、duration、retry | 上流サーバー内部の処理時間。backend側計測が必要 |
|
||||
| RN運行情報取得 | flag/GAS text/operation logsのどれが失敗したか | 公式WebViewページ内部の通信詳細 |
|
||||
| ダイヤ/運用取得 | static storage/backend APIの失敗、遅延、サイズ | WebView内の重複fetch詳細 |
|
||||
| WebView保持 | focus/blur、remount、process gone、content termination、activeWebViews | WebView内fetchのstatus/durationは未計測 |
|
||||
| タブ切替 | tabPress/focus/blur、root state、root_tab | native側のFabric mount詳細 |
|
||||
| 体感クラッシュ | 次回起動時に前回sessionの突然終了をwarning化 | OS killとnative crashの厳密な区別 |
|
||||
|
||||
## 10. 現時点の注意点
|
||||
|
||||
- 成功通信はIssue化しない。breadcrumb/spanで見る。
|
||||
- `slow_success` のIssue送信は現在 `SLOW_SUCCESS_SAMPLE_RATE = 0` のため無効。
|
||||
- background/offline由来の通信失敗はIssue化を抑制している。
|
||||
- URL全文はtagに入れない。host/path templateのみcontextに入る。
|
||||
- response body全文は送らない。`responseHead` は最大300文字。
|
||||
- WebView内の公式XHRや injected JS fetch は、RN `observedFetch` を通らないため通信詳細が見えない。
|
||||
- `app.previous_session_unexpected_exit` は「前回sessionが直近heartbeatのまま正常backgroundなしで消えた」ことを示す。Sentry native crashそのものではない。
|
||||
|
||||
## 11. 次に増やすとよい計測
|
||||
|
||||
優先度 high:
|
||||
|
||||
- WebView内fetchのpostMessage計測。
|
||||
- 特に `positions_webview` と公式XHR `/g?arg1=train&arg2=train`。
|
||||
- backend mock API `/train-positions/current` のサーバー側duration、cache hit/miss、upstream duration。
|
||||
|
||||
優先度 medium:
|
||||
|
||||
- `useBusAndTrainData`, `useTrainDelayData`, `SpecialTrainInfoBox` など未計測RN fetchのobservedFetch化。
|
||||
- `operation.webview` のpostMessageにページ状態 summary を追加。
|
||||
- `activeWebViews` に `GeneralWebView` も必要に応じて追加。
|
||||
|
||||
優先度 low:
|
||||
|
||||
- slow success samplingを `0.01` から再開し、十分落ち着いたら調整。
|
||||
- cellular/connection type取得。現状は `navigator.onLine` 程度。
|
||||
@@ -0,0 +1,153 @@
|
||||
# X投稿向け運行情報画像セット:実装指示書
|
||||
|
||||
## 依頼
|
||||
|
||||
`ndView.tsx` に、X(旧Twitter)へ複数画像で投稿することを前提とした運行情報画像セット生成機能を実装してください。
|
||||
|
||||
既存の「この項目を切り出す」「この小見出しを切り出す」「表示中の運行情報をすべて切り出す」「項目ごとに複数画像で共有」は残し、新たに「X投稿向け画像を作成」を追加します。
|
||||
|
||||
実装まで行い、型チェックと生成処理の確認をしてください。調査・提案だけで終了しないでください。
|
||||
|
||||
## ユーザー体験
|
||||
|
||||
新しいボタンを押すと、次の順番で最大4枚のPNGを生成し、既存の複数ファイル共有処理へ渡します。
|
||||
|
||||
1. 1枚目:運行状況の表紙(路線図+短い要約)
|
||||
2. 2枚目以降:表示中の運行情報の詳細
|
||||
|
||||
Xで1枚目と2枚目が横並びに表示されたときに自然につながって見える構成にします。ただし、各画像は単体表示されても意味が通じる必要があります。画像の境界をまたいで文章や必須情報を配置しないでください。
|
||||
|
||||
## 出力仕様
|
||||
|
||||
- 各画像は `1080 x 1440 px`(3:4)の固定サイズ
|
||||
- PNG
|
||||
- 画像数は1〜4枚。運行情報が存在する通常ケースでは表紙+詳細で2〜4枚
|
||||
- ファイル名は投稿順を明確にする
|
||||
- `operation-info-x-01-map-<timestamp>.png`
|
||||
- `operation-info-x-02-detail-<timestamp>.png`
|
||||
- 以下同様
|
||||
- ネイティブ側へ送る `batchIndex` はゼロ始まりの表示順と一致させる
|
||||
- 既存の `Share.open({ urls })` に渡る配列順を維持する
|
||||
- 画像生成途中で1枚でも失敗した場合、不完全なセットを共有せず既存形式のエラーを返す
|
||||
|
||||
## 1枚目:表紙
|
||||
|
||||
必須要素:
|
||||
|
||||
- `JR四国 列車運行情報` のタイトル
|
||||
- 現在表示中の状態を示す短い要約
|
||||
- 四国の路線図
|
||||
- 更新日時(取得できる最新のもの)
|
||||
- 詳細ページがある場合は `詳細は次の画像へ →`
|
||||
- 非公式アプリによる生成画像であり、最新情報はJR四国公式を確認する旨
|
||||
- ページ番号(例:`1/4`)
|
||||
|
||||
路線図は既存の `buildMapImage()` と `img/map/*` を再利用します。現在ページ上で有効になっている路線レイヤーを反映してください。既存挙動を壊さない範囲で、影響路線を目立たせ、影響のない部分を弱められるなら実装してください。状態と路線の対応を正確に判定できない場合は、誤った色分けを推測せず、現在表示されているレイヤー表現を使用してください。
|
||||
|
||||
表紙は路線図を主役にし、要約文が長い場合も地図を極端に小さくしないでください。要約は路線名・状態を中心に短く整形し、詳細本文を表紙へ詰め込みません。
|
||||
|
||||
## 2枚目以降:詳細ページ
|
||||
|
||||
必須要素:
|
||||
|
||||
- 路線・項目タイトル
|
||||
- サブタイトル/状態
|
||||
- 更新日時
|
||||
- 小見出しと本文
|
||||
- ページ番号
|
||||
- 非公式画像の注意書き
|
||||
|
||||
既存の `getOperationItems()`、`parseDetailBlocks()`、`splitCaptureBlocksIntoSections()` のデータ構造を再利用します。
|
||||
|
||||
詳細は「1項目=必ず1画像」ではなく、固定高のページへ順に組版してください。
|
||||
|
||||
- 1件が短ければ、同じページに次の項目も配置してよい
|
||||
- 1件が長ければ、ブロックまたは小見出し単位で次ページへ送る
|
||||
- 小見出しだけをページ末尾に残さない
|
||||
- 本文を文字単位で不自然に分断するより、小見出し単位の改ページを優先する
|
||||
- 4枚を超える場合は、詳細3ページへ読みやすく収める
|
||||
- それでも収まらない場合は、文字を極端に縮小したり内容を黙って欠落させたりしない
|
||||
|
||||
4枚で収まらないケースについては、実装上安全な扱いを選び、コードコメントと完了報告で明示してください。推奨は、最小可読サイズを守ったうえで4枚では収まらないことをユーザーへ知らせ、既存の項目別共有を案内することです。
|
||||
|
||||
## レイアウト規則
|
||||
|
||||
- 背景は白を基本とし、既存のJR四国風配色(`#0099CB` など)を継承
|
||||
- 左右80px程度をX側のクロップに備えた安全領域とする
|
||||
- 必須情報は端へ寄せない
|
||||
- 全ページでヘッダー、ページ番号、フッターの位置を統一
|
||||
- 本文の可読性を優先し、既存画像と同程度の文字サイズを維持
|
||||
- 1枚目右側の矢印などで2枚目への視線誘導を作ってよいが、その装飾が切れても意味が失われないようにする
|
||||
- 角丸や画像間の隙間はX側が付けるため、画像自体には外周の角丸を焼き込まない
|
||||
|
||||
## 既存コードの入口
|
||||
|
||||
主な対象は `ndView.tsx` です。
|
||||
|
||||
- `buildOperationPageScript()`:WebViewへ注入する生成処理
|
||||
- `buildMapImage()`:路線図Canvas合成
|
||||
- `appendCaptureItemLayout()` / `drawCaptureLayout()`:既存組版・描画
|
||||
- `getOperationItems()`:表示中の運行情報抽出
|
||||
- `installPageCaptureButton()`:共有ボタン追加
|
||||
- `renderAllItemsToSeparateImages()`:既存バッチ送信の参考
|
||||
- `saveOperationCaptureBatchItem()`:ネイティブ側で順番どおりにファイルを集約
|
||||
- `shareOperationCaptureFiles()`:単一/複数ファイル共有
|
||||
|
||||
必要ならX投稿向けのレイアウト計算・描画関数を独立させてください。既存の可変幅・可変高画像生成ロジックへ多数の条件分岐を足すより、データ抽出と基本描画だけ共有する構成を優先します。
|
||||
|
||||
## 実装上の制約
|
||||
|
||||
- 既存の切り出し/共有機能を壊さない
|
||||
- 横画面サイネージモードでは、従来どおりキャプチャボタンを表示しない
|
||||
- iOS・Android双方で動く既存のWebViewメッセージ方式を維持
|
||||
- 新しい依存パッケージは原則追加しない
|
||||
- WebView内で利用できない新しいJavaScript構文を安易に導入しない
|
||||
- 生成中の二重タップで複数バッチが競合しないよう考慮する
|
||||
- ユーザーの既存変更があるファイルを勝手に巻き戻さない
|
||||
- `scripts/generate-operation-info-userscript.mjs` が `ndView.tsx` の注入コードを元に生成物を作るため、必要なら生成物も更新する。ただし生成物を直接手編集しない
|
||||
|
||||
## UI文言
|
||||
|
||||
新規ボタン:
|
||||
|
||||
`X投稿向け画像を作成`
|
||||
|
||||
生成・共有に失敗した場合は、既存の「切り出し失敗」系ダイアログとトーンをそろえます。4枚へ収まらない場合は、理由と代替手段が分かる日本語を表示してください。
|
||||
|
||||
## 完了条件
|
||||
|
||||
- 新規ボタンから表紙+詳細画像が正しい順番で共有される
|
||||
- 全画像が厳密に1080×1440
|
||||
- 1件、2件、3件、4件以上、長文1件のレイアウトを確認している
|
||||
- 長文がCanvas外へはみ出さない
|
||||
- 空のタイトル、サブタイトル、更新日時でも壊れない
|
||||
- 地図画像のロード失敗時も白紙画像を共有せず、明確に失敗扱いまたは安全なフォールバックになる
|
||||
- 既存4種類の切り出し操作が維持される
|
||||
- TypeScript型チェックが通る
|
||||
- `git diff --check` が通る
|
||||
|
||||
## 検証
|
||||
|
||||
最低限、次を実行してください。
|
||||
|
||||
```bash
|
||||
npx tsc --noEmit
|
||||
git diff --check
|
||||
```
|
||||
|
||||
注入スクリプトを変更した場合は、リポジトリ既存の生成手順も確認します。
|
||||
|
||||
```bash
|
||||
node scripts/generate-operation-info-userscript.mjs
|
||||
```
|
||||
|
||||
可能なら、Canvas描画を開発用に呼び出せる小さなテスト入口または純粋なページ分割関数を用意し、上記の件数・長文パターンを検証してください。本番UIへデバッグ操作を残さないでください。
|
||||
|
||||
## 完了報告に含めるもの
|
||||
|
||||
- 変更したファイル
|
||||
- 表紙・詳細ページの分割ルール
|
||||
- 4枚で収まらない場合の扱い
|
||||
- 実行した検証と結果
|
||||
- 端末で確認が必要な残件
|
||||
|
||||
@@ -47,6 +47,12 @@
|
||||
},
|
||||
"production7.0": {
|
||||
"channel": "familymart"
|
||||
},
|
||||
"beta7.1": {
|
||||
"channel": "gmarket"
|
||||
},
|
||||
"production7.1": {
|
||||
"channel": "geekbuying"
|
||||
}
|
||||
},
|
||||
"submit": {
|
||||
|
||||
@@ -45,6 +45,7 @@ export type CustomTrainData = {
|
||||
type: trainTypeID;
|
||||
train_name: string;
|
||||
train_info_img: string;
|
||||
train_info_img_hub?: string | null;
|
||||
train_info_url: string;
|
||||
infogram: string;
|
||||
via_data: string;
|
||||
@@ -88,6 +89,9 @@ export type CustomTrainData = {
|
||||
lng: number;
|
||||
isSpot?: boolean;
|
||||
};
|
||||
|
||||
export type OriginalStationList = Record<string, StationProps[]>;
|
||||
|
||||
export type OperationLogs = {
|
||||
id: number;
|
||||
operation_id?: string;
|
||||
@@ -96,6 +100,8 @@ export type OperationLogs = {
|
||||
unit_ids?: string[];
|
||||
vehicle_img: string;
|
||||
vehicle_img_right: string;
|
||||
vehicle_img_hub?: string | null;
|
||||
vehicle_img_right_hub?: string | null;
|
||||
vehicle_info_url: string;
|
||||
related_train_ids?: string[];
|
||||
state: number | null;
|
||||
|
||||
@@ -12,6 +12,20 @@ import type { ElesiteData } from "@/types/unyohub";
|
||||
|
||||
type HeadingDirection = "left" | "right";
|
||||
|
||||
export type ElesiteLineGroup = {
|
||||
key: string;
|
||||
lineCode: string | null;
|
||||
lineLabel: string | null;
|
||||
leftStation: string | null;
|
||||
rightStation: string | null;
|
||||
timetableUrl: string | null;
|
||||
lastReportedAt: string | null;
|
||||
entries: ElesiteData[];
|
||||
formations: string[];
|
||||
formationText: string | null;
|
||||
hasFormations: boolean;
|
||||
};
|
||||
|
||||
// マリンライナー(3xxxM)用: JR西日本区間の駅は originData にないのでここで定義
|
||||
const MARINE_STATION_SEQUENCE = [
|
||||
"岡山", "大元", "備前西市", "妹尾", "早島", "茶屋町", "植松", "木見", "上の町",
|
||||
@@ -25,6 +39,70 @@ const STATION_SEQUENCES: string[][] = [
|
||||
MARINE_STATION_SEQUENCE,
|
||||
];
|
||||
|
||||
const uniqueNonEmpty = (values: Array<string | null | undefined>): string[] => {
|
||||
const seen = new Set<string>();
|
||||
|
||||
return values.filter((value): value is string => {
|
||||
const normalized = value?.trim();
|
||||
if (!normalized || seen.has(normalized)) return false;
|
||||
seen.add(normalized);
|
||||
return true;
|
||||
});
|
||||
};
|
||||
|
||||
const getElesiteQueryParam = (url: string, key: string): string | null => {
|
||||
if (!url) return null;
|
||||
|
||||
const escapedKey = key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
||||
const match = url.match(new RegExp(`[?&]${escapedKey}=([^&#]+)`));
|
||||
if (!match) return null;
|
||||
|
||||
try {
|
||||
return decodeURIComponent(match[1].replace(/\+/g, " "));
|
||||
} catch {
|
||||
return match[1];
|
||||
}
|
||||
};
|
||||
|
||||
const getElesiteMatchedTrain = (
|
||||
entry: ElesiteData,
|
||||
trainNumber: string,
|
||||
) =>
|
||||
entry.trains?.find(
|
||||
(train) => train.train_number.trim() === trainNumber.trim(),
|
||||
);
|
||||
|
||||
const getElesiteLineMeta = (
|
||||
entry: ElesiteData,
|
||||
trainNumber: string,
|
||||
): Omit<ElesiteLineGroup, "entries" | "formations" | "formationText" | "hasFormations" | "lastReportedAt"> => {
|
||||
const matchedTrain = getElesiteMatchedTrain(entry, trainNumber);
|
||||
const timetableUrl = matchedTrain?.timetable_url?.trim() || null;
|
||||
const lineCode = timetableUrl
|
||||
? getElesiteQueryParam(timetableUrl, "rosen_code")
|
||||
: null;
|
||||
const lineLabel = timetableUrl
|
||||
? getElesiteQueryParam(timetableUrl, "rosen_name")
|
||||
: null;
|
||||
const leftStation = entry.formation_config?.left_station?.trim() || null;
|
||||
const rightStation = entry.formation_config?.right_station?.trim() || null;
|
||||
const fallbackKey = [lineLabel, leftStation, rightStation]
|
||||
.filter(Boolean)
|
||||
.join("::") || "unknown";
|
||||
|
||||
return {
|
||||
key: lineCode || fallbackKey,
|
||||
lineCode,
|
||||
lineLabel,
|
||||
leftStation,
|
||||
rightStation,
|
||||
timetableUrl,
|
||||
};
|
||||
};
|
||||
|
||||
const getElesiteEntryFormations = (entry: ElesiteData): string[] =>
|
||||
uniqueNonEmpty(entry.formation_config?.units?.map((unit) => unit.formation) ?? []);
|
||||
|
||||
const getRouteEndpoints = (
|
||||
trainNumber: string,
|
||||
): { firstStation: string; lastStation: string } | null => {
|
||||
@@ -140,3 +218,60 @@ export const sortElesiteEntriesByTrainNumber = (
|
||||
getElesiteLeftSideRank(a, trainNumber) -
|
||||
getElesiteLeftSideRank(b, trainNumber),
|
||||
);
|
||||
|
||||
export const buildElesiteLineGroups = (
|
||||
entries: ElesiteData[],
|
||||
trainNumber: string,
|
||||
): ElesiteLineGroup[] => {
|
||||
const groups = new Map<string, ElesiteData[]>();
|
||||
const lineOrder: string[] = [];
|
||||
|
||||
for (const entry of entries) {
|
||||
const key = getElesiteLineMeta(entry, trainNumber).key;
|
||||
if (!groups.has(key)) {
|
||||
groups.set(key, []);
|
||||
lineOrder.push(key);
|
||||
}
|
||||
groups.get(key)?.push(entry);
|
||||
}
|
||||
|
||||
return lineOrder.map((key) => {
|
||||
const groupedEntries = groups.get(key) ?? [];
|
||||
const sortedEntries = sortElesiteEntriesByTrainNumber(groupedEntries, trainNumber);
|
||||
const lineMetas = sortedEntries.map((entry) => getElesiteLineMeta(entry, trainNumber));
|
||||
const formations = uniqueNonEmpty(
|
||||
sortedEntries.flatMap((entry) => getElesiteEntryFormations(entry)),
|
||||
);
|
||||
|
||||
return {
|
||||
key,
|
||||
lineCode: lineMetas.map((meta) => meta.lineCode).find(Boolean) ?? null,
|
||||
lineLabel: lineMetas.map((meta) => meta.lineLabel).find(Boolean) ?? null,
|
||||
leftStation: lineMetas.map((meta) => meta.leftStation).find(Boolean) ?? null,
|
||||
rightStation: lineMetas.map((meta) => meta.rightStation).find(Boolean) ?? null,
|
||||
timetableUrl:
|
||||
lineMetas.map((meta) => meta.timetableUrl).find(Boolean) ?? null,
|
||||
lastReportedAt:
|
||||
sortedEntries
|
||||
.map((entry) => entry.report_info?.last_reported_at)
|
||||
.filter((value): value is string => !!value)
|
||||
.sort()
|
||||
.at(-1) ?? null,
|
||||
entries: sortedEntries,
|
||||
formations,
|
||||
formationText: formations.length > 0 ? formations.join("+") : null,
|
||||
hasFormations: formations.length > 0,
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
export const getElesiteSummaryByTrainNumber = (
|
||||
entries: ElesiteData[],
|
||||
trainNumber: string,
|
||||
): string | null => {
|
||||
const lineGroups = buildElesiteLineGroups(entries, trainNumber).filter(
|
||||
(group) => group.hasFormations,
|
||||
);
|
||||
|
||||
return lineGroups[0]?.formationText ?? null;
|
||||
};
|
||||
|
||||
+2
-39
@@ -2,6 +2,8 @@
|
||||
// Source: https://github.com/micolous/metrodroid (GPL-3.0)
|
||||
// Keys: stationId = ((areaCode)<<16) | ((lineCode)<<8) | stationCode
|
||||
// areaCode = data[15] >> 6 (from FeliCa history block byte 15)
|
||||
// The source contains historical duplicate IDs; this map intentionally keeps the last
|
||||
// record for each ID to preserve the original object last-record-wins lookup.
|
||||
|
||||
interface FelicaStationEntry { s: string; l: string; c: string }
|
||||
|
||||
@@ -61,7 +63,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x000147: { s: '清水', l: '東海道本', c: '東海旅客鉄道' },
|
||||
0x000149: { s: '草薙', l: '東海道本', c: '東海旅客鉄道' },
|
||||
0x00014b: { s: '東静岡', l: '東海道本', c: '東海旅客鉄道' },
|
||||
0x00014b: { s: '東静岡', l: '東海道本', c: '東海旅客鉄道' },
|
||||
0x00014c: { s: '静岡', l: '東海道本', c: '東海旅客鉄道' },
|
||||
0x00014e: { s: '安倍川', l: '東海道本', c: '東海旅客鉄道' },
|
||||
0x00014f: { s: '用宗', l: '東海道本', c: '東海旅客鉄道' },
|
||||
@@ -267,7 +268,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x000271: { s: '太子堂', l: '東北本', c: '東日本旅客鉄道' },
|
||||
0x000272: { s: '長町', l: '東北本', c: '東日本旅客鉄道' },
|
||||
0x000273: { s: '仙台', l: '東北本', c: '東日本旅客鉄道' },
|
||||
0x000273: { s: '仙台', l: '東北本', c: '東日本旅客鉄道' },
|
||||
0x000275: { s: '東仙台', l: '東北本', c: '東日本旅客鉄道' },
|
||||
0x000276: { s: '岩切', l: '東北本', c: '東日本旅客鉄道' },
|
||||
0x000277: { s: '陸前山王', l: '東北本', c: '東日本旅客鉄道' },
|
||||
@@ -665,9 +665,7 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x00062c: { s: '大野城', l: '鹿児島本', c: '九州旅客鉄道' },
|
||||
0x00062d: { s: '水城', l: '鹿児島本', c: '九州旅客鉄道' },
|
||||
0x00062e: { s: '都府楼南', l: '鹿児島本', c: '九州旅客鉄道' },
|
||||
0x00062f: { s: '二日市', l: '鹿児島本', c: '九州旅客鉄道' },
|
||||
0x00062f: { s: '都府楼南', l: '鹿児島本', c: '九州旅客鉄道' },
|
||||
0x000630: { s: '二日市', l: '鹿児島本', c: '九州旅客鉄道' },
|
||||
0x000630: { s: '天拝山', l: '鹿児島本', c: '九州旅客鉄道' },
|
||||
0x000631: { s: '天拝山', l: '鹿児島本', c: '九州旅客鉄道' },
|
||||
0x000632: { s: '原田', l: '鹿児島本', c: '九州旅客鉄道' },
|
||||
@@ -725,7 +723,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x00071a: { s: '三毛門', l: '日豊本', c: '九州旅客鉄道' },
|
||||
0x00071b: { s: '吉富', l: '日豊本', c: '九州旅客鉄道' },
|
||||
0x00071c: { s: '中津', l: '日豊本', c: '九州旅客鉄道' },
|
||||
0x000728: { s: '中津', l: '日豊本', c: '九州旅客鉄道' },
|
||||
0x000728: { s: '宇佐', l: '日豊本', c: '九州旅客鉄道' },
|
||||
0x00072a: { s: '西屋敷', l: '日豊本', c: '九州旅客鉄道' },
|
||||
0x00073b: { s: '別府', l: '日豊本', c: '九州旅客鉄道' },
|
||||
@@ -1113,9 +1110,7 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x00104c: { s: '高野川', l: '予讃', c: '四国旅客鉄道' },
|
||||
0x001058: { s: '五郎', l: '予讃', c: '四国旅客鉄道' },
|
||||
0x001059: { s: '伊予大洲', l: '予讃', c: '四国旅客鉄道' },
|
||||
0x001081: { s: '御免', l: 'ごめんなはり', c: '土佐くろしお鉄道' },
|
||||
0x001081: { s: '後免', l: '阿佐', c: '土佐くろしお鉄道' },
|
||||
0x001083: { s: '後免町', l: '阿佐', c: '土佐くろしお鉄道' },
|
||||
0x001083: { s: '御免町', l: 'ごめんなはり', c: '土佐くろしお鉄道' },
|
||||
0x001102: { s: '金蔵寺', l: '土讃', c: '四国旅客鉄道' },
|
||||
0x001103: { s: '善通寺', l: '土讃', c: '四国旅客鉄道' },
|
||||
@@ -1123,7 +1118,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x00110c: { s: '佃', l: '土讃', c: '四国旅客鉄道' },
|
||||
0x00110d: { s: '阿波池田', l: '土讃', c: '四国旅客鉄道' },
|
||||
0x001113: { s: '大歩危', l: '土讃', c: '四国旅客鉄道' },
|
||||
0x001124: { s: '御免', l: '土讃', c: '四国旅客鉄道' },
|
||||
0x001124: { s: '後免', l: '土讃', c: '四国旅客鉄道' },
|
||||
0x00112a: { s: '高知', l: '土讃', c: '四国旅客鉄道' },
|
||||
0x00112b: { s: '入明', l: '土讃', c: '四国旅客鉄道' },
|
||||
@@ -1649,7 +1643,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x002984: { s: '岩手和井内', l: '岩泉', c: '東日本旅客鉄道' },
|
||||
0x002986: { s: '押角', l: '岩泉', c: '東日本旅客鉄道' },
|
||||
0x002a0c: { s: '新川崎', l: '横須賀', c: '東日本旅客鉄道' },
|
||||
0x002a0d: { s: '武蔵小杉', l: '横須賀', c: '東日本旅客鉄道' },
|
||||
0x002a0d: { s: '新川崎', l: '横須賀', c: '東日本旅客鉄道' },
|
||||
0x002a0e: { s: '西大井', l: '横須賀', c: '東日本旅客鉄道' },
|
||||
0x002a15: { s: '新日本橋', l: '総武本', c: '東日本旅客鉄道' },
|
||||
@@ -1671,7 +1664,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x002ada: { s: '登別', l: '室蘭本', c: '北海道旅客鉄道' },
|
||||
0x002ae0: { s: '白老', l: '室蘭本', c: '北海道旅客鉄道' },
|
||||
0x002ae3: { s: '錦岡', l: '室蘭本', c: '北海道旅客鉄道' },
|
||||
0x002ae3: { s: '錦岡', l: '室蘭本', c: '北海道旅客鉄道' },
|
||||
0x002ae5: { s: '糸井', l: '室蘭本', c: '北海道旅客鉄道' },
|
||||
0x002ae9: { s: '苫小牧', l: '室蘭本', c: '北海道旅客鉄道' },
|
||||
0x002aeb: { s: '沼ノ端', l: '室蘭本', c: '北海道旅客鉄道' },
|
||||
@@ -2281,7 +2273,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x00524a: { s: '三角', l: '三角', c: '九州旅客鉄道' },
|
||||
0x005318: { s: '太田部', l: '小海', c: '東日本旅客鉄道' },
|
||||
0x005319: { s: '中込', l: '小海', c: '東日本旅客鉄道' },
|
||||
0x00531a: { s: '滑津', l: '小海', c: '東日本旅客鉄道' },
|
||||
0x00531a: { s: '中込', l: '小海', c: '東日本旅客鉄道' },
|
||||
0x00531b: { s: '北中込', l: '小海', c: '東日本旅客鉄道' },
|
||||
0x00531c: { s: '岩村田', l: '小海', c: '東日本旅客鉄道' },
|
||||
@@ -2291,7 +2282,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x005352: { s: '人吉', l: '肥薩', c: '九州旅客鉄道' },
|
||||
0x00540c: { s: '戸狩野沢温泉', l: '飯山', c: '東日本旅客鉄道' },
|
||||
0x005415: { s: '森宮野原', l: '飯山', c: '東日本旅客鉄道' },
|
||||
0x005415: { s: '森宮野原', l: '飯山', c: '東日本旅客鉄道' },
|
||||
0x00541f: { s: '十日町', l: '飯山', c: '東日本旅客鉄道' },
|
||||
0x005420: { s: '魚沼中条', l: '飯山', c: '東日本旅客鉄道' },
|
||||
0x005515: { s: '吉田', l: '越後', c: '東日本旅客鉄道' },
|
||||
@@ -2715,7 +2705,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x007403: { s: '播磨高岡', l: '姫新', c: '西日本旅客鉄道' },
|
||||
0x007404: { s: '余部', l: '姫新', c: '西日本旅客鉄道' },
|
||||
0x007407: { s: '本竜野', l: '姫新', c: '西日本旅客鉄道' },
|
||||
0x007408: { s: '東觜崎', l: '姫新線', c: '西日本旅客鉄道' },
|
||||
0x007408: { s: '東觜崎', l: '姫新', c: '西日本旅客鉄道' },
|
||||
0x007409: { s: '播磨新宮', l: '姫新', c: '西日本旅客鉄道' },
|
||||
0x007410: { s: '佐用', l: '姫新', c: '西日本旅客鉄道' },
|
||||
@@ -3453,7 +3442,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x00c708: { s: '京王多摩センター', l: '相模原', c: '京王電鉄' },
|
||||
0x00c709: { s: '京王堀之内', l: '相模原', c: '京王電鉄' },
|
||||
0x00c70a: { s: '南大沢', l: '相模原', c: '京王電鉄' },
|
||||
0x00c70a: { s: '南大沢', l: '相模原', c: '京王電鉄' },
|
||||
0x00c70b: { s: '多摩境', l: '相模原', c: '京王電鉄' },
|
||||
0x00c70c: { s: '橋本', l: '相模原', c: '京王電鉄' },
|
||||
0x00c801: { s: '北野', l: '高尾', c: '京王電鉄' },
|
||||
@@ -3596,7 +3584,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x00d403: { s: '新高島', l: 'みなとみらい', c: '横浜高速鉄道' },
|
||||
0x00d405: { s: 'みなとみらい', l: 'みなとみらい', c: '横浜高速鉄道' },
|
||||
0x00d407: { s: '馬車道', l: 'みなとみらい', c: '横浜高速鉄道' },
|
||||
0x00d409: { s: '日本大通', l: 'みなとみらい', c: '横浜高速鉄道' },
|
||||
0x00d409: { s: '日本大通り', l: 'みなとみらい', c: '横浜高速鉄道' },
|
||||
0x00d40b: { s: '元町・中華街', l: 'みなとみらい', c: '横浜高速鉄道' },
|
||||
0x00d501: { s: '泉岳寺', l: '本', c: '京浜急行電鉄' },
|
||||
@@ -3654,14 +3641,8 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x00d603: { s: '大鳥居', l: '空港', c: '京浜急行電鉄' },
|
||||
0x00d604: { s: '穴守稲荷', l: '空港', c: '京浜急行電鉄' },
|
||||
0x00d605: { s: '天空橋', l: '空港', c: '京浜急行電鉄' },
|
||||
0x00d606: { s: '国際ターミナル駅(仮称)', l: '空港', c: '京浜急行電鉄' },
|
||||
0x00d606: { s: '羽田空港国際線ターミナル', l: '空港', c: '京浜急行電鉄' },
|
||||
0x00d607: { s: '羽田空港', l: '空港', c: '京浜急行電鉄' },
|
||||
0x00d607: { s: '羽田空港', l: '空港', c: '京浜急行電鉄' },
|
||||
0x00d607: { s: '羽田空港', l: '空港', c: '京浜急行電鉄' },
|
||||
0x00d607: { s: '羽田空港国内線ターミナル', l: '空港', c: '京浜急行電鉄' },
|
||||
0x00d607: { s: '羽田空港', l: '空港', c: '京浜急行' },
|
||||
0x00d607: { s: '羽田空港', l: '空港', c: '京浜急行電鉄' },
|
||||
0x00d701: { s: '京急川崎', l: '大師', c: '京浜急行電鉄' },
|
||||
0x00d702: { s: '港町', l: '大師', c: '京浜急行電鉄' },
|
||||
0x00d703: { s: '鈴木町', l: '大師', c: '京浜急行電鉄' },
|
||||
@@ -4111,7 +4092,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x00fa07: { s: '整備場', l: '東京モノレール羽田', c: '東京モノレール' },
|
||||
0x00fa08: { s: '羽田', l: '東京モノレール羽田', c: '東京モノレール' },
|
||||
0x00fa09: { s: '天空橋', l: '東京モノレール羽田', c: '東京モノレール' },
|
||||
0x00fa0a: { s: '国際線ターミナルビル', l: '東京モノレール羽田', c: '東京モノレール' },
|
||||
0x00fa0a: { s: '羽田空港国際線ビル', l: '東京モノレール羽田', c: '東京モノレール' },
|
||||
0x00fa0b: { s: '新整備場', l: '東京モノレール羽田', c: '東京モノレール' },
|
||||
0x00fa0c: { s: '羽田空港第1ビル', l: '東京モノレール羽田', c: '東京モノレール' },
|
||||
@@ -4823,7 +4803,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x02933e: { s: '元町', l: '本', c: '阪神電気鉄道' },
|
||||
0x029401: { s: '大阪難波', l: '阪神なんば', c: '阪神電気鉄道' },
|
||||
0x029403: { s: '桜川', l: '阪神なんば', c: '阪神電気鉄道' },
|
||||
0x029404: { s: '桜川', l: '阪神なんば', c: '阪神電気鉄道' },
|
||||
0x029404: { s: 'ドーム前', l: '阪神なんば', c: '阪神電気鉄道' },
|
||||
0x029405: { s: '九条', l: '阪神なんば', c: '阪神電気鉄道' },
|
||||
0x029407: { s: '西九条', l: '西大阪', c: '阪神電気鉄道' },
|
||||
@@ -5122,12 +5101,9 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x02c54e: { s: '鳥羽街道', l: '京阪本', c: '京阪電気鉄道' },
|
||||
0x02c550: { s: '東福寺', l: '京阪本', c: '京阪電気鉄道' },
|
||||
0x02c552: { s: '七条', l: '京阪本', c: '京阪電気鉄道' },
|
||||
0x02c554: { s: '五条', l: '京阪本', c: '京阪電気鉄道' },
|
||||
0x02c554: { s: '清水五条', l: '京阪本', c: '京阪電気鉄道' },
|
||||
0x02c556: { s: '祇園四条', l: '京阪本', c: '京阪電気鉄道' },
|
||||
0x02c556: { s: '四条', l: '京阪本', c: '京阪電気鉄道' },
|
||||
0x02c558: { s: '三条', l: '京阪本', c: '京阪電気鉄道' },
|
||||
0x02c55a: { s: '丸太町', l: '鴨東', c: '京阪電気鉄道' },
|
||||
0x02c55a: { s: '神宮丸太町', l: '鴨東', c: '京阪電気鉄道' },
|
||||
0x02c55c: { s: '出町柳', l: '鴨東', c: '京阪電気鉄道' },
|
||||
0x02c5c2: { s: '八幡市', l: '京阪鋼索', c: '京阪電気鉄道' },
|
||||
@@ -5336,12 +5312,8 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x02e603: { s: '近鉄新庄', l: '御所', c: '近畿日本鉄道' },
|
||||
0x02e604: { s: '忍海', l: '御所', c: '近畿日本鉄道' },
|
||||
0x02e605: { s: '近鉄御所', l: '御所', c: '近畿日本鉄道' },
|
||||
0x02e701: { s: '近鉄難波', l: '難波', c: '近畿日本鉄道' },
|
||||
0x02e701: { s: '大阪難波', l: '難波', c: '近畿日本鉄道' },
|
||||
0x02e701: { s: '大阪難波', l: '難波', c: '近畿日本鉄道' },
|
||||
0x02e702: { s: '近鉄日本橋', l: '難波', c: '近畿日本鉄道' },
|
||||
0x02e703: { s: '上本町', l: '大阪', c: '近畿日本鉄道' },
|
||||
0x02e703: { s: '大阪上本町', l: '大阪', c: '近畿日本鉄道' },
|
||||
0x02e703: { s: '大阪上本町', l: '大阪', c: '近畿日本鉄道' },
|
||||
0x02e704: { s: '鶴橋', l: '大阪', c: '近畿日本鉄道' },
|
||||
0x02e706: { s: '今里', l: '大阪', c: '近畿日本鉄道' },
|
||||
@@ -5495,7 +5467,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x02ef16: { s: '桑名', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef17: { s: '益生', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef19: { s: '伊勢朝日', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef1b: { s: '富洲原', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef1b: { s: '川越富洲原', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef1d: { s: '近鉄富田', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef1f: { s: '霞ヶ浦', l: '名古屋', c: '近畿日本鉄道' },
|
||||
@@ -5512,7 +5483,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x02ef2c: { s: '伊勢若松', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef2e: { s: '千代崎', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef30: { s: '白子', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef30: { s: '白子', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef31: { s: '鼓ヶ浦', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef33: { s: '磯山', l: '名古屋', c: '近畿日本鉄道' },
|
||||
0x02ef35: { s: '千里', l: '名古屋', c: '近畿日本鉄道' },
|
||||
@@ -5573,7 +5543,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x02f303: { s: '馬道 廃止', l: '北勢', c: '近畿日本鉄道' },
|
||||
0x02f304: { s: '西別所 廃止', l: '北勢', c: '近畿日本鉄道' },
|
||||
0x02f305: { s: '蓮花寺 廃止', l: '北勢', c: '近畿日本鉄道' },
|
||||
0x02f305: { s: '蓮花寺 廃止', l: '北勢', c: '近畿日本鉄道' },
|
||||
0x02f306: { s: '在良 廃止', l: '北勢', c: '近畿日本鉄道' },
|
||||
0x02f307: { s: '坂井橋 廃止', l: '北勢', c: '近畿日本鉄道' },
|
||||
0x02f30b: { s: '六把野 廃止', l: '北勢', c: '近畿日本鉄道' },
|
||||
@@ -5629,15 +5598,12 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x02ffb7: { s: '貿易センター', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffb9: { s: 'ポートターミナル', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffbb: { s: '中公園', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffbd: { s: '市民病院前', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffbd: { s: 'みなとじま', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffbf: { s: '市民広場', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffc1: { s: '南公園', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffc3: { s: '中埠頭', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffc5: { s: '北埠頭', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffc7: { s: '先端医療センター前', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffc7: { s: '医療センター', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffc9: { s: '京コンピュータ前', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffc9: { s: 'ポートアイランド南', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x02ffcb: { s: '神戸空港', l: 'ポートアイランド', c: '神戸新交通' },
|
||||
0x032841: { s: '川西', l: '錦川清流', c: '錦川鉄道' },
|
||||
@@ -5722,7 +5688,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x03be19: { s: '城北', l: 'アストラムライン', c: '広島高速交通' },
|
||||
0x03be1d: { s: '白島', l: 'アストラムライン', c: '広島高速交通' },
|
||||
0x03be1f: { s: '牛田', l: 'アストラムライン', c: '広島高速交通' },
|
||||
0x03be21: { s: '不動院前', l: 'アストラムライン', c: '広島' },
|
||||
0x03be21: { s: '不動院前', l: 'アストラムライン', c: '広島高速交通' },
|
||||
0x03be23: { s: '祇園新橋北', l: 'アストラムライン', c: '広島高速交通' },
|
||||
0x03be25: { s: '西原', l: 'アストラムライン', c: '広島高速交通' },
|
||||
@@ -5832,7 +5797,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x03d64d: { s: '西鉄千早', l: '貝塚', c: '西日本鉄道' },
|
||||
0x03d64f: { s: '名島', l: '貝塚', c: '西日本鉄道' },
|
||||
0x03d651: { s: '貝塚', l: '貝塚', c: '西日本鉄道' },
|
||||
0x03d765: { s: '西鉄福岡(天神)', l: '天神大牟田線', c: '西日本鉄道' },
|
||||
0x03d765: { s: '西鉄福岡(天神)', l: '天神大牟田', c: '西日本鉄道' },
|
||||
0x03d767: { s: '薬院', l: '天神大牟田', c: '西日本鉄道' },
|
||||
0x03d769: { s: '西鉄平尾', l: '天神大牟田', c: '西日本鉄道' },
|
||||
@@ -5846,7 +5810,6 @@ export const FELICA_STATION_MAP: Record<number, FelicaStationEntry> = {
|
||||
0x03d777: { s: '下大利', l: '天神大牟田', c: '西日本鉄道' },
|
||||
0x03d779: { s: '都府楼前', l: '天神大牟田', c: '西日本鉄道' },
|
||||
0x03d77b: { s: '西鉄二日市', l: '天神大牟田', c: '西日本鉄道' },
|
||||
0x03d77c: { s: '二日市南', l: '天神大牟田', c: '西日本鉄道' },
|
||||
0x03d77c: { s: '紫', l: '天神大牟田', c: '西日本鉄道' },
|
||||
0x03d77d: { s: '朝倉街道', l: '天神大牟田', c: '西日本鉄道' },
|
||||
0x03d77f: { s: '桜台', l: '天神大牟田', c: '西日本鉄道' },
|
||||
|
||||
+14
-49
@@ -1,53 +1,18 @@
|
||||
import { trainTypeID } from "@/lib/CommonTypes";
|
||||
import {
|
||||
getTrainType,
|
||||
type TrainTypeFontFamily,
|
||||
} from "@/lib/getTrainType";
|
||||
|
||||
type types = (
|
||||
type: trainTypeID,
|
||||
id: string,
|
||||
) => [string, TrainTypeFontFamily | undefined, boolean];
|
||||
|
||||
type types = (types: trainTypeID, id: string) => [string, boolean, boolean];
|
||||
export const getStringConfig: types = (type, id) => {
|
||||
switch (type) {
|
||||
case "Normal":
|
||||
return ["普通", true, false];
|
||||
case "OneMan":
|
||||
return ["普通", true, true];
|
||||
case "Rapid":
|
||||
return ["快速", true, false];
|
||||
case "OneManRapid":
|
||||
return ["快速", true, true];
|
||||
case "LTDEXP":
|
||||
return ["特急", true, false];
|
||||
case "NightLTDEXP":
|
||||
return ["特急", true, false];
|
||||
case "SPCL":
|
||||
return ["臨時", true, false];
|
||||
case "SPCL_Normal":
|
||||
return ["臨時", true, false];
|
||||
case "SPCL_Rapid":
|
||||
return ["臨時快速", true, false];
|
||||
case "SPCL_EXP":
|
||||
return ["臨時特急", true, false];
|
||||
case "Party":
|
||||
return ["団体臨時", true, false];
|
||||
case "Freight":
|
||||
return ["貨物", false, false];
|
||||
case "Forwarding":
|
||||
return ["回送", false, false];
|
||||
case "Trial":
|
||||
return ["試運転", false, false];
|
||||
case "Construction":
|
||||
return ["工事", false, false];
|
||||
case "FreightForwarding":
|
||||
return ["単機回送", false, false];
|
||||
case "Other":
|
||||
switch (true) {
|
||||
case !!id.includes("T"):
|
||||
return ["単機回送", false, false];
|
||||
case !!id.includes("R"):
|
||||
case !!id.includes("E"):
|
||||
case !!id.includes("L"):
|
||||
case !!id.includes("A"):
|
||||
case !!id.includes("B"):
|
||||
return ["回送", false, false];
|
||||
case !!id.includes("H"):
|
||||
return ["試運転", false, false];
|
||||
}
|
||||
return ["", false, false];
|
||||
}
|
||||
const { shortName, fontFamily, isOneMan } = getTrainType({ type, id });
|
||||
const typeString =
|
||||
type === "Other" && shortName === "その他" ? "" : shortName;
|
||||
|
||||
return [typeString, fontFamily, isOneMan];
|
||||
};
|
||||
|
||||
+24
-23
@@ -22,13 +22,14 @@ type trainTypeString =
|
||||
| "普通列車(ワンマン)"
|
||||
| "臨時快速"
|
||||
| "臨時特急"
|
||||
| "団体臨時"
|
||||
| "団体"
|
||||
| "貨物"
|
||||
| "回送"
|
||||
| "単機回送"
|
||||
| "試運転"
|
||||
| "工事"
|
||||
| "その他";
|
||||
export type TrainTypeFontFamily = "JR-Nishi" | "JR-WEST-PLUS";
|
||||
type trainTypeDataString = "rapid" | "express" | "normal" | "notService";
|
||||
type getTrainType = (e: {
|
||||
type: trainTypeID;
|
||||
@@ -38,7 +39,7 @@ type getTrainType = (e: {
|
||||
color: colorString;
|
||||
name: trainTypeString;
|
||||
shortName: string;
|
||||
fontAvailable: boolean;
|
||||
fontFamily: TrainTypeFontFamily | undefined;
|
||||
isOneMan: boolean;
|
||||
data: trainTypeDataString;
|
||||
};
|
||||
@@ -49,7 +50,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: whiteMode ? "#333333ff" : "white",
|
||||
name: "普通列車",
|
||||
shortName: "普通",
|
||||
fontAvailable: true,
|
||||
fontFamily: "JR-Nishi",
|
||||
isOneMan: false,
|
||||
data: "normal",
|
||||
};
|
||||
@@ -58,7 +59,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: whiteMode ? "#333333ff" : "white",
|
||||
name: "普通列車(ワンマン)",
|
||||
shortName: "普通",
|
||||
fontAvailable: true,
|
||||
fontFamily: "JR-Nishi",
|
||||
isOneMan: true,
|
||||
data: "normal",
|
||||
};
|
||||
@@ -67,7 +68,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: whiteMode ? "#00a0bdff" : "aqua",
|
||||
name: "快速",
|
||||
shortName: "快速",
|
||||
fontAvailable: true,
|
||||
fontFamily: "JR-Nishi",
|
||||
isOneMan: false,
|
||||
data: "rapid",
|
||||
};
|
||||
@@ -76,7 +77,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: whiteMode ? "#00a0bdff" : "aqua",
|
||||
name: "快速",
|
||||
shortName: "快速",
|
||||
fontAvailable: true,
|
||||
fontFamily: "JR-Nishi",
|
||||
isOneMan: true,
|
||||
data: "rapid",
|
||||
};
|
||||
@@ -85,7 +86,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#ee424dff",
|
||||
name: "特急",
|
||||
shortName: "特急",
|
||||
fontAvailable: true,
|
||||
fontFamily: "JR-Nishi",
|
||||
isOneMan: false,
|
||||
data: "express",
|
||||
};
|
||||
@@ -94,7 +95,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: whiteMode ? "#e000b0ff" : "pink",
|
||||
name: "寝台特急",
|
||||
shortName: "特急",
|
||||
fontAvailable: true,
|
||||
fontFamily: "JR-Nishi",
|
||||
isOneMan: false,
|
||||
data: "express",
|
||||
};
|
||||
@@ -104,7 +105,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#297bff",
|
||||
name: "臨時",
|
||||
shortName: "臨時",
|
||||
fontAvailable: true,
|
||||
fontFamily: "JR-Nishi",
|
||||
isOneMan: false,
|
||||
data: "normal",
|
||||
};
|
||||
@@ -113,7 +114,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#297bff",
|
||||
name: "臨時快速",
|
||||
shortName: "臨時快速",
|
||||
fontAvailable: true,
|
||||
fontFamily: "JR-Nishi",
|
||||
isOneMan: false,
|
||||
data: "normal",
|
||||
};
|
||||
@@ -122,16 +123,16 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#297bff",
|
||||
name: "臨時特急",
|
||||
shortName: "臨時特急",
|
||||
fontAvailable: true,
|
||||
fontFamily: "JR-Nishi",
|
||||
isOneMan: false,
|
||||
data: "normal",
|
||||
};
|
||||
case "Party":
|
||||
return {
|
||||
color: "#ff7300ff",
|
||||
name: "団体臨時",
|
||||
shortName: "団体臨時",
|
||||
fontAvailable: true,
|
||||
name: "団体",
|
||||
shortName: "団体",
|
||||
fontFamily: "JR-Nishi",
|
||||
isOneMan: false,
|
||||
data: "normal",
|
||||
};
|
||||
@@ -140,7 +141,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#007488ff",
|
||||
name: "貨物",
|
||||
shortName: "貨物",
|
||||
fontAvailable: false,
|
||||
fontFamily: undefined,
|
||||
isOneMan: false,
|
||||
data: "notService",
|
||||
};
|
||||
@@ -149,7 +150,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#5f5f5fff",
|
||||
name: "回送",
|
||||
shortName: "回送",
|
||||
fontAvailable: false,
|
||||
fontFamily: "JR-WEST-PLUS",
|
||||
isOneMan: false,
|
||||
data: "notService",
|
||||
};
|
||||
@@ -158,7 +159,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#5f5f5fff",
|
||||
name: "試運転",
|
||||
shortName: "試運転",
|
||||
fontAvailable: false,
|
||||
fontFamily: "JR-WEST-PLUS",
|
||||
isOneMan: false,
|
||||
data: "notService",
|
||||
};
|
||||
@@ -167,7 +168,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#5f5f5fff",
|
||||
name: "工事",
|
||||
shortName: "工事",
|
||||
fontAvailable: false,
|
||||
fontFamily: undefined,
|
||||
isOneMan: false,
|
||||
data: "notService",
|
||||
};
|
||||
@@ -176,7 +177,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#5f5f5fff",
|
||||
name: "単機回送",
|
||||
shortName: "単機回送",
|
||||
fontAvailable: false,
|
||||
fontFamily: undefined,
|
||||
isOneMan: false,
|
||||
data: "notService",
|
||||
};
|
||||
@@ -189,7 +190,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#5f5f5fff",
|
||||
name: "単機回送",
|
||||
shortName: "単機回送",
|
||||
fontAvailable: false,
|
||||
fontFamily: undefined,
|
||||
isOneMan: false,
|
||||
data: "notService",
|
||||
};
|
||||
@@ -202,7 +203,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#5f5f5fff",
|
||||
name: "回送",
|
||||
shortName: "回送",
|
||||
fontAvailable: false,
|
||||
fontFamily: "JR-WEST-PLUS",
|
||||
isOneMan: false,
|
||||
data: "notService",
|
||||
};
|
||||
@@ -211,7 +212,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: "#5f5f5fff",
|
||||
name: "試運転",
|
||||
shortName: "試運転",
|
||||
fontAvailable: false,
|
||||
fontFamily: "JR-WEST-PLUS",
|
||||
isOneMan: false,
|
||||
data: "notService",
|
||||
};
|
||||
@@ -221,7 +222,7 @@ export const getTrainType: getTrainType = ({ type, id, whiteMode }) => {
|
||||
color: whiteMode ? "#333333ff" : "white",
|
||||
name: "その他",
|
||||
shortName: "その他",
|
||||
fontAvailable: false,
|
||||
fontFamily: undefined,
|
||||
isOneMan: false,
|
||||
data: "normal",
|
||||
};
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
export type IconDisplayMode = "default" | "original" | "hub";
|
||||
|
||||
export const normalizeIconDisplayMode = (
|
||||
value: unknown,
|
||||
): IconDisplayMode => {
|
||||
if (value === "hub") return "hub";
|
||||
if (value === "default" || value === "false" || value === false) {
|
||||
return "default";
|
||||
}
|
||||
return "original";
|
||||
};
|
||||
|
||||
export const isHubIconDisplayMode = (value: unknown): boolean =>
|
||||
normalizeIconDisplayMode(value) === "hub";
|
||||
|
||||
export const usesCustomTrainIcons = (value: unknown): boolean =>
|
||||
normalizeIconDisplayMode(value) !== "default";
|
||||
@@ -1,3 +1,6 @@
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
import { observedFetchJson } from "@/lib/observability/network/observedFetch";
|
||||
|
||||
/**
|
||||
* Position Masters – JR Shikoku mock API
|
||||
*
|
||||
@@ -32,6 +35,8 @@ export type PositionLookup = Map<string, string>;
|
||||
|
||||
/** Module-level cache (lives for the app session, not persisted). */
|
||||
let _cache: PositionMaster[] | null = null;
|
||||
let _lastGoodTrainPositions: any[] | null = null;
|
||||
let _lastGoodTrainPositionsAt: number | null = null;
|
||||
|
||||
/**
|
||||
* Fetch position masters from the remote API.
|
||||
@@ -39,9 +44,16 @@ let _cache: PositionMaster[] | null = null;
|
||||
*/
|
||||
export const fetchPositionMasters = async (): Promise<PositionMaster[]> => {
|
||||
if (_cache) return _cache;
|
||||
const res = await fetch(POSITION_MASTERS_URL);
|
||||
if (!res.ok) throw new Error(`position-masters fetch failed: ${res.status}`);
|
||||
const data: PositionMaster[] = await res.json();
|
||||
const data = await observedFetchJson<PositionMaster[]>(POSITION_MASTERS_URL, {
|
||||
endpoint: "positions_master",
|
||||
source: "mock_api",
|
||||
userVisible: false,
|
||||
preload: true,
|
||||
fetchPriority: "medium",
|
||||
timeoutMs: 8000,
|
||||
retry: true,
|
||||
urlPathTemplate: "/position-masters",
|
||||
});
|
||||
_cache = data;
|
||||
return data;
|
||||
};
|
||||
@@ -95,7 +107,35 @@ export const serializePosLookupForJs = (lookup: PositionLookup): string => {
|
||||
* Throws on network error or non-OK response.
|
||||
*/
|
||||
export const fetchMockTrainPositions = async (): Promise<any[]> => {
|
||||
const res = await fetch(MOCK_TRAIN_POSITIONS_URL);
|
||||
if (!res.ok) throw new Error(`mock train-positions fetch failed: ${res.status}`);
|
||||
return res.json();
|
||||
try {
|
||||
const data = await observedFetchJson<any[]>(MOCK_TRAIN_POSITIONS_URL, {
|
||||
endpoint: "positions_current",
|
||||
source: "mock_api",
|
||||
userVisible: true,
|
||||
preload: false,
|
||||
fetchPriority: "high",
|
||||
timeoutMs: 8000,
|
||||
retry: true,
|
||||
urlPathTemplate: "/train-positions/current",
|
||||
});
|
||||
_lastGoodTrainPositions = data;
|
||||
_lastGoodTrainPositionsAt = Date.now();
|
||||
return data;
|
||||
} catch (error) {
|
||||
if (_lastGoodTrainPositions) {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "data_fetch",
|
||||
level: "warning",
|
||||
message: "fetch:stale_cache",
|
||||
data: {
|
||||
endpoint: "positions_current",
|
||||
source: "mock_api",
|
||||
stale: true,
|
||||
cacheAgeSeconds: _lastGoodTrainPositionsAt ? Math.round((Date.now() - _lastGoodTrainPositionsAt) / 1000) : undefined,
|
||||
},
|
||||
});
|
||||
return _lastGoodTrainPositions;
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
};
|
||||
|
||||
+291
-14
@@ -1,3 +1,6 @@
|
||||
import AsyncStorage from '@react-native-async-storage/async-storage';
|
||||
import { Directory, File, Paths } from 'expo-file-system';
|
||||
|
||||
import { AS } from '../../storageControl';
|
||||
import { STORAGE_KEYS } from '../../constants/storage';
|
||||
import { TrainEntry } from './webviewXhrInterceptor';
|
||||
@@ -24,6 +27,60 @@ export type TrainRecording = {
|
||||
snapshots: TrainSnapshot[];
|
||||
};
|
||||
|
||||
export type RecordingExportEnvelope = {
|
||||
format: 'jrshikoku-train-recording';
|
||||
version: 1;
|
||||
exportedAt: string;
|
||||
recording: TrainRecording;
|
||||
};
|
||||
|
||||
export type RecordingsExportEnvelope = {
|
||||
format: 'jrshikoku-train-recordings';
|
||||
version: 1;
|
||||
exportedAt: string;
|
||||
recordings: TrainRecording[];
|
||||
};
|
||||
|
||||
export type RecordingImportResult = {
|
||||
importedCount: number;
|
||||
overwrittenCount: number;
|
||||
};
|
||||
|
||||
const RECORDING_EXPORT_FORMAT = 'jrshikoku-train-recording' as const;
|
||||
const RECORDINGS_EXPORT_FORMAT = 'jrshikoku-train-recordings' as const;
|
||||
const RECORDING_FILE_DIRECTORY = 'train-recordings';
|
||||
|
||||
const getRecordingsDirectory = () => new Directory(Paths.document, RECORDING_FILE_DIRECTORY);
|
||||
|
||||
const ensureRecordingsDirectory = () => {
|
||||
const directory = getRecordingsDirectory();
|
||||
directory.create({ idempotent: true, intermediates: true });
|
||||
return directory;
|
||||
};
|
||||
|
||||
const getRecordingFileName = (id: string) => `${encodeURIComponent(id)}.json`;
|
||||
|
||||
const getRecordingFile = (id: string, createDirectory = false) =>
|
||||
new File(createDirectory ? ensureRecordingsDirectory() : getRecordingsDirectory(), getRecordingFileName(id));
|
||||
|
||||
const getLegacyRecordingStorageKey = (id: string) =>
|
||||
(STORAGE_KEYS.MOCK_RECORDING_DATA_PREFIX + id) as string;
|
||||
|
||||
const removeLegacyRecordingStorage = async (id: string) => {
|
||||
const key = getLegacyRecordingStorageKey(id);
|
||||
await AS.removeItem(key).catch(() => {});
|
||||
};
|
||||
|
||||
const cleanupLegacyRecordingStorage = async () => {
|
||||
const prefix = STORAGE_KEYS.MOCK_RECORDING_DATA_PREFIX;
|
||||
const keys = await AsyncStorage.getAllKeys().catch(() => []);
|
||||
await Promise.all(
|
||||
keys
|
||||
.filter((key) => key.startsWith(prefix))
|
||||
.map((key) => AsyncStorage.removeItem(key).catch(() => {})),
|
||||
);
|
||||
};
|
||||
|
||||
const parse = <T>(raw: string | null | boolean): T | null => {
|
||||
if (!raw) return null;
|
||||
try {
|
||||
@@ -37,6 +94,99 @@ const parse = <T>(raw: string | null | boolean): T | null => {
|
||||
export const generateRecordingId = (recordedAt: string) =>
|
||||
recordedAt.replace(/[:.]/g, '-');
|
||||
|
||||
const isPlainObject = (value: unknown): value is Record<string, unknown> =>
|
||||
typeof value === 'object' && value !== null && !Array.isArray(value);
|
||||
|
||||
const normalizeDirection = (value: unknown): 0 | 1 => (value === 1 ? 1 : 0);
|
||||
|
||||
const normalizeDelay = (value: unknown): number | string =>
|
||||
typeof value === 'number' || typeof value === 'string' ? value : 0;
|
||||
|
||||
const normalizeTrainEntry = (value: unknown): TrainEntry | null => {
|
||||
if (!isPlainObject(value)) return null;
|
||||
if (typeof value.TrainNum !== 'string') return null;
|
||||
if (typeof value.Line !== 'string') return null;
|
||||
if (typeof value.Type !== 'string') return null;
|
||||
|
||||
return {
|
||||
Index: typeof value.Index === 'number' ? value.Index : 0,
|
||||
TrainNum: value.TrainNum,
|
||||
Pos: typeof value.Pos === 'string' ? value.Pos : '',
|
||||
PosNum: typeof value.PosNum === 'number' ? value.PosNum : 0,
|
||||
delay: normalizeDelay(value.delay),
|
||||
Direction: normalizeDirection(value.Direction),
|
||||
Type: value.Type,
|
||||
Line: value.Line,
|
||||
};
|
||||
};
|
||||
|
||||
const normalizeSnapshot = (value: unknown): TrainSnapshot | null => {
|
||||
if (!isPlainObject(value)) return null;
|
||||
if (!Array.isArray(value.trains)) return null;
|
||||
|
||||
const trains = value.trains
|
||||
.map(normalizeTrainEntry)
|
||||
.filter((entry): entry is TrainEntry => entry !== null);
|
||||
|
||||
if (trains.length !== value.trains.length) return null;
|
||||
|
||||
return {
|
||||
t: typeof value.t === 'number' && Number.isFinite(value.t) ? Math.max(0, value.t) : 0,
|
||||
trains,
|
||||
};
|
||||
};
|
||||
|
||||
const normalizeRecording = (value: unknown): TrainRecording | null => {
|
||||
if (!isPlainObject(value)) return null;
|
||||
if (typeof value.recordedAt !== 'string') return null;
|
||||
if (!Array.isArray(value.snapshots)) return null;
|
||||
|
||||
const snapshots = value.snapshots
|
||||
.map(normalizeSnapshot)
|
||||
.filter((snapshot): snapshot is TrainSnapshot => snapshot !== null);
|
||||
|
||||
if (snapshots.length !== value.snapshots.length) return null;
|
||||
|
||||
const durationMs =
|
||||
typeof value.durationMs === 'number' && Number.isFinite(value.durationMs)
|
||||
? Math.max(0, value.durationMs)
|
||||
: snapshots[snapshots.length - 1]?.t ?? 0;
|
||||
|
||||
const id =
|
||||
typeof value.id === 'string' && value.id.trim().length > 0
|
||||
? value.id
|
||||
: generateRecordingId(value.recordedAt);
|
||||
|
||||
return {
|
||||
id,
|
||||
recordedAt: value.recordedAt,
|
||||
durationMs,
|
||||
snapshots,
|
||||
};
|
||||
};
|
||||
|
||||
const extractRecordingsFromImport = (value: unknown): TrainRecording[] => {
|
||||
if (isPlainObject(value) && value.format === RECORDING_EXPORT_FORMAT) {
|
||||
const recording = normalizeRecording(value.recording);
|
||||
return recording ? [recording] : [];
|
||||
}
|
||||
|
||||
if (isPlainObject(value) && value.format === RECORDINGS_EXPORT_FORMAT && Array.isArray(value.recordings)) {
|
||||
return value.recordings
|
||||
.map(normalizeRecording)
|
||||
.filter((recording): recording is TrainRecording => recording !== null);
|
||||
}
|
||||
|
||||
if (Array.isArray(value)) {
|
||||
return value
|
||||
.map(normalizeRecording)
|
||||
.filter((recording): recording is TrainRecording => recording !== null);
|
||||
}
|
||||
|
||||
const recording = normalizeRecording(value);
|
||||
return recording ? [recording] : [];
|
||||
};
|
||||
|
||||
/** 録画インデックス(メタ一覧)を読み込む */
|
||||
export const loadRecordingList = async (): Promise<RecordingMeta[]> => {
|
||||
const raw = await AS.getItem(STORAGE_KEYS.MOCK_RECORDINGS_INDEX).catch(() => null);
|
||||
@@ -45,16 +195,57 @@ export const loadRecordingList = async (): Promise<RecordingMeta[]> => {
|
||||
|
||||
/** フル録画データをIDで読み込む */
|
||||
export const loadRecordingById = async (id: string): Promise<TrainRecording | null> => {
|
||||
const raw = await AS.getItem((STORAGE_KEYS.MOCK_RECORDING_DATA_PREFIX + id) as any).catch(() => null);
|
||||
return parse<TrainRecording>(raw);
|
||||
const file = getRecordingFile(id);
|
||||
if (file.exists) {
|
||||
const raw = await file.text().catch(() => null);
|
||||
const recording = parse<TrainRecording>(raw);
|
||||
if (recording) return recording;
|
||||
}
|
||||
|
||||
const legacyKey = getLegacyRecordingStorageKey(id);
|
||||
const legacyRaw = await AS.getItem(legacyKey).catch(() => null);
|
||||
const legacyRecording = parse<TrainRecording>(legacyRaw);
|
||||
if (!legacyRecording) return null;
|
||||
|
||||
await writeRecordingFile(legacyRecording);
|
||||
await removeLegacyRecordingStorage(id);
|
||||
return legacyRecording;
|
||||
};
|
||||
|
||||
/** 全録画を新しい順で読み込む */
|
||||
export const loadAllRecordings = async (): Promise<TrainRecording[]> => {
|
||||
const list = await loadRecordingList();
|
||||
const recordings = await Promise.all(list.map((meta) => loadRecordingById(meta.id)));
|
||||
return recordings.filter((recording): recording is TrainRecording => recording !== null);
|
||||
};
|
||||
|
||||
const migrateIndexedLegacyRecordings = async (): Promise<boolean> => {
|
||||
const list = await loadRecordingList();
|
||||
if (list.length === 0) return true;
|
||||
|
||||
const results = await Promise.all(
|
||||
list.map(async (meta) => {
|
||||
const recording = await loadRecordingById(meta.id).catch(() => null);
|
||||
return recording !== null;
|
||||
}),
|
||||
);
|
||||
|
||||
return results.every(Boolean);
|
||||
};
|
||||
|
||||
const writeRecordingFile = async (recording: TrainRecording): Promise<void> => {
|
||||
const file = getRecordingFile(recording.id, true);
|
||||
if (file.exists) {
|
||||
file.delete();
|
||||
}
|
||||
file.create({ overwrite: true });
|
||||
file.write(JSON.stringify(recording));
|
||||
};
|
||||
|
||||
/** 録画を保存してインデックスに追加する */
|
||||
export const saveRecording = async (recording: TrainRecording): Promise<void> => {
|
||||
await AS.setItem(
|
||||
(STORAGE_KEYS.MOCK_RECORDING_DATA_PREFIX + recording.id) as any,
|
||||
JSON.stringify(recording),
|
||||
);
|
||||
await writeRecordingFile(recording);
|
||||
await removeLegacyRecordingStorage(recording.id);
|
||||
const list = await loadRecordingList();
|
||||
const meta: RecordingMeta = {
|
||||
id: recording.id,
|
||||
@@ -69,7 +260,11 @@ export const saveRecording = async (recording: TrainRecording): Promise<void> =>
|
||||
|
||||
/** 録画をIDで削除する */
|
||||
export const deleteRecordingById = async (id: string): Promise<void> => {
|
||||
await AS.removeItem((STORAGE_KEYS.MOCK_RECORDING_DATA_PREFIX + id) as any).catch(() => {});
|
||||
const file = getRecordingFile(id);
|
||||
if (file.exists) {
|
||||
file.delete();
|
||||
}
|
||||
await removeLegacyRecordingStorage(id);
|
||||
const list = await loadRecordingList();
|
||||
await AS.setItem(
|
||||
STORAGE_KEYS.MOCK_RECORDINGS_INDEX,
|
||||
@@ -78,17 +273,99 @@ export const deleteRecordingById = async (id: string): Promise<void> => {
|
||||
};
|
||||
|
||||
/**
|
||||
* 旧フォーマット(MOCK_RECORDING)からマイグレーション。
|
||||
* 新インデックスが空の場合のみ実行する。
|
||||
* 旧フォーマット(MOCK_RECORDING/SQLite保存)からファイル保存へ移行する。
|
||||
*/
|
||||
export const migrateOldRecording = async (): Promise<void> => {
|
||||
const indexedRecordingsMigrated = await migrateIndexedLegacyRecordings();
|
||||
const list = await loadRecordingList();
|
||||
if (list.length > 0) return; // 既に移行済み
|
||||
if (list.length > 0) {
|
||||
if (indexedRecordingsMigrated) {
|
||||
await cleanupLegacyRecordingStorage();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const raw = await AS.getItem(STORAGE_KEYS.MOCK_RECORDING).catch(() => null);
|
||||
const old = parse<Omit<TrainRecording, 'id'>>(raw);
|
||||
if (!old) return;
|
||||
const id = generateRecordingId(old.recordedAt);
|
||||
await saveRecording({ ...old, id });
|
||||
await AS.removeItem(STORAGE_KEYS.MOCK_RECORDING).catch(() => {});
|
||||
if (old) {
|
||||
const id = generateRecordingId(old.recordedAt);
|
||||
await saveRecording({ ...old, id });
|
||||
await AS.removeItem(STORAGE_KEYS.MOCK_RECORDING).catch(() => {});
|
||||
}
|
||||
|
||||
await cleanupLegacyRecordingStorage();
|
||||
};
|
||||
|
||||
/** 録画1件をファイル/クリップボード用JSON文字列へ変換する */
|
||||
export const buildRecordingExportText = async (id: string): Promise<string> => {
|
||||
const recording = await loadRecordingById(id);
|
||||
if (!recording) {
|
||||
throw new Error('録画データが見つかりませんでした。');
|
||||
}
|
||||
|
||||
const payload: RecordingExportEnvelope = {
|
||||
format: RECORDING_EXPORT_FORMAT,
|
||||
version: 1,
|
||||
exportedAt: new Date().toISOString(),
|
||||
recording,
|
||||
};
|
||||
|
||||
return JSON.stringify(payload, null, 2);
|
||||
};
|
||||
|
||||
/** 全録画をファイル/クリップボード用JSON文字列へ変換する */
|
||||
export const buildAllRecordingsExportText = async (): Promise<string> => {
|
||||
const recordings = await loadAllRecordings();
|
||||
if (recordings.length === 0) {
|
||||
throw new Error('書き出せる録画がありません。');
|
||||
}
|
||||
|
||||
const payload: RecordingsExportEnvelope = {
|
||||
format: RECORDINGS_EXPORT_FORMAT,
|
||||
version: 1,
|
||||
exportedAt: new Date().toISOString(),
|
||||
recordings,
|
||||
};
|
||||
|
||||
return JSON.stringify(payload, null, 2);
|
||||
};
|
||||
|
||||
/** コピペ/ファイルから読み込んだJSON文字列を録画として保存する */
|
||||
export const importRecordingsFromText = async (text: string): Promise<RecordingImportResult> => {
|
||||
const trimmed = text.trim();
|
||||
if (!trimmed) {
|
||||
throw new Error('インポートするJSONが空です。');
|
||||
}
|
||||
|
||||
let parsedValue: unknown;
|
||||
try {
|
||||
parsedValue = JSON.parse(trimmed);
|
||||
} catch {
|
||||
throw new Error('JSONとして読み取れませんでした。ファイル内容を確認してください。');
|
||||
}
|
||||
|
||||
const recordings = extractRecordingsFromImport(parsedValue);
|
||||
if (recordings.length === 0) {
|
||||
throw new Error('有効な録画データが見つかりませんでした。');
|
||||
}
|
||||
|
||||
if (await migrateIndexedLegacyRecordings()) {
|
||||
await cleanupLegacyRecordingStorage();
|
||||
}
|
||||
|
||||
const existingIds = new Set((await loadRecordingList()).map((meta) => meta.id));
|
||||
let overwrittenCount = 0;
|
||||
|
||||
for (const recording of recordings) {
|
||||
if (existingIds.has(recording.id)) {
|
||||
overwrittenCount += 1;
|
||||
}
|
||||
await saveRecording(recording);
|
||||
existingIds.add(recording.id);
|
||||
}
|
||||
|
||||
return {
|
||||
importedCount: recordings.length,
|
||||
overwrittenCount,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -0,0 +1,234 @@
|
||||
import AsyncStorage from "@react-native-async-storage/async-storage";
|
||||
import { AppState, AppStateStatus, Platform } from "react-native";
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
import * as Updates from "expo-updates";
|
||||
import { lastObservedRootRouteRef } from "@/lib/rootNavigation";
|
||||
|
||||
const STORAGE_KEY = "@jrshikoku/app_crash_sentinel_v1";
|
||||
const HEARTBEAT_INTERVAL_MS = 7000;
|
||||
const RECENT_HEARTBEAT_MS = 120000;
|
||||
const MIN_SESSION_AGE_MS = 5000;
|
||||
|
||||
type RootNavigationSnapshot = {
|
||||
rootRoute: string | null;
|
||||
nestedRoute?: string | null;
|
||||
rootIndex?: number;
|
||||
nestedIndex?: number;
|
||||
source?: string;
|
||||
updatedAt: string;
|
||||
};
|
||||
|
||||
type CrashSentinelState = {
|
||||
app_session_active: boolean;
|
||||
normal_background: boolean;
|
||||
sessionStartedAt: string;
|
||||
lastHeartbeatAt: string;
|
||||
lastKnownAppState: AppStateStatus | "unknown";
|
||||
lastRootTab: string | null;
|
||||
previousRootNavigation: RootNavigationSnapshot | null;
|
||||
activeWebViews: string[];
|
||||
nativeScreensMode: string;
|
||||
reportedUnexpectedExitForSessionStartedAt?: string;
|
||||
};
|
||||
|
||||
type StartOptions = {
|
||||
nativeScreensMode: string;
|
||||
};
|
||||
|
||||
let currentState: CrashSentinelState | null = null;
|
||||
let heartbeatTimer: ReturnType<typeof setInterval> | null = null;
|
||||
let appStateSubscription: { remove: () => void } | null = null;
|
||||
let latestNavigationSnapshot: RootNavigationSnapshot | null = null;
|
||||
const activeWebViews = new Set<string>();
|
||||
|
||||
const nowIso = () => new Date().toISOString();
|
||||
|
||||
const safeJsonParse = <T>(value: string | null): T | null => {
|
||||
if (!value) return null;
|
||||
try {
|
||||
return JSON.parse(value) as T;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
const getExpoUpdateContext = () => ({
|
||||
update_id: (Updates as any).updateId ?? null,
|
||||
updateId: (Updates as any).updateId ?? null,
|
||||
channel: (Updates as any).channel ?? null,
|
||||
runtimeVersion: (Updates as any).runtimeVersion ?? null,
|
||||
createdAt: (Updates as any).createdAt ?? null,
|
||||
isEmbeddedLaunch: (Updates as any).isEmbeddedLaunch ?? null,
|
||||
});
|
||||
|
||||
const getMemoryInfo = () => {
|
||||
const performanceMemory = (globalThis as any)?.performance?.memory;
|
||||
if (!performanceMemory) return null;
|
||||
return {
|
||||
jsHeapSizeLimit: performanceMemory.jsHeapSizeLimit ?? null,
|
||||
totalJSHeapSize: performanceMemory.totalJSHeapSize ?? null,
|
||||
usedJSHeapSize: performanceMemory.usedJSHeapSize ?? null,
|
||||
};
|
||||
};
|
||||
|
||||
const getRootTab = () => lastObservedRootRouteRef.current ?? currentState?.lastRootTab ?? "unknown";
|
||||
|
||||
const persistCurrentState = async (patch?: Partial<CrashSentinelState>) => {
|
||||
if (!currentState) return;
|
||||
currentState = {
|
||||
...currentState,
|
||||
...patch,
|
||||
lastRootTab: getRootTab(),
|
||||
previousRootNavigation: latestNavigationSnapshot ?? currentState.previousRootNavigation,
|
||||
activeWebViews: Array.from(activeWebViews).sort(),
|
||||
};
|
||||
try {
|
||||
await AsyncStorage.setItem(STORAGE_KEY, JSON.stringify(currentState));
|
||||
} catch (error) {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "app.lifecycle",
|
||||
level: "warning",
|
||||
message: "crash sentinel persist failed",
|
||||
data: {
|
||||
errorMessage: error instanceof Error ? error.message : String(error),
|
||||
},
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
const shouldReportUnexpectedExit = (previous: CrashSentinelState, nowMs: number) => {
|
||||
if (!previous.app_session_active) return false;
|
||||
if (previous.normal_background) return false;
|
||||
if (previous.reportedUnexpectedExitForSessionStartedAt === previous.sessionStartedAt) return false;
|
||||
|
||||
const heartbeatMs = Date.parse(previous.lastHeartbeatAt);
|
||||
const startedMs = Date.parse(previous.sessionStartedAt);
|
||||
if (!Number.isFinite(heartbeatMs) || !Number.isFinite(startedMs)) return false;
|
||||
|
||||
const heartbeatAgeMs = nowMs - heartbeatMs;
|
||||
const sessionAgeMs = heartbeatMs - startedMs;
|
||||
return heartbeatAgeMs >= 0 && heartbeatAgeMs <= RECENT_HEARTBEAT_MS && sessionAgeMs >= MIN_SESSION_AGE_MS;
|
||||
};
|
||||
|
||||
const reportUnexpectedExit = async (previous: CrashSentinelState, nativeScreensMode: string) => {
|
||||
const rootTab = getRootTab();
|
||||
Sentry.captureMessage("app.previous_session_unexpected_exit", {
|
||||
level: "warning",
|
||||
tags: {
|
||||
area: "app_lifecycle",
|
||||
result: "unexpected_exit",
|
||||
platform: Platform.OS,
|
||||
root_tab: rootTab,
|
||||
last_root_tab: previous.lastRootTab ?? "unknown",
|
||||
native_screens_mode: nativeScreensMode,
|
||||
},
|
||||
contexts: {
|
||||
app_lifecycle: {
|
||||
lastHeartbeatAt: previous.lastHeartbeatAt,
|
||||
sessionStartedAt: previous.sessionStartedAt,
|
||||
previousRootNavigation: previous.previousRootNavigation,
|
||||
lastKnownAppState: previous.lastKnownAppState,
|
||||
activeWebViews: previous.activeWebViews,
|
||||
memory: getMemoryInfo(),
|
||||
expoUpdate: getExpoUpdateContext(),
|
||||
normalBackground: previous.normal_background,
|
||||
heartbeatAgeMs: Date.now() - Date.parse(previous.lastHeartbeatAt),
|
||||
},
|
||||
},
|
||||
fingerprint: ["app_lifecycle", "unexpected_exit", Platform.OS],
|
||||
});
|
||||
|
||||
await AsyncStorage.setItem(
|
||||
STORAGE_KEY,
|
||||
JSON.stringify({
|
||||
...previous,
|
||||
reportedUnexpectedExitForSessionStartedAt: previous.sessionStartedAt,
|
||||
})
|
||||
);
|
||||
};
|
||||
|
||||
export async function startAppLifecycleCrashSentinel(options: StartOptions) {
|
||||
const startedAt = nowIso();
|
||||
const previous = safeJsonParse<CrashSentinelState>(await AsyncStorage.getItem(STORAGE_KEY));
|
||||
|
||||
if (previous && shouldReportUnexpectedExit(previous, Date.now())) {
|
||||
await reportUnexpectedExit(previous, options.nativeScreensMode);
|
||||
}
|
||||
|
||||
currentState = {
|
||||
app_session_active: true,
|
||||
normal_background: false,
|
||||
sessionStartedAt: startedAt,
|
||||
lastHeartbeatAt: startedAt,
|
||||
lastKnownAppState: AppState.currentState ?? "unknown",
|
||||
lastRootTab: getRootTab(),
|
||||
previousRootNavigation: latestNavigationSnapshot,
|
||||
activeWebViews: Array.from(activeWebViews).sort(),
|
||||
nativeScreensMode: options.nativeScreensMode,
|
||||
};
|
||||
|
||||
Sentry.setContext("app_lifecycle_sentinel", {
|
||||
sessionStartedAt: currentState.sessionStartedAt,
|
||||
lastHeartbeatAt: currentState.lastHeartbeatAt,
|
||||
lastKnownAppState: currentState.lastKnownAppState,
|
||||
activeWebViews: currentState.activeWebViews,
|
||||
expoUpdate: getExpoUpdateContext(),
|
||||
});
|
||||
|
||||
await persistCurrentState();
|
||||
|
||||
if (heartbeatTimer) clearInterval(heartbeatTimer);
|
||||
heartbeatTimer = setInterval(() => {
|
||||
void persistCurrentState({
|
||||
lastHeartbeatAt: nowIso(),
|
||||
lastKnownAppState: AppState.currentState ?? "unknown",
|
||||
normal_background: AppState.currentState === "background" ? true : currentState?.normal_background ?? false,
|
||||
});
|
||||
}, HEARTBEAT_INTERVAL_MS);
|
||||
|
||||
appStateSubscription?.remove();
|
||||
appStateSubscription = AppState.addEventListener("change", (nextState) => {
|
||||
const patch: Partial<CrashSentinelState> = {
|
||||
lastKnownAppState: nextState,
|
||||
lastHeartbeatAt: nowIso(),
|
||||
};
|
||||
if (nextState === "background") {
|
||||
patch.normal_background = true;
|
||||
} else if (nextState === "active") {
|
||||
patch.normal_background = false;
|
||||
}
|
||||
void persistCurrentState(patch);
|
||||
});
|
||||
}
|
||||
|
||||
export function stopAppLifecycleCrashSentinel() {
|
||||
if (heartbeatTimer) {
|
||||
clearInterval(heartbeatTimer);
|
||||
heartbeatTimer = null;
|
||||
}
|
||||
appStateSubscription?.remove();
|
||||
appStateSubscription = null;
|
||||
}
|
||||
|
||||
export function recordAppLifecycleRootNavigation(snapshot: Omit<RootNavigationSnapshot, "updatedAt">) {
|
||||
latestNavigationSnapshot = {
|
||||
...snapshot,
|
||||
updatedAt: nowIso(),
|
||||
};
|
||||
if (snapshot.rootRoute) {
|
||||
lastObservedRootRouteRef.current = snapshot.rootRoute;
|
||||
}
|
||||
void persistCurrentState();
|
||||
}
|
||||
|
||||
export function setAppLifecycleWebViewActive(name: string, active: boolean) {
|
||||
if (active) {
|
||||
activeWebViews.add(name);
|
||||
} else {
|
||||
activeWebViews.delete(name);
|
||||
}
|
||||
Sentry.setContext("active_webviews", {
|
||||
names: Array.from(activeWebViews).sort(),
|
||||
});
|
||||
void persistCurrentState();
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
import { DataEndpoint, ExpectedContentType } from "./types";
|
||||
|
||||
type DataEndpointConfig = {
|
||||
expectedContentType: ExpectedContentType;
|
||||
timeoutMs: number;
|
||||
slowMs: number;
|
||||
allowStale: boolean;
|
||||
};
|
||||
|
||||
export const DATA_ENDPOINT_CONFIG: Record<DataEndpoint, DataEndpointConfig> = {
|
||||
positions_current: { expectedContentType: "json", timeoutMs: 8000, slowMs: 2500, allowStale: true },
|
||||
positions_master: { expectedContentType: "json", timeoutMs: 8000, slowMs: 2500, allowStale: true },
|
||||
positions_gas_fallback: { expectedContentType: "json", timeoutMs: 8000, slowMs: 2500, allowStale: true },
|
||||
positions_webview: { expectedContentType: "json", timeoutMs: 8000, slowMs: 2500, allowStale: true },
|
||||
operation_info_flag: { expectedContentType: "json", timeoutMs: 10000, slowMs: 3000, allowStale: true },
|
||||
operation_info_text: { expectedContentType: "text", timeoutMs: 15000, slowMs: 5000, allowStale: true },
|
||||
operation_logs: { expectedContentType: "json", timeoutMs: 15000, slowMs: 3000, allowStale: true },
|
||||
train_operation_data: { expectedContentType: "json", timeoutMs: 15000, slowMs: 3500, allowStale: true },
|
||||
timetable_today: { expectedContentType: "json", timeoutMs: 15000, slowMs: 3500, allowStale: true },
|
||||
positions: { expectedContentType: "json", timeoutMs: 8000, slowMs: 2500, allowStale: true },
|
||||
operation_info: { expectedContentType: "json", timeoutMs: 10000, slowMs: 3000, allowStale: true },
|
||||
train_operation: { expectedContentType: "json", timeoutMs: 10000, slowMs: 3500, allowStale: true },
|
||||
timetable: { expectedContentType: "json", timeoutMs: 10000, slowMs: 3500, allowStale: true },
|
||||
station_info: { expectedContentType: "json", timeoutMs: 8000, slowMs: 2500, allowStale: true },
|
||||
notice: { expectedContentType: "json", timeoutMs: 8000, slowMs: 2500, allowStale: true },
|
||||
app_config: { expectedContentType: "json", timeoutMs: 8000, slowMs: 2000, allowStale: false },
|
||||
unknown: { expectedContentType: "any", timeoutMs: 8000, slowMs: 3000, allowStale: false },
|
||||
};
|
||||
@@ -0,0 +1,31 @@
|
||||
import { NetworkFailureKind } from "./types";
|
||||
|
||||
export class ObservedFetchError extends Error {
|
||||
kind: NetworkFailureKind;
|
||||
status?: number;
|
||||
retryable: boolean;
|
||||
|
||||
constructor(message: string, kind: NetworkFailureKind, options?: { status?: number; retryable?: boolean; cause?: unknown }) {
|
||||
super(message);
|
||||
this.name = "ObservedFetchError";
|
||||
this.kind = kind;
|
||||
this.status = options?.status;
|
||||
this.retryable = options?.retryable ?? false;
|
||||
if (options?.cause !== undefined) {
|
||||
(this as Error & { cause?: unknown }).cause = options.cause;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export const isObservedFetchError = (error: unknown): error is ObservedFetchError =>
|
||||
error instanceof ObservedFetchError ||
|
||||
(typeof error === "object" && error !== null && (error as any).name === "ObservedFetchError");
|
||||
|
||||
export const shouldRetryNetworkError = (error: unknown) => {
|
||||
if (isObservedFetchError(error)) {
|
||||
return error.retryable;
|
||||
}
|
||||
|
||||
const message = String((error as any)?.message ?? error);
|
||||
return message.includes("Network request failed") || message.includes("AbortError");
|
||||
};
|
||||
@@ -0,0 +1,377 @@
|
||||
import { AppState, Platform } from "react-native";
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
import { DATA_ENDPOINT_CONFIG } from "./endpoints";
|
||||
import { ObservedFetchOptions } from "./types";
|
||||
import { ObservedFetchError, shouldRetryNetworkError } from "./networkError";
|
||||
import { reportDataFetchFailure, reportDataFetchSuccess, truncateResponseHead } from "./sentryNetwork";
|
||||
import { lastObservedRootRouteRef, rootNavigationRef } from "@/lib/rootNavigation";
|
||||
|
||||
type ParsedUrl = { host: string; pathTemplate: string };
|
||||
|
||||
const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
|
||||
|
||||
const getRootTab = (fallback?: string) => {
|
||||
if (fallback) return fallback;
|
||||
try {
|
||||
const state = rootNavigationRef.getState?.();
|
||||
const routeName = state?.routes?.[state.index ?? 0]?.name;
|
||||
if (routeName) {
|
||||
lastObservedRootRouteRef.current = routeName;
|
||||
return routeName;
|
||||
}
|
||||
} catch {}
|
||||
return lastObservedRootRouteRef.current ?? "unknown";
|
||||
};
|
||||
|
||||
const getKnownOnline = () => {
|
||||
const online = (globalThis as any)?.navigator?.onLine;
|
||||
return typeof online === "boolean" ? online : true;
|
||||
};
|
||||
|
||||
const getRuntimeState = () => ({
|
||||
appState: AppState.currentState,
|
||||
online: getKnownOnline(),
|
||||
});
|
||||
|
||||
const canStartFetch = (options: ObservedFetchOptions) => {
|
||||
const runtime = getRuntimeState();
|
||||
return (options.allowBackground || runtime.appState !== "background") && runtime.online !== false;
|
||||
};
|
||||
|
||||
const shouldCaptureRuntimeFailure = () => {
|
||||
const runtime = getRuntimeState();
|
||||
return runtime.appState !== "background" && runtime.online !== false;
|
||||
};
|
||||
|
||||
const getOptionTags = (options: ObservedFetchOptions) => ({
|
||||
source: options.source ?? "rn_fetch",
|
||||
user_visible: String(options.userVisible ?? false),
|
||||
preload: String(options.preload ?? false),
|
||||
fetch_priority: options.fetchPriority ?? "medium",
|
||||
});
|
||||
|
||||
const safeParseUrl = (url: string, urlPathTemplate?: string): ParsedUrl => {
|
||||
try {
|
||||
const parsed = new URL(url);
|
||||
return {
|
||||
host: parsed.host,
|
||||
pathTemplate: urlPathTemplate ?? parsed.pathname,
|
||||
};
|
||||
} catch {
|
||||
return { host: "unknown", pathTemplate: urlPathTemplate ?? "unknown" };
|
||||
}
|
||||
};
|
||||
|
||||
const estimateBytes = (text: string) => {
|
||||
if (typeof Blob !== "undefined") {
|
||||
return new Blob([text]).size;
|
||||
}
|
||||
return text.length;
|
||||
};
|
||||
|
||||
const looksJson = (contentType: string, text: string) => {
|
||||
const trimmed = text.trimStart();
|
||||
return contentType.includes("application/json") || trimmed.startsWith("{") || trimmed.startsWith("[");
|
||||
};
|
||||
|
||||
const getFetchSignal = (controller: AbortController, externalSignal?: AbortSignal) => {
|
||||
if (!externalSignal) return controller.signal;
|
||||
if (externalSignal.aborted) controller.abort();
|
||||
const abort = () => controller.abort();
|
||||
externalSignal.addEventListener("abort", abort, { once: true });
|
||||
return controller.signal;
|
||||
};
|
||||
|
||||
const buildContext = (args: {
|
||||
endpoint: string;
|
||||
status?: number;
|
||||
ok?: boolean;
|
||||
durationMs: number;
|
||||
timeoutMs: number;
|
||||
bytes?: number;
|
||||
contentType?: string;
|
||||
responseHead?: string;
|
||||
urlHost: string;
|
||||
urlPathTemplate: string;
|
||||
retryCount: number;
|
||||
}) => ({
|
||||
endpoint: args.endpoint,
|
||||
method: "GET",
|
||||
status: args.status,
|
||||
ok: args.ok,
|
||||
durationMs: args.durationMs,
|
||||
timeoutMs: args.timeoutMs,
|
||||
bytes: args.bytes,
|
||||
contentType: args.contentType,
|
||||
responseHead: truncateResponseHead(args.responseHead),
|
||||
retryCount: args.retryCount,
|
||||
urlHost: args.urlHost,
|
||||
urlPathTemplate: args.urlPathTemplate,
|
||||
...getRuntimeState(),
|
||||
});
|
||||
|
||||
async function observedFetchTextOnce(url: string, options: ObservedFetchOptions, reportSuccess = true): Promise<{ text: string; response: Response; durationMs: number; bytes: number; contentType: string; context: Record<string, unknown>; slow: boolean; statusTag: string }> {
|
||||
const endpoint = options.endpoint ?? "unknown";
|
||||
const config = DATA_ENDPOINT_CONFIG[endpoint];
|
||||
const timeoutMs = options.timeoutMs ?? config.timeoutMs;
|
||||
const slowMs = options.slowMs ?? config.slowMs;
|
||||
const startedAt = Date.now();
|
||||
const parsedUrl = safeParseUrl(url, options.urlPathTemplate);
|
||||
const retryCount = options.retryCount ?? 0;
|
||||
const method = options.method ?? "GET";
|
||||
const rootTab = getRootTab(options.rootTab);
|
||||
const baseTags = {
|
||||
area: "data_fetch",
|
||||
endpoint,
|
||||
result: "unknown",
|
||||
root_tab: rootTab,
|
||||
platform: Platform.OS,
|
||||
...getOptionTags(options),
|
||||
};
|
||||
|
||||
if (!canStartFetch(options)) {
|
||||
const runtime = getRuntimeState();
|
||||
const error = new ObservedFetchError(
|
||||
runtime.online === false ? "Data fetch skipped while offline" : "Data fetch skipped while app is background",
|
||||
"aborted",
|
||||
{ retryable: false }
|
||||
);
|
||||
reportDataFetchFailure({
|
||||
kind: "aborted",
|
||||
error,
|
||||
tags: { ...baseTags, result: "aborted" },
|
||||
context: buildContext({
|
||||
endpoint,
|
||||
durationMs: 0,
|
||||
timeoutMs,
|
||||
urlHost: parsedUrl.host,
|
||||
urlPathTemplate: parsedUrl.pathTemplate,
|
||||
retryCount,
|
||||
}),
|
||||
capture: false,
|
||||
});
|
||||
throw error;
|
||||
}
|
||||
|
||||
const controller = new AbortController();
|
||||
const signal = getFetchSignal(controller, options.signal);
|
||||
let timedOut = false;
|
||||
let timeoutId: ReturnType<typeof setTimeout> | null = null;
|
||||
const timeoutPromise = new Promise<never>((_, reject) => {
|
||||
timeoutId = setTimeout(() => {
|
||||
timedOut = true;
|
||||
controller.abort();
|
||||
reject(new Error("Network request timed out"));
|
||||
}, timeoutMs);
|
||||
});
|
||||
|
||||
Sentry.addBreadcrumb({
|
||||
category: "data_fetch",
|
||||
level: "info",
|
||||
message: "fetch:start",
|
||||
data: { endpoint, method, urlHost: parsedUrl.host, urlPathTemplate: parsedUrl.pathTemplate, timeoutMs, retryCount },
|
||||
});
|
||||
|
||||
const run = async () => {
|
||||
try {
|
||||
const { endpoint: _endpoint, expectedContentType: _expectedContentType, timeoutMs: _timeoutMs, slowMs: _slowMs, rootTab: _rootTab, source: _source, userVisible: _userVisible, preload: _preload, fetchPriority: _fetchPriority, urlPathTemplate: _urlPathTemplate, retryCount: _retryCount, retry: _retry, allowBackground: _allowBackground, signal: _signal, ...requestOptions } = options;
|
||||
const { response, text, contentType } = await Promise.race([
|
||||
(async () => {
|
||||
const response = await fetch(url, {
|
||||
...requestOptions,
|
||||
signal,
|
||||
});
|
||||
const contentType = response.headers.get("content-type") ?? "";
|
||||
const text = await response.text();
|
||||
return { response, text, contentType };
|
||||
})(),
|
||||
timeoutPromise,
|
||||
]);
|
||||
const durationMs = Date.now() - startedAt;
|
||||
const bytes = estimateBytes(text);
|
||||
const context = buildContext({
|
||||
endpoint,
|
||||
status: response.status,
|
||||
ok: response.ok,
|
||||
durationMs,
|
||||
timeoutMs,
|
||||
bytes,
|
||||
contentType,
|
||||
urlHost: parsedUrl.host,
|
||||
urlPathTemplate: parsedUrl.pathTemplate,
|
||||
retryCount,
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const retryable = [502, 503, 504].includes(response.status);
|
||||
const error = new ObservedFetchError("HTTP " + response.status, "http_error", { status: response.status, retryable });
|
||||
reportDataFetchFailure({
|
||||
kind: "http_error",
|
||||
error,
|
||||
tags: { ...baseTags, result: "http_error", status: String(response.status) },
|
||||
context: { ...context, responseHead: truncateResponseHead(text) },
|
||||
});
|
||||
throw error;
|
||||
}
|
||||
|
||||
const slow = durationMs >= slowMs;
|
||||
if (reportSuccess) {
|
||||
reportDataFetchSuccess({
|
||||
tags: { ...baseTags, result: slow ? "slow_success" : "success", status: String(response.status) },
|
||||
context,
|
||||
slow,
|
||||
});
|
||||
}
|
||||
|
||||
return { text, response, durationMs, bytes, contentType, context, slow, statusTag: String(response.status) };
|
||||
} catch (error) {
|
||||
if (error instanceof ObservedFetchError) throw error;
|
||||
const durationMs = Date.now() - startedAt;
|
||||
const isAbort = timedOut || (error as any)?.name === "AbortError";
|
||||
const kind = isAbort ? "timeout" : String((error as any)?.message ?? "").includes("Network request failed") ? "network_error" : "unknown";
|
||||
const retryable = kind === "timeout" || kind === "network_error";
|
||||
const wrapped = new ObservedFetchError(
|
||||
isAbort ? "Network request timed out" : String((error as any)?.message ?? error),
|
||||
kind,
|
||||
isAbort ? { retryable } : { retryable, cause: error }
|
||||
);
|
||||
reportDataFetchFailure({
|
||||
kind,
|
||||
error: wrapped,
|
||||
tags: { ...baseTags, result: kind },
|
||||
context: buildContext({
|
||||
endpoint,
|
||||
durationMs,
|
||||
timeoutMs,
|
||||
urlHost: parsedUrl.host,
|
||||
urlPathTemplate: parsedUrl.pathTemplate,
|
||||
retryCount,
|
||||
}),
|
||||
capture: shouldCaptureRuntimeFailure(),
|
||||
});
|
||||
throw wrapped;
|
||||
} finally {
|
||||
if (timeoutId) clearTimeout(timeoutId);
|
||||
}
|
||||
};
|
||||
|
||||
const spanOptions = {
|
||||
name: "fetch " + endpoint,
|
||||
description: "fetch " + endpoint,
|
||||
op: "http.client",
|
||||
attributes: {
|
||||
"app.area": "data_fetch",
|
||||
"app.endpoint": endpoint,
|
||||
"app.root_tab": rootTab,
|
||||
"http.method": method,
|
||||
"server.address": parsedUrl.host,
|
||||
},
|
||||
};
|
||||
|
||||
if (typeof (Sentry as any).startSpan === "function") {
|
||||
return (Sentry as any).startSpan(spanOptions, run);
|
||||
}
|
||||
|
||||
return run();
|
||||
}
|
||||
|
||||
export async function observedFetchText(url: string, options: ObservedFetchOptions): Promise<string> {
|
||||
const retryCount = options.retryCount ?? 0;
|
||||
try {
|
||||
const result = await observedFetchTextOnce(url, { ...options, retryCount });
|
||||
return result.text;
|
||||
} catch (error) {
|
||||
if (!options.retry || retryCount >= 1 || !shouldRetryNetworkError(error)) {
|
||||
throw error;
|
||||
}
|
||||
if (!canStartFetch(options)) {
|
||||
throw error;
|
||||
}
|
||||
await sleep(750 + Math.random() * 500);
|
||||
return observedFetchText(url, { ...options, retryCount: retryCount + 1 });
|
||||
}
|
||||
}
|
||||
|
||||
export async function observedFetchJson<T>(url: string, options: ObservedFetchOptions): Promise<T> {
|
||||
const endpoint = options.endpoint ?? "unknown";
|
||||
const config = DATA_ENDPOINT_CONFIG[endpoint];
|
||||
const expectedContentType = options.expectedContentType ?? config.expectedContentType;
|
||||
const parsedUrl = safeParseUrl(url, options.urlPathTemplate);
|
||||
const retryCount = options.retryCount ?? 0;
|
||||
const rootTab = getRootTab(options.rootTab);
|
||||
|
||||
try {
|
||||
const result = await observedFetchTextOnce(url, { ...options, retryCount }, false);
|
||||
const trimmed = result.text.trim();
|
||||
const context = buildContext({
|
||||
endpoint,
|
||||
status: result.response.status,
|
||||
ok: result.response.ok,
|
||||
durationMs: result.durationMs,
|
||||
timeoutMs: options.timeoutMs ?? config.timeoutMs,
|
||||
bytes: result.bytes,
|
||||
contentType: result.contentType,
|
||||
urlHost: parsedUrl.host,
|
||||
urlPathTemplate: parsedUrl.pathTemplate,
|
||||
retryCount,
|
||||
});
|
||||
|
||||
if (trimmed.length === 0) {
|
||||
const error = new ObservedFetchError("Empty response", "empty_response", { retryable: false });
|
||||
reportDataFetchFailure({
|
||||
kind: "empty_response",
|
||||
error,
|
||||
tags: { area: "data_fetch", endpoint, result: "empty_response", root_tab: rootTab, platform: Platform.OS, ...getOptionTags(options), status: String(result.response.status) },
|
||||
context,
|
||||
});
|
||||
throw error;
|
||||
}
|
||||
|
||||
if (expectedContentType === "json" && !looksJson(result.contentType, result.text)) {
|
||||
const error = new ObservedFetchError("Non JSON response", "non_json_response", { retryable: false });
|
||||
reportDataFetchFailure({
|
||||
kind: "non_json_response",
|
||||
error,
|
||||
tags: { area: "data_fetch", endpoint, result: "non_json", root_tab: rootTab, platform: Platform.OS, ...getOptionTags(options), status: String(result.response.status) },
|
||||
context: { ...context, responseHead: truncateResponseHead(result.text) },
|
||||
});
|
||||
throw error;
|
||||
}
|
||||
|
||||
try {
|
||||
const parsed = JSON.parse(result.text) as T;
|
||||
reportDataFetchSuccess({
|
||||
tags: {
|
||||
area: "data_fetch",
|
||||
endpoint,
|
||||
result: result.slow ? "slow_success" : "success",
|
||||
root_tab: rootTab,
|
||||
platform: Platform.OS,
|
||||
...getOptionTags(options),
|
||||
status: result.statusTag,
|
||||
},
|
||||
context,
|
||||
slow: result.slow,
|
||||
});
|
||||
return parsed;
|
||||
} catch (error) {
|
||||
const wrapped = new ObservedFetchError("JSON parse error", "json_parse_error", { retryable: false, cause: error });
|
||||
reportDataFetchFailure({
|
||||
kind: "json_parse_error",
|
||||
error: wrapped,
|
||||
tags: { area: "data_fetch", endpoint, result: "parse_error", root_tab: rootTab, platform: Platform.OS, ...getOptionTags(options), status: String(result.response.status) },
|
||||
context: { ...context, responseHead: truncateResponseHead(result.text) },
|
||||
});
|
||||
throw wrapped;
|
||||
}
|
||||
} catch (error) {
|
||||
if (!options.retry || retryCount >= 1 || !shouldRetryNetworkError(error)) {
|
||||
throw error;
|
||||
}
|
||||
if (!canStartFetch(options)) {
|
||||
throw error;
|
||||
}
|
||||
await sleep(750 + Math.random() * 500);
|
||||
return observedFetchJson<T>(url, { ...options, retryCount: retryCount + 1 });
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
import { NetworkFailureKind } from "./types";
|
||||
|
||||
const SLOW_SUCCESS_SAMPLE_RATE = 0;
|
||||
|
||||
export const truncateResponseHead = (value: unknown) =>
|
||||
typeof value === "string" ? value.slice(0, 300) : value;
|
||||
|
||||
export function reportDataFetchSuccess(args: {
|
||||
tags: Record<string, string>;
|
||||
context: Record<string, unknown>;
|
||||
slow: boolean;
|
||||
}) {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "data_fetch",
|
||||
level: args.slow ? "warning" : "info",
|
||||
message: args.slow ? "fetch:slow_success" : "fetch:success",
|
||||
data: args.context,
|
||||
});
|
||||
|
||||
if (args.slow && SLOW_SUCCESS_SAMPLE_RATE > 0 && Math.random() < SLOW_SUCCESS_SAMPLE_RATE) {
|
||||
Sentry.captureMessage("data_fetch.slow_success", {
|
||||
level: "warning",
|
||||
tags: args.tags,
|
||||
contexts: { data_fetch: args.context },
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
export function reportDataFetchFailure(args: {
|
||||
kind: NetworkFailureKind;
|
||||
error: unknown;
|
||||
tags: Record<string, string>;
|
||||
context: Record<string, unknown>;
|
||||
capture?: boolean;
|
||||
}) {
|
||||
Sentry.addBreadcrumb({
|
||||
category: "data_fetch",
|
||||
level: args.kind === "aborted" ? "info" : "error",
|
||||
message: "fetch:" + args.kind,
|
||||
data: args.context,
|
||||
});
|
||||
|
||||
if (args.kind === "aborted" || args.capture === false) return;
|
||||
|
||||
const level = args.kind === "json_parse_error" ? "error" : "warning";
|
||||
const captureError = args.error instanceof Error ? args.error : new Error(String(args.error));
|
||||
|
||||
Sentry.captureException(captureError, {
|
||||
level,
|
||||
tags: args.tags,
|
||||
contexts: {
|
||||
data_fetch: {
|
||||
kind: args.kind,
|
||||
...args.context,
|
||||
},
|
||||
},
|
||||
fingerprint: ["data_fetch", args.kind, args.tags.endpoint ?? "unknown"],
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
export type DataEndpoint =
|
||||
| "positions_current"
|
||||
| "positions_master"
|
||||
| "positions_gas_fallback"
|
||||
| "positions_webview"
|
||||
| "operation_info_flag"
|
||||
| "operation_info_text"
|
||||
| "operation_logs"
|
||||
| "train_operation_data"
|
||||
| "timetable_today"
|
||||
| "positions"
|
||||
| "operation_info"
|
||||
| "train_operation"
|
||||
| "timetable"
|
||||
| "station_info"
|
||||
| "notice"
|
||||
| "app_config"
|
||||
| "unknown";
|
||||
|
||||
export type ExpectedContentType = "json" | "text" | "html" | "any";
|
||||
|
||||
export type DataFetchSource =
|
||||
| "rn_fetch"
|
||||
| "mock_api"
|
||||
| "n8n"
|
||||
| "gas"
|
||||
| "backend_api"
|
||||
| "static_storage"
|
||||
| "webview_fetch";
|
||||
|
||||
export type FetchPriority = "high" | "medium" | "low";
|
||||
|
||||
export type DataFetchResult =
|
||||
| "success"
|
||||
| "slow_success"
|
||||
| "network_error"
|
||||
| "timeout"
|
||||
| "http_error"
|
||||
| "non_json"
|
||||
| "parse_error"
|
||||
| "empty_response"
|
||||
| "aborted"
|
||||
| "unknown";
|
||||
|
||||
export type NetworkFailureKind =
|
||||
| "timeout"
|
||||
| "network_error"
|
||||
| "http_error"
|
||||
| "non_json_response"
|
||||
| "json_parse_error"
|
||||
| "empty_response"
|
||||
| "aborted"
|
||||
| "unknown";
|
||||
|
||||
export type ObservedFetchOptions = Omit<RequestInit, "signal"> & {
|
||||
endpoint: DataEndpoint;
|
||||
expectedContentType?: ExpectedContentType;
|
||||
timeoutMs?: number;
|
||||
slowMs?: number;
|
||||
rootTab?: string;
|
||||
source?: DataFetchSource;
|
||||
userVisible?: boolean;
|
||||
preload?: boolean;
|
||||
fetchPriority?: FetchPriority;
|
||||
urlPathTemplate?: string;
|
||||
retryCount?: number;
|
||||
retry?: boolean;
|
||||
allowBackground?: boolean;
|
||||
signal?: AbortSignal;
|
||||
};
|
||||
@@ -0,0 +1,60 @@
|
||||
import type { OperationLogs } from "@/lib/CommonTypes";
|
||||
import {
|
||||
normalizeIconDisplayMode,
|
||||
type IconDisplayMode,
|
||||
} from "@/lib/iconDisplayMode";
|
||||
|
||||
type OperationIconPair = {
|
||||
forward: string;
|
||||
rear: string;
|
||||
};
|
||||
|
||||
export const resolveOperationIconPair = (
|
||||
operation: Pick<
|
||||
OperationLogs,
|
||||
| "vehicle_img"
|
||||
| "vehicle_img_right"
|
||||
| "vehicle_img_hub"
|
||||
| "vehicle_img_right_hub"
|
||||
>,
|
||||
iconDisplayMode: IconDisplayMode,
|
||||
fallback = "",
|
||||
): OperationIconPair => {
|
||||
if (iconDisplayMode === "hub") {
|
||||
return {
|
||||
forward: operation.vehicle_img_hub || operation.vehicle_img || fallback,
|
||||
rear:
|
||||
operation.vehicle_img_right_hub ||
|
||||
operation.vehicle_img_hub ||
|
||||
operation.vehicle_img_right ||
|
||||
operation.vehicle_img ||
|
||||
fallback,
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
forward: operation.vehicle_img || fallback,
|
||||
rear: operation.vehicle_img_right || operation.vehicle_img || fallback,
|
||||
};
|
||||
};
|
||||
|
||||
export const resolveDirectionalOperationIcon = (
|
||||
operation: Pick<
|
||||
OperationLogs,
|
||||
| "vehicle_img"
|
||||
| "vehicle_img_right"
|
||||
| "vehicle_img_hub"
|
||||
| "vehicle_img_right_hub"
|
||||
>,
|
||||
iconDisplayModeValue: unknown,
|
||||
direction: boolean,
|
||||
fallback = "",
|
||||
): string => {
|
||||
const iconDisplayMode = normalizeIconDisplayMode(iconDisplayModeValue);
|
||||
const { forward, rear } = resolveOperationIconPair(
|
||||
operation,
|
||||
iconDisplayMode,
|
||||
fallback,
|
||||
);
|
||||
return direction ? forward || rear : rear || forward;
|
||||
};
|
||||
@@ -2,9 +2,29 @@ import { createNavigationContainerRef, StackActions } from "@react-navigation/na
|
||||
|
||||
export const rootNavigationRef = createNavigationContainerRef<any>();
|
||||
|
||||
export const lastObservedRootRouteRef: { current: string | null } = { current: null };
|
||||
export const startupExplicitTargetRef: { current: boolean } = { current: false };
|
||||
const startupPendingResolversRef: { current: number } = { current: 2 };
|
||||
|
||||
/** positions タブの Stack.Navigator navigation を登録するグローバルref */
|
||||
export const positionsStackNavRef: { current: any } = { current: null };
|
||||
|
||||
export const positionsLifecycleRef: {
|
||||
current: {
|
||||
isUnstable: boolean;
|
||||
blockTabExit: boolean;
|
||||
resetBeforeLeave: (() => void) | null;
|
||||
deactivateStack: (() => void) | null;
|
||||
};
|
||||
} = {
|
||||
current: {
|
||||
isUnstable: false,
|
||||
blockTabExit: false,
|
||||
resetBeforeLeave: null,
|
||||
deactivateStack: null,
|
||||
},
|
||||
};
|
||||
|
||||
/**
|
||||
* 遷移先タブのネストスタックを一度 popToTop してからナビゲートする。
|
||||
* ウィジェットや外部リンクからの遷移時に、既存の開いている画面を閉じてから目的の画面へ移動するために使用する。
|
||||
@@ -45,3 +65,24 @@ export function stackAwareNavigate(tabName: string, params?: any) {
|
||||
doNavigate();
|
||||
}
|
||||
}
|
||||
|
||||
export function markStartupExplicitTarget() {
|
||||
startupExplicitTargetRef.current = true;
|
||||
}
|
||||
|
||||
export function resolveStartupNavigationSource() {
|
||||
startupPendingResolversRef.current = Math.max(
|
||||
0,
|
||||
startupPendingResolversRef.current - 1
|
||||
);
|
||||
}
|
||||
|
||||
export async function waitForStartupNavigationResolution(timeoutMs = 2000) {
|
||||
const startedAt = Date.now();
|
||||
while (startupPendingResolversRef.current > 0) {
|
||||
if (Date.now() - startedAt >= timeoutMs) {
|
||||
break;
|
||||
}
|
||||
await new Promise((resolve) => setTimeout(resolve, 50));
|
||||
}
|
||||
}
|
||||
|
||||
+9
-1
@@ -28,8 +28,9 @@ const forModalPresentationAndroid = (
|
||||
|
||||
export const optionData = {
|
||||
gestureEnabled: true,
|
||||
...TransitionPresets.ModalPresentationIOS,
|
||||
...(Platform.OS === "ios" ? TransitionPresets.ModalPresentationIOS : {}),
|
||||
...(Platform.OS === "android" && {
|
||||
animationEnabled: false,
|
||||
cardStyleInterpolator: forModalPresentationAndroid,
|
||||
}),
|
||||
cardOverlayEnabled: true,
|
||||
@@ -37,3 +38,10 @@ export const optionData = {
|
||||
headerShown: false,
|
||||
detachPreviousScreen: false,
|
||||
};
|
||||
|
||||
export const pushTransitionOptions =
|
||||
Platform.OS === "ios"
|
||||
? TransitionPresets.SlideFromRightIOS
|
||||
: {
|
||||
animationEnabled: false,
|
||||
};
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
import type { CustomTrainData } from "@/lib/CommonTypes";
|
||||
import {
|
||||
normalizeIconDisplayMode,
|
||||
type IconDisplayMode,
|
||||
} from "@/lib/iconDisplayMode";
|
||||
|
||||
export const resolveTrainDataIcon = (
|
||||
trainData: Pick<CustomTrainData, "train_info_img" | "train_info_img_hub">,
|
||||
iconDisplayMode: IconDisplayMode,
|
||||
fallback = "",
|
||||
): string => {
|
||||
if (iconDisplayMode === "hub") {
|
||||
return trainData.train_info_img_hub || trainData.train_info_img || fallback;
|
||||
}
|
||||
|
||||
return trainData.train_info_img || fallback;
|
||||
};
|
||||
|
||||
export const resolveTrainDataIconFromValue = (
|
||||
trainData: Pick<CustomTrainData, "train_info_img" | "train_info_img_hub">,
|
||||
iconDisplayModeValue: unknown,
|
||||
fallback = "",
|
||||
): string =>
|
||||
resolveTrainDataIcon(
|
||||
trainData,
|
||||
normalizeIconDisplayMode(iconDisplayModeValue),
|
||||
fallback,
|
||||
);
|
||||
@@ -0,0 +1,97 @@
|
||||
import type { CustomTrainData, OperationLogs } from "@/lib/CommonTypes";
|
||||
import type { IconDisplayMode } from "@/lib/iconDisplayMode";
|
||||
import { resolveOperationIconPair } from "@/lib/operationLogIcon";
|
||||
import { resolveTrainDataIcon } from "@/lib/trainDataIcon";
|
||||
|
||||
export type TrainIconEntry = {
|
||||
vehicle_info_img: string;
|
||||
vehicle_info_right_img: string;
|
||||
vehicle_info_url: string;
|
||||
};
|
||||
|
||||
type TrainDataForIcon = Pick<
|
||||
CustomTrainData,
|
||||
"train_info_img" | "train_info_img_hub" | "vehicle_info_url"
|
||||
>;
|
||||
|
||||
const extractOrderNumber = (trainId: string): number => {
|
||||
const parts = trainId.split(",");
|
||||
if (parts.length <= 1) return Infinity;
|
||||
|
||||
const num = parseInt(parts[1].trim(), 10);
|
||||
return isNaN(num) ? Infinity : num;
|
||||
};
|
||||
|
||||
const findMatchingTrainId = (
|
||||
operation: OperationLogs,
|
||||
trainNum: string,
|
||||
): string | null => {
|
||||
const allTrainIds = [
|
||||
...(operation.train_ids || []),
|
||||
...(operation.related_train_ids || []),
|
||||
];
|
||||
|
||||
for (const trainId of allTrainIds) {
|
||||
const prefix = trainId.split(",")[0];
|
||||
if (prefix === trainNum) return trainId;
|
||||
}
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
export const sortOperationsForTrainIcon = (
|
||||
operations: OperationLogs[],
|
||||
trainNum: string,
|
||||
): OperationLogs[] =>
|
||||
[...operations].sort((a, b) => {
|
||||
const aTrainId = findMatchingTrainId(a, trainNum);
|
||||
const bTrainId = findMatchingTrainId(b, trainNum);
|
||||
|
||||
if (!aTrainId || !bTrainId) {
|
||||
return aTrainId ? -1 : bTrainId ? 1 : 0;
|
||||
}
|
||||
|
||||
return extractOrderNumber(aTrainId) - extractOrderNumber(bTrainId);
|
||||
});
|
||||
|
||||
export const resolveTrainIconEntries = ({
|
||||
trainNum,
|
||||
customTrainData,
|
||||
todayOperation,
|
||||
iconDisplayMode,
|
||||
}: {
|
||||
trainNum: string;
|
||||
customTrainData: TrainDataForIcon;
|
||||
todayOperation: OperationLogs[];
|
||||
iconDisplayMode: IconDisplayMode;
|
||||
}): TrainIconEntry[] => {
|
||||
const fallbackIcon = resolveTrainDataIcon(customTrainData, iconDisplayMode);
|
||||
|
||||
if (todayOperation.length > 0) {
|
||||
return sortOperationsForTrainIcon(todayOperation, trainNum)
|
||||
.map((operation) => {
|
||||
const { forward, rear } = resolveOperationIconPair(
|
||||
operation,
|
||||
iconDisplayMode,
|
||||
fallbackIcon,
|
||||
);
|
||||
|
||||
return {
|
||||
vehicle_info_img: forward,
|
||||
vehicle_info_right_img: rear,
|
||||
vehicle_info_url: operation.vehicle_info_url,
|
||||
};
|
||||
})
|
||||
.filter((entry) => entry.vehicle_info_img || entry.vehicle_info_right_img);
|
||||
}
|
||||
|
||||
if (!fallbackIcon) return [];
|
||||
|
||||
return [
|
||||
{
|
||||
vehicle_info_img: fallbackIcon,
|
||||
vehicle_info_right_img: fallbackIcon,
|
||||
vehicle_info_url: customTrainData.vehicle_info_url || "",
|
||||
},
|
||||
];
|
||||
};
|
||||
@@ -1,4 +1,5 @@
|
||||
import dayjs from "dayjs";
|
||||
import { checkDuplicateTrainData } from "@/lib/checkDuplicateTrainData";
|
||||
import { trainDataType, trainPosition } from "@/lib/trainPositionTextArray";
|
||||
import { eachTrainDiagramType, StationProps } from "@/lib/CommonTypes";
|
||||
import betweenData from "@/assets/originData/between";
|
||||
@@ -6,12 +7,15 @@ type trainDataProps = {
|
||||
d: eachTrainDiagramType;
|
||||
currentTrain: trainDataType[];
|
||||
station: StationProps[];
|
||||
stationList: StationProps[][];
|
||||
now?: string | null;
|
||||
};
|
||||
export const trainTimeFiltering: (x: trainDataProps) => boolean = (props) => {
|
||||
const { d, currentTrain, station } = props;
|
||||
const { d, currentTrain, station, stationList, now } = props;
|
||||
const baseTime = 2; // 何時間以内の列車を表示するか
|
||||
if (currentTrain.filter((t) => t.num == d.train).length == 0) {
|
||||
const date = dayjs();
|
||||
const currentTrainMatches = currentTrain.filter((t) => t.num == d.train);
|
||||
if (currentTrainMatches.length == 0) {
|
||||
const date = now ? dayjs(now) : dayjs();
|
||||
const trainTime = date
|
||||
.hour(parseInt(d.time.split(":")[0]))
|
||||
.minute(parseInt(d.time.split(":")[1]));
|
||||
@@ -23,7 +27,10 @@ export const trainTimeFiltering: (x: trainDataProps) => boolean = (props) => {
|
||||
}
|
||||
return false;
|
||||
} else {
|
||||
const Pos = trainPosition(currentTrain.filter((t) => t.num == d.train)[0]);
|
||||
const currentTrainData =
|
||||
checkDuplicateTrainData(currentTrainMatches, stationList) ??
|
||||
currentTrainMatches[0];
|
||||
const Pos = trainPosition(currentTrainData);
|
||||
let nextPos = "";
|
||||
let PrePos = "";
|
||||
//
|
||||
@@ -65,9 +72,9 @@ export const trainTimeFiltering: (x: trainDataProps) => boolean = (props) => {
|
||||
break;
|
||||
}
|
||||
const [h, m] = d.time.split(":");
|
||||
const delayData = currentTrain.filter((t) => t.num == d.train)[0].delay;
|
||||
const delayData = currentTrainData.delay;
|
||||
let delay = delayData === "入線" ? 0 : delayData;
|
||||
const date = dayjs();
|
||||
const date = now ? dayjs(now) : dayjs();
|
||||
const IntH = parseInt(h);
|
||||
const IntM = parseInt(m);
|
||||
const currentHour = date.hour();
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
const WRAPPABLE_TYPE_LENGTH = 4;
|
||||
const MIN_LONG_TRAIN_NAME_LENGTH = 8;
|
||||
|
||||
const countCharacters = (value: string) => Array.from(value).length;
|
||||
|
||||
const normalizeTrainName = (trainName: string) => trainName.replace(/\s+/g, "");
|
||||
|
||||
export const shouldWrapTrainType = (
|
||||
typeName: string,
|
||||
trainName: string,
|
||||
): boolean =>
|
||||
countCharacters(typeName) === WRAPPABLE_TYPE_LENGTH &&
|
||||
countCharacters(normalizeTrainName(trainName)) >= MIN_LONG_TRAIN_NAME_LENGTH;
|
||||
|
||||
export const formatWrappedTrainType = (typeName: string): string => {
|
||||
const chars = Array.from(typeName);
|
||||
|
||||
if (chars.length !== WRAPPABLE_TYPE_LENGTH) {
|
||||
return typeName;
|
||||
}
|
||||
|
||||
return `${chars.slice(0, 2).join("")}\n${chars.slice(2).join("")}`;
|
||||
};
|
||||
+95
-15
@@ -2,6 +2,26 @@ import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { AppState, AppStateStatus } from "react-native";
|
||||
import WebView from "react-native-webview";
|
||||
|
||||
type WebViewRemountReason =
|
||||
| "manual"
|
||||
| "app_background"
|
||||
| "render_process_gone"
|
||||
| "content_process_terminated"
|
||||
| "loading_timeout"
|
||||
| "pong_timeout"
|
||||
| "blank_detected";
|
||||
|
||||
type WebViewRemountData = Record<string, string | number | boolean | null | undefined>;
|
||||
|
||||
type UseWebViewRemountOptions = {
|
||||
pingEnabled?: boolean;
|
||||
backgroundThresholdMs?: number | null;
|
||||
isFocused?: boolean;
|
||||
pauseWatchdogWhenUnfocused?: boolean;
|
||||
ignoreProcessTerminationWhenUnfocused?: boolean;
|
||||
onRemount?: (reason: WebViewRemountReason, data?: WebViewRemountData) => void;
|
||||
};
|
||||
|
||||
/**
|
||||
* WebView のメモリ解放・プロセス終了による白画面を自動復帰させるフック。
|
||||
*
|
||||
@@ -13,25 +33,55 @@ import WebView from "react-native-webview";
|
||||
* pingHandlers を使う場合は onMessage を上書きせず spread すること。
|
||||
* ping による白画面検知を有効にするには pingEnabled: true を渡す。
|
||||
*/
|
||||
export function useWebViewRemount(options?: { pingEnabled?: boolean; backgroundThresholdMs?: number }) {
|
||||
export function useWebViewRemount(options?: UseWebViewRemountOptions) {
|
||||
const pingEnabled = options?.pingEnabled ?? false;
|
||||
const backgroundThresholdMs = options?.backgroundThresholdMs ?? 300_000; // デフォルト5分
|
||||
const backgroundThresholdMs = options?.backgroundThresholdMs ?? null;
|
||||
const isFocused = options?.isFocused ?? true;
|
||||
const pauseWatchdogWhenUnfocused = options?.pauseWatchdogWhenUnfocused ?? false;
|
||||
const ignoreProcessTerminationWhenUnfocused = options?.ignoreProcessTerminationWhenUnfocused ?? false;
|
||||
const onRemount = options?.onRemount;
|
||||
const [remountKey, setRemountKey] = useState(0);
|
||||
const backgroundedAt = useRef<number | null>(null);
|
||||
const webViewRef = useRef<WebView>(null);
|
||||
const ignoredProcessTerminationRef = useRef<WebViewRemountReason | null>(null);
|
||||
const focusedRef = useRef(isFocused);
|
||||
const lastBlurAtRef = useRef<number | null>(null);
|
||||
const processTerminationBlurGraceMs = 1200;
|
||||
|
||||
// ping watchdog 用
|
||||
const lastPongAt = useRef(Date.now());
|
||||
const isLoadingRef = useRef(true);
|
||||
|
||||
const remount = useCallback(() => {
|
||||
const triggerRemount = useCallback((reason: WebViewRemountReason, data?: WebViewRemountData) => {
|
||||
onRemount?.(reason, data);
|
||||
lastPongAt.current = Date.now();
|
||||
isLoadingRef.current = true;
|
||||
setRemountKey((k) => k + 1);
|
||||
}, []);
|
||||
}, [onRemount]);
|
||||
|
||||
const remount = useCallback(() => {
|
||||
triggerRemount("manual");
|
||||
}, [triggerRemount]);
|
||||
|
||||
// バックグラウンドから復帰したら再マウント(デフォルト5分超)
|
||||
useEffect(() => {
|
||||
focusedRef.current = isFocused;
|
||||
if (!isFocused) {
|
||||
lastBlurAtRef.current = Date.now();
|
||||
}
|
||||
}, [isFocused]);
|
||||
|
||||
const shouldIgnoreProcessTermination = useCallback(() => {
|
||||
if (!ignoreProcessTerminationWhenUnfocused) return false;
|
||||
if (!focusedRef.current) return true;
|
||||
if (lastBlurAtRef.current === null) return false;
|
||||
return Date.now() - lastBlurAtRef.current < processTerminationBlurGraceMs;
|
||||
}, [ignoreProcessTerminationWhenUnfocused]);
|
||||
|
||||
// 明示指定がある場合のみ、長時間バックグラウンド復帰で再マウントする。
|
||||
useEffect(() => {
|
||||
if (backgroundThresholdMs === null || backgroundThresholdMs <= 0) {
|
||||
return;
|
||||
}
|
||||
const onAppStateChange = (nextState: AppStateStatus) => {
|
||||
if (nextState.match(/inactive|background/)) {
|
||||
backgroundedAt.current = Date.now();
|
||||
@@ -39,13 +89,13 @@ export function useWebViewRemount(options?: { pingEnabled?: boolean; backgroundT
|
||||
const elapsed = Date.now() - backgroundedAt.current;
|
||||
backgroundedAt.current = null;
|
||||
if (elapsed > backgroundThresholdMs) {
|
||||
remount();
|
||||
triggerRemount("app_background", { elapsedMs: elapsed });
|
||||
}
|
||||
}
|
||||
};
|
||||
const subscription = AppState.addEventListener("change", onAppStateChange);
|
||||
return () => subscription.remove();
|
||||
}, [remount, backgroundThresholdMs]);
|
||||
}, [backgroundThresholdMs, triggerRemount]);
|
||||
|
||||
// ping watchdog: 5秒ごとに生存確認と白画面検知を行う
|
||||
// - ローディング中(isLoadingRef=true)でも45秒超なら remount(レンダラー死亡でonLoadEndが来ないケース)
|
||||
@@ -55,29 +105,53 @@ export function useWebViewRemount(options?: { pingEnabled?: boolean; backgroundT
|
||||
useEffect(() => {
|
||||
if (!pingEnabled) return;
|
||||
const id = setInterval(() => {
|
||||
if (pauseWatchdogWhenUnfocused && !isFocused) {
|
||||
lastPongAt.current = Date.now();
|
||||
return;
|
||||
}
|
||||
const elapsed = Date.now() - lastPongAt.current;
|
||||
if (isLoadingRef.current) {
|
||||
// ローディング中でも45秒超はレンダラー死亡と判定
|
||||
if (elapsed > 45_000) remount();
|
||||
if (elapsed > 45_000) triggerRemount("loading_timeout", { elapsedMs: elapsed });
|
||||
return;
|
||||
}
|
||||
// ロード完了後30秒 pong 無応答 → レンダラー死亡
|
||||
if (elapsed > 30_000) {
|
||||
remount();
|
||||
triggerRemount("pong_timeout", { elapsedMs: elapsed });
|
||||
return;
|
||||
}
|
||||
webViewRef.current?.injectJavaScript(
|
||||
`(function(){var t=document.body?(document.body.innerText||'').replace(/\\s+/g,'').length:0;window.ReactNativeWebView&&window.ReactNativeWebView.postMessage(JSON.stringify({type:'__ping',len:t}));})();true;`
|
||||
`(function(){var t=document.body?(document.body.innerText||'').replace(/\s+/g,'').length:0;window.ReactNativeWebView&&window.ReactNativeWebView.postMessage(JSON.stringify({type:'__ping',len:t}));})();true;`
|
||||
);
|
||||
}, 5_000);
|
||||
return () => clearInterval(id);
|
||||
}, [pingEnabled, remount]);
|
||||
}, [isFocused, pauseWatchdogWhenUnfocused, pingEnabled, triggerRemount]);
|
||||
|
||||
const processHandlers = {
|
||||
onRenderProcessGone: () => remount(),
|
||||
onContentProcessDidTerminate: () => remount(),
|
||||
onRenderProcessGone: (event?: any) => {
|
||||
if (shouldIgnoreProcessTermination()) {
|
||||
ignoredProcessTerminationRef.current = "render_process_gone";
|
||||
lastPongAt.current = Date.now();
|
||||
return;
|
||||
}
|
||||
triggerRemount("render_process_gone", { didCrash: event?.nativeEvent?.didCrash ?? null });
|
||||
},
|
||||
onContentProcessDidTerminate: () => {
|
||||
if (shouldIgnoreProcessTermination()) {
|
||||
ignoredProcessTerminationRef.current = "content_process_terminated";
|
||||
lastPongAt.current = Date.now();
|
||||
return;
|
||||
}
|
||||
triggerRemount("content_process_terminated");
|
||||
},
|
||||
} as const;
|
||||
|
||||
useEffect(() => {
|
||||
if (!isFocused || !ignoredProcessTerminationRef.current) return;
|
||||
ignoredProcessTerminationRef.current = null;
|
||||
lastPongAt.current = Date.now();
|
||||
}, [isFocused]);
|
||||
|
||||
// pingHandlers は onLoadEnd と onMessage を提供する
|
||||
// 既存の onMessage がある場合は手動でマージすること
|
||||
const pingHandlers = pingEnabled ? {
|
||||
@@ -90,7 +164,7 @@ export function useWebViewRemount(options?: { pingEnabled?: boolean; backgroundT
|
||||
setTimeout(() => {
|
||||
if (!isLoadingRef.current) {
|
||||
webViewRef.current?.injectJavaScript(
|
||||
`(function(){var t=document.body?(document.body.innerText||'').replace(/\\s+/g,'').length:0;window.ReactNativeWebView&&window.ReactNativeWebView.postMessage(JSON.stringify({type:'__ping',len:t}));})();true;`
|
||||
`(function(){var t=document.body?(document.body.innerText||'').replace(/\s+/g,'').length:0;window.ReactNativeWebView&&window.ReactNativeWebView.postMessage(JSON.stringify({type:'__ping',len:t}));})();true;`
|
||||
);
|
||||
}
|
||||
}, 3000);
|
||||
@@ -112,9 +186,15 @@ export function useWebViewRemount(options?: { pingEnabled?: boolean; backgroundT
|
||||
if (maxTextLenRef.current > 20 && len < 5) {
|
||||
blankCountRef.current += 1;
|
||||
if (blankCountRef.current >= 3) {
|
||||
const blankCount = blankCountRef.current;
|
||||
const maxTextLength = maxTextLenRef.current;
|
||||
blankCountRef.current = 0;
|
||||
maxTextLenRef.current = 0;
|
||||
remount();
|
||||
triggerRemount("blank_detected", {
|
||||
blankCount,
|
||||
textLength: len,
|
||||
maxTextLength,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
blankCountRef.current = 0;
|
||||
|
||||
+100
-51
@@ -3,6 +3,11 @@ import { TRAIN_TYPE_CONFIG } from './webview/trainTypeConfig';
|
||||
import { TRAIN_ICON_MAP, TRAIN_ICON_REGEX } from './webview/trainIconMap';
|
||||
import { STATION_DATA } from './webview/stationData';
|
||||
import { generateXhrInterceptorJs, MockApiConfig } from './mockApi/webviewXhrInterceptor';
|
||||
import {
|
||||
isHubIconDisplayMode,
|
||||
normalizeIconDisplayMode,
|
||||
usesCustomTrainIcons,
|
||||
} from './iconDisplayMode';
|
||||
import dosan from '@/assets/originData/dosan';
|
||||
import dosan2 from '@/assets/originData/dosan2';
|
||||
import koutoku from '@/assets/originData/koutoku';
|
||||
@@ -16,7 +21,7 @@ import yosan from '@/assets/originData/yosan';
|
||||
export interface InjectJavascriptOptions {
|
||||
/** 地図スイッチ ("true" | "false") */
|
||||
mapSwitch: string;
|
||||
/** 列車アイコン表示スイッチ ("true" | "false") */
|
||||
/** 列車アイコン表示モード ("default" | "original" | "hub") */
|
||||
iconSetting: string;
|
||||
/** 駅メニュースイッチ ("true" | "false") */
|
||||
stationMenu: string;
|
||||
@@ -63,6 +68,9 @@ export const injectJavascriptData = ({
|
||||
diagramTodayUrl,
|
||||
mockApiConfig,
|
||||
}: InjectJavascriptOptions): string => {
|
||||
const iconDisplayMode = normalizeIconDisplayMode(iconSetting);
|
||||
const preferHubTrainIcon = isHubIconDisplayMode(iconDisplayMode);
|
||||
const useVehicleIcons = usesCustomTrainIcons(iconDisplayMode);
|
||||
const MARINE_STATION_SEQUENCE = [
|
||||
"岡山", "大元", "備前西市", "妹尾", "早島", "茶屋町", "植松", "木見", "上の町",
|
||||
"児島", "坂出", "鴨川", "国分", "端岡", "鬼無", "高松",
|
||||
@@ -142,6 +150,8 @@ export const injectJavascriptData = ({
|
||||
const s = document.createElement('style');
|
||||
s.textContent = '@keyframes _jrs_blink{0%,55%{opacity:1}70%,90%{opacity:0}100%{opacity:1}}' +
|
||||
'@keyframes _jrs_glow{0%,55%{box-shadow:0 0 12px 3px rgba(255,0,0,0.9)}70%,90%{box-shadow:0 0 6px 2px rgba(255,0,0,0.45)}100%{box-shadow:0 0 12px 3px rgba(255,0,0,0.9)}}'
|
||||
+ '@keyframes _jrs_type_primary{0%,49.999%{opacity:1}50%,100%{opacity:0}}'
|
||||
+ '@keyframes _jrs_type_secondary{0%,49.999%{opacity:0}50%,99.999%{opacity:1}100%{opacity:0}}'
|
||||
+ (_isDark ? (
|
||||
'html,body{background-color:#3a3f47!important;}'
|
||||
+ '#main{background-color:#3a3f47!important;}'
|
||||
@@ -182,6 +192,7 @@ export const injectJavascriptData = ({
|
||||
// データ変数の宣言
|
||||
let stationList = {};
|
||||
let trainDataList = [];
|
||||
let trainDataListReady = false;
|
||||
let operationList = [];
|
||||
let trainDiagramData2 = {};
|
||||
let probremsData = [];
|
||||
@@ -190,7 +201,7 @@ export const injectJavascriptData = ({
|
||||
let elesiteData = [];
|
||||
const useEleSiteSetting = ${useElesite === "true"};
|
||||
|
||||
// 列車種別設定 (typeColor / borderColor / bgColor / label / isWanman)
|
||||
// 列車種別設定 (typeColor / borderColor / bgColor / label)
|
||||
const TRAIN_TYPE_CFG = ${JSON.stringify(TRAIN_TYPE_CONFIG)};
|
||||
|
||||
// operationList から列番が一致する運行情報を返すヘルパー
|
||||
@@ -249,11 +260,13 @@ export const injectJavascriptData = ({
|
||||
const DatalistUpdate = () => {
|
||||
fetch("${API_ENDPOINTS.TRAIN_DATA_API}").then(r => r.json())
|
||||
.then(data => {
|
||||
if (hasChanged('trainDataList', data.data)) {
|
||||
trainDataList = data.data;
|
||||
_wcache.set('trainDataList', trainDataList);
|
||||
setReload();
|
||||
}
|
||||
const nextTrainDataList = Array.isArray(data?.data) ? data.data : null;
|
||||
if (!nextTrainDataList) return;
|
||||
trainDataListReady = true;
|
||||
if (!hasChanged('trainDataList', nextTrainDataList)) return;
|
||||
trainDataList = nextTrainDataList;
|
||||
_wcache.set('trainDataList', trainDataList);
|
||||
setReload();
|
||||
})
|
||||
.catch(() => {})
|
||||
.finally(() => { setTimeout(DatalistUpdate, ${INTERVALS.DELAY_UPDATE}); });
|
||||
@@ -352,8 +365,12 @@ export const injectJavascriptData = ({
|
||||
Object.keys(_hashes).forEach(k => { _hashes[k] = null; });
|
||||
Promise.allSettled([
|
||||
fetch("${API_ENDPOINTS.TRAIN_DATA_API}").then(r => r.json()).then(data => {
|
||||
trainDataList = data.data ?? trainDataList;
|
||||
_hashes['trainDataList'] = JSON.stringify(trainDataList);
|
||||
if (Array.isArray(data?.data)) {
|
||||
trainDataList = data.data;
|
||||
trainDataListReady = true;
|
||||
_hashes['trainDataList'] = JSON.stringify(trainDataList);
|
||||
_wcache.set('trainDataList', trainDataList);
|
||||
}
|
||||
}).catch(() => {}),
|
||||
fetch("${API_ENDPOINTS.OPERATION_LOGS}").then(r => r.json()).then(data => {
|
||||
const source = Array.isArray(data?.data) ? data.data : [];
|
||||
@@ -396,6 +413,7 @@ export const injectJavascriptData = ({
|
||||
if (_c0.operationList) { operationList = _c0.operationList; _hashes['operationList'] = JSON.stringify(_c0.operationList); anyHit = true; }
|
||||
if (_c0.probremsData) { probremsData = _c0.probremsData; _hashes['probremsData'] = JSON.stringify(_c0.probremsData); anyHit = true; }
|
||||
if (_c0.trainDataList) { trainDataList = _c0.trainDataList; _hashes['trainDataList'] = JSON.stringify(_c0.trainDataList); anyHit = true; }
|
||||
if (_c0.trainDataList) trainDataListReady = true;
|
||||
if (_c0.trainDiagramData2) { trainDiagramData2 = _c0.trainDiagramData2; _hashes['trainDiagramData2'] = JSON.stringify(_c0.trainDiagramData2); anyHit = true; }
|
||||
if (_c0.unyohubData) { unyohubData = _c0.unyohubData; anyHit = true; }
|
||||
if (_c0.elesiteData) { elesiteData = _c0.elesiteData; anyHit = true; }
|
||||
@@ -433,7 +451,9 @@ export const injectJavascriptData = ({
|
||||
// TRAIN_DATA_API: 0.84s/1MB, DIAGRAM_TODAY: 0.27s/522KB
|
||||
Promise.allSettled([
|
||||
fetch("${API_ENDPOINTS.TRAIN_DATA_API}").then(r => r.json()).then(data => {
|
||||
trainDataList = data.data ?? [];
|
||||
if (!Array.isArray(data?.data)) return;
|
||||
trainDataList = data.data;
|
||||
trainDataListReady = true;
|
||||
_hashes['trainDataList'] = JSON.stringify(trainDataList);
|
||||
_wcache.set('trainDataList', trainDataList);
|
||||
}).catch(() => {}),
|
||||
@@ -626,17 +646,28 @@ export const injectJavascriptData = ({
|
||||
`;
|
||||
// 左か右かを判定してアイコンを設置する
|
||||
const trainIcon = `
|
||||
const _preferHubTrainIcon = ${preferHubTrainIcon};
|
||||
const setStationIcon = (setIconElem,img,hasProblem,backCount = 100) =>{
|
||||
const position = setIconElem.getAttribute("style").includes("left");
|
||||
const isHubDataset = _preferHubTrainIcon && typeof img === "string" && img.includes("unyohub-icon-dataset/");
|
||||
let marginData = ${uiSetting === "tokyo" ? `"5px"`: `"2px"`};
|
||||
let backgroundColor = "transparent";
|
||||
let heightData = "22px";
|
||||
let widthData = isHubDataset ? "18px" : "auto";
|
||||
let transformData = isHubDataset ? "scale(1.15)" : "none";
|
||||
let filterData = isHubDataset
|
||||
? "drop-shadow(0 0 0.8px rgba(255,255,255,0.75)) drop-shadow(0 1px 1px rgba(0,0,0,0.38)) drop-shadow(0 1px 1.5px rgba(0,0,0,0.18))"
|
||||
: "drop-shadow(0 1px 1.5px rgba(0,0,0,0.35))";
|
||||
if(backCount == 0){
|
||||
marginData = position ? ${uiSetting === "tokyo" ? `"0px 0px -10px 0px" : "-10px 0px 0px 0px"`: `"0px 2px 0px 0px" : "0px 2px 0px 0px"`};
|
||||
heightData = "16px";
|
||||
widthData = isHubDataset ? "13px" : "auto";
|
||||
if (isHubDataset) {
|
||||
filterData = "drop-shadow(0 0 0.6px rgba(255,255,255,0.7)) drop-shadow(0 1px 0.8px rgba(0,0,0,0.36)) drop-shadow(0 1px 1.2px rgba(0,0,0,0.16))";
|
||||
}
|
||||
}
|
||||
|
||||
setIconElem.insertAdjacentHTML('beforebegin', "<img src="+img+" style='float:"+(position ? 'left' : 'right')+";height:"+heightData+";margin: "+marginData+";background-color: "+backgroundColor+";'>");
|
||||
setIconElem.insertAdjacentHTML('beforebegin', "<img src="+img+" style='float:"+(position ? 'left' : 'right')+";height:"+heightData+";width:"+widthData+";object-fit:contain;transform:"+transformData+";transform-origin:center center;filter:"+filterData+";margin: "+marginData+";background-color: "+backgroundColor+";'>");
|
||||
if (backCount == 0 || backCount == 100) setIconElem.remove();
|
||||
}
|
||||
|
||||
@@ -650,14 +681,24 @@ export const injectJavascriptData = ({
|
||||
if (new RegExp(pattern).test(列番データ)) return url;
|
||||
}
|
||||
};
|
||||
|
||||
const pickOperationTrainIcon = (operation, direction) => {
|
||||
const forward = _preferHubTrainIcon
|
||||
? (operation.vehicle_img_hub || operation.vehicle_img)
|
||||
: operation.vehicle_img;
|
||||
const rear = _preferHubTrainIcon
|
||||
? (operation.vehicle_img_right_hub || operation.vehicle_img_hub || operation.vehicle_img_right || operation.vehicle_img)
|
||||
: (operation.vehicle_img_right || operation.vehicle_img);
|
||||
return direction ? (forward || rear) : (rear || forward);
|
||||
};
|
||||
`;
|
||||
|
||||
const normal_train_name = `
|
||||
const nameReplace = (列車名データ,列番データ,行き先情報,hasProblem,isLeft) =>{
|
||||
let isWanman = false;
|
||||
let trainName = "";
|
||||
let trainType = "";
|
||||
let trainTypeColor = "black";
|
||||
let resolvedType = "";
|
||||
let viaData = "";
|
||||
let ToData = "";
|
||||
let TrainNumber = 列番データ;
|
||||
@@ -665,6 +706,21 @@ export const injectJavascriptData = ({
|
||||
let isSeason = false;
|
||||
let TrainNumberOverride;
|
||||
let optionalText = "";
|
||||
const registeredTrainData = trainDataList.find(e => String(e.train_id) === String(列番データ));
|
||||
|
||||
// 列車マスタに未登録でも在線カード自体は残す。
|
||||
// 推測した種別・行先等は表示せず、列番と車両アイコンだけの最小表示にする。
|
||||
if(trainDataListReady && !registeredTrainData){
|
||||
行き先情報.innerText = "";
|
||||
${uiSetting === "tokyo" ? `
|
||||
行き先情報.insertAdjacentHTML('beforebegin', "<div data-jrs-train-data='unavailable' style='width:100%;display:flex;flex:1;flex-direction:" + (isLeft ? "column-reverse" : "column") + ";font-weight:bold;-webkit-text-size-adjust:100%;text-size-adjust:100%;'><p style='font-size:6px;padding:0;color:black;text-align:center;'>" + 列番データ + "</p><div style='flex:1;'></div><p style='font-size:8px;font-weight:bold;padding:0;text-align:center;color:" + (hasProblem ? "red" : "black") + ";" + (hasProblem ? "animation:_jrs_blink 3s linear infinite;" : "") + "'>" + (hasProblem ? "‼️停止中‼️" : "") + "</p></div>");
|
||||
` : `
|
||||
var _missingTextColor = _isDark ? 'white' : 'black';
|
||||
行き先情報.insertAdjacentHTML('beforebegin', "<p data-jrs-train-data='unavailable' style='font-size:10px;padding:0;color:" + _missingTextColor + ";'>" + 列番データ + "</p>");
|
||||
`}
|
||||
行き先情報.remove();
|
||||
return;
|
||||
}
|
||||
try{
|
||||
const diagram = trainDiagramData2[列番データ] || trainTimeInfo[列番データ];
|
||||
if(diagram){
|
||||
@@ -682,9 +738,6 @@ export const injectJavascriptData = ({
|
||||
trainName = textBase;
|
||||
}
|
||||
|
||||
if(new RegExp(/^4[1-9]\\d\\d[DM]$/).test(列番データ) || new RegExp(/^5[1-7]\\d\\d[DM]$/).test(列番データ) || new RegExp(/^3[2-9]\\d\\d[DM]$/).test(TrainNumber) ){
|
||||
isWanman = true;
|
||||
}
|
||||
if(new RegExp(/^49[0-4]\\dD$/).test(列番データ) || new RegExp(/^9[0-4]\\dD$/).test(列番データ)){
|
||||
viaData = "(海経由)";
|
||||
}
|
||||
@@ -706,7 +759,6 @@ export const injectJavascriptData = ({
|
||||
case "4430D":
|
||||
case "4472D":
|
||||
viaData = "牟岐線直通";
|
||||
isWanman = true;
|
||||
ToData = "牟岐";
|
||||
break;
|
||||
case "434D":
|
||||
@@ -720,12 +772,10 @@ export const injectJavascriptData = ({
|
||||
case "4466D":
|
||||
case "4470D":
|
||||
viaData = "牟岐線直通";
|
||||
isWanman = true;
|
||||
ToData = "阿南";
|
||||
break;
|
||||
case "4456D":
|
||||
viaData = "牟岐線直通";
|
||||
isWanman = true;
|
||||
ToData = "阿波海南"
|
||||
break;
|
||||
//鳴門線発牟岐線行き
|
||||
@@ -745,7 +795,6 @@ export const injectJavascriptData = ({
|
||||
case "4350D":
|
||||
case "4368D":
|
||||
viaData = "高徳線直通";
|
||||
isWanman = true;
|
||||
break;
|
||||
|
||||
//牟岐線発徳島線行き
|
||||
@@ -759,7 +808,6 @@ export const injectJavascriptData = ({
|
||||
case "5471D":
|
||||
case "5479D":
|
||||
viaData = "徳島線直通";
|
||||
isWanman = true;
|
||||
break;
|
||||
//牟岐線発鳴門線行き
|
||||
|
||||
@@ -769,7 +817,6 @@ export const injectJavascriptData = ({
|
||||
case "4954D":
|
||||
case "4978D":
|
||||
viaData = "鳴門線直通";
|
||||
isWanman = true;
|
||||
break;
|
||||
|
||||
//安芸行と併結列車を個別に表示、それ以外をdefaultで下りなら既定の行き先を、上りなら奈半利行を設定
|
||||
@@ -816,11 +863,11 @@ export const injectJavascriptData = ({
|
||||
getThrew(列番データ);
|
||||
if(trainDataList.find(e => e.train_id === 列番データ) !== undefined){
|
||||
const data = trainDataList.find(e => e.train_id === 列番データ);
|
||||
resolvedType = data.type;
|
||||
|
||||
const _tCfg = TRAIN_TYPE_CFG[data.type];
|
||||
if (_tCfg) {
|
||||
trainTypeColor = _tCfg.typeColor;
|
||||
isWanman = _tCfg.isWanman;
|
||||
trainType = _tCfg.label;
|
||||
}
|
||||
isEdit = data.priority == 400;
|
||||
@@ -845,8 +892,9 @@ export const injectJavascriptData = ({
|
||||
optionalText = data.optional_text;
|
||||
}
|
||||
}
|
||||
const isOneManType = resolvedType === "OneMan" || resolvedType === "OneManRapid";
|
||||
//列番付与
|
||||
const returnText1 = (isWanman ? "ワンマン " : "") + trainName + viaData;
|
||||
const returnText1 = trainName + viaData;
|
||||
行き先情報.innerText = "";
|
||||
${uiSetting === "tokyo" ? `
|
||||
let stationIDs = [];
|
||||
@@ -921,6 +969,18 @@ export const injectJavascriptData = ({
|
||||
}
|
||||
|
||||
const optionalTextColor = optionalText.includes("最終") ? "red" : "black";
|
||||
const hasViaData = !!viaData && viaData.trim() !== "";
|
||||
const hasOptionalText = !!optionalText && optionalText.trim() !== "";
|
||||
const hasTrainName = !!trainName && trainName.trim() !== "";
|
||||
const hasToData = !!ToData && ToData.trim() !== "";
|
||||
const trainTypeTextStyle = "font-size:10px;font-weight:bold;font-style:italic;padding:0;margin:0;color:#ffffff;text-align:center;line-height:1;";
|
||||
const trainTypeFrameStyle = "position:relative;height:10px;width:100%;overflow:hidden;display:flex;align-items:center;justify-content:center;";
|
||||
const trainTypeMainStyle = trainTypeTextStyle + "display:flex;align-items:center;justify-content:center;width:100%;height:100%;";
|
||||
const trainTypeWanmanStyle = trainTypeMainStyle.replace("font-size:10px;", "font-size:9px;");
|
||||
const trainTypeHtml = isOneManType
|
||||
? "<div style='" + trainTypeFrameStyle + "'><p style='" + trainTypeMainStyle + "position:absolute;inset:0;animation:_jrs_type_primary 4s linear infinite;'>" + trainType + "</p><p style='" + trainTypeWanmanStyle + "position:absolute;inset:0;animation:_jrs_type_secondary 4s linear infinite;opacity:0;'>ワンマン</p></div>"
|
||||
: "<div style='" + trainTypeFrameStyle + "'><p style='" + trainTypeMainStyle + "'>" + trainType + "</p></div>";
|
||||
const trainTypeContainerPadding = isLeft ? "1px 0 2px 0" : "2px 0 1px 0";
|
||||
const unyohubLookupNum = TrainNumberOverride || 列番データ;
|
||||
const unyohubFormation = getUnyohubFormation(unyohubLookupNum);
|
||||
const hasUnyohub = unyohubFormation !== null;
|
||||
@@ -966,12 +1026,17 @@ export const injectJavascriptData = ({
|
||||
badgeHtml += "<div style='position:absolute;" + badgePosition + ":0;" + offsetStyle + "background-color:#44bb44;border-radius:50%;border:1px solid #228822;width:19px;height:19px;box-sizing:border-box;overflow:hidden;display:flex;align-items:center;justify-content:center;'><img src='https://storage.haruk.in/elesite_logo.jpg' style='width:19px;height:19px;'/></div>";
|
||||
}
|
||||
|
||||
行き先情報.insertAdjacentHTML('beforebegin', "<div style='width:100%;display:flex;flex:1;flex-direction:"+(isLeft ? "column-reverse" : "column") + ";font-weight:bold;'>" + badgeHtml + "<p style='font-size:6px;padding:0;color:black;text-align:center;'>" + (TrainNumberOverride ? TrainNumberOverride : TrainNumber) + "</p><div style='flex:1;'></div><p style='font-size:8px;font-weight:bold;padding:0;color:black;text-align:center;'>" + (isWanman ? "ワンマン " : "") + "</p><p style='font-size:6px;font-weight:bold;padding:0;color:black;text-align:center;border-style:solid;border-width: "+(!!yosan2Color ? "2px" : "0px")+";border-color:" + yosan2Color + "'>" + viaData + "</p><p style='font-size:8px;font-weight:bold;padding:0;color: " + optionalTextColor + ";text-align:center;'>" + optionalText + "</p><p style='font-size:8px;font-weight:bold;padding:0;color:black;text-align:center;'>" + trainName + "</p><div style='width:100%;background:" + gradient + ";'><p style='font-size:10px;font-weight:bold;padding:0;margin:0;color:white;align-items:center;align-content:center;text-align:center;text-shadow:1px 1px 0px #00000030, -1px -1px 0px #00000030,-1px 1px 0px #00000030, 1px -1px 0px #00000030,1px 0px 0px #00000030, -1px 0px 0px #00000030,0px 1px 0px #00000030, 0px -1px 0px #00000030;'>" + (ToData ? ToData + "行" : ToData) + "</p></div><div style='width:100%;background:" + trainTypeColor + ";border-radius:"+(isLeft ? "4px 4px 0 0" : "0 0 4px 4px")+";'><p style='font-size:10px;font-weight:bold;font-style:italic;padding:0;color: white;text-align:center;'>" + trainType + "</p></div><p style='font-size:8px;font-weight:bold;padding:0;text-align:center;color: "+(hasProblem ? "red": "black")+"; "+(hasProblem ? "animation:_jrs_blink 3s linear infinite;" : "")+"'>" + (hasProblem ? "‼️停止中‼️" : "") + "</p></div>");
|
||||
const viaDataHtml = hasViaData ? "<p style='font-size:6px;font-weight:bold;padding:0;margin:0;color:black;text-align:center;border-style:solid;border-width: " + (!!yosan2Color ? "2px" : "0px") + ";border-color:" + yosan2Color + "'>" + viaData + "</p>" : "";
|
||||
const optionalTextHtml = hasOptionalText ? "<p style='font-size:8px;font-weight:bold;padding:0;margin:0;color: " + optionalTextColor + ";text-align:center;'>" + optionalText + "</p>" : "";
|
||||
const trainNameHtml = hasTrainName ? "<p style='font-size:8px;font-weight:bold;padding:0;margin:0;color:black;text-align:center;'>" + trainName + "</p>" : "";
|
||||
const toDataHtml = hasToData ? "<div style='width:100%;min-height:13px;height:auto;box-sizing:border-box;display:flex;align-items:center;justify-content:center;background:" + gradient + ";padding:1px 0;overflow:visible;'><p style='font-size:10px;font-weight:bold;padding:0;margin:0;color:white;line-height:1.1;text-align:center;text-shadow:1px 1px 0px #00000030, -1px -1px 0px #00000030,-1px 1px 0px #00000030, 1px -1px 0px #00000030,1px 0px 0px #00000030, -1px 0px 0px #00000030,0px 1px 0px #00000030, 0px -1px 0px #00000030;'>" + ToData + "行</p></div>" : "";
|
||||
const problemHtml = hasProblem ? "<p style='font-size:8px;font-weight:bold;padding:0;margin:0;text-align:center;color:red;animation:_jrs_blink 3s linear infinite;'>‼️停止中‼️</p>" : "";
|
||||
行き先情報.insertAdjacentHTML('beforebegin', "<div style='width:100%;display:flex;flex:1;flex-direction:"+(isLeft ? "column-reverse" : "column") + ";font-weight:bold;-webkit-text-size-adjust:100%;text-size-adjust:100%;'>" + badgeHtml + "<p style='font-size:6px;padding:0;margin:0;color:black;text-align:center;'>" + (TrainNumberOverride ? TrainNumberOverride : TrainNumber) + "</p><div style='flex:1;'></div>" + viaDataHtml + optionalTextHtml + trainNameHtml + toDataHtml + "<div style='width:100%;height:13px;box-sizing:border-box;background:" + trainTypeColor + ";border-radius:"+(isLeft ? "4px 4px 0 0" : "0 0 4px 4px")+";display:flex;align-items:center;justify-content:center;padding:" + trainTypeContainerPadding + ";margin:0;overflow:hidden;'>" + trainTypeHtml + "</div>" + problemHtml + "</div>");
|
||||
`: `
|
||||
var _defTextColor = _isDark ? 'white' : 'black';
|
||||
行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:10px;font-weight:bold;padding:0;color:" + _defTextColor + ";'>" + returnText1 + "</p>");
|
||||
行き先情報.insertAdjacentHTML('beforebegin', "<div style='display:inline-flex;flex-direction:row;'><p style='font-size:10px;font-weight: bold;padding:0;color:" + _defTextColor + ";'>" + (ToData ? ToData + "行 " : ToData) + "</p><p style='font-size:10px;padding:0;color:" + _defTextColor + ";'>" + (TrainNumberOverride ? TrainNumberOverride : TrainNumber) + "</p></div>");
|
||||
行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:10px;font-weight:bold;padding:0;color: "+(hasProblem ? "red": _defTextColor)+"; "+(hasProblem ? "animation:_jrs_blink 3s linear infinite;" : "")+"'>" + (hasProblem ? "‼️停止中‼️" : "") + "</p>");
|
||||
if(returnText1){ 行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:10px;font-weight:bold;padding:0;margin:0;color:" + _defTextColor + ";'>" + returnText1 + "</p>"); }
|
||||
行き先情報.insertAdjacentHTML('beforebegin', "<div style='display:inline-flex;flex-direction:row;'><p style='font-size:10px;font-weight: bold;padding:0;margin:0;color:" + _defTextColor + ";'>" + (ToData ? ToData + "行 " : "") + "</p><p style='font-size:10px;padding:0;margin:0;color:" + _defTextColor + ";'>" + (TrainNumberOverride ? TrainNumberOverride : TrainNumber) + "</p></div>");
|
||||
if(hasProblem){ 行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:10px;font-weight:bold;padding:0;margin:0;color:red;animation:_jrs_blink 3s linear infinite;'>‼️停止中‼️</p>"); }
|
||||
`}
|
||||
}
|
||||
`;
|
||||
@@ -991,13 +1056,7 @@ const setNewTrainItem = (element,hasProblem,type)=>{
|
||||
element.style.backgroundColor = _bgc;
|
||||
}else{
|
||||
element.style.backgroundColor = '#ffffffff';
|
||||
if(element.getAttribute('offclick').includes("express")){
|
||||
element.style.borderColor = '#ff0000ff';
|
||||
}else if(element.getAttribute('offclick').includes("rapid")){
|
||||
element.style.borderColor = '#008cffff';
|
||||
}else{
|
||||
element.style.borderColor = _isDark ? '#30363d' : 'black';
|
||||
}
|
||||
element.style.borderColor = _isDark ? '#30363d' : 'black';
|
||||
}
|
||||
element.style.borderWidth = _isDark ? '1px' : '2px';
|
||||
element.style.borderStyle = 'solid';
|
||||
@@ -1159,7 +1218,7 @@ const setStrings = () =>{
|
||||
var TrainType = undefined;
|
||||
setTrainMenuDialog(element)
|
||||
|
||||
${iconSetting == "true" ? `
|
||||
${useVehicleIcons ? `
|
||||
let trainIconUrl = [];
|
||||
operationList
|
||||
.sort((a,b)=>sortOperationalList(a,b,列番データ.toString()))
|
||||
@@ -1173,14 +1232,8 @@ const setStrings = () =>{
|
||||
if(directions != null && directions != undefined){
|
||||
iconTrainDirection = directions ? true : false;
|
||||
}
|
||||
if(iconTrainDirection){
|
||||
if(e.vehicle_img) trainIconUrl.push(e.vehicle_img);
|
||||
else if(e.vehicle_img_right) trainIconUrl.push(e.vehicle_img_right);
|
||||
}else{
|
||||
if(e.vehicle_img_right) trainIconUrl.push(e.vehicle_img_right);
|
||||
else if(e.vehicle_img) trainIconUrl.push(e.vehicle_img);
|
||||
}
|
||||
|
||||
const iconUrl = pickOperationTrainIcon(e, iconTrainDirection);
|
||||
if(iconUrl) trainIconUrl.push(iconUrl);
|
||||
}
|
||||
} else if (e.related_train_ids?.length > 0) {
|
||||
const trainIds = e.related_train_ids.map(
|
||||
@@ -1192,13 +1245,8 @@ const setStrings = () =>{
|
||||
if(directions != null && directions != undefined){
|
||||
iconTrainDirection = directions ? true : false;
|
||||
}
|
||||
if(iconTrainDirection){
|
||||
if(e.vehicle_img) trainIconUrl.push(e.vehicle_img);
|
||||
else if(e.vehicle_img_right) trainIconUrl.push(e.vehicle_img_right);
|
||||
}else{
|
||||
if(e.vehicle_img_right) trainIconUrl.push(e.vehicle_img_right);
|
||||
else if(e.vehicle_img) trainIconUrl.push(e.vehicle_img);
|
||||
}
|
||||
const iconUrl = pickOperationTrainIcon(e, iconTrainDirection);
|
||||
if(iconUrl) trainIconUrl.push(iconUrl);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1212,7 +1260,8 @@ const setStrings = () =>{
|
||||
}
|
||||
else{
|
||||
if(trainDataList.find(e => e.train_id === 列番データ) !== undefined){
|
||||
const trainIconUrl = [trainDataList.find(e => e.train_id === 列番データ).train_info_img];
|
||||
const trainData = trainDataList.find(e => e.train_id === 列番データ);
|
||||
const trainIconUrl = [_preferHubTrainIcon ? (trainData.train_info_img_hub || trainData.train_info_img) : trainData.train_info_img];
|
||||
if(trainIconUrl.length > 0){
|
||||
trainIconUrl.forEach((url,index,array) => {
|
||||
if(url && url != ""){
|
||||
|
||||
@@ -5,31 +5,29 @@
|
||||
* - borderColor: setNewTrainItem で使う枠線色
|
||||
* - bgColor : setNewTrainItem で使う背景色
|
||||
* - label : 種別ラベル文字列
|
||||
* - isWanman : ワンマン列車かどうか
|
||||
*/
|
||||
export interface TrainTypeConfig {
|
||||
label: string;
|
||||
typeColor: string;
|
||||
borderColor: string;
|
||||
bgColor: string;
|
||||
isWanman: boolean;
|
||||
}
|
||||
|
||||
export const TRAIN_TYPE_CONFIG: Record<string, TrainTypeConfig> = {
|
||||
Normal: { label: "普通", typeColor: "black", borderColor: "black", bgColor: "#ffffffcc", isWanman: false },
|
||||
OneMan: { label: "普通", typeColor: "black", borderColor: "black", bgColor: "#ffffffcc", isWanman: true },
|
||||
Rapid: { label: "快速", typeColor: "rgba(0, 140, 255, 1)", borderColor: "rgba(0, 140, 255, 1)", bgColor: "#ffffffcc", isWanman: false },
|
||||
OneManRapid: { label: "快速", typeColor: "rgba(0, 140, 255, 1)", borderColor: "rgba(0, 140, 255, 1)", bgColor: "#ffffffcc", isWanman: true },
|
||||
LTDEXP: { label: "特急", typeColor: "red", borderColor: "red", bgColor: "#ffffffcc", isWanman: false },
|
||||
NightLTDEXP: { label: "寝台特急", typeColor: "#d300b0ff", borderColor: "#d300b0ff", bgColor: "#ffffffcc", isWanman: false },
|
||||
SPCL: { label: "臨時", typeColor: "#008d07ff", borderColor: "#008d07ff", bgColor: "#ffffffcc", isWanman: false },
|
||||
SPCL_Normal: { label: "臨時", typeColor: "#008d07ff", borderColor: "#008d07ff", bgColor: "#ffffffcc", isWanman: false },
|
||||
SPCL_Rapid: { label: "臨時快速", typeColor: "rgba(0, 81, 255, 1)", borderColor: "#0051ffff", bgColor: "#ffffffcc", isWanman: false },
|
||||
SPCL_EXP: { label: "臨時特急", typeColor: "#a52e2eff", borderColor: "#a52e2eff", bgColor: "#ffffffcc", isWanman: false },
|
||||
Party: { label: "団体臨時", typeColor: "#ff7300ff", borderColor: "#ff7300ff", bgColor: "#ffd0a9ff", isWanman: false },
|
||||
Freight: { label: "貨物", typeColor: "#00869ecc", borderColor: "#00869ecc", bgColor: "#c7c7c7cc", isWanman: false },
|
||||
Forwarding: { label: "回送", typeColor: "#727272cc", borderColor: "#727272cc", bgColor: "#c7c7c7cc", isWanman: false },
|
||||
Trial: { label: "試運転", typeColor: "#727272cc", borderColor: "#727272cc", bgColor: "#c7c7c7cc", isWanman: false },
|
||||
Construction: { label: "工事", typeColor: "#727272cc", borderColor: "#727272cc", bgColor: "#c7c7c7cc", isWanman: false },
|
||||
FreightForwarding: { label: "単機回送", typeColor: "#727272cc", borderColor: "#727272cc", bgColor: "#c7c7c7cc", isWanman: false },
|
||||
Normal: { label: "普通", typeColor: "black", borderColor: "black", bgColor: "#ffffffcc" },
|
||||
OneMan: { label: "普通", typeColor: "black", borderColor: "black", bgColor: "#ffffffcc" },
|
||||
Rapid: { label: "快速", typeColor: "rgba(0, 140, 255, 1)", borderColor: "rgba(0, 140, 255, 1)", bgColor: "#ffffffcc" },
|
||||
OneManRapid: { label: "快速", typeColor: "rgba(0, 140, 255, 1)", borderColor: "rgba(0, 140, 255, 1)", bgColor: "#ffffffcc" },
|
||||
LTDEXP: { label: "特急", typeColor: "red", borderColor: "red", bgColor: "#ffffffcc" },
|
||||
NightLTDEXP: { label: "寝台特急", typeColor: "#d300b0ff", borderColor: "#d300b0ff", bgColor: "#ffffffcc" },
|
||||
SPCL: { label: "臨時", typeColor: "#008d07ff", borderColor: "#008d07ff", bgColor: "#ffffffcc" },
|
||||
SPCL_Normal: { label: "臨時", typeColor: "#008d07ff", borderColor: "#008d07ff", bgColor: "#ffffffcc" },
|
||||
SPCL_Rapid: { label: "臨時快速", typeColor: "rgba(0, 81, 255, 1)", borderColor: "#0051ffff", bgColor: "#ffffffcc" },
|
||||
SPCL_EXP: { label: "臨時特急", typeColor: "#a52e2eff", borderColor: "#a52e2eff", bgColor: "#ffffffcc" },
|
||||
Party: { label: "団体", typeColor: "#ff7300ff", borderColor: "#ff7300ff", bgColor: "#ffd0a9ff" },
|
||||
Freight: { label: "貨物", typeColor: "#00869ecc", borderColor: "#00869ecc", bgColor: "#c7c7c7cc" },
|
||||
Forwarding: { label: "回送", typeColor: "#727272cc", borderColor: "#727272cc", bgColor: "#c7c7c7cc" },
|
||||
Trial: { label: "試運転", typeColor: "#727272cc", borderColor: "#727272cc", bgColor: "#c7c7c7cc" },
|
||||
Construction: { label: "工事", typeColor: "#727272cc", borderColor: "#727272cc", bgColor: "#c7c7c7cc" },
|
||||
FreightForwarding: { label: "単機回送", typeColor: "#727272cc", borderColor: "#727272cc", bgColor: "#c7c7c7cc" },
|
||||
};
|
||||
|
||||
@@ -29,6 +29,7 @@ import { lineList_LineWebID } from "@/lib/getStationList";
|
||||
import { StationProps } from "@/lib/CommonTypes";
|
||||
import { LocationObject } from "expo-location";
|
||||
import { StationSource } from "@/types";
|
||||
import * as Sentry from "@sentry/react-native";
|
||||
configureReanimatedLogger({
|
||||
level: ReanimatedLogLevel.error, // Set the log level to error
|
||||
strict: true, // Reanimated runs in strict mode by default
|
||||
@@ -43,6 +44,8 @@ type props = {
|
||||
};
|
||||
|
||||
const MAP_PIN_SIZE = Platform.OS === "android" ? 32 : 36;
|
||||
const ANDROID_USER_LOCATION_MARKER_SIZE = 18;
|
||||
const ANDROID_USER_LOCATION_INNER_SIZE = 8;
|
||||
|
||||
export const Menu: FC<props> = (props) => {
|
||||
const { scrollRef, mapHeight, MapFullHeight, mapMode, setMapMode } = props;
|
||||
@@ -54,12 +57,73 @@ export const Menu: FC<props> = (props) => {
|
||||
const { favoriteStation } = useFavoriteStation();
|
||||
const { originalStationList, getStationDataFromNameBase } = useStationList();
|
||||
const [stationSource, _setStationSource] = useState<StationSource>({ type: "position" });
|
||||
const [isHeavyContentReady, setIsHeavyContentReady] = useState(Platform.OS !== "android");
|
||||
// 時刻表βの遅延レンダリング(画面遷移アニメーション完了後に描画)
|
||||
const [ledReady, setLedReady] = useState(false);
|
||||
const [ledReady, setLedReady] = useState(Platform.OS !== "android");
|
||||
useEffect(() => {
|
||||
const handle = InteractionManager.runAfterInteractions(() => setLedReady(true));
|
||||
return () => handle.cancel();
|
||||
}, []);
|
||||
if (Platform.OS !== "android") {
|
||||
setIsHeavyContentReady(true);
|
||||
setLedReady(true);
|
||||
return;
|
||||
}
|
||||
|
||||
let cancelled = false;
|
||||
let timer: ReturnType<typeof setTimeout> | null = null;
|
||||
if (!isMenuFocused) {
|
||||
if (!isHeavyContentReady) return;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "topMenu.runtime",
|
||||
level: "info",
|
||||
message: "top menu heavy content preserved on blur",
|
||||
data: { mapMode },
|
||||
});
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}
|
||||
|
||||
if (isHeavyContentReady && ledReady) {
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}
|
||||
|
||||
Sentry.addBreadcrumb({
|
||||
category: "topMenu.runtime",
|
||||
level: "info",
|
||||
message: "top menu heavy content activation scheduled",
|
||||
data: { mapMode },
|
||||
});
|
||||
|
||||
const handle = InteractionManager.runAfterInteractions(() => {
|
||||
timer = setTimeout(() => {
|
||||
if (cancelled) return;
|
||||
Sentry.addBreadcrumb({
|
||||
category: "topMenu.runtime",
|
||||
level: "info",
|
||||
message: "top menu heavy content activated",
|
||||
data: { mapMode },
|
||||
});
|
||||
setIsHeavyContentReady(true);
|
||||
setLedReady(true);
|
||||
}, 60);
|
||||
});
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
handle.cancel();
|
||||
if (timer) clearTimeout(timer);
|
||||
};
|
||||
}, [isHeavyContentReady, isMenuFocused, ledReady, mapMode]);
|
||||
|
||||
useEffect(() => {
|
||||
Sentry.setContext("top_menu_runtime", {
|
||||
focused: isMenuFocused,
|
||||
mapMode,
|
||||
heavyContentReady: isHeavyContentReady,
|
||||
ledReady,
|
||||
});
|
||||
}, [isHeavyContentReady, isMenuFocused, ledReady, mapMode]);
|
||||
// 検索モードを閉じたときに戻るソースを記憶
|
||||
const prevNonSearchTypeRef = useRef<"position" | "favorite">("position");
|
||||
|
||||
@@ -258,7 +322,9 @@ export const Menu: FC<props> = (props) => {
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [listUpStation]);
|
||||
useEffect(() => {
|
||||
if (!isHeavyContentReady) return;
|
||||
if (originalStationList == undefined) return;
|
||||
if (!mapsRef.current) return;
|
||||
if (listUpStation.length == 0) return;
|
||||
if (listUpStation[listIndex] == undefined) return;
|
||||
const { lat, lng } = listUpStation[listIndex][0];
|
||||
@@ -279,7 +345,7 @@ export const Menu: FC<props> = (props) => {
|
||||
} else {
|
||||
mapsRef.current.animateToRegion(mapRegion, 1000);
|
||||
}
|
||||
}, [listIndex, listUpStation]);
|
||||
}, [isHeavyContentReady, listIndex, listUpStation]);
|
||||
|
||||
return (
|
||||
<View
|
||||
@@ -313,83 +379,129 @@ export const Menu: FC<props> = (props) => {
|
||||
}
|
||||
}}
|
||||
>
|
||||
<MapView
|
||||
ref={mapsRef}
|
||||
style={{ width: "100%", height: mapMode ? MapFullHeight : mapHeight }}
|
||||
showsUserLocation={true}
|
||||
loadingEnabled={true}
|
||||
showsMyLocationButton={false}
|
||||
moveOnMarkerPress={false}
|
||||
showsCompass={false}
|
||||
userInterfaceStyle={isDark ? "dark" : "light"}
|
||||
//provider={PROVIDER_GOOGLE}
|
||||
initialRegion={{
|
||||
latitude: 33.774519,
|
||||
longitude: 133.533306,
|
||||
latitudeDelta: 1.8, //小さくなるほどズーム
|
||||
longitudeDelta: 1.8,
|
||||
}}
|
||||
onTouchStart={() => {
|
||||
LayoutAnimation.configureNext({
|
||||
duration: 300,
|
||||
create: {
|
||||
type: LayoutAnimation.Types.easeInEaseOut,
|
||||
property: LayoutAnimation.Properties.opacity,
|
||||
},
|
||||
update: {
|
||||
type: LayoutAnimation.Types.easeInEaseOut,
|
||||
property: LayoutAnimation.Properties.opacity,
|
||||
},
|
||||
});
|
||||
setMapMode(true);
|
||||
goToMap();
|
||||
}}
|
||||
>
|
||||
{listUpStation.map(([{ lat, lng, StationNumber }], index) => (
|
||||
<Marker
|
||||
key={index + StationNumber}
|
||||
coordinate={{
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
}}
|
||||
anchor={{ x: 0.5, y: 1 }}
|
||||
tracksViewChanges={false}
|
||||
onPress={() => {
|
||||
setMapMode(false);
|
||||
setListIndex(index);
|
||||
if (mapsRef.current) {
|
||||
mapsRef.current.animateToRegion(
|
||||
{
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
latitudeDelta: 0.05,
|
||||
longitudeDelta: 0.05,
|
||||
{isHeavyContentReady ? (
|
||||
<MapView
|
||||
ref={mapsRef}
|
||||
style={{ width: "100%", height: mapMode ? MapFullHeight : mapHeight }}
|
||||
showsUserLocation={Platform.OS !== "android"}
|
||||
loadingEnabled={true}
|
||||
showsMyLocationButton={false}
|
||||
moveOnMarkerPress={false}
|
||||
showsCompass={false}
|
||||
userInterfaceStyle={isDark ? "dark" : "light"}
|
||||
//provider={PROVIDER_GOOGLE}
|
||||
initialRegion={{
|
||||
latitude: 33.774519,
|
||||
longitude: 133.533306,
|
||||
latitudeDelta: 1.8, //小さくなるほどズーム
|
||||
longitudeDelta: 1.8,
|
||||
}}
|
||||
onTouchStart={() => {
|
||||
LayoutAnimation.configureNext({
|
||||
duration: 300,
|
||||
create: {
|
||||
type: LayoutAnimation.Types.easeInEaseOut,
|
||||
property: LayoutAnimation.Properties.opacity,
|
||||
},
|
||||
update: {
|
||||
type: LayoutAnimation.Types.easeInEaseOut,
|
||||
property: LayoutAnimation.Properties.opacity,
|
||||
},
|
||||
});
|
||||
setMapMode(true);
|
||||
goToMap();
|
||||
}}
|
||||
>
|
||||
{Platform.OS === "android" && position ? (
|
||||
<Marker
|
||||
key="android-user-location"
|
||||
coordinate={{
|
||||
latitude: position.coords.latitude,
|
||||
longitude: position.coords.longitude,
|
||||
}}
|
||||
anchor={{ x: 0.5, y: 0.5 }}
|
||||
tracksViewChanges={false}
|
||||
zIndex={999}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
width: ANDROID_USER_LOCATION_MARKER_SIZE,
|
||||
height: ANDROID_USER_LOCATION_MARKER_SIZE,
|
||||
borderRadius: ANDROID_USER_LOCATION_MARKER_SIZE / 2,
|
||||
backgroundColor: "rgba(10, 132, 255, 0.24)",
|
||||
borderWidth: 1,
|
||||
borderColor: "rgba(10, 132, 255, 0.42)",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
}}
|
||||
>
|
||||
<View
|
||||
style={{
|
||||
width: ANDROID_USER_LOCATION_INNER_SIZE,
|
||||
height: ANDROID_USER_LOCATION_INNER_SIZE,
|
||||
borderRadius: ANDROID_USER_LOCATION_INNER_SIZE / 2,
|
||||
backgroundColor: "#0A84FF",
|
||||
borderWidth: 1,
|
||||
borderColor: "#ffffff",
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
</Marker>
|
||||
) : null}
|
||||
{listUpStation.map(([{ lat, lng, StationNumber }], index) => (
|
||||
<Marker
|
||||
key={index + StationNumber}
|
||||
coordinate={{
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
}}
|
||||
anchor={{ x: 0.5, y: 1 }}
|
||||
tracksViewChanges={false}
|
||||
onPress={() => {
|
||||
setMapMode(false);
|
||||
setListIndex(index);
|
||||
if (mapsRef.current) {
|
||||
mapsRef.current.animateToRegion(
|
||||
{
|
||||
latitude: lat,
|
||||
longitude: lng,
|
||||
latitudeDelta: 0.05,
|
||||
longitudeDelta: 0.05,
|
||||
},
|
||||
1000
|
||||
);
|
||||
}
|
||||
LayoutAnimation.configureNext({
|
||||
duration: 300,
|
||||
create: {
|
||||
type: LayoutAnimation.Types.easeInEaseOut,
|
||||
property: LayoutAnimation.Properties.opacity,
|
||||
},
|
||||
1000
|
||||
);
|
||||
}
|
||||
LayoutAnimation.configureNext({
|
||||
duration: 300,
|
||||
create: {
|
||||
type: LayoutAnimation.Types.easeInEaseOut,
|
||||
property: LayoutAnimation.Properties.opacity,
|
||||
},
|
||||
update: {
|
||||
type: LayoutAnimation.Types.easeInEaseOut,
|
||||
property: LayoutAnimation.Properties.opacity,
|
||||
},
|
||||
});
|
||||
returnToTop();
|
||||
}}
|
||||
>
|
||||
<Image
|
||||
source={require("@/assets/reccha-small.png")}
|
||||
style={{ width: MAP_PIN_SIZE, height: MAP_PIN_SIZE }}
|
||||
resizeMode="contain"
|
||||
/>
|
||||
</Marker>
|
||||
))}
|
||||
</MapView>
|
||||
update: {
|
||||
type: LayoutAnimation.Types.easeInEaseOut,
|
||||
property: LayoutAnimation.Properties.opacity,
|
||||
},
|
||||
});
|
||||
returnToTop();
|
||||
}}
|
||||
>
|
||||
<Image
|
||||
source={require("@/assets/reccha-small.png")}
|
||||
style={{ width: MAP_PIN_SIZE, height: MAP_PIN_SIZE }}
|
||||
resizeMode="contain"
|
||||
/>
|
||||
</Marker>
|
||||
))}
|
||||
</MapView>
|
||||
) : (
|
||||
<View
|
||||
style={{
|
||||
width: "100%",
|
||||
height: mapMode ? MapFullHeight : mapHeight,
|
||||
backgroundColor: colors.background,
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{!mapMode && (
|
||||
<CarouselTypeChanger
|
||||
{...{
|
||||
@@ -405,7 +517,7 @@ export const Menu: FC<props> = (props) => {
|
||||
/>
|
||||
)}
|
||||
|
||||
{originalStationList.length != 0 && (
|
||||
{Object.keys(originalStationList).length !== 0 && isHeavyContentReady && (
|
||||
<>
|
||||
<CarouselBox
|
||||
{...{
|
||||
|
||||
+5
-3
@@ -1,7 +1,9 @@
|
||||
const { getDefaultConfig } = require("expo/metro-config");
|
||||
const path = require("path");
|
||||
const {
|
||||
getSentryExpoConfig
|
||||
} = require("@sentry/react-native/metro");
|
||||
|
||||
const config = getDefaultConfig(__dirname);
|
||||
const config = getSentryExpoConfig(__dirname);
|
||||
|
||||
// Ensure local Expo modules in modules/ are watched and resolved directly
|
||||
config.watchFolders = [
|
||||
@@ -22,4 +24,4 @@ config.transformer = {
|
||||
experimentalImportSupport: true,
|
||||
};
|
||||
|
||||
module.exports = config;
|
||||
module.exports = config;
|
||||
+3286
-131
File diff suppressed because it is too large
Load Diff
+18
-16
@@ -6,6 +6,7 @@
|
||||
"android": "expo run:android",
|
||||
"ios": "expo run:ios",
|
||||
"eject": "expo eject",
|
||||
"postinstall": "patch-package",
|
||||
"pushWeb": "npx expo export -p web && netlify deploy --dir dist --prod",
|
||||
"checkDiagram": "bash ./check.sh"
|
||||
},
|
||||
@@ -22,9 +23,15 @@
|
||||
"react-native-responsive-screen",
|
||||
"typescript",
|
||||
"react",
|
||||
"react-dom"
|
||||
"react-dom",
|
||||
"expo-live-activity",
|
||||
"@react-native-vector-icons/fontawesome",
|
||||
"@react-native-vector-icons/material-icons"
|
||||
]
|
||||
}
|
||||
},
|
||||
"autolinking": {
|
||||
"nativeModulesDir": "./modules"
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
@@ -43,6 +50,7 @@
|
||||
"@react-navigation/stack": "^7.8.6",
|
||||
"@rneui/base": "5.0.0",
|
||||
"@rneui/themed": "5.0.0",
|
||||
"@sentry/react-native": "~7.11.0",
|
||||
"dayjs": "^1.11.20",
|
||||
"expo": "^55.0.8",
|
||||
"expo-alternate-app-icons": "8.0.0",
|
||||
@@ -51,9 +59,10 @@
|
||||
"expo-build-properties": "~55.0.10",
|
||||
"expo-clipboard": "~55.0.9",
|
||||
"expo-constants": "~55.0.9",
|
||||
"expo-dev-client": "~55.0.18",
|
||||
"expo-dev-client": "~55.0.36",
|
||||
"expo-device": "~55.0.10",
|
||||
"expo-felica-reader": "file:./modules/expo-felica-reader",
|
||||
"expo-document-picker": "~55.0.14",
|
||||
"expo-file-system": "~55.0.23",
|
||||
"expo-font": "~55.0.4",
|
||||
"expo-haptics": "~55.0.9",
|
||||
"expo-intent-launcher": "~55.0.9",
|
||||
@@ -73,7 +82,7 @@
|
||||
"lottie-react-native": "~7.3.1",
|
||||
"react": "19.2.0",
|
||||
"react-dom": "19.2.0",
|
||||
"react-native": "0.83.2",
|
||||
"react-native": "0.83.6",
|
||||
"react-native-actions-sheet": "10.1.2",
|
||||
"react-native-android-widget": "^0.20.1",
|
||||
"react-native-gesture-handler": "~2.30.0",
|
||||
@@ -83,6 +92,7 @@
|
||||
"react-native-responsive-screen": "^1.4.2",
|
||||
"react-native-safe-area-context": "~5.6.0",
|
||||
"react-native-screens": "~4.23.0",
|
||||
"react-native-share": "^12.3.1",
|
||||
"react-native-sortables": "1.9.4",
|
||||
"react-native-storage": "^1.0.1",
|
||||
"react-native-svg": "15.15.3",
|
||||
@@ -91,22 +101,14 @@
|
||||
"react-native-view-shot": "~4.0.3",
|
||||
"react-native-web": "^0.21.2",
|
||||
"react-native-webview": "13.16.0",
|
||||
"react-native-worklets": "0.7.2",
|
||||
"typescript": "~5.9.3",
|
||||
"expo-live-activity": "file:./modules/expo-live-activity"
|
||||
"react-native-worklets": "0.7.4",
|
||||
"typescript": "~5.9.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "~19.2.14",
|
||||
"babel-preset-expo": "~55.0.12",
|
||||
"baseline-browser-mapping": "^2.10.9"
|
||||
},
|
||||
"resolutions": {
|
||||
"react": "19.2.0",
|
||||
"react-dom": "19.2.0",
|
||||
"expo-asset": "55.0.10",
|
||||
"expo-constants": "55.0.9",
|
||||
"expo-manifests": "55.0.11",
|
||||
"react-native-worklets": "0.7.2"
|
||||
"baseline-browser-mapping": "^2.10.9",
|
||||
"patch-package": "^8.0.1"
|
||||
},
|
||||
"private": true,
|
||||
"name": "jrshikoku",
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
{
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"compile-web-script": "npx tsx scripts/compile-web-script.ts",
|
||||
"start": "expo start",
|
||||
"android": "expo run:android",
|
||||
"ios": "expo run:ios",
|
||||
"eject": "expo eject",
|
||||
"pushWeb": "npx expo export -p web && netlify deploy --dir dist --prod",
|
||||
"checkDiagram": "bash ./check.sh"
|
||||
},
|
||||
"expo": {
|
||||
"doctor": {
|
||||
"reactNativeDirectoryCheck": {
|
||||
"exclude": [
|
||||
"@rneui/base",
|
||||
"@rneui/themed",
|
||||
"@lottiefiles/dotlottie-react",
|
||||
"expo-felica-reader",
|
||||
"react-native-touchable-scale",
|
||||
"react-native-vector-icons",
|
||||
"react-native-responsive-screen",
|
||||
"typescript",
|
||||
"react",
|
||||
"react-dom"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"@bacons/apple-targets": "^4.0.6",
|
||||
"@expo/metro-runtime": "~55.0.6",
|
||||
"@expo/ngrok": "^4.1.3",
|
||||
"@expo/vector-icons": "^15.1.1",
|
||||
"@gorhom/bottom-sheet": "^5",
|
||||
"@lottiefiles/dotlottie-react": "^0.18.7",
|
||||
"@react-native-async-storage/async-storage": "2.2.0",
|
||||
"@react-native-masked-view/masked-view": "0.3.2",
|
||||
"@react-native-vector-icons/fontawesome": "^12.4.3",
|
||||
"@react-native-vector-icons/material-icons": "^12.4.3",
|
||||
"@react-navigation/bottom-tabs": "^7.15.6",
|
||||
"@react-navigation/native": "^7.1.34",
|
||||
"@react-navigation/stack": "^7.8.6",
|
||||
"@rneui/base": "5.0.0",
|
||||
"@rneui/themed": "5.0.0",
|
||||
"@sentry/react-native": "^8.16.0",
|
||||
"dayjs": "^1.11.20",
|
||||
"expo": "^55.0.8",
|
||||
"expo-alternate-app-icons": "8.0.0",
|
||||
"expo-asset": "~55.0.10",
|
||||
"expo-audio": "~55.0.9",
|
||||
"expo-build-properties": "~55.0.10",
|
||||
"expo-clipboard": "~55.0.9",
|
||||
"expo-constants": "~55.0.9",
|
||||
"expo-dev-client": "~55.0.18",
|
||||
"expo-device": "~55.0.10",
|
||||
"expo-document-picker": "~55.0.14",
|
||||
"expo-felica-reader": "file:./modules/expo-felica-reader",
|
||||
"expo-file-system": "~55.0.23",
|
||||
"expo-font": "~55.0.4",
|
||||
"expo-haptics": "~55.0.9",
|
||||
"expo-intent-launcher": "~55.0.9",
|
||||
"expo-keep-awake": "~55.0.4",
|
||||
"expo-linear-gradient": "~55.0.9",
|
||||
"expo-linking": "~55.0.8",
|
||||
"expo-live-activity": "file:./modules/expo-live-activity",
|
||||
"expo-localization": "~55.0.9",
|
||||
"expo-location": "~55.1.4",
|
||||
"expo-notifications": "~55.0.13",
|
||||
"expo-screen-orientation": "~55.0.9",
|
||||
"expo-sharing": "~55.0.14",
|
||||
"expo-status-bar": "~55.0.4",
|
||||
"expo-system-ui": "~55.0.10",
|
||||
"expo-updates": "~55.0.15",
|
||||
"expo-video": "~55.0.11",
|
||||
"expo-web-browser": "~55.0.10",
|
||||
"lottie-react-native": "~7.3.1",
|
||||
"react": "19.2.0",
|
||||
"react-dom": "19.2.0",
|
||||
"react-native": "0.83.2",
|
||||
"react-native-actions-sheet": "10.1.2",
|
||||
"react-native-android-widget": "^0.20.1",
|
||||
"react-native-gesture-handler": "~2.30.0",
|
||||
"react-native-maps": "1.27.2",
|
||||
"react-native-reanimated": "4.2.1",
|
||||
"react-native-reanimated-carousel": "^4.0.3",
|
||||
"react-native-responsive-screen": "^1.4.2",
|
||||
"react-native-safe-area-context": "~5.6.0",
|
||||
"react-native-screens": "~4.23.0",
|
||||
"react-native-share": "^12.3.1",
|
||||
"react-native-sortables": "1.9.4",
|
||||
"react-native-storage": "^1.0.1",
|
||||
"react-native-svg": "15.15.3",
|
||||
"react-native-touchable-scale": "^2.2.0",
|
||||
"react-native-vector-icons": "^10.3.0",
|
||||
"react-native-view-shot": "~4.0.3",
|
||||
"react-native-web": "^0.21.2",
|
||||
"react-native-webview": "13.16.0",
|
||||
"react-native-worklets": "0.7.2",
|
||||
"typescript": "~5.9.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "~19.2.14",
|
||||
"babel-preset-expo": "~55.0.12",
|
||||
"baseline-browser-mapping": "^2.10.9"
|
||||
},
|
||||
"resolutions": {
|
||||
"react": "19.2.0",
|
||||
"react-dom": "19.2.0",
|
||||
"expo-asset": "55.0.10",
|
||||
"expo-constants": "55.0.9",
|
||||
"expo-manifests": "55.0.11",
|
||||
"react-native-worklets": "0.7.2"
|
||||
},
|
||||
"private": true,
|
||||
"name": "jrshikoku",
|
||||
"version": "1.0.0"
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
diff --git a/node_modules/@react-navigation/bottom-tabs/src/views/BottomTabView.tsx b/node_modules/@react-navigation/bottom-tabs/src/views/BottomTabView.tsx
|
||||
index ec0491e..c546b88 100644
|
||||
--- a/node_modules/@react-navigation/bottom-tabs/src/views/BottomTabView.tsx
|
||||
+++ b/node_modules/@react-navigation/bottom-tabs/src/views/BottomTabView.tsx
|
||||
@@ -318,7 +318,12 @@ export function BottomTabView(props: Props) {
|
||||
return (
|
||||
<MaybeScreen
|
||||
key={route.key}
|
||||
- style={[StyleSheet.absoluteFill, { zIndex: isFocused ? 0 : -1 }]}
|
||||
+ style={[
|
||||
+ StyleSheet.absoluteFill,
|
||||
+ Platform.OS === 'android'
|
||||
+ ? { opacity: isFocused ? 1 : 0 }
|
||||
+ : { zIndex: isFocused ? 0 : -1 },
|
||||
+ ]}
|
||||
active={activityState}
|
||||
enabled={detachInactiveScreens}
|
||||
freezeOnBlur={freezeOnBlur}
|
||||
@@ -24,7 +24,7 @@ const noUserscript = args.includes('--no-userscript');
|
||||
|
||||
const options = {
|
||||
mapSwitch: 'false',
|
||||
iconSetting: 'true',
|
||||
iconSetting: 'original',
|
||||
stationMenu: 'false',
|
||||
trainMenu: 'false',
|
||||
uiSetting: (process.env.UI ?? 'tokyo') as string,
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
import fs from "node:fs";
|
||||
import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
const __filename = fileURLToPath(import.meta.url);
|
||||
const __dirname = path.dirname(__filename);
|
||||
const repoRoot = path.resolve(__dirname, "..");
|
||||
const sourcePath = path.join(repoRoot, "ndView.tsx");
|
||||
const outputDir = path.join(repoRoot, "docs", "generated");
|
||||
const outputPath = path.join(outputDir, "jrshikoku-operation-info.user.js");
|
||||
|
||||
const source = fs.readFileSync(sourcePath, "utf8");
|
||||
const match = source.match(/return String\.raw`([\s\S]*?)`;\n};/);
|
||||
if (!match) {
|
||||
throw new Error("Failed to locate buildOperationPageScript body in ndView.tsx");
|
||||
}
|
||||
|
||||
let scriptBody = match[1];
|
||||
|
||||
scriptBody = scriptBody.replace(
|
||||
" window.__jrsNativeOperationLayout = ${nativeLayout};",
|
||||
[
|
||||
" window.__jrsNativeOperationLayout = Object.assign({",
|
||||
" forceSignage: true,",
|
||||
" safeAreaLeft: 0,",
|
||||
" safeAreaRight: 0,",
|
||||
" lineBadges: []",
|
||||
" }, window.__TM_OPERATION_INFO_LAYOUT || {});"
|
||||
].join("\n")
|
||||
);
|
||||
|
||||
const nativePostMessageBlock = [
|
||||
" function postMessage(payload) {",
|
||||
" if (!window.ReactNativeWebView) return;",
|
||||
" payload.type = 'operationInfoCapture';",
|
||||
" window.ReactNativeWebView.postMessage(JSON.stringify(payload));",
|
||||
" }"
|
||||
].join("\n");
|
||||
|
||||
const tampermonkeyPostMessageBlock = [
|
||||
" function downloadCapture(dataUrl, fileName) {",
|
||||
" if (!dataUrl) return;",
|
||||
" if (typeof GM_download === 'function') {",
|
||||
" try {",
|
||||
" GM_download({ url: dataUrl, name: fileName, saveAs: true });",
|
||||
" return;",
|
||||
" } catch (error) {",
|
||||
" console.warn('[JRShikoku TM] GM_download failed, falling back to anchor download.', error);",
|
||||
" }",
|
||||
" }",
|
||||
"",
|
||||
" var link = document.createElement('a');",
|
||||
" link.href = dataUrl;",
|
||||
" link.download = fileName || ('operation-info-' + Date.now() + '.png');",
|
||||
" link.rel = 'noopener';",
|
||||
" document.body.appendChild(link);",
|
||||
" link.click();",
|
||||
" link.remove();",
|
||||
" }",
|
||||
"",
|
||||
" function postMessage(payload) {",
|
||||
" if (!payload) return;",
|
||||
" if (payload.error) {",
|
||||
" console.error('[JRShikoku TM] capture failed', payload);",
|
||||
" window.alert('運行情報の画像生成に失敗しました。');",
|
||||
" return;",
|
||||
" }",
|
||||
" downloadCapture(payload.dataUrl, payload.fileName);",
|
||||
" }"
|
||||
].join("\n");
|
||||
|
||||
if (!scriptBody.includes(nativePostMessageBlock)) {
|
||||
throw new Error("Failed to locate React Native postMessage block in ndView.tsx");
|
||||
}
|
||||
scriptBody = scriptBody.replace(nativePostMessageBlock, tampermonkeyPostMessageBlock);
|
||||
|
||||
const header = [
|
||||
"// ==UserScript==",
|
||||
"// @name JR四国 運行情報 Inject",
|
||||
"// @namespace https://github.com/harukin/jrshikoku",
|
||||
"// @version 0.1.0",
|
||||
"// @description Run the JR Shikoku operation-info injection on desktop browsers via Tampermonkey.",
|
||||
"// @match https://www.jr-shikoku.co.jp/info/*",
|
||||
"// @run-at document-idle",
|
||||
"// @grant GM_download",
|
||||
"// ==/UserScript==",
|
||||
"",
|
||||
"/* Generated from ndView.tsx by scripts/generate-operation-info-userscript.mjs. */",
|
||||
"",
|
||||
"window.__TM_OPERATION_INFO_LAYOUT = Object.assign({",
|
||||
" forceSignage: true,",
|
||||
" safeAreaLeft: 0,",
|
||||
" safeAreaRight: 0,",
|
||||
" lineBadges: []",
|
||||
"}, window.__TM_OPERATION_INFO_LAYOUT || {});",
|
||||
""
|
||||
].join("\n");
|
||||
|
||||
fs.mkdirSync(outputDir, { recursive: true });
|
||||
fs.writeFileSync(outputPath, header + scriptBody.trimStart() + "\n", "utf8");
|
||||
console.log(path.relative(repoRoot, outputPath));
|
||||
@@ -15,6 +15,7 @@ import {
|
||||
getDiagramTodayUrl,
|
||||
BACKEND_API_BASE_URLS,
|
||||
} from "@/lib/jrDataSystemEnvironment";
|
||||
import { observedFetchJson } from "@/lib/observability/network/observedFetch";
|
||||
const initialState = {
|
||||
allTrainDiagram: {},
|
||||
setAllTrainDiagram: (e) => {},
|
||||
@@ -51,10 +52,10 @@ export const AllTrainDiagramProvider: FC<Props> = ({ children }) => {
|
||||
setKeyList(Object.keys(allTrainDiagram));
|
||||
else setKeyList([]);
|
||||
}, [allTrainDiagram]);
|
||||
const [backendApiBaseUrl, setBackendApiBaseUrl] = React.useState(
|
||||
const [backendApiBaseUrl, setBackendApiBaseUrl] = React.useState<string>(
|
||||
BACKEND_API_BASE_URLS.production,
|
||||
);
|
||||
const [diagramTodayUrl, setDiagramTodayUrl] = React.useState(
|
||||
const [diagramTodayUrl, setDiagramTodayUrl] = React.useState<string>(
|
||||
"https://jr-shikoku-api-data-storage.haruk.in/tmp/diagram-today.json",
|
||||
);
|
||||
|
||||
@@ -68,10 +69,16 @@ export const AllTrainDiagramProvider: FC<Props> = ({ children }) => {
|
||||
}, []);
|
||||
|
||||
const getTrainDiagram = () => {
|
||||
const controller = new AbortController();
|
||||
const timeoutId = setTimeout(() => controller.abort(), 15000);
|
||||
fetch(diagramTodayUrl, { signal: controller.signal })
|
||||
.then((res) => res.json())
|
||||
observedFetchJson<any[]>(diagramTodayUrl, {
|
||||
endpoint: "timetable_today",
|
||||
source: "static_storage",
|
||||
userVisible: false,
|
||||
preload: true,
|
||||
fetchPriority: "medium",
|
||||
timeoutMs: 15000,
|
||||
retry: true,
|
||||
urlPathTemplate: "/tmp/diagram-today.json",
|
||||
})
|
||||
.then((res) => {
|
||||
const data = {};
|
||||
res.forEach((d) => {
|
||||
@@ -101,8 +108,7 @@ export const AllTrainDiagramProvider: FC<Props> = ({ children }) => {
|
||||
.catch(() => {
|
||||
alert("初回の路線情報の取得に失敗しました。");
|
||||
});
|
||||
})
|
||||
.finally(() => clearTimeout(timeoutId));
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
@@ -111,15 +117,20 @@ export const AllTrainDiagramProvider: FC<Props> = ({ children }) => {
|
||||
useInterval(getTrainDiagram, 30000, true, true); //30秒毎に全在線列車取得(バックグラウンドでも継続)
|
||||
|
||||
const getCustomTrainData = () => {
|
||||
const controller = new AbortController();
|
||||
const timeoutId = setTimeout(() => controller.abort(), 15000);
|
||||
fetch(`${backendApiBaseUrl}/train-data`, { signal: controller.signal })
|
||||
.then((res) => res.json())
|
||||
observedFetchJson<{ data: CustomTrainData[] }>(`${backendApiBaseUrl}/train-data`, {
|
||||
endpoint: "train_operation_data",
|
||||
source: "backend_api",
|
||||
userVisible: false,
|
||||
preload: true,
|
||||
fetchPriority: "medium",
|
||||
timeoutMs: 15000,
|
||||
retry: true,
|
||||
urlPathTemplate: "/train-data",
|
||||
})
|
||||
.then((res) => {
|
||||
setAllCustomTrainData(res.data);
|
||||
})
|
||||
.catch(() => {})
|
||||
.finally(() => clearTimeout(timeoutId));
|
||||
.catch(() => {});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
@@ -130,10 +141,16 @@ export const AllTrainDiagramProvider: FC<Props> = ({ children }) => {
|
||||
|
||||
const [todayOperation, setTodayOperation] = useState<OperationLogs[]>([]); // 本日の運行情報
|
||||
const getTodayOperation = () => {
|
||||
const controller = new AbortController();
|
||||
const timeoutId = setTimeout(() => controller.abort(), 15000);
|
||||
fetch(`${backendApiBaseUrl}/operation-logs`, { signal: controller.signal })
|
||||
.then((res) => res.json())
|
||||
observedFetchJson<{ data: OperationLogs[] | null }>(`${backendApiBaseUrl}/operation-logs`, {
|
||||
endpoint: "operation_logs",
|
||||
source: "backend_api",
|
||||
userVisible: false,
|
||||
preload: true,
|
||||
fetchPriority: "medium",
|
||||
timeoutMs: 15000,
|
||||
retry: true,
|
||||
urlPathTemplate: "/operation-logs",
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.data === null) {
|
||||
setTodayOperation([]);
|
||||
@@ -141,8 +158,7 @@ export const AllTrainDiagramProvider: FC<Props> = ({ children }) => {
|
||||
}
|
||||
setTodayOperation(res.data);
|
||||
})
|
||||
.catch(() => {})
|
||||
.finally(() => clearTimeout(timeoutId));
|
||||
.catch(() => {});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
+77
-21
@@ -3,9 +3,12 @@ import React, {
|
||||
useContext,
|
||||
useState,
|
||||
useEffect,
|
||||
useRef,
|
||||
FC,
|
||||
} from "react";
|
||||
import { InteractionManager } from "react-native";
|
||||
import useInterval from "../lib/useInterval";
|
||||
import { observedFetchJson, observedFetchText } from "@/lib/observability/network/observedFetch";
|
||||
|
||||
const setoStationID = [
|
||||
"Y00",
|
||||
@@ -361,41 +364,94 @@ export const AreaInfoProvider: FC<props> = ({ children }) => {
|
||||
const [areaIconBadgeText, setAreaIconBadgeText] = useState("");
|
||||
const [areaStationID, setAreaStationID] = useState([]);
|
||||
const [isInfo, setIsInfo] = useState(false);
|
||||
const getAreaData = () => {
|
||||
fetch(
|
||||
"https://script.google.com/macros/s/AKfycbz80LcaEUrhnlEsLkJy0LG2IRO3DBVQhfNmN1d_0f_HvtsujNQpxM90SrV9yKWH_JG1Ww/exec"
|
||||
const areaDescriptionTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
const initialFetchTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
const fetchAreaDescription = () => {
|
||||
observedFetchText(
|
||||
"https://script.google.com/macros/s/AKfycbz80LcaEUrhnlEsLkJy0LG2IRO3DBVQhfNmN1d_0f_HvtsujNQpxM90SrV9yKWH_JG1Ww/exec",
|
||||
{
|
||||
endpoint: "operation_info_text",
|
||||
source: "gas",
|
||||
userVisible: true,
|
||||
preload: false,
|
||||
fetchPriority: "medium",
|
||||
expectedContentType: "text",
|
||||
timeoutMs: 15000,
|
||||
retry: false,
|
||||
urlPathTemplate: "/macros/s/AKfy.../exec",
|
||||
}
|
||||
)
|
||||
.then((d) => d.text())
|
||||
.then((d) => setAreaInfo(d));
|
||||
fetch("https://n8n.haruk.in/webhook/jr-shikoku-trainfo-flag")
|
||||
.then((d) => d.json())
|
||||
.then((d) => setAreaInfo(d))
|
||||
.catch(() => {});
|
||||
};
|
||||
|
||||
const scheduleAreaDescriptionFetch = () => {
|
||||
if (areaDescriptionTimeoutRef.current) {
|
||||
clearTimeout(areaDescriptionTimeoutRef.current);
|
||||
}
|
||||
areaDescriptionTimeoutRef.current = setTimeout(() => {
|
||||
areaDescriptionTimeoutRef.current = null;
|
||||
fetchAreaDescription();
|
||||
}, 800);
|
||||
};
|
||||
|
||||
const getAreaData = () => {
|
||||
observedFetchJson<any>("https://n8n.haruk.in/webhook/jr-shikoku-trainfo-flag", {
|
||||
endpoint: "operation_info_flag",
|
||||
source: "n8n",
|
||||
userVisible: true,
|
||||
preload: true,
|
||||
fetchPriority: "medium",
|
||||
timeoutMs: 10000,
|
||||
retry: true,
|
||||
urlPathTemplate: "/webhook/jr-shikoku-trainfo-flag",
|
||||
})
|
||||
.then((d) => {
|
||||
if (!d.data) return;
|
||||
const lineInfo = d.data.filter((e) => e.area != "genelic");
|
||||
const genelicInfo = d.data.filter((e) => e.area == "genelic");
|
||||
const text = lineInfo
|
||||
.filter((e) => e.status)
|
||||
.map((e) => {
|
||||
return `${areaStationPair[e.area].id}`;
|
||||
});
|
||||
const activeLineInfo = lineInfo.filter((e) => e.status);
|
||||
const text = activeLineInfo.map((e) => {
|
||||
return `${areaStationPair[e.area].id}`;
|
||||
});
|
||||
let stationIDList = [];
|
||||
lineInfo
|
||||
.filter((e) => e.status)
|
||||
.forEach((e) => {
|
||||
stationIDList = stationIDList.concat(
|
||||
areaStationPair[e.area].stationID
|
||||
);
|
||||
});
|
||||
activeLineInfo.forEach((e) => {
|
||||
stationIDList = stationIDList.concat(
|
||||
areaStationPair[e.area].stationID
|
||||
);
|
||||
});
|
||||
const info = genelicInfo[0].status.includes("nodelay") ? true : false;
|
||||
setIsInfo(info);
|
||||
setAreaStationID(stationIDList);
|
||||
setAreaIconBadgeText(
|
||||
text.length == 0 ? (info ? "i" : "!") : text.join(",")
|
||||
);
|
||||
});
|
||||
if (stationIDList.length > 0) {
|
||||
scheduleAreaDescriptionFetch();
|
||||
} else {
|
||||
setAreaInfo("");
|
||||
}
|
||||
})
|
||||
.catch(() => {});
|
||||
};
|
||||
useEffect(() => {
|
||||
getAreaData();
|
||||
const task = InteractionManager.runAfterInteractions(() => {
|
||||
initialFetchTimeoutRef.current = setTimeout(() => {
|
||||
initialFetchTimeoutRef.current = null;
|
||||
getAreaData();
|
||||
}, 1200);
|
||||
});
|
||||
return () => {
|
||||
task.cancel?.();
|
||||
if (initialFetchTimeoutRef.current) {
|
||||
clearTimeout(initialFetchTimeoutRef.current);
|
||||
initialFetchTimeoutRef.current = null;
|
||||
}
|
||||
if (areaDescriptionTimeoutRef.current) {
|
||||
clearTimeout(areaDescriptionTimeoutRef.current);
|
||||
areaDescriptionTimeoutRef.current = null;
|
||||
}
|
||||
};
|
||||
}, []);
|
||||
useInterval(getAreaData, 60000); //60秒毎に全在線列車取得
|
||||
return (
|
||||
|
||||
@@ -19,6 +19,7 @@ import { MOCK_TRAIN_POSITIONS } from "@/lib/mockApi";
|
||||
import { fetchMockTrainPositions } from "@/lib/mockApi/positionMasters";
|
||||
import WebView from "react-native-webview";
|
||||
import { StationProps } from "@/lib/CommonTypes";
|
||||
import { observedFetchJson } from "@/lib/observability/network/observedFetch";
|
||||
type loading = "loading" | "success" | "error";
|
||||
const initialState = {
|
||||
webview: undefined,
|
||||
@@ -129,7 +130,7 @@ export const CurrentTrainProvider: FC<props> = ({ children }) => {
|
||||
let nearest: StationProps | null = null;
|
||||
let nearestDist = Infinity;
|
||||
Object.keys(originalStationList).forEach((lineName) => {
|
||||
(originalStationList as any)[lineName]?.forEach((station: StationProps) => {
|
||||
originalStationList[lineName]?.forEach((station) => {
|
||||
const d = _calcDistance({ lat: station.lat, lng: station.lng }, userPos);
|
||||
if (d < nearestDist) {
|
||||
nearestDist = d;
|
||||
@@ -305,15 +306,21 @@ export const CurrentTrainProvider: FC<props> = ({ children }) => {
|
||||
setCurrentTrainLoading("success");
|
||||
})
|
||||
.catch(() => {
|
||||
setCurrentTrainLoading("error");
|
||||
setCurrentTrainLoading(currentTrain.length > 0 ? "success" : "error");
|
||||
})
|
||||
.finally(() => clearTimeout(timeoutId));
|
||||
return;
|
||||
}
|
||||
const controller = new AbortController();
|
||||
const timeoutId = setTimeout(() => controller.abort(), 8000);
|
||||
fetch("https://n8n.haruk.in/webhook/c501550c-7d1b-4e50-927b-4429fe18931a", { signal: controller.signal })
|
||||
.then((response) => response.json())
|
||||
observedFetchJson<any>("https://n8n.haruk.in/webhook/c501550c-7d1b-4e50-927b-4429fe18931a", {
|
||||
endpoint: "positions_current",
|
||||
source: "n8n",
|
||||
userVisible: true,
|
||||
preload: false,
|
||||
fetchPriority: "high",
|
||||
timeoutMs: 8000,
|
||||
retry: true,
|
||||
urlPathTemplate: "/webhook/c501550c-7d1b-4e50-927b-4429fe18931a",
|
||||
})
|
||||
.then((d) => d.data)
|
||||
.then((d) =>
|
||||
d.map((x) => ({
|
||||
@@ -343,13 +350,20 @@ export const CurrentTrainProvider: FC<props> = ({ children }) => {
|
||||
})));
|
||||
})
|
||||
.catch(() => {
|
||||
const fallbackController = new AbortController();
|
||||
const fallbackTimeoutId = setTimeout(() => fallbackController.abort(), 8000);
|
||||
fetch(
|
||||
observedFetchJson<any[]>(
|
||||
"https://script.google.com/macros/s/AKfycby9Y2-Bm75J_WkbZimi7iS8v5r9wMa9wtzpdwES9sOGF4i6HIYEJOM60W6gM1gXzt1o/exec",
|
||||
{ ...HeaderConfig, signal: fallbackController.signal }
|
||||
{
|
||||
...HeaderConfig,
|
||||
endpoint: "positions_gas_fallback",
|
||||
source: "gas",
|
||||
userVisible: true,
|
||||
preload: false,
|
||||
fetchPriority: "high",
|
||||
timeoutMs: 8000,
|
||||
retry: true,
|
||||
urlPathTemplate: "/macros/s/AKfyc.../exec",
|
||||
}
|
||||
)
|
||||
.then((response) => response.json())
|
||||
.then((d) =>
|
||||
d.map((x) => ({ num: x.TrainNum, delay: x.delay, Pos: x.Pos }))
|
||||
)
|
||||
@@ -367,12 +381,9 @@ export const CurrentTrainProvider: FC<props> = ({ children }) => {
|
||||
setCurrentTrainLoading("success");
|
||||
})
|
||||
.catch(() => {
|
||||
// エラー時の処理
|
||||
setCurrentTrainLoading("error");
|
||||
})
|
||||
.finally(() => clearTimeout(fallbackTimeoutId));
|
||||
})
|
||||
.finally(() => clearTimeout(timeoutId));
|
||||
setCurrentTrainLoading(currentTrain.length > 0 ? "success" : "error");
|
||||
});
|
||||
});
|
||||
};
|
||||
const inject = (i) => {
|
||||
webview.current?.injectJavaScript(i);
|
||||
|
||||
+5
-19
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
|
||||
import { AS } from "../storageControl";
|
||||
import { STORAGE_KEYS } from "@/constants";
|
||||
import { API_ENDPOINTS } from "@/constants";
|
||||
import { sortElesiteEntriesByTrainNumber } from "@/lib/elesiteTrainOrder";
|
||||
import { getElesiteSummaryByTrainNumber } from "@/lib/elesiteTrainOrder";
|
||||
import type { ElesiteResponse, ElesiteData } from "@/types/unyohub";
|
||||
|
||||
type ElesiteHook = {
|
||||
@@ -67,25 +67,11 @@ export const useElesite = (): ElesiteHook => {
|
||||
const getElesiteByTrainNumber = (trainNumber: string): string | null => {
|
||||
if (!useElesite || elesiteData.length === 0) return null;
|
||||
|
||||
const results: string[] = [];
|
||||
const matchedEntries = elesiteData.filter((entry) =>
|
||||
entry.trains?.some((train) => train.train_number.trim() === trainNumber),
|
||||
);
|
||||
|
||||
// 高松(left_station)側のユニットを先に表示
|
||||
// (heading_to === "left") === is_leading が true → 高松(left)端のユニット
|
||||
const sortedEntries = sortElesiteEntriesByTrainNumber(elesiteData, trainNumber);
|
||||
|
||||
for (const entry of sortedEntries) {
|
||||
if (!entry.trains) continue;
|
||||
const found = entry.trains.find(train => train.train_number.trim() === trainNumber);
|
||||
if (!found) continue;
|
||||
// units が1件以上ある場合のみ編成名を返す(空 units は報告なし扱い)
|
||||
const units = entry.formation_config?.units;
|
||||
const formText = units?.length
|
||||
? units.map(u => u.formation).join('+')
|
||||
: null;
|
||||
if (formText) results.push(formText);
|
||||
}
|
||||
|
||||
return results.length > 0 ? results.join(', ') : null;
|
||||
return getElesiteSummaryByTrainNumber(matchedEntries, trainNumber);
|
||||
};
|
||||
|
||||
// 列番に紐づくエントリをすべて取得
|
||||
|
||||
@@ -11,7 +11,12 @@ import * as Notifications from "expo-notifications";
|
||||
import * as Device from "expo-device";
|
||||
import Constants from "expo-constants";
|
||||
import { logger } from "@/utils/logger";
|
||||
import { rootNavigationRef, stackAwareNavigate } from "@/lib/rootNavigation";
|
||||
import {
|
||||
markStartupExplicitTarget,
|
||||
resolveStartupNavigationSource,
|
||||
rootNavigationRef,
|
||||
stackAwareNavigate,
|
||||
} from "@/lib/rootNavigation";
|
||||
import { SheetManager } from "react-native-actions-sheet";
|
||||
import { AS } from "@/storageControl";
|
||||
import { STORAGE_KEYS } from "@/constants";
|
||||
@@ -209,6 +214,8 @@ export const NotificationProvider: FC<Props> = ({ children }) => {
|
||||
const action = resolveNotificationRoute(response);
|
||||
if (!action) return;
|
||||
|
||||
markStartupExplicitTarget();
|
||||
|
||||
if (!rootNavigationRef.isReady()) {
|
||||
if (retryCount < 8) {
|
||||
setTimeout(() => routeFromNotification(response, retryCount + 1), 300);
|
||||
@@ -263,11 +270,15 @@ export const NotificationProvider: FC<Props> = ({ children }) => {
|
||||
// キーが存在しない場合は初回起動なので何もしない
|
||||
})
|
||||
.finally(() => {
|
||||
Notifications.getLastNotificationResponseAsync().then((response) => {
|
||||
if (response) {
|
||||
routeFromNotification(response);
|
||||
}
|
||||
});
|
||||
Notifications.getLastNotificationResponseAsync()
|
||||
.then((response) => {
|
||||
if (response) {
|
||||
routeFromNotification(response);
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
resolveStartupNavigationSource();
|
||||
});
|
||||
});
|
||||
|
||||
return () => {
|
||||
|
||||
@@ -10,11 +10,13 @@ import {
|
||||
getStationList,
|
||||
lineList_LineWebID,
|
||||
} from "@/lib/getStationList";
|
||||
import { StationProps } from "@/lib/CommonTypes";
|
||||
import { OriginalStationList, StationProps } from "@/lib/CommonTypes";
|
||||
|
||||
type initialStateType = {
|
||||
originalStationList: StationProps[][];
|
||||
setOriginalStationList: React.Dispatch<React.SetStateAction<StationProps[][]>>;
|
||||
originalStationList: OriginalStationList;
|
||||
setOriginalStationList: React.Dispatch<
|
||||
React.SetStateAction<OriginalStationList>
|
||||
>;
|
||||
getStationDataFromName: (id: string) => StationProps[];
|
||||
getStationDataFromId: (id: string) => StationProps[];
|
||||
getStationDataFromNameBase: (name: string) => StationProps[];
|
||||
@@ -27,7 +29,7 @@ type initialStateType = {
|
||||
};
|
||||
|
||||
const initialState = {
|
||||
originalStationList: [[]],
|
||||
originalStationList: {},
|
||||
setOriginalStationList: () => {},
|
||||
getStationDataFromName: () => [],
|
||||
getStationDataFromId: () => [],
|
||||
@@ -51,7 +53,8 @@ export const useStationList = () => {
|
||||
};
|
||||
|
||||
export const StationListProvider: FC<Props> = ({ children }) => {
|
||||
const [originalStationList, setOriginalStationList] = useState<StationProps[][]>([]);
|
||||
const [originalStationList, setOriginalStationList] =
|
||||
useState<OriginalStationList>({});
|
||||
useEffect(() => {
|
||||
getStationList().then(setOriginalStationList);
|
||||
}, []);
|
||||
@@ -105,9 +108,10 @@ export const StationListProvider: FC<Props> = ({ children }) => {
|
||||
|
||||
const [stationList, setStationList] = useState<StationProps[][]>([[]]);
|
||||
useEffect(() => {
|
||||
if (originalStationList.length === 0) return;
|
||||
if (Object.keys(originalStationList).length === 0) return;
|
||||
const stationList = lineList.map((d) =>
|
||||
originalStationList[d].map((a) => ({
|
||||
...a,
|
||||
StationNumber: a.StationNumber,
|
||||
StationName: a.Station_JP,
|
||||
}))
|
||||
|
||||
@@ -6,16 +6,18 @@ import React, {
|
||||
FC,
|
||||
} from "react";
|
||||
import { lineList, getStationList } from "../lib/getStationList";
|
||||
import { StationProps } from "@/lib/CommonTypes";
|
||||
import { OriginalStationList, StationProps } from "@/lib/CommonTypes";
|
||||
|
||||
type initialStateType = {
|
||||
originalStationList: StationProps[][];
|
||||
setOriginalStationList: React.Dispatch<React.SetStateAction<StationProps[][]>>;
|
||||
originalStationList: OriginalStationList;
|
||||
setOriginalStationList: React.Dispatch<
|
||||
React.SetStateAction<OriginalStationList>
|
||||
>;
|
||||
getStationData: (id: string) => StationProps[];
|
||||
stationList: { StationNumber: string; StationName: string }[][];
|
||||
};
|
||||
const initialState = {
|
||||
originalStationList: [[]],
|
||||
originalStationList: {},
|
||||
setOriginalStationList: () => {},
|
||||
getStationData: () => [],
|
||||
stationList: [],
|
||||
@@ -30,7 +32,8 @@ export const useTopMenu = () => {
|
||||
};
|
||||
|
||||
export const TopMenuProvider: FC<Props> = ({ children }) => {
|
||||
const [originalStationList, setOriginalStationList] = useState<StationProps[][]>([]);
|
||||
const [originalStationList, setOriginalStationList] =
|
||||
useState<OriginalStationList>({});
|
||||
useEffect(() => {
|
||||
getStationList().then(setOriginalStationList);
|
||||
}, []);
|
||||
@@ -47,7 +50,7 @@ export const TopMenuProvider: FC<Props> = ({ children }) => {
|
||||
};
|
||||
const [stationList, setStationList] = useState<{ StationNumber: string; StationName: string }[][]>([[]]);
|
||||
useEffect(()=>{
|
||||
if(originalStationList.length === 0) return;
|
||||
if (Object.keys(originalStationList).length === 0) return;
|
||||
const stationList =
|
||||
originalStationList &&
|
||||
lineList.map((d) =>
|
||||
|
||||
+131
-10
@@ -7,6 +7,10 @@ import React, {
|
||||
useCallback,
|
||||
FC,
|
||||
} from "react";
|
||||
import { Platform } from "react-native";
|
||||
import * as DocumentPicker from "expo-document-picker";
|
||||
import { File, Paths } from "expo-file-system";
|
||||
import Share from "react-native-share";
|
||||
|
||||
import { ASCore } from "../storageControl";
|
||||
import { AS } from "../storageControl";
|
||||
@@ -26,17 +30,25 @@ import {
|
||||
import {
|
||||
TrainRecording,
|
||||
RecordingMeta,
|
||||
RecordingImportResult,
|
||||
saveRecording,
|
||||
loadRecordingList,
|
||||
loadRecordingById,
|
||||
deleteRecordingById,
|
||||
migrateOldRecording,
|
||||
generateRecordingId,
|
||||
buildRecordingExportText as buildRecordingExportTextCore,
|
||||
buildAllRecordingsExportText as buildAllRecordingsExportTextCore,
|
||||
importRecordingsFromText as importRecordingsFromTextCore,
|
||||
} from "../lib/mockApi/trainRecorder";
|
||||
|
||||
import { useNotification } from "../stateBox/useNotifications";
|
||||
import { useThemeColors } from "@/lib/theme";
|
||||
import { STORAGE_KEYS } from "@/constants/storage";
|
||||
import {
|
||||
normalizeIconDisplayMode,
|
||||
type IconDisplayMode,
|
||||
} from "@/lib/iconDisplayMode";
|
||||
import {
|
||||
getBackendApiBaseUrl,
|
||||
getDiagramTodayUrl,
|
||||
@@ -95,6 +107,8 @@ const initialState = {
|
||||
activeRecording: null as TrainRecording | null,
|
||||
/** 現在再生中のスナップショットインデックス */
|
||||
playbackIndex: 0,
|
||||
/** 再生中スナップショットに対応する基準時刻(通常時は null) */
|
||||
playbackCurrentTimeIso: null as string | null,
|
||||
/** 再生一時停止中か */
|
||||
playbackPaused: false,
|
||||
startRecording: () => {},
|
||||
@@ -107,6 +121,11 @@ const initialState = {
|
||||
seekToSnapshot: (_index: number) => {},
|
||||
addTrainSnapshot: (_trains: TrainEntry[]) => {},
|
||||
deleteRecording: (_id: string): Promise<void> => Promise.resolve(),
|
||||
exportRecordingFile: (_id: string): Promise<void> => Promise.resolve(),
|
||||
exportAllRecordingsFile: (): Promise<void> => Promise.resolve(),
|
||||
importRecordingFile: (): Promise<RecordingImportResult | null> => Promise.resolve(null),
|
||||
importRecordingsFromText: (_content: string): Promise<RecordingImportResult> =>
|
||||
Promise.resolve({ importedCount: 0, overwrittenCount: 0 }),
|
||||
};
|
||||
|
||||
const TrainMenuContext = createContext(initialState);
|
||||
@@ -124,16 +143,18 @@ export const TrainMenuProvider: FC<props> = ({ children }) => {
|
||||
}, []);
|
||||
type boolType = "true" | "false" | undefined;
|
||||
//画面表示関連
|
||||
const [iconSetting, setIconSetting] = useState<boolType>(undefined);
|
||||
const [iconSetting, setIconSetting] = useState<IconDisplayMode | undefined>(
|
||||
undefined,
|
||||
);
|
||||
const [mapSwitch, setMapSwitch] = useState<boolType>(undefined);
|
||||
const [stationMenu, setStationMenu] = useState<boolType>(undefined);
|
||||
const [LoadError, setLoadError] = useState(false);
|
||||
|
||||
// バックエンドAPIベースURL(環境設定から読み込み)
|
||||
const [backendApiBaseUrl, setBackendApiBaseUrl] = useState(
|
||||
const [backendApiBaseUrl, setBackendApiBaseUrl] = useState<string>(
|
||||
BACKEND_API_BASE_URLS.production,
|
||||
);
|
||||
const [diagramTodayUrl, setDiagramTodayUrl] = useState(
|
||||
const [diagramTodayUrl, setDiagramTodayUrl] = useState<string>(
|
||||
"https://jr-shikoku-api-data-storage.haruk.in/tmp/diagram-today.json",
|
||||
);
|
||||
|
||||
@@ -210,13 +231,25 @@ export const TrainMenuProvider: FC<props> = ({ children }) => {
|
||||
const [recordingList, setRecordingList] = useState<RecordingMeta[]>([]);
|
||||
const [activeRecording, setActiveRecording] = useState<TrainRecording | null>(null);
|
||||
const [playbackIndex, setPlaybackIndex] = useState(0);
|
||||
const playbackCurrentTimeIso =
|
||||
recorderState === 'playing' && activeRecording && activeRecording.snapshots.length > 0
|
||||
? new Date(
|
||||
new Date(activeRecording.recordedAt).getTime() +
|
||||
(activeRecording.snapshots[playbackIndex]?.t ?? 0)
|
||||
).toISOString()
|
||||
: null;
|
||||
const [playbackPaused, setPlaybackPaused] = useState(false);
|
||||
const recordingStartTimeRef = useRef<number>(0);
|
||||
const recordingSnapshotsRef = useRef<Array<{ t: number; trains: TrainEntry[] }>>([]);
|
||||
|
||||
const refreshRecordingList = async () => {
|
||||
const list = await loadRecordingList();
|
||||
setRecordingList(list);
|
||||
};
|
||||
|
||||
// 起動時: 旧フォーマット移行 → 一覧読み込み
|
||||
useEffect(() => {
|
||||
migrateOldRecording().then(() => loadRecordingList()).then(setRecordingList).catch(() => {});
|
||||
migrateOldRecording().then(refreshRecordingList).catch(() => {});
|
||||
}, []);
|
||||
|
||||
// 再生ループ: playbackIndex / recorderState / playbackPaused が変わるたびに次へ進める
|
||||
@@ -254,8 +287,7 @@ export const TrainMenuProvider: FC<props> = ({ children }) => {
|
||||
snapshots: snaps,
|
||||
};
|
||||
await saveRecording(recording);
|
||||
const list = await loadRecordingList();
|
||||
setRecordingList(list);
|
||||
await refreshRecordingList();
|
||||
}
|
||||
setRecorderState('idle');
|
||||
};
|
||||
@@ -300,8 +332,92 @@ export const TrainMenuProvider: FC<props> = ({ children }) => {
|
||||
|
||||
const deleteRecording = async (id: string) => {
|
||||
await deleteRecordingById(id);
|
||||
const list = await loadRecordingList();
|
||||
setRecordingList(list);
|
||||
await refreshRecordingList();
|
||||
};
|
||||
|
||||
const downloadTextFileOnWeb = (fileName: string, content: string) => {
|
||||
const web = globalThis as any;
|
||||
if (!web.document || !web.URL || !web.Blob) {
|
||||
throw new Error('この環境ではファイルのダウンロードに対応していません。');
|
||||
}
|
||||
|
||||
const blob = new web.Blob([content], { type: 'application/json' });
|
||||
const url = web.URL.createObjectURL(blob);
|
||||
const anchor = web.document.createElement('a');
|
||||
anchor.href = url;
|
||||
anchor.download = fileName;
|
||||
web.document.body.appendChild(anchor);
|
||||
anchor.click();
|
||||
anchor.remove();
|
||||
web.setTimeout(() => web.URL.revokeObjectURL(url), 0);
|
||||
};
|
||||
|
||||
const shareJsonFile = async (fileName: string, content: string) => {
|
||||
if (Platform.OS === 'web') {
|
||||
downloadTextFileOnWeb(fileName, content);
|
||||
return;
|
||||
}
|
||||
|
||||
const file = new File(Paths.cache, fileName);
|
||||
if (file.exists) {
|
||||
file.delete();
|
||||
}
|
||||
file.create({ overwrite: true });
|
||||
file.write(content);
|
||||
|
||||
await Share.open({
|
||||
title: fileName,
|
||||
subject: fileName,
|
||||
url: file.uri,
|
||||
type: 'application/json',
|
||||
filename: fileName.replace(/\.json$/i, ''),
|
||||
failOnCancel: false,
|
||||
saveToFiles: true,
|
||||
useInternalStorage: true,
|
||||
});
|
||||
};
|
||||
|
||||
const exportRecordingFile = async (id: string) => {
|
||||
const content = await buildRecordingExportTextCore(id);
|
||||
await shareJsonFile(`jrshikoku-recording-${id}.json`, content);
|
||||
};
|
||||
|
||||
const exportAllRecordingsFile = async () => {
|
||||
const content = await buildAllRecordingsExportTextCore();
|
||||
const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
|
||||
await shareJsonFile(`jrshikoku-recordings-${timestamp}.json`, content);
|
||||
};
|
||||
|
||||
const readPickedRecordingText = async (asset: DocumentPicker.DocumentPickerAsset) => {
|
||||
const webFile = (asset as any).file;
|
||||
if (Platform.OS === 'web' && webFile && typeof webFile.text === 'function') {
|
||||
return webFile.text();
|
||||
}
|
||||
|
||||
const file = new File(asset.uri);
|
||||
return file.text();
|
||||
};
|
||||
|
||||
const importRecordingFile = async (): Promise<RecordingImportResult | null> => {
|
||||
const result = await DocumentPicker.getDocumentAsync({
|
||||
type: ['application/json', 'text/json', 'text/plain', '*/*'],
|
||||
copyToCacheDirectory: true,
|
||||
multiple: false,
|
||||
base64: false,
|
||||
});
|
||||
|
||||
if (result.canceled || !result.assets?.[0]) return null;
|
||||
|
||||
const content = await readPickedRecordingText(result.assets[0]);
|
||||
const importResult = await importRecordingsFromTextCore(content);
|
||||
await refreshRecordingList();
|
||||
return importResult;
|
||||
};
|
||||
|
||||
const importRecordingsFromText = async (content: string): Promise<RecordingImportResult> => {
|
||||
const importResult = await importRecordingsFromTextCore(content);
|
||||
await refreshRecordingList();
|
||||
return importResult;
|
||||
};
|
||||
|
||||
/** PosNum + Line → Pos テキスト(位置マスターから) */
|
||||
@@ -335,8 +451,8 @@ export const TrainMenuProvider: FC<props> = ({ children }) => {
|
||||
//列車アイコンスイッチ
|
||||
ASCore({
|
||||
k: STORAGE_KEYS.ICON_SWITCH,
|
||||
s: setIconSetting,
|
||||
d: "true",
|
||||
s: (value) => setIconSetting(normalizeIconDisplayMode(value)),
|
||||
d: "original",
|
||||
u: true,
|
||||
});
|
||||
//地図スイッチ
|
||||
@@ -456,6 +572,7 @@ export const TrainMenuProvider: FC<props> = ({ children }) => {
|
||||
recordingList,
|
||||
activeRecording,
|
||||
playbackIndex,
|
||||
playbackCurrentTimeIso,
|
||||
playbackPaused,
|
||||
startRecording,
|
||||
stopRecording,
|
||||
@@ -466,6 +583,10 @@ export const TrainMenuProvider: FC<props> = ({ children }) => {
|
||||
seekToSnapshot,
|
||||
addTrainSnapshot,
|
||||
deleteRecording,
|
||||
exportRecordingFile,
|
||||
exportAllRecordingsFile,
|
||||
importRecordingFile,
|
||||
importRecordingsFromText,
|
||||
}}
|
||||
>
|
||||
{children}
|
||||
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
} from "expo-location";
|
||||
import { Platform } from "react-native";
|
||||
import useInterval from "@/lib/useInterval";
|
||||
import { logger } from "@/utils/logger";
|
||||
|
||||
type initialStateType = {
|
||||
position: LocationObject | undefined;
|
||||
@@ -42,17 +43,30 @@ export const UserPositionProvider: FC<Props> = ({ children }) => {
|
||||
);
|
||||
|
||||
const getLocationPermission = async () => {
|
||||
return requestForegroundPermissionsAsync().then((data) => {
|
||||
setLocationStatus(
|
||||
Platform.OS == "ios"
|
||||
? data.status == "granted"
|
||||
: data.android.accuracy == "fine"
|
||||
);
|
||||
});
|
||||
return requestForegroundPermissionsAsync()
|
||||
.then((data) => {
|
||||
setLocationStatus(
|
||||
Platform.OS == "ios"
|
||||
? data.status == "granted"
|
||||
: data.android.accuracy == "fine"
|
||||
);
|
||||
})
|
||||
.catch((error) => {
|
||||
setLocationStatus(false);
|
||||
if (__DEV__) {
|
||||
logger.warn("Location permission request failed:", error);
|
||||
}
|
||||
});
|
||||
};
|
||||
const getCurrentPosition = () => {
|
||||
if (!locationStatus) return () => {};
|
||||
getCurrentPositionAsync({}).then((location) => setPosition(location));
|
||||
getCurrentPositionAsync({})
|
||||
.then((location) => setPosition(location))
|
||||
.catch((error) => {
|
||||
if (__DEV__) {
|
||||
logger.warn("Current location fetch failed:", error);
|
||||
}
|
||||
});
|
||||
};
|
||||
useEffect(() => {
|
||||
if (Platform.OS == "web") return;
|
||||
|
||||
+2
-1
@@ -6,7 +6,8 @@
|
||||
}
|
||||
],
|
||||
"paths": {
|
||||
"@/*": ["./*"]
|
||||
"@/*": ["./*"],
|
||||
"expo-live-activity": ["./modules/expo-live-activity/src/index.ts"]
|
||||
}
|
||||
},
|
||||
"extends": "expo/tsconfig.base"
|
||||
|
||||
Reference in New Issue
Block a user