number selection

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,83 +0,0 @@
-name: Bug 反馈
-description: 反馈一个 Bug
-labels: [ "bug" ]
-title: "[BUG] "
-body:
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: 检查清单
-      description: 确保我们的错误报告表单适合您。
-      options:
-        - label: 之前没有人提交过类似或相同的 bug report。
-          required: true
-        - label: 我正在使用本软件的最新版本。
-          required: true
-  - type: dropdown
-    id: version
-    attributes:
-      label: my-ty 版本
-      description: 请选择正在使用的版本
-      options:
-        - 最新稳定版
-        - 最新 CI 版
-    validations:
-      required: true
-  - type: textarea
-    id: bug
-    attributes:
-      label: Bug 描述
-      description: 请描述 bug 详情
-      placeholder: |
-        e.g. Crashed when generating snapshot.
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: 预期行为
-      description: 你预期会发生什么？
-      placeholder: |
-        e.g. A New snapshot!
-    validations:
-      required: true
-  - type: textarea
-    id: actual
-    attributes:
-      label: 实际行为
-      description: 反而发生了什么？
-      placeholder: |
-        e.g. Crashed.
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: 复现步骤
-      description: 如何复现这个 bug。
-      placeholder: |
-        1. Open the app
-        2. Crashed
-
-        What an app.
-  - type: input
-    id: ui
-    attributes:
-      label: UI / OS
-      description: 你的电视系统 UI 或 OS 或 品牌
-      placeholder: TCL / XIAOMI / PHONE / etc.
-    validations:
-      required: true
-  - type: input
-    id: android
-    attributes:
-      label: Android 版本
-      description: 你的 Android 版本
-      placeholder: "12"
-    validations:
-      required: true
-  - type: textarea
-    id: additional
-    attributes:
-      label: 额外信息
-      description: 任何你觉得值得说的。

.github/ISSUE_TEMPLATE/fr.yml

@@ -1,36 +0,0 @@
-name: 功能(新频道)请求
-description: 提出一个建议
-labels: [ "enhancement" ]
-title: "[FR] "
-body:
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: 检查清单
-      description: 确保我们的错误报告表单适合您。
-      options:
-        - label: 之前没有人提交过类似或相同的功能请求。
-          required: true
-        - label: 这个建议不会背离 LibChecker 的初衷。
-          required: true
-  - type: textarea
-    id: propose
-    attributes:
-      label: 改进目的
-      description: 改进有什么用
-      placeholder: |
-        Show your idea here.
-    validations:
-      required: true
-  - type: textarea
-    id: solution
-    attributes:
-      label: 解决方案
-      description: 你会怎么完成这个改进？
-      placeholder: |
-        How to do it on your opinion? Or left this blank
-  - type: textarea
-    id: addition
-    attributes:
-      label: 额外信息
-      description: 任何你觉得值得说的。

README.md

@@ -1,6 +1,6 @@
 # 我的电视
 
-电视直播软件，安装即可使用
+安卓电视直播软件，内置直播源
 
 ## 使用
 
@@ -14,52 +14,7 @@
 
 ## 更新日志
 
-### v1.5.8（通用版）
-
-* 修复央视6画质差的问题
-* 增加兵团卫视
-* 播放失败重试
-
-### v1.5.6（通用版）
-
-* 解决部分设备系统时间不对导致播放失败的问题
-
-### v1.5.2（通用版）
-
-* 修复APP恢复后频道号、频道列表不自动消失的问题
-
-### v1.5.1（高版本专用）
-
-* 性能优化
-
-### v1.5.0（通用版）
-
-* 修复部分情况下APP切换后无法继续播放的问题
-
-### v1.4.9（高版本专用）
-
-* 同步v1.4.8
-
-### v1.4.8（通用版）
-
-* 频道号从1开始，CCTV5+为18
-* 提高CCTV6清晰度
-* 增加天津卫视、新疆卫视
-
-### v1.4.7（高版本专用）
-
-* 修复部分用户CCTV13播放过程中卡住的问题
-* 调整CCTV的频道顺序
-
-### v1.4.6（通用版）
-
-* 10以下频道不再需要先按0
-
-### v1.4.5（高版本专用）
-
-* 数字选台配置
-
-### v1.4.4（通用版）
+### v1.4.4（安卓4专用）
 
 * 优化图标显示
 * 增加换台反转
