fix retry bug

README.md

@@ -18,10 +18,6 @@
 
 * 性能优化
 
-### v1.5.0（通用版）
-
-* 修复部分情况下APP切换后无法继续播放的问题
-
 ### v1.4.9（高版本专用）
 
 * 同步v1.4.8

app/build.gradle

@@ -101,7 +101,7 @@ dependencies {
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
 
     // 21:2.9.0 17:2.6.4
-    def retrofit2_version = "2.6.4"
+    def retrofit2_version = "2.9.0"
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
     implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"

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

@@ -1,119 +0,0 @@
-package com.lizongying.mytv
-
-import android.graphics.Color
-import android.view.ContextThemeWrapper
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.ScaleAnimation
-import android.widget.ImageView
-import androidx.leanback.widget.ImageCardView
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.lizongying.mytv.models.TVListViewModel
-import com.lizongying.mytv.models.TVViewModel
-
-
-class CardAdapter(private val owner: LifecycleOwner, private var tvListViewModel: TVListViewModel) :
-    RecyclerView.Adapter<CardAdapter.ViewHolder>() {
-
-    private var listener: ItemListener? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val cardView = object :
-            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
-        startScaleAnimation(cardView, 1.0f, 0.9f)
-        cardView.isFocusable = true
-        cardView.isFocusableInTouchMode = true
-
-        return ViewHolder(cardView)
-    }
-
-    private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float) {
-        val scaleAnimation = ScaleAnimation(
-            fromScale, toScale,
-            fromScale, toScale,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f
-        )
-        scaleAnimation.duration = 200
-        scaleAnimation.fillAfter = true
-
-        view.startAnimation(scaleAnimation)
-    }
-
-    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
-        val item = tvListViewModel.getTVViewModel(position)
-
-        val tvViewModel = item as TVViewModel
-        val cardView = viewHolder.view as ImageCardView
-
-        cardView.setOnFocusChangeListener { _, hasFocus ->
-            listener?.onItemFocusChange(item, hasFocus)
-            if (hasFocus) {
-                startScaleAnimation(cardView, 0.9f, 1.0f)
-            } else {
-                startScaleAnimation(cardView, 1.0f, 0.9f)
-            }
-        }
-
-        cardView.setOnClickListener { _ ->
-            listener?.onItemClicked(item)
-        }
-
-        cardView.titleText = tvViewModel.title.value
-        cardView.tag = tvViewModel.videoUrl.value
-
-        when (tvViewModel.title.value) {
-            "CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.cctv8k)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "天津卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.tianjin)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "新疆卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.xinjiang)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            else -> Glide.with(viewHolder.view.context)
-                .load(tvViewModel.logo.value)
-                .centerInside()
-                .into(cardView.mainImageView)
-        }
-
-        cardView.mainImageView.setBackgroundColor(Color.WHITE)
-        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
-
-        tvViewModel.program.observe(owner) { _ ->
-            val program = tvViewModel.getProgramOne()
-            if (program != null) {
-                cardView.contentText = program.name
-            }
-        }
-    }
-
-    override fun getItemCount() = tvListViewModel.size()
-
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val view = itemView
-    }
-
-    interface ItemListener {
-        fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean)
-        fun onItemClicked(tvViewModel: TVViewModel)
-    }
-
-    fun setItemListener(listener: ItemListener) {
-        this.listener = listener
-    }
-
-    companion object {
-        private const val TAG = "CardAdapter"
-    }
-}
-

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

