拿掉LOG

2.優化VideoView get/set

app/build.gradle

@@ -6,6 +6,7 @@ plugins {
 }
 
 android {
+    namespace 'com.ray650128.gstreamer_demo_app'
     ndkVersion "21.3.6528147"
     compileSdk 33
 
@@ -26,29 +27,28 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     lint {
         abortOnError false
         checkReleaseBuilds false
     }
     viewBinding.enabled = true
-    namespace 'com.ray650128.gstreamer_demo_app'
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.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.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     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.5")
+    implementation("androidx.fragment:fragment-ktx:1.5.7")
-    implementation("androidx.activity:activity-ktx:1.6.1")
+    implementation("androidx.activity:activity-ktx:1.7.1")
 }

app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt

@@ -94,8 +94,7 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun reloadVideoViews(list: List<List<Device>>?) = MainScope().launch {
+    private fun reloadVideoViews(list: List<List<Device>>?) {
-        val oldListCount = videoPageList.size
         for (videoPage in videoPageList) {
             supportFragmentManager.commit {
                 remove(videoPage)
@@ -104,9 +103,6 @@ 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)

app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt

@@ -162,14 +162,13 @@ class SplitViewFragment : Fragment() {
         }
 
         if (isClickable) {
-            for (position in videoViews.indices) {
+            videoViews.forEach { videoView ->
-                videoViews[position].setOnClickListener {
+                videoView.setOnClickListener {
-                    if (position >= data.size) return@setOnClickListener
+                    if (!videoView.isPlaying) {
-                    /*if (!videoViews[position].isPlaying) {
                         return@setOnClickListener
-                    }*/
+                    }
                     stopAll()
-                    val item = data[position]
+                    val item = videoView.data
                     val bundle = Bundle().apply {
                         //putInt(MonitoringActivity.BUNDLE_DEVICE_ID, item.id)
                         //putInt(MonitoringActivity.BUNDLE_CHANNEL_ID, item.channelId)
@@ -189,27 +188,23 @@ class SplitViewFragment : Fragment() {
 
     private fun setAllUrl() {
         for (index in data.indices) {
-            videoViews[index].setData(data[index])
+            videoViews[index].data = data[index]
             videoViews[index].setTextVisible(
                 (splitMode != Constants.SPLIT_MODE_NINE && splitMode != Constants.SPLIT_MODE_SIXTEEN)
             )
         }
     }
 
-    fun playAll() = MainScope().launch(Dispatchers.Main) {
+    fun playAll() {
-        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) {
@@ -219,7 +214,6 @@ class SplitViewFragment : Fragment() {
     }
 
     fun destroyAll() {
-        if (videoViews.isEmpty()) return
         videoViews.forEach { videoView ->
             //videoView.destroy()
             videoView.destroySurface()

app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/VideoView.kt

@@ -35,7 +35,25 @@ class VideoView : ConstraintLayout, GstCallback {
 
     private lateinit var view: ItemVideoViewBinding
 
-    private var data: Device? = null
+    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")
+        }
 
     var isReady: Boolean = false
 
@@ -95,23 +113,6 @@ 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
     }

build.gradle

@@ -7,8 +7,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.1' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.library' version '8.0.1' 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
 }

gradle.properties

@@ -18,4 +18,7 @@ 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
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

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-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gstreamer_player/build.gradle

@@ -2,9 +2,10 @@ apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
+    namespace 'com.hisharp.gstreamer_player'
     ndkVersion "21.3.6528147"
 
-    compileSdkVersion 33
+    compileSdk 33
 
     defaultConfig {
         minSdkVersion 15
@@ -58,6 +59,17 @@ android {
             path 'jni/Android.mk'
         }
     }
+    buildFeatures {
+        renderScript true
+        aidl true
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 afterEvaluate {
@@ -69,7 +81,7 @@ afterEvaluate {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     testImplementation 'junit:junit:4.13.2'
     //implementation 'androidx.appcompat:appcompat:1.6.0'
 }

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 {