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 {