Merge pull request #3706 from TrainLCD/dev

v7.7.2追加対応

src/components/LineBoardWest.tsx

@@ -434,7 +434,7 @@ const StationNameCell: React.FC<StationNameCellProps> = ({
 
 const LineBoardWest: React.FC<Props> = ({ stations, lineColors }: Props) => {
   const { selectedLine } = useRecoilValue(lineState)
-  const { arrived } = useRecoilValue(stationState)
+  const { arrived, approaching } = useRecoilValue(stationState)
 
   const isPassing = useIsPassing()
   const currentLine = useCurrentLine()
@@ -450,11 +450,11 @@ const LineBoardWest: React.FC<Props> = ({ stations, lineColors }: Props) => {
         key={s.groupId}
         station={s}
         stations={stations}
-        arrived={!isPassing && arrived}
+        arrived={!isPassing && !approaching && arrived}
         index={i}
       />
     ),
-    [arrived, isPassing, stations]
+    [approaching, arrived, isPassing, stations]
   )
 
   const emptyArray = useMemo(

src/hooks/useSavedRoutes.ts

@@ -1,43 +1,55 @@
 import firestore from '@react-native-firebase/firestore'
-import { useCallback, useEffect, useState } from 'react'
+import useSWR from 'swr'
+import useSWRMutation from 'swr/dist/mutation'
 import { GetStationByIdListRequest } from '../../gen/proto/stationapi_pb'
 import { grpcClient } from '../lib/grpc'
 import { SavedRoute } from '../models/SavedRoute'
 import useCachedInitAnonymousUser from './useCachedAnonymousUser'
 
 export const useSavedRoutes = () => {
   useCachedInitAnonymousUser()
-  const [routes, setRoutes] = useState<SavedRoute[]>([])
-  const [loading, setLoading] = useState(false)
 
-  useEffect(() => {
-    const fetchRoutesAsync = async () => {
-      setLoading(true)
-      const routesSnapshot = await firestore()
-        .collection('uploadedCommunityRoutes')
-        .orderBy('createdAt', 'desc')
-        .get()
-      const routes = routesSnapshot.docs.map((doc) => ({
-        id: doc.id,
-        ...doc.data(),
+  const {
+    data: routes,
+    isLoading: isRoutesLoading,
+    error: fetchRoutesError,
+  } = useSWR<SavedRoute[]>('/firestore/uploadedCommunityRoutes', async () => {
+    const routesSnapshot = await firestore()
+      .collection('uploadedCommunityRoutes')
+      .orderBy('createdAt', 'desc')
+      .get()
+
+    return routesSnapshot.docs.map((doc) => ({
+      id: doc.id,
+      ...doc.data(),
+    })) as SavedRoute[]
+  })
+
+  const {
+    isMutating: isStationsLoading,
+    error: fetchStationsError,
+    trigger: fetchStationsByRoute,
+  } = useSWRMutation(
+    '/app.trainlcd.grpc/GetStationByIdListRequest',
+    async (_, { arg: route }: { arg: SavedRoute }) => {
+      const req = new GetStationByIdListRequest()
+      req.ids = route.stations.map((sta) => sta.id)
+      const res = await grpcClient.getStationByIdList(req, {})
+      const stations = res?.stations ?? []
+
+      return stations.map((sta) => ({
+        ...sta,
+        stopCondition: route.stations.find((rs) => rs.id === sta.id)
+          ?.stopCondition,
+        trainType: route.trainType,
       }))
-      setRoutes(routes as SavedRoute[])
-      setLoading(false)
     }
-    fetchRoutesAsync()
-  }, [])
-
-  const fetchStationsByRoute = useCallback(async (route: SavedRoute) => {
-    const req = new GetStationByIdListRequest()
-    req.ids = route.stations.map((sta) => sta.id)
-    const res = await grpcClient.getStationByIdList(req, {})
-    const stations = res?.stations ?? []
-    return stations.map((sta, idx) => ({
-      ...sta,
-      stopCondition: route.stations[idx].stopCondition,
-      trainType: route.trainType,
-    }))
-  }, [])
+  )
 
-  return { routes, loading, fetchStationsByRoute }
+  return {
+    routes,
+    loading: isRoutesLoading || isStationsLoading,
+    error: fetchRoutesError || fetchStationsError,
+    fetchStationsByRoute,
+  }
 }

src/hooks/useStartBackgroundLocationUpdates.ts

@@ -16,8 +16,12 @@ export const useStartBackgroundLocationUpdates = () => {
         !(await Location.hasStartedLocationUpdatesAsync(LOCATION_TASK_NAME))
       ) {
         Location.startLocationUpdatesAsync(LOCATION_TASK_NAME, {
-          accuracy: Location.Accuracy.High,
-          distanceInterval: 250,
+          // NOTE: BestForNavigationにしたら暴走時のCPU使用率が50%ほど低下した
+          accuracy: Location.Accuracy.BestForNavigation,
+          // NOTE: マップマッチが勝手に行われると電車での経路と大きく異なることがあるはずなので
+          // OtherNavigationは必須
+          activityType: Location.ActivityType.OtherNavigation,
+          distanceInterval: 100,
           foregroundService: {
             notificationTitle: translate('bgAlertTitle'),
             notificationBody: translate('bgAlertContent'),