From 2f0beb7755476e840d75e078d45286d284a7f71c Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 15 Jun 2023 13:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=80=E5=87=BA=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/toside/music/mobile/utils/UtilsModule.java | 1 + src/core/common.ts | 3 ++- src/core/player/timeoutExit.ts | 2 +- src/plugins/player/service.ts | 10 +++++----- src/screens/Home/Horizontal/Aside.tsx | 2 +- src/screens/Home/Vertical/DrawerNav.tsx | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/android/app/src/main/java/cn/toside/music/mobile/utils/UtilsModule.java b/android/app/src/main/java/cn/toside/music/mobile/utils/UtilsModule.java index cd0e2d8..b803cd2 100644 --- a/android/app/src/main/java/cn/toside/music/mobile/utils/UtilsModule.java +++ b/android/app/src/main/java/cn/toside/music/mobile/utils/UtilsModule.java @@ -52,6 +52,7 @@ public class UtilsModule extends ReactContextBaseJavaModule { // https://stackoverflow.com/questions/6330200/how-to-quit-android-application-programmatically Activity currentActivity = reactContext.getCurrentActivity(); + Log.d("Utils", "Exit app..."); if (currentActivity == null) { Log.d("Utils", "killProcess"); android.os.Process.killProcess(android.os.Process.myPid()); diff --git a/src/core/common.ts b/src/core/common.ts index f39413c..3c52530 100644 --- a/src/core/common.ts +++ b/src/core/common.ts @@ -49,7 +49,8 @@ export const setLanguage = (locale: Parameters[0]) => { let isDestroying = false -export const exitApp = () => { +export const exitApp = (reason: string) => { + console.log('Handle Exit App, Reason: ' + reason) if (isDestroying) return isDestroying = true Promise.all([ diff --git a/src/core/player/timeoutExit.ts b/src/core/player/timeoutExit.ts index ecff8b0..4206b95 100644 --- a/src/core/player/timeoutExit.ts +++ b/src/core/player/timeoutExit.ts @@ -17,7 +17,7 @@ const timeoutTools = { global.lx.isPlayedStop = true this.callHooks() } else { - exitApp() + exitApp('Timeout Exit') } }, getTime() { diff --git a/src/plugins/player/service.ts b/src/plugins/player/service.ts index 89b313e..430a805 100644 --- a/src/plugins/player/service.ts +++ b/src/plugins/player/service.ts @@ -18,9 +18,9 @@ let isInitialized = false // let isPlaying = false // 销毁播放器并退出 -const handleExitApp = async() => { +const handleExitApp = async(reason: string) => { global.lx.isPlayedStop = false - exitApp() + exitApp(reason) } @@ -50,7 +50,7 @@ const registerPlaybackService = async() => { TrackPlayer.addEventListener(TPEvent.RemoteStop, () => { // console.log('remote-stop') - void handleExitApp() + void handleExitApp('Remote Stop') }) // TrackPlayer.addEventListener(TPEvent.RemoteDuck, async({ permanent, paused, ducking }) => { @@ -105,7 +105,7 @@ const registerPlaybackService = async() => { // console.log('playback-state', info) break } - if (global.lx.isPlayedStop) return handleExitApp() + if (global.lx.isPlayedStop) return handleExitApp('Timeout Exit') // console.log('currentIsPlaying', currentIsPlaying, global.lx.playInfo.isPlaying) // void updateMetaData(global.lx.store_playMusicInfo.musicInfo, currentIsPlaying) @@ -114,7 +114,7 @@ const registerPlaybackService = async() => { // console.log('PlaybackTrackChanged====>', info) global.lx.playerTrackId = await getCurrentTrackId() if (info.track == null) return - if (global.lx.isPlayedStop) return handleExitApp() + if (global.lx.isPlayedStop) return handleExitApp('Timeout Exit') // console.log('global.lx.playerTrackId====>', global.lx.playerTrackId) if (isEmpty()) { diff --git a/src/screens/Home/Horizontal/Aside.tsx b/src/screens/Home/Horizontal/Aside.tsx index 0cd4319..3e52628 100644 --- a/src/screens/Home/Horizontal/Aside.tsx +++ b/src/screens/Home/Horizontal/Aside.tsx @@ -115,7 +115,7 @@ export default memo(() => { confirmButtonText: global.i18n.t('list_remove_tip_button'), }).then(isExit => { if (!isExit) return - exitApp() + exitApp('Exit Btn') }) return case 'back_home': diff --git a/src/screens/Home/Vertical/DrawerNav.tsx b/src/screens/Home/Vertical/DrawerNav.tsx index c486605..1dc27a2 100644 --- a/src/screens/Home/Vertical/DrawerNav.tsx +++ b/src/screens/Home/Vertical/DrawerNav.tsx @@ -109,7 +109,7 @@ export default memo(() => { confirmButtonText: global.i18n.t('list_remove_tip_button'), }).then(isExit => { if (!isExit) return - exitApp() + exitApp('Exit Btn') }) return case 'back_home':