fix save state

.github/ISSUE_TEMPLATE/bug.yml

@@ -19,8 +19,8 @@ body:
       label: my-ty 版本
       description: 请选择正在使用的版本
       options:
-        - 通用版
-        - 专用版
+        - 最新稳定版
+        - 最新 CI 版
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/fr.yml

@@ -11,7 +11,7 @@ body:
       options:
         - label: 之前没有人提交过类似或相同的功能请求。
           required: true
-        - label: 这个建议不会背离 my-tv 的初衷。
+        - label: 这个建议不会背离 LibChecker 的初衷。
           required: true
   - type: textarea
     id: propose

README.md

@@ -14,40 +14,10 @@
 
 ## 更新日志
 
-### v1.6.6（通用）
-
-* 更新重庆卫视图标
-* 凤凰卫视增强画质
-* 凤凰卫视增加EPG
-
-### v1.6.5（安卓5及以上专用）
-
-* 增加CETV1图标
-* 稳定性提升
-
-### v1.6.4（通用）
-
-* 增加CETV1
-* 增加凤凰卫视
-* 默认关闭开机启动
-
-### v1.6.3（安卓5及以上专用）
-
-* 增加CETV1
-* 凤凰卫视增强画质
-* 默认关闭开机启动
-* 延迟菜单自动关闭时间
-* 解决一些可能导致首次打开时黑屏的问题
-
 ### v1.6.2（通用）
 
-* 修复按键无效的问题
 * 新的频道列表样式
 
-### v1.6.1（安卓5及以上专用）
-
-* 增加凤凰卫视
-
 ### v1.6.0（通用）
 
 * 通用（春晚緊急修復）
@@ -224,16 +194,18 @@ adb install my-tv.apk
 ## TODO
 
 * 音量不同
-* 大湾区卫视、广东4k超高清、广东珠江、三沙卫视
+* 大湾区卫视、广东4k超高清、广东珠江
+* CETV教育频道
 * CHC高清三个电影频道
 * 地方频道
 * 收藏夹
 * 自定义源
+* 凤凰卫视、凤凰资讯台
 * 海外
+* 1.5.0 无法安装，1.5.1 可以安装
+* 选中的图标比例能否相差更大
 * 节目增加预告
 * 频道列表优化
-* 自动更新
-* 時間
 
 ## 赞赏
 

app/build.gradle

@@ -54,7 +54,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = 17
+        jvmTarget=17
     }
 
     // Encapsulates your external native build configurations.
@@ -71,14 +71,9 @@ android {
 
 static def VersionCode() {
     try {
-        def p = "git describe --tags --always"
-        def process = p.execute()
+        def process = 'git rev-list --count HEAD'.execute()
         process.waitFor()
-        def replace = [v: "", ".": " ", "-": " "]
-        def arr = (process.text.trim().replace(replace) + " 0").split(" ")
-        def versionCode = arr[0].toInteger() * 16777216 + arr[1].toInteger() * 65536 + arr[2].toInteger() * 256 + arr[3].toInteger()
-        println("VersionCode $versionCode")
-        return versionCode
+        return process.text.toInteger()
     } catch (ignored) {
         return 0
     }
@@ -86,7 +81,7 @@ static def VersionCode() {
 
 static def VersionName() {
     try {
-        def process = "git describe --tags --always".execute()
+        def process = 'git describe --tags --always'.execute()
         process.waitFor()
         return process.text.trim() - "v"
     } catch (ignored) {
@@ -106,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/AndroidManifest.xml

@@ -7,7 +7,6 @@
         android:name="android.software.leanback"
         android:required="true" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <application
         android:allowBackup="true"
@@ -39,9 +38,5 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
-        <provider
-            android:name=".InitializerProvider"
-            android:authorities="${applicationId}.InitializerProvider"
-            android:exported="false"/>
     </application>
 </manifest>

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

@@ -7,7 +7,8 @@ import android.content.Intent
 class BootReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
-        if (SP.bootStartup) {
+        val sp = context.getSharedPreferences("MainActivity", Context.MODE_PRIVATE)
+        if (sp.getBoolean(MainActivity.BOOT_STARTUP, true)) {
             context.startActivity(
                 Intent(context, MainActivity::class.java)
                     .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

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

@@ -0,0 +1,149 @@
+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)
+
+            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,60 +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
-
-        Glide.with(viewHolder.view.context)
-            .load(tvViewModel.logo.value)
-            .centerInside()
-            .into(cardView.mainImageView)
-
-        cardView.setBackgroundColor(Color.WHITE)
-        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
-
-        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
-        if (!epg.isNullOrEmpty()) {
-            cardView.contentText = epg.last().title
-        } else {
-            cardView.contentText = ""
-        }
-    }
-
-    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/Ext.kt

@@ -1,84 +0,0 @@
-@file:Suppress("DEPRECATION")
-
-package com.lizongying.mytv
-
-import android.content.Context
-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
-import android.content.pm.Signature
-import android.content.pm.SigningInfo
-import android.os.Build
-import android.util.Log
-import java.security.MessageDigest
-
-private const val TAG = "Extensions"
-
-private val Context.packageInfo: PackageInfo
-    get() {
-        val flag = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            PackageManager.GET_SIGNATURES
-        } else {
-            PackageManager.GET_SIGNING_CERTIFICATES
-        }
-        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            packageManager.getPackageInfo(packageName, flag)
-        } else {
-            packageManager.getPackageInfo(
-                packageName,
-                PackageManager.PackageInfoFlags.of(PackageManager.GET_SIGNING_CERTIFICATES.toLong())
-            )
-        }
-    }
-
-/**
- * Return the version code of the app which is defined in build.gradle.
- * eg:100
- */
-val Context.appVersionCode: Long
-    get() {
-        val packageInfo = this.packageInfo
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            packageInfo.longVersionCode
-        } else {
-            packageInfo.versionCode.toLong()
-        }
-    }
-
-/**
- * Return the version name of the app which is defined in build.gradle.
- * eg:1.0.0
- */
-val Context.appVersionName: String get() = packageInfo.versionName
-
-val Context.appSignature: String
-    get() {
-        val packageInfo = this.packageInfo
-        var sign: Signature? = null
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            val signatures: Array<out Signature>? = packageInfo.signatures
-            if (signatures != null) {
-                sign = signatures[0]
-            }
-        } else {
-            val signingInfo: SigningInfo? = packageInfo.signingInfo
-            if (signingInfo != null) {
-                sign = signingInfo.apkContentsSigners[0]
-            }
-        }
-        if (sign == null) {
-            return ""
-        }
-        return hashSignature(sign)
-    }
-
-private fun hashSignature(signature: Signature): String {
-    return try {
-        val md = MessageDigest.getInstance("MD5")
-        md.update(signature.toByteArray())
-        val digest = md.digest()
-        digest.let { it -> it.joinToString("") { "%02x".format(it) } }
-    } catch (e: Exception) {
-        Log.e(TAG, "Error hashing signature", e)
-        ""
-    }
-}

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

@@ -0,0 +1,48 @@
+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()) {
+                // 计算遮罩层的大小
+                val overlayRect = Rect(
+                    child.left,
+                    child.top,
+                    child.right,
+                    child.bottom
+                )
+                // 绘制灰色遮罩层
+                c.drawRect(overlayRect, grayOverlayPaint)
+            }
+        }
+    }
+
+    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/InfoFragment.kt

