From d8d351831c5e07b1c9ffdfb0124743e4ffb91cfb Mon Sep 17 00:00:00 2001
From: Raymond Yang <sdc957@gmail.com>
Date: Fri, 10 Feb 2023 10:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=8AexitProcess?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ray650128/gstreamer_demo_app/MyApplication.kt  |  3 ++-
 .../ui/mainScreen/MainActivity.kt                  | 14 ++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/MyApplication.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/MyApplication.kt
index e151eb6..bdce2f3 100644
--- a/app/src/main/java/com/ray650128/gstreamer_demo_app/MyApplication.kt
+++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/MyApplication.kt
@@ -12,6 +12,7 @@ class MyApplication : Application(), Application.ActivityLifecycleCallbacks {
     override fun onCreate() {
         super.onCreate()
         instance = this
+        registerActivityLifecycleCallbacks(this)
     }
 
     private var currentActivity: Activity? = null
@@ -32,7 +33,7 @@ class MyApplication : Application(), Application.ActivityLifecycleCallbacks {
 
     override fun onActivityDestroyed(p0: Activity) {
         if (currentActivity?.equals(p0) == true) {
-            Log.e("APP", "EXIT...")
+            Log.e("MyApplication", "EXIT...")
             onTerminate()
             exitProcess(0)
         }
diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt
index e08d11e..8c3091f 100644
--- a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt
+++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt
@@ -47,14 +47,16 @@ class MainActivity : AppCompatActivity() {
         initObservers()
     }
 
+    override fun onBackPressed() {
+        super.onBackPressed()
+        finish()
+    }
+
     override fun onDestroy() {
-        super.onDestroy()
-        MainScope().launch {
-            for (i in 0 until splitVideoViewAdapter.itemCount) {
-                splitVideoViewAdapter.destroy(i)
-                //delay(100)
-            }
+        for (i in 0 until splitVideoViewAdapter.itemCount) {
+            splitVideoViewAdapter.destroy(i)
         }
+        super.onDestroy()
     }
 
     private fun initContentView() = binding.apply {