fix channel number did not disappear

移除硬编码，更改为json格式，并支持从服务器上动态更新channels。

README.md

@@ -14,11 +14,6 @@
 
 ## 更新日志
 
-### v1.5.6（通用版）
-
-* 解决部分设备系统时间不对导致播放失败的问题
-* 
-
 ### v1.5.2（通用版）
 
 * 修复APP恢复后频道号、频道列表不自动消失的问题

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

@@ -18,22 +18,16 @@ import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.models.TVViewModel
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 import java.security.MessageDigest
 
 
 class MainActivity : FragmentActivity() {
 
-    private var ready = 0
+    var playerFragment = PlayerFragment()
-    private var playerFragment = PlayerFragment()
+    private val mainFragment = MainFragment()
-    private var mainFragment = MainFragment()
+    private val infoFragment = InfoFragment()
-    private var infoFragment = InfoFragment()
+    private val channelFragment = ChannelFragment()
-    private var channelFragment = ChannelFragment()
     private lateinit var settingFragment: SettingFragment
 
     private var doubleBackToExitPressedOnce = false
@@ -50,16 +44,6 @@ class MainActivity : FragmentActivity() {
 
     private var versionName = ""
 
-    init {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
-
-            utilsJob.start()
-
-            utilsJob.await()
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
@@ -138,7 +122,6 @@ class MainActivity : FragmentActivity() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
-            mainFragment.setPosition()
             transaction.show(mainFragment)
             keepRunnable()
         } else {
@@ -172,11 +155,7 @@ class MainActivity : FragmentActivity() {
     }
 
     fun fragmentReady() {
-        ready++
+        mainFragment.fragmentReady()
-        Log.i(TAG, "ready $ready")
-        if (ready == 4) {
-            mainFragment.fragmentReady()
-        }
     }
 
     override fun onTouchEvent(event: MotionEvent?): Boolean {
@@ -516,7 +495,7 @@ class MainActivity : FragmentActivity() {
     override fun onResume() {
         Log.i(TAG, "onResume")
         super.onResume()
-        if (!mainFragment.isHidden) {
+        if (!mainFragment.isHidden){
             handler.postDelayed(hideMain, delayHideMain)
         }
     }

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 rowsAdapter: ArrayObjectAdapter? = null
-
-    private var _binding: ShowBinding? = null
-    private val binding get() = _binding!!
 
     private var request = Request()
 
@@ -42,12 +41,17 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
 
-    override fun onCreateView(
+    private var ready = 0
-        inflater: LayoutInflater, container: ViewGroup?,
+
-        savedInstanceState: Bundle?
+    override fun onCreate(savedInstanceState: Bundle?) {
-    ): View {
+        Log.i(TAG, "onCreate")
-        _binding = ShowBinding.inflate(inflater, container, false)
+        super.onCreate(savedInstanceState)
-        return binding.root
+        headersState = HEADERS_DISABLED
+    }
+
+    override fun onStart() {
+        Log.i(TAG, "onStart")
+        super.onStart()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -56,142 +60,172 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         activity?.let { request.initYSP(it) }
         sharedPref = (activity as? MainActivity)?.sharedPref!!
 
-        view?.post {
+        loadRows()
-            val content = binding.content
 
-            var idx: Long = 0
+        setupEventListeners()
-            for ((k, v) in TVList.list) {
-                val itemBinding: RowBinding =
-                    RowBinding.inflate(layoutInflater, content, false)
 
-                val tvListViewModelCurrent = TVListViewModel()
+        mUpdateProgramRunnable = UpdateProgramRunnable()
-                for ((idx2, v1) in v.withIndex()) {
+        handler.post(mUpdateProgramRunnable)
-                    val tvViewModel = TVViewModel(v1)
+
-                    tvViewModel.setRowPosition(idx.toInt())
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-                    tvViewModel.setItemPosition(idx2)
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
+                if (tvViewModel.errInfo.value != null
-                    tvListViewModel.addTVViewModel(tvViewModel)
+                    && 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()
+                // not first time && channel not change
-            handler.post(mUpdateProgramRunnable)
+                if (tvViewModel.ready.value != null
-
+                    && tvViewModel.id.value == itemPosition
-            itemPosition = sharedPref.getInt(POSITION, 0)
+                    && check(tvViewModel)
-            if (itemPosition >= tvListViewModel.size()) {
+                ) {
-                itemPosition = 0
+                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                    (activity as? MainActivity)?.play(tvViewModel)
+                }
             }
-            tvListViewModel.setItemPosition(itemPosition)
+            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-            setPosition()
+                if (tvViewModel.change.value != null) {
-            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+                    val title = tvViewModel.title.value
-                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                    if (tvViewModel.pid.value != "") {
-                    if (tvViewModel.errInfo.value != null
+                        Log.i(TAG, "request $title")
-                        && tvViewModel.id.value == itemPosition
+                        lifecycleScope.launch(Dispatchers.IO) {
-                    ) {
+                            tvViewModel.let { request.fetchData(it) }
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
+                        }
-                            .show()
+                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                    }
+                        setSelectedPosition(
-                }
+                            tvViewModel.getRowPosition(), true,
-                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
+                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
-
+                        )
-                    // not first time && channel not change
+                    } else {
-                    if (tvViewModel.ready.value != null
+                        if (check(tvViewModel)) {
-                        && tvViewModel.id.value == itemPosition
+                            (activity as? MainActivity)?.play(tvViewModel)
-                        && 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")
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { request.fetchData(it) }
-                            }
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setPosition(
+                            setSelectedPosition(
-                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                                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()
-                                )
-                            }
                         }
                     }
                 }
             }
+        }
 
-            (activity as MainActivity).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
+        context?.let { TVList.init(it) }
+        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?) {
+    fun nextSource() {
-        super.onViewCreated(view, savedInstanceState)
+        view?.post {
-    }
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-
+            if (tvViewModel != null) {
-    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
-        if (hasFocus) {
+                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
-            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
+                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
-            (activity as MainActivity).keepRunnable()
+                        tvViewModel.setVideoIndex(0)
+                    }
+                    tvViewModel.changed()
+                }
+            }
         }
     }
 
-    override fun onItemClicked(tvViewModel: TVViewModel) {
+    private fun setupEventListeners() {
-        if (this.isHidden) {
+        onItemViewClickedListener = ItemViewClickedListener()
-            (activity as? MainActivity)?.switchMainFragment()
+        onItemViewSelectedListener = ItemViewSelectedListener()
-            return
-        }
-
-        if (itemPosition != tvViewModel.id.value!!) {
-            itemPosition = tvViewModel.id.value!!
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-        (activity as? MainActivity)?.switchMainFragment()
     }
 
-    fun setPosition() {
+    private inner class ItemViewClickedListener : OnItemViewClickedListener {
-        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+        override fun onItemClicked(
-        Log.i(TAG, "tvViewModel $tvViewModel")
+            itemViewHolder: Presenter.ViewHolder,
-        Log.i(TAG, "rowList ${rowList.size}")
+            item: Any,
-        rowList[tvViewModel!!.getRowPosition()].post {
+            rowViewHolder: RowPresenter.ViewHolder,
-            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
+            row: Row
-                tvViewModel.getItemPosition()
+        ) {
-            )?.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()
+            }
         }
     }
 
-    fun setPosition(rowPosition: Int, itemPosition: Int) {
+    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
-        rowList[rowPosition].post {
+        override fun onItemSelected(
-            ((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
+            itemViewHolder: Presenter.ViewHolder?, item: Any?,
-                itemPosition
+            rowViewHolder: RowPresenter.ViewHolder, row: Row
-            )?.requestFocus()
+        ) {
+            if (item is TVViewModel) {
+                tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                (activity as MainActivity).keepRunnable()
+            }
         }
     }
 
@@ -212,8 +246,12 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     }
 
     fun fragmentReady() {
+        ready++
+        Log.i(TAG, "ready $ready")
+        if (ready == 4) {
 //            request.fetchPage()
-        tvListViewModel.getTVViewModel(itemPosition)?.changed()
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+        }
     }
 
     fun play(itemPosition: Int) {
@@ -295,15 +333,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     override fun onDestroy() {
         Log.i(TAG, "onDestroy")
         super.onDestroy()
-        if (::mUpdateProgramRunnable.isInitialized) {
+        handler.removeCallbacks(mUpdateProgramRunnable)
-            handler.removeCallbacks(mUpdateProgramRunnable)
-        }
-    }
-
-    override fun onDestroyView() {
-        Log.i(TAG, "onDestroyView")
-        super.onDestroyView()
-        _binding = null
     }
 
     companion object {

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

@@ -32,6 +32,7 @@ class PlayerFragment : Fragment() {
     ): View {
         _binding = PlayerBinding.inflate(inflater, container, false)
         playerView = _binding!!.playerView
+        (activity as MainActivity).playerFragment = this
         playerView?.viewTreeObserver?.addOnGlobalLayoutListener(object :
             ViewTreeObserver.OnGlobalLayoutListener {
             override fun onGlobalLayout() {
@@ -85,7 +86,6 @@ class PlayerFragment : Fragment() {
         if (playerView != null && playerView!!.player?.isPlaying == false) {
             Log.i(TAG, "replay")
             playerView!!.player?.prepare()
-            playerView!!.player?.play()
         } else {
             Log.i(TAG, "playing")
         }

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

@@ -41,7 +41,7 @@ class Request {
 
     private val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
     private val input =
-        """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()
+        """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,AppleM1Pro,OpenGL4.1)"}""".toByteArray()
 
     private var mapping = mapOf(
         "CCTV4K" to "CCTV4K 超高清",
@@ -97,6 +97,8 @@ class Request {
 
     fun initYSP(context: Context) {
         ysp = YSP(context)
+        //TODO 不确定在哪里初始化
+        TVList.init(context)
     }
 
     var call: Call<LiveInfo>? = null
@@ -118,7 +120,6 @@ class Request {
             override fun onResponse(call: Call<LiveInfo>, response: Response<LiveInfo>) {
                 if (response.isSuccessful) {
                     val liveInfo = response.body()
-
                     if (liveInfo?.data?.playurl != null) {
                         val chanll = liveInfo.data.chanll
                         val decodedBytes = Base64.decode(
@@ -134,8 +135,8 @@ class Request {
                             val url = liveInfo.data.playurl + "&revoi=" + encryptTripleDES(
                                 keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
                                 ivBytes
-                            ).uppercase() + liveInfo.data.extended_param
+                            ).uppercase()
-                            Log.d(TAG, "$title url $url")
+//                            Log.d(TAG, "$title url $url")
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()
                             tvModel.retryTimes = 0
@@ -355,20 +356,29 @@ class Request {
             ) {
                 if (response.isSuccessful) {
                     val body = response.body()
+
                     if (body?.data?.feedModuleListCount == 1) {
                         for (item in body.data?.feedModuleListList!![0]?.dataTvChannelListList!!) {
-                            Log.d(
+                            if (item.isVip && !item.isLimitedFree) {
+                                continue
+                            }
+                            Log.i(
                                 TAG,
                                 "${item.channelName},${item.pid},${item.streamId}"
                             )
-
+                            var channelType = "央视频道"
-                            for ((_, v) in TVList.list) {
+                            if (item?.channelType === "weishi") {
-                                for (v2 in v) {
+                                channelType = "地方频道"
-                                    if (v2.title == item.channelName || v2.alias == item.channelName) {
+                            }
-                                        v2.pid = item.pid
+                            if (!mapping.containsKey(item.channelName)) {
-                                        v2.sid = item.streamId
+                                continue
-                                    }
+                            }
-                                }
+                            val tv =
+                                TVList.list[channelType]?.find { it.title == mapping[item.channelName] }
+                            if (tv != null) {
+                                tv.logo = item.tvLogo
+                                tv.pid = item.pid
+                                tv.sid = item.streamId
                             }
                         }
                     }

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

@@ -5,7 +5,6 @@ import java.io.Serializable
 data class TV(
     var id: Int = 0,
     var title: String,
-    var alias: String = "",
     var videoUrl: List<String>,
     var videoIndex: Int = 0,
     var channel: String = "",
@@ -13,10 +12,10 @@ data class TV(
     var pid: String = "",
     var sid: String = "",
     var programId: String = "",
-    var needToken: Boolean = false,
+    var needToken:Boolean=false,
-    var mustToken: Boolean = false,
+    var mustToken:Boolean=false,
 
-    ) : Serializable {
+) : Serializable {
 
     override fun toString(): String {
         return "TV{" +

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

@@ -1,946 +1,54 @@
 package com.lizongying.mytv
 
+import android.content.Context
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import java.io.File
+
 object TVList {
-    var list = mapOf(
+    lateinit var list: Map<String, List<TV>>
-        "央视频道" to listOf(
+    private val channels = "channels.json"
-            TV(
+
-                0,
+    fun init(context: Context) {
-                "CCTV1 综合",
+        if (::list.isInitialized) {
-                "CCTV1",
+            return
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226231/index.m3u8"),
+        }
-                0,
+        synchronized(this) {
-                "央视频道",
+            if (::list.isInitialized) {
-                "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
+                return
-                "600001859",
+            }
-                "2022576801",
+            list = setupTV(context)
-                "600001859",
+        }
-                false,
+    }
-                mustToken = false
+
-            ),
+
-            TV(
+    private fun setupTV(context: Context): Map<String, List<TV>> {
-                1,
+        val map: MutableMap<String, MutableList<TV>> = mutableMapOf()
-                "CCTV2 财经",
+        val appDirectory = Utils.getAppDirectory(context)
-                "CCTV2",
+
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index.m3u8"),
+        //检查当前目录下是否存在channels.json
-                0,
+        val file = File(appDirectory, channels)
-                "央视频道",
+        if (!file.exists()) {
-                "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
+            //不存在则从assets中拷贝
-                "600001800",
+            file.createNewFile()
-                "2022576701",
+            context.resources.openRawResource(R.raw.channels).use { input ->
-                "600001800",
+                file.outputStream().use { output ->
-                true,
+                    input.copyTo(output)
-                mustToken = false
+                }
-            ),
+            }
-            TV(
+        }
-                2,
+
-                "CCTV3 综艺",
+        //读取channels.json，并转换为Map<String,LIst<TV>>
-                "CCTV3",
+        val json = file.readText()
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226397/index.m3u8"),
+        //防止类型擦除
-                0,
+        val type = object : TypeToken<Array<TV>>() {}.type
-                "央视频道",
+        Gson().fromJson<Array<TV>>(json, type)?.forEach {
-                "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
+            if (map.containsKey(it.channel)) {
-                "600001801",
+                map[it.channel]?.add(it)
-                "2022576501",
+            } else {
-                "600001801",
+                map[it.channel] = mutableListOf(it)
-                true,
+            }
-                mustToken = true
+        }
-            ),
+        return map
-            TV(
+    }
-                3,
-                "CCTV4 中文国际",
-                "CCTV4",
-                listOf(
-                    "http://39.134.24.161/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8"
-                ),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp",
-                "600001814",
-                "2022576601",
-                "600001814",
-                false,
-                mustToken = false
-            ),
-            TV(
-                4,
-                "CCTV5 体育",
-                "CCTV5",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226395/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp",
-                "600001818",
-                "2022576401",
-                "600001818",
-                true,
-                mustToken = false
-            ),
-            TV(
-                5,
-                "CCTV6 电影",
-                "CCTV6",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226393/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
-                "600001802",
-                "2022574301",
-                "600001802",
-                true,
-                mustToken = true
-            ),
-            TV(
-                6,
-                "CCTV7 国防军事",
-                "CCTV7",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226192/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp",
-                "600004092",
-                "2022576201",
-                "600004092",
-                true,
-                mustToken = false
-            ),
-            TV(
-                7,
-                "CCTV8 电视剧",
-                "CCTV8",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226391/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/ad51de94426a0ba039e6dd6a8534ea98ecc813a6176bde87b4f18cc34d6d7590.png?imageMogr2/format/webp",
-                "600001803",
-                "2022576101",
-                "600001803",
-                true,
-                mustToken = true
-            ),
-            TV(
-                8,
-                "CCTV9 记录",
-                "CCTV9",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226197/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp",
-                "600004078",
-                "2022576001",
-                "600004078",
-                true,
-                mustToken = false
-            ),
-            TV(
-                9,
-                "CCTV10 科教",
-                "CCTV10",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226189/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp",
-                "600001805",
-                "2022573001",
-                "600001805",
-                true,
-                mustToken = false
-            ),
-            TV(
-                10,
-                "CCTV11 戏曲",
-                "CCTV11",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226240/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp",
-                "600001806",
-                "2022575901",
-                "600001806",
-                true,
-                mustToken = false
-            ),
-            TV(
-                11,
-                "CCTV12 社会与法",
-                "CCTV12",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226190/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp",
-                "600001807",
-                "2022575801",
-                "600001807",
-                true,
-                mustToken = false
-            ),
-            TV(
-                12,
-                "CCTV13 新闻",
-                "CCTV13",
-                listOf(
-                    "https://live-play.cctvnews.cctv.com/cctv/merge_cctv13.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226233/index.m3u8"
-                ),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/266da7b43c03e2312186b4a999e0f060e8f15b10d2cc2c9aa32171819254cf1a.png?imageMogr2/format/webp",
-                "600001811",
-                "2022575701",
-                "600001811",
-                false,
-                mustToken = false
-            ),
-            TV(
-                13,
-                "CCTV14 少儿",
-                "CCTV14",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp",
-                "600001809",
-                "2022575601",
-                "600001809",
-                true,
-                mustToken = false
-            ),
-            TV(
-                14,
-                "CCTV15 音乐",
-                "CCTV15",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp",
-                "600001815",
-                "2022575501",
-                "600001815",
-                true,
-                mustToken = false
-            ),
-            TV(
-                15,
-                "CCTV16 奥林匹克",
-                "CCTV16-HD",
-                listOf(
-                    "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"
-                ),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp",
-                "600098637",
-                "2022575401",
-                "600098637",
-                true,
-                mustToken = false
-            ),
-            TV(
-                16,
-                "CCTV17 农业农村",
-                "CCTV17",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226198/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp",
-                "600001810",
-                "2022575301",
-                "600001810",
-                true,
-                mustToken = false
-            ),
-            TV(
-                17,
-                "CCTV5+ 体育赛事",
-                "CCTV5+",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226221/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp",
-                "600001817",
-                "2022576301",
-                "600001817",
-                true,
-                mustToken = false
-            ),
-            TV(
-                18,
-                "CCTV4K 超高清",
-                "CCTV4K",
-                listOf(),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
-                "600002264",
-                "2022575201",
-                "600002264",
-                true,
-                mustToken = false
-            ),
-            TV(
-                19,
-                "CCTV8K 超高清",
-                "CCTV8K",
-                listOf(),
-                0,
-                "央视频道",
-                "",
-                "600156816",
-                "2020603421",
-                "",
-                false,
-                mustToken = false
-            ),
-            TV(
-                20,
-                "风云剧场",
-                "CCTV风云剧场频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226950/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/4d549e53e6d0f632d5a633d1945280797b153e588f919221a07faa869812cc89.png?imageMogr2/format/webp",
-                "600099658",
-                "2012513603",
-                "600099658",
-                true,
-                mustToken = true
-            ),
-            TV(
-                21,
-                "第一剧场",
-                "CCTV第一剧场频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226959/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/a556bd7d93ce65e18f243a8892b5604f4faa994a4897315914216a710a706208.png?imageMogr2/format/webp",
-                "600099655",
-                "2012514403",
-                "600099655",
-                true,
-                mustToken = true
-            ),
-            TV(
-                22,
-                "怀旧剧场",
-                "CCTV怀旧剧场频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226972/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/5661bd04fecdb6e899f801147a22ab5d3a475bf2b62e30aec2c0023190ebc9b1.png?imageMogr2/format/webp",
-                "600099620",
-                "2012511203",
-                "600099620",
-                true,
-                mustToken = true
-            ),
-            TV(
-                23,
-                "世界地理",
-                "CCTV世界地理频道",
-                listOf(),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/bb3c6c9e145d698137f5bb64a582021a01b51344b929003630eb769ea65832a9.png?imageMogr2/format/webp",
-                "600099637",
-                "2012513303",
-                "600099637",
-                true,
-                mustToken = true
-            ),
-            TV(
-                24,
-                "风云音乐",
-                "CCTV风云音乐频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226953/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/bbf1d024c5228b8dd128b0e3cb1717d173fab4ee84c3a4c8a57b1a215362ca3b.png?imageMogr2/format/webp",
-                "600099660",
-                "2012514103",
-                "600099660",
-                true,
-                mustToken = true
-            ),
-            TV(
-                25,
-                "兵器科技",
-                "CCTV兵器科技频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226975/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/4c6b6a6d3839889f34d33db3c2f80233b26b74d3489b393487635f8704e70796.png?imageMogr2/format/webp",
-                "600099649",
-                "2012513403",
-                "600099649",
-                true,
-                mustToken = true
-            ),
-            TV(
-                26,
-                "风云足球",
-                "CCTV风云足球频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226984/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/cd1e2bb52b06a991de168733e5ff0f1d85adc8042d40c8f393f723543e5dd08a.png?imageMogr2/format/webp",
-                "600099636",
-                "2012514203",
-                "600099636",
-                true,
-                mustToken = true
-            ),
-            TV(
-                27,
-                "高尔夫网球",
-                "CCTV高尔夫·网球频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226978/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/cdd1b31ede7a5ad049ed53d9a072422f829e72dd062ed2c19e077fdd01699071.png?imageMogr2/format/webp",
-                "600099659",
-                "2012512503",
-                "600099659",
-                true,
-                mustToken = true
-            ),
-            TV(
-                28,
-                "女性时尚",
-                "CCTV女性时尚频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226969/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/fa28955ce8b2539d728bf4c6a13a46ff57ad76eae46627f7bcfb1ed8a613d3fc.png?imageMogr2/format/webp",
-                "600099650",
-                "2012513903",
-                "600099650",
-                true,
-                mustToken = true
-            ),
-            TV(
-                29,
-                "央视文化精品",
-                "CCTV央视文化精品频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226981/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/14ac5ce40482cacd3d4b37435222bfe86af2b452a2f04ecbfc1d13d76edd7c57.png?imageMogr2/format/webp",
-                "600099653",
-                "2012513803",
-                "600099653",
-                true,
-                mustToken = true
-            ),
-            TV(
-                30,
-                "央视台球",
-                "CCTV央视台球频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226956/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/10e14a92478011aa6c3c8562e62127f3b1908e29fcd78e4b2b24b9e6d3ec2fbc.png?imageMogr2/format/webp",
-                "600099652",
-                "2012513703",
-                "600099652",
-                true,
-                mustToken = true
-            ),
-            TV(
-                31,
-                "电视指南",
-                "CCTV电视指南频道",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226987/index.m3u8"),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/244d72c0eb1615ed7d51c2f5db5a67f306aa3f58c05bc2d34de3aa7e956dc8c9.png?imageMogr2/format/webp",
-                "600099656",
-                "2012514003",
-                "600099656",
-                true,
-                mustToken = true
-            ),
-            TV(
-                32,
-                "卫生健康",
-                "CCTV卫生健康频道",
-                listOf(),
-                0,
-                "央视频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/54a6863656fdfd8f803be193ddf22441c5000a108833889816fd2d8911715ce8.png?imageMogr2/format/webp",
-                "600099651",
-                "2012513503",
-                "600099651",
-                true,
-                mustToken = true
-            ),
-        ),
-        "地方频道" to listOf(
-            TV(
-                33,
-                "东方卫视",
-                "东方卫视",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226217/index.m3u8"),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp",
-                "600002483",
-                "2000292403",
-                "600002483",
-                true,
-                mustToken = false
-            ),
-            TV(
-                34,
-                "湖南卫视",
-                "湖南卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226307/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226211/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp",
-                "600002475",
-                "2000296203",
-                "600002475",
-                true,
-                mustToken = false
-            ),
-            TV(
-                35,
-                "湖北卫视",
-                "湖北卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226477/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226194/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp",
-                "600002508",
-                "2000294503",
-                "600002508",
-                true,
-                mustToken = false
-            ),
-            TV(
-                36,
-                "辽宁卫视",
-                "辽宁卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226546/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226201/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/ac4ed6058a87c101ae7147ebc38905d0cae047fb73fd277ee5049b84f52bda36.png?imageMogr2/format/webp",
-                "600002505",
-                "2000281303",
-                "600002505",
-                true,
-                mustToken = false
-            ),
-            TV(
-                37,
-                "江苏卫视",
-                "江苏卫视",
-                listOf(
-                    "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp",
-                "600002521",
-                "2000295603",
-                "600002521",
-                true,
-                mustToken = false
-            ),
-            TV(
-                38,
-                "江西卫视",
-                "江西卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226344/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225764/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/3c760d0d00463855890e8a1864ea4a6b6dd66b90c29b4ac714a4b17c16519871.png?imageMogr2/format/webp",
-                "600002503",
-                "2000294103",
-                "600002503",
-                true,
-                mustToken = false
-            ),
-            TV(
-                39,
-                "山东卫视",
-                "山东卫视",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226209/index.m3u8"),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/22d403f07a7cf5410b3ad3ddb65a11aa229a32475fac213f5344c9f0ec330ca1.png?imageMogr2/format/webp",
-                "600002513",
-                "2000294803",
-                "600002513",
-                true,
-                mustToken = false
-            ),
-            TV(
-                40,
-                "广东卫视",
-                "广东卫视",
-                listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226216/index.m3u8"),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/28886880a4dc0f06fb7e0a528a1def0591d61a65870e29176ede0cc92033bbfd.png?imageMogr2/format/webp",
-                "600002485",
-                "2000292703",
-                "600002485",
-                true,
-                mustToken = false
-            ),
-            TV(
-                41,
-                "广西卫视",
-                "广西卫视",
-                listOf(
-                    "http://live.gxrb.com.cn/tv/gxtvlive03/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225770/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/54b7e97cb816bb223fe05f3fc44da2c7820eb66e8550c19d23100f2c414ecc38.png?imageMogr2/format/webp",
-                "600002509",
-                "2000294203",
-                "600002509",
-                true,
-                mustToken = false
-            ),
-            TV(
-                42,
-                "重庆卫视",
-                "重庆卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226409/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226202/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/657651f411de2673d1770d9a78b44c1265704f7468cc41d4be7f51d630768494.png?imageMogr2/format/webp",
-                "600002531",
-                "2000297803",
-                "600002531",
-                true,
-                mustToken = false
-            ),
-            TV(
-                43,
-                "河南卫视",
-                "河南卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226480/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225767/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/74925962148a6d31c85808b6cd4e444c2a54bab393d2c5fc85e960b50e22fa86.png?imageMogr2/format/webp",
-                "600002525",
-                "2000296103",
-                "600002525",
-                true,
-                mustToken = false
-            ),
-            TV(
-                44,
-                "河北卫视",
-                "河北卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226406/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225750/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/d545becdc81c60197b08c7f47380705e4665ed3fe55efc8b855e486f6e655378.png?imageMogr2/format/webp",
-                "600002493",
-                "2000293403",
-                "600002493",
-                true,
-                mustToken = false
-            ),
-            TV(
-                45,
-                "贵州卫视",
-                "贵州卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226474/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225793/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/4eb45f4781d33d872af027dc01c941559aab55667dd99cc5c22bef7037807b13.png?imageMogr2/format/webp",
-                "600002490",
-                "2000293303",
-                "600002490",
-                true,
-                mustToken = false
-            ),
-            TV(
-                46,
-                "北京卫视",
-                "北京卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221225728/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226222/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/f4f23633c578beea49a3841d88d3490100f029ee349059fa532869db889872c5.png?imageMogr2/format/webp",
-                "600002309",
-                "2000272103",
-                "600002309",
-                true,
-                mustToken = false
-            ),
-            TV(
-                47,
-                "黑龙江卫视",
-                "黑龙江卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226327/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226215/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/d8273ae9be698ce2db21f5b886ecac95a73429593f93713c60ed8c12c38bf0d3.png?imageMogr2/format/webp",
-                "600002498",
-                "2000293903",
-                "600002498",
-                true,
-                mustToken = false
-            ),
-            TV(
-                48,
-                "浙江卫视",
-                "浙江卫视",
-                listOf(
-                    "http://hw-m-l.cztv.com/channels/lantian/channel01/1080p.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226199/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/a66c836bd98ba3e41a2e9a570d4b9c50dedc6839e9de333e2e78212ad505f37e.png?imageMogr2/format/webp",
-                "600002520",
-                "2000295503",
-                "600002520",
-                true,
-                mustToken = false
-            ),
-            TV(
-                49,
-                "安徽卫视",
-                "安徽卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226391/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226203/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/f35fa04b51b1ee4984b03578b65403570868ebca03c6c01e11b097f999a58d9b.png?imageMogr2/format/webp",
-                "600002532",
-                "2000298003",
-                "600002532",
-                true,
-                mustToken = false
-            ),
-            TV(
-                50,
-                "深圳卫视",
-                "深圳卫视",
-                listOf(
-                    "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp",
-                "600002481",
-                "2000292203",
-                "600002481",
-                true,
-                mustToken = false
-            ),
-            TV(
-                51,
-                "四川卫视",
-                "四川卫视",
-                listOf(
-                    "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"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
-                "600002516",
-                "2000295003",
-                "600002516",
-                true,
-                mustToken = false
-            ),
-            TV(
-                52,
-                "东南卫视",
-                "福建东南卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226341/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225766/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp",
-                "600002484",
-                "2000292503",
-                "600002484",
-                true,
-                mustToken = false
-            ),
-            TV(
-                53,
-                "海南卫视",
-                "海南卫视",
-                listOf(
-                    "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226465/index.m3u8",
-                    "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225769/index.m3u8"
-                ),
-                0,
-                "地方频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp",
-                "600002506",
-                "2000291503",
-                "600002506",
-                true,
-                mustToken = false
-            ),
-            TV(
-                54,
-                "天津卫视",
-                "天津卫视",
-                listOf(),
-                0,
-                "地方频道",
-                "",
-                "600152137",
-                "2019927003",
-                "",
-                true,
-                mustToken = false
-            ),
-            TV(
-                55,
-                "新疆卫视",
-                "新疆卫视",
-                listOf(),
-                0,
-                "地方频道",
-                "",
-                "600152138",
-                "2019927403",
-                "",
-                true,
-                mustToken = false
-            ),
-        ),
-        "国际频道" to listOf(
-            TV(
-                56,
-                "CGTN",
-                "CGTN",
-                listOf("http://live.cgtn.com/1000/prog_index.m3u8"),
-                0,
-                "国际频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp",
-                "600014550",
-                "2022575001",
-                "600014550",
-                false,
-                mustToken = false
-            ),
-            TV(
-                57,
-                "CGTN 法语频道",
-                "CGTN法语频道",
-                listOf("https://livefr.cgtn.com/1000f/prog_index.m3u8"),
-                0,
-                "国际频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp",
-                "600084704",
-                "2022574901",
-                "600084704",
-                false,
-                mustToken = false
-            ),
-            TV(
-                58,
-                "CGTN 俄语频道",
-                "CGTN俄语频道",
-                listOf("http://liveru.cgtn.com/1000r/prog_index.m3u8"),
-                0,
-                "国际频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp",
-                "600084758",
-                "2022574801",
-                "600084758",
-                false,
-                mustToken = false
-            ),
-            TV(
-                59,
-                "CGTN 阿拉伯语频道",
-                "CGTN阿拉伯语频道",
-                listOf("http://livear.cgtn.com/1000a/prog_index.m3u8"),
-                0,
-                "国际频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp",
-                "600084782",
-                "2022574601",
-                "600084782",
-                false,
-                mustToken = false
-            ),
-            TV(
-                60,
-                "CGTN 西班牙语频道",
-                "CGTN西班牙语频道",
-                listOf(
-                    "http://livees.cgtn.com/500e/prog_index.m3u8",
-                    "http://livees.cgtn.com/1000e/prog_index.m3u8"
-                ),
-                0,
-                "国际频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp",
-                "600084744",
-                "2022571701",
-                "600084744",
-                false,
-                mustToken = false
-            ),
-            TV(
-                61,
-                "CGTN 纪录频道",
-                "CGTN外语纪录频道",
-                listOf("https://livedoc.cgtn.com/500d/prog_index.m3u8"),
-                0,
-                "国际频道",
-                "https://resources.yangshipin.cn/assets/oms/image/202309/74d3ac436a7e374879578de1d87a941fbf566d39d5632b027c5097891ed32bd5.png?imageMogr2/format/webp",
-                "600084781",
-                "2022574701",
-                "600084781",
-                false,
-                mustToken = false
-            ),
-        )
-    )
 }

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

@@ -1,101 +0,0 @@
-package com.lizongying.mytv
-
-import android.app.DownloadManager
-import android.app.DownloadManager.Request
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.net.Uri
-import android.os.Build
-import android.os.Environment
-import android.util.Log
-import androidx.annotation.RequiresApi
-import com.lizongying.mytv.api.Release
-import com.lizongying.mytv.requests.MyRequest
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.File
-
-
-class UpdateManager(private var context: Context?) {
-
-    private var myRequest = MyRequest()
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun checkAndUpdate() {
-        CoroutineScope(Dispatchers.Main).launch {
-            try {
-                val release = myRequest.getRelease()
-                // 在主线程中更新 UI
-                updateUI(release)
-                if (release?.data?.versionCode!! > 0) {
-                    startDownload(release)
-                }
-            } catch (e: Exception) {
-                // 处理异常情况
-                Log.e(TAG, "Error occurred: ${e.message}", e)
-            }
-        }
-    }
-
-    private fun updateUI(release: Release?) {
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun startDownload(release: Release) {
-        val apkFileName = "my-tv-${release.data.versionName}.apk"
-
-        val downloadManager =
-            context!!.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        val request = Request(Uri.parse(release.data.downloadUrl))
-        request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, apkFileName)
-        request.setTitle("New Version Download")
-        request.setNotificationVisibility(Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-
-        // 获取下载任务的引用
-        val downloadReference = downloadManager.enqueue(request)
-
-        // 注册广播接收器，监听下载完成事件
-        context!!.registerReceiver(
-            DownloadReceiver(context!!, apkFileName, downloadReference),
-            IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), Context.RECEIVER_NOT_EXPORTED
-        )
-    }
-
-
-    private class DownloadReceiver(
-        private val context: Context,
-        private val apkFileName: String,
-        private val downloadReference: Long
-    ) : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            val reference = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-
-            // 检查是否是我们发起的下载
-            if (reference == downloadReference) {
-                // 下载完成，触发安装
-                installNewVersion()
-            }
-        }
-
-        private fun installNewVersion() {
-            val installIntent = Intent(Intent.ACTION_VIEW)
-            val apkUri = Uri.fromFile(
-                File(
-                    Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
-                    apkFileName
-                )
-            )
-            installIntent.setDataAndType(apkUri, "application/vnd.android.package-archive")
-            installIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(installIntent)
-        }
-    }
-
-
-    companion object {
-        private const val TAG = "UpdateManager"
-    }
-}

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

@@ -3,63 +3,18 @@ package com.lizongying.mytv
 import android.content.Context
 import android.content.res.Resources
 import android.util.TypedValue
-import com.google.gson.Gson
-import com.lizongying.mytv.api.TimeResponse
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import java.io.File
-import java.io.IOException
 import java.text.SimpleDateFormat
-import java.util.Date
+import java.util.*
-import java.util.Locale
+import java.io.IOException
 
 object Utils {
-    private var between: Long = 0
-
     fun getDateFormat(format: String): String {
-        return SimpleDateFormat(
+        return SimpleDateFormat(format, Locale.CHINA).format(Date())
-            format,
-            Locale.CHINA
-        ).format(Date(System.currentTimeMillis() - between))
     }
 
     fun getDateTimestamp(): Long {
-        return (System.currentTimeMillis() - between) / 1000
+        return Date().time / 1000
-    }
-
-    suspend fun init() {
-        var currentTimeMillis: Long = 0
-        try {
-            currentTimeMillis = getTimestampFromServer()
-        } catch (e: Exception) {
-            println("Failed to retrieve timestamp from server: ${e.message}")
-        }
-        between = System.currentTimeMillis() - currentTimeMillis
-    }
-
-    /**
-     * 从服务器获取时间戳
-     * @return Long 时间戳
-     */
-    private suspend fun getTimestampFromServer(): Long {
-        return withContext(Dispatchers.IO) {
-            val client = okhttp3.OkHttpClient.Builder()
-                .connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
-                .readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
-            val request = okhttp3.Request.Builder()
-                .url("https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp")
-                .build()
-            try {
-                client.newCall(request).execute().use { response ->
-                    if (!response.isSuccessful) throw IOException("Unexpected code $response")
-                    val string = response.body()?.string()
-                    Gson().fromJson(string, TimeResponse::class.java).data.t.toLong()
-                }
-            } catch (e: IOException) {
-                // Handle network errors
-                throw IOException("Error during network request", e)
-            }
-        }
     }
 
     fun dpToPx(dp: Float): Int {

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

@@ -34,14 +34,6 @@ class ApiClient {
             .build().create(YSPTokenService::class.java)
     }
 
-    val ReleaseService by lazy {
-        Retrofit.Builder()
-            .baseUrl(myUrl)
-            .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build().create(ReleaseService::class.java)
-    }
-
     val yspProtoService: YSPProtoService by lazy {
         Retrofit.Builder()
             .baseUrl(protoUrl)

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

@@ -3,30 +3,9 @@ package com.lizongying.mytv.api
 data class Info(
     val code: Int?,
     val msg: String?,
-    val data: Data,
+    val data: InfoData,
-) {
+)
-    data class Data(
-        val token: String,
-    )
-}
 
-data class Release(
+data class InfoData(
-    val code: Int?,
+    val token: String,
-    val msg: String?,
+)
-    val data: Data,
-) {
-    data class Data(
-        val versionName: String,
-        val versionCode: Int,
-        val downloadUrl: String,
-        val updateTime: Int,
-    )
-}
-
-data class TimeResponse(
-    val data: Time
-) {
-    data class Time(
-        val t: String
-    )
-}

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

@@ -13,7 +13,6 @@ data class LiveInfo(
 )
 
 data class LiveInfoData(
-    val extended_param: String,
     val chanll: String,
     val playurl: String,
     val errinfo: String,

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

@@ -1,11 +0,0 @@
-package com.lizongying.mytv.api
-
-import retrofit2.Call
-import retrofit2.http.GET
-
-
-interface ReleaseService {
-    @GET("my-tv/v1/release")
-    fun getRelease(
-    ): Call<Release>
-}

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

@@ -127,6 +127,7 @@ class YSP(var context: Context) {
     private fun getSignature(): String {
         val e =
             "adjust=${adjust}&appVer=${appVer}&app_version=$appVersion&cKey=$cKey&channel=$channel&cmd=$cmd&cnlid=$cnlid&defn=${defn}&devid=${devid}&dtype=${dtype}&encryptVer=${encryptVer}&guid=${guid}&livepid=${livepid}&otype=${otype}&platform=${platform}&rand_str=${randStr}&sphttps=${sphttps}&stream=${stream}".toByteArray()
+
         val hashedData = encryptor?.hash(e) ?: return ""
         return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
     }

app/src/main/java/com/lizongying/mytv/requests/MyRequest.kt

@@ -1,44 +0,0 @@
-package com.lizongying.mytv.requests
-
-import com.lizongying.mytv.api.ApiClient
-import com.lizongying.mytv.api.Release
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
-
-class MyRequest {
-    private var releaseService = ApiClient().ReleaseService
-
-    suspend fun getRelease(): Release? {
-        return withContext(Dispatchers.IO) {
-            fetchRelease()
-        }
-    }
-
-    private suspend fun fetchRelease(): Release? {
-        return suspendCoroutine { continuation ->
-            releaseService.getRelease()
-                .enqueue(object : Callback<Release> {
-                    override fun onResponse(call: Call<Release>, response: Response<Release>) {
-                        if (response.isSuccessful) {
-                            continuation.resume(response.body())
-                        } else {
-                            continuation.resume(null)
-                        }
-                    }
-
-                    override fun onFailure(call: Call<Release>, t: Throwable) {
-                        continuation.resume(null)
-                    }
-                })
-        }
-    }
-
-    companion object {
-        private const val TAG = "MyRequest"
-    }
-}

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="lbImageCardViewType">Title|Content</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>