@@ -122,7 +122,6 @@ class MainActivity : FragmentActivity() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
-            mainFragment.setPosition()
             transaction.show(mainFragment)
             keepRunnable()
         } else {

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

@@ -5,31 +5,30 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
-import androidx.fragment.app.Fragment
+import androidx.leanback.app.BrowseSupportFragment
+import androidx.leanback.widget.ArrayObjectAdapter
+import androidx.leanback.widget.HeaderItem
+import androidx.leanback.widget.ListRow
+import androidx.leanback.widget.ListRowPresenter
+import androidx.leanback.widget.ListRowPresenter.SelectItemViewHolderTask
+import androidx.leanback.widget.OnItemViewClickedListener
+import androidx.leanback.widget.OnItemViewSelectedListener
+import androidx.leanback.widget.Presenter
+import androidx.leanback.widget.Row
+import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.lizongying.mytv.Utils.dpToPx
 import com.lizongying.mytv.Utils.getDateTimestamp
-import com.lizongying.mytv.databinding.RowBinding
-import com.lizongying.mytv.databinding.ShowBinding
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class MainFragment : Fragment(), CardAdapter.ItemListener {
+class MainFragment : BrowseSupportFragment() {
 
     private var itemPosition = 0
 
-    private var rowList: MutableList<View> = mutableListOf()
-
-    private var _binding: ShowBinding? = null
-    private val binding get() = _binding!!
+    private var rowsAdapter: ArrayObjectAdapter? = null
 
     private var request = Request()
 
@@ -44,12 +43,15 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var ready = 0
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = ShowBinding.inflate(inflater, container, false)
-        return binding.root
+    override fun onCreate(savedInstanceState: Bundle?) {
+        Log.i(TAG, "onCreate")
+        super.onCreate(savedInstanceState)
+        headersState = HEADERS_DISABLED
+    }
+
+    override fun onStart() {
+        Log.i(TAG, "onStart")
+        super.onStart()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -58,140 +60,171 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         activity?.let { request.initYSP(it) }
         sharedPref = (activity as? MainActivity)?.sharedPref!!
 
-        view?.post {
-            val content = binding.content
+        loadRows()
 
-            var idx: Long = 0
-            for ((k, v) in TVList.list) {
-                val itemBinding: RowBinding =
-                    RowBinding.inflate(layoutInflater, content, false)
+        setupEventListeners()
 
-                val tvListViewModelCurrent = TVListViewModel()
-                for ((idx2, v1) in v.withIndex()) {
-                    val tvViewModel = TVViewModel(v1)
-                    tvViewModel.setRowPosition(idx.toInt())
-                    tvViewModel.setItemPosition(idx2)
-                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
-                    tvListViewModel.addTVViewModel(tvViewModel)
+        mUpdateProgramRunnable = UpdateProgramRunnable()
+        handler.post(mUpdateProgramRunnable)
+
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                if (tvViewModel.errInfo.value != null
+                    && tvViewModel.id.value == itemPosition
+                ) {
+                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
                 }
-                tvListViewModel.maxNum.add(v.size)
-
-                val adapter = CardAdapter(viewLifecycleOwner, tvListViewModelCurrent)
-                rowList.add(itemBinding.rowItems)
-
-                adapter.setItemListener(this)
-
-                itemBinding.rowHeader.text = k
-                itemBinding.rowItems.adapter = adapter
-                itemBinding.rowItems.layoutManager =
-                    LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-
-                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
-                layoutParams.topMargin = dpToPx(11F)
-                itemBinding.row.layoutParams = layoutParams
-                content.addView(itemBinding.row)
-
-                idx++
             }
+            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
 
-            mUpdateProgramRunnable = UpdateProgramRunnable()
-            handler.post(mUpdateProgramRunnable)
-
-            itemPosition = sharedPref.getInt(POSITION, 0)
-            if (itemPosition >= tvListViewModel.size()) {
-                itemPosition = 0
+                // not first time && channel not change
+                if (tvViewModel.ready.value != null
+                    && tvViewModel.id.value == itemPosition
+                    && check(tvViewModel)
+                ) {
+                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                    (activity as? MainActivity)?.play(tvViewModel)
+                }
             }
-            tvListViewModel.setItemPosition(itemPosition)
-            setPosition()
-            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.errInfo.value != null
-                        && tvViewModel.id.value == itemPosition
-                    ) {
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
-                            .show()
-                    }
-                }
-                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
-
-                    // not first time && channel not change
-                    if (tvViewModel.ready.value != null
-                        && tvViewModel.id.value == itemPosition
-                        && check(tvViewModel)
-                    ) {
-                        Log.i(TAG, "ready ${tvViewModel.title.value}")
-                        (activity as? MainActivity)?.play(tvViewModel)
-                    }
-                }
-                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.change.value != null) {
-                        val title = tvViewModel.title.value
-                        Log.i(TAG, "switch $title")
-                        if (tvViewModel.pid.value != "") {
-                            Log.i(TAG, "request $title ${tvViewModel.pid.value}")
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { request.fetchData(it) }
-                            }
+            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
+                if (tvViewModel.change.value != null) {
+                    val title = tvViewModel.title.value
+                    if (tvViewModel.pid.value != "") {
+                        Log.i(TAG, "request $title")
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            tvViewModel.let { request.fetchData(it) }
+                        }
+                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                        setSelectedPosition(
+                            tvViewModel.getRowPosition(), true,
+                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
+                        )
+                    } else {
+                        if (check(tvViewModel)) {
+                            (activity as? MainActivity)?.play(tvViewModel)
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setPosition(
-                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                            setSelectedPosition(
+                                tvViewModel.getRowPosition(), true,
+                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
                             )
-                        } else {
-                            if (check(tvViewModel)) {
-                                (activity as? MainActivity)?.play(tvViewModel)
-                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                                setPosition(
-                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
-                                )
-                            }
                         }
                     }
                 }
             }
+        }
 
-            fragmentReady()
+        fragmentReady()
+    }
+
+    fun toLastPosition() {
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
+        )
+    }
+
+    fun toFirstPosition() {
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(0)
+        )
+    }
+
+    override fun startHeadersTransition(withHeaders: Boolean) {
+    }
+
+    private fun loadRows() {
+        rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
+
+        val cardPresenter = CardPresenter(viewLifecycleOwner)
+
+        var idx: Long = 0
+        for ((k, v) in TVList.list) {
+            val listRowAdapter = ArrayObjectAdapter(cardPresenter)
+            for ((idx2, v1) in v.withIndex()) {
+                val tvViewModel = TVViewModel(v1)
+                tvViewModel.setRowPosition(idx.toInt())
+                tvViewModel.setItemPosition(idx2)
+                tvListViewModel.addTVViewModel(tvViewModel)
+                listRowAdapter.add(tvViewModel)
+            }
+            tvListViewModel.maxNum.add(v.size)
+            val header = HeaderItem(idx, k)
+            rowsAdapter!!.add(ListRow(header, listRowAdapter))
+            idx++
+        }
+
+        adapter = rowsAdapter
+
+        itemPosition = sharedPref.getInt(POSITION, 0)
+        if (itemPosition >= tvListViewModel.size()) {
+            itemPosition = 0
+        }
+        tvListViewModel.setItemPosition(itemPosition)
+    }
+
+    fun prevSource() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.minus(1)
+                    if (videoIndex == -1) {
+                        tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
+                    }
+                    tvViewModel.changed()
+                }
+            }
         }
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-    }
-
-    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
-        if (hasFocus) {
-            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
-            (activity as MainActivity).keepRunnable()
+    fun nextSource() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
+                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
+                        tvViewModel.setVideoIndex(0)
+                    }
+                    tvViewModel.changed()
+                }
+            }
         }
     }
 
-    override fun onItemClicked(tvViewModel: TVViewModel) {
-        if (this.isHidden) {
-            (activity as? MainActivity)?.switchMainFragment()
-            return
-        }
-
-        if (itemPosition != tvViewModel.id.value!!) {
-            itemPosition = tvViewModel.id.value!!
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-        (activity as? MainActivity)?.switchMainFragment()
+    private fun setupEventListeners() {
+        onItemViewClickedListener = ItemViewClickedListener()
+        onItemViewSelectedListener = ItemViewSelectedListener()
     }
 
-    fun setPosition() {
-        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-        rowList[tvViewModel!!.getRowPosition()].post {
-            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
-                tvViewModel.getItemPosition()
-            )?.requestFocus()
+    private inner class ItemViewClickedListener : OnItemViewClickedListener {
+        override fun onItemClicked(
+            itemViewHolder: Presenter.ViewHolder,
+            item: Any,
+            rowViewHolder: RowPresenter.ViewHolder,
+            row: Row
+        ) {
+            if (item is TVViewModel) {
+                if (itemPosition != item.id.value!!) {
+                    itemPosition = item.id.value!!
+                    tvListViewModel.setItemPosition(itemPosition)
+                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
+                }
+                (activity as? MainActivity)?.switchMainFragment()
+            }
         }
     }
 
-    fun setPosition(rowPosition: Int, itemPosition: Int) {
-        rowList[rowPosition].post {
-            ((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
-                itemPosition
-            )?.requestFocus()
+    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
+        override fun onItemSelected(
+            itemViewHolder: Presenter.ViewHolder?, item: Any?,
+            rowViewHolder: RowPresenter.ViewHolder, row: Row
+        ) {
+            if (item is TVViewModel) {
+                tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                (activity as MainActivity).keepRunnable()
+            }
         }
     }
 
@@ -271,7 +304,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     inner class UpdateProgramRunnable : Runnable {
         override fun run() {
-            tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null }
+            tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null && it.programId.value != "" }
                 ?.forEach { tvViewModel ->
                     updateProgram(
                         tvViewModel
@@ -302,12 +335,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         handler.removeCallbacks(mUpdateProgramRunnable)
     }
 
-    override fun onDestroyView() {
-        Log.i(TAG, "onDestroyView")
-        super.onDestroyView()
-        _binding = null
-    }
-
     companion object {
         private const val TAG = "MainFragment"
         private const val POSITION = "position"

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

@@ -39,6 +39,8 @@ class Request {
     private lateinit var btraceRunnable: BtraceRunnable
     private var tokenRunnable: TokenRunnable = TokenRunnable()
 
+    private val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
+
     private var mapping = mapOf(
         "CCTV4K" to "CCTV4K 超高清",
         "CCTV1" to "CCTV1 综合",
@@ -121,7 +123,6 @@ class Request {
                             Base64.DEFAULT
                         )
                         val decodedString = String(decodedBytes)
-                        val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
                         val matchResult = regex.find(decodedString)
                         if (matchResult != null) {
                             val (key, iv) = matchResult.destructured
@@ -131,7 +132,7 @@ class Request {
                                 keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
                                 ivBytes
                             ).uppercase()
-//                            Log.d(TAG, "$title url $url")
+                            Log.d(TAG, "$title url $url")
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()
                             tvModel.retryTimes = 0
@@ -142,8 +143,14 @@ class Request {
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
                                 if (tvModel.needToken) {
-                                    token = ""
-                                    fetchVideo(tvModel)
+                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                        if (!tvModel.mustToken) {
+                                            fetchVideo(tvModel, cookie)
+                                        }
+                                    } else {
+                                        token = ""
+                                        fetchVideo(tvModel)
+                                    }
                                 } else {
                                     fetchVideo(tvModel, cookie)
                                 }
@@ -158,8 +165,14 @@ class Request {
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
                                 if (tvModel.needToken) {
-                                    token = ""
-                                    fetchVideo(tvModel)
+                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                        if (!tvModel.mustToken) {
+                                            fetchVideo(tvModel, cookie)
+                                        }
+                                    } else {
+                                        token = ""
+                                        fetchVideo(tvModel)
+                                    }
                                 } else {
                                     fetchVideo(tvModel, cookie)
                                 }
@@ -171,8 +184,14 @@ class Request {
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
                         if (tvModel.needToken) {
-                            token = ""
-                            fetchVideo(tvModel)
+                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                if (!tvModel.mustToken) {
+                                    fetchVideo(tvModel, cookie)
+                                }
+                            } else {
+                                token = ""
+                                fetchVideo(tvModel)
+                            }
                         } else {
                             fetchVideo(tvModel, cookie)
                         }
@@ -185,8 +204,14 @@ class Request {
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.needToken) {
-                        token = ""
-                        fetchVideo(tvModel)
+                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                            if (!tvModel.mustToken) {
+                                fetchVideo(tvModel, cookie)
+                            }
+                        } else {
+                            token = ""
+                            fetchVideo(tvModel)
+                        }
                     } else {
                         fetchVideo(tvModel, cookie)
                     }
@@ -208,18 +233,28 @@ class Request {
                             fetchVideo(tvModel, cookie)
                         } else {
                             Log.e(TAG, "info status error")
-                            if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                                tvModel.retryTimes++
+                            if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
+                                tvModel.tokenRetryTimes++
                                 fetchVideo(tvModel)
+                            } else {
+                                if (!tvModel.mustToken) {
+                                    val cookie = "vplatform=109"
+                                    fetchVideo(tvModel, cookie)
+                                }
                             }
                         }
                     }
 
                     override fun onFailure(call: Call<Info>, t: Throwable) {
                         Log.e(TAG, "info request error $t")
-                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                            tvModel.retryTimes++
+                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
+                            tvModel.tokenRetryTimes++
                             fetchVideo(tvModel)
+                        } else {
+                            if (!tvModel.mustToken) {
+                                val cookie = "vplatform=109"
+                                fetchVideo(tvModel, cookie)
+                            }
                         }
                     }
                 })

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

@@ -71,7 +71,7 @@ object TVList {
     )
     private var mappingEPG = mapOf(
         "CCTV4K 超高清" to "600002264",
-        "CCTV8K 超高清" to "600156816",
+//        "CCTV8K 超高清" to "600156816",
         "CCTV1 综合" to "600001859",
         "CCTV2 财经" to "600001800",
         "CCTV3 综艺" to "600001801",
@@ -95,7 +95,7 @@ object TVList {
         "CGTN 俄语频道" to "600084758",
         "CGTN 阿拉伯语频道" to "600084782",
         "CGTN 西班牙语频道" to "600084744",
-        "CGTN 记录频道" to "600084781",
+//        "CGTN 记录频道" to "600084781",
         "风云剧场" to "600099658",
         "第一剧场" to "600099655",
         "怀旧剧场" to "600099620",
@@ -130,8 +130,8 @@ object TVList {
         "四川卫视" to "600002516",
         "东南卫视" to "600002484",
         "海南卫视" to "600002506",
-        "天津卫视" to "600152137",
-        "新疆卫视" to "600152138",
+//        "天津卫视" to "600152137",
+//        "新疆卫视" to "600152138",
     )
     private var mappingVideo = mapOf(
         "CCTV4K 超高清" to arrayOf("600002264", "2000266303"),

app/src/main/java/com/lizongying/mytv/api/YSP.kt

@@ -2,7 +2,6 @@ package com.lizongying.mytv.api
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
 import com.lizongying.mytv.Encryptor
 import com.lizongying.mytv.MainActivity
 import com.lizongying.mytv.Utils.getDateTimestamp

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

@@ -19,8 +19,10 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     private var rowPosition: Int = 0
     private var itemPosition: Int = 0
 
-    var retryTimes: Int = 0
-    var retryMaxTimes: Int = 8
+    var retryTimes = 0
+    var tokenRetryTimes = 0
+    var retryMaxTimes = 8
+    var tokenRetryMaxTimes = 2
     var programUpdateTime: Long = 0
 
     private val _errInfo = MutableLiveData<String>()
@@ -77,6 +79,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
 
     var needToken = false
 
+    var mustToken = false
+
     private val channelsNeedToken = arrayOf(
         "CCTV4K 超高清",
         "CCTV2 财经",
@@ -134,6 +138,25 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         "新疆卫视",
     )
 
+    private val channelsMustToken = arrayOf(
+        "CCTV3 综艺",
+        "CCTV6 电影",
+        "CCTV8 电视剧",
+        "风云剧场",
+        "第一剧场",
+        "怀旧剧场",
+        "世界地理",
+        "风云音乐",
+        "兵器科技",
+        "风云足球",
+        "高尔夫网球",
+        "女性时尚",
+        "央视文化精品",
+        "央视台球",
+        "电视指南",
+        "卫生健康",
+    )
+
     fun addVideoUrl(url: String) {
         if (_videoUrl.value?.isNotEmpty() == true) {
             if (_videoUrl.value!!.last().contains("cctv.cn")) {
@@ -188,6 +211,9 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         if (tv.title in channelsNeedToken) {
             needToken = true
         }
+        if (tv.title in channelsMustToken) {
+            mustToken = true
+        }
     }
 
     fun getRowPosition(): Int {

app/src/main/res/layout/row.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/row_header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:layout_marginTop="0dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginBottom="5dp"
-        android:gravity="start"
-        android:textColor="#FFEEEEEE"
-        android:textSize="22sp" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/row_items"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-    </androidx.recyclerview.widget.RecyclerView>
-</LinearLayout>

app/src/main/res/layout/show.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/show_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <LinearLayout
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-        </LinearLayout>
-    </ScrollView>
-</FrameLayout>

app/src/main/res/values/styles.xml

@@ -1,25 +1,10 @@
 <resources>
 
     <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
-        <item name="cardType">infoUnder</item>
-        <item name="infoVisibility">always</item>
-        <!-- In order to keep backward compatibility we have to create an icon on right. -->
-        <item name="lbImageCardViewType">Title|Content|IconOnRight</item>
-        <!-- Deprecated. Use 'Widget.Leanback.ImageCardView.InfoAreaStyle' instead. -->
-        <item name="infoAreaBackground">@null</item>
-    </style>
-
-    <style name="CustomImageCardViewImageStyle" parent="Widget.Leanback.ImageCardView.ImageStyle">
-        <item name="android:layout_width">143dp</item>
-        <item name="android:layout_height">50dp</item>
-        <item name="android:adjustViewBounds">true</item>
-        <item name="android:contentDescription">@null</item>
-        <item name="android:scaleType">centerCrop</item>
-        <item name="layout_viewType">main</item>
+        <item name="lbImageCardViewType">Title|Content</item>
     </style>
 
     <style name="CustomImageCardTheme" parent="Theme.Leanback">
         <item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
-        <item name="imageCardViewImageStyle">@style/CustomImageCardViewImageStyle</item>
     </style>
 </resources>