cetv1

README.md

@@ -20,14 +20,6 @@
 * 增加凤凰卫视
 * 默认关闭开机启动
 
-### v1.6.3（安卓5及以上专用）
-
-* 增加CETV1
-* 凤凰卫视增强画质
-* 默认关闭开机启动
-* 延迟菜单自动关闭时间
-* 解决一些可能导致首次打开时黑屏的问题
-
 ### v1.6.2（通用）
 
 * 修复按键无效的问题
@@ -214,14 +206,16 @@ adb install my-tv.apk
 
 * 音量不同
 * 大湾区卫视、广东4k超高清、广东珠江、三沙卫视
+* CETV教育频道
 * CHC高清三个电影频道
 * 地方频道
 * 收藏夹
 * 自定义源
+* 凤凰卫视、凤凰资讯台
 * 海外
+* 1.5.0 无法安装，1.5.1 可以安装
 * 节目增加预告
 * 频道列表优化
-* 自动更新
 
 ## 赞赏
 

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,154 @@
+package com.lizongying.mytv
+
+import android.graphics.Color
+import android.view.ContextThemeWrapper
+import android.view.KeyEvent
+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 recyclerView: RecyclerView,
+    private val owner: LifecycleOwner,
+    private var tvListViewModel: TVListViewModel,
+) :
+    RecyclerView.Adapter<CardAdapter.ViewHolder>() {
+
+    private var listener: ItemListener? = null
+    private var focused: View? = null
+    private var defaultFocused = false
+    var defaultFocus: Int = -1
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val cardView = object :
+            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
+        cardView.isFocusable = true
+        cardView.isFocusableInTouchMode = true
+        return ViewHolder(cardView)
+    }
+
+    fun clear() {
+        focused?.clearFocus()
+        recyclerView.invalidate()
+    }
+
+    private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float, duration: Long) {
+        val scaleAnimation = ScaleAnimation(
+            fromScale, toScale,
+            fromScale, toScale,
+            ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
+            ScaleAnimation.RELATIVE_TO_SELF, 0.5f
+        )
+        scaleAnimation.duration = duration
+        scaleAnimation.fillAfter = false
+        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
+
+        if (!defaultFocused && item.id.value == defaultFocus) {
+            cardView.requestFocus()
+            defaultFocused = true
+        }
+
+        val onFocusChangeListener = View.OnFocusChangeListener { _, hasFocus ->
+            listener?.onItemFocusChange(item, hasFocus)
+
+//            if (hasFocus && defaultFocus == item.id.value) {
+            if (hasFocus) {
+                focused = cardView
+                startScaleAnimation(cardView, 0.9f, 1.0f, 200)
+            }
+        }
+
+        cardView.onFocusChangeListener = onFocusChangeListener
+
+        cardView.setOnClickListener { _ ->
+            listener?.onItemClicked(item)
+        }
+
+        cardView.setOnKeyListener { _, keyCode, event: KeyEvent? ->
+            if (event?.action == KeyEvent.ACTION_DOWN) {
+                return@setOnKeyListener listener?.onKey(keyCode) ?: false
+            }
+            false
+        }
+
+        cardView.titleText = tvViewModel.title.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)
+
+            "兵团卫视" -> Glide.with(viewHolder.view.context)
+                .load(R.drawable.bingtuan)
+                .centerInside()
+                .into(cardView.mainImageView)
+
+            "CETV1" -> Glide.with(viewHolder.view.context)
+                .load(R.drawable.cetv1)
+                .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 onKey(keyCode: Int): Boolean
+    }
+
+    fun setItemListener(listener: ItemListener) {
+        this.listener = listener
+    }
+
+    companion object {
+        private const val TAG = "CardAdapter"
+    }
+}
+

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

@@ -1,82 +0,0 @@
-package com.lizongying.mytv
-
-import android.graphics.Color
-import android.view.ContextThemeWrapper
-import android.view.ViewGroup
-import android.widget.ImageView
-import androidx.leanback.widget.ImageCardView
-import androidx.leanback.widget.Presenter
-import androidx.lifecycle.LifecycleOwner
-import com.bumptech.glide.Glide
-import com.lizongying.mytv.models.TVViewModel
-
-class CardPresenter(
-    private val owner: LifecycleOwner,
-) : Presenter() {
-
-    override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
-        val cardView = object :
-            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
-
-        cardView.isFocusable = true
-        cardView.isFocusableInTouchMode = true
-        return ViewHolder(cardView)
-    }
-
-    override fun onBindViewHolder(viewHolder: ViewHolder, item: Any) {
-        val tvViewModel = item as TVViewModel
-        val cardView = viewHolder.view as ImageCardView
-
-        cardView.titleText = tvViewModel.title.value
-        cardView.setMainImageDimensions(CARD_WIDTH, CARD_HEIGHT)
-        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)
-
-            "兵团卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.bingtuan)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            else -> Glide.with(viewHolder.view.context)
-                .load(tvViewModel.logo.value)
-                .centerInside()
-                .into(cardView.mainImageView)
-        }
-
-        cardView.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 onUnbindViewHolder(viewHolder: ViewHolder) {
-        val cardView = viewHolder.view as ImageCardView
-        cardView.mainImage = null
-    }
-
-    companion object {
-        private const val TAG = "CardPresenter"
-        private const val CARD_WIDTH = 300
-        private const val CARD_HEIGHT = 101
-    }
-}

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

@@ -1,157 +0,0 @@
-package com.lizongying.mytv
-
-import android.content.Context
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.io.File
-
-/**
- *@author LeGend
- *@date 2024/2/4 22:42
- */
-object ChannelUtils {
-    /**
-     * 获取服务器channel版本
-     *
-     * @param context Context
-     *
-     * @return 服务器channel版本
-     */
-    suspend fun getServerVersion(context: Context): Int {
-        return withContext(Dispatchers.IO) {
-            val client = okhttp3.OkHttpClient.Builder().connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
-                .readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
-            client.newCall(okhttp3.Request.Builder().url(getServerVersionUrl(context)).build()).execute()
-                .use { response ->
-                    if (!response.isSuccessful) throw java.io.IOException("Unexpected code $response")
-                    val body = response.body()
-                    body?.string()?.toInt() ?: 0
-                }
-        }
-    }
-
-    /**
-     * 获取服务器channel
-     *
-     * @param url String 服务器地址
-     *
-     * @return Array<TV> 服务器channel
-     *
-     * @throws java.io.IOException 网络请求失败
-     */
-    suspend fun getServerChannel(url: String): List<TV> {
-        val result = 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(url).build()
-            client.newCall(request).execute().use { response ->
-                if (!response.isSuccessful) throw java.io.IOException("Unexpected code $response")
-                val body = response.body()
-                body?.string() ?: ""
-            }
-        }
-        return withContext(Dispatchers.Default) {
-            val type = object : com.google.gson.reflect.TypeToken<List<TV>>() {}.type
-            com.google.gson.Gson().fromJson(result, type)
-        }
-    }
-
-    /**
-     * 获取服务器地址
-     *
-     * @param context Context
-     *
-     * @return 服务器地址
-     */
-    fun getServerUrl(context: Context): String {
-        return context.resources.getString(R.string.server_url)
-    }
-
-    /**
-     * 获取serverVersion的URL
-     *
-     * @param context Context
-     *
-     * @return serverVersionURL 服务器版本地址
-     */
-    suspend fun getServerVersionUrl(context: Context): String {
-        return withContext(Dispatchers.IO) {
-            context.resources.getString(R.string.server_version_url)
-        }
-    }
-
-
-    /**
-     * 获取本地channel版本
-     *
-     * @param context Context
-     *
-     * @return 本地channel
-     */
-    suspend fun getLocalVersion(context: Context): Int {
-        return withContext(Dispatchers.IO) {
-            val file = File(getAppDirectory(context), "channels")
-            //检查本地是否已经有保存的channels.json,若无保存的Channel.json则从读取assert中文件
-            val savedVersion =
-                context.getSharedPreferences("saved_version", Context.MODE_PRIVATE).getInt("version", Integer.MIN_VALUE)
-            if (!file.exists() || savedVersion == Integer.MIN_VALUE) {
-                context.resources.getInteger(R.integer.local_channel_version)
-            } else {
-                savedVersion
-            }
-        }
-    }
-
-    /**
-     * 获取本地可读取的目录
-     * @param context Context
-     *
-     * @return 可读取的目录
-     */
-    private fun getAppDirectory(context: Context): File {
-        return context.filesDir
-    }
-
-    /**
-     * 获取本地channel
-     *
-     * @param context Context
-     *
-     * @return Array<TV> 本地channel
-     */
-    suspend fun getLocalChannel(context: Context): List<TV> {
-        val str = withContext(Dispatchers.IO) {
-            if (File(getAppDirectory(context), "channels").exists()) {
-                File(getAppDirectory(context), "channels").readText()
-            } else {
-                context.resources.openRawResource(R.raw.channels).bufferedReader().use { it.readText() }
-            }
-        }
-        return withContext(Dispatchers.Default) {
-            val type = object : com.google.gson.reflect.TypeToken<List<TV>>() {}.type
-            com.google.gson.Gson().fromJson(str, type)
-        }
-    }
-
-    /**
-     * 更新channels.json
-     *
-     * @param context Context
-     *
-     * @return 无
-     *
-     * @throws java.io.IOException 写入失败
-     */
-    suspend fun updateLocalChannel(context: Context, version: Int, channels: List<TV>) {
-        withContext(Dispatchers.IO) {
-            val file = File(getAppDirectory(context), "channels")
-            if (!file.exists()) {
-                file.createNewFile()
-            }
-            file.writeText(com.google.gson.Gson().toJson(channels))
-            context.getSharedPreferences("saved_version", Context.MODE_PRIVATE).edit().putInt(
-                "version", version
-            ).apply()
-        }
-    }
-}

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

@@ -0,0 +1,51 @@
+package com.lizongying.mytv
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
+import android.view.View
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+
+class GrayOverlayItemDecoration(private val context: Context) : RecyclerView.ItemDecoration() {
+
+    private val grayOverlayPaint = Paint().apply {
+        color = ContextCompat.getColor(context, R.color.gray_overlay)
+        style = Paint.Style.FILL
+    }
+
+    override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        super.onDrawOver(c, parent, state)
+
+        val childCount = parent.childCount
+        for (i in 0 until childCount) {
+            val child = parent.getChildAt(i)
+            if (!child.hasFocus()) {
+//                child.alpha = 0.7f
+                // 计算遮罩层的大小
+                val overlayRect = Rect(
+                    child.left,
+                    child.top,
+                    child.right,
+                    child.bottom
+                )
+                // 绘制灰色遮罩层
+                c.drawRect(overlayRect, grayOverlayPaint)
+            } else {
+//                child.alpha = 1f
+            }
+        }
+    }
+
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        super.getItemOffsets(outRect, view, parent, state)
+        // 在此处设置偏移量为0，以防止遮罩层影响项的布局
+        outRect.setEmpty()
+    }
+}

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

@@ -25,7 +25,7 @@ import kotlinx.coroutines.launch
 import java.security.MessageDigest
 
 
-class MainActivity : FragmentActivity(), Request.RequestListener {
+class MainActivity : FragmentActivity() {
 
     private var ready = 0
     private var playerFragment = PlayerFragment()
@@ -39,27 +39,24 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private lateinit var gestureDetector: GestureDetector
 
     private val handler = Handler()
-    private val delayHideMain: Long = 10000
+    private val delayHideMain: Long = 5000
     private val delayHideSetting: Long = 10000
 
-//    init {
+    init {
-//        lifecycleScope.launch(Dispatchers.IO) {
+        lifecycleScope.launch(Dispatchers.IO) {
-//            val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
+            val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
-//
+
-//            utilsJob.start()
+            utilsJob.start()
-//
+
-//            utilsJob.await()
+            utilsJob.await()
-//        }
+        }
-//    }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        Request.onCreate()
-        Request.setRequestListener(this)
-
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
         window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
@@ -81,13 +78,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         } else {
             packageInfo.versionCode.toLong()
         }
-        settingFragment = SettingFragment(
+        settingFragment = SettingFragment(versionName, versionCode, SP.channelReversal, SP.channelNum, SP.bootStartup)
-            versionName,
-            versionCode,
-            SP.channelReversal,
-            SP.channelNum,
-            SP.bootStartup
-        )
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -140,6 +131,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
+            mainFragment.setPosition()
             transaction.show(mainFragment)
             mainActive()
         } else {
@@ -180,7 +172,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 5) {
+        if (ready == 4) {
             mainFragment.fragmentReady()
         }
     }
@@ -306,7 +298,9 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }, 2000)
     }
 
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+
+    fun onKey(keyCode: Int): Boolean {
+        Log.i(TAG, "keyCode $keyCode")
         when (keyCode) {
             KeyEvent.KEYCODE_0 -> {
                 showChannel("0")
@@ -418,6 +412,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
+                channelUp()
 //                if (mainFragment.isHidden) {
 //                    prevSource()
 //                } else {
@@ -431,6 +426,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_RIGHT -> {
+                channelDown()
 //                if (mainFragment.isHidden) {
 //                    nextSource()
 //                } else {
@@ -442,6 +438,13 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 //                }
             }
         }
+        return false
+    }
+
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        if (onKey(keyCode)) {
+            return true
+        }
 
         return super.onKeyDown(keyCode, event)
     }
@@ -516,17 +519,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         handler.removeCallbacks(hideMain)
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        Request.onDestroy()
-    }
-
-    override fun onRequestFinished() {
-        fragmentReady()
-    }
-
     private companion object {
         const val TAG = "MainActivity"
     }
-
 }

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

@@ -4,31 +4,35 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
-import androidx.leanback.app.BrowseSupportFragment
+import androidx.fragment.app.Fragment
-import androidx.leanback.widget.ArrayObjectAdapter
-import androidx.leanback.widget.HeaderItem
-import androidx.leanback.widget.ListRow
-import androidx.leanback.widget.ListRowPresenter
-import androidx.leanback.widget.ListRowPresenter.SelectItemViewHolderTask
-import androidx.leanback.widget.OnItemViewClickedListener
-import androidx.leanback.widget.OnItemViewSelectedListener
-import androidx.leanback.widget.Presenter
-import androidx.leanback.widget.Row
-import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.lizongying.mytv.Utils.dpToPx
 import com.lizongying.mytv.Utils.getDateTimestamp
-import com.lizongying.mytv.api.YSP
+import com.lizongying.mytv.databinding.RowBinding
+import com.lizongying.mytv.databinding.ShowBinding
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class MainFragment : BrowseSupportFragment() {
+
+class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var itemPosition = 0
 
-    private var rowsAdapter: ArrayObjectAdapter? = null
+    private var rowList: MutableList<View> = mutableListOf()
+
+    private var _binding: ShowBinding? = null
+    private val binding get() = _binding!!
+
+    private var request = Request()
 
     var tvListViewModel = TVListViewModel()
 
@@ -37,189 +41,212 @@ class MainFragment : BrowseSupportFragment() {
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreateView(
-        Log.i(TAG, "onCreate")
+        inflater: LayoutInflater, container: ViewGroup?,
-        super.onCreate(savedInstanceState)
+        savedInstanceState: Bundle?
-        headersState = HEADERS_DISABLED
+    ): View {
-    }
+        _binding = ShowBinding.inflate(inflater, container, false)
-
+        return binding.root
-    override fun onStart() {
-        Log.i(TAG, "onStart")
-        super.onStart()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        activity?.let { YSP.init(it) }
+        activity?.let { request.initYSP(it) }
-
-        loadRows()
-
-        setupEventListeners()
-
-        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()
-                }
-            }
-            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())
-                        )
-                    } else {
-                        if (check(tvViewModel)) {
-                            (activity as? MainActivity)?.play(tvViewModel)
-                            (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setSelectedPosition(
-                                tvViewModel.getRowPosition(), true,
-                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
-                            )
-                        }
-                    }
-                }
-            }
-        }
-
-        (activity as MainActivity).fragmentReady()
-    }
-
-    fun toLastPosition() {
-        setSelectedPosition(
-            selectedPosition, false,
-            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
-        )
-    }
-
-    fun toFirstPosition() {
-        setSelectedPosition(
-            selectedPosition, false,
-            SelectItemViewHolderTask(0)
-        )
-    }
-
-    override fun startHeadersTransition(withHeaders: Boolean) {
-    }
-
-    private fun loadRows() {
-        rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
-
-        val cardPresenter = CardPresenter(viewLifecycleOwner)
-
-        var idx: Long = 0
-        for ((k, v) in TVList.list) {
-            val listRowAdapter = ArrayObjectAdapter(cardPresenter)
-            for ((idx2, v1) in v.withIndex()) {
-                val tvViewModel = TVViewModel(v1)
-                tvViewModel.setRowPosition(idx.toInt())
-                tvViewModel.setItemPosition(idx2)
-                tvListViewModel.addTVViewModel(tvViewModel)
-                listRowAdapter.add(tvViewModel)
-            }
-            tvListViewModel.maxNum.add(v.size)
-            val header = HeaderItem(idx, k)
-            rowsAdapter!!.add(ListRow(header, listRowAdapter))
-            idx++
-        }
-
-        adapter = rowsAdapter
 
         itemPosition = SP.itemPosition
-        if (itemPosition >= tvListViewModel.size()) {
-            itemPosition = 0
-        }
-        tvListViewModel.setItemPosition(itemPosition)
-    }
 
-    fun prevSource() {
         view?.post {
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            val content = binding.content
-            if (tvViewModel != null) {
+
-                if (tvViewModel.videoUrl.value!!.size > 1) {
+            var idx: Long = 0
-                    val videoIndex = tvViewModel.videoIndex.value?.minus(1)
+            for ((k, v) in TVList.list) {
-                    if (videoIndex == -1) {
+                val itemBinding: RowBinding =
-                        tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
+                    RowBinding.inflate(layoutInflater, content, false)
+
+                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)
+                }
+                tvListViewModel.maxNum.add(v.size)
+
+                val adapter =
+                    CardAdapter(
+                        itemBinding.rowItems,
+                        viewLifecycleOwner,
+                        tvListViewModelCurrent,
+                    )
+                rowList.add(itemBinding.rowItems)
+
+                adapter.setItemListener(this)
+
+                itemBinding.rowHeader.text = k
+                itemBinding.rowItems.tag = idx.toInt()
+                itemBinding.rowItems.adapter = adapter
+                itemBinding.rowItems.layoutManager =
+                    GridLayoutManager(context, 6)
+                itemBinding.rowItems.layoutParams.height =
+                    dpToPx(92 * ((tvListViewModelCurrent.size() + 6 - 1) / 6))
+
+                itemBinding.rowItems.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                    override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                        super.onScrolled(recyclerView, dx, dy)
+                        (activity as MainActivity).mainActive()
                     }
-                    tvViewModel.changed()
+                })
+
+                val itemDecoration = context?.let { GrayOverlayItemDecoration(it) }
+                if (itemDecoration != null) {
+                    itemBinding.rowItems.addItemDecoration(itemDecoration)
+                }
+
+                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
+                layoutParams.topMargin = dpToPx(11F)
+                itemBinding.row.layoutParams = layoutParams
+                content.addView(itemBinding.row)
+
+                idx++
+            }
+
+            mUpdateProgramRunnable = UpdateProgramRunnable()
+            handler.post(mUpdateProgramRunnable)
+
+            if (itemPosition >= tvListViewModel.size()) {
+                itemPosition = 0
+            }
+
+            val tv = tvListViewModel.getTVViewModel(itemPosition)
+            for (i in rowList) {
+                if (i.tag as Int == tv?.getRowPosition()) {
+                    ((i as RecyclerView).adapter as CardAdapter).defaultFocus = itemPosition
+                    break
                 }
             }
-        }
-    }
 
