diff --git a/app/src/main/java/com/stand/standapp/MainActivity.kt b/app/src/main/java/com/stand/standapp/MainActivity.kt index 4e3814b..7bb82a8 100644 --- a/app/src/main/java/com/stand/standapp/MainActivity.kt +++ b/app/src/main/java/com/stand/standapp/MainActivity.kt @@ -489,10 +489,19 @@ class MainActivity : AppCompatActivity() { geckoView.releaseSession() geckoSession?.close() geckoSession = null + clearCompanionState() instance = null super.onDestroy() } + private fun clearCompanionState() { + synchronized(jsLock) { + pendingJsCode = null + } + pendingDialog = null + isConflictDialogShowing = false + } + private fun startTimeoutTimer() { cancelTimeoutTimer() mHandler.postDelayed(timeoutRunnable, TIMEOUT_MS) diff --git a/app/src/main/java/com/stand/standapp/TempCallActivity.kt b/app/src/main/java/com/stand/standapp/TempCallActivity.kt index 7242251..0c19128 100644 --- a/app/src/main/java/com/stand/standapp/TempCallActivity.kt +++ b/app/src/main/java/com/stand/standapp/TempCallActivity.kt @@ -114,11 +114,9 @@ class TempCallActivity : AppCompatActivity() { pulseAnimator?.cancel() if (instance == this) { instance = null - // 如果不是最小化状态,说明是真正结束,清除所有状态 if (!isMinimized) { currentGroupName = "临时会话" } - // 通知 web 页面状态变化 MainActivity.executeJs("onTempCallStateChanged('" + if (isMinimized) "minimized" else "destroyed" + "')") } }