Merge pull request #3622 from TrainLCD/fix/perf

暴走発熱バグ修正

index.js

@@ -14,26 +14,26 @@ TaskManager.defineTask(locationTaskName, ({ data, error }) => {
     return BackgroundFetchResult.Failed
   }
 
-  const curLocation = useLocationStore.getState().location
+  const stateLat = useLocationStore.getState().location?.coords.latitude
+  const stateLon = useLocationStore.getState().location?.coords.longitude
+  const stateTimestamp = useLocationStore.getState().location?.timestamp
+  const setLocation = useLocationStore.getState().setLocation
+
   if (
-    curLocation?.coords.latitude === data.locations[0]?.coords.latitude &&
-    curLocation?.coords.longitude === data.locations[0]?.coords.longitude
+    stateLat === data.locations[0]?.coords.latitude &&
+    stateLon === data.locations[0]?.coords.longitude
   ) {
     return BackgroundFetchResult.NoData
   }
 
-  const now = dayjs()
-  const stateTimestamp = curLocation && dayjs(curLocation.timestamp)
+  const receivedTimestamp =
+    data.locations[0] && dayjs(data.locations[0].timestamp)
   const diffSeconds =
-    (stateTimestamp && now.diff(stateTimestamp, 'seconds')) ?? 0
-  if (diffSeconds < 1) {
-    return BackgroundFetchResult.NoData
-  }
+    stateTimestamp && receivedTimestamp.diff(stateTimestamp, 'seconds')
+  if (!diffSeconds) return BackgroundFetchResult.NoData
+  if (diffSeconds < 1) return BackgroundFetchResult.NoData
 
-  useLocationStore.setState((state) => ({
-    ...state,
-    location: data.locations[0],
-  }))
+  setLocation(data.locations[0])
 
   return BackgroundFetchResult.NewData
 })

src/hooks/useAnonymousUser.ts

@@ -1,26 +1,26 @@
 import type { FirebaseAuthTypes } from '@react-native-firebase/auth'
 import auth from '@react-native-firebase/auth'
-import { useEffect, useState } from 'react'
+import { useEffect, useRef } from 'react'
 
 /**
  * Recoilが使えない環境の時にもユーザーを持ちたい場合に使います。基本的に `useCachedAnonymousUser` を使ってください。
  */
 const useAnonymousUser = (): FirebaseAuthTypes.User | undefined => {
-  const [user, setUser] = useState<FirebaseAuthTypes.User>()
+  const userRef = useRef<FirebaseAuthTypes.User>()
   useEffect(() => {
     const unsubscribe = auth().onAuthStateChanged((authUser) => {
       if (authUser) {
-        setUser(authUser)
+        userRef.current = authUser
       } else {
         auth()
           .signInAnonymously()
-          .then((credential) => setUser(credential.user))
+          .then((credential) => (userRef.current = credential.user))
       }
     })
     return unsubscribe
-  }, [setUser, user])
+  }, [])
 
-  return user
+  return userRef.current
 }
 
 export default useAnonymousUser

src/hooks/useStartBackgroundLocationUpdates.ts

@@ -22,7 +22,7 @@ export const useStartBackgroundLocationUpdates = () => {
 
       await Location.startLocationUpdatesAsync(locationTaskName, {
         accuracy: locationServiceAccuracy,
-        activityType: Location.LocationActivityType.OtherNavigation,
+        activityType: Location.ActivityType.OtherNavigation,
         foregroundService: {
           notificationTitle: translate('bgAlertTitle'),
           notificationBody: translate('bgAlertContent'),

src/hooks/useTTS.ts

@@ -1,17 +1,11 @@
 import { Audio, InterruptionModeAndroid, InterruptionModeIOS } from 'expo-av'
 import * as FileSystem from 'expo-file-system'
 import { useCallback, useEffect, useMemo, useRef } from 'react'
-import DeviceInfo from 'react-native-device-info'
-import {
-  DEV_TTS_API_URL,
-  LOCAL_TTS_API_URL,
-  PRODUCTION_TTS_API_URL,
-} from 'react-native-dotenv'
+import { DEV_TTS_API_URL, PRODUCTION_TTS_API_URL } from 'react-native-dotenv'
 import { useRecoilValue } from 'recoil'
 import speechState from '../store/atoms/speech'
 import { isDevApp } from '../utils/isDevApp'
 import useAnonymousUser from './useAnonymousUser'
-import useConnectivity from './useConnectivity'
 import { usePrevious } from './usePrevious'
 import { useTTSCache } from './useTTSCache'
 import useTTSText from './useTTSText'
@@ -26,7 +20,7 @@ export const useTTS = (): void => {
   const ttsText = useTTSText(firstSpeechRef.current)
   const [prevTextJa, prevTextEn] = usePrevious(ttsText)
   const [textJa, textEn] = ttsText
-  const isInternetAvailable = useConnectivity()
+
   const user = useAnonymousUser()
 
   const soundJaRef = useRef<Audio.Sound | null>(null)
@@ -80,9 +74,6 @@ export const useTTS = (): void => {
   }, [])
 
   const ttsApiUrl = useMemo(() => {
-    if (__DEV__ && DeviceInfo.isEmulatorSync()) {
-      return LOCAL_TTS_API_URL
-    }
     return isDevApp ? DEV_TTS_API_URL : PRODUCTION_TTS_API_URL
   }, [])
 
@@ -173,9 +164,8 @@ export const useTTS = (): void => {
 
   useEffect(() => {
     if (
-      playingRef.current ||
       !enabled ||
-      !isInternetAvailable ||
+      playingRef.current ||
       prevTextJa === textJa ||
       prevTextEn === textEn
     ) {
@@ -186,15 +176,7 @@ export const useTTS = (): void => {
       textJa,
       textEn,
     })
-  }, [
-    enabled,
-    isInternetAvailable,
-    prevTextEn,
-    prevTextJa,
-    speech,
-    textEn,
-    textJa,
-  ])
+  }, [enabled, prevTextEn, prevTextJa, speech, textEn, textJa])
 
   useEffect(() => {
     return () => {