From 53763bfa345ece753b973fb81defa3286c3947ef Mon Sep 17 00:00:00 2001
From: Raymond Yang <sdc957@gmail.com>
Date: Wed, 8 Feb 2023 10:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=87=E5=BB=B6=E9=81=B2=E5=8F=83=E6=95=B8?=
 =?UTF-8?q?=E5=B8=B8=E6=95=B8=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ray650128/gstreamer_demo_app/Constants.kt |  2 +-
 .../ui/mainScreen/SplitViewFragment.kt                 | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/Constants.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/Constants.kt
index 310ef47..de162e4 100644
--- a/app/src/main/java/com/ray650128/gstreamer_demo_app/Constants.kt
+++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/Constants.kt
@@ -1,5 +1,5 @@
 package com.ray650128.gstreamer_demo_app
 
 object Constants {
-    const val CONF_DELAY_BASE_MILLIS = 300L
+    const val CONF_DELAY_BASE_MILLIS = 500L
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt
index 3058f43..219b262 100644
--- a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt
+++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt
@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.gridlayout.widget.GridLayout
+import com.ray650128.gstreamer_demo_app.Constants
 import com.ray650128.gstreamer_demo_app.databinding.FragmentSplitViewBinding
 import com.ray650128.gstreamer_demo_app.dp
 import com.ray650128.gstreamer_demo_app.model.Device
@@ -67,7 +68,7 @@ class SplitViewFragment : Fragment() {
     }
 
     override fun onPause() {
-        //stopAll()
+        stopAll()
         super.onPause()
         Log.d("${TAG}_$mPageNum", "onPause()")
     }
@@ -76,7 +77,7 @@ class SplitViewFragment : Fragment() {
         super.onResume()
         if (viewModel.activePage.value == mPageNum) {
             MainScope().launch {
-                delay(splitMode * 500L)
+                delay(splitMode * Constants.CONF_DELAY_BASE_MILLIS)
                 playAll()
             }
         }
@@ -156,7 +157,7 @@ class SplitViewFragment : Fragment() {
                             }
                             MainScope().launch {
                                 stopAll()
-                                delay(splitMode * 300L)
+                                delay(splitMode * Constants.CONF_DELAY_BASE_MILLIS)
                                 val item = data[position]
                                 val bundle = Bundle().apply {
                                     //putInt(MonitoringActivity.BUNDLE_DEVICE_ID, item.id)
@@ -196,8 +197,9 @@ class SplitViewFragment : Fragment() {
         if (videoViews.isEmpty()) return@launch
         for (index in data.indices) {
             videoViews[index].stopRetryCount()
+            if (!videoViews[index].isPlaying || videoViews[index].isLoading) continue
             videoViews[index].stop()
-            delay(300)
+            delay(100)
         }
     }.start()