add retry

README.md

@@ -14,6 +14,11 @@
 
 ## 更新日志
 
+### v1.3.2
+
+* 增加重试，减少因网络问题导致的播放失败
+* 优化横幅banner
+
 ### v1.2.6
 
 * 支持安卓4.2

app/src/main/AndroidManifest.xml

@@ -12,12 +12,11 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.MyTV">
         <activity
             android:keepScreenOn="true"
             android:name=".MainActivity"
-            android:banner="@drawable/logo"
+            android:banner="@drawable/banner"
             android:exported="true"
             android:icon="@drawable/logo"
             android:logo="@drawable/logo"

app/src/main/java/com/lizongying/mytv/CardPresenter.kt

@@ -32,10 +32,17 @@ class CardPresenter(
         cardView.tag = tvViewModel.videoUrl.value
 
         if (tvViewModel.logo.value != null) {
-            Glide.with(viewHolder.view.context)
+            if (tvViewModel.title.value == "CCTV8K 超高清") {
-                .load(tvViewModel.logo.value)
+                Glide.with(viewHolder.view.context)
-                .centerInside()
+                    .load(R.drawable.cctv8k)
-                .into(cardView.mainImageView)
+                    .centerInside()
+                    .into(cardView.mainImageView)
+            } else {
+                Glide.with(viewHolder.view.context)
+                    .load(tvViewModel.logo.value)
+                    .centerInside()
+                    .into(cardView.mainImageView)
+            }
 
             cardView.setBackgroundColor(Color.WHITE)
             cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)

app/src/main/java/com/lizongying/mytv/InfoFragment.kt

@@ -36,9 +36,16 @@ class InfoFragment : Fragment() {
 
     fun show(tvViewModel: TVViewModel) {
         binding.textView.text = tvViewModel.title.value
-        Glide.with(this)
+        if (tvViewModel.title.value == "CCTV8K 超高清") {
-            .load(tvViewModel.logo.value)
+            Glide.with(this)
-            .into(binding.infoLogo)
+                .load(R.drawable.cctv8k)
+                .into(binding.infoLogo)
+        } else {
+            Glide.with(this)
+                .load(tvViewModel.logo.value)
+                .into(binding.infoLogo)
+        }
+
         val program = tvViewModel.getProgramOne()
         if (program != null) {
             binding.infoDesc.text = program.name

app/src/main/java/com/lizongying/mytv/MainFragment.kt

@@ -43,10 +43,6 @@ class MainFragment : BrowseSupportFragment() {
 
     private var ready = 0
 
-    init {
-        request.fetchToken(::fragmentReady)
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         headersState = HEADERS_DISABLED
@@ -212,11 +208,8 @@ class MainFragment : BrowseSupportFragment() {
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 4) {
+        if (ready == 3) {
-
+//            request.fetchPage()
-//            request?.fetchPage()
-//            tvListViewModel.getTVViewModel(0)?.let { request?.fetchProgram(it) }
-
             val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
             tvViewModel?.changed()
 
@@ -280,10 +273,6 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
-    fun tvViewModel(): TVViewModel? {
-        return tvListViewModel.getTVViewModel(itemPosition)
-    }
-
     private fun setupEventListeners() {
         onItemViewClickedListener = ItemViewClickedListener()
         onItemViewSelectedListener = ItemViewSelectedListener()

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

@@ -14,9 +14,6 @@ import androidx.media3.common.Player
 import androidx.media3.common.VideoSize
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.exoplayer.analytics.AnalyticsListener
-import androidx.media3.exoplayer.source.LoadEventInfo
-import androidx.media3.exoplayer.source.MediaLoadData
 import androidx.media3.ui.PlayerView
 import com.lizongying.mytv.databinding.PlayerBinding
 import com.lizongying.mytv.models.TVViewModel
@@ -80,71 +77,8 @@ class PlayerFragment : Fragment() {
         val videoUrlCurrent =
             tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
         playerView?.player?.run {
-            val mediaItem = MediaItem.Builder()
+            videoUrlCurrent?.let { setMediaItem(MediaItem.fromUri(it)) }
-            tvViewModel.id.value?.let { mediaItem.setMediaId(it.toString()) }
-            videoUrlCurrent?.let { mediaItem.setUri(it) }
-            setMediaItem(mediaItem.build())
             prepare()
-
-//            val httpDataSource = DefaultHttpDataSource.Factory()
-//            val hls = HlsMediaSource.Factory(httpDataSource).createMediaSource(
-//                MediaItem.fromUri(
-//                    Uri.parse(videoUrlCurrent)
-//                )
-//            )
-//            val analyticsListener: AnalyticsListener= MyAnalyticsListener()
-//            val exoPlayer = playerView?.player as ExoPlayer
-//            exoPlayer.addAnalyticsListener(analyticsListener)
-//            exoPlayer.setMediaSource(hls)
-//            exoPlayer.playWhenReady = true
-//
-//
-//            exoPlayer.let {
-//                val parameters =
-//                    TrackSelectionParameters.Builder().setPreferredAudioMimeType("application/id3").build()
-//                // 更新轨道选择器参数
-//                exoPlayer.trackSelector?.parameters = parameters
-//                Log.i(TAG, "parameters $parameters")
-//            }
-//
-//            // 获取当前轨道组
-//
-//            playerView?.player = exoPlayer
-//            playerView?.player?.prepare()
-
-
-//
-//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-//                val codecList = MediaCodecList(MediaCodecList.ALL_CODECS)
-//                val codecInfos = codecList.codecInfos
-//
-//                for (codecInfo in codecInfos) {
-//
-//                    val supportedTypes = codecInfo.supportedTypes
-//                    for (type in supportedTypes) {
-//                        Log.d("supportedTypes", "$type")
-////                        if (type.equals(androidx.media3.exoplayer.mediacode, ignoreCase = true)) {
-////                            Log.d("AudioCodecChecker", "Device supports MPEG-L2")
-////                            return
-////                        }
-//                    }
-//                }
-//
-//                Log.d("AudioCodecChecker", "Device does not support MPEG-L2")
-//            }
-
-        }
-    }
-
-    @UnstableApi
-    class MyAnalyticsListener : AnalyticsListener {
-        override fun onLoadStarted(
-            eventTime: AnalyticsListener.EventTime,
-            loadEventInfo: LoadEventInfo,
-            mediaLoadData: MediaLoadData
-        ) {
-            super.onLoadStarted(eventTime, loadEventInfo, mediaLoadData)
-//            Log.i(TAG, "loadEventInfo.uri ${loadEventInfo.uri} ${mediaLoadData.trackFormat.toString()}")
         }
     }
 

app/src/main/java/com/lizongying/mytv/Request.kt

@@ -26,7 +26,6 @@ import retrofit2.Response
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
-import kotlin.reflect.KFunction0
 
 
 class Request {
@@ -93,60 +92,16 @@ class Request {
         ysp = YSP(context)
     }
 
-    fun fetchToken(fragmentReady: KFunction0<Unit>) {
+    fun fetchVideo(tvModel: TVViewModel, cookie: String) {
-        yspTokenService.getInfo()
-            .enqueue(object : Callback<Info> {
-                override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                    if (response.isSuccessful) {
-                        val info = response.body()
-                        token = info?.data?.token
-                        Log.i(TAG, "info success $token")
-                    } else {
-                        Log.e(TAG, "info status error")
-                    }
-                    fragmentReady()
-                }
-
-                override fun onFailure(call: Call<Info>, t: Throwable) {
-                    Log.e(TAG, "info request error $t")
-                    fragmentReady()
-                }
-            })
-    }
-
-    fun fetchData(tvModel: TVViewModel) {
         if (::myRunnable.isInitialized) {
             handler.removeCallbacks(myRunnable)
         }
 
-        tvModel.seq = 0
-        val data = ysp?.switch(tvModel)
         val title = tvModel.title.value
 
+        tvModel.seq = 0
+        val data = ysp?.switch(tvModel)
         val request = data?.let { LiveInfoRequest(it) }
-        var cookie = "guid=1; vplatform=109"
-        val channels = arrayOf(
-            "CCTV3 综艺",
-            "CCTV6 电影",
-            "CCTV8 电视剧",
-            "风云剧场",
-            "第一剧场",
-            "怀旧剧场",
-            "世界地理",
-            "风云音乐",
-            "兵器科技",
-            "风云足球",
-            "高尔夫网球",
-            "女性时尚",
-            "央视文化精品",
-            "央视台球",
-            "电视指南",
-            "卫生健康",
-        )
-        if (token != null && tvModel.title.value in channels) {
-            cookie =
-                "guid=1; vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-        }
 
         request?.let { yspApiService.getLiveInfo(cookie, it) }
             ?.enqueue(object : Callback<LiveInfo> {
@@ -173,30 +128,95 @@ class Request {
                                 Log.i(TAG, "$title url $url")
                                 tvModel.addVideoUrl(url)
                                 tvModel.allReady()
-
+                                tvModel.retryTimes = 0
                                 myRunnable = MyRunnable(tvModel)
                                 handler.post(myRunnable)
                             } else {
                                 Log.e(TAG, "$title key error")
-                                tvModel.firstSource()
+                                if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                                    tvModel.retryTimes++
+                                    fetchData(tvModel)
+                                }
                             }
                         } else {
                             Log.e(TAG, "$title url error $request")
-                            tvModel.firstSource()
+                            if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                                tvModel.retryTimes++
+                                fetchData(tvModel)
+                            }
                         }
                     } else {
                         Log.e(TAG, "$title status error")
-                        tvModel.firstSource()
+                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                            tvModel.retryTimes++
+                            fetchData(tvModel)
+                        }
                     }
                 }
 
                 override fun onFailure(call: Call<LiveInfo>, t: Throwable) {
                     Log.e(TAG, "$title request error")
-                    tvModel.firstSource()
+                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                        tvModel.retryTimes++
+                        fetchData(tvModel)
+                    }
                 }
             })
     }
 
+    fun fetchData(tvModel: TVViewModel) {
+        var cookie = "guid=1; vplatform=109"
+        val channels = arrayOf(
+            "CCTV3 综艺",
+            "CCTV6 电影",
+            "CCTV8 电视剧",
+            "风云剧场",
+            "第一剧场",
+            "怀旧剧场",
+            "世界地理",
+            "风云音乐",
+            "兵器科技",
+            "风云足球",
+            "高尔夫网球",
+            "女性时尚",
+            "央视文化精品",
+            "央视台球",
+            "电视指南",
+            "卫生健康",
+        )
+        if (tvModel.title.value in channels) {
+            yspTokenService.getInfo()
+                .enqueue(object : Callback<Info> {
+                    override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                        if (response.isSuccessful) {
+                            val info = response.body()
+                            token = info?.data?.token
+                            Log.i(TAG, "info success $token")
+                            cookie =
+                                "guid=1; vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                            fetchVideo(tvModel, cookie)
+                        } else {
+                            Log.e(TAG, "info status error")
+                            if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                                tvModel.retryTimes++
+                                fetchData(tvModel)
+                            }
+                        }
+                    }
+
+                    override fun onFailure(call: Call<Info>, t: Throwable) {
+                        Log.e(TAG, "info request error $t")
+                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                            tvModel.retryTimes++
+                            fetchData(tvModel)
+                        }
+                    }
+                })
+        } else {
+            fetchVideo(tvModel, cookie)
+        }
+    }
+
     inner class MyRunnable(private val tvModel: TVViewModel) : Runnable {
         override fun run() {
             fetchBtrace(tvModel)
@@ -229,7 +249,6 @@ class Request {
                         //                        Log.d(TAG, "$title kvcollect success")
                     } else {
                         Log.e(TAG, "$title kvcollect status error")
-                        tvModel.firstSource()
                     }
                 }
 
@@ -256,7 +275,7 @@ class Request {
                             }
                             Log.i(
                                 TAG,
-                                "${item.channelName} ,${item.tvLogo},${item.pid},${item.streamId}"
+                                "${item.channelName},${item.pid},${item.streamId}"
                             )
                             var channelType = "央视频道"
                             if (item?.channelType === "weishi") {

app/src/main/java/com/lizongying/mytv/TV.kt

@@ -25,8 +25,4 @@ data class TV(
                 ", programId='" + programId + '\'' +
                 '}'
     }
-
-    companion object {
-        internal const val serialVersionUID = 727566175075960653L
-    }
 }

app/src/main/java/com/lizongying/mytv/TVList.kt

@@ -7,6 +7,7 @@ object TVList {
 
     private var mappingLogo = mapOf(
         "CCTV4K 超高清" to "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
+        "CCTV8K 超高清" to "https://static.wikia.nocookie.net/logos/images/6/69/CCTV8K.png/revision/latest/scale-to-width-down/120?cb=20230104110835&path-prefix=vi",
         "CCTV1 综合" to "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
         "CCTV2 财经" to "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
         "CCTV3 综艺" to "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
@@ -68,6 +69,7 @@ object TVList {
     )
     private var mappingEPG = mapOf(
         "CCTV4K 超高清" to "600002264",
+        "CCTV8K 超高清" to "600156816",
         "CCTV1 综合" to "600001859",
         "CCTV2 财经" to "600001800",
         "CCTV3 综艺" to "600001801",
@@ -129,6 +131,7 @@ object TVList {
     )
     private var mappingVideo = mapOf(
         "CCTV4K 超高清" to arrayOf("600002264", "2000266303"),
+        "CCTV8K 超高清" to arrayOf("600156816", "2020603421"),
         "CCTV1 综合" to arrayOf("600001859", "2000210103"),
         "CCTV2 财经" to arrayOf("600001800", "2000203603"),
         "CCTV3 综艺" to arrayOf("600001801", "2000203803"),
@@ -194,6 +197,7 @@ object TVList {
         val tvs = """
 央视频道
 CCTV4K 超高清,
+CCTV8K 超高清,
 CCTV1 综合,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226231/index.m3u8
 CCTV2 财经,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index.m3u8
 CCTV3 综艺,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226397/index.m3u8
@@ -212,12 +216,6 @@ CCTV14 少儿,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/inde
 CCTV15 音乐,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8
 CCTV16 奥林匹克,http://39.134.24.162/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8
 CCTV17 农业农村,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226198/index.m3u8
-CGTN,http://live.cgtn.com/1000/prog_index.m3u8
-CGTN 法语频道,https://livefr.cgtn.com/1000f/prog_index.m3u8
-CGTN 俄语频道,http://liveru.cgtn.com/1000r/prog_index.m3u8
-CGTN 阿拉伯语频道,http://livear.cgtn.com/1000a/prog_index.m3u8
-CGTN 西班牙语频道,http://livees.cgtn.com/500e/prog_index.m3u8;http://livees.cgtn.com/1000e/prog_index.m3u8
-CGTN 纪录频道,https://livedoc.cgtn.com/500d/prog_index.m3u8
 风云剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226950/index.m3u8
 第一剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226959/index.m3u8
 怀旧剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226972/index.m3u8
@@ -253,6 +251,13 @@ CGTN 纪录频道,https://livedoc.cgtn.com/500d/prog_index.m3u8
 四川卫视,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8;http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8
 东南卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226341/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225766/index.m3u8
 海南卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226465/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225769/index.m3u8
+国际频道
+CGTN,http://live.cgtn.com/1000/prog_index.m3u8
+CGTN 法语频道,https://livefr.cgtn.com/1000f/prog_index.m3u8
+CGTN 俄语频道,http://liveru.cgtn.com/1000r/prog_index.m3u8
+CGTN 阿拉伯语频道,http://livear.cgtn.com/1000a/prog_index.m3u8
+CGTN 西班牙语频道,http://livees.cgtn.com/500e/prog_index.m3u8;http://livees.cgtn.com/1000e/prog_index.m3u8
+CGTN 纪录频道,https://livedoc.cgtn.com/500d/prog_index.m3u8
         """.trimIndent()
 
         val map: MutableMap<String, MutableList<TV>> = mutableMapOf()

app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt

@@ -19,6 +19,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     private var rowPosition: Int = 0
     private var itemPosition: Int = 0
 
+    var retryTimes: Int = 0
+    var retryMaxTimes: Int = 3
     var programUpdateTime: Long = 0
 
     private val _programId = MutableLiveData<String>()