@@ -104,23 +59,6 @@
 adb install my-tv.apk
 ```
 
-## TODO
-
-* 音量不同
-* 大湾区卫视、广东4k超高清、广东珠江
-* CETV教育频道
-* CHC高清三个电影频道
-* 地方频道
-* 收藏夹
-* 自定义源
-* 凤凰卫视、凤凰资讯台
-* 海外
-* 1.5.0 无法安装，1.5.1 可以安装
-* 获取系统时间
-* 选中的图标比例能否相差更大
-* 自动重连
-* 节目增加预告
-
 ## 赞赏
 
 ![image](./screenshots/appreciate.jpeg)

app/build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 android {
     namespace 'com.lizongying.mytv'
-    compileSdk 34
+    compileSdk 33
 
     viewBinding {
         enabled = true
@@ -90,7 +90,7 @@ static def VersionName() {
 }
 
 dependencies {
-    def media3_version = "1.2.1"
+    def media3_version = "1.1.1"
 
     implementation "androidx.media3:media3-ui:$media3_version"
 
@@ -101,7 +101,7 @@ dependencies {
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
 
     // 21:2.9.0 17:2.6.4
-    def retrofit2_version = "2.9.0"
+    def retrofit2_version = "2.6.4"
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
     implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
@@ -113,8 +113,4 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC")
-
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.3'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.13.3'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.13.3'
 }

app/src/main/AndroidManifest.xml

@@ -7,22 +7,19 @@
         android:name="android.software.leanback"
         android:required="true" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <application
         android:allowBackup="true"
-        android:largeHeap="true"
         android:icon="@drawable/logo"
-        android:logo="@drawable/logo"
-        android:banner="@drawable/banner"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:networkSecurityConfig="@xml/network"
-        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.MyTV">
         <activity
             android:keepScreenOn="true"
             android:name=".MainActivity"
+            android:banner="@drawable/banner"
             android:exported="true"
+            android:icon="@drawable/logo"
+            android:logo="@drawable/logo"
             android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -30,13 +27,5 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <receiver
-            android:name=".BootReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
     </application>
 </manifest>

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

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

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

@@ -31,31 +31,23 @@ class CardPresenter(
         cardView.setMainImageDimensions(CARD_WIDTH, CARD_HEIGHT)
         cardView.tag = tvViewModel.videoUrl.value
 
-        when (tvViewModel.title.value) {
-            "CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.cctv8k)
-                .centerInside()
-                .into(cardView.mainImageView)
+        if (tvViewModel.logo.value != null) {
+            if (tvViewModel.title.value == "CCTV8K 超高清") {
+                Glide.with(viewHolder.view.context)
+                    .load(R.drawable.cctv8k)
+                    .centerInside()
+                    .into(cardView.mainImageView)
+            } else {
+                Glide.with(viewHolder.view.context)
+                    .load(tvViewModel.logo.value)
+                    .centerInside()
+                    .into(cardView.mainImageView)
+            }
 
-            "天津卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.tianjin)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "新疆卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.xinjiang)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            else -> Glide.with(viewHolder.view.context)
-                .load(tvViewModel.logo.value)
-                .centerInside()
-                .into(cardView.mainImageView)
+            cardView.setBackgroundColor(Color.WHITE)
+            cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
         }
 
-        cardView.setBackgroundColor(Color.WHITE)
-        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
-
         tvViewModel.program.observe(owner) { _ ->
             val program = tvViewModel.getProgramOne()
             if (program != null) {

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

@@ -2,6 +2,7 @@ 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
@@ -15,59 +16,49 @@ class ChannelFragment : Fragment() {
 
     private val handler = Handler()
     private val delay: Long = 3000
-    private var channel = 0
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
         _binding = ChannelBinding.inflate(inflater, container, false)
-        _binding!!.root.visibility = View.GONE
         (activity as MainActivity).fragmentReady()
         return binding.root
     }
 
     fun show(tvViewModel: TVViewModel) {
-        handler.removeCallbacks(hideRunnable)
-        handler.removeCallbacks(playRunnable)
-        binding.channelContent.text = (tvViewModel.id.value?.plus(1)).toString()
+        binding.channelContent.text = tvViewModel.id.value.toString()
+        handler.removeCallbacks(removeRunnable)
         view?.visibility = View.VISIBLE
-        handler.postDelayed(hideRunnable, delay)
+        handler.postDelayed(removeRunnable, delay)
     }
 
     fun show(channel: String) {
-        this.channel = "${binding.channelContent.text}$channel".toInt()
-        handler.removeCallbacks(hideRunnable)
-        handler.removeCallbacks(playRunnable)
         if (binding.channelContent.text == "") {
             binding.channelContent.text = channel
+            handler.removeCallbacks(removeRunnable)
             view?.visibility = View.VISIBLE
-            handler.postDelayed(playRunnable, delay)
+            handler.postDelayed(removeRunnable, delay)
         } else {
-            handler.postDelayed(playRunnable, 0)
+            val ch = "${binding.channelContent.text}$channel".toInt()
+            Log.i(TAG, "channel $ch")
+            (activity as MainActivity).play(ch)
+            binding.channelContent.text = ""
+            view?.visibility = View.GONE
         }
     }
 
     override fun onResume() {
         super.onResume()
-        if (view?.visibility == View.VISIBLE) {
-            handler.postDelayed(hideRunnable, delay)
-        }
+        handler.postDelayed(removeRunnable, delay)
     }
 
     override fun onPause() {
         super.onPause()
-        handler.removeCallbacks(hideRunnable)
-        handler.removeCallbacks(playRunnable)
+        handler.removeCallbacks(removeRunnable)
     }
 
-    private val hideRunnable = Runnable {
-        binding.channelContent.text = ""
-        view?.visibility = View.GONE
-    }
-
-    private val playRunnable = Runnable {
-        (activity as MainActivity).play(channel - 1)
+    private val removeRunnable = Runnable {
         binding.channelContent.text = ""
         view?.visibility = View.GONE
     }

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

@@ -2,6 +2,7 @@ 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
@@ -22,32 +23,25 @@ class InfoFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         _binding = InfoBinding.inflate(inflater, container, false)
-        _binding!!.root.visibility = View.GONE
         (activity as MainActivity).fragmentReady()
         return binding.root
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        // Use a Handler to delay the fragment transaction
+        handler.postDelayed(removeRunnable, delay)
+    }
+
     fun show(tvViewModel: TVViewModel) {
         binding.textView.text = tvViewModel.title.value
-
-        when (tvViewModel.title.value) {
-            "CCTV8K 超高清" -> Glide.with(this)
+        if (tvViewModel.title.value == "CCTV8K 超高清") {
+            Glide.with(this)
                 .load(R.drawable.cctv8k)
                 .into(binding.infoLogo)
-
-            "天津卫视" -> 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)
+        } else {
+            Glide.with(this)
                 .load(tvViewModel.logo.value)
                 .into(binding.infoLogo)
         }
@@ -62,13 +56,10 @@ class InfoFragment : Fragment() {
         handler.postDelayed(removeRunnable, delay)
     }
 
-    override fun onResume() {
-        super.onResume()
-        handler.postDelayed(removeRunnable, delay)
-    }
-
     override fun onPause() {
         super.onPause()
+        Log.i(TAG, "onPause")
+        // Cancel the delayed task when the fragment is paused
         handler.removeCallbacks(removeRunnable)
     }
 

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

@@ -18,50 +18,32 @@ 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() {
 
     var playerFragment = PlayerFragment()
-    private val mainFragment = MainFragment()
+    private val mainFragment = MainFragment2()
     private val infoFragment = InfoFragment()
     private val channelFragment = ChannelFragment()
-    private lateinit var settingFragment: SettingFragment
 
     private var doubleBackToExitPressedOnce = false
 
     private lateinit var gestureDetector: GestureDetector
 
     private val handler = Handler()
-    private val delayHideMain: Long = 5000
-    private val delayHideSetting: Long = 10000
+    private val delay: Long = 4000
+    private val delayHideHelp: Long = 10000
 
-    lateinit var sharedPref: SharedPreferences
+    private lateinit var sharedPref: SharedPreferences
     private var channelReversal = false
-    private var channelNum = true
-    private var bootStartup = true
 
     private var versionName = ""
-
-    init {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
-
-            utilsJob.start()
-
-            utilsJob.await()
-        }
-    }
+    private lateinit var dialogFragment: MyDialogFragment
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
@@ -75,39 +57,24 @@ class MainActivity : FragmentActivity() {
                 .add(R.id.main_browse_fragment, infoFragment)
                 .add(R.id.main_browse_fragment, channelFragment)
                 .add(R.id.main_browse_fragment, mainFragment)
+                .hide(infoFragment)
+                .hide(channelFragment)
                 .hide(mainFragment)
                 .commit()
+            mainFragment.view?.requestFocus()
         }
         gestureDetector = GestureDetector(this, GestureListener())
 
         sharedPref = getPreferences(Context.MODE_PRIVATE)
-        channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, channelReversal)
-        channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
-        bootStartup = sharedPref.getBoolean(BOOT_STARTUP, bootStartup)
+        channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, false)
 
         versionName = getPackageInfo().versionName
-        settingFragment = SettingFragment(versionName, channelReversal, channelNum, bootStartup)
+        dialogFragment = MyDialogFragment(versionName, channelReversal)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
         infoFragment.show(tvViewModel)
-        if (channelNum) {
-            channelFragment.show(tvViewModel)
-        }
-    }
-
-    private fun showChannel(channel: String) {
-        if (!mainFragment.isHidden) {
-            return
-        }
-
-        if (settingFragment.isVisible) {
-            return
-        }
-
-        if (channelNum) {
-            channelFragment.show(channel)
-        }
+        channelFragment.show(tvViewModel)
     }
 
     fun play(tvViewModel: TVViewModel) {
@@ -139,6 +106,7 @@ class MainActivity : FragmentActivity() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
+            mainFragment.setPosition()
             transaction.show(mainFragment)
             keepRunnable()
         } else {
@@ -149,11 +117,11 @@ class MainActivity : FragmentActivity() {
     }
 
     fun keepRunnable() {
-        handler.removeCallbacks(hideMain)
-        handler.postDelayed(hideMain, delayHideMain)
+        handler.removeCallbacks(hideRunnable)
+        handler.postDelayed(hideRunnable, delay)
     }
 
-    private val hideMain = Runnable {
+    private val hideRunnable = Runnable {
         if (!mainFragment.isHidden) {
             supportFragmentManager.beginTransaction().hide(mainFragment).commit()
         }
@@ -191,7 +159,7 @@ class MainActivity : FragmentActivity() {
         }
 
         override fun onFling(
-            e1: MotionEvent?,
+            e1: MotionEvent,
             e2: MotionEvent,
             velocityX: Float,
             velocityY: Float
@@ -231,41 +199,25 @@ class MainActivity : FragmentActivity() {
         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() {
+    private fun showHelp() {
         if (!mainFragment.isHidden) {
             return
         }
 
-        Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
-        if (!settingFragment.isVisible) {
-            settingFragment.show(supportFragmentManager, "setting")
-            handler.removeCallbacks(hideSetting)
-            handler.postDelayed(hideSetting, delayHideSetting)
+        Log.i(TAG, "dialogFragment ${dialogFragment.isVisible}")
+        if (!dialogFragment.isVisible) {
+            dialogFragment.show(supportFragmentManager, "settings_dialog")
+            handler.removeCallbacks(hideHelp)
+            handler.postDelayed(hideHelp, delayHideHelp)
         } else {
-            handler.removeCallbacks(hideSetting)
-            settingFragment.dismiss()
+            handler.removeCallbacks(hideHelp)
+            dialogFragment.dismiss()
         }
     }
 
-    private val hideSetting = Runnable {
-        if (settingFragment.isVisible) {
-            settingFragment.dismiss()
+    private val hideHelp = Runnable {
+        if (dialogFragment.isVisible) {
+            dialogFragment.dismiss()
         }
     }
 
@@ -321,6 +273,18 @@ class MainActivity : FragmentActivity() {
         }, 2000)
     }
 
+    private fun showChannel(channel: String) {
+        if (!mainFragment.isHidden) {
+            return
+        }
+
+        if (dialogFragment.isVisible) {
+            return
+        }
+
+        channelFragment.show(channel)
+    }
+
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         when (keyCode) {
             KeyEvent.KEYCODE_0 -> {
@@ -384,27 +348,27 @@ class MainActivity : FragmentActivity() {
             }
 
             KeyEvent.KEYCODE_BOOKMARK -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
             KeyEvent.KEYCODE_UNKNOWN -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
             KeyEvent.KEYCODE_HELP -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
             KeyEvent.KEYCODE_SETTINGS -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
             KeyEvent.KEYCODE_MENU -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
@@ -502,7 +466,7 @@ class MainActivity : FragmentActivity() {
 
     private fun hashSignature(signature: Signature): String {
         return try {
-            val md = MessageDigest.getInstance("MD5")
+            val md = MessageDigest.getInstance("SHA-256")
             md.update(signature.toByteArray())
             val digest = md.digest()
             digest.let { it -> it.joinToString("") { "%02x".format(it) } }
@@ -512,29 +476,8 @@ class MainActivity : FragmentActivity() {
         }
     }
 
-    override fun onStart() {
-        Log.i(TAG, "onStart")
-        super.onStart()
-    }
-
-    override fun onResume() {
-        Log.i(TAG, "onResume")
-        super.onResume()
-        if (!mainFragment.isHidden){
-            handler.postDelayed(hideMain, delayHideMain)
-        }
-    }
-
-    override fun onPause() {
-        Log.i(TAG, "onPause")
-        super.onPause()
-        handler.removeCallbacks(hideMain)
-    }
-
     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,5 +1,6 @@
 package com.lizongying.mytv
 
+import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.os.Handler
@@ -24,19 +25,19 @@ import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class MainFragment : BrowseSupportFragment() {
 
-    private var itemPosition = 0
+class MainFragment : BrowseSupportFragment() {
+    var itemPosition: Int = 0
+
+    private var request: Request = Request()
 
     private var rowsAdapter: ArrayObjectAdapter? = null
 
-    private var request = Request()
-
     var tvListViewModel = TVListViewModel()
 
-    private lateinit var sharedPref: SharedPreferences
+    private var sharedPref: SharedPreferences? = null
 
-    private var lastVideoUrl = ""
+    private var lastVideoUrl: String = ""
 
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
@@ -44,21 +45,16 @@ class MainFragment : BrowseSupportFragment() {
     private var ready = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
         headersState = HEADERS_DISABLED
     }
 
-    override fun onStart() {
-        Log.i(TAG, "onStart")
-        super.onStart()
-    }
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
         activity?.let { request.initYSP(it) }
-        sharedPref = (activity as? MainActivity)?.sharedPref!!
+
+        sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
 
         loadRows()
 
@@ -67,7 +63,7 @@ class MainFragment : BrowseSupportFragment() {
         mUpdateProgramRunnable = UpdateProgramRunnable()
         handler.post(mUpdateProgramRunnable)
 
-        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+        tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
             tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
                 if (tvViewModel.errInfo.value != null
                     && tvViewModel.id.value == itemPosition
@@ -89,8 +85,9 @@ class MainFragment : BrowseSupportFragment() {
             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")
+                        Log.i(TAG, "request $title ${tvViewModel.pid.value}")
                         lifecycleScope.launch(Dispatchers.IO) {
                             tvViewModel.let { request.fetchData(it) }
                         }
@@ -103,6 +100,7 @@ class MainFragment : BrowseSupportFragment() {
                         if (check(tvViewModel)) {
                             (activity as? MainActivity)?.play(tvViewModel)
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+
                             setSelectedPosition(
                                 tvViewModel.getRowPosition(), true,
                                 SelectItemViewHolderTask(tvViewModel.getItemPosition())
@@ -116,6 +114,58 @@ class MainFragment : BrowseSupportFragment() {
         fragmentReady()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        handler.removeCallbacks(mUpdateProgramRunnable)
+        with(sharedPref!!.edit()) {
+            putInt("position", itemPosition)
+            apply()
+        }
+    }
+
+    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 (timestamp - tvViewModel.program.value!!.last().et < 600) {
+                    tvViewModel.programUpdateTime = timestamp
+                    request.fetchProgram(tvViewModel)
+                }
+            }
+        }
+    }
+
+    inner class UpdateProgramRunnable : Runnable {
+        override fun run() {
+            tvListViewModel.getTVListViewModel().value?.filter { it.programId.value != null }
+                ?.forEach { tvViewModel ->
+                    updateProgram(
+                        tvViewModel
+                    )
+                }
+            handler.postDelayed(this, 60000)
+        }
+    }
+
+    fun check(tvViewModel: TVViewModel): Boolean {
+        val title = tvViewModel.title.value
+        val videoUrl = tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
+        if (videoUrl == null || videoUrl == "") {
+            Log.e(TAG, "$title videoUrl is empty")
+            return false
+        }
+
+        if (videoUrl == lastVideoUrl) {
+            Log.e(TAG, "$title videoUrl is duplication")
+            return false
+        }
+
+        return true
+    }
+
     fun toLastPosition() {
         setSelectedPosition(
             selectedPosition, false,
@@ -156,13 +206,51 @@ class MainFragment : BrowseSupportFragment() {
 
         adapter = rowsAdapter
 
-        itemPosition = sharedPref.getInt(POSITION, 0)
+        itemPosition = sharedPref?.getInt("position", 0)!!
         if (itemPosition >= tvListViewModel.size()) {
             itemPosition = 0
         }
         tvListViewModel.setItemPosition(itemPosition)
     }
 
+    fun fragmentReady() {
+        ready++
+        Log.i(TAG, "ready $ready")
+        if (ready == 3) {
+//            request.fetchPage()
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
+
+            (activity as? MainActivity)?.switchMainFragment()
+        }
+    }
+
+    fun prev() {
+        view?.post {
+            itemPosition--
+            if (itemPosition == -1) {
+                itemPosition = tvListViewModel.size() - 1
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
+        }
+    }
+
+    fun next() {
+        view?.post {
+            itemPosition++
+            if (itemPosition == tvListViewModel.size()) {
+                itemPosition = 0
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
+        }
+    }
+
     fun prevSource() {
         view?.post {
             val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
@@ -209,7 +297,9 @@ class MainFragment : BrowseSupportFragment() {
                 if (itemPosition != item.id.value!!) {
                     itemPosition = item.id.value!!
                     tvListViewModel.setItemPosition(itemPosition)
-                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
+
+                    val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+                    tvViewModel?.changed()
                 }
                 (activity as? MainActivity)?.switchMainFragment()
             }
@@ -228,115 +318,12 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
-    fun check(tvViewModel: TVViewModel): Boolean {
-        val title = tvViewModel.title.value
-        val videoUrl = tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
-        if (videoUrl == null || videoUrl == "") {
-            Log.e(TAG, "$title videoUrl is empty")
-            return false
-        }
-
-        if (videoUrl == lastVideoUrl) {
-            Log.e(TAG, "$title videoUrl is duplication")
-            return false
-        }
-
-        return true
-    }
-
-    fun fragmentReady() {
-        ready++
-        Log.i(TAG, "ready $ready")
-        if (ready == 4) {
-//            request.fetchPage()
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-    }
-
-    fun play(itemPosition: Int) {
-        view?.post {
-            if (itemPosition > -1 && itemPosition < tvListViewModel.size()) {
-                this.itemPosition = itemPosition
-                tvListViewModel.setItemPosition(itemPosition)
-                tvListViewModel.getTVViewModel(itemPosition)?.changed()
-            } else {
-                Toast.makeText(context, "频道不存在", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    fun prev() {
-        view?.post {
-            itemPosition--
-            if (itemPosition == -1) {
-                itemPosition = tvListViewModel.size() - 1
-            }
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-    }
-
-    fun next() {
-        view?.post {
-            itemPosition++
-            if (itemPosition == tvListViewModel.size()) {
-                itemPosition = 0
-            }
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-    }
-
-    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)
-        }
-    }
-
     override fun onResume() {
-        Log.i(TAG, "onResume")
         super.onResume()
-    }
-
-    override fun onStop() {
-        Log.i(TAG, "onStop")
-        super.onStop()
-        with(sharedPref.edit()) {
-            putInt(POSITION, itemPosition)
-            apply()
-        }
-        Log.i(TAG, "$POSITION saved")
-    }
-
-    override fun onDestroy() {
-        Log.i(TAG, "onDestroy")
-        super.onDestroy()
-        handler.removeCallbacks(mUpdateProgramRunnable)
+        view!!.requestFocus()
     }
 
     companion object {
         private const val TAG = "MainFragment"
-        private const val POSITION = "position"
     }
 }

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

@@ -0,0 +1,313 @@
+package com.lizongying.mytv
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.lizongying.mytv.Utils.dpToPx
+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 MainFragment2 : Fragment(), CardAdapter.ItemListener {
+
+    private var itemPosition = 0
+
+    private var rowList: MutableList<View> = mutableListOf()
+
+    private var _binding: ShowBinding? = null
+    private val binding get() = _binding!!
+
+    private var request: Request = Request()
+
+    var tvListViewModel = TVListViewModel()
+
+    private var sharedPref: SharedPreferences? = null
+
+    private var lastVideoUrl: String = ""
+
+    private val handler = Handler(Looper.getMainLooper())
+    private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
+
+    private var ready = 0
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = ShowBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+
+        activity?.let { request.initYSP(it) }
+        sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
+
+        view?.post {
+            val content = binding.content
+
+            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(viewLifecycleOwner, tvListViewModelCurrent)
+                rowList.add(itemBinding.rowItems)
+
+                adapter.setItemListener(this)
+
+                itemBinding.rowHeader.text = k
+                itemBinding.rowItems.adapter = adapter
+                itemBinding.rowItems.layoutManager =
+                    LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+
+                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
+                layoutParams.topMargin = dpToPx(11F)
+                itemBinding.row.layoutParams = layoutParams
+                content.addView(itemBinding.row)
+
+                idx++
+            }
+
+            mUpdateProgramRunnable = UpdateProgramRunnable()
+            handler.post(mUpdateProgramRunnable)
+
+            itemPosition = sharedPref?.getInt(POSITION, 0)!!
+            if (itemPosition >= tvListViewModel.size()) {
+                itemPosition = 0
+            }
+            setPosition()
+            tvListViewModel.setItemPosition(itemPosition)
+            tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
+                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                    if (tvViewModel.errInfo.value != null
+                        && tvViewModel.id.value == itemPosition
+                    ) {
+                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
+                            .show()
+                    }
+                }
+                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
+
+                    // not first time && channel not change
+                    if (tvViewModel.ready.value != null
+                        && tvViewModel.id.value == itemPosition
+                        && check(tvViewModel)
+                    ) {
+                        Log.i(TAG, "ready ${tvViewModel.title.value}")
+                        (activity as? MainActivity)?.play(tvViewModel)
+                    }
+                }
+                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
+                    if (tvViewModel.change.value != null) {
+                        val title = tvViewModel.title.value
+                        Log.i(TAG, "switch $title")
+                        if (tvViewModel.pid.value != "") {
+                            Log.i(TAG, "request $title ${tvViewModel.pid.value}")
+                            lifecycleScope.launch(Dispatchers.IO) {
+                                tvViewModel.let { request.fetchData(it) }
+                            }
+                            (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                            setPosition(
+                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                            )
+                        } else {
+                            if (check(tvViewModel)) {
+                                (activity as? MainActivity)?.play(tvViewModel)
+                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                                setPosition(
+                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+
+            fragmentReady()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
+        if (hasFocus) {
+            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
+            (activity as MainActivity).keepRunnable()
+        }
+    }
+
+    override fun onItemClicked(tvViewModel: TVViewModel) {
+        if (this.isHidden) {
+            (activity as? MainActivity)?.switchMainFragment()
+            return
+        }
+
+        if (itemPosition != tvViewModel.id.value!!) {
+            itemPosition = tvViewModel.id.value!!
+            tvListViewModel.setItemPosition(itemPosition)
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+        }
+        (activity as? MainActivity)?.switchMainFragment()
+    }
+
+    fun setPosition() {
+        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+        rowList[tvViewModel!!.getRowPosition()].post {
+            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
+                tvViewModel.getItemPosition()
+            )?.requestFocus()
+        }
+    }
+
+    fun setPosition(rowPosition: Int, itemPosition: Int) {
+        rowList[rowPosition].post {
+            ((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
+                itemPosition
+            )?.requestFocus()
+        }
+    }
+
+    fun check(tvViewModel: TVViewModel): Boolean {
+        val title = tvViewModel.title.value
+        val videoUrl = tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
+        if (videoUrl == null || videoUrl == "") {
+            Log.e(TAG, "$title videoUrl is empty")
+            return false
+        }
+
+        if (videoUrl == lastVideoUrl) {
+            Log.e(TAG, "$title videoUrl is duplication")
+            return false
+        }
+
+        return true
+    }
+
+    fun fragmentReady() {
+        ready++
+        Log.i(TAG, "ready $ready")
+        if (ready == 4) {
+//            request.fetchPage()
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+        }
+    }
+
+    fun play(itemPosition: Int) {
+        view?.post {
+            if (itemPosition < tvListViewModel.size()) {
+                this.itemPosition = itemPosition
+                tvListViewModel.setItemPosition(itemPosition)
+                tvListViewModel.getTVViewModel(itemPosition)?.changed()
+            }
+        }
+    }
+
+    fun prev() {
+        view?.post {
+            itemPosition--
+            if (itemPosition == -1) {
+                itemPosition = tvListViewModel.size() - 1
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+        }
+    }
+
+    fun next() {
+        view?.post {
+            itemPosition++
+            if (itemPosition == tvListViewModel.size()) {
+                itemPosition = 0
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+        }
+    }
+
+    fun updateProgram(tvViewModel: TVViewModel) {
+        val timestamp = Utils.getDateTimestamp()
+        if (timestamp - tvViewModel.programUpdateTime > 60) {
+            if (tvViewModel.program.value!!.isEmpty()) {
+                tvViewModel.programUpdateTime = timestamp
+                request.fetchProgram(tvViewModel)
+            } else {
+                if (timestamp - tvViewModel.program.value!!.last().et < 600) {
+                    tvViewModel.programUpdateTime = timestamp
+                    request.fetchProgram(tvViewModel)
+                }
+            }
+        }
+    }
+
+    inner class UpdateProgramRunnable : Runnable {
+        override fun run() {
+            tvListViewModel.getTVListViewModel().value?.filter { it.programId.value != null }
+                ?.forEach { tvViewModel ->
+                    updateProgram(
+                        tvViewModel
+                    )
+                }
+            handler.postDelayed(this, 60000)
+        }
+    }
+
+    override fun onStop() {
+        Log.i(TAG, "onStop")
+        super.onStop()
+        with(sharedPref!!.edit()) {
+            putInt(POSITION, itemPosition)
+            apply()
+        }
+        Log.i(TAG, "POSITION saved")
+    }
+
+    override fun onDestroy() {
+        Log.i(TAG, "onDestroy")
+        super.onDestroy()
+        handler.removeCallbacks(mUpdateProgramRunnable)
+    }
+
+    override fun onDestroyView() {
+        Log.i(TAG, "onDestroyView")
+        super.onDestroyView()
+        _binding = null
+    }
+
+    override fun onResume() {
+        super.onResume()
+        view!!.requestFocus()
+    }
+
+    companion object {
+        private const val TAG = "MainFragment"
+        private const val POSITION = "position"
+    }
+}

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

@@ -8,11 +8,7 @@ import androidx.fragment.app.DialogFragment
 import com.lizongying.mytv.databinding.DialogBinding
 
 
-class SettingFragment(private val versionName: String,
-                      private val channelReversal: Boolean,
-                      private val channelNum: Boolean,
-                      private val bootStartup: Boolean,
-    ) :
+class MyDialogFragment(private val versionName: String, private val channelReversal: Boolean) :
     DialogFragment() {
 
     private var _binding: DialogBinding? = null
@@ -32,24 +28,12 @@ class SettingFragment(private val versionName: String,
         _binding?.version?.text =
             "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
 
-        val switchChannelReversal = _binding?.switchChannelReversal
-        switchChannelReversal?.isChecked = channelReversal
-        switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
+        val switchView = _binding?.switchView
+        switchView?.isChecked = channelReversal
+        switchView?.setOnCheckedChangeListener { _, isChecked ->
             (activity as MainActivity).saveChannelReversal(isChecked)
         }
 
-        val switchChannelNum = _binding?.switchChannelNum
-        switchChannelNum?.isChecked = channelNum
-        switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
-            (activity as MainActivity).saveChannelNum(isChecked)
-        }
-
-        val switchBootStartup = _binding?.switchBootStartup
-        switchBootStartup?.isChecked = bootStartup
-        switchBootStartup?.setOnCheckedChangeListener { _, isChecked ->
-            (activity as MainActivity).saveBootStartup(isChecked)
-        }
-
         return binding.root
     }
 
@@ -59,7 +43,7 @@ class SettingFragment(private val versionName: String,
     }
 
     companion object {
-        const val TAG = "SettingFragment"
+        const val TAG = "MyDialogFragment"
     }
 }
 

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

@@ -3,8 +3,6 @@ package com.lizongying.mytv
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
-import android.view.SurfaceHolder
-import android.view.SurfaceView
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
@@ -17,39 +15,24 @@ import androidx.media3.common.VideoSize
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.PlayerView
-import com.google.android.exoplayer2.SimpleExoPlayer
 import com.lizongying.mytv.databinding.PlayerBinding
 import com.lizongying.mytv.models.TVViewModel
 
 
-class PlayerFragment : Fragment(), SurfaceHolder.Callback {
+class PlayerFragment : Fragment() {
 
     private var _binding: PlayerBinding? = null
     private var playerView: PlayerView? = null
     private var tvViewModel: TVViewModel? = null
     private val aspectRatio = 16f / 9f
 
-
-    private lateinit var surfaceView: SurfaceView
-    private lateinit var surfaceHolder: SurfaceHolder
-    private var exoPlayer: SimpleExoPlayer? = null
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
         _binding = PlayerBinding.inflate(inflater, container, false)
-
-        if (Utils.isTmallDevice()) {
-            _binding!!.playerView.visibility = View.GONE
-            surfaceView = _binding!!.surfaceView
-            surfaceHolder = surfaceView.holder
-            surfaceHolder.addCallback(this)
-        } else {
-            _binding!!.surfaceView.visibility = View.GONE
-            playerView = _binding!!.playerView
-        }
-
+        playerView = _binding!!.playerView
+        (activity as MainActivity).playerFragment = this
         playerView?.viewTreeObserver?.addOnGlobalLayoutListener(object :
             ViewTreeObserver.OnGlobalLayoutListener {
             override fun onGlobalLayout() {
@@ -91,42 +74,26 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
     @OptIn(UnstableApi::class)
     fun play(tvViewModel: TVViewModel) {
         this.tvViewModel = tvViewModel
+        val videoUrlCurrent =
+            tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
         playerView?.player?.run {
-            setMediaItem(MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
-            prepare()
-        }
-        exoPlayer?.run {
-            setMediaItem(com.google.android.exoplayer2.MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
+            videoUrlCurrent?.let { setMediaItem(MediaItem.fromUri(it)) }
             prepare()
         }
     }
 
     override fun onStart() {
-        Log.i(TAG, "onStart")
         super.onStart()
-        if (playerView != null && playerView!!.player?.isPlaying == false) {
-            Log.i(TAG, "replay")
-            playerView!!.player?.prepare()
-        }
-        if (exoPlayer?.isPlaying == false) {
-            Log.i(TAG, "replay")
-            exoPlayer?.prepare()
+        if (playerView != null) {
+            playerView!!.player?.play()
         }
     }
 
-    override fun onResume() {
-        Log.i(TAG, "onResume")
-        super.onResume()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        if (playerView != null && playerView!!.player?.isPlaying == true) {
+    override fun onStop() {
+        super.onStop()
+        if (playerView != null) {
             playerView!!.player?.stop()
         }
-        if (exoPlayer?.isPlaying == true) {
-            exoPlayer?.stop()
-        }
     }
 
     override fun onDestroy() {
@@ -134,7 +101,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
         if (playerView != null) {
             playerView!!.player?.release()
         }
-        exoPlayer?.release()
     }
 
     override fun onDestroyView() {
@@ -145,16 +111,4 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
     companion object {
         private const val TAG = "PlaybackVideoFragment"
     }
-
-    override fun surfaceCreated(holder: SurfaceHolder) {
-        exoPlayer = SimpleExoPlayer.Builder(requireContext()).build()
-        exoPlayer?.setVideoSurfaceHolder(surfaceHolder)
-        exoPlayer?.playWhenReady = true
-    }
-
-    override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-    }
-
-    override fun surfaceDestroyed(holder: SurfaceHolder) {
-    }
 }

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

@@ -32,20 +32,56 @@ class Request {
     private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
     private var yspProtoService: YSPProtoService = ApiClient().yspProtoService
     private var ysp: YSP? = null
-    private var token = ""
 
     // TODO onDestroy
     private val handler = Handler(Looper.getMainLooper())
-    private lateinit var btraceRunnable: BtraceRunnable
-    private var tokenRunnable: TokenRunnable = TokenRunnable()
+    private lateinit var myRunnable: MyRunnable
 
-    private val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
-    private val input =
-        """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()
-
-    init {
-        handler.post(tokenRunnable)
-    }
+    private var mapping = mapOf(
+        "CCTV4K" to "CCTV4K 超高清",
+        "CCTV1" to "CCTV1 综合",
+        "CCTV2" to "CCTV2 财经",
+        "CCTV4" to "CCTV4 中文国际",
+        "CCTV5" to "CCTV5 体育",
+        "CCTV5+" to "CCTV5+ 体育赛事",
+        "CCTV7" to "CCTV7 国防军事",
+        "CCTV9" to "CCTV9 记录",
+        "CCTV10" to "CCTV10 科教",
+        "CCTV11" to "CCTV11 戏曲",
+        "CCTV12" to "CCTV12 社会与法",
+        "CCTV13" to "CCTV13 新闻",
+        "CCTV14" to "CCTV14 少儿",
+        "CCTV15" to "CCTV15 音乐",
+        "CCTV16-HD" to "CCTV16 奥林匹克",
+        "CCTV17" to "CCTV17 农业农村",
+        "CGTN" to "CGTN",
+        "CGTN法语频道" to "CGTN 法语频道",
+        "CGTN俄语频道" to "CGTN 俄语频道",
+        "CGTN阿拉伯语频道" to "CGTN 阿拉伯语频道",
+        "CGTN西班牙语频道" to "CGTN 西班牙语频道",
+        "CGTN外语纪录频道" to "CGTN 纪录频道",
+        "东方卫视" to "东方卫视",
+        "湖南卫视" to "湖南卫视",
+        "湖北卫视" to "湖北卫视",
+        "辽宁卫视" to "辽宁卫视",
+        "江苏卫视" to "江苏卫视",
+        "江西卫视" to "江西卫视",
+        "山东卫视" to "山东卫视",
+        "广东卫视" to "广东卫视",
+        "广西卫视" to "广西卫视",
+        "重庆卫视" to "重庆卫视",
+        "河南卫视" to "河南卫视",
+        "河北卫视" to "河北卫视",
+        "贵州卫视" to "贵州卫视",
+        "北京卫视" to "北京卫视",
+        "黑龙江卫视" to "黑龙江卫视",
+        "浙江卫视" to "浙江卫视",
+        "安徽卫视" to "安徽卫视",
+        "深圳卫视" to "深圳卫视",
+        "四川卫视" to "四川卫视",
+        "福建东南卫视" to "东南卫视",
+        "海南卫视" to "海南卫视",
+    )
 
     fun initYSP(context: Context) {
         ysp = YSP(context)
@@ -55,8 +91,8 @@ class Request {
 
     fun fetchVideo(tvModel: TVViewModel, cookie: String) {
         call?.cancel()
-        if (::btraceRunnable.isInitialized) {
-            handler.removeCallbacks(btraceRunnable)
+        if (::myRunnable.isInitialized) {
+            handler.removeCallbacks(myRunnable)
         }
 
         val title = tvModel.title.value
@@ -70,7 +106,6 @@ class Request {
             override fun onResponse(call: Call<LiveInfo>, response: Response<LiveInfo>) {
                 if (response.isSuccessful) {
                     val liveInfo = response.body()
-
                     if (liveInfo?.data?.playurl != null) {
                         val chanll = liveInfo.data.chanll
                         val decodedBytes = Base64.decode(
@@ -78,6 +113,7 @@ class Request {
                             Base64.DEFAULT
                         )
                         val decodedString = String(decodedBytes)
+                        val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
                         val matchResult = regex.find(decodedString)
                         if (matchResult != null) {
                             val (key, iv) = matchResult.destructured
@@ -86,29 +122,18 @@ class Request {
                             val url = liveInfo.data.playurl + "&revoi=" + encryptTripleDES(
                                 keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
                                 ivBytes
-                            ).uppercase() + liveInfo.data.extended_param
-                            Log.d(TAG, "$title url $url")
+                            ).uppercase()
+                            Log.i(TAG, "$title url $url")
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()
                             tvModel.retryTimes = 0
-                            btraceRunnable = BtraceRunnable(tvModel)
-                            handler.post(btraceRunnable)
+                            myRunnable = MyRunnable(tvModel)
+                            handler.post(myRunnable)
                         } else {
                             Log.e(TAG, "$title key error")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
-                                        if (!tvModel.getTV().mustToken) {
-                                            fetchVideo(tvModel, cookie)
-                                        }
-                                    } else {
-                                        token = ""
-                                        fetchVideo(tvModel)
-                                    }
-                                } else {
-                                    fetchVideo(tvModel, cookie)
-                                }
+                                fetchVideo(tvModel, cookie)
                             }
                         }
                     } else {
@@ -119,18 +144,7 @@ class Request {
                             Log.e(TAG, "$title url error $request $liveInfo")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
-                                        if (!tvModel.getTV().mustToken) {
-                                            fetchVideo(tvModel, cookie)
-                                        }
-                                    } else {
-                                        token = ""
-                                        fetchVideo(tvModel)
-                                    }
-                                } else {
-                                    fetchVideo(tvModel, cookie)
-                                }
+                                fetchVideo(tvModel, cookie)
                             }
                         }
                     }
@@ -138,126 +152,60 @@ class Request {
                     Log.e(TAG, "$title status error")
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
-                        if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
-                                if (!tvModel.getTV().mustToken) {
-                                    fetchVideo(tvModel, cookie)
-                                }
-                            } else {
-                                token = ""
-                                fetchVideo(tvModel)
-                            }
-                        } else {
-                            fetchVideo(tvModel, cookie)
-                        }
+                        fetchVideo(tvModel, cookie)
                     }
                 }
             }
 
             override fun onFailure(call: Call<LiveInfo>, t: Throwable) {
-                Log.e(TAG, "$title request error $t")
+                Log.e(TAG, "$title request error")
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
-                    if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
-                            if (!tvModel.getTV().mustToken) {
-                                fetchVideo(tvModel, cookie)
-                            }
-                        } else {
-                            token = ""
-                            fetchVideo(tvModel)
-                        }
-                    } else {
-                        fetchVideo(tvModel, cookie)
-                    }
+                    fetchVideo(tvModel, cookie)
                 }
             }
         })
     }
 
     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; 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; 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) {
-                                val cookie =
-                                    "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; yspappid=519748109"
-                                fetchVideo(tvModel, cookie)
-                            }
-                        }
-                    }
-                })
-        } else {
-            val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-            fetchVideo(tvModel, cookie)
-        }
-    }
-
-    fun fetchData(tvModel: TVViewModel) {
-        if (tvModel.getTV().needToken) {
-            fetchVideo(tvModel)
-        } else {
-            val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; yspappid=519748109"
-            fetchVideo(tvModel, cookie)
-        }
-    }
-
-    inner class TokenRunnable : Runnable {
-        override fun run() {
-            fetchToken()
-            handler.postDelayed(this, 600000)
-        }
-    }
-
-    fun fetchToken() {
         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!!
+                    if (response.isSuccessful) {
+                        val token = response.body()?.data?.token
                         Log.i(TAG, "info success $token")
+                        val cookie =
+                            "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                        fetchVideo(tvModel, cookie)
                     } else {
-                        Log.e(TAG, "token status error")
+                        Log.e(TAG, "info status error")
+                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                            tvModel.retryTimes++
+                            fetchVideo(tvModel)
+                        }
                     }
                 }
 
                 override fun onFailure(call: Call<Info>, t: Throwable) {
-                    Log.e(TAG, "token request error $t")
+                    Log.e(TAG, "info request error $t")
+                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                        tvModel.retryTimes++
+                        fetchVideo(tvModel)
+                    }
                 }
             })
     }
 
-    inner class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
+    fun fetchData(tvModel: TVViewModel) {
+        if (tvModel.needToken) {
+            fetchVideo(tvModel)
+        } else {
+            val cookie = "vplatform=109"
+            fetchVideo(tvModel, cookie)
+        }
+    }
+
+    inner class MyRunnable(private val tvModel: TVViewModel) : Runnable {
         override fun run() {
             fetchBtrace(tvModel)
             handler.postDelayed(this, 60000)
@@ -307,20 +255,29 @@ class Request {
             ) {
                 if (response.isSuccessful) {
                     val body = response.body()
+
                     if (body?.data?.feedModuleListCount == 1) {
                         for (item in body.data?.feedModuleListList!![0]?.dataTvChannelListList!!) {
-                            Log.d(
+                            if (item.isVip && !item.isLimitedFree) {
+                                continue
+                            }
+                            Log.i(
                                 TAG,
                                 "${item.channelName},${item.pid},${item.streamId}"
                             )
-
-                            for ((_, v) in TVList.list) {
-                                for (v2 in v) {
-                                    if (v2.title == item.channelName || v2.alias == item.channelName) {
-                                        v2.pid = item.pid
-                                        v2.sid = item.streamId
-                                    }
-                                }
+                            var channelType = "央视频道"
+                            if (item?.channelType === "weishi") {
+                                channelType = "地方频道"
+                            }
+                            if (!mapping.containsKey(item.channelName)) {
+                                continue
+                            }
+                            val tv =
+                                TVList.list[channelType]?.find { it.title == mapping[item.channelName] }
+                            if (tv != null) {
+                                tv.logo = item.tvLogo
+                                tv.pid = item.pid
+                                tv.sid = item.streamId
                             }
                         }
                     }
@@ -345,10 +302,8 @@ class Request {
                         val program = response.body()
                         if (program != null) {
                             tvViewModel.addProgram(program.dataListList)
-                            Log.d(TAG, "$title program ${program.dataListList.size}")
+                            Log.i(TAG, "$title program ${program.dataListList.size}")
                         }
-                    } else {
-                        Log.w(TAG, "$title program error")
                     }
                 }
 
@@ -359,12 +314,15 @@ class Request {
     }
 
     private fun encryptTripleDES(key: ByteArray, iv: ByteArray): String {
+        val plaintext =
+            """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,AppleM1Pro,OpenGL4.1)"}"""
         return try {
             val keySpec = SecretKeySpec(key, "DESede")
             val ivSpec = IvParameterSpec(iv)
             val cipher = Cipher.getInstance("DESede/CBC/PKCS5Padding")
             cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec)
-            return cipher.doFinal(input).let { it -> it.joinToString("") { "%02x".format(it) } }
+            val encryptedBytes = cipher.doFinal(plaintext.toByteArray())
+            return encryptedBytes.let { it -> it.joinToString("") { "%02x".format(it) } }
         } catch (e: Exception) {
             e.printStackTrace()
             ""

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

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

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

@@ -1,5 +0,0 @@
-package com.lizongying.mytv
-
-class UpdateManager {
-
-}

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

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

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

@@ -9,11 +9,3 @@ data class Info(
 data class InfoData(
     val token: String,
 )
-
-data class TimeResponse(
-    val data: Time
-) {
-    data class Time(
-        val t: String
-    )
-}

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

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

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

@@ -51,14 +51,14 @@ class YSP(var context: Context) {
     private var signature = ""
 
     private var encryptor: Encryptor? = null
-    private lateinit var sharedPref: SharedPreferences
+    private var sharedPref: SharedPreferences? = null
 
     init {
         if (context is MainActivity) {
             encryptor = Encryptor()
             encryptor!!.init(context)
 
-            sharedPref = (context as MainActivity).sharedPref
+            sharedPref = (context as MainActivity).getPreferences(Context.MODE_PRIVATE)
         }
 
         guid = getGuid()
@@ -77,10 +77,15 @@ class YSP(var context: Context) {
 
         timeStr = getTimeStr()
 
+//        guid = "lq3oqitm_1e15dnzgjnb"
+//        randStr = "BfcCPQp8Hq"
+//        timeStr = "1702166501"
+
         cKey =
             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"}"""
+//        return """{"cnlid":"2000203803","livepid":"600001801","stream":"2","guid":"lq1y36mb_ccfwmja9zan","cKey":"--01A9F5E89BB86A0C61F4025BEDE15309B6913A79FD1AF1EE7F5EC9C7605F377D1D2281488385C32DEB9E7D0DD3559CB700BD7AF44DD5C9DE0AE14D94B8214027B5D664C108AEE23532348DCC61B86F7C8FBB6CF14D588E6093A25E97DF6D66F4882AB28F17016472DD43D45EF076B7F505176A5E8DEDF2662E5F9AB12B69CB20BCE1579BE724091F3AF6826AE34B713906F3FE139C3783F80EECBD08416DC525E1","adjust":1,"sphttps":"1","platform":"5910204","cmd":"2","encryptVer":"8.1","dtype":"1","devid":"devid","otype":"ojson","appVer":"V1.0.0","app_version":"V1.0.0","rand_str":"IOS2soOw44","channel":"ysp_tx","defn":"fhd","signature":"6ca945f651817de8c6e6910457ceafd6"}"""
     }
 
     private fun getTimeStr(): String {
@@ -94,10 +99,10 @@ class YSP(var context: Context) {
     }
 
     fun getGuid(): String {
-        var guid = sharedPref.getString("guid", "")
+        var guid = sharedPref?.getString("guid", "")
         if (guid == null || guid.length < 18) {
             guid = generateGuid()
-            with(sharedPref.edit()) {
+            with(sharedPref!!.edit()) {
                 putString("guid", guid)
                 apply()
             }
@@ -107,7 +112,7 @@ class YSP(var context: Context) {
 
     private fun newGuid(): String {
         guid = generateGuid()
-        with(sharedPref.edit()) {
+        with(sharedPref!!.edit()) {
             putString("guid", guid)
             apply()
         }
@@ -127,6 +132,7 @@ class YSP(var context: Context) {
     private fun getSignature(): String {
         val e =
             "adjust=${adjust}&appVer=${appVer}&app_version=$appVersion&cKey=$cKey&channel=$channel&cmd=$cmd&cnlid=$cnlid&defn=${defn}&devid=${devid}&dtype=${dtype}&encryptVer=${encryptVer}&guid=${guid}&livepid=${livepid}&otype=${otype}&platform=${platform}&rand_str=${randStr}&sphttps=${sphttps}&stream=${stream}".toByteArray()
+
         val hashedData = encryptor?.hash(e) ?: return ""
         return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
     }

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

@@ -8,9 +8,7 @@ class TVListViewModel : ViewModel() {
 
     var maxNum = mutableListOf<Int>()
 
-    private val _tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
-    val tvListViewModel: LiveData<MutableList<TVViewModel>>
-        get() = _tvListViewModel
+    private val tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
 
     private val _itemPosition = MutableLiveData<Int>()
     val itemPosition: LiveData<Int>
@@ -20,20 +18,22 @@ class TVListViewModel : ViewModel() {
     val itemPositionCurrent: LiveData<Int>
         get() = _itemPositionCurrent
 
+    fun getTVListViewModel(): MutableLiveData<MutableList<TVViewModel>> {
+        return tvListViewModel
+    }
+
     fun addTVViewModel(tvViewModel: TVViewModel) {
-        if (_tvListViewModel.value == null) {
-            _tvListViewModel.value = mutableListOf(tvViewModel)
-        } else {
-            _tvListViewModel.value?.add(tvViewModel)
-        }
+        val currentTVModelList = tvListViewModel.value ?: mutableListOf()
+        currentTVModelList.add(tvViewModel)
+        tvListViewModel.value = currentTVModelList
     }
 
     fun getTVViewModel(id: Int): TVViewModel? {
-        return _tvListViewModel.value?.get(id)
+        return tvListViewModel.value?.get(id)
     }
 
     fun getTVViewModelCurrent(): TVViewModel? {
-        return _itemPositionCurrent.value?.let { _tvListViewModel.value?.get(it) }
+        return _itemPositionCurrent.value?.let { tvListViewModel.value?.get(it) }
     }
 
     fun setItemPosition(position: Int) {
@@ -46,9 +46,6 @@ class TVListViewModel : ViewModel() {
     }
 
     fun size(): Int {
-        if (_tvListViewModel.value == null) {
-            return 0
-        }
-        return _tvListViewModel.value!!.size
+        return tvListViewModel.value!!.size
     }
 }

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

@@ -19,10 +19,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     private var rowPosition: Int = 0
     private var itemPosition: Int = 0
 
-    var retryTimes = 0
-    var tokenRetryTimes = 0
-    var retryMaxTimes = 8
-    var tokenRetryMaxTimes = 2
+    var retryTimes: Int = 0
+    var retryMaxTimes: Int = 5
     var programUpdateTime: Long = 0
 
     private val _errInfo = MutableLiveData<String>()
@@ -77,6 +75,26 @@ class TVViewModel(private var tv: TV) : ViewModel() {
 
     var seq = 0
 
+    var needToken = false
+
+    private val channelsNeedToken = arrayOf(
+        "CCTV3 综艺",
+        "CCTV6 电影",
+        "CCTV8 电视剧",
+        "风云剧场",
+        "第一剧场",
+        "怀旧剧场",
+        "世界地理",
+        "风云音乐",
+        "兵器科技",
+        "风云足球",
+        "高尔夫网球",
+        "女性时尚",
+        "央视文化精品",
+        "央视台球",
+        "电视指南",
+        "卫生健康",
+    )
 
     fun addVideoUrl(url: String) {
         if (_videoUrl.value?.isNotEmpty() == true) {
@@ -128,8 +146,11 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _pid.value = tv.pid
         _sid.value = tv.sid
         _program.value = mutableListOf()
-    }
 
+        if (tv.title in channelsNeedToken) {
+            needToken = true
+        }
+    }
 
     fun getRowPosition(): Int {
         return rowPosition
@@ -201,25 +222,18 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         mMinimumLoadableRetryCount = minimumLoadableRetryCount
     }
 
-    /**
-     * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
-     */
     @OptIn(UnstableApi::class)
-    fun buildSource(): HlsMediaSource {
+    fun buildSource(videoUrl: String, mHeaders: Map<String, String>?): HlsMediaSource {
         val httpDataSource = DefaultHttpDataSource.Factory()
         mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
 
         return HlsMediaSource.Factory(httpDataSource).createMediaSource(
             MediaItem.fromUri(
-                Uri.parse(getVideoUrlCurrent())
+                Uri.parse(videoUrl)
             )
         )
     }
 
-    fun getVideoUrlCurrent(): String {
-        return _videoUrl.value!![_videoIndex.value!!]
-    }
-
     companion object {
         private const val TAG = "TVViewModel"
     }

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

@@ -26,24 +26,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
                 android:text="当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
                 ></TextView>
             <Switch
-                android:id="@+id/switch_channel_reversal"
+                android:id="@+id/switch_view"
                 android:text="@string/title_channel_reversal"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <Switch
-                android:id="@+id/switch_channel_num"
-                android:text="@string/title_channel_num"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <Switch
-                android:id="@+id/switch_boot_startup"
-                android:text="@string/title_boot_startup"
-                android:layout_marginTop="10dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
         </LinearLayout>

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

@@ -7,14 +7,6 @@
     android:background="@color/black"
     android:keepScreenOn="true">
 
-    <SurfaceView
-        android:id="@+id/surface_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        app:resize_mode="fill"
-        app:use_controller="false" />
-
     <androidx.media3.ui.PlayerView
         android:id="@+id/player_view"
         android:layout_width="match_parent"

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

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

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

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

app/src/main/res/raw/channels.json

@@ -1,954 +0,0 @@
-[
-  {
-    "id": 0,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
-    "pid": "600001859",
-    "sid": "2000210103",
-    "programId": "600001859",
-    "needToken": false,
-    "mustToken": false,
-    "title": "CCTV1 综合",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226231/index.m3u8"
-    ]
-  },
-  {
-    "id": 1,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
-    "pid": "600001800",
-    "sid": "2000203603",
-    "programId": "600001800",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV2 财经",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index.m3u8"
-    ]
-  },
-  {
-    "id": 2,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
-    "pid": "600001801",
-    "sid": "2000203803",
-    "programId": "600001801",
-    "needToken": true,
-    "mustToken": true,
-    "title": "CCTV3 综艺",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226397/index.m3u8"
-    ]
-  },
-  {
-    "id": 3,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp",
-    "pid": "600001814",
-    "sid": "2000204803",
-    "programId": "600001814",
-    "needToken": false,
-    "mustToken": false,
-    "title": "CCTV4 中文国际",
-    "videoUrl": [
-      "http://39.134.24.161/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8"
-    ]
-  },
-  {
-    "id": 4,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp",
-    "pid": "600001818",
-    "sid": "2000205103",
-    "programId": "600001818",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV5 体育",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226395/index.m3u8"
-    ]
-  },
-  {
-    "id": 5,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
-    "pid": "600001802",
-    "sid": "2013693901",
-    "programId": "600001802",
-    "needToken": true,
-    "mustToken": true,
-    "title": "CCTV6 电影",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226393/index.m3u8"
-    ]
-  },
-  {
-    "id": 6,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp",
-    "pid": "600004092",
-    "sid": "2000510003",
-    "programId": "600004092",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV7 国防军事",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226192/index.m3u8"
-    ]
-  },
-  {
-    "id": 7,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ad51de94426a0ba039e6dd6a8534ea98ecc813a6176bde87b4f18cc34d6d7590.png?imageMogr2/format/webp",
-    "pid": "600001803",
-    "sid": "2000203903",
-    "programId": "600001803",
-    "needToken": true,
-    "mustToken": true,
-    "title": "CCTV8 电视剧",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226391/index.m3u8"
-    ]
-  },
-  {
-    "id": 8,
-    "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 记录",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226197/index.m3u8"
-    ]
-  },
-  {
-    "id": 9,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp",
-    "pid": "600001805",
-    "sid": "2000203503",
-    "programId": "600001805",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV10 科教",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226189/index.m3u8"
-    ]
-  },
-  {
-    "id": 10,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp",
-    "pid": "600001806",
-    "sid": "2000204103",
-    "programId": "600001806",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV11 戏曲",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226240/index.m3u8"
-    ]
-  },
-  {
-    "id": 11,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp",
-    "pid": "600001807",
-    "sid": "2000202603",
-    "programId": "600001807",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV12 社会与法",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226190/index.m3u8"
-    ]
-  },
-  {
-    "id": 12,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/266da7b43c03e2312186b4a999e0f060e8f15b10d2cc2c9aa32171819254cf1a.png?imageMogr2/format/webp",
-    "pid": "600001811",
-    "sid": "2000204603",
-    "programId": "600001811",
-    "needToken": false,
-    "mustToken": false,
-    "title": "CCTV13 新闻",
-    "videoUrl": [
-      "https://live-play.cctvnews.cctv.com/cctv/merge_cctv13.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226233/index.m3u8"
-    ]
-  },
-  {
-    "id": 13,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp",
-    "pid": "600001809",
-    "sid": "2000204403",
-    "programId": "600001809",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV14 少儿",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/index.m3u8"
-    ]
-  },
-  {
-    "id": 14,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp",
-    "pid": "600001815",
-    "sid": "2000205003",
-    "programId": "600001815",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV15 音乐",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8"
-    ]
-  },
-  {
-    "id": 15,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp",
-    "pid": "600098637",
-    "sid": "2012375003",
-    "programId": "600098637",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV16 奥林匹克",
-    "videoUrl": [
-      "http://39.134.24.162/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8"
-    ]
-  },
-  {
-    "id": 16,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp",
-    "pid": "600001810",
-    "sid": "2000204203",
-    "programId": "600001810",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV17 农业农村",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226198/index.m3u8"
-    ]
-  },
-  {
-    "id": 17,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp",
-    "pid": "600001817",
-    "sid": "2000204503",
-    "programId": "600001817",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV5+ 体育赛事",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226221/index.m3u8"
-    ]
-  },
-  {
-    "id": 18,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
-    "pid": "600002264",
-    "sid": "2000266303",
-    "programId": "600002264",
-    "needToken": true,
-    "mustToken": false,
-    "title": "CCTV4K 超高清",
-    "videoUrl": [
-      ""
-    ]
-  },
-  {
-    "id": 19,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "",
-    "pid": "600156816",
-    "sid": "2020603421",
-    "programId": "",
-    "needToken": false,
-    "mustToken": false,
-    "title": "CCTV8K 超高清",
-    "videoUrl": [
-      ""
-    ]
-  },
-  {
-    "id": 20,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4d549e53e6d0f632d5a633d1945280797b153e588f919221a07faa869812cc89.png?imageMogr2/format/webp",
-    "pid": "600099658",
-    "sid": "2012513603",
-    "programId": "600099658",
-    "needToken": true,
-    "mustToken": true,
-    "title": "风云剧场",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226950/index.m3u8"
-    ]
-  },
-  {
-    "id": 21,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a556bd7d93ce65e18f243a8892b5604f4faa994a4897315914216a710a706208.png?imageMogr2/format/webp",
-    "pid": "600099655",
-    "sid": "2012514403",
-    "programId": "600099655",
-    "needToken": true,
-    "mustToken": true,
-    "title": "第一剧场",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226959/index.m3u8"
-    ]
-  },
-  {
-    "id": 22,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/5661bd04fecdb6e899f801147a22ab5d3a475bf2b62e30aec2c0023190ebc9b1.png?imageMogr2/format/webp",
-    "pid": "600099620",
-    "sid": "2012511203",
-    "programId": "600099620",
-    "needToken": true,
-    "mustToken": true,
-    "title": "怀旧剧场",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226972/index.m3u8"
-    ]
-  },
-  {
-    "id": 23,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bb3c6c9e145d698137f5bb64a582021a01b51344b929003630eb769ea65832a9.png?imageMogr2/format/webp",
-    "pid": "600099637",
-    "sid": "2012513303",
-    "programId": "600099637",
-    "needToken": true,
-    "mustToken": true,
-    "title": "世界地理",
-    "videoUrl": [
-      ""
-    ]
-  },
-  {
-    "id": 24,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bbf1d024c5228b8dd128b0e3cb1717d173fab4ee84c3a4c8a57b1a215362ca3b.png?imageMogr2/format/webp",
-    "pid": "600099660",
-    "sid": "2012514103",
-    "programId": "600099660",
-    "needToken": true,
-    "mustToken": true,
-    "title": "风云音乐",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226953/index.m3u8"
-    ]
-  },
-  {
-    "id": 25,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4c6b6a6d3839889f34d33db3c2f80233b26b74d3489b393487635f8704e70796.png?imageMogr2/format/webp",
-    "pid": "600099649",
-    "sid": "2012513403",
-    "programId": "600099649",
-    "needToken": true,
-    "mustToken": true,
-    "title": "兵器科技",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226975/index.m3u8"
-    ]
-  },
-  {
-    "id": 26,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cd1e2bb52b06a991de168733e5ff0f1d85adc8042d40c8f393f723543e5dd08a.png?imageMogr2/format/webp",
-    "pid": "600099636",
-    "sid": "2012514203",
-    "programId": "600099636",
-    "needToken": true,
-    "mustToken": true,
-    "title": "风云足球",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226984/index.m3u8"
-    ]
-  },
-  {
-    "id": 27,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cdd1b31ede7a5ad049ed53d9a072422f829e72dd062ed2c19e077fdd01699071.png?imageMogr2/format/webp",
-    "pid": "600099659",
-    "sid": "2012512503",
-    "programId": "600099659",
-    "needToken": true,
-    "mustToken": true,
-    "title": "高尔夫网球",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226978/index.m3u8"
-    ]
-  },
-  {
-    "id": 28,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/fa28955ce8b2539d728bf4c6a13a46ff57ad76eae46627f7bcfb1ed8a613d3fc.png?imageMogr2/format/webp",
-    "pid": "600099650",
-    "sid": "2012513903",
-    "programId": "600099650",
-    "needToken": true,
-    "mustToken": true,
-    "title": "女性时尚",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226969/index.m3u8"
-    ]
-  },
-  {
-    "id": 29,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/14ac5ce40482cacd3d4b37435222bfe86af2b452a2f04ecbfc1d13d76edd7c57.png?imageMogr2/format/webp",
-    "pid": "600099653",
-    "sid": "2012513803",
-    "programId": "600099653",
-    "needToken": true,
-    "mustToken": true,
-    "title": "央视文化精品",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226981/index.m3u8"
-    ]
-  },
-  {
-    "id": 30,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/10e14a92478011aa6c3c8562e62127f3b1908e29fcd78e4b2b24b9e6d3ec2fbc.png?imageMogr2/format/webp",
-    "pid": "600099652",
-    "sid": "2012513703",
-    "programId": "600099652",
-    "needToken": true,
-    "mustToken": true,
-    "title": "央视台球",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226956/index.m3u8"
-    ]
-  },
-  {
-    "id": 31,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/244d72c0eb1615ed7d51c2f5db5a67f306aa3f58c05bc2d34de3aa7e956dc8c9.png?imageMogr2/format/webp",
-    "pid": "600099656",
-    "sid": "2012514003",
-    "programId": "600099656",
-    "needToken": true,
-    "mustToken": true,
-    "title": "电视指南",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226987/index.m3u8"
-    ]
-  },
-  {
-    "id": 32,
-    "videoIndex": 0,
-    "channel": "央视频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54a6863656fdfd8f803be193ddf22441c5000a108833889816fd2d8911715ce8.png?imageMogr2/format/webp",
-    "pid": "600099651",
-    "sid": "2012513503",
-    "programId": "600099651",
-    "needToken": true,
-    "mustToken": true,
-    "title": "卫生健康",
-    "videoUrl": [
-      ""
-    ]
-  },
-  {
-    "id": 33,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp",
-    "pid": "600002483",
-    "sid": "2000292403",
-    "programId": "600002483",
-    "needToken": true,
-    "mustToken": false,
-    "title": "东方卫视",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226217/index.m3u8"
-    ]
-  },
-  {
-    "id": 34,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp",
-    "pid": "600002475",
-    "sid": "2000296203",
-    "programId": "600002475",
-    "needToken": true,
-    "mustToken": false,
-    "title": "湖南卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226307/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226211/index.m3u8"
-    ]
-  },
-  {
-    "id": 35,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp",
-    "pid": "600002508",
-    "sid": "2000294503",
-    "programId": "600002508",
-    "needToken": true,
-    "mustToken": false,
-    "title": "湖北卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226477/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226194/index.m3u8"
-    ]
-  },
-  {
-    "id": 36,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ac4ed6058a87c101ae7147ebc38905d0cae047fb73fd277ee5049b84f52bda36.png?imageMogr2/format/webp",
-    "pid": "600002505",
-    "sid": "2000281303",
-    "programId": "600002505",
-    "needToken": true,
-    "mustToken": false,
-    "title": "辽宁卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226546/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226201/index.m3u8"
-    ]
-  },
-  {
-    "id": 37,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp",
-    "pid": "600002521",
-    "sid": "2000295603",
-    "programId": "600002521",
-    "needToken": true,
-    "mustToken": false,
-    "title": "江苏卫视",
-    "videoUrl": [
-      "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8"
-    ]
-  },
-  {
-    "id": 38,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3c760d0d00463855890e8a1864ea4a6b6dd66b90c29b4ac714a4b17c16519871.png?imageMogr2/format/webp",
-    "pid": "600002503",
-    "sid": "2000294103",
-    "programId": "600002503",
-    "needToken": true,
-    "mustToken": false,
-    "title": "江西卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226344/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225764/index.m3u8"
-    ]
-  },
-  {
-    "id": 39,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/22d403f07a7cf5410b3ad3ddb65a11aa229a32475fac213f5344c9f0ec330ca1.png?imageMogr2/format/webp",
-    "pid": "600002513",
-    "sid": "2000294803",
-    "programId": "600002513",
-    "needToken": true,
-    "mustToken": false,
-    "title": "山东卫视",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226209/index.m3u8"
-    ]
-  },
-  {
-    "id": 40,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/28886880a4dc0f06fb7e0a528a1def0591d61a65870e29176ede0cc92033bbfd.png?imageMogr2/format/webp",
-    "pid": "600002485",
-    "sid": "2000292703",
-    "programId": "600002485",
-    "needToken": true,
-    "mustToken": false,
-    "title": "广东卫视",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226216/index.m3u8"
-    ]
-  },
-  {
-    "id": 41,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54b7e97cb816bb223fe05f3fc44da2c7820eb66e8550c19d23100f2c414ecc38.png?imageMogr2/format/webp",
-    "pid": "600002509",
-    "sid": "2000294203",
-    "programId": "600002509",
-    "needToken": true,
-    "mustToken": false,
-    "title": "广西卫视",
-    "videoUrl": [
-      "http://live.gxrb.com.cn/tv/gxtvlive03/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225770/index.m3u8"
-    ]
-  },
-  {
-    "id": 42,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/657651f411de2673d1770d9a78b44c1265704f7468cc41d4be7f51d630768494.png?imageMogr2/format/webp",
-    "pid": "600002531",
-    "sid": "2000297803",
-    "programId": "600002531",
-    "needToken": true,
-    "mustToken": false,
-    "title": "重庆卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226409/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226202/index.m3u8"
-    ]
-  },
-  {
-    "id": 43,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/74925962148a6d31c85808b6cd4e444c2a54bab393d2c5fc85e960b50e22fa86.png?imageMogr2/format/webp",
-    "pid": "600002525",
-    "sid": "2000296103",
-    "programId": "600002525",
-    "needToken": true,
-    "mustToken": false,
-    "title": "河南卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226480/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225767/index.m3u8"
-    ]
-  },
-  {
-    "id": 44,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d545becdc81c60197b08c7f47380705e4665ed3fe55efc8b855e486f6e655378.png?imageMogr2/format/webp",
-    "pid": "600002493",
-    "sid": "2000293403",
-    "programId": "600002493",
-    "needToken": true,
-    "mustToken": false,
-    "title": "河北卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226406/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225750/index.m3u8"
-    ]
-  },
-  {
-    "id": 45,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4eb45f4781d33d872af027dc01c941559aab55667dd99cc5c22bef7037807b13.png?imageMogr2/format/webp",
-    "pid": "600002490",
-    "sid": "2000293303",
-    "programId": "600002490",
-    "needToken": true,
-    "mustToken": false,
-    "title": "贵州卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226474/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225793/index.m3u8"
-    ]
-  },
-  {
-    "id": 46,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f4f23633c578beea49a3841d88d3490100f029ee349059fa532869db889872c5.png?imageMogr2/format/webp",
-    "pid": "600002309",
-    "sid": "2000272103",
-    "programId": "600002309",
-    "needToken": true,
-    "mustToken": false,
-    "title": "北京卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221225728/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226222/index.m3u8"
-    ]
-  },
-  {
-    "id": 47,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d8273ae9be698ce2db21f5b886ecac95a73429593f93713c60ed8c12c38bf0d3.png?imageMogr2/format/webp",
-    "pid": "600002498",
-    "sid": "2000293903",
-    "programId": "600002498",
-    "needToken": true,
-    "mustToken": false,
-    "title": "黑龙江卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226327/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226215/index.m3u8"
-    ]
-  },
-  {
-    "id": 48,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a66c836bd98ba3e41a2e9a570d4b9c50dedc6839e9de333e2e78212ad505f37e.png?imageMogr2/format/webp",
-    "pid": "600002520",
-    "sid": "2000295503",
-    "programId": "600002520",
-    "needToken": true,
-    "mustToken": false,
-    "title": "浙江卫视",
-    "videoUrl": [
-      "http://hw-m-l.cztv.com/channels/lantian/channel01/1080p.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226199/index.m3u8"
-    ]
-  },
-  {
-    "id": 49,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f35fa04b51b1ee4984b03578b65403570868ebca03c6c01e11b097f999a58d9b.png?imageMogr2/format/webp",
-    "pid": "600002532",
-    "sid": "2000298003",
-    "programId": "600002532",
-    "needToken": true,
-    "mustToken": false,
-    "title": "安徽卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226391/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226203/index.m3u8"
-    ]
-  },
-  {
-    "id": 50,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp",
-    "pid": "600002481",
-    "sid": "2000292203",
-    "programId": "600002481",
-    "needToken": true,
-    "mustToken": false,
-    "title": "深圳卫视",
-    "videoUrl": [
-      "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8"
-    ]
-  },
-  {
-    "id": 51,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
-    "pid": "600002516",
-    "sid": "2000295003",
-    "programId": "600002516",
-    "needToken": true,
-    "mustToken": false,
-    "title": "四川卫视",
-    "videoUrl": [
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8",
-      "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8"
-    ]
-  },
-  {
-    "id": 52,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp",
-    "pid": "600002484",
-    "sid": "2000292503",
-    "programId": "600002484",
-    "needToken": true,
-    "mustToken": false,
-    "title": "东南卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226341/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225766/index.m3u8"
-    ]
-  },
-  {
-    "id": 53,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp",
-    "pid": "600002506",
-    "sid": "2000291503",
-    "programId": "600002506",
-    "needToken": true,
-    "mustToken": false,
-    "title": "海南卫视",
-    "videoUrl": [
-      "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226465/index.m3u8",
-      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225769/index.m3u8"
-    ]
-  },
-  {
-    "id": 54,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "",
-    "pid": "600152137",
-    "sid": "2019927003",
-    "programId": "",
-    "needToken": true,
-    "mustToken": false,
-    "title": "天津卫视",
-    "videoUrl": [
-      ""
-    ]
-  },
-  {
-    "id": 55,
-    "videoIndex": 0,
-    "channel": "地方频道",
-    "logo": "",
-    "pid": "600152138",
-    "sid": "2019927403",
-    "programId": "",
-    "needToken": true,
-    "mustToken": false,
-    "title": "新疆卫视",
-    "videoUrl": [
-      ""
-    ]
-  },
-  {
-    "id": 56,
-    "videoIndex": 0,
-    "channel": "国际频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp",
-    "pid": "600014550",
-    "sid": "2001656803",
-    "programId": "600014550",
-    "needToken": false,
-    "mustToken": false,
-    "title": "CGTN",
-    "videoUrl": [
-      "http://live.cgtn.com/1000/prog_index.m3u8"
-    ]
-  },
-  {
-    "id": 57,
-    "videoIndex": 0,
-    "channel": "国际频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp",
-    "pid": "600084704",
-    "sid": "2010153503",
-    "programId": "600084704",
-    "needToken": false,
-    "mustToken": false,
-    "title": "CGTN 法语频道",
-    "videoUrl": [
-      "https://livefr.cgtn.com/1000f/prog_index.m3u8"
-    ]
-  },
-  {
-    "id": 58,
-    "videoIndex": 0,
-    "channel": "国际频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp",
-    "pid": "600084758",
-    "sid": "2010152603",
-    "programId": "600084758",
-    "needToken": false,
-    "mustToken": false,
-    "title": "CGTN 俄语频道",
-    "videoUrl": [
-      "http://liveru.cgtn.com/1000r/prog_index.m3u8"
-    ]
-  },
-  {
-    "id": 59,
-    "videoIndex": 0,
-    "channel": "国际频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp",
-    "pid": "600084782",
-    "sid": "2010155203",
-    "programId": "600084782",
-    "needToken": false,
-    "mustToken": false,
-    "title": "CGTN 阿拉伯语频道",
-    "videoUrl": [
-      "http://livear.cgtn.com/1000a/prog_index.m3u8"
-    ]
-  },
-  {
-    "id": 60,
-    "videoIndex": 0,
-    "channel": "国际频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp",
-    "pid": "600084744",
-    "sid": "2010152503",
-    "programId": "600084744",
-    "needToken": false,
-    "mustToken": false,
-    "title": "CGTN 西班牙语频道",
-    "videoUrl": [
-      "http://livees.cgtn.com/500e/prog_index.m3u8",
-      "http://livees.cgtn.com/1000e/prog_index.m3u8"
-    ]
-  },
-  {
-    "id": 61,
-    "videoIndex": 0,
-    "channel": "国际频道",
-    "logo": "https://resources.yangshipin.cn/assets/oms/image/202309/74d3ac436a7e374879578de1d87a941fbf566d39d5632b027c5097891ed32bd5.png?imageMogr2/format/webp",
-    "pid": "600084781",
-    "sid": "2010155403",
-    "programId": "600084781",
-    "needToken": false,
-    "mustToken": false,
-    "title": "CGTN 纪录频道",
-    "videoUrl": [
-      "https://livedoc.cgtn.com/500d/prog_index.m3u8"
-    ]
-  }
-]

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

@@ -1,6 +0,0 @@
-<?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>

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

@@ -1,6 +1,4 @@
 <resources>
     <string name="app_name">我的电视</string>
-    <string name="title_channel_reversal">换台反转</string>
-    <string name="title_channel_num">数字选台</string>
-    <string name="title_boot_startup">开机自启</string>
+    <string name="title_channel_reversal">频道反转</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">143dp</item>
+        <item name="android:layout_height">50dp</item>
+        <item name="android:adjustViewBounds">true</item>
+        <item name="android:contentDescription">@null</item>
+        <item name="android:scaleType">centerCrop</item>
+        <item name="layout_viewType">main</item>
     </style>
 
     <style name="CustomImageCardTheme" parent="Theme.Leanback">
         <item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
+        <item name="imageCardViewImageStyle">@style/CustomImageCardViewImageStyle</item>
     </style>
 </resources>

app/src/main/res/xml/network.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <base-config cleartextTrafficPermitted="true">
-        <trust-anchors>
-            <certificates src="system" />
-            <certificates src="user" />
-        </trust-anchors>
-    </base-config>
-</network-security-config>

build.gradle

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