optimize retry

HISTORY.md

@@ -1,5 +1,9 @@
 ## 更新日誌
 
+### v1.3.8.14
+
+* 優化重試
+
 ### v1.3.8.13
 
 * 支持切換軟解/硬解

app/src/main/java/com/lizongying/mytv0/MainViewModel.kt

@@ -354,6 +354,7 @@ class MainViewModel : ViewModel() {
                             logo ?: "",
                             "",
                             uris,
+                            0,
                             mapOf(),
                             group,
                             SourceType.UNKNOWN,
@@ -377,6 +378,7 @@ class MainViewModel : ViewModel() {
                         t0.logo,
                         "",
                         uris,
+                        0,
                         mapOf(),
                         t0.group,
                         SourceType.UNKNOWN,
@@ -425,6 +427,7 @@ class MainViewModel : ViewModel() {
                         "",
                         "",
                         uris,
+                        0,
                         mapOf(),
                         channelGroup,
                         SourceType.UNKNOWN,

app/src/main/java/com/lizongying/mytv0/PlayerFragment.kt

@@ -54,24 +54,29 @@ class PlayerFragment : Fragment() {
 
     @OptIn(UnstableApi::class)
     fun updatePlayer() {
+        if (context == null) {
+            Log.e(TAG, "context == null")
+            return
+        }
+
+        val ctx = requireContext()
+
         val playerView = binding.playerView
 
-        val renderersFactory = context?.let { DefaultRenderersFactory(it) }
+        val renderersFactory = DefaultRenderersFactory(ctx)
         val playerMediaCodecSelector = PlayerMediaCodecSelector()
-        renderersFactory?.setMediaCodecSelector(playerMediaCodecSelector)
-        renderersFactory?.setExtensionRendererMode(
+        renderersFactory.setMediaCodecSelector(playerMediaCodecSelector)
+        renderersFactory.setExtensionRendererMode(
             if (SP.softDecode) DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER else DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF
         )
 
         if (player != null) {
             player?.release()
         }
 
-        player = context?.let {
-            ExoPlayer.Builder(it)
-                .setRenderersFactory(renderersFactory!!)
-                .build()
-        }
+        player = ExoPlayer.Builder(ctx)
+            .setRenderersFactory(renderersFactory)
+            .build()
         player?.repeatMode = REPEAT_MODE_ALL
         player?.playWhenReady = true
         player?.addListener(object : Player.Listener {
@@ -91,22 +96,24 @@ class PlayerFragment : Fragment() {
 
             override fun onIsPlayingChanged(isPlaying: Boolean) {
                 super.onIsPlayingChanged(isPlaying)
+
+                if (tvModel == null) {
+                    Log.e(TAG, "tvModel == null")
+                    return
+                }
+
+                val tv = tvModel!!
+
                 if (isPlaying) {
-                    tvModel?.confirmSourceType()
-                    tvModel?.setErrInfo("")
-                    tvModel!!.retryTimes = 0
+                    tv.confirmSourceType()
+                    tv.confirmVideoIndex()
+                    tv.setErrInfo("")
+                    tv.retryTimes = 0
                 } else {
-                    Log.i(TAG, "${tvModel?.tv?.title} 播放停止")
-//                                tvModel?.setErrInfo("播放停止")
+                    Log.i(TAG, "${tv.tv.title} 播放停止")
                 }
             }
 
-            override fun onPlaybackStateChanged(playbackState: Int) {
-                Log.d(TAG, "playbackState $playbackState")
-                super.onPlaybackStateChanged(playbackState)
-            }
-
-
             override fun onPositionDiscontinuity(
                 oldPosition: Player.PositionInfo,
                 newPosition: Player.PositionInfo,
@@ -120,34 +127,42 @@ class PlayerFragment : Fragment() {
 
             override fun onPlayerError(error: PlaybackException) {
                 super.onPlayerError(error)
-                tvModel?.setErrInfo(R.string.play_error.getString())
 
-                if (tvModel!!.retryTimes < tvModel!!.retryMaxTimes) {
+                if (tvModel == null) {
+                    Log.e(TAG, "tvModel == null")
+                    return
+                }
+
+                val tv = tvModel!!
+
+                if (tv.retryTimes < tv.retryMaxTimes) {
                     var last = true
-                    if (tvModel?.getSourceTypeDefault() == SourceType.UNKNOWN) {
-                        last = tvModel!!.nextSourceType()
+                    if (tv.getSourceTypeDefault() == SourceType.UNKNOWN) {
+                        last = tv.nextSourceType()
                     }
-                    tvModel?.setReady()
+                    tv.setReady(true)
                     if (last) {
-                        tvModel!!.retryTimes++
+                        tv.retryTimes++
                     }
                     Log.i(
                         TAG,
-                        "retry ${tvModel!!.videoIndex.value} ${tvModel!!.getSourceTypeCurrent()} ${tvModel!!.retryTimes}/${tvModel!!.retryMaxTimes}"
+                        "retry ${tv.videoIndex.value} ${tv.getSourceTypeCurrent()} ${tv.retryTimes}/${tv.retryMaxTimes}"
                     )
                 } else {
-                    if (!tvModel!!.isLastVideo()) {
-                        tvModel!!.nextVideo()
-                        tvModel?.setReady()
-                        tvModel!!.retryTimes = 0
+                    if (!tv.isLastVideo()) {
+                        tv.nextVideo()
+                        tv.setReady(true)
+                        tv.retryTimes = 0
+                    } else {
+                        tv.setErrInfo(R.string.play_error.getString())
                     }
                 }
             }
         })
 
         playerView.player = player
-        if (tvModel != null) {
-            play(tvModel!!)
+        tvModel?.let {
+            play(it)
         }
     }
 

app/src/main/java/com/lizongying/mytv0/data/TV.kt

@@ -10,6 +10,7 @@ data class TV(
     var logo: String = "",
     var image: String? = null,
     var uris: List<String>,
+    var videoIndex: Int = 0,
     var headers: Map<String, String>? = null,
     var group: String = "",
     var sourceType: SourceType = SourceType.UNKNOWN,

app/src/main/java/com/lizongying/mytv0/models/TVModel.kt

@@ -43,8 +43,8 @@ class TVModel(var tv: TV) : ViewModel() {
 
     var listIndex = 0
 
-    private var sourceTypeList: MutableList<SourceType> =
-        mutableListOf(
+    private var sourceTypeList: List<SourceType> =
+        listOf(
             SourceType.UNKNOWN,
         )
     private var sourceTypeIndex = 0
@@ -69,17 +69,18 @@ class TVModel(var tv: TV) : ViewModel() {
     val program: LiveData<MutableList<Program>>
         get() = _program
 
-    fun getVideoUrl(): String? {
-        if (_videoIndex.value == null || tv.uris.isEmpty()) {
-            return null
-        }
+    private val _videoIndex = MutableLiveData<Int>()
+    val videoIndex: LiveData<Int>
+        get() = _videoIndex
+    val videoIndexValue: Int
+        get() = _videoIndex.value ?: 0
 
-        if (videoIndex.value!! >= tv.uris.size) {
+    fun getVideoUrl(): String? {
+        if (videoIndexValue >= tv.uris.size) {
             return null
         }
 
-        val index = min(max(_videoIndex.value!!, 0), tv.uris.size - 1)
-        return tv.uris[index]
+        return tv.uris[videoIndexValue]
     }
 
     private val _like = MutableLiveData<Boolean>()
@@ -94,14 +95,18 @@ class TVModel(var tv: TV) : ViewModel() {
     val ready: LiveData<Boolean>
         get() = _ready
 
-    fun setReady() {
+    fun setReady(retry: Boolean = false) {
+        if (!retry) {
+            setErrInfo("")
+            retryTimes = 0
+
+            _videoIndex.value = max(0, min(tv.uris.size - 1, tv.videoIndex))
+            sourceTypeIndex =
+                max(0, min(sourceTypeList.size - 1, sourceTypeList.indexOf(tv.sourceType)))
+        }
         _ready.value = true
     }
 
-    private val _videoIndex = MutableLiveData<Int>()
-    val videoIndex: LiveData<Int>
-        get() = _videoIndex
-
     private var userAgent = ""
 
     private var _httpDataSource: DataSource.Factory? = null
@@ -133,19 +138,18 @@ class TVModel(var tv: TV) : ViewModel() {
 
             _httpDataSource = defaultHttpDataSource
 
-            if (path.lowercase().endsWith(".m3u8")) {
-                sourceTypeList[0] = SourceType.HLS
+            sourceTypeList = if (path.lowercase().endsWith(".m3u8")) {
+                listOf(SourceType.HLS)
             } else if (path.lowercase().endsWith(".mpd")) {
-                sourceTypeList[0] = SourceType.DASH
+                listOf(SourceType.DASH)
             } else if (scheme.lowercase() == "rtsp") {
-                sourceTypeList[0] = SourceType.RTSP
+                listOf(SourceType.RTSP)
             } else if (scheme.lowercase() == "rtmp") {
-                sourceTypeList[0] = SourceType.RTMP
+                listOf(SourceType.RTMP)
             } else if (scheme.lowercase() == "rtp") {
-                sourceTypeList[0] = SourceType.RTP
+                listOf(SourceType.RTP)
             } else {
-                sourceTypeList[0] = SourceType.HLS
-                sourceTypeList.add(SourceType.PROGRESSIVE)
+                listOf(SourceType.HLS, SourceType.PROGRESSIVE)
             }
 
             MediaItem.fromUri(it)
@@ -158,7 +162,7 @@ class TVModel(var tv: TV) : ViewModel() {
     }
 
     fun getSourceTypeCurrent(): SourceType {
-        sourceTypeIndex = min(max(0, sourceTypeIndex), sourceTypeList.size - 1)
+        sourceTypeIndex = max(0, min(sourceTypeList.size - 1, sourceTypeIndex))
         return sourceTypeList[sourceTypeIndex]
     }
 
@@ -173,6 +177,10 @@ class TVModel(var tv: TV) : ViewModel() {
         tv.sourceType = getSourceTypeCurrent()
     }
 
+    fun confirmVideoIndex() {
+        tv.videoIndex = videoIndexValue
+    }
+
     @OptIn(UnstableApi::class)
     fun getMediaSource(): MediaSource? {
         if (sourceTypeList.isEmpty()) {
@@ -214,27 +222,28 @@ class TVModel(var tv: TV) : ViewModel() {
     }
 
     fun isLastVideo(): Boolean {
-        return _videoIndex.value!! == tv.uris.size - 1
+        return videoIndexValue == tv.uris.size - 1
     }
 
     fun nextVideo(): Boolean {
         if (tv.uris.isEmpty()) {
             return false
         }
 
-        _videoIndex.value = (_videoIndex.value!! + 1) % tv.uris.size
-        sourceTypeList = mutableListOf(
+        _videoIndex.value = (videoIndexValue + 1) % tv.uris.size
+        sourceTypeList = listOf(
             SourceType.UNKNOWN,
         )
-        return _videoIndex.value!! == tv.uris.size - 1
+
+        return isLastVideo()
     }
 
     fun update(t: TV) {
         tv = t
     }
 
     init {
-        _videoIndex.value = min(0, tv.uris.size - 1)
+        _videoIndex.value = max(0, min(tv.uris.size - 1, tv.videoIndex))
         _like.value = SP.getLike(tv.id)
         _program.value = mutableListOf()
     }

version.json

@@ -1 +1 @@
-{"version_code": 16975885, "version_name": "v1.3.8.13"}
+{"version_code": 16975886, "version_name": "v1.3.8.14"}