fix ysp err

app/build.gradle

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

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

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

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

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

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

@@ -5,30 +5,31 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
-import androidx.leanback.app.BrowseSupportFragment
-import androidx.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.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.lizongying.mytv.Utils.dpToPx
 import com.lizongying.mytv.Utils.getDateTimestamp
+import com.lizongying.mytv.databinding.RowBinding
+import com.lizongying.mytv.databinding.ShowBinding
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class MainFragment : BrowseSupportFragment() {
+class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var itemPosition = 0
 
-    private var rowsAdapter: ArrayObjectAdapter? = null
+    private var rowList: MutableList<View> = mutableListOf()
+
+    private var _binding: ShowBinding? = null
+    private val binding get() = _binding!!
 
     private var request = Request()
 
@@ -43,15 +44,12 @@ class MainFragment : BrowseSupportFragment() {
 
     private var ready = 0
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        Log.i(TAG, "onCreate")
-        super.onCreate(savedInstanceState)
-        headersState = HEADERS_DISABLED
-    }
-
-    override fun onStart() {
-        Log.i(TAG, "onStart")
-        super.onStart()
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = ShowBinding.inflate(inflater, container, false)
+        return binding.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -60,172 +58,141 @@ class MainFragment : BrowseSupportFragment() {
         activity?.let { request.initYSP(it) }
         sharedPref = (activity as? MainActivity)?.sharedPref!!
 
-        loadRows()
+        view?.post {
+            val content = binding.content
 
-        setupEventListeners()
+            var idx: Long = 0
+            context?.let { TVList.init(it) }
+            for ((k, v) in TVList.list) {
+                val itemBinding: RowBinding =
+                    RowBinding.inflate(layoutInflater, content, false)
 
-        mUpdateProgramRunnable = UpdateProgramRunnable()
-        handler.post(mUpdateProgramRunnable)
-
-        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                if (tvViewModel.errInfo.value != null
-                    && tvViewModel.id.value == itemPosition
-                ) {
-                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
+                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)
                 }
-            }
-            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
+                tvListViewModel.maxNum.add(v.size)
 
-                // 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)
-                }
+                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.change.observe(viewLifecycleOwner) { _ ->
-                if (tvViewModel.change.value != null) {
-                    val title = tvViewModel.title.value
-                    if (tvViewModel.pid.value != "") {
-                        Log.i(TAG, "request $title")
-                        lifecycleScope.launch(Dispatchers.IO) {
-                            tvViewModel.let { request.fetchData(it) }
-                        }
-                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                        setSelectedPosition(
-                            tvViewModel.getRowPosition(), true,
-                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
-                        )
-                    } else {
-                        if (check(tvViewModel)) {
-                            (activity as? MainActivity)?.play(tvViewModel)
+
+            mUpdateProgramRunnable = UpdateProgramRunnable()
+            handler.post(mUpdateProgramRunnable)
+
+            itemPosition = sharedPref.getInt(POSITION, 0)
+            if (itemPosition >= tvListViewModel.size()) {
+                itemPosition = 0
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+            setPosition()
+            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                    if (tvViewModel.errInfo.value != null
+                        && tvViewModel.id.value == itemPosition
+                    ) {
+                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
+                            .show()
+                    }
+                }
+                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
+
+                    // not first time && channel not change
+                    if (tvViewModel.ready.value != null
+                        && tvViewModel.id.value == itemPosition
+                        && check(tvViewModel)
+                    ) {
+                        Log.i(TAG, "ready ${tvViewModel.title.value}")
+                        (activity as? MainActivity)?.play(tvViewModel)
+                    }
+                }
+                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
+                    if (tvViewModel.change.value != null) {
+                        val title = tvViewModel.title.value
+                        Log.i(TAG, "switch $title")
+                        if (tvViewModel.pid.value != "") {
+                            Log.i(TAG, "request $title")
+                            lifecycleScope.launch(Dispatchers.IO) {
+                                tvViewModel.let { request.fetchData(it) }
+                            }
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setSelectedPosition(
-                                tvViewModel.getRowPosition(), true,
-                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
+                            setPosition(
+                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
                             )
+                        } else {
+                            if (check(tvViewModel)) {
+                                (activity as? MainActivity)?.play(tvViewModel)
+                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                                setPosition(
+                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                                )
+                            }
                         }
                     }
                 }
             }
-        }
 
-        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()
-                }
-            }
+            fragmentReady()
         }
     }
 
-    fun nextSource() {
-        view?.post {
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            if (tvViewModel != null) {
-                if (tvViewModel.videoUrl.value!!.size > 1) {
-                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
-                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
-                        tvViewModel.setVideoIndex(0)
-                    }
-                    tvViewModel.changed()
-                }
-            }
+    override fun 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()
         }
     }
 
-    private fun setupEventListeners() {
-        onItemViewClickedListener = ItemViewClickedListener()
-        onItemViewSelectedListener = ItemViewSelectedListener()
+    override fun onItemClicked(tvViewModel: TVViewModel) {
+        if (this.isHidden) {
+            (activity as? MainActivity)?.switchMainFragment()
+            return
+        }
+
+        if (itemPosition != tvViewModel.id.value!!) {
+            itemPosition = tvViewModel.id.value!!
+            tvListViewModel.setItemPosition(itemPosition)
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+        }
+        (activity as? MainActivity)?.switchMainFragment()
     }
 
-    private inner class ItemViewClickedListener : OnItemViewClickedListener {
-        override fun onItemClicked(
-            itemViewHolder: Presenter.ViewHolder,
-            item: Any,
-            rowViewHolder: RowPresenter.ViewHolder,
-            row: Row
-        ) {
-            if (item is TVViewModel) {
-                if (itemPosition != item.id.value!!) {
-                    itemPosition = item.id.value!!
-                    tvListViewModel.setItemPosition(itemPosition)
-                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
-                }
-                (activity as? MainActivity)?.switchMainFragment()
-            }
+    fun setPosition() {
+        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+        rowList[tvViewModel!!.getRowPosition()].post {
+            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
+                tvViewModel.getItemPosition()
+            )?.requestFocus()
         }
     }
 
-    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
-        override fun onItemSelected(
-            itemViewHolder: Presenter.ViewHolder?, item: Any?,
-            rowViewHolder: RowPresenter.ViewHolder, row: Row
-        ) {
-            if (item is TVViewModel) {
-                tvListViewModel.setItemPositionCurrent(item.id.value!!)
-                (activity as MainActivity).keepRunnable()
-            }
+    fun setPosition(rowPosition: Int, itemPosition: Int) {
+        rowList[rowPosition].post {
+            ((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
+                itemPosition
+            )?.requestFocus()
         }
     }
 
@@ -336,6 +303,12 @@ class MainFragment : BrowseSupportFragment() {
         handler.removeCallbacks(mUpdateProgramRunnable)
     }
 
+    override fun onDestroyView() {
+        Log.i(TAG, "onDestroyView")
+        super.onDestroyView()
+        _binding = null
+    }
+
     companion object {
         private const val TAG = "MainFragment"
         private const val POSITION = "position"

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

@@ -97,8 +97,6 @@ class Request {
 
     fun initYSP(context: Context) {
         ysp = YSP(context)
-        //TODO 不确定在哪里初始化
-        TVList.init(context)
     }
 
     var call: Call<LiveInfo>? = null
@@ -204,7 +202,7 @@ class Request {
             }
 
             override fun onFailure(call: Call<LiveInfo>, t: Throwable) {
-                Log.e(TAG, "$title request error $t")
+                Log.e(TAG, "$title request error")
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {

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

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

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

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

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

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