@@ -2,7 +2,6 @@ package com.lizongying.mytv
 
 import android.os.Bundle
 import android.os.Handler
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -31,16 +30,31 @@ class InfoFragment : Fragment() {
     fun show(tvViewModel: TVViewModel) {
         binding.textView.text = tvViewModel.title.value
 
-        Glide.with(this)
-            .load(tvViewModel.logo.value)
-            .into(binding.infoLogo)
+        when (tvViewModel.title.value) {
+            "CCTV8K 超高清" -> Glide.with(this)
+                .load(R.drawable.cctv8k)
+                .into(binding.infoLogo)
 
-        Log.i(TAG, "${tvViewModel.title.value} ${tvViewModel.epg.value}")
-        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
-        if (!epg.isNullOrEmpty()) {
-            binding.infoDesc.text = epg.last().title
-        } else {
-            binding.infoDesc.text = ""
+            "天津卫视" -> Glide.with(this)
+                .load(R.drawable.tianjin)
+                .into(binding.infoLogo)
+
+            "新疆卫视" -> Glide.with(this)
+                .load(R.drawable.xinjiang)
+                .into(binding.infoLogo)
+
+            "兵团卫视" -> Glide.with(this)
+                .load(R.drawable.bingtuan)
+                .into(binding.infoLogo)
+
+            else -> Glide.with(this)
+                .load(tvViewModel.logo.value)
+                .into(binding.infoLogo)
+        }
+
+        val program = tvViewModel.getProgramOne()
+        if (program != null) {
+            binding.infoDesc.text = program.name
         }
 
         handler.removeCallbacks(removeRunnable)

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

@@ -1,39 +0,0 @@
-package com.lizongying.mytv
-
-import android.content.ContentProvider
-import android.content.ContentValues
-import android.net.Uri
-
-internal class InitializerProvider : ContentProvider() {
-
-    // Happens before Application#onCreate.It's fine to init something here
-    override fun onCreate(): Boolean {
-        SP.init(context!!)
-        return true
-    }
-
-    override fun query(
-        uri: Uri,
-        projection: Array<out String>?,
-        selection: String?,
-        selectionArgs: Array<out String>?,
-        sortOrder: String?,
-    ) = unsupported()
-
-    override fun getType(uri: Uri) = unsupported()
-
-    override fun insert(uri: Uri, values: ContentValues?) = unsupported()
-
-    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?) =
-        unsupported()
-
-    override fun update(
-        uri: Uri,
-        values: ContentValues?,
-        selection: String?,
-        selectionArgs: Array<out String>?,
-    ) = unsupported()
-
-    private fun unsupported(errorMessage: String? = null): Nothing =
-        throw UnsupportedOperationException(errorMessage)
-}

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

@@ -1,5 +1,12 @@
 package com.lizongying.mytv
 
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.Signature
+import android.content.pm.SigningInfo
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -11,35 +18,52 @@ import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.models.TVViewModel
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import java.security.MessageDigest
 
 
-class MainActivity : FragmentActivity(), Request.RequestListener {
+class MainActivity : FragmentActivity() {
 
     private var ready = 0
-    private val playerFragment = PlayerFragment()
-    private val mainFragment = MainFragment()
-    private val infoFragment = InfoFragment()
-    private val channelFragment = ChannelFragment()
-    private val settingFragment = SettingFragment()
+    private var playerFragment = PlayerFragment()
+    private var mainFragment = MainFragment()
+    private var infoFragment = InfoFragment()
+    private var channelFragment = ChannelFragment()
+    private lateinit var settingFragment: SettingFragment
 
     private var doubleBackToExitPressedOnce = false
 
     private lateinit var gestureDetector: GestureDetector
 
     private val handler = Handler()
-    private val delayHideMain: Long = 10000
+    private val delayHideMain: Long = 5000
     private val delayHideSetting: Long = 10000
 
+    lateinit var sharedPref: SharedPreferences
+    private var channelReversal = false
+    private var channelNum = true
+    private var bootStartup = true
+
+    init {
+        lifecycleScope.launch(Dispatchers.IO) {
+            val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
+
+            utilsJob.start()
+
+            utilsJob.await()
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
-
         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
@@ -54,11 +78,26 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
                 .commit()
         }
         gestureDetector = GestureDetector(this, GestureListener())
+
+        sharedPref = getPreferences(Context.MODE_PRIVATE)
+        channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, channelReversal)
+        channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
+        bootStartup = sharedPref.getBoolean(BOOT_STARTUP, bootStartup)
+
+        val packageInfo = getPackageInfo()
+        val versionName = packageInfo.versionName
+        val versionCode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            packageInfo.longVersionCode
+        } else {
+            packageInfo.versionCode.toLong()
+        }
+        settingFragment =
+            SettingFragment(versionName, versionCode, channelReversal, channelNum, bootStartup)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
         infoFragment.show(tvViewModel)
-        if (SP.channelNum) {
+        if (channelNum) {
             channelFragment.show(tvViewModel)
         }
     }
@@ -72,7 +111,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             return
         }
 
-        if (SP.channelNum) {
+        if (channelNum) {
             channelFragment.show(channel)
         }
     }
@@ -106,6 +145,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
+            mainFragment.setPosition()
             transaction.show(mainFragment)
             mainActive()
         } else {
@@ -146,7 +186,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 5) {
+        if (ready == 4) {
             mainFragment.fragmentReady()
         }
     }
@@ -161,15 +201,11 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
 
         override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+            Log.i(TAG, "onSingleTapConfirmed")
             switchMainFragment()
             return true
         }
 
-        override fun onDoubleTap(e: MotionEvent): Boolean {
-            showSetting()
-            return true
-        }
-
         override fun onFling(
             e1: MotionEvent?,
             e2: MotionEvent,
@@ -203,6 +239,30 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }
     }
 
+    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
+    }
+
+    fun saveBootStartup(bootStartup: Boolean) {
+        with(sharedPref.edit()) {
+            putBoolean(BOOT_STARTUP, bootStartup)
+            apply()
+        }
+        this.bootStartup = bootStartup
+    }
+
     private fun showSetting() {
         if (!mainFragment.isHidden) {
             return
@@ -226,7 +286,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
     private fun channelUp() {
         if (mainFragment.isHidden) {
-            if (SP.channelReversal) {
+            if (channelReversal) {
                 next()
                 return
             }
@@ -243,7 +303,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
     private fun channelDown() {
         if (mainFragment.isHidden) {
-            if (SP.channelReversal) {
+            if (channelReversal) {
                 prev()
                 return
             }
@@ -276,7 +336,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")
@@ -388,6 +450,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
+                channelUp()
 //                if (mainFragment.isHidden) {
 //                    prevSource()
 //                } else {
@@ -401,6 +464,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_RIGHT -> {
+                channelDown()
 //                if (mainFragment.isHidden) {
 //                    nextSource()
 //                } else {
@@ -412,11 +476,67 @@ 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)
     }
 
-    private fun getAppSignature() = this.appSignature
+    private fun getPackageInfo(): PackageInfo {
+        val flag = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            PackageManager.GET_SIGNATURES
+        } else {
+            PackageManager.GET_SIGNING_CERTIFICATES
+        }
+
+        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            packageManager.getPackageInfo(packageName, flag)
+        } else {
+            packageManager.getPackageInfo(
+                packageName,
+                PackageManager.PackageInfoFlags.of(PackageManager.GET_SIGNING_CERTIFICATES.toLong())
+            )
+        }
+    }
+
+    private fun getAppSignature(): String {
+        val packageInfo = getPackageInfo()
+
+        var sign: Signature? = null
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            val signatures: Array<out Signature>? = packageInfo.signatures
+            if (signatures != null) {
+                sign = signatures[0]
+            }
+        } else {
+            val signingInfo: SigningInfo? = packageInfo.signingInfo
+            if (signingInfo != null) {
+                sign = signingInfo.apkContentsSigners[0]
+            }
+        }
+        if (sign == null) {
+            return ""
+        }
+
+        return hashSignature(sign)
+    }
+
+    private fun hashSignature(signature: Signature): String {
+        return try {
+            val md = MessageDigest.getInstance("MD5")
+            md.update(signature.toByteArray())
+            val digest = md.digest()
+            digest.let { it -> it.joinToString("") { "%02x".format(it) } }
+        } catch (e: Exception) {
+            Log.e(TAG, "Error hashing signature", e)
+            ""
+        }
+    }
 
     override fun onStart() {
         Log.i(TAG, "onStart")
@@ -437,16 +557,10 @@ 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"
+    companion object {
+        private const val TAG = "MainActivity"
+        private const val CHANNEL_REVERSAL = "channel_reversal"
+        private const val CHANNEL_NUM = "channel_num"
+        const val BOOT_STARTUP = "boot_startup"
     }
 }

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

@@ -1,221 +1,255 @@
 package com.lizongying.mytv
 
+import android.content.SharedPreferences
 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.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.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()
 
+    private lateinit var sharedPref: SharedPreferences
+
     private var lastVideoUrl = ""
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        Log.i(TAG, "onCreate")
-        super.onCreate(savedInstanceState)
-        headersState = HEADERS_DISABLED
-    }
+    private val handler = Handler(Looper.getMainLooper())
+    private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
 
-    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?) {
         super.onActivityCreated(savedInstanceState)
 
-        activity?.let { YSP.init(it) }
+        activity?.let { request.initYSP(it) }
+        sharedPref = (activity as? MainActivity)?.sharedPref!!
 
-        loadRows()
+        itemPosition = sharedPref.getInt(POSITION, 0)
 
-        setupEventListeners()
+        view?.post {
+            val content = binding.content
 
-        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()
+            var idx: Long = 0
+            for ((k, v) in TVList.list) {
+                val itemBinding: RowBinding =
+                    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()
+                    }
+                })
+
+                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
                 }
             }
-            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)
+            tvListViewModel.setItemPosition(itemPosition)
+            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.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)
+                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()
+                                )
+                            }
                         }
                     }
                 }
             }
+            (activity as MainActivity).fragmentReady()
         }
-
-        (activity as MainActivity).fragmentReady()
     }
 
-    fun toLastPosition() {
-        setSelectedPosition(
-            selectedPosition, false,
-            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
-        )
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
     }
 
-    fun toFirstPosition() {
-        setSelectedPosition(
-            selectedPosition, false,
-            SelectItemViewHolderTask(0)
-        )
-    }
+    override fun onKey(keyCode: Int): Boolean {
+        if (this.isHidden) {
+            when (keyCode) {
+                KeyEvent.KEYCODE_DPAD_UP -> {
+                    (activity as MainActivity).onKey(keyCode)
+                    return true
+                }
 
-    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)
-
-                updateEPG(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)
-            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()
+                KeyEvent.KEYCODE_DPAD_DOWN -> {
+                    (activity as MainActivity).onKey(keyCode)
+                    return true
                 }
             }
         }
+        return false
     }
 
-    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 onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
+        if (hasFocus) {
+            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
+
+            val row = tvViewModel.getRowPosition()
+
+            for (i in rowList) {
+                if (i.tag as Int != row) {
+                    ((i as RecyclerView).adapter as CardAdapter).clear()
                 }
             }
+
+            (activity as MainActivity).mainActive()
         }
     }
 