-    fun nextSource() {
+            tvListViewModel.setItemPosition(itemPosition)
-        view?.post {
+            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-            if (tvViewModel != null) {
+                    if (tvViewModel.errInfo.value != null
-                if (tvViewModel.videoUrl.value!!.size > 1) {
+                        && tvViewModel.id.value == itemPosition
-                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
+                    ) {
-                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
+                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
-                        tvViewModel.setVideoIndex(0)
+                            .show()
                     }
-                    tvViewModel.changed()
+                }
+                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)
+                            setPosition(
+                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                            )
+                        } else {
+                            if (check(tvViewModel)) {
+                                // TODO lastVideoUrl
+                                (activity as? MainActivity)?.play(tvViewModel)
+                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                                setPosition(
+                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+            (activity as MainActivity).fragmentReady()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    override fun onKey(keyCode: Int): Boolean {
+        if (this.isHidden) {
+            when (keyCode) {
+                KeyEvent.KEYCODE_DPAD_UP -> {
+                    (activity as MainActivity).onKey(keyCode)
+                    return true
+                }
+
+                KeyEvent.KEYCODE_DPAD_DOWN -> {
+                    (activity as MainActivity).onKey(keyCode)
+                    return true
                 }
             }
         }
+        return false
     }
 
-    private fun setupEventListeners() {
+    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
-        onItemViewClickedListener = ItemViewClickedListener()
+        if (hasFocus) {
-        onItemViewSelectedListener = ItemViewSelectedListener()
+            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
-    }
 
-    private inner class ItemViewClickedListener : OnItemViewClickedListener {
+            val row = tvViewModel.getRowPosition()
-        override fun onItemClicked(
+
-            itemViewHolder: Presenter.ViewHolder,
+            for (i in rowList) {
-            item: Any,
+                if (i.tag as Int != row) {
-            rowViewHolder: RowPresenter.ViewHolder,
+                    ((i as RecyclerView).adapter as CardAdapter).clear()
-            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()
             }
+
+            (activity as MainActivity).mainActive()
         }
     }
 
-    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
+    override fun onItemClicked(tvViewModel: TVViewModel) {
-        override fun onItemSelected(
+        Log.i(TAG, "onItemClicked")
-            itemViewHolder: Presenter.ViewHolder?, item: Any?,
+        if (this.isHidden) {
-            rowViewHolder: RowPresenter.ViewHolder, row: Row
+            (activity as? MainActivity)?.switchMainFragment()
-        ) {
+            return
-            if (item is TVViewModel) {
-                tvListViewModel.setItemPositionCurrent(item.id.value!!)
-                (activity as MainActivity).mainActive()
-            }
         }
+
+        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 GridLayoutManager).findViewByPosition(
+                tvViewModel.getItemPosition()
+            )?.requestFocus()
+        }
+    }
+
+    fun setPosition(rowPosition: Int, itemPosition: Int) {
+        rowList[rowPosition].post {
+            ((rowList[rowPosition] as RecyclerView).layoutManager as GridLayoutManager).findViewByPosition(
+                itemPosition
+            )?.requestFocus()
+        }
+
+        ((rowList[rowPosition] as RecyclerView).adapter as CardAdapter).defaultFocus = itemPosition
     }
 
     fun check(tvViewModel: TVViewModel): Boolean {
@@ -282,11 +309,11 @@ class MainFragment : BrowseSupportFragment() {
         if (timestamp - tvViewModel.programUpdateTime > 60) {
             if (tvViewModel.program.value!!.isEmpty()) {
                 tvViewModel.programUpdateTime = timestamp
-                Request.fetchProgram(tvViewModel)
+                request.fetchProgram(tvViewModel)
             } else {
                 if (tvViewModel.program.value!!.last().et - timestamp < 600) {
                     tvViewModel.programUpdateTime = timestamp
-                    Request.fetchProgram(tvViewModel)
+                    request.fetchProgram(tvViewModel)
                 }
             }
         }
@@ -313,7 +340,7 @@ class MainFragment : BrowseSupportFragment() {
         Log.i(TAG, "onStop")
         super.onStop()
         SP.itemPosition = itemPosition
-        Log.i(TAG, "position saved")
+        Log.i(TAG, "$POSITION $itemPosition saved")
     }
 
     override fun onDestroy() {
@@ -324,7 +351,14 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
+    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

@@ -1,5 +1,6 @@
 package com.lizongying.mytv
 
+import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
@@ -11,10 +12,8 @@ import com.lizongying.mytv.api.AuthRequest
 import com.lizongying.mytv.api.FAuth
 import com.lizongying.mytv.api.FAuthService
 import com.lizongying.mytv.api.Info
-import com.lizongying.mytv.api.InfoV2
 import com.lizongying.mytv.api.LiveInfo
 import com.lizongying.mytv.api.LiveInfoRequest
-import com.lizongying.mytv.api.Token
 import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.api.YSPApiService
 import com.lizongying.mytv.api.YSPBtraceService
@@ -29,22 +28,20 @@ import retrofit2.Response
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
-import kotlin.math.max
 
 
-object Request {
+class Request {
-    private const val TAG = "Request"
     private var yspTokenService: YSPTokenService = ApiClient().yspTokenService
     private var yspApiService: YSPApiService = ApiClient().yspApiService
     private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
     private var yspProtoService: YSPProtoService = ApiClient().yspProtoService
     private var fAuthService: FAuthService = ApiClient().fAuthService
-
+    private var ysp: YSP? = null
     private var token = ""
-    private var tokenFH = ""
 
     private var needAuth = false
 
+    // TODO onDestroy
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var btraceRunnable: BtraceRunnable
     private var tokenRunnable: TokenRunnable = TokenRunnable()
@@ -53,16 +50,12 @@ object Request {
     private val input =
         """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()
 
-    private var listener: RequestListener? = null
+    init {
-
+        handler.post(tokenRunnable)
-    fun onCreate() {
-        Log.i(TAG, "onCreate")
-        fetchInfoV2()
     }
 
-    fun onDestroy() {
+    fun initYSP(context: Context) {
-        Log.i(TAG, "onDestroy")
+        ysp = YSP(context)
-        handler.removeCallbacks(tokenRunnable)
     }
 
     var call: Call<LiveInfo>? = null
@@ -73,9 +66,9 @@ object Request {
 
         val title = tvModel.title.value
 
-        val data = YSP.getAuthData(tvModel)
+        val data = ysp?.getAuthData(tvModel)
-        val request = AuthRequest(data)
+        val request = data?.let { AuthRequest(it) }
-        callAuth = request.let { yspApiService.getAuth("guid=${YSP.getGuid()}; $cookie", it) }
+        callAuth = request?.let { yspApiService.getAuth("guid=${ysp?.getGuid()}; $cookie", it) }
 
         callAuth?.enqueue(object : Callback<Auth> {
             override fun onResponse(call: Call<Auth>, response: Response<Auth>) {
@@ -84,7 +77,7 @@ object Request {
 
                     if (liveInfo?.data?.token != null) {
                         Log.i(TAG, "token ${liveInfo.data.token}")
-                        YSP.token = liveInfo.data.token
+                        ysp?.token = liveInfo.data.token
                         fetchVideo(tvModel, cookie)
                     } else {
                         Log.e(TAG, "$title token error")
@@ -154,12 +147,12 @@ object Request {
         val title = tvModel.title.value
 
         tvModel.seq = 0
-        val data = YSP.switch(tvModel)
+        val data = ysp?.switch(tvModel)
-        val request = LiveInfoRequest(data)
+        val request = data?.let { LiveInfoRequest(it) }
-        call = request.let {
+        call = request?.let {
             yspApiService.getLiveInfo(
-                "guid=${YSP.getGuid()}; $cookie",
+                "guid=${ysp?.getGuid()}; $cookie",
-                YSP.token,
+                ysp!!.token,
                 it
             )
         }
@@ -330,7 +323,6 @@ object Request {
     }
 
     fun fetchVideo(tvModel: TVViewModel) {
-        Log.d(TAG, "fetchVideo")
         if (token == "") {
             yspTokenService.getInfo("")
                 .enqueue(object : Callback<Info> {
@@ -385,12 +377,7 @@ object Request {
 
         val title = tvModel.title.value
 
-        var qa = "HD"
+        fAuth = fAuthService.getAuth(tvModel.getTV().pid, "HD")
-        if (tokenFH != "") {
-            qa = "FHD"
-        }
-
-        fAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
         fAuth?.enqueue(object : Callback<FAuth> {
             override fun onResponse(call: Call<FAuth>, response: Response<FAuth>) {
                 if (response.isSuccessful && response.body()?.data?.live_url != null) {
@@ -419,7 +406,6 @@ object Request {
     }
 
     fun fetchData(tvModel: TVViewModel) {
-        Log.d(TAG, "fetchData")
         if (tvModel.getTV().channel == "港澳台") {
             fetchFAuth(tvModel)
             return
@@ -442,121 +428,32 @@ object Request {
         }
     }
 
-    class TokenRunnable : Runnable {
+    inner class TokenRunnable : Runnable {
         override fun run() {
             fetchToken()
+            handler.postDelayed(this, 600000)
         }
     }
 
-    private fun fetchInfoV2() {
-        yspTokenService.getInfoV2()
-            .enqueue(object : Callback<InfoV2> {
-                override fun onResponse(call: Call<InfoV2>, response: Response<InfoV2>) {
-                    if (response.isSuccessful) {
-                        val t = response.body()?.t
-                        val f = response.body()?.f
-                        val e = response.body()?.e
-                        val c = response.body()?.c
-                        if (!t.isNullOrEmpty()) {
-                            token = t
-                            Log.i(TAG, "token success $token")
-                            if (e != null) {
-                                handler.postDelayed(
-                                    tokenRunnable,
-                                    max(600000, (e - 1500) * 1000).toLong()
-                                )
-                            } else {
-                                Log.e(TAG, "e empty")
-                                handler.postDelayed(
-                                    tokenRunnable,
-                                    600000
-                                )
-                            }
-                        } else {
-                            Log.e(TAG, "token empty")
-                            handler.postDelayed(
-                                tokenRunnable,
-                                600000
-                            )
-                        }
-                        if (!f.isNullOrEmpty()) {
-                            tokenFH = f
-                            Log.i(TAG, "tokenFH success $tokenFH")
-                        }
-                        if (c != null) {
-                            Utils.setBetween(c * 1000L)
-                            Log.i(TAG, "current time $c")
-                        }
-                    } else {
-                        Log.e(TAG, "token status error")
-                        handler.postDelayed(
-                            tokenRunnable,
-                            600000
-                        )
-                    }
-                    listener?.onRequestFinished()
-                }
-
-                override fun onFailure(call: Call<InfoV2>, t: Throwable) {
-                    Log.e(TAG, "token request error $t")
-                    handler.postDelayed(
-                        tokenRunnable,
-                        600000
-                    )
-                    listener?.onRequestFinished()
-                }
-            })
-    }
-
     fun fetchToken() {
-        yspTokenService.getToken(token)
+        yspTokenService.getInfo(token)
-            .enqueue(object : Callback<Token> {
+            .enqueue(object : Callback<Info> {
-                override fun onResponse(call: Call<Token>, response: Response<Token>) {
+                override fun onResponse(call: Call<Info>, response: Response<Info>) {
                     if (response.isSuccessful) {
-                        val t = response.body()?.t
+                        token = response.body()?.data?.token!!
-                        val e = response.body()?.e
+                        Log.i(TAG, "info success $token")
-                        if (!t.isNullOrEmpty()) {
-                            token = t
-                            Log.e(TAG, "token success $token")
-                            if (e != null) {
-                                handler.postDelayed(
-                                    tokenRunnable,
-                                    max(600000, (e - 1500) * 1000).toLong()
-                                )
-                            } else {
-                                Log.e(TAG, "e empty")
-                                handler.postDelayed(
-                                    tokenRunnable,
-                                    600000
-                                )
-                            }
-                        } else {
-                            Log.e(TAG, "token empty")
-                            handler.postDelayed(
-                                tokenRunnable,
-                                600000
-                            )
-                        }
                     } else {
                         Log.e(TAG, "token status error")
-                        handler.postDelayed(
-                            tokenRunnable,
-                            600000
-                        )
                     }
                 }
 
-                override fun onFailure(call: Call<Token>, t: Throwable) {
+                override fun onFailure(call: Call<Info>, t: Throwable) {
                     Log.e(TAG, "token request error $t")
-                    handler.postDelayed(
-                        tokenRunnable,
-                        600000
-                    )
                 }
             })
     }
 
-    class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
+    inner class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
         override fun run() {
             fetchBtrace(tvModel)
             handler.postDelayed(this, 60000)
@@ -566,11 +463,11 @@ object Request {
     fun fetchBtrace(tvModel: TVViewModel) {
         val title = tvModel.title.value
 
-        val guid = YSP.getGuid()
+        val guid = ysp?.getGuid()!!
         val pid = tvModel.pid.value!!
         val sid = tvModel.sid.value!!
         yspBtraceService.kvcollect(
-            c_timestamp = YSP.generateGuid(),
+            c_timestamp = ysp?.generateGuid()!!,
             guid = guid,
             c_guid = guid,
             prog = sid,
@@ -578,7 +475,7 @@ object Request {
             fpid = pid,
             livepid = pid,
             sUrl = "https://www.yangshipin.cn/#/tv/home?pid=$pid",
-            playno = YSP.getRand(),
+            playno = ysp?.getRand()!!,
             ftime = getDateFormat("yyyy-MM-dd HH:mm:ss"),
             seq = tvModel.seq.toString(),
         )
@@ -670,11 +567,7 @@ object Request {
         }
     }
 
-    interface RequestListener {
+    companion object {
-        fun onRequestFinished()
+        private const val TAG = "Request"
-    }
-
-    fun setRequestListener(listener: RequestListener) {
-        this.listener = listener
     }
 }

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

@@ -1,12 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.Context
-import android.util.Log
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.IOException
-
 object TVList {
     var list = mapOf(
         "央视" to listOf(
@@ -1022,63 +1015,4 @@ object TVList {
             ),
         )
     )
-
-    /**
-     * 初始化
-     *
-     * @param context Context
-     */
-    fun init(context: Context) {
-        CoroutineScope(Dispatchers.Default).launch {
-            //获取本地版本号
-            val localVersion = ChannelUtils.getLocalVersion(context)
-            //获取服务器版本号
-            val serverVersion = try {
-                ChannelUtils.getServerVersion(context)
-            } catch (e: IOException) {
-                Log.e("TVList", "无法从服务器获取版本信息", e)
-                Integer.MIN_VALUE
-            }
-            //频道列表
-            val channelTVMap: MutableMap<String, MutableList<TV>> = mutableMapOf()
-            //是否从服务器更新
-            var updateFromServer = false
-            //获取频道列表
-            val tvList: List<TV> = if (localVersion < serverVersion) {
-                //获取服务器地址
-                val url = ChannelUtils.getServerUrl(context)
-                //是否从服务器更新
-                updateFromServer = true
-                Log.i("TVList", "从服务器获取频道信息")
-                try {
-                    ChannelUtils.getServerChannel(url)
-                } catch (e: IOException) {
-                    Log.e("TVList", "无法从服务器获取频道信息", e)
-                    updateFromServer = false
-                    ChannelUtils.getLocalChannel(context)
-                }
-            } else {
-                Log.i("TVList", "从本地获取频道信息")
-                //获取本地频道
-                ChannelUtils.getLocalChannel(context)
-            }
-            //按频道分类
-            for (tv in tvList) {
-                val key = tv.channel
-                if (channelTVMap.containsKey(key)) {
-                    val list = channelTVMap[key]!!
-                    list.add(tv)
-                    channelTVMap[key] = list
-                } else {
-                    channelTVMap[key] = mutableListOf(tv)
-                }
-            }
-            //保存频道列表
-            list = channelTVMap
-            //保存版本号
-            if (updateFromServer) {
-                ChannelUtils.updateLocalChannel(context, serverVersion, tvList)
-            }
-        }
-    }
 }

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

@@ -1,5 +1,6 @@
 package com.lizongying.mytv
 
+import android.content.Context
 import android.content.res.Resources
 import android.os.Build
 import android.util.TypedValue
@@ -7,6 +8,7 @@ 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
@@ -26,10 +28,6 @@ object Utils {
         return (System.currentTimeMillis() - between) / 1000
     }
 
-    fun setBetween(currentTimeMillis: Long) {
-        between = System.currentTimeMillis() - currentTimeMillis
-    }
-
     suspend fun init() {
         var currentTimeMillis: Long = 0
         try {
@@ -78,4 +76,49 @@ object Utils {
     }
 
     fun isTmallDevice() = Build.MANUFACTURER.equals("Tmall", ignoreCase = true)
+
+    /**
+     * 获取可读写的目录
+     *
+     * @param context 应用环境信息
+     *
+     * @return 可读写的目录
+     *
+     */
+    fun getAppDirectory(context: Context): File {
+        return context.filesDir
+    }
+
+    /**
+     * 更新channels.json
+     *
+     * @param context 应用环境信息
+     *
+     * @return 无
+     *
+     * @throws IOException 网络请求失败
+     */
+    fun updateChannel(context: Context) {
+        val client = okhttp3.OkHttpClient()
+        val request = okhttp3.Request.Builder().url(getServerUrl(context)).build()
+        client.newCall(request).execute().use { response ->
+            if (!response.isSuccessful) throw IOException("Unexpected code $response")
+            val body = response.body()
+            //覆盖channels.json
+            val file = File(getAppDirectory(context), "channels.json")
+            if (!file.exists()) {
+                file.createNewFile()
+            }
+            file.writeText(body!!.string())
+        }
+    }
+
+    /**
+     * 从res/values/server.xml获取服务器地址
+     * @param context 应用环境信息
+     * @return 服务器地址
+     */
+    private fun getServerUrl(context: Context): String {
+        return context.resources.getString(R.string.server_url)
+    }
 }

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

@@ -2,13 +2,11 @@ package com.lizongying.mytv.api
 
 import retrofit2.Call
 import retrofit2.http.GET
-import retrofit2.http.Header
 import retrofit2.http.Query
 
 interface FAuthService {
     @GET("api/v3/hub/live/auth-url")
     fun getAuth(
-        @Header("token") token: String,
         @Query("live_id") live_id: String = "",
         @Query("live_qa") live_qa: String = "",
     ): Call<FAuth>

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

@@ -10,18 +10,6 @@ data class Info(
     )
 }
 
-data class Token(
-    val e: Int?,
-    val t: String?,
-)
-
-data class InfoV2(
-    val f: String?,
-    val t: String?,
-    val e: Int?,
-    val c: Int?,
-)
-
 data class Release(
     val code: Int?,
     val msg: String?,

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

@@ -9,9 +9,7 @@ import com.lizongying.mytv.models.TVViewModel
 import kotlin.math.floor
 import kotlin.random.Random
 
-object YSP {
+class YSP(var context: Context) {
-    private const val TAG = "YSP"
-
     private var cnlid = ""
 
     private var livepid = ""
@@ -55,10 +53,14 @@ object YSP {
     private var appid = "ysp_pc"
     var token = ""
 
-    private var encryptor = Encryptor()
+    private var encryptor: Encryptor? = null
+
+    init {
+        if (context is MainActivity) {
+            encryptor = Encryptor()
+            encryptor!!.init(context)
+        }
 
-    fun init(context: Context) {
-        encryptor.init(context)
         guid = getGuid()
     }
 
@@ -76,7 +78,7 @@ object YSP {
         timeStr = getTimeStr()
 
         cKey =
-            encryptor.encrypt(cnlid, timeStr, appVer, guid, platform)
+            encryptor!!.encrypt(cnlid, timeStr, appVer, guid, platform)
         signature = getSignature()
         return """{"cnlid":"$cnlid","livepid":"$livepid","stream":"$stream","guid":"$guid","cKey":"$cKey","adjust":$adjust,"sphttps":"$sphttps","platform":"$platform","cmd":"$cmd","encryptVer":"$encryptVer","dtype":"$dtype","devid":"$devid","otype":"$otype","appVer":"$appVer","app_version":"$appVersion","rand_str":"$randStr","channel":"$channel","defn":"$defn","signature":"$signature"}"""
     }
@@ -132,14 +134,18 @@ object YSP {
     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 ""
+        val hashedData = encryptor?.hash(e) ?: return ""
         return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
     }
 
     private fun getAuthSignature(): String {
         val e =
             "appid=${appid}&guid=${guid}&pid=${livepid}&rand_str=${randStr}".toByteArray()
-        val hashedData = encryptor.hash2(e) ?: return ""
+        val hashedData = encryptor?.hash2(e) ?: return ""
         return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
     }
+
+    companion object {
+        private const val TAG = "YSP"
+    }
 }

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

@@ -10,13 +10,4 @@ interface YSPTokenService {
     fun getInfo(
         @Query("token") token: String = "",
     ): Call<Info>
-
-    @GET("my-tv/v2/token")
-    fun getToken(
-        @Query("token") token: String = "",
-    ): Call<Token>
-
-    @GET("my-tv/v2/info")
-    fun getInfoV2(
-    ): Call<InfoV2>
 }

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="wrap_content"
+    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/colors.xml

@@ -2,4 +2,5 @@
     <color name="fastlane_background">#30000000</color>
     <color name="black">#000</color>
     <color name="white">#FFF</color>
+    <color name="gray_overlay">#7F000000</color>
 </resources>

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

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="local_channel_version">1</integer>
+    <string name="server_url">http://localhost:8080</string>
-    <string name="server_version_url">https://fastly.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@main/version.txt</string>
+</resources>
-    <string name="server_url">https://fastly.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@main/channels.json</string>
-</resources>

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">160dp</item>
+        <item name="android:layout_height">40dp</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>