9 changed files with 58 additions and 64 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -6,7 +6,6 @@ plugins {
 }

 android {
-    namespace 'com.ray650128.gstreamer_demo_app'
    ndkVersion "21.3.6528147"
    compileSdk 33

@ -27,28 +26,29 @@ android {
        }
    }
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
    }
    kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = '1.8'
    }
    lint {
        abortOnError false
        checkReleaseBuilds false
    }
    viewBinding.enabled = true
+    namespace 'com.ray650128.gstreamer_demo_app'
 }

 dependencies {

-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.8.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
    implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
@ -56,6 +56,6 @@ dependencies {
    implementation project(path: ':gstreamer_player')

    // Android Jetpack lib
-    implementation("androidx.fragment:fragment-ktx:1.5.7")
-    implementation("androidx.activity:activity-ktx:1.7.1")
+    implementation("androidx.fragment:fragment-ktx:1.5.5")
+    implementation("androidx.activity:activity-ktx:1.6.1")
 }
--- 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
@ -94,7 +94,8 @@ class MainActivity : AppCompatActivity() {
        }
    }

-    private fun reloadVideoViews(list: List<List<Device>>?) {
+    private fun reloadVideoViews(list: List<List<Device>>?) = MainScope().launch {
+        val oldListCount = videoPageList.size
        for (videoPage in videoPageList) {
            supportFragmentManager.commit {
                remove(videoPage)
@ -103,6 +104,9 @@ class MainActivity : AppCompatActivity() {
        binding.viewPager.removeAllViews()
        videoPageList.clear()

+        if (oldListCount > 0) {
+            delay(500L)
+        }
        // 如果群組內沒有裝置，則顯示底圖
        if (list.isNullOrEmpty()) {
            binding.viewPager.setBackgroundResource(R.drawable.bg_not_in_playing)
--- 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
@ -162,13 +162,14 @@ class SplitViewFragment : Fragment() {
        }

        if (isClickable) {
-            videoViews.forEach { videoView ->
-                videoView.setOnClickListener {
-                    if (!videoView.isPlaying) {
+            for (position in videoViews.indices) {
+                videoViews[position].setOnClickListener {
+                    if (position >= data.size) return@setOnClickListener
+                    /*if (!videoViews[position].isPlaying) {
                        return@setOnClickListener
-                    }
+                    }*/
                    stopAll()
-                    val item = videoView.data
+                    val item = data[position]
                    val bundle = Bundle().apply {
                        //putInt(MonitoringActivity.BUNDLE_DEVICE_ID, item.id)
                        //putInt(MonitoringActivity.BUNDLE_CHANNEL_ID, item.channelId)
@ -188,23 +189,27 @@ class SplitViewFragment : Fragment() {

    private fun setAllUrl() {
        for (index in data.indices) {
-            videoViews[index].data = data[index]
+            videoViews[index].setData(data[index])
            videoViews[index].setTextVisible(
                (splitMode != Constants.SPLIT_MODE_NINE && splitMode != Constants.SPLIT_MODE_SIXTEEN)
            )
        }
    }

-    fun playAll() {
+    fun playAll() = MainScope().launch(Dispatchers.Main) {
+        if (videoViews.isEmpty()) return@launch
+        delay(splitMode * Constants.CONF_DELAY_BASE_MILLIS)
        videoViews.forEach { videoView ->
            if (videoView.isReady) {
                videoView.resetRetryCount()
                videoView.play()
+                //delay(300)
            }
        }
-    }
+    }.start()

    fun stopAll() {
+        if (videoViews.isEmpty()) return
        videoViews.forEach { videoView ->
            videoView.stopRetryCount()
            if (videoView.isPlaying || !videoView.isLoading) {
@ -214,6 +219,7 @@ class SplitViewFragment : Fragment() {
    }

    fun destroyAll() {
+        if (videoViews.isEmpty()) return
        videoViews.forEach { videoView ->
            //videoView.destroy()
            videoView.destroySurface()
--- a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/VideoView.kt
+++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/VideoView.kt
@ -35,25 +35,7 @@ class VideoView : ConstraintLayout, GstCallback {

    private lateinit var view: ItemVideoViewBinding

-    var streamType: Int = MAIN_STREAM
-
-    var data: Device? = null
-        set(value) {
-            field = value
-            if (field == null) {
-                view.textDeviceName.isVisible = false
-                isPlaying = false
-                isLoading = false
-                return
-            }
-            this.tag = field?.deviceName
-            view.textDeviceName.text = field?.deviceName
-            view.textDeviceName.isVisible = true
-            val rtspUrl = this.data?.getStreamPath(streamType) ?: return    // 如果 null 就不指派給 Gstreamer 了
-            gstLibrary.setTag(this.data!!.deviceName)
-            gstLibrary.setRtspUrl(rtspUrl)
-            Log.d("${TAG}_$tag", "Set device to: $field, rtspUrl = $rtspUrl")
-        }
+    private var data: Device? = null

    var isReady: Boolean = false

@ -113,6 +95,23 @@ class VideoView : ConstraintLayout, GstCallback {
        }
    }

+    fun setData(device: Device?, streamType: Int = SUB_STREAM) {
+        if (device == null) {
+            view.textDeviceName.isVisible = false
+            isPlaying = false
+            isLoading = false
+            return
+        }
+        this.data = device
+        this.tag = device.deviceName
+        view.textDeviceName.text = device.deviceName
+        view.textDeviceName.isVisible = true
+        val rtspUrl = this.data?.getStreamPath(streamType) ?: return    // 如果 null 就不指派給 Gstreamer 了
+        gstLibrary.setTag(this.data!!.deviceName)
+        gstLibrary.setRtspUrl(rtspUrl)
+        Log.d("${TAG}_$tag", "Set device to: $device, rtspUrl = $rtspUrl")
+    }
+
    fun setTextVisible(isVisible: Boolean) {
        view.textDeviceName.isVisible = isVisible
    }
--- a/build.gradle
+++ b/build.gradle
@ -7,8 +7,8 @@ buildscript {
 }

 plugins {
-    id 'com.android.application' version '8.0.1' apply false
-    id 'com.android.library' version '8.0.1' apply false
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
    id 'org.jetbrains.kotlin.plugin.parcelize' version '1.7.0' apply false
 }
--- a/gradle.properties
+++ b/gradle.properties
@ -18,7 +18,4 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
+kotlin.code.style=official
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
 #Thu Mar 24 14:41:01 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
--- a/gstreamer_player/build.gradle
+++ b/gstreamer_player/build.gradle
@ -2,10 +2,9 @@ apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'

 android {
-    namespace 'com.hisharp.gstreamer_player'
    ndkVersion "21.3.6528147"

-    compileSdk 33
+    compileSdkVersion 33

    defaultConfig {
        minSdkVersion 15
@ -59,17 +58,6 @@ android {
            path 'jni/Android.mk'
        }
    }
-    buildFeatures {
-        renderScript true
-        aidl true
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
 }

 afterEvaluate {
@ -81,7 +69,7 @@ afterEvaluate {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
    testImplementation 'junit:junit:4.13.2'
    //implementation 'androidx.appcompat:appcompat:1.6.0'
 }
--- a/gstreamer_player/src/com/hisharp/gstreamer_player/GstLibrary.kt
+++ b/gstreamer_player/src/com/hisharp/gstreamer_player/GstLibrary.kt
@ -142,12 +142,12 @@ class GstLibrary(context: Context) : Closeable, SurfaceHolder.Callback, TextureV
    }

    override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-        //Log.d("$TAG+$tag", String.format("Surface changed, format: %d, width: %d, height: %d", format, width, height))
+        Log.d("$TAG+$tag", String.format("Surface changed, format: %d, width: %d, height: %d", format, width, height))
        /*setSurfaceHolder(holder);*/
    }

    override fun surfaceDestroyed(holder: SurfaceHolder) {
-        //Log.d("$TAG+$tag", "Surface destroyed")
+        Log.d("$TAG+$tag", "Surface destroyed")
        this.isInit = false
        this.surface = null
        releaseSurface()
@ -156,22 +156,22 @@ class GstLibrary(context: Context) : Closeable, SurfaceHolder.Callback, TextureV
    override fun onSurfaceTextureAvailable(surface: SurfaceTexture, width: Int, height: Int) {
        this.surface = Surface(surface)
        this.surface?.let { nativeSurfaceInit(it) }
-        //Log.d("$TAG+$tag", "Surface onSurfaceTextureAvailable: $surface")
+        Log.d("$TAG+$tag", "Surface onSurfaceTextureAvailable: $surface")
    }

    override fun onSurfaceTextureSizeChanged(surface: SurfaceTexture, width: Int, height: Int) {
-        //Log.d("$TAG+$tag", "Surface onSurfaceTextureSizeChanged: $surface")
+        Log.d("$TAG+$tag", "Surface onSurfaceTextureSizeChanged: $surface")
    }

    override fun onSurfaceTextureDestroyed(surface: SurfaceTexture): Boolean {
-        //Log.d("$TAG+$tag", "Surface onSurfaceTextureDestroyed: $surface")
+        Log.d("$TAG+$tag", "Surface onSurfaceTextureDestroyed: $surface")
        this.isInit = false
        this.surface = null
        return isInit
    }

    override fun onSurfaceTextureUpdated(surface: SurfaceTexture) {
-        //Log.d("$TAG+$tag", "Surface onSurfaceTextureUpdated: $surface")
+        Log.d("$TAG+$tag", "Surface onSurfaceTextureUpdated: $surface")
    }

    companion object {