-    private fun setupEventListeners() {
-        onItemViewClickedListener = ItemViewClickedListener()
-        onItemViewSelectedListener = ItemViewSelectedListener()
+    override fun onItemClicked(tvViewModel: TVViewModel) {
+        Log.i(TAG, "onItemClicked")
+        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 GridLayoutManager).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).mainActive()
-            }
+    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 {
@@ -273,11 +307,30 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
-    private fun updateEPG(tvViewModel: TVViewModel) {
-        if (tvViewModel.getTV().channel == "港澳台") {
-            Request.fetchFEPG(tvViewModel)
-        } else {
-            Request.fetchYEPG(tvViewModel)
+    fun updateProgram(tvViewModel: TVViewModel) {
+        val timestamp = getDateTimestamp()
+        if (timestamp - tvViewModel.programUpdateTime > 60) {
+            if (tvViewModel.program.value!!.isEmpty()) {
+                tvViewModel.programUpdateTime = timestamp
+                request.fetchProgram(tvViewModel)
+            } else {
+                if (tvViewModel.program.value!!.last().et - timestamp < 600) {
+                    tvViewModel.programUpdateTime = timestamp
+                    request.fetchProgram(tvViewModel)
+                }
+            }
+        }
+    }
+
+    inner class UpdateProgramRunnable : Runnable {
+        override fun run() {
+            tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null && it.programId.value != "" }
+                ?.forEach { tvViewModel ->
+                    updateProgram(
+                        tvViewModel
+                    )
+                }
+            handler.postDelayed(this, 60000)
         }
     }
 
@@ -289,13 +342,25 @@ class MainFragment : BrowseSupportFragment() {
     override fun onStop() {
         Log.i(TAG, "onStop")
         super.onStop()
-        SP.itemPosition = itemPosition
+        with(sharedPref.edit()) {
+            putInt(POSITION, itemPosition)
+            apply()
+        }
         Log.i(TAG, "$POSITION $itemPosition saved")
     }
 
     override fun onDestroy() {
         Log.i(TAG, "onDestroy")
         super.onDestroy()
+        if (::mUpdateProgramRunnable.isInitialized) {
+            handler.removeCallbacks(mUpdateProgramRunnable)
+        }
+    }
+
+    override fun onDestroyView() {
+        Log.i(TAG, "onDestroyView")
+        super.onDestroyView()
+        _binding = null
     }
 
     companion object {

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
@@ -8,14 +9,9 @@ import com.lizongying.mytv.Utils.getDateFormat
 import com.lizongying.mytv.api.ApiClient
 import com.lizongying.mytv.api.Auth
 import com.lizongying.mytv.api.AuthRequest
-import com.lizongying.mytv.api.FAuth
-import com.lizongying.mytv.api.FAuthService
-import com.lizongying.mytv.api.FEPG
 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
@@ -30,22 +26,19 @@ import retrofit2.Response
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
-import kotlin.math.max
 
 
-object Request {
-    private const val TAG = "Request"
+class 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()
@@ -54,43 +47,26 @@ 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
-
-    private var initRetryTimes = 0
-    private var initRetryMaxTimes = 1
-
-    fun onCreate() {
-        Log.i(TAG, "onCreate")
-        fetchInfoV2()
+    init {
+        handler.post(tokenRunnable)
     }
 
-    fun onDestroy() {
-        Log.i(TAG, "onDestroy")
-        handler.removeCallbacks(tokenRunnable)
+    fun initYSP(context: Context) {
+        ysp = YSP(context)
     }
 
-    private var call: Call<LiveInfo>? = null
+    var call: Call<LiveInfo>? = null
     private var callAuth: Call<Auth>? = null
-    private var callInfo: Call<Info>? = null
-    private var callFAuth: Call<FAuth>? = null
-    private var callPage: Call<pageModel.Response>? = null
-
-    private fun cancelCall() {
-        call?.cancel()
-        callAuth?.cancel()
-        callInfo?.cancel()
-        callFAuth?.cancel()
-        callPage?.cancel()
-    }
 
     private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
-        cancelCall()
+        callAuth?.cancel()
 
         val title = tvModel.title.value
 
-        val data = YSP.getAuthData(tvModel)
-        val request = AuthRequest(data)
-        callAuth = request.let { yspApiService.getAuth("guid=${YSP.getGuid()}; $cookie", it) }
+        val data = ysp?.getAuthData(tvModel)
+        val request = data?.let { AuthRequest(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>) {
                 if (response.isSuccessful) {
@@ -98,19 +74,19 @@ 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")
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
                             if (tvModel.getTV().needToken) {
-                                if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                                if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                     if (!tvModel.getTV().mustToken) {
                                         fetchAuth(tvModel, cookie)
                                     }
                                 } else {
-                                    tvModel.needGetToken = true
+                                    token = ""
                                     fetchAuth(tvModel)
                                 }
                             } else {
@@ -123,12 +99,12 @@ object Request {
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
                         if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchAuth(tvModel, cookie)
                                 }
                             } else {
-                                tvModel.needGetToken = true
+                                token = ""
                                 fetchAuth(tvModel)
                             }
                         } else {
@@ -143,12 +119,12 @@ object Request {
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                             if (!tvModel.getTV().mustToken) {
                                 fetchAuth(tvModel, cookie)
                             }
                         } else {
-                            tvModel.needGetToken = true
+                            token = ""
                             fetchAuth(tvModel)
                         }
                     } else {
@@ -159,9 +135,8 @@ object Request {
         })
     }
 
-    private fun fetchVideo(tvModel: TVViewModel, cookie: String) {
-        cancelCall()
-
+    fun fetchVideo(tvModel: TVViewModel, cookie: String) {
+        call?.cancel()
         if (::btraceRunnable.isInitialized) {
             handler.removeCallbacks(btraceRunnable)
         }
@@ -169,12 +144,12 @@ object Request {
         val title = tvModel.title.value
 
         tvModel.seq = 0
-        val data = YSP.switch(tvModel)
-        val request = LiveInfoRequest(data)
-        call = request.let {
+        val data = ysp?.switch(tvModel)
+        val request = data?.let { LiveInfoRequest(it) }
+        call = request?.let {
             yspApiService.getLiveInfo(
-                "guid=${YSP.getGuid()}; $cookie",
-                YSP.token,
+                "guid=${ysp?.getGuid()}; $cookie",
+                ysp!!.token,
                 it
             )
         }
@@ -211,13 +186,13 @@ object Request {
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
                                 if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                         if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
 //                                            fetchAuth(tvModel, cookie)
                                         }
                                     } else {
-                                        tvModel.needGetToken = true
+                                        token = ""
                                         fetchVideo(tvModel)
 //                                        fetchAuth(tvModel)
                                     }
@@ -236,13 +211,13 @@ object Request {
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
                                 if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                         if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
 //                                            fetchAuth(tvModel, cookie)
                                         }
                                     } else {
-                                        tvModel.needGetToken = true
+                                        token = ""
                                         fetchVideo(tvModel)
 //                                        fetchAuth(tvModel)
                                     }
@@ -258,13 +233,13 @@ object Request {
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
                         if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchVideo(tvModel, cookie)
 //                                    fetchAuth(tvModel, cookie)
                                 }
                             } else {
-                                tvModel.needGetToken = true
+                                token = ""
                                 fetchVideo(tvModel)
 //                                fetchAuth(tvModel)
                             }
@@ -281,12 +256,12 @@ object Request {
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                             if (!tvModel.getTV().mustToken) {
                                 fetchVideo(tvModel, cookie)
                             }
                         } else {
-                            tvModel.needGetToken = true
+                            token = ""
                             fetchVideo(tvModel)
                         }
                     } else {
@@ -297,31 +272,37 @@ object Request {
         })
     }
 
-    private fun fetchAuth(tvModel: TVViewModel) {
-        cancelCall()
-        if (tvModel.needGetToken) {
-            callInfo = yspTokenService.getInfo("")
-            callInfo?.enqueue(object : Callback<Info> {
-                override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                    if (response.isSuccessful && response.body()?.data?.token != null) {
-                        token = response.body()?.data?.token!!
-                        Log.i(TAG, "info success $token")
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
-                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                        fetchAuth(tvModel, cookie)
-                    } else if (response.code() == 304) {
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
-                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                        fetchVideo(tvModel, cookie)
-                    } else {
-                        Log.e(TAG, "info status error")
-                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
-                            tvModel.tokenYSPRetryTimes++
-                            fetchAuth(tvModel)
+    fun fetchAuth(tvModel: TVViewModel) {
+        if (token == "") {
+            yspTokenService.getInfo("")
+                .enqueue(object : Callback<Info> {
+                    override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                        if (response.isSuccessful) {
+                            token = response.body()?.data?.token!!
+                            Log.i(TAG, "info success $token")
+                            val cookie =
+                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                            fetchAuth(tvModel, cookie)
+                        } else {
+                            Log.e(TAG, "info status error")
+                            if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
+                                tvModel.tokenRetryTimes++
+                                fetchAuth(tvModel)
+                            } else {
+                                if (!tvModel.getTV().mustToken) {
+                                    val cookie =
+                                        "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
+                                    fetchAuth(tvModel, cookie)
+                                }
+                            }
+                        }
+                    }
+
+                    override fun onFailure(call: Call<Info>, t: Throwable) {
+                        Log.e(TAG, "info request error $t")
+                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
+                            tvModel.tokenRetryTimes++
+                            fetchVideo(tvModel)
                         } else {
                             if (!tvModel.getTV().mustToken) {
                                 val cookie =
@@ -330,22 +311,7 @@ object Request {
                             }
                         }
                     }
-                }
-
-                override fun onFailure(call: Call<Info>, t: Throwable) {
-                    Log.e(TAG, "info request error $t")
-                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
-                        tvModel.tokenYSPRetryTimes++
-                        fetchVideo(tvModel)
-                    } else {
-                        if (!tvModel.getTV().mustToken) {
-                            val cookie =
-                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
-                            fetchAuth(tvModel, cookie)
-                        }
-                    }
-                }
-            })
+                })
         } else {
             val cookie =
                 "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
@@ -353,31 +319,36 @@ object Request {
         }
     }
 
-    private fun fetchVideo(tvModel: TVViewModel) {
-        cancelCall()
-        Log.d(TAG, "fetchVideo")
-        if (tvModel.needGetToken) {
-            callInfo = yspTokenService.getInfo("")
-            callInfo?.enqueue(object : Callback<Info> {
-                override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                    if (response.isSuccessful && response.body()?.data?.token != null) {
-                        token = response.body()?.data?.token!!
-                        Log.i(TAG, "info success $token")
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
-                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                        fetchVideo(tvModel, cookie)
-                    } else if (response.code() == 304) {
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
-                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                        fetchVideo(tvModel, cookie)
-                    } else {
-                        Log.e(TAG, "info status error")
-                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
-                            tvModel.tokenYSPRetryTimes++
+    fun fetchVideo(tvModel: TVViewModel) {
+        if (token == "") {
+            yspTokenService.getInfo("")
+                .enqueue(object : Callback<Info> {
+                    override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                        if (response.isSuccessful && response.body()?.data?.token != null) {
+                            token = response.body()?.data?.token!!
+                            Log.i(TAG, "info success $token")
+                            val cookie =
+                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                            fetchVideo(tvModel, cookie)
+                        } else {
+                            Log.e(TAG, "info status error")
+                            if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
+                                tvModel.tokenRetryTimes++
+                                fetchVideo(tvModel)
+                            } else {
+                                if (!tvModel.getTV().mustToken) {
+                                    val cookie =
+                                        "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
+                                    fetchVideo(tvModel, cookie)
+                                }
+                            }
+                        }
+                    }
+
+                    override fun onFailure(call: Call<Info>, t: Throwable) {
+                        Log.e(TAG, "info request error $t")
+                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
+                            tvModel.tokenRetryTimes++
                             fetchVideo(tvModel)
                         } else {
                             if (!tvModel.getTV().mustToken) {
@@ -387,73 +358,15 @@ object Request {
                             }
                         }
                     }
-                }
-
-                override fun onFailure(call: Call<Info>, t: Throwable) {
-                    Log.e(TAG, "info request error $t")
-                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
-                        tvModel.tokenYSPRetryTimes++
-                        fetchVideo(tvModel)
-                    } else {
-                        if (!tvModel.getTV().mustToken) {
-                            val cookie =
-                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
-                            fetchVideo(tvModel, cookie)
-                        }
-                    }
-                }
-            })
+                })
         } else {
             val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
             fetchVideo(tvModel, cookie)
         }
     }
 
-    private fun fetchFAuth(tvModel: TVViewModel) {
-        cancelCall()
-
-        val title = tvModel.title.value
-
-        var qa = "HD"
-        if (tokenFH != "") {
-            qa = "FHD"
-        }
-
-        callFAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
-        callFAuth?.enqueue(object : Callback<FAuth> {
-            override fun onResponse(call: Call<FAuth>, response: Response<FAuth>) {
-                if (response.isSuccessful && response.body()?.data?.live_url != null) {
-                    val url = response.body()?.data?.live_url!!
-//                    Log.d(TAG, "$title url $url")
-                    tvModel.addVideoUrl(url)
-                    tvModel.allReady()
-                    tvModel.tokenFHRetryTimes = 0
-                } else {
-                    Log.e(TAG, "auth status error ${response.code()}")
-                    if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
-                        tvModel.tokenFHRetryTimes++
-                        fetchFAuth(tvModel)
-                    }
-                }
-            }
-
-            override fun onFailure(call: Call<FAuth>, t: Throwable) {
-                Log.e(TAG, "auth request error $t")
-                if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
-                    tvModel.tokenFHRetryTimes++
-                    fetchFAuth(tvModel)
-                }
-            }
-        })
-    }
-
     fun fetchData(tvModel: TVViewModel) {
-        if (tvModel.getTV().channel == "港澳台") {
-            fetchFAuth(tvModel)
-            return
-        }
-
         if (tvModel.getTV().needToken) {
             if (needAuth) {
                 fetchAuth(tvModel)
@@ -471,133 +384,32 @@ object Request {
         }
     }
 
-    class TokenRunnable : Runnable {
+    inner class TokenRunnable : Runnable {
         override fun run() {
-//            fetchToken()
+            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(30 * 60 * 1000, (e - 1500) * 1000).toLong()
-                                )
-                            } else {
-                                Log.e(TAG, "e empty")
-                                handler.postDelayed(
-                                    tokenRunnable,
-                                    30 * 60 * 1000
-                                )
-                            }
-                        } else {
-                            Log.e(TAG, "token empty")
-                            handler.postDelayed(
-                                tokenRunnable,
-                                30 * 60 * 1000
-                            )
-                        }
-                        if (!f.isNullOrEmpty()) {
-                            tokenFH = f
-                            Log.i(TAG, "tokenFH success $tokenFH")
-                        }
-                        if (c != null) {
-                            Utils.setBetween(c * 1000L)
-                            Log.i(TAG, "current time $c")
-                        }
-                        listener?.onRequestFinished()
-                    } else {
-                        Log.e(TAG, "token status error")
-                        handler.postDelayed(
-                            tokenRunnable,
-                            30 * 60 * 1000
-                        )
-                        if (initRetryTimes < initRetryMaxTimes) {
-                            initRetryTimes++
-                            fetchInfoV2()
-                        } else {
-                            listener?.onRequestFinished()
-                        }
-                    }
-                }
-
-                override fun onFailure(call: Call<InfoV2>, t: Throwable) {
-                    Log.e(TAG, "token request error $t")
-                    handler.postDelayed(
-                        tokenRunnable,
-                        30 * 60 * 1000
-                    )
-
-                    if (initRetryTimes < initRetryMaxTimes) {
-                        initRetryTimes++
-                        fetchInfoV2()
-                    } else {
-                        listener?.onRequestFinished()
-                    }
-                }
-            })
-    }
-
     fun fetchToken() {
-        yspTokenService.getToken(token)
-            .enqueue(object : Callback<Token> {
-                override fun onResponse(call: Call<Token>, response: Response<Token>) {
+        yspTokenService.getInfo(token)
+            .enqueue(object : Callback<Info> {
+                override fun onResponse(call: Call<Info>, response: Response<Info>) {
                     if (response.isSuccessful) {
-                        val t = response.body()?.t
-                        val e = response.body()?.e
-                        if (!t.isNullOrEmpty()) {
-                            token = t
-                            Log.e(TAG, "token success $token")
-                            if (e != null) {
-                                handler.postDelayed(
-                                    tokenRunnable,
-                                    max(30 * 60 * 1000, (e - 1500) * 1000).toLong()
-                                )
-                            } else {
-                                Log.e(TAG, "e empty")
-                                handler.postDelayed(
-                                    tokenRunnable,
-                                    30 * 60 * 1000
-                                )
-                            }
-                        } else {
-                            Log.e(TAG, "token empty")
-                            handler.postDelayed(
-                                tokenRunnable,
-                                30 * 60 * 1000
-                            )
-                        }
+                        token = response.body()?.data?.token!!
+                        Log.i(TAG, "info success $token")
                     } else {
                         Log.e(TAG, "token status error")
-                        handler.postDelayed(
-                            tokenRunnable,
-                            30 * 60 * 1000
-                        )
                     }
                 }
 
-                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,
-                        30 * 60 * 1000
-                    )
                 }
             })
     }
 
-    class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
+    inner class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
         override fun run() {
             fetchBtrace(tvModel)
             handler.postDelayed(this, 60000)
@@ -607,11 +419,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,
@@ -619,7 +431,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(),
         )
@@ -640,8 +452,7 @@ object Request {
     }
 
     fun fetchPage() {
-        callPage = yspProtoService.getPage()
-        callPage?.enqueue(object : Callback<pageModel.Response> {
+        yspProtoService.getPage().enqueue(object : Callback<pageModel.Response> {
             override fun onResponse(
                 call: Call<pageModel.Response>,
                 response: Response<pageModel.Response>
@@ -674,7 +485,7 @@ object Request {
         })
     }
 
-    fun fetchYEPG(tvViewModel: TVViewModel) {
+    fun fetchProgram(tvViewModel: TVViewModel) {
         val title = tvViewModel.title.value
         yspProtoService.getProgram(tvViewModel.programId.value!!, getDateFormat("yyyyMMdd"))
             .enqueue(object : Callback<epgProgramModel.Response> {
@@ -685,7 +496,7 @@ object Request {
                     if (response.isSuccessful) {
                         val program = response.body()
                         if (program != null) {
-                            tvViewModel.addYEPG(program.dataListList)
+                            tvViewModel.addProgram(program.dataListList)
                             Log.d(TAG, "$title program ${program.dataListList.size}")
                         }
                     } else {
@@ -699,31 +510,6 @@ object Request {
             })
     }
 
-    fun fetchFEPG(tvViewModel: TVViewModel) {
-        val title = tvViewModel.title.value
-        fAuthService.getEPG(tvViewModel.pid.value!!, getDateFormat("yyyyMMdd"))
-            .enqueue(object : Callback<List<FEPG>> {
-                override fun onResponse(
-                    call: Call<List<FEPG>>,
-                    response: Response<List<FEPG>>
-                ) {
-                    if (response.isSuccessful) {
-                        val program = response.body()
-                        if (program != null) {
-                            tvViewModel.addFEPG(program)
-                            Log.d(TAG, "$title program ${program.size}")
-                        }
-                    } else {
-                        Log.w(TAG, "$title program error")
-                    }
-                }
-
-                override fun onFailure(call: Call<List<FEPG>>, t: Throwable) {
-                    Log.e(TAG, "$title program request failed $t")
-                }
-            })
-    }
-
     private fun encryptTripleDES(key: ByteArray, iv: ByteArray): String {
         return try {
             val keySpec = SecretKeySpec(key, "DESede")
@@ -737,11 +523,7 @@ object Request {
         }
     }
 
-    interface RequestListener {
-        fun onRequestFinished()
-    }
-
-    fun setRequestListener(listener: RequestListener) {
-        this.listener = listener
+    companion object {
+        private const val TAG = "Request"
     }
 }

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

@@ -1,53 +0,0 @@
-package com.lizongying.mytv
-
-import android.content.Context
-import android.content.SharedPreferences
-
-object SP {
-    // Name of the sp file TODO Should use a meaningful name and do migrations
-    private const val SP_FILE_NAME = "MainActivity"
-
-    // If Change channel with up and down in reversed order or not
-    private const val KEY_CHANNEL_REVERSAL = "channel_reversal"
-
-    // If use channel num to select channel or not
-    private const val KEY_CHANNEL_NUM = "channel_num"
-
-    // If start app on device boot or not
-    private const val KEY_BOOT_STARTUP = "boot_startup"
-
-    // Position in list of the selected channel item
-    private const val KEY_POSITION = "position"
-
-    // guid
-    private const val KEY_GUID = "guid"
-
-    private lateinit var sp: SharedPreferences
-
-    /**
-     * The method must be invoked as early as possible(At least before using the keys)
-     */
-    fun init(context: Context) {
-        sp = context.getSharedPreferences(SP_FILE_NAME, Context.MODE_PRIVATE)
-    }
-
-    var channelReversal: Boolean
-        get() = sp.getBoolean(KEY_CHANNEL_REVERSAL, false)
-        set(value) = sp.edit().putBoolean(KEY_CHANNEL_REVERSAL, value).apply()
-
-    var channelNum: Boolean
-        get() = sp.getBoolean(KEY_CHANNEL_NUM, true)
-        set(value) = sp.edit().putBoolean(KEY_CHANNEL_NUM, value).apply()
-
-    var bootStartup: Boolean
-        get() = sp.getBoolean(KEY_BOOT_STARTUP, false)
-        set(value) = sp.edit().putBoolean(KEY_BOOT_STARTUP, value).apply()
-
-    var itemPosition: Int
-        get() = sp.getInt(KEY_POSITION, 0)
-        set(value) = sp.edit().putInt(KEY_POSITION, value).apply()
-
-    var guid: String
-        get() = sp.getString(KEY_GUID, "") ?: ""
-        set(value) = sp.edit().putString(KEY_GUID, value).apply()
-}

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

@@ -8,7 +8,14 @@ import androidx.fragment.app.DialogFragment
 import com.lizongying.mytv.databinding.DialogBinding
 
 
-class SettingFragment : DialogFragment() {
+class SettingFragment(
+    private val versionName: String,
+    private val versionCode: Long,
+    private val channelReversal: Boolean,
+    private val channelNum: Boolean,
+    private val bootStartup: Boolean,
+) :
+    DialogFragment() {
 
     private var _binding: DialogBinding? = null
     private val binding get() = _binding!!
@@ -25,37 +32,33 @@ class SettingFragment : DialogFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val context = requireContext() // It‘s safe to get context here.
         _binding = DialogBinding.inflate(inflater, container, false)
-        binding.versionName.text = "当前版本: v${context.appVersionName}"
-        binding.version.text = "https://github.com/lizongying/my-tv"
+        _binding?.version?.text =
+            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
 
-        binding.switchChannelReversal.run {
-            isChecked = SP.channelReversal
-            setOnCheckedChangeListener { _, isChecked ->
-                SP.channelReversal = isChecked
-                (activity as MainActivity).settingActive()
-            }
+        val switchChannelReversal = _binding?.switchChannelReversal
+        switchChannelReversal?.isChecked = channelReversal
+        switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
+            (activity as MainActivity).saveChannelReversal(isChecked)
+            (activity as MainActivity).settingActive()
         }
 
-        binding.switchChannelNum.run {
-            isChecked = SP.channelNum
-            setOnCheckedChangeListener { _, isChecked ->
-                SP.channelNum = isChecked
-                (activity as MainActivity).settingActive()
-            }
+        val switchChannelNum = _binding?.switchChannelNum
+        switchChannelNum?.isChecked = channelNum
+        switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
+            (activity as MainActivity).saveChannelNum(isChecked)
+            (activity as MainActivity).settingActive()
         }
 
-        binding.switchBootStartup.run {
-            isChecked = SP.bootStartup
-            setOnCheckedChangeListener { _, isChecked ->
-                SP.bootStartup = isChecked
-                (activity as MainActivity).settingActive()
-            }
+        val switchBootStartup = _binding?.switchBootStartup
+        switchBootStartup?.isChecked = bootStartup
+        switchBootStartup?.setOnCheckedChangeListener { _, isChecked ->
+            (activity as MainActivity).saveBootStartup(isChecked)
+            (activity as MainActivity).settingActive()
         }
 
-        updateManager = UpdateManager(context, this, context.appVersionCode)
-        binding.checkVersion.setOnClickListener(OnClickListenerCheckVersion(updateManager))
+        updateManager = UpdateManager(context, this, versionCode)
+        _binding?.checkVersion?.setOnClickListener(OnClickListenerCheckVersion(updateManager))
 
         return binding.root
     }

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

@@ -7,8 +7,9 @@ data class TV(
     var title: String,
     var alias: String = "",
     var videoUrl: List<String>,
+    var videoIndex: Int = 0,
     var channel: String = "",
-    var logo: Any = "",
+    var logo: String = "",
     var pid: String = "",
     var sid: String = "",
     var programId: String = "",
@@ -22,6 +23,7 @@ data class TV(
                 "id=" + id +
                 ", title='" + title + '\'' +
                 ", videoUrl='" + videoUrl + '\'' +
+                ", videoIndex='" + videoIndex + '\'' +
                 ", logo='" + logo + '\'' +
                 ", pid='" + pid + '\'' +
                 ", sid='" + sid + '\'' +

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

@@ -1,6 +1,5 @@
 package com.lizongying.mytv
 
-import android.app.Activity
 import android.app.DownloadManager
 import android.app.DownloadManager.Request
 import android.content.BroadcastReceiver
@@ -14,10 +13,8 @@ import android.os.Environment
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import androidx.core.app.ActivityCompat
-import androidx.core.content.PermissionChecker
-import androidx.core.content.PermissionChecker.checkSelfPermission
-import com.lizongying.mytv.api.ReleaseV2
+import android.widget.Toast
+import com.lizongying.mytv.api.Release
 import com.lizongying.mytv.requests.MyRequest
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -26,115 +23,81 @@ import java.io.File
 
 
 class UpdateManager(
-    private var context: Context,
+    private var context: Context?,
     private var settingFragment: SettingFragment,
     private var versionCode: Long
 ) :
     ConfirmationDialogFragment.ConfirmationDialogListener {
 
     private var myRequest = MyRequest()
-    private var release: ReleaseV2? = null
+    private var release: Release? = null
 
     private var downloadReceiver: DownloadReceiver? = null
 
     fun checkAndUpdate() {
-        if (!haveStoragePermission()) {
-            return
-        }
         CoroutineScope(Dispatchers.Main).launch {
-            var text = "版本获取失败"
             try {
                 release = myRequest.getRelease()
-                Log.i(TAG, "versionCode $versionCode ${release?.c}")
-                if (release?.c != null) {
-                    if (release?.c!! >= versionCode) {
-                        text = "最新版本：${release?.n}"
+                updateUI(release)
+                Log.i(TAG, "versionCode $versionCode ${release?.data?.versionCode}")
+                if (release != null) {
+                    if (release?.data?.versionCode!! >= versionCode) {
                         val dialog = ConfirmationDialogFragment(this@UpdateManager)
                         dialog.show(settingFragment.fragmentManager, "ConfirmationDialogFragment")
                     } else {
-                        text = "已是最新版本，不需要更新"
+                        Toast.makeText(context, "不需要更新", Toast.LENGTH_LONG)
+                            .show()
                     }
                 }
             } catch (e: Exception) {
                 Log.e(TAG, "Error occurred: ${e.message}", e)
             }
-            updateUI(text)
         }
     }
 
-    private fun updateUI(text: String) {
-        settingFragment.setVersionName(text)
-    }
-
-    fun haveStoragePermission(): Boolean {
-        if (Build.VERSION.SDK_INT >= 23) {
-            if (checkSelfPermission(context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                === PermissionChecker.PERMISSION_GRANTED
-            ) {
-                Log.e("Permission error", "You have permission")
-                return true
-            } else {
-                Log.e("Permission error", "You have asked for permission")
-                ActivityCompat.requestPermissions(
-                    context as Activity, arrayOf(
-                        android.Manifest.permission.WRITE_EXTERNAL_STORAGE
-                    ), 1
-                )
-                return false
-            }
-        } else { //you don't need to worry about these stuff below api level 23
-            Log.e("Permission error", "You already have the permission")
-            return true
+    private fun updateUI(release: Release?) {
+        if (release?.data?.versionName.isNullOrEmpty()) {
+            settingFragment.setVersionName("版本获取失败")
+        } else {
+            settingFragment.setVersionName("最新版本：${release?.data?.versionName!!}")
         }
     }
 
-
-    private fun startDownload(release: ReleaseV2) {
-        val apkFileName = "my-tv-${release.n}.apk"
+    private fun startDownload(release: Release) {
+        val apkFileName = "my-tv-${release.data.versionName}.apk"
         Log.i(TAG, "apkFileName $apkFileName")
         val downloadManager =
-            context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        val request = Request(Uri.parse(release.u))
-        Log.i(TAG, "url ${Uri.parse(release.u)}")
-        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)?.mkdirs()
-        request.setDestinationInExternalFilesDir(
-            context,
-            Environment.DIRECTORY_DOWNLOADS,
-            apkFileName
-        )
+            context!!.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+        val request = Request(Uri.parse(release.data.downloadUrl))
+        Log.i(TAG, "url ${Uri.parse(release.data.downloadUrl)}")
+        request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, apkFileName)
         request.setTitle("New Version Download")
         request.setNotificationVisibility(Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
-        request.setAllowedOverRoaming(false)
-        request.setMimeType("application/vnd.android.package-archive")
 
         // 获取下载任务的引用
         val downloadReference = downloadManager.enqueue(request)
 
-        downloadReceiver = DownloadReceiver(context, apkFileName, downloadReference)
+        downloadReceiver = DownloadReceiver(context!!, apkFileName, downloadReference)
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context.registerReceiver(
+            context!!.registerReceiver(
                 downloadReceiver,
                 IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
                 Context.RECEIVER_NOT_EXPORTED,
             )
         } else {
-            context.registerReceiver(
+            context!!.registerReceiver(
                 downloadReceiver,
                 IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
             )
         }
 
-        getDownloadProgress(context, downloadReference) { progress ->
+        getDownloadProgress(context!!, downloadReference) { progress ->
             println("Download progress: $progress%")
         }
     }
 
-    private fun getDownloadProgress(
-        context: Context,
-        downloadId: Long,
-        progressListener: (Int) -> Unit
-    ) {
+    private fun getDownloadProgress(context: Context, downloadId: Long, progressListener: (Int) -> Unit) {
         val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
         val handler = Handler(Looper.getMainLooper())
         val intervalMillis: Long = 1000
@@ -216,9 +179,10 @@ class UpdateManager(
     override fun onCancel() {
     }
 
+
     fun destroy() {
         if (downloadReceiver != null) {
-            context.unregisterReceiver(downloadReceiver)
+            context!!.unregisterReceiver(downloadReceiver)
             Log.i(TAG, "destroy downloadReceiver")
         }
     }

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/ApiClient.kt

@@ -1,11 +1,7 @@
 package com.lizongying.mytv.api
 
 
-import android.os.Build
-import android.util.Log
-import okhttp3.ConnectionSpec
 import okhttp3.OkHttpClient
-import okhttp3.TlsVersion
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.protobuf.ProtoConverterFactory
@@ -17,9 +13,9 @@ import javax.net.ssl.X509TrustManager
 class ApiClient {
     private val yspUrl = "https://player-api.yangshipin.cn/"
     private val myUrl = "https://lyrics.run/"
+    private val devUrl = "http://10.0.2.2:8081/"
     private val protoUrl = "https://capi.yangshipin.cn/"
     private val traceUrl = "https://btrace.yangshipin.cn/"
-    private val fUrl = "https://m.fengshows.com/"
 
     private var okHttpClient = getUnsafeOkHttpClient()
 
@@ -63,44 +59,6 @@ class ApiClient {
             .build().create(YSPBtraceService::class.java)
     }
 
-    val fAuthService: FAuthService by lazy {
-        Retrofit.Builder()
-            .baseUrl(fUrl)
-            .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build().create(FAuthService::class.java)
-    }
-
-    private fun enableTls12OnPreLollipop(client: OkHttpClient.Builder): OkHttpClient.Builder {
-        if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT < 22) {
-            try {
-                val sc = SSLContext.getInstance("TLSv1.2")
-
-                sc.init(null, null, null)
-
-                // a more robust version is to pass a custom X509TrustManager
-                // as the second parameter and make checkServerTrusted to accept your server.
-                // Credits: https://github.com/square/okhttp/issues/2372#issuecomment-1774955225
-                client.sslSocketFactory(Tls12SocketFactory(sc.socketFactory))
-
-                val cs = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
-                    .tlsVersions(TlsVersion.TLS_1_2)
-                    .build()
-
-                val specs: MutableList<ConnectionSpec> = ArrayList()
-                specs.add(cs)
-                specs.add(ConnectionSpec.COMPATIBLE_TLS)
-                specs.add(ConnectionSpec.CLEARTEXT)
-
-                client.connectionSpecs(specs)
-            } catch (exc: java.lang.Exception) {
-                Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc)
-            }
-        }
-
-        return client
-    }
-
     private fun getUnsafeOkHttpClient(): OkHttpClient {
         try {
             val trustAllCerts: Array<TrustManager> = arrayOf(
@@ -126,12 +84,11 @@ class ApiClient {
             val sslContext = SSLContext.getInstance("SSL")
             sslContext.init(null, trustAllCerts, java.security.SecureRandom())
 
-            val builder = OkHttpClient.Builder()
+            return OkHttpClient.Builder()
                 .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)
                 .hostnameVerifier { _, _ -> true }
                 .dns(DnsCache())
-
-            return enableTls12OnPreLollipop(builder).build()
+                .build()
 
         } catch (e: Exception) {
             throw RuntimeException(e)

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

@@ -1,10 +0,0 @@
-package com.lizongying.mytv.api
-
-
-data class FAuth(
-    val data: Data,
-) {
-    data class Data(
-        val live_url: String,
-    )
-}

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

@@ -1,23 +0,0 @@
-package com.lizongying.mytv.api
-
-import retrofit2.Call
-import retrofit2.http.GET
-import retrofit2.http.Header
-import retrofit2.http.Path
-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>
-
-    @GET("api/v3/live/{liveId}/resources")
-    fun getEPG(
-        @Path("liveId") liveId: String,
-        @Query("date") date: String,
-        @Query("dir") dir: String = "asc"
-    ): Call<List<FEPG>>
-}

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

@@ -1,7 +0,0 @@
-package com.lizongying.mytv.api
-
-
-data class FEPG(
-    val title: String,
-    val event_time: String,
-)

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

@@ -10,23 +10,18 @@ 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 ReleaseV2(
-    val n: String?,
-    val u: String?,
-    val c: Int?,
-)
+data class Release(
+    val code: Int?,
+    val msg: String?,
+    val data: Data,
+) {
+    data class Data(
+        val versionName: String,
+        val versionCode: Int,
+        val downloadUrl: String,
+        val updateTime: Int,
+    )
+}
 
 data class TimeResponse(
     val data: Time

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

@@ -2,11 +2,10 @@ package com.lizongying.mytv.api
 
 import retrofit2.Call
 import retrofit2.http.GET
-import retrofit2.http.Path
+
 
 interface ReleaseService {
-    @GET("my-tv/v2/release/{name}")
+    @GET("my-tv/v1/release")
     fun getRelease(
-        @Path("name") date: String = "1",
-    ): Call<ReleaseV2>
+    ): Call<Release>
 }

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

@@ -1,74 +0,0 @@
-package com.lizongying.mytv.api
-
-import java.io.IOException
-import java.net.InetAddress
-import java.net.Socket
-import java.net.UnknownHostException
-import javax.net.ssl.SSLSocket
-import javax.net.ssl.SSLSocketFactory
-
-
-/**
- * Enables TLS v1.2 when creating SSLSockets.
- *
- *
- * For some reason, android supports TLS v1.2 from API 16, but enables it by
- * default only from API 20.
- * @link https://developer.android.com/reference/javax/net/ssl/SSLSocket.html
- * @see SSLSocketFactory
- */
-class Tls12SocketFactory(val delegate: SSLSocketFactory) : SSLSocketFactory() {
-    override fun getDefaultCipherSuites(): Array<String> {
-        return delegate.defaultCipherSuites
-    }
-
-    override fun getSupportedCipherSuites(): Array<String> {
-        return delegate.supportedCipherSuites
-    }
-
-    @Throws(IOException::class)
-    override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket {
-        return patch(delegate.createSocket(s, host, port, autoClose))
-    }
-
-    @Throws(IOException::class, UnknownHostException::class)
-    override fun createSocket(host: String, port: Int): Socket {
-        return patch(delegate.createSocket(host, port))
-    }
-
-    @Throws(IOException::class, UnknownHostException::class)
-    override fun createSocket(
-        host: String,
-        port: Int,
-        localHost: InetAddress,
-        localPort: Int
-    ): Socket {
-        return patch(delegate.createSocket(host, port, localHost, localPort))
-    }
-
-    @Throws(IOException::class)
-    override fun createSocket(host: InetAddress, port: Int): Socket {
-        return patch(delegate.createSocket(host, port))
-    }
-
-    @Throws(IOException::class)
-    override fun createSocket(
-        address: InetAddress,
-        port: Int,
-        localAddress: InetAddress,
-        localPort: Int
-    ): Socket {
-        return patch(delegate.createSocket(address, port, localAddress, localPort))
-    }
-
-    private fun patch(s: Socket): Socket {
-        if (s is SSLSocket) {
-            s.enabledProtocols = TLS_V12_ONLY
-        }
-        return s
-    }
-
-    companion object {
-        private val TLS_V12_ONLY = arrayOf("TLSv1.2")
-    }
-}

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

@@ -1,17 +1,15 @@
 package com.lizongying.mytv.api
 
 import android.content.Context
+import android.content.SharedPreferences
 import com.lizongying.mytv.Encryptor
 import com.lizongying.mytv.MainActivity
-import com.lizongying.mytv.SP
 import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.models.TVViewModel
 import kotlin.math.floor
 import kotlin.random.Random
 
-object YSP {
-    private const val TAG = "YSP"
-
+class YSP(var context: Context) {
     private var cnlid = ""
 
     private var livepid = ""
@@ -55,10 +53,17 @@ object YSP {
     private var appid = "ysp_pc"
     var token = ""
 
-    private var encryptor = Encryptor()
+    private var encryptor: Encryptor? = null
+    private lateinit var sharedPref: SharedPreferences
+
+    init {
+        if (context is MainActivity) {
+            encryptor = Encryptor()
+            encryptor!!.init(context)
+
+            sharedPref = (context as MainActivity).sharedPref
+        }
 
-    fun init(context: Context) {
-        encryptor.init(context)
         guid = getGuid()
     }
 
@@ -76,7 +81,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"}"""
     }
@@ -105,17 +110,23 @@ object YSP {
     }
 
     fun getGuid(): String {
-        var guid = SP.guid
-        if (guid.length < 18) {
+        var guid = sharedPref.getString("guid", "")
+        if (guid == null || guid.length < 18) {
             guid = generateGuid()
-            SP.guid = guid
+            with(sharedPref.edit()) {
+                putString("guid", guid)
+                apply()
+            }
         }
         return guid
     }
 
     private fun newGuid(): String {
         guid = generateGuid()
-        SP.guid = guid
+        with(sharedPref.edit()) {
+            putString("guid", guid)
+            apply()
+        }
         return guid
     }
 
@@ -132,14 +143,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/java/com/lizongying/mytv/models/EPG.kt

@@ -1,7 +0,0 @@
-package com.lizongying.mytv.models
-
-
-data class EPG(
-    val title: String,
-    val beginTime: Int,
-)

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

@@ -11,10 +11,8 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.DefaultHttpDataSource
 import androidx.media3.exoplayer.hls.HlsMediaSource
 import com.lizongying.mytv.TV
-import com.lizongying.mytv.api.FEPG
+import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.programModel.Program
-import java.text.SimpleDateFormat
-import java.util.TimeZone
 
 class TVViewModel(private var tv: TV) : ViewModel() {
 
@@ -22,13 +20,10 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     private var itemPosition: Int = 0
 
     var retryTimes = 0
+    var tokenRetryTimes = 0
     var retryMaxTimes = 8
-    var tokenYSPRetryTimes = 0
-    var tokenYSPRetryMaxTimes = 0
-    var tokenFHRetryTimes = 0
-    var tokenFHRetryMaxTimes = 4
-
-    var needGetToken = false
+    var tokenRetryMaxTimes = 2
+    var programUpdateTime: Long = 0
 
     private val _errInfo = MutableLiveData<String>()
     val errInfo: LiveData<String>
@@ -38,9 +33,9 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val programId: LiveData<String>
         get() = _programId
 
-    private var _epg = MutableLiveData<MutableList<EPG>>()
-    val epg: LiveData<MutableList<EPG>>
-        get() = _epg
+    private var _program = MutableLiveData<MutableList<Program>>()
+    val program: LiveData<MutableList<Program>>
+        get() = _program
 
     private val _id = MutableLiveData<Int>()
     val id: LiveData<Int>
@@ -58,8 +53,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val videoIndex: LiveData<Int>
         get() = _videoIndex
 
-    private val _logo = MutableLiveData<Any>()
-    val logo: LiveData<Any>
+    private val _logo = MutableLiveData<String>()
+    val logo: LiveData<String>
         get() = _logo
 
     private val _pid = MutableLiveData<String>()
@@ -78,8 +73,11 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val ready: LiveData<Boolean>
         get() = _ready
 
+    private var mMinimumLoadableRetryCount = 5
+
     var seq = 0
 
+
     fun addVideoUrl(url: String) {
         if (_videoUrl.value?.isNotEmpty() == true) {
             if (_videoUrl.value!!.last().contains("cctv.cn")) {
@@ -90,8 +88,9 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         } else {
             tv.videoUrl = tv.videoUrl + listOf(url)
         }
+        tv.videoIndex = tv.videoUrl.lastIndex
         _videoUrl.value = tv.videoUrl
-        _videoIndex.value = tv.videoUrl.lastIndex
+        _videoIndex.value = tv.videoIndex
     }
 
     fun firstSource() {
@@ -115,17 +114,23 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _videoIndex.value = videoIndex
     }
 
+    fun setLogo(url: String) {
+        _logo.value = url
+    }
+
     init {
         _id.value = tv.id
         _title.value = tv.title
         _videoUrl.value = tv.videoUrl
-        _videoIndex.value = tv.videoUrl.lastIndex
+        _videoIndex.value = tv.videoIndex
         _logo.value = tv.logo
         _programId.value = tv.programId
         _pid.value = tv.pid
         _sid.value = tv.sid
+        _program.value = mutableListOf()
     }
 
+
     fun getRowPosition(): Int {
         return rowPosition
     }
@@ -154,22 +159,46 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         return tv
     }
 
-    fun addYEPG(p: MutableList<Program>) {
-        _epg.value = p.map { EPG(it.name, it.st.toInt()) }.toMutableList()
-    }
-
-    private fun formatFTime(s: String): Int {
-        val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss")
-        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
-        val date = dateFormat.parse(s.substring(0, 19))
-        if (date != null) {
-            return (date.time / 1000).toInt()
+    fun getProgramOne(): Program? {
+        val programNew =
+            (_program.value?.filter { it.et > getDateTimestamp() })?.toMutableList()
+        if (programNew != null && _program.value != programNew) {
+            _program.value = programNew
         }
-        return 0
+        if (_program.value!!.isEmpty()) {
+            return null
+        }
+        return _program.value?.first()
     }
 
-    fun addFEPG(p: List<FEPG>) {
-        _epg.value = p.map { EPG(it.title, formatFTime(it.event_time)) }.toMutableList()
+    fun addProgram(p: MutableList<Program>) {
+        val timestamp = getDateTimestamp()
+
+        // after now & not empty & different
+        val p1 = (p.filter { it.et > timestamp }).toMutableList()
+        if (p1.isEmpty() || _program.value == p1) {
+            return
+        }
+
+        if (_program.value!!.isEmpty()) {
+            _program.value = p1
+        } else {
+            _program.value =
+                ((_program.value?.filter { it.et > timestamp && it.st < p1.first().st })?.plus(
+                    p1
+                ))?.toMutableList()
+        }
+    }
+
+
+    private var mHeaders: Map<String, String>? = mapOf()
+
+    fun setHeaders(headers: Map<String, String>) {
+        mHeaders = headers
+    }
+
+    fun setMinimumLoadableRetryCount(minimumLoadableRetryCount: Int) {
+        mMinimumLoadableRetryCount = minimumLoadableRetryCount
     }
 
     /**
@@ -178,7 +207,7 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     @OptIn(UnstableApi::class)
     fun buildSource(): HlsMediaSource {
         val httpDataSource = DefaultHttpDataSource.Factory()
-//        mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
+        mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
 
         return HlsMediaSource.Factory(httpDataSource).createMediaSource(
             MediaItem.fromUri(

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

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

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/raw/channels.json

@@ -1,7 +1,8 @@
 [
   {
     "id": 0,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
     "pid": "600001859",
     "sid": "2000210103",
@@ -15,7 +16,8 @@
   },
   {
     "id": 1,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
     "pid": "600001800",
     "sid": "2000203603",
@@ -29,7 +31,8 @@
   },
   {
     "id": 2,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
     "pid": "600001801",
     "sid": "2000203803",
@@ -43,7 +46,8 @@
   },
   {
     "id": 3,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp",
     "pid": "600001814",
     "sid": "2000204803",
@@ -58,7 +62,8 @@
   },
   {
     "id": 4,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp",
     "pid": "600001818",
     "sid": "2000205103",
@@ -72,7 +77,8 @@
   },
   {
     "id": 5,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
     "pid": "600001802",
     "sid": "2013693901",
@@ -86,7 +92,8 @@
   },
   {
     "id": 6,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp",
     "pid": "600004092",
     "sid": "2000510003",
@@ -100,7 +107,8 @@
   },
   {
     "id": 7,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ad51de94426a0ba039e6dd6a8534ea98ecc813a6176bde87b4f18cc34d6d7590.png?imageMogr2/format/webp",
     "pid": "600001803",
     "sid": "2000203903",
@@ -114,21 +122,23 @@
   },
   {
     "id": 8,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp",
     "pid": "600004078",
     "sid": "2000499403",
     "programId": "600004078",
     "needToken": true,
     "mustToken": false,
-    "title": "CCTV9 纪录",
+    "title": "CCTV9 记录",
     "videoUrl": [
       "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226197/index.m3u8"
     ]
   },
   {
     "id": 9,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp",
     "pid": "600001805",
     "sid": "2000203503",
@@ -142,7 +152,8 @@
   },
   {
     "id": 10,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp",
     "pid": "600001806",
     "sid": "2000204103",
@@ -156,7 +167,8 @@
   },
   {
     "id": 11,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp",
     "pid": "600001807",
     "sid": "2000202603",
@@ -170,7 +182,8 @@
   },
   {
     "id": 12,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/266da7b43c03e2312186b4a999e0f060e8f15b10d2cc2c9aa32171819254cf1a.png?imageMogr2/format/webp",
     "pid": "600001811",
     "sid": "2000204603",
@@ -185,7 +198,8 @@
   },
   {
     "id": 13,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp",
     "pid": "600001809",
     "sid": "2000204403",
@@ -199,7 +213,8 @@
   },
   {
     "id": 14,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp",
     "pid": "600001815",
     "sid": "2000205003",
@@ -213,7 +228,8 @@
   },
   {
     "id": 15,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp",
     "pid": "600098637",
     "sid": "2012375003",
@@ -228,7 +244,8 @@
   },
   {
     "id": 16,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp",
     "pid": "600001810",
     "sid": "2000204203",
@@ -242,7 +259,8 @@
   },
   {
     "id": 17,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp",
     "pid": "600001817",
     "sid": "2000204503",
@@ -256,7 +274,8 @@
   },
   {
     "id": 18,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
     "pid": "600002264",
     "sid": "2000266303",
@@ -270,7 +289,8 @@
   },
   {
     "id": 19,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "",
     "pid": "600156816",
     "sid": "2020603421",
@@ -284,7 +304,8 @@
   },
   {
     "id": 20,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4d549e53e6d0f632d5a633d1945280797b153e588f919221a07faa869812cc89.png?imageMogr2/format/webp",
     "pid": "600099658",
     "sid": "2012513603",
@@ -298,7 +319,8 @@
   },
   {
     "id": 21,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a556bd7d93ce65e18f243a8892b5604f4faa994a4897315914216a710a706208.png?imageMogr2/format/webp",
     "pid": "600099655",
     "sid": "2012514403",
@@ -312,7 +334,8 @@
   },
   {
     "id": 22,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/5661bd04fecdb6e899f801147a22ab5d3a475bf2b62e30aec2c0023190ebc9b1.png?imageMogr2/format/webp",
     "pid": "600099620",
     "sid": "2012511203",
@@ -326,7 +349,8 @@
   },
   {
     "id": 23,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bb3c6c9e145d698137f5bb64a582021a01b51344b929003630eb769ea65832a9.png?imageMogr2/format/webp",
     "pid": "600099637",
     "sid": "2012513303",
@@ -340,7 +364,8 @@
   },
   {
     "id": 24,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bbf1d024c5228b8dd128b0e3cb1717d173fab4ee84c3a4c8a57b1a215362ca3b.png?imageMogr2/format/webp",
     "pid": "600099660",
     "sid": "2012514103",
@@ -354,7 +379,8 @@
   },
   {
     "id": 25,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4c6b6a6d3839889f34d33db3c2f80233b26b74d3489b393487635f8704e70796.png?imageMogr2/format/webp",
     "pid": "600099649",
     "sid": "2012513403",
@@ -368,7 +394,8 @@
   },
   {
     "id": 26,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cd1e2bb52b06a991de168733e5ff0f1d85adc8042d40c8f393f723543e5dd08a.png?imageMogr2/format/webp",
     "pid": "600099636",
     "sid": "2012514203",
@@ -382,7 +409,8 @@
   },
   {
     "id": 27,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cdd1b31ede7a5ad049ed53d9a072422f829e72dd062ed2c19e077fdd01699071.png?imageMogr2/format/webp",
     "pid": "600099659",
     "sid": "2012512503",
@@ -396,7 +424,8 @@
   },
   {
     "id": 28,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/fa28955ce8b2539d728bf4c6a13a46ff57ad76eae46627f7bcfb1ed8a613d3fc.png?imageMogr2/format/webp",
     "pid": "600099650",
     "sid": "2012513903",
@@ -410,7 +439,8 @@
   },
   {
     "id": 29,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/14ac5ce40482cacd3d4b37435222bfe86af2b452a2f04ecbfc1d13d76edd7c57.png?imageMogr2/format/webp",
     "pid": "600099653",
     "sid": "2012513803",
@@ -424,7 +454,8 @@
   },
   {
     "id": 30,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/10e14a92478011aa6c3c8562e62127f3b1908e29fcd78e4b2b24b9e6d3ec2fbc.png?imageMogr2/format/webp",
     "pid": "600099652",
     "sid": "2012513703",
@@ -438,7 +469,8 @@
   },
   {
     "id": 31,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/244d72c0eb1615ed7d51c2f5db5a67f306aa3f58c05bc2d34de3aa7e956dc8c9.png?imageMogr2/format/webp",
     "pid": "600099656",
     "sid": "2012514003",
@@ -452,7 +484,8 @@
   },
   {
     "id": 32,
-    "channel": "央视",
+    "videoIndex": 0,
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54a6863656fdfd8f803be193ddf22441c5000a108833889816fd2d8911715ce8.png?imageMogr2/format/webp",
     "pid": "600099651",
     "sid": "2012513503",
@@ -466,7 +499,8 @@
   },
   {
     "id": 33,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp",
     "pid": "600002483",
     "sid": "2000292403",
@@ -480,7 +514,8 @@
   },
   {
     "id": 34,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp",
     "pid": "600002475",
     "sid": "2000296203",
@@ -495,7 +530,8 @@
   },
   {
     "id": 35,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp",
     "pid": "600002508",
     "sid": "2000294503",
@@ -510,7 +546,8 @@
   },
   {
     "id": 36,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ac4ed6058a87c101ae7147ebc38905d0cae047fb73fd277ee5049b84f52bda36.png?imageMogr2/format/webp",
     "pid": "600002505",
     "sid": "2000281303",
@@ -525,7 +562,8 @@
   },
   {
     "id": 37,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp",
     "pid": "600002521",
     "sid": "2000295603",
@@ -540,7 +578,8 @@
   },
   {
     "id": 38,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3c760d0d00463855890e8a1864ea4a6b6dd66b90c29b4ac714a4b17c16519871.png?imageMogr2/format/webp",
     "pid": "600002503",
     "sid": "2000294103",
@@ -555,7 +594,8 @@
   },
   {
     "id": 39,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/22d403f07a7cf5410b3ad3ddb65a11aa229a32475fac213f5344c9f0ec330ca1.png?imageMogr2/format/webp",
     "pid": "600002513",
     "sid": "2000294803",
@@ -569,7 +609,8 @@
   },
   {
     "id": 40,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/28886880a4dc0f06fb7e0a528a1def0591d61a65870e29176ede0cc92033bbfd.png?imageMogr2/format/webp",
     "pid": "600002485",
     "sid": "2000292703",
@@ -583,7 +624,8 @@
   },
   {
     "id": 41,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54b7e97cb816bb223fe05f3fc44da2c7820eb66e8550c19d23100f2c414ecc38.png?imageMogr2/format/webp",
     "pid": "600002509",
     "sid": "2000294203",
@@ -598,7 +640,8 @@
   },
   {
     "id": 42,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/657651f411de2673d1770d9a78b44c1265704f7468cc41d4be7f51d630768494.png?imageMogr2/format/webp",
     "pid": "600002531",
     "sid": "2000297803",
@@ -613,7 +656,8 @@
   },
   {
     "id": 43,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/74925962148a6d31c85808b6cd4e444c2a54bab393d2c5fc85e960b50e22fa86.png?imageMogr2/format/webp",
     "pid": "600002525",
     "sid": "2000296103",
@@ -628,7 +672,8 @@
   },
   {
     "id": 44,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d545becdc81c60197b08c7f47380705e4665ed3fe55efc8b855e486f6e655378.png?imageMogr2/format/webp",
     "pid": "600002493",
     "sid": "2000293403",
@@ -643,7 +688,8 @@
   },
   {
     "id": 45,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4eb45f4781d33d872af027dc01c941559aab55667dd99cc5c22bef7037807b13.png?imageMogr2/format/webp",
     "pid": "600002490",
     "sid": "2000293303",
@@ -658,7 +704,8 @@
   },
   {
     "id": 46,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f4f23633c578beea49a3841d88d3490100f029ee349059fa532869db889872c5.png?imageMogr2/format/webp",
     "pid": "600002309",
     "sid": "2000272103",
@@ -673,7 +720,8 @@
   },
   {
     "id": 47,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d8273ae9be698ce2db21f5b886ecac95a73429593f93713c60ed8c12c38bf0d3.png?imageMogr2/format/webp",
     "pid": "600002498",
     "sid": "2000293903",
@@ -688,7 +736,8 @@
   },
   {
     "id": 48,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a66c836bd98ba3e41a2e9a570d4b9c50dedc6839e9de333e2e78212ad505f37e.png?imageMogr2/format/webp",
     "pid": "600002520",
     "sid": "2000295503",
@@ -703,7 +752,8 @@
   },
   {
     "id": 49,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f35fa04b51b1ee4984b03578b65403570868ebca03c6c01e11b097f999a58d9b.png?imageMogr2/format/webp",
     "pid": "600002532",
     "sid": "2000298003",
@@ -718,7 +768,8 @@
   },
   {
     "id": 50,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp",
     "pid": "600002481",
     "sid": "2000292203",
@@ -733,7 +784,8 @@
   },
   {
     "id": 51,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
     "pid": "600002516",
     "sid": "2000295003",
@@ -748,7 +800,8 @@
   },
   {
     "id": 52,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp",
     "pid": "600002484",
     "sid": "2000292503",
@@ -763,7 +816,8 @@
   },
   {
     "id": 53,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp",
     "pid": "600002506",
     "sid": "2000291503",
@@ -778,7 +832,8 @@
   },
   {
     "id": 54,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "",
     "pid": "600152137",
     "sid": "2019927003",
@@ -792,7 +847,8 @@
   },
   {
     "id": 55,
-    "channel": "地方",
+    "videoIndex": 0,
+    "channel": "地方频道",
     "logo": "",
     "pid": "600152138",
     "sid": "2019927403",
@@ -806,7 +862,8 @@
   },
   {
     "id": 56,
-    "channel": "国际",
+    "videoIndex": 0,
+    "channel": "国际频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp",
     "pid": "600014550",
     "sid": "2001656803",
@@ -820,7 +877,8 @@
   },
   {
     "id": 57,
-    "channel": "国际",
+    "videoIndex": 0,
+    "channel": "国际频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp",
     "pid": "600084704",
     "sid": "2010153503",
@@ -834,7 +892,8 @@
   },
   {
     "id": 58,
-    "channel": "国际",
+    "videoIndex": 0,
+    "channel": "国际频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp",
     "pid": "600084758",
     "sid": "2010152603",
@@ -848,7 +907,8 @@
   },
   {
     "id": 59,
-    "channel": "国际",
+    "videoIndex": 0,
+    "channel": "国际频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp",
     "pid": "600084782",
     "sid": "2010155203",
@@ -862,7 +922,8 @@
   },
   {
     "id": 60,
-    "channel": "国际",
+    "videoIndex": 0,
+    "channel": "国际频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp",
     "pid": "600084744",
     "sid": "2010152503",
@@ -877,7 +938,8 @@
   },
   {
     "id": 61,
-    "channel": "国际",
+    "videoIndex": 0,
+    "channel": "国际频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202309/74d3ac436a7e374879578de1d87a941fbf566d39d5632b027c5097891ed32bd5.png?imageMogr2/format/webp",
     "pid": "600084781",
     "sid": "2010155403",

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_version_url">https://fastly.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@main/version.txt</string>
-    <string name="server_url">https://fastly.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@main/channels.json</string>
-</resources>
+    <string name="server_url">http://localhost:8080</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>

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.3.0' apply false
-    id 'com.android.library' version '8.3.0' apply false
+    id 'com.android.application' version '8.2.2' apply false
+    id 'com.android.library' version '8.2.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Dec 01 13:53:24 HKT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME