add channel

README.md

@@ -14,24 +14,16 @@
 
 ## 更新日志
 
-### v1.5.1（高版本专用）
-
-* 性能优化
-
-### v1.4.9（高版本专用）
-
-* 同步v1.4.8
-
 ### v1.4.8（通用版）
 
-* 频道号从1开始，CCTV5+为18
+* 频道号从1开始，cctv5+为18
-* 提高CCTV6清晰度
+* 提高cctv6清晰度
 * 增加天津卫视、新疆卫视
 
 ### v1.4.7（高版本专用）
 
-* 修复部分用户CCTV13播放过程中卡住的问题
+* 修复部分用户cctv13播放过程中卡住的问题
-* 调整CCTV的频道顺序
+* 调整cctv的频道顺序
 
 ### v1.4.6（通用版）
 

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.9.0"
+    def retrofit2_version = "2.6.4"
 
     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

@@ -0,0 +1,119 @@
+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/InfoFragment.kt

@@ -48,6 +48,7 @@ class InfoFragment : Fragment() {
                 .into(binding.infoLogo)
         }
 
+
         val program = tvViewModel.getProgramOne()
         if (program != null) {
             binding.infoDesc.text = program.name

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

@@ -38,7 +38,7 @@ class MainActivity : FragmentActivity() {
     private val delay: Long = 4000
     private val delayHideHelp: Long = 10000
 
-    lateinit var sharedPref: SharedPreferences
+    private lateinit var sharedPref: SharedPreferences
     private var channelReversal = false
     private var channelNum = true
 
@@ -60,6 +60,7 @@ class MainActivity : FragmentActivity() {
                 .add(R.id.main_browse_fragment, mainFragment)
                 .hide(mainFragment)
                 .commit()
+            mainFragment.view?.requestFocus()
         }
         gestureDetector = GestureDetector(this, GestureListener())
 
@@ -121,6 +122,7 @@ class MainActivity : FragmentActivity() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
+            mainFragment.setPosition()
             transaction.show(mainFragment)
             keepRunnable()
         } else {
@@ -476,7 +478,7 @@ class MainActivity : FragmentActivity() {
 
     private fun hashSignature(signature: Signature): String {
         return try {
-            val md = MessageDigest.getInstance("MD5")
+            val md = MessageDigest.getInstance("SHA-256")
             md.update(signature.toByteArray())
             val digest = md.digest()
             digest.let { it -> it.joinToString("") { "%02x".format(it) } }

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

@@ -1,40 +1,42 @@
 package com.lizongying.mytv
 
+import android.content.Context
 import android.content.SharedPreferences
 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.leanback.app.BrowseSupportFragment
+import androidx.fragment.app.Fragment
-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 : BrowseSupportFragment() {
+class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var itemPosition = 0
 
-    private var rowsAdapter: ArrayObjectAdapter? = null
+    private var rowList: MutableList<View> = mutableListOf()
+
+    private var _binding: ShowBinding? = null
+    private val binding get() = _binding!!
 
     private var request = Request()
 
     var tvListViewModel = TVListViewModel()
 
-    private lateinit var sharedPref: SharedPreferences
+    private var sharedPref: SharedPreferences? = null
 
     private var lastVideoUrl = ""
 
@@ -43,182 +45,154 @@ class MainFragment : BrowseSupportFragment() {
 
     private var ready = 0
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreateView(
-        super.onCreate(savedInstanceState)
+        inflater: LayoutInflater, container: ViewGroup?,
-        headersState = HEADERS_DISABLED
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = ShowBinding.inflate(inflater, container, false)
+        return binding.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
         activity?.let { request.initYSP(it) }
-        sharedPref = (activity as? MainActivity)?.sharedPref!!
+        sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
 
-        loadRows()
+        view?.post {
+            val content = binding.content
 
-        setupEventListeners()
+            var idx: Long = 0
+            for ((k, v) in TVList.list) {
+                val itemBinding: RowBinding =
+                    RowBinding.inflate(layoutInflater, content, false)
 
-        mUpdateProgramRunnable = UpdateProgramRunnable()
+                val tvListViewModelCurrent = TVListViewModel()
-        handler.post(mUpdateProgramRunnable)
+                for ((idx2, v1) in v.withIndex()) {
-
+                    val tvViewModel = TVViewModel(v1)
-        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+                    tvViewModel.setRowPosition(idx.toInt())
-            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                    tvViewModel.setItemPosition(idx2)
-                if (tvViewModel.errInfo.value != null
+                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
-                    && tvViewModel.id.value == itemPosition
+                    tvListViewModel.addTVViewModel(tvViewModel)
-                ) {
-                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
                 }
-            }
+                tvListViewModel.maxNum.add(v.size)
-            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
 
-                // not first time && channel not change
+                val adapter = CardAdapter(viewLifecycleOwner, tvListViewModelCurrent)
-                if (tvViewModel.ready.value != null
+                rowList.add(itemBinding.rowItems)
-                    && tvViewModel.id.value == itemPosition
+
-                    && check(tvViewModel)
+                adapter.setItemListener(this)
-                ) {
+
-                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                itemBinding.rowHeader.text = k
-                    (activity as? MainActivity)?.play(tvViewModel)
+                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.change.observe(viewLifecycleOwner) { _ ->
+
-                if (tvViewModel.change.value != null) {
+            mUpdateProgramRunnable = UpdateProgramRunnable()
-                    val title = tvViewModel.title.value
+            handler.post(mUpdateProgramRunnable)
-                    if (tvViewModel.pid.value != "") {
+
-                        Log.i(TAG, "request $title")
+            itemPosition = sharedPref?.getInt(POSITION, 0)!!
-                        lifecycleScope.launch(Dispatchers.IO) {
+            if (itemPosition >= tvListViewModel.size()) {
-                            tvViewModel.let { request.fetchData(it) }
+                itemPosition = 0
-                        }
+            }
-                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+            tvListViewModel.setItemPosition(itemPosition)
-                        setSelectedPosition(
+            setPosition()
-                            tvViewModel.getRowPosition(), true,
+            tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
-                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
+                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                        )
+                    if (tvViewModel.errInfo.value != null
-                    } else {
+                        && tvViewModel.id.value == itemPosition
-                        if (check(tvViewModel)) {
+                    ) {
-                            (activity as? MainActivity)?.play(tvViewModel)
+                        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) }
+                            }
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setSelectedPosition(
+                            setPosition(
-                                tvViewModel.getRowPosition(), true,
+                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
-                                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()
-                }
-            }
         }
     }
 
-    fun nextSource() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        view?.post {
+        super.onViewCreated(view, savedInstanceState)
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+    }
-            if (tvViewModel != null) {
+
-                if (tvViewModel.videoUrl.value!!.size > 1) {
+    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
-                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
+        if (hasFocus) {
-                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
+            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
-                        tvViewModel.setVideoIndex(0)
+            (activity as MainActivity).keepRunnable()
-                    }
-                    tvViewModel.changed()
-                }
-            }
         }
     }
 
-    private fun setupEventListeners() {
+    override fun onItemClicked(tvViewModel: TVViewModel) {
-        onItemViewClickedListener = ItemViewClickedListener()
+        if (this.isHidden) {
-        onItemViewSelectedListener = ItemViewSelectedListener()
+            (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 inner class ItemViewClickedListener : OnItemViewClickedListener {
+    fun setPosition() {
-        override fun onItemClicked(
+        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            itemViewHolder: Presenter.ViewHolder,
+        rowList[tvViewModel!!.getRowPosition()].post {
-            item: Any,
+            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
-            rowViewHolder: RowPresenter.ViewHolder,
+                tvViewModel.getItemPosition()
-            row: Row
+            )?.requestFocus()
-        ) {
-            if (item is TVViewModel) {
-                if (itemPosition != item.id.value!!) {
-                    itemPosition = item.id.value!!
-                    tvListViewModel.setItemPosition(itemPosition)
-                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
-                }
-                (activity as? MainActivity)?.switchMainFragment()
-            }
         }
     }
 
-    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
+    fun setPosition(rowPosition: Int, itemPosition: Int) {
-        override fun onItemSelected(
+        rowList[rowPosition].post {
-            itemViewHolder: Presenter.ViewHolder?, item: Any?,
+            ((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
-            rowViewHolder: RowPresenter.ViewHolder, row: Row
+                itemPosition
-        ) {
+            )?.requestFocus()
-            if (item is TVViewModel) {
-                tvListViewModel.setItemPositionCurrent(item.id.value!!)
-                (activity as MainActivity).keepRunnable()
-            }
         }
     }
 
@@ -288,7 +262,7 @@ class MainFragment : BrowseSupportFragment() {
                 tvViewModel.programUpdateTime = timestamp
                 request.fetchProgram(tvViewModel)
             } else {
-                if (tvViewModel.program.value!!.last().et - timestamp < 600) {
+                if (timestamp - tvViewModel.program.value!!.last().et < 600) {
                     tvViewModel.programUpdateTime = timestamp
                     request.fetchProgram(tvViewModel)
                 }
@@ -298,7 +272,7 @@ class MainFragment : BrowseSupportFragment() {
 
     inner class UpdateProgramRunnable : Runnable {
         override fun run() {
-            tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null }
+            tvListViewModel.getTVListViewModel().value?.filter { it.programId.value != null }
                 ?.forEach { tvViewModel ->
                     updateProgram(
                         tvViewModel
@@ -311,7 +285,7 @@ class MainFragment : BrowseSupportFragment() {
     override fun onStop() {
         Log.i(TAG, "onStop")
         super.onStop()
-        with(sharedPref.edit()) {
+        with(sharedPref!!.edit()) {
             putInt(POSITION, itemPosition)
             apply()
         }
@@ -324,6 +298,12 @@ class MainFragment : BrowseSupportFragment() {
         handler.removeCallbacks(mUpdateProgramRunnable)
     }
 
+    override fun onDestroyView() {
+        Log.i(TAG, "onDestroyView")
+        super.onDestroyView()
+        _binding = null
+    }
+
     override fun onResume() {
         super.onResume()
         view?.post { view?.requestFocus() }

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

@@ -74,22 +74,23 @@ class PlayerFragment : Fragment() {
     @OptIn(UnstableApi::class)
     fun play(tvViewModel: TVViewModel) {
         this.tvViewModel = tvViewModel
+        val videoUrlCurrent = tvViewModel.getVideoUrlCurrent()
         playerView?.player?.run {
-            setMediaItem(MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
+            setMediaItem(MediaItem.fromUri(videoUrlCurrent))
             prepare()
         }
     }
 
     override fun onStart() {
         super.onStart()
-        if (playerView != null && playerView!!.player?.isPlaying == false) {
+        if (playerView != null) {
             playerView!!.player?.play()
         }
     }
 
     override fun onStop() {
         super.onStop()
-        if (playerView != null && playerView!!.player?.isPlaying == true) {
+        if (playerView != null) {
             playerView!!.player?.stop()
         }
     }

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

@@ -32,12 +32,10 @@ class Request {
     private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
     private var yspProtoService: YSPProtoService = ApiClient().yspProtoService
     private var ysp: YSP? = null
-    private var token = ""
 
     // TODO onDestroy
     private val handler = Handler(Looper.getMainLooper())
-    private lateinit var btraceRunnable: BtraceRunnable
+    private lateinit var myRunnable: MyRunnable
-    private var tokenRunnable: TokenRunnable = TokenRunnable()
 
     private var mapping = mapOf(
         "CCTV4K" to "CCTV4K 超高清",
@@ -87,10 +85,6 @@ class Request {
         "新疆卫视" to "新疆卫视",
     )
 
-    init {
-        handler.post(tokenRunnable)
-    }
-
     fun initYSP(context: Context) {
         ysp = YSP(context)
     }
@@ -99,8 +93,8 @@ class Request {
 
     fun fetchVideo(tvModel: TVViewModel, cookie: String) {
         call?.cancel()
-        if (::btraceRunnable.isInitialized) {
+        if (::myRunnable.isInitialized) {
-            handler.removeCallbacks(btraceRunnable)
+            handler.removeCallbacks(myRunnable)
         }
 
         val title = tvModel.title.value
@@ -131,22 +125,17 @@ class Request {
                                 keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
                                 ivBytes
                             ).uppercase()
-                            Log.d(TAG, "$title url $url")
+                            Log.i(TAG, "$title url $url")
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()
                             tvModel.retryTimes = 0
-                            btraceRunnable = BtraceRunnable(tvModel)
+                            myRunnable = MyRunnable(tvModel)
-                            handler.post(btraceRunnable)
+                            handler.post(myRunnable)
                         } else {
                             Log.e(TAG, "$title key error")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                if (tvModel.needToken) {
+                                fetchVideo(tvModel, cookie)
-                                    token = ""
-                                    fetchVideo(tvModel)
-                                } else {
-                                    fetchVideo(tvModel, cookie)
-                                }
                             }
                         }
                     } else {
@@ -157,12 +146,7 @@ class Request {
                             Log.e(TAG, "$title url error $request $liveInfo")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                if (tvModel.needToken) {
+                                fetchVideo(tvModel, cookie)
-                                    token = ""
-                                    fetchVideo(tvModel)
-                                } else {
-                                    fetchVideo(tvModel, cookie)
-                                }
                             }
                         }
                     }
@@ -170,12 +154,7 @@ class Request {
                     Log.e(TAG, "$title status error")
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
-                        if (tvModel.needToken) {
+                        fetchVideo(tvModel, cookie)
-                            token = ""
-                            fetchVideo(tvModel)
-                        } else {
-                            fetchVideo(tvModel, cookie)
-                        }
                     }
                 }
             }
@@ -184,50 +163,39 @@ class Request {
                 Log.e(TAG, "$title request error")
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
-                    if (tvModel.needToken) {
+                    fetchVideo(tvModel, cookie)
-                        token = ""
-                        fetchVideo(tvModel)
-                    } else {
-                        fetchVideo(tvModel, cookie)
-                    }
                 }
             }
         })
     }
 
     fun fetchVideo(tvModel: TVViewModel) {
-        if (token == "") {
+        yspTokenService.getInfo()
-            yspTokenService.getInfo()
+            .enqueue(object : Callback<Info> {
-                .enqueue(object : Callback<Info> {
+                override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                    override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                    if (response.isSuccessful) {
-                        if (response.isSuccessful) {
+                        val token = response.body()?.data?.token
-                            token = response.body()?.data?.token!!
+                        Log.i(TAG, "info success $token")
-                            Log.i(TAG, "info success $token")
+                        val cookie =
-                            val cookie =
+                            "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                                "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                        fetchVideo(tvModel, cookie)
-                            fetchVideo(tvModel, cookie)
+                    } else {
-                        } else {
+                        Log.e(TAG, "info status error")
-                            Log.e(TAG, "info status error")
-                            if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                                tvModel.retryTimes++
-                                fetchVideo(tvModel)
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call<Info>, t: Throwable) {
-                        Log.e(TAG, "info request error $t")
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
                             fetchVideo(tvModel)
                         }
                     }
-                })
+                }
-        } else {
+
-            val cookie =
+                override fun onFailure(call: Call<Info>, t: Throwable) {
-                "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                    Log.e(TAG, "info request error $t")
-            fetchVideo(tvModel, cookie)
+                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-        }
+                        tvModel.retryTimes++
+                        fetchVideo(tvModel)
+                    }
+                }
+            })
     }
 
     fun fetchData(tvModel: TVViewModel) {
@@ -239,32 +207,7 @@ class Request {
         }
     }
 
-    inner class TokenRunnable : Runnable {
+    inner class MyRunnable(private val tvModel: TVViewModel) : Runnable {
-        override fun run() {
-            fetchToken()
-            handler.postDelayed(this, 600000)
-        }
-    }
-
-    fun fetchToken() {
-        yspTokenService.getInfo()
-            .enqueue(object : Callback<Info> {
-                override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                    if (response.isSuccessful) {
-                        token = response.body()?.data?.token!!
-                        Log.i(TAG, "info success $token")
-                    } else {
-                        Log.e(TAG, "token status error")
-                    }
-                }
-
-                override fun onFailure(call: Call<Info>, t: Throwable) {
-                    Log.e(TAG, "token request error $t")
-                }
-            })
-    }
-
-    inner class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
         override fun run() {
             fetchBtrace(tvModel)
             handler.postDelayed(this, 60000)
@@ -363,8 +306,6 @@ class Request {
                             tvViewModel.addProgram(program.dataListList)
                             Log.i(TAG, "$title program ${program.dataListList.size}")
                         }
-                    } else {
-                        Log.w(TAG, "$title program error")
                     }
                 }
 

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

@@ -277,6 +277,9 @@ CGTN 纪录频道,https://livedoc.cgtn.com/500d/prog_index.m3u8
             }
             if (!i.contains(",")) {
                 channel = i.trim()
+                if (channel == "移动专区") {
+                    break
+                }
                 continue
             }
             val p = i.split(",")

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

@@ -51,14 +51,14 @@ class YSP(var context: Context) {
     private var signature = ""
 
     private var encryptor: Encryptor? = null
-    private lateinit var sharedPref: SharedPreferences
+    private var sharedPref: SharedPreferences? = null
 
     init {
         if (context is MainActivity) {
             encryptor = Encryptor()
             encryptor!!.init(context)
 
-            sharedPref = (context as MainActivity).sharedPref
+            sharedPref = (context as MainActivity).getPreferences(Context.MODE_PRIVATE)
         }
 
         guid = getGuid()
@@ -77,10 +77,15 @@ class YSP(var context: Context) {
 
         timeStr = getTimeStr()
 
+//        guid = "lq3oqitm_1e15dnzgjnb"
+//        randStr = "BfcCPQp8Hq"
+//        timeStr = "1702166501"
+
         cKey =
             encryptor!!.encrypt(cnlid, timeStr, appVer, guid, platform)
         signature = getSignature()
         return """{"cnlid":"$cnlid","livepid":"$livepid","stream":"$stream","guid":"$guid","cKey":"$cKey","adjust":$adjust,"sphttps":"$sphttps","platform":"$platform","cmd":"$cmd","encryptVer":"$encryptVer","dtype":"$dtype","devid":"$devid","otype":"$otype","appVer":"$appVer","app_version":"$appVersion","rand_str":"$randStr","channel":"$channel","defn":"$defn","signature":"$signature"}"""
+//        return """{"cnlid":"2000203803","livepid":"600001801","stream":"2","guid":"lq1y36mb_ccfwmja9zan","cKey":"--01A9F5E89BB86A0C61F4025BEDE15309B6913A79FD1AF1EE7F5EC9C7605F377D1D2281488385C32DEB9E7D0DD3559CB700BD7AF44DD5C9DE0AE14D94B8214027B5D664C108AEE23532348DCC61B86F7C8FBB6CF14D588E6093A25E97DF6D66F4882AB28F17016472DD43D45EF076B7F505176A5E8DEDF2662E5F9AB12B69CB20BCE1579BE724091F3AF6826AE34B713906F3FE139C3783F80EECBD08416DC525E1","adjust":1,"sphttps":"1","platform":"5910204","cmd":"2","encryptVer":"8.1","dtype":"1","devid":"devid","otype":"ojson","appVer":"V1.0.0","app_version":"V1.0.0","rand_str":"IOS2soOw44","channel":"ysp_tx","defn":"fhd","signature":"6ca945f651817de8c6e6910457ceafd6"}"""
     }
 
     private fun getTimeStr(): String {
@@ -94,10 +99,10 @@ class YSP(var context: Context) {
     }
 
     fun getGuid(): String {
-        var guid = sharedPref.getString("guid", "")
+        var guid = sharedPref?.getString("guid", "")
         if (guid == null || guid.length < 18) {
             guid = generateGuid()
-            with(sharedPref.edit()) {
+            with(sharedPref!!.edit()) {
                 putString("guid", guid)
                 apply()
             }
@@ -107,7 +112,7 @@ class YSP(var context: Context) {
 
     private fun newGuid(): String {
         guid = generateGuid()
-        with(sharedPref.edit()) {
+        with(sharedPref!!.edit()) {
             putString("guid", guid)
             apply()
         }

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

@@ -8,9 +8,7 @@ class TVListViewModel : ViewModel() {
 
     var maxNum = mutableListOf<Int>()
 
-    private val _tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
+    private val tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
-    val tvListViewModel: LiveData<MutableList<TVViewModel>>
-        get() = _tvListViewModel
 
     private val _itemPosition = MutableLiveData<Int>()
     val itemPosition: LiveData<Int>
@@ -20,20 +18,22 @@ class TVListViewModel : ViewModel() {
     val itemPositionCurrent: LiveData<Int>
         get() = _itemPositionCurrent
 
+    fun getTVListViewModel(): MutableLiveData<MutableList<TVViewModel>> {
+        return tvListViewModel
+    }
+
     fun addTVViewModel(tvViewModel: TVViewModel) {
-        if (_tvListViewModel.value == null) {
+        val currentTVModelList = tvListViewModel.value ?: mutableListOf()
-            _tvListViewModel.value = mutableListOf(tvViewModel)
+        currentTVModelList.add(tvViewModel)
-        } else {
+        tvListViewModel.value = currentTVModelList
-            _tvListViewModel.value?.add(tvViewModel)
-        }
     }
 
     fun getTVViewModel(id: Int): TVViewModel? {
-        return _tvListViewModel.value?.get(id)
+        return tvListViewModel.value?.get(id)
     }
 
     fun getTVViewModelCurrent(): TVViewModel? {
-        return _itemPositionCurrent.value?.let { _tvListViewModel.value?.get(it) }
+        return _itemPositionCurrent.value?.let { tvListViewModel.value?.get(it) }
     }
 
     fun setItemPosition(position: Int) {
@@ -46,9 +46,6 @@ class TVListViewModel : ViewModel() {
     }
 
     fun size(): Int {
-        if (_tvListViewModel.value == null) {
+        return tvListViewModel.value!!.size
-            return 0
-        }
-        return _tvListViewModel.value!!.size
     }
 }

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

@@ -78,20 +78,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     var needToken = false
 
     private val channelsNeedToken = arrayOf(
-        "CCTV4K 超高清",
-        "CCTV2 财经",
-        "CCTV5 体育",
-        "CCTV5+ 体育赛事",
-        "CCTV7 国防军事",
-        "CCTV9 记录",
-        "CCTV10 科教",
-        "CCTV11 戏曲",
-        "CCTV12 社会与法",
-        "CCTV14 少儿",
-        "CCTV15 音乐",
-        "CCTV16 奥林匹克",
-        "CCTV17 农业农村",
-
         "CCTV3 综艺",
         "CCTV6 电影",
         "CCTV8 电视剧",
@@ -108,30 +94,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         "央视台球",
         "电视指南",
         "卫生健康",
-
-        "东方卫视",
-        "湖南卫视",
-        "湖北卫视",
-        "辽宁卫视",
-        "江苏卫视",
-        "江西卫视",
-        "山东卫视",
-        "广东卫视",
-        "广西卫视",
-        "重庆卫视",
-        "河南卫视",
-        "河北卫视",
-        "贵州卫视",
-        "北京卫视",
-        "黑龙江卫视",
-        "浙江卫视",
-        "安徽卫视",
-        "深圳卫视",
-        "四川卫视",
-        "东南卫视",
-        "海南卫视",
-        "天津卫视",
-        "新疆卫视",
     )
 
     fun addVideoUrl(url: String) {

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

@@ -0,0 +1,25 @@
+<?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

@@ -0,0 +1,17 @@
+<?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,10 +1,25 @@
 <resources>
 
     <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
-        <item name="lbImageCardViewType">Title|Content</item>
+        <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>
     </style>
 
     <style name="CustomImageCardTheme" parent="Theme.Leanback">
         <item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
+        <item name="imageCardViewImageStyle">@style/CustomImageCardViewImageStyle</item>
     </style>
 </resources>