fix the menu did not appear

README.md

@@ -14,24 +14,6 @@
 
 ## 更新日志
 
-### v1.4.7（高版本专用）
-
-* 修复部分用户cctv13播放过程中卡住的问题
-* 调整cctv的频道顺序
-
-### v1.4.6（通用版）
-
-* 10以下频道不再需要先按0
-
-### v1.4.5（高版本专用）
-
-* 数字选台配置
-
-### v1.4.4（通用版）
-
-* 优化图标显示
-* 增加换台反转
-
 ### v1.3.3
 
 * 部分错误会提示用户

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/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:allowBackup="true"
-        android:icon="@drawable/logo"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.MyTV">

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

@@ -1,112 +0,0 @@
-package com.lizongying.mytv
-
-import android.graphics.Color
-import android.util.Log
-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
-
-        if (tvViewModel.logo.value != null) {
-            if (tvViewModel.title.value == "CCTV8K 超高清") {
-                Glide.with(viewHolder.view.context)
-                    .load(R.drawable.cctv8k)
-                    .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/ChannelFragment.kt

@@ -1,76 +0,0 @@
-package com.lizongying.mytv
-
-import android.os.Bundle
-import android.os.Handler
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import com.lizongying.mytv.databinding.ChannelBinding
-import com.lizongying.mytv.models.TVViewModel
-
-class ChannelFragment : Fragment() {
-    private var _binding: ChannelBinding? = null
-    private val binding get() = _binding!!
-
-    private val handler = Handler()
-    private val delay: Long = 3000
-    private var channel = 0
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = ChannelBinding.inflate(inflater, container, false)
-        _binding!!.root.visibility = View.GONE
-        (activity as MainActivity).fragmentReady()
-        return binding.root
-    }
-
-    fun show(tvViewModel: TVViewModel) {
-        handler.removeCallbacks(hideRunnable)
-        handler.removeCallbacks(playRunnable)
-        binding.channelContent.text = tvViewModel.id.value.toString()
-        view?.visibility = View.VISIBLE
-        handler.postDelayed(hideRunnable, delay)
-    }
-
-    fun show(channel: String) {
-        this.channel = "${binding.channelContent.text}$channel".toInt()
-        handler.removeCallbacks(hideRunnable)
-        handler.removeCallbacks(playRunnable)
-        if (binding.channelContent.text == "") {
-            binding.channelContent.text = channel
-            view?.visibility = View.VISIBLE
-            handler.postDelayed(playRunnable, delay)
-        } else {
-            handler.postDelayed(playRunnable, 0)
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        handler.removeCallbacks(hideRunnable)
-        handler.removeCallbacks(playRunnable)
-    }
-
-    private val hideRunnable = Runnable {
-        binding.channelContent.text = ""
-        view?.visibility = View.GONE
-    }
-
-    private val playRunnable = Runnable {
-        (activity as MainActivity).play(channel)
-        binding.channelContent.text = ""
-        view?.visibility = View.GONE
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        private const val TAG = "ChannelFragment"
-    }
-}

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

@@ -23,11 +23,17 @@ class InfoFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         _binding = InfoBinding.inflate(inflater, container, false)
-        _binding!!.root.visibility = View.GONE
         (activity as MainActivity).fragmentReady()
         return binding.root
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        // Use a Handler to delay the fragment transaction
+        handler.postDelayed(removeRunnable, delay)
+    }
+
     fun show(tvViewModel: TVViewModel) {
         binding.textView.text = tvViewModel.title.value
         if (tvViewModel.title.value == "CCTV8K 超高清") {
@@ -50,13 +56,10 @@ class InfoFragment : Fragment() {
         handler.postDelayed(removeRunnable, delay)
     }
 
-    override fun onResume() {
-        super.onResume()
-        handler.postDelayed(removeRunnable, delay)
-    }
-
     override fun onPause() {
         super.onPause()
+        Log.i(TAG, "onPause")
+        // Cancel the delayed task when the fragment is paused
         handler.removeCallbacks(removeRunnable)
     }
 

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

@@ -1,11 +1,11 @@
 package com.lizongying.mytv
 
-import android.content.Context
-import android.content.SharedPreferences
+import android.app.AlertDialog
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.Signature
 import android.content.pm.SigningInfo
+import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -16,7 +16,11 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import com.lizongying.mytv.models.TVViewModel
 import java.security.MessageDigest
@@ -27,8 +31,6 @@ class MainActivity : FragmentActivity() {
     var playerFragment = PlayerFragment()
     private val mainFragment = MainFragment()
     private val infoFragment = InfoFragment()
-    private val channelFragment = ChannelFragment()
-    private lateinit var settingFragment: SettingFragment
 
     private var doubleBackToExitPressedOnce = false
 
@@ -36,13 +38,6 @@ class MainActivity : FragmentActivity() {
 
     private val handler = Handler()
     private val delay: Long = 4000
-    private val delayHideHelp: Long = 10000
-
-    private lateinit var sharedPref: SharedPreferences
-    private var channelReversal = false
-    private var channelNum = true
-
-    private var versionName = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -56,41 +51,16 @@ class MainActivity : FragmentActivity() {
             supportFragmentManager.beginTransaction()
                 .add(R.id.main_browse_fragment, playerFragment)
                 .add(R.id.main_browse_fragment, infoFragment)
-                .add(R.id.main_browse_fragment, channelFragment)
                 .add(R.id.main_browse_fragment, mainFragment)
-                .hide(mainFragment)
+                .hide(infoFragment)
                 .commit()
             mainFragment.view?.requestFocus()
         }
         gestureDetector = GestureDetector(this, GestureListener())
-
-        sharedPref = getPreferences(Context.MODE_PRIVATE)
-        channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, channelReversal)
-        channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
-
-        versionName = getPackageInfo().versionName
-        settingFragment = SettingFragment(versionName, channelReversal, channelNum)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
         infoFragment.show(tvViewModel)
-        if (channelNum) {
-            channelFragment.show(tvViewModel)
-        }
-    }
-
-    private fun showChannel(channel: String) {
-        if (!mainFragment.isHidden) {
-            return
-        }
-
-        if (settingFragment.isVisible) {
-            return
-        }
-
-        if (channelNum) {
-            channelFragment.show(channel)
-        }
     }
 
     fun play(tvViewModel: TVViewModel) {
@@ -98,10 +68,6 @@ class MainActivity : FragmentActivity() {
         mainFragment.view?.requestFocus()
     }
 
-    fun play(itemPosition: Int) {
-        mainFragment.play(itemPosition)
-    }
-
     fun prev() {
         mainFragment.prev()
     }
@@ -111,18 +77,17 @@ class MainActivity : FragmentActivity() {
     }
 
     private fun prevSource() {
-//        mainFragment.prevSource()
+        mainFragment.prevSource()
     }
 
     private fun nextSource() {
-//        mainFragment.nextSource()
+        mainFragment.nextSource()
     }
 
     fun switchMainFragment() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
-            mainFragment.setPosition()
             transaction.show(mainFragment)
             keepRunnable()
         } else {
@@ -138,9 +103,7 @@ class MainActivity : FragmentActivity() {
     }
 
     private val hideRunnable = Runnable {
-        if (!mainFragment.isHidden) {
-            supportFragmentManager.beginTransaction().hide(mainFragment).commit()
-        }
+        supportFragmentManager.beginTransaction().hide(mainFragment).commit()
     }
 
     private fun mainFragmentIsHidden(): Boolean {
@@ -207,170 +170,59 @@ class MainActivity : FragmentActivity() {
         }
     }
 
-    fun saveChannelReversal(channelReversal: Boolean) {
-        with(sharedPref.edit()) {
-            putBoolean(CHANNEL_REVERSAL, channelReversal)
-            apply()
-        }
-        this.channelReversal = channelReversal
-    }
-
-    fun saveChannelNum(channelNum: Boolean) {
-        with(sharedPref.edit()) {
-            putBoolean(CHANNEL_NUM, channelNum)
-            apply()
-        }
-        this.channelNum = channelNum
-    }
-
     private fun showHelp() {
-        if (!mainFragment.isHidden) {
-            return
-        }
+        val versionName = getPackageInfo().versionName
 
-        Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
-        if (!settingFragment.isVisible) {
-            settingFragment.show(supportFragmentManager, "setting")
-            handler.removeCallbacks(hideHelp)
-            handler.postDelayed(hideHelp, delayHideHelp)
-        } else {
-            handler.removeCallbacks(hideHelp)
-            settingFragment.dismiss()
-        }
-    }
+        val textView = TextView(this)
+        textView.text =
+            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+        textView.setBackgroundColor(0xFF263238.toInt())
+        textView.setPadding(20, 50, 20, 20)
 
-    private val hideHelp = Runnable {
-        if (settingFragment.isVisible) {
-            settingFragment.dismiss()
-        }
-    }
+        val imageView = ImageView(this)
+        val drawable = ContextCompat.getDrawable(this, R.drawable.appreciate)
+        imageView.setImageDrawable(drawable)
+        imageView.setBackgroundColor(Color.WHITE)
 
-    private fun channelUp() {
-        if (mainFragment.isHidden) {
-            if (channelReversal) {
-                next()
-                return
-            }
-            prev()
-        } else {
-//                    if (mainFragment.selectedPosition == 0) {
-//                        mainFragment.setSelectedPosition(
-//                            mainFragment.tvListViewModel.maxNum.size - 1,
-//                            false
-//                        )
-//                    }
-        }
-    }
+        val linearLayout = LinearLayout(this)
+        linearLayout.orientation = LinearLayout.VERTICAL
+        linearLayout.addView(textView)
+        linearLayout.addView(imageView)
 
-    private fun channelDown() {
-        if (mainFragment.isHidden) {
-            if (channelReversal) {
-                prev()
-                return
-            }
-            next()
-        } else {
-//                    if (mainFragment.selectedPosition == mainFragment.tvListViewModel.maxNum.size - 1) {
-////                        mainFragment.setSelectedPosition(0, false)
-//                        hideMainFragment()
-//                        return false
-//                    }
-        }
-    }
+        val layoutParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        imageView.layoutParams = layoutParams
+        textView.layoutParams = layoutParams
 
-    private fun back() {
-        if (!mainFragmentIsHidden()) {
-            hideMainFragment()
-            return
-        }
+        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
+        builder
+            .setView(linearLayout)
 
-        if (doubleBackToExitPressedOnce) {
-            super.onBackPressed()
-            return
-        }
-
-        doubleBackToExitPressedOnce = true
-        Toast.makeText(this, "再按一次退出", Toast.LENGTH_SHORT).show()
-
-        Handler(Looper.getMainLooper()).postDelayed({
-            doubleBackToExitPressedOnce = false
-        }, 2000)
+        val dialog: AlertDialog = builder.create()
+        dialog.show()
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         when (keyCode) {
-            KeyEvent.KEYCODE_0 -> {
-                showChannel("0")
-                return true
-            }
-
-            KeyEvent.KEYCODE_1 -> {
-                showChannel("1")
-                return true
-            }
-
-            KeyEvent.KEYCODE_2 -> {
-                showChannel("2")
-                return true
-            }
-
-            KeyEvent.KEYCODE_3 -> {
-                showChannel("3")
-                return true
-            }
-
-            KeyEvent.KEYCODE_4 -> {
-                showChannel("4")
-                return true
-            }
-
-            KeyEvent.KEYCODE_5 -> {
-                showChannel("5")
-                return true
-            }
-
-            KeyEvent.KEYCODE_6 -> {
-                showChannel("6")
-                return true
-            }
-
-            KeyEvent.KEYCODE_7 -> {
-                showChannel("7")
-                return true
-            }
-
-            KeyEvent.KEYCODE_8 -> {
-                showChannel("8")
-                return true
-            }
-
-            KeyEvent.KEYCODE_9 -> {
-                showChannel("9")
-                return true
-            }
-
-            KeyEvent.KEYCODE_ESCAPE -> {
-                back()
-                return true
-            }
-
             KeyEvent.KEYCODE_BACK -> {
-                back()
-                return true
-            }
+                if (!mainFragmentIsHidden()) {
+                    hideMainFragment()
+                    return true
+                }
 
-            KeyEvent.KEYCODE_BOOKMARK -> {
-                showHelp()
-                return true
-            }
+                if (doubleBackToExitPressedOnce) {
+                    super.onBackPressed()
+                    return true
+                }
 
-            KeyEvent.KEYCODE_UNKNOWN -> {
-                showHelp()
-                return true
-            }
+                this.doubleBackToExitPressedOnce = true
+                Toast.makeText(this, "再按一次退出", Toast.LENGTH_SHORT).show()
 
-            KeyEvent.KEYCODE_HELP -> {
-                showHelp()
+                Handler(Looper.getMainLooper()).postDelayed({
+                    doubleBackToExitPressedOnce = false
+                }, 2000)
                 return true
             }
 
@@ -393,19 +245,28 @@ class MainActivity : FragmentActivity() {
             }
 
             KeyEvent.KEYCODE_DPAD_UP -> {
-                channelUp()
-            }
-
-            KeyEvent.KEYCODE_CHANNEL_UP -> {
-                channelUp()
+                if (mainFragment.isHidden) {
+                    prev()
+                } else {
+//                    if (mainFragment.selectedPosition == 0) {
+//                        mainFragment.setSelectedPosition(
+//                            mainFragment.tvListViewModel.maxNum.size - 1,
+//                            false
+//                        )
+//                    }
+                }
             }
 
             KeyEvent.KEYCODE_DPAD_DOWN -> {
-                channelDown()
-            }
-
-            KeyEvent.KEYCODE_CHANNEL_DOWN -> {
-                channelDown()
+                if (mainFragment.isHidden) {
+                    next()
+                } else {
+//                    if (mainFragment.selectedPosition == mainFragment.tvListViewModel.maxNum.size - 1) {
+////                        mainFragment.setSelectedPosition(0, false)
+//                        hideMainFragment()
+//                        return false
+//                    }
+                }
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
@@ -490,7 +351,5 @@ class MainActivity : FragmentActivity() {
 
     companion object {
         private const val TAG = "MainActivity"
-        private const val CHANNEL_REVERSAL = "channel_reversal"
-        private const val CHANNEL_NUM = "channel_num"
     }
 }

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

@@ -6,252 +6,120 @@ 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 {
 
-    private var itemPosition = 0
+class MainFragment : BrowseSupportFragment() {
+    var itemPosition: Int = 0
 
-    private var rowList: MutableList<View> = mutableListOf()
+    private var request: Request = Request()
 
-    private var _binding: ShowBinding? = null
-    private val binding get() = _binding!!
-
-    private var request = Request()
+    private var rowsAdapter: ArrayObjectAdapter? = null
 
     var tvListViewModel = TVListViewModel()
 
     private var sharedPref: SharedPreferences? = null
 
-    private var lastVideoUrl = ""
+    private var lastVideoUrl: String = ""
 
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
 
     private var ready = 0
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = ShowBinding.inflate(inflater, container, false)
-        return binding.root
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        headersState = HEADERS_DISABLED
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
         activity?.let { request.initYSP(it) }
+
         sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
 
-        view?.post {
-            val content = binding.content
+        loadRows()
 
-            var idx: Long = 0
-            for ((k, v) in TVList.list) {
-                val itemBinding: RowBinding =
-                    RowBinding.inflate(layoutInflater, content, false)
+        setupEventListeners()
 
-                val tvListViewModelCurrent = TVListViewModel()
-                for ((idx2, v1) in v.withIndex()) {
-                    val tvViewModel = TVViewModel(v1)
-                    tvViewModel.setRowPosition(idx.toInt())
-                    tvViewModel.setItemPosition(idx2)
-                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
-                    tvListViewModel.addTVViewModel(tvViewModel)
+        mUpdateProgramRunnable = UpdateProgramRunnable()
+        handler.post(mUpdateProgramRunnable)
+
+        tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                if (tvViewModel.errInfo.value != null
+                    && tvViewModel.id.value == itemPosition
+                ) {
+                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
                 }
-                tvListViewModel.maxNum.add(v.size)
-
-                val adapter = CardAdapter(viewLifecycleOwner, tvListViewModelCurrent)
-                rowList.add(itemBinding.rowItems)
-
-                adapter.setItemListener(this)
-
-                itemBinding.rowHeader.text = k
-                itemBinding.rowItems.adapter = adapter
-                itemBinding.rowItems.layoutManager =
-                    LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-
-                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
-                layoutParams.topMargin = dpToPx(11F)
-                itemBinding.row.layoutParams = layoutParams
-                content.addView(itemBinding.row)
-
-                idx++
             }
+            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
 
-            mUpdateProgramRunnable = UpdateProgramRunnable()
-            handler.post(mUpdateProgramRunnable)
-
-            itemPosition = sharedPref?.getInt(POSITION, 0)!!
-            if (itemPosition >= tvListViewModel.size()) {
-                itemPosition = 0
+                // not first time && channel not change
+                if (tvViewModel.ready.value != null
+                    && tvViewModel.id.value == itemPosition
+                    && check(tvViewModel)
+                ) {
+                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                    (activity as? MainActivity)?.play(tvViewModel)
+                }
             }
-            tvListViewModel.setItemPosition(itemPosition)
-            setPosition()
-            tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
-                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.errInfo.value != null
-                        && tvViewModel.id.value == itemPosition
-                    ) {
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
-                            .show()
-                    }
-                }
-                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
-
-                    // not first time && channel not change
-                    if (tvViewModel.ready.value != null
-                        && tvViewModel.id.value == itemPosition
-                        && check(tvViewModel)
-                    ) {
-                        Log.i(TAG, "ready ${tvViewModel.title.value}")
-                        (activity as? MainActivity)?.play(tvViewModel)
-                    }
-                }
-                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.change.value != null) {
-                        val title = tvViewModel.title.value
-                        Log.i(TAG, "switch $title")
-                        if (tvViewModel.pid.value != "") {
-                            Log.i(TAG, "request $title ${tvViewModel.pid.value}")
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { request.fetchData(it) }
-                            }
+            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
+                if (tvViewModel.change.value != null) {
+                    val title = tvViewModel.title.value
+                    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(
+                            tvViewModel.getRowPosition(), true,
+                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
+                        )
+                    } else {
+                        if (check(tvViewModel)) {
+                            (activity as? MainActivity)?.play(tvViewModel)
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setPosition(
-                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+
+                            setSelectedPosition(
+                                tvViewModel.getRowPosition(), true,
+                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
                             )
-                        } else {
-                            if (check(tvViewModel)) {
-                                (activity as? MainActivity)?.play(tvViewModel)
-                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                                setPosition(
-                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
-                                )
-                            }
                         }
                     }
                 }
             }
-
-            fragmentReady()
         }
+
+        fragmentReady()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-    }
-
-    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
-        if (hasFocus) {
-            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
-            (activity as MainActivity).keepRunnable()
-        }
-    }
-
-    override fun onItemClicked(tvViewModel: TVViewModel) {
-        if (this.isHidden) {
-            (activity as? MainActivity)?.switchMainFragment()
-            return
-        }
-
-        if (itemPosition != tvViewModel.id.value!!) {
-            itemPosition = tvViewModel.id.value!!
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-        (activity as? MainActivity)?.switchMainFragment()
-    }
-
-    fun setPosition() {
-        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-        rowList[tvViewModel!!.getRowPosition()].post {
-            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
-                tvViewModel.getItemPosition()
-            )?.requestFocus()
-        }
-    }
-
-    fun setPosition(rowPosition: Int, itemPosition: Int) {
-        rowList[rowPosition].post {
-            ((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
-                itemPosition
-            )?.requestFocus()
-        }
-    }
-
-    fun check(tvViewModel: TVViewModel): Boolean {
-        val title = tvViewModel.title.value
-        val videoUrl = tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
-        if (videoUrl == null || videoUrl == "") {
-            Log.e(TAG, "$title videoUrl is empty")
-            return false
-        }
-
-        if (videoUrl == lastVideoUrl) {
-            Log.e(TAG, "$title videoUrl is duplication")
-            return false
-        }
-
-        return true
-    }
-
-    fun fragmentReady() {
-        ready++
-        Log.i(TAG, "ready $ready")
-        if (ready == 4) {
-//            request.fetchPage()
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-    }
-
-    fun play(itemPosition: Int) {
-        view?.post {
-            if (itemPosition < tvListViewModel.size()) {
-                this.itemPosition = itemPosition
-                tvListViewModel.setItemPosition(itemPosition)
-                tvListViewModel.getTVViewModel(itemPosition)?.changed()
-            } else {
-                Toast.makeText(context, "频道不存在", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    fun prev() {
-        view?.post {
-            itemPosition--
-            if (itemPosition == -1) {
-                itemPosition = tvListViewModel.size() - 1
-            }
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-    }
-
-    fun next() {
-        view?.post {
-            itemPosition++
-            if (itemPosition == tvListViewModel.size()) {
-                itemPosition = 0
-            }
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+    override fun onDestroy() {
+        super.onDestroy()
+        handler.removeCallbacks(mUpdateProgramRunnable)
+        with(sharedPref!!.edit()) {
+            putInt("position", itemPosition)
+            apply()
         }
     }
 
@@ -282,35 +150,180 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         }
     }
 
-    override fun onStop() {
-        Log.i(TAG, "onStop")
-        super.onStop()
-        with(sharedPref!!.edit()) {
-            putInt(POSITION, itemPosition)
-            apply()
+    fun check(tvViewModel: TVViewModel): Boolean {
+        val title = tvViewModel.title.value
+        val videoUrl = tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
+        if (videoUrl == null || videoUrl == "") {
+            Log.e(TAG, "$title videoUrl is empty")
+            return false
         }
-        Log.i(TAG, "POSITION saved")
+
+        if (videoUrl == lastVideoUrl) {
+            Log.e(TAG, "$title videoUrl is duplication")
+            return false
+        }
+
+        return true
     }
 
-    override fun onDestroy() {
-        Log.i(TAG, "onDestroy")
-        super.onDestroy()
-        handler.removeCallbacks(mUpdateProgramRunnable)
+    fun toLastPosition() {
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
+        )
     }
 
-    override fun onDestroyView() {
-        Log.i(TAG, "onDestroyView")
-        super.onDestroyView()
-        _binding = null
+    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 fragmentReady() {
+        ready++
+        Log.i(TAG, "ready $ready")
+        if (ready == 3) {
+//            request.fetchPage()
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
+
+            (activity as? MainActivity)?.switchMainFragment()
+        }
+    }
+
+    fun prev() {
+        view?.post {
+            itemPosition--
+            if (itemPosition == -1) {
+                itemPosition = tvListViewModel.size() - 1
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
+        }
+    }
+
+    fun next() {
+        view?.post {
+            itemPosition++
+            if (itemPosition == tvListViewModel.size()) {
+                itemPosition = 0
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
+        }
+    }
+
+    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() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
+                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
+                        tvViewModel.setVideoIndex(0)
+                    }
+                    tvViewModel.changed()
+                }
+            }
+        }
+    }
+
+    private fun setupEventListeners() {
+        onItemViewClickedListener = ItemViewClickedListener()
+        onItemViewSelectedListener = ItemViewSelectedListener()
+    }
+
+    private inner class ItemViewClickedListener : OnItemViewClickedListener {
+        override fun onItemClicked(
+            itemViewHolder: Presenter.ViewHolder,
+            item: Any,
+            rowViewHolder: RowPresenter.ViewHolder,
+            row: Row
+        ) {
+            if (item is TVViewModel) {
+                if (itemPosition != item.id.value!!) {
+                    itemPosition = item.id.value!!
+                    tvListViewModel.setItemPosition(itemPosition)
+
+                    val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+                    tvViewModel?.changed()
+                }
+                (activity as? MainActivity)?.switchMainFragment()
+            }
+        }
+    }
+
+    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
+        override fun onItemSelected(
+            itemViewHolder: Presenter.ViewHolder?, item: Any?,
+            rowViewHolder: RowPresenter.ViewHolder, row: Row
+        ) {
+            if (item is TVViewModel) {
+                tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                (activity as MainActivity).keepRunnable()
+            }
+        }
     }
 
     override fun onResume() {
         super.onResume()
-        view?.post { view?.requestFocus() }
+        view!!.requestFocus()
     }
 
     companion object {
         private const val TAG = "MainFragment"
-        private const val POSITION = "position"
     }
 }

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

@@ -74,9 +74,10 @@ class PlayerFragment : Fragment() {
     @OptIn(UnstableApi::class)
     fun play(tvViewModel: TVViewModel) {
         this.tvViewModel = tvViewModel
-        val videoUrlCurrent = tvViewModel.getVideoUrlCurrent()
+        val videoUrlCurrent =
+            tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
         playerView?.player?.run {
-            setMediaItem(MediaItem.fromUri(videoUrlCurrent))
+            videoUrlCurrent?.let { setMediaItem(MediaItem.fromUri(it)) }
             prepare()
         }
     }
@@ -102,11 +103,6 @@ class PlayerFragment : Fragment() {
         }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
     companion object {
         private const val TAG = "PlaybackVideoFragment"
     }

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

@@ -1,58 +0,0 @@
-package com.lizongying.mytv
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import com.lizongying.mytv.databinding.DialogBinding
-
-
-class SettingFragment(private val versionName: String,
-                      private val channelReversal: Boolean,
-                      private val channelNum: Boolean,
-    ) :
-    DialogFragment() {
-
-    private var _binding: DialogBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = DialogBinding.inflate(inflater, container, false)
-        _binding?.version?.text =
-            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
-
-        val switchChannelReversal = _binding?.switchChannelReversal
-        switchChannelReversal?.isChecked = channelReversal
-        switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
-            (activity as MainActivity).saveChannelReversal(isChecked)
-        }
-
-        val switchChannelNum = _binding?.switchChannelNum
-        switchChannelNum?.isChecked = channelNum
-        switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
-            (activity as MainActivity).saveChannelNum(isChecked)
-        }
-
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        const val TAG = "SettingFragment"
-    }
-}
-

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

@@ -145,7 +145,7 @@ object TVList {
         "CCTV10 科教" to arrayOf("600001805", "2000203503"),
         "CCTV11 戏曲" to arrayOf("600001806", "2000204103"),
         "CCTV12 社会与法" to arrayOf("600001807", "2000202603"),
-        "CCTV13 新闻" to arrayOf("600001811","2000204603"),
+//        "CCTV13 新闻" to arrayOf("600001811","2000204603"),
         "CCTV14 少儿" to arrayOf("600001809", "2000204403"),
         "CCTV15 音乐" to arrayOf("600001815", "2000205003"),
         "CCTV16 奥林匹克" to arrayOf("600098637", "2012375003"),
@@ -196,6 +196,8 @@ object TVList {
     private fun setupTV(): Map<String, List<TV>> {
         val tvs = """
 央视频道
+CCTV4K 超高清,
+CCTV8K 超高清,
 CCTV1 综合,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226231/index.m3u8
 CCTV2 财经,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index.m3u8
 CCTV3 综艺,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226397/index.m3u8
@@ -214,8 +216,6 @@ CCTV14 少儿,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/inde
 CCTV15 音乐,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8
 CCTV16 奥林匹克,http://39.134.24.162/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8
 CCTV17 农业农村,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226198/index.m3u8
-CCTV4K 超高清,
-CCTV8K 超高清,
 风云剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226950/index.m3u8
 第一剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226959/index.m3u8
 怀旧剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226972/index.m3u8

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

@@ -1,7 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.res.Resources
-import android.util.TypedValue
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -14,20 +12,4 @@ object Utils {
     fun getDateTimestamp(): Long {
         return Date().time / 1000
     }
-
-    fun dpToPx(dp: Float): Int {
-        return TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            dp,
-            Resources.getSystem().displayMetrics
-        ).toInt()
-    }
-
-    fun dpToPx(dp: Int): Int {
-        return TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            dp.toFloat(),
-            Resources.getSystem().displayMetrics
-        ).toInt()
-    }
 }

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

@@ -20,7 +20,7 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     private var itemPosition: Int = 0
 
     var retryTimes: Int = 0
-    var retryMaxTimes: Int = 8
+    var retryMaxTimes: Int = 5
     var programUpdateTime: Long = 0
 
     private val _errInfo = MutableLiveData<String>()
@@ -222,25 +222,18 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         mMinimumLoadableRetryCount = minimumLoadableRetryCount
     }
 
-    /**
-     * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
-     */
     @OptIn(UnstableApi::class)
-    fun buildSource(): HlsMediaSource {
+    fun buildSource(videoUrl: String, mHeaders: Map<String, String>?): HlsMediaSource {
         val httpDataSource = DefaultHttpDataSource.Factory()
         mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
 
         return HlsMediaSource.Factory(httpDataSource).createMediaSource(
             MediaItem.fromUri(
-                Uri.parse(getVideoUrlCurrent())
+                Uri.parse(videoUrl)
             )
         )
     }
 
-    fun getVideoUrlCurrent(): String {
-        return _videoUrl.value!![_videoIndex.value!!]
-    }
-
     companion object {
         private const val TAG = "TVViewModel"
     }

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

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/channel_fragment"
-    android:layout_width="80dp"
-    android:layout_height="80dp"
-    android:layout_gravity="end|top"
-    android:layout_marginTop="20dp"
-    android:layout_marginEnd="50dp">
-
-    <TextView
-        android:id="@+id/channel_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginTop="0dp"
-        android:text="99"
-        android:textColor="#FFEEEEEE"
-        android:textStyle="bold"
-        android:textSize="50sp" />
-</FrameLayout>

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

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialog"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    >
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <LinearLayout
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:paddingTop="20dp"
-            android:paddingLeft="7dp"
-            android:paddingRight="7dp"
-            android:background="#FF263238"
-            >
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:textSize="16sp" />
-            <TextView
-                android:id="@+id/version"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
-                ></TextView>
-            <Switch
-                android:id="@+id/switch_channel_reversal"
-                android:text="@string/title_channel_reversal"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <Switch
-                android:id="@+id/switch_channel_num"
-                android:text="@string/title_channel_num"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
-        <ImageView
-            android:layout_width="300dp"
-            android:layout_height="wrap_content"
-            android:src="@drawable/appreciate"
-            android:background="@color/white" />
-    </LinearLayout>
-</FrameLayout>

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

@@ -12,6 +12,7 @@
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:contentDescription="@string/logo"
         android:padding="10dp" />
 
     <LinearLayout

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/strings.xml

@@ -1,5 +1,4 @@
 <resources>
     <string name="app_name">我的电视</string>
-    <string name="title_channel_reversal">换台反转</string>
-    <string name="title_channel_num">数字选台</string>
+    <string name="logo">logo</string>
 </resources>

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

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

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.2.1' apply false
-    id 'com.android.library' version '8.2.1' apply false
+    id 'com.android.application' version '8.2.0' apply false
+    id 'com.android.library' version '8.2.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.21' apply false
 }