fix ysp

.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: 这个建议不会背离 my-tv 的初衷。
-          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

@@ -6,7 +6,7 @@
 
 下载安装 [releases](https://github.com/lizongying/my-tv/releases/)
 
-更多地址 [my-tv](https://lyrics.run/my-tv.html)
+其他地址 [my-tv](https://lyrics.run/my-tv.html)
 
 ![image](./screenshots/img_3.png)
 ![image](./screenshots/img_2.png)
@@ -14,119 +14,56 @@
 
 ## 更新日志
 
-### v1.6.2（通用）
+### v1.5.8（通用版）
-
-* 修复按键无效的问题
-* 新的频道列表样式
-
-### v1.6.1（安卓5及以上专用）
-
-* 增加凤凰卫视
-
-### v1.6.0（通用）
-
-* 通用（春晚緊急修復）
-
-### v1.5.9（安卓5及以上专用）
-
-* 解决天猫魔盒闪退问题
-
-### v1.5.8（通用）
 
 * 修复央视6画质差的问题
 * 增加兵团卫视
 * 播放失败重试
 
-### v1.5.7（安卓5及以上专用）
+### v1.5.6（通用版）
-
-* 修复播放失败的问题
-
-### v1.5.6（通用）
 
 * 解决部分设备系统时间不对导致播放失败的问题
 
-### v1.5.5（安卓5及以上专用）
+### v1.5.2（通用版）
-
-* 修复播放失败的问题
-* 修复APP恢复后频道号、频道列表不自动消失的问题
-
-### v1.5.4（通用）
-
-* 修复播放失败的问题
-
-### 以下已不可用
-
-### v1.5.3（安卓5及以上专用）
-
-* 修复部分情况下APP切换后无法继续播放的问题
-* 优化重试逻辑
-
-### v1.5.2（通用）
 
 * 修复APP恢复后频道号、频道列表不自动消失的问题
 
-### v1.5.1（安卓5及以上专用）
+### v1.5.1（高版本专用）
 
 * 性能优化
 
-### v1.5.0（通用）
+### v1.5.0（通用版）
 
 * 修复部分情况下APP切换后无法继续播放的问题
 
-### v1.4.9（安卓5及以上专用）
+### v1.4.9（高版本专用）
 
 * 同步v1.4.8
 
-### v1.4.8（通用）
+### v1.4.8（通用版）
 
 * 频道号从1开始，CCTV5+为18
 * 提高CCTV6清晰度
 * 增加天津卫视、新疆卫视
 
-### v1.4.7（安卓5及以上专用）
+### v1.4.7（高版本专用）
 
 * 修复部分用户CCTV13播放过程中卡住的问题
 * 调整CCTV的频道顺序
 
-### v1.4.6（通用）
+### v1.4.6（通用版）
 
 * 10以下频道不再需要先按0
 
-### v1.4.5（安卓5及以上专用）
+### v1.4.5（高版本专用）
 
 * 数字选台配置
 
-### v1.4.4（通用）
+### v1.4.4（通用版）
 
 * 优化图标显示
 * 增加换台反转
 
-### v1.4.3（安卓5及以上专用）
-
-* 支持频道反转配置
-
-### v1.4.2（通用）
-
-* 支持安卓4
-
-### v1.4.1
-
-* 解决部分用户无法打开菜单的问题
-
-### v1.4.0
-
-* 解决极个别高版本机型黑屏问题
-
-### v1.3.9
-
-* 提高稳定性
-* 提高连接速度
-
-### v1.3.4
-
-* 部分错误会提示用户
-* 菜单3秒钟后自动关闭
-
 ### v1.3.3
 
 * 部分错误会提示用户
@@ -137,27 +74,6 @@
 * 增加重试，减少因网络问题导致的播放失败
 * 优化横幅banner
 
-### v1.3.1
-
-* 增加CCTV 8K 超高清频道
-* 增加国际频道栏目
-
-### v1.3.0
-
-* 处理368可能失败的情形
-
-### v1.2.9
-
-* 支持3、6、8
-
-### v1.2.8
-
-* 兼容16:10等分辨率
-
-### v1.2.7
-
-* 此版本是为了测试安卓6.0以下版本，如之前可以正常运行，请勿安装。
-
 ### v1.2.6
 
 * 支持安卓4.2
@@ -178,14 +94,6 @@
 * 播放相同的频道，不再重复加载
 * 暂时移除部分频道
 
-### v1.2.3
-
-* 固定视频比列为16:9
-* 隐藏全面屏底部的小横条
-* 移除移动专区
-* 修复一个闪退问题
-* 更换图标和应用名
-
 ## 其他
 
 小米电视可以使用小米电视助手进行安装
@@ -208,8 +116,10 @@ adb install my-tv.apk
 * 凤凰卫视、凤凰资讯台
 * 海外
 * 1.5.0 无法安装，1.5.1 可以安装
+* 获取系统时间
+* 选中的图标比例能否相差更大
+* 自动重连
 * 节目增加预告
-* 频道列表优化
 
 ## 赞赏
 

app/build.gradle

@@ -101,7 +101,7 @@ dependencies {
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
 
     // 21:2.9.0 17:2.6.4
-    def retrofit2_version = "2.9.0"
+    def retrofit2_version = "2.6.4"
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
     implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
@@ -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,7 +7,6 @@
         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"
@@ -30,13 +29,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,124 @@
+package com.lizongying.mytv
+
+import android.graphics.Color
+import android.view.ContextThemeWrapper
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.ScaleAnimation
+import android.widget.ImageView
+import androidx.leanback.widget.ImageCardView
+import androidx.lifecycle.LifecycleOwner
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.lizongying.mytv.models.TVListViewModel
+import com.lizongying.mytv.models.TVViewModel
+
+
+class CardAdapter(private val owner: LifecycleOwner, private var tvListViewModel: TVListViewModel) :
+    RecyclerView.Adapter<CardAdapter.ViewHolder>() {
+
+    private var listener: ItemListener? = null
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val cardView = object :
+            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
+        startScaleAnimation(cardView, 1.0f, 0.9f)
+        cardView.isFocusable = true
+        cardView.isFocusableInTouchMode = true
+
+        return ViewHolder(cardView)
+    }
+
+    private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float) {
+        val scaleAnimation = ScaleAnimation(
+            fromScale, toScale,
+            fromScale, toScale,
+            ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
+            ScaleAnimation.RELATIVE_TO_SELF, 0.5f
+        )
+        scaleAnimation.duration = 200
+        scaleAnimation.fillAfter = true
+
+        view.startAnimation(scaleAnimation)
+    }
+
+    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
+        val item = tvListViewModel.getTVViewModel(position)
+
+        val tvViewModel = item as TVViewModel
+        val cardView = viewHolder.view as ImageCardView
+
+        cardView.setOnFocusChangeListener { _, hasFocus ->
+            listener?.onItemFocusChange(item, hasFocus)
+            if (hasFocus) {
+                startScaleAnimation(cardView, 0.9f, 1.0f)
+            } else {
+                startScaleAnimation(cardView, 1.0f, 0.9f)
+            }
+        }
+
+        cardView.setOnClickListener { _ ->
+            listener?.onItemClicked(item)
+        }
+
+        cardView.titleText = tvViewModel.title.value
+        cardView.tag = tvViewModel.videoUrl.value
+
+        when (tvViewModel.title.value) {
+            "CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
+                .load(R.drawable.cctv8k)
+                .centerInside()
+                .into(cardView.mainImageView)
+
+            "天津卫视" -> Glide.with(viewHolder.view.context)
+                .load(R.drawable.tianjin)
+                .centerInside()
+                .into(cardView.mainImageView)
+
+            "新疆卫视" -> Glide.with(viewHolder.view.context)
+                .load(R.drawable.xinjiang)
+                .centerInside()
+                .into(cardView.mainImageView)
+
+            "兵团卫视" -> Glide.with(viewHolder.view.context)
+                .load(R.drawable.bingtuan)
+                .centerInside()
+                .into(cardView.mainImageView)
+
+            else -> Glide.with(viewHolder.view.context)
+                .load(tvViewModel.logo.value)
+                .centerInside()
+                .into(cardView.mainImageView)
+        }
+
+        cardView.mainImageView.setBackgroundColor(Color.WHITE)
+        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
+
+        tvViewModel.program.observe(owner) { _ ->
+            val program = tvViewModel.getProgramOne()
+            if (program != null) {
+                cardView.contentText = program.name
+            }
+        }
+    }
+
+    override fun getItemCount() = tvListViewModel.size()
+
+    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val view = itemView
+    }
+
+    interface ItemListener {
+        fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean)
+        fun onItemClicked(tvViewModel: TVViewModel)
+    }
+
+    fun setItemListener(listener: ItemListener) {
+        this.listener = listener
+    }
+
+    companion object {
+        private const val TAG = "CardAdapter"
+    }
+}
+

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

@@ -47,7 +47,8 @@ class MainActivity : FragmentActivity() {
     lateinit var sharedPref: SharedPreferences
     private var channelReversal = false
     private var channelNum = true
-    private var bootStartup = true
+
+    private var versionName = ""
 
     init {
         lifecycleScope.launch(Dispatchers.IO) {
@@ -82,17 +83,15 @@ class MainActivity : FragmentActivity() {
         sharedPref = getPreferences(Context.MODE_PRIVATE)
         channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, channelReversal)
         channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
-        bootStartup = sharedPref.getBoolean(BOOT_STARTUP, bootStartup)
 
         val packageInfo = getPackageInfo()
-        val versionName = packageInfo.versionName
+        versionName = packageInfo.versionName
         val versionCode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             packageInfo.longVersionCode
         } else {
             packageInfo.versionCode.toLong()
         }
-        settingFragment =
+        settingFragment = SettingFragment(versionName, versionCode, channelReversal, channelNum)
-            SettingFragment(versionName, versionCode, channelReversal, channelNum, bootStartup)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -145,8 +144,9 @@ class MainActivity : FragmentActivity() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
+            mainFragment.setPosition()
             transaction.show(mainFragment)
-            mainActive()
+            keepRunnable()
         } else {
             transaction.hide(mainFragment)
         }
@@ -154,16 +154,11 @@ class MainActivity : FragmentActivity() {
         transaction.commit()
     }
 
-    fun mainActive() {
+    fun keepRunnable() {
         handler.removeCallbacks(hideMain)
         handler.postDelayed(hideMain, delayHideMain)
     }
 
-    fun settingActive() {
-        handler.removeCallbacks(hideSetting)
-        handler.postDelayed(hideSetting, delayHideSetting)
-    }
-
     private val hideMain = Runnable {
         if (!mainFragment.isHidden) {
             supportFragmentManager.beginTransaction().hide(mainFragment).commit()
@@ -254,14 +249,6 @@ class MainActivity : FragmentActivity() {
         this.channelNum = channelNum
     }
 
-    fun saveBootStartup(bootStartup: Boolean) {
-        with(sharedPref.edit()) {
-            putBoolean(BOOT_STARTUP, bootStartup)
-            apply()
-        }
-        this.bootStartup = bootStartup
-    }
-
     private fun showSetting() {
         if (!mainFragment.isHidden) {
             return
@@ -270,7 +257,8 @@ class MainActivity : FragmentActivity() {
         Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
         if (!settingFragment.isVisible) {
             settingFragment.show(supportFragmentManager, "setting")
-            settingActive()
+            handler.removeCallbacks(hideSetting)
+            handler.postDelayed(hideSetting, delayHideSetting)
         } else {
             handler.removeCallbacks(hideSetting)
             settingFragment.dismiss()
@@ -549,6 +537,5 @@ class MainActivity : FragmentActivity() {
         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

@@ -5,30 +5,31 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
-import androidx.leanback.app.BrowseSupportFragment
+import androidx.fragment.app.Fragment
-import androidx.leanback.widget.ArrayObjectAdapter
-import androidx.leanback.widget.HeaderItem
-import androidx.leanback.widget.ListRow
-import androidx.leanback.widget.ListRowPresenter
-import androidx.leanback.widget.ListRowPresenter.SelectItemViewHolderTask
-import androidx.leanback.widget.OnItemViewClickedListener
-import androidx.leanback.widget.OnItemViewSelectedListener
-import androidx.leanback.widget.Presenter
-import androidx.leanback.widget.Row
-import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.lizongying.mytv.Utils.dpToPx
 import com.lizongying.mytv.Utils.getDateTimestamp
+import com.lizongying.mytv.databinding.RowBinding
+import com.lizongying.mytv.databinding.ShowBinding
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class MainFragment : BrowseSupportFragment() {
+class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var itemPosition = 0
 
-    private var rowsAdapter: ArrayObjectAdapter? = null
+    private var rowList: MutableList<View> = mutableListOf()
+
+    private var _binding: ShowBinding? = null
+    private val binding get() = _binding!!
 
     private var request = Request()
 
@@ -41,15 +42,12 @@ class MainFragment : BrowseSupportFragment() {
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreateView(
-        Log.i(TAG, "onCreate")
+        inflater: LayoutInflater, container: ViewGroup?,
-        super.onCreate(savedInstanceState)
+        savedInstanceState: Bundle?
-        headersState = HEADERS_DISABLED
+    ): View {
-    }
+        _binding = ShowBinding.inflate(inflater, container, false)
-
+        return binding.root
-    override fun onStart() {
-        Log.i(TAG, "onStart")
-        super.onStart()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -58,172 +56,142 @@ class MainFragment : BrowseSupportFragment() {
         activity?.let { request.initYSP(it) }
         sharedPref = (activity as? MainActivity)?.sharedPref!!
 
-        loadRows()
+        view?.post {
+            val content = binding.content
 
-        setupEventListeners()
+            var idx: Long = 0
+            for ((k, v) in TVList.list) {
+                val itemBinding: RowBinding =
+                    RowBinding.inflate(layoutInflater, content, false)
 
-        mUpdateProgramRunnable = UpdateProgramRunnable()
+                val tvListViewModelCurrent = TVListViewModel()
-        handler.post(mUpdateProgramRunnable)
+                for ((idx2, v1) in v.withIndex()) {
-
+                    val tvViewModel = TVViewModel(v1)
-        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+                    tvViewModel.setRowPosition(idx.toInt())
-            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                    tvViewModel.setItemPosition(idx2)
-                if (tvViewModel.errInfo.value != null
+                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
-                    && tvViewModel.id.value == itemPosition
+                    tvListViewModel.addTVViewModel(tvViewModel)
-                ) {
-                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
                 }
-            }
+                tvListViewModel.maxNum.add(v.size)
-            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
 
-                // not first time && channel not change
+                val adapter = CardAdapter(viewLifecycleOwner, tvListViewModelCurrent)
-                if (tvViewModel.ready.value != null
+                rowList.add(itemBinding.rowItems)
-                    && tvViewModel.id.value == itemPosition
+
-                    && check(tvViewModel)
+                adapter.setItemListener(this)
-                ) {
+
-                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                itemBinding.rowHeader.text = k
-                    (activity as? MainActivity)?.play(tvViewModel)
+                itemBinding.rowItems.adapter = adapter
-                }
+                itemBinding.rowItems.layoutManager =
+                    LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+
+                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
+                layoutParams.topMargin = dpToPx(11F)
+                itemBinding.row.layoutParams = layoutParams
+                content.addView(itemBinding.row)
+
+                idx++
             }
-            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
+
-                if (tvViewModel.change.value != null) {
+            mUpdateProgramRunnable = UpdateProgramRunnable()
-                    val title = tvViewModel.title.value
+            handler.post(mUpdateProgramRunnable)
-                    Log.i(TAG, "switch $title")
+
-                    if (tvViewModel.pid.value != "") {
+            itemPosition = sharedPref.getInt(POSITION, 0)
-                        Log.i(TAG, "request $title")
+            if (itemPosition >= tvListViewModel.size()) {
-                        lifecycleScope.launch(Dispatchers.IO) {
+                itemPosition = 0
-                            tvViewModel.let { request.fetchData(it) }
+            }
-                        }
+            tvListViewModel.setItemPosition(itemPosition)
-                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+            setPosition()
-                        setSelectedPosition(
+            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-                            tvViewModel.getRowPosition(), true,
+                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
+                    if (tvViewModel.errInfo.value != null
-                        )
+                        && tvViewModel.id.value == itemPosition
-                    } else {
+                    ) {
-                        if (check(tvViewModel)) {
+                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
-                            (activity as? MainActivity)?.play(tvViewModel)
+                            .show()
+                    }
+                }
+                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
+
+                    // not first time && channel not change
+                    if (tvViewModel.ready.value != null
+                        && tvViewModel.id.value == itemPosition
+                        && check(tvViewModel)
+                    ) {
+                        Log.i(TAG, "ready ${tvViewModel.title.value}")
+                        (activity as? MainActivity)?.play(tvViewModel)
+                    }
+                }
+                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
+                    if (tvViewModel.change.value != null) {
+                        val title = tvViewModel.title.value
+                        Log.i(TAG, "switch $title")
+                        if (tvViewModel.pid.value != "") {
+                            Log.i(TAG, "request $title")
+                            lifecycleScope.launch(Dispatchers.IO) {
+                                tvViewModel.let { request.fetchData(it) }
+                            }
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setSelectedPosition(
+                            setPosition(
-                                tvViewModel.getRowPosition(), true,
+                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
-                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
                             )
+                        } else {
+                            if (check(tvViewModel)) {
+                                (activity as? MainActivity)?.play(tvViewModel)
+                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                                setPosition(
+                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                                )
+                            }
                         }
                     }
                 }
             }
-        }
 
-        (activity as MainActivity).fragmentReady()
+            (activity as MainActivity).fragmentReady()
-    }
-
-    fun toLastPosition() {
-        setSelectedPosition(
-            selectedPosition, false,
-            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
-        )
-    }
-
-    fun toFirstPosition() {
-        setSelectedPosition(
-            selectedPosition, false,
-            SelectItemViewHolderTask(0)
-        )
-    }
-
-    override fun startHeadersTransition(withHeaders: Boolean) {
-    }
-
-    private fun loadRows() {
-        rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
-
-        val cardPresenter = CardPresenter(viewLifecycleOwner)
-
-        var idx: Long = 0
-        for ((k, v) in TVList.list) {
-            val listRowAdapter = ArrayObjectAdapter(cardPresenter)
-            for ((idx2, v1) in v.withIndex()) {
-                val tvViewModel = TVViewModel(v1)
-                tvViewModel.setRowPosition(idx.toInt())
-                tvViewModel.setItemPosition(idx2)
-                tvListViewModel.addTVViewModel(tvViewModel)
-                listRowAdapter.add(tvViewModel)
-            }
-            tvListViewModel.maxNum.add(v.size)
-            val header = HeaderItem(idx, k)
-            rowsAdapter!!.add(ListRow(header, listRowAdapter))
-            idx++
-        }
-
-        adapter = rowsAdapter
-
-        itemPosition = sharedPref.getInt(POSITION, 0)
-        if (itemPosition >= tvListViewModel.size()) {
-            itemPosition = 0
-        }
-        tvListViewModel.setItemPosition(itemPosition)
-    }
-
-    fun prevSource() {
-        view?.post {
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            if (tvViewModel != null) {
-                if (tvViewModel.videoUrl.value!!.size > 1) {
-                    val videoIndex = tvViewModel.videoIndex.value?.minus(1)
-                    if (videoIndex == -1) {
-                        tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
-                    }
-                    tvViewModel.changed()
-                }
-            }
         }
     }
 
-    fun nextSource() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        view?.post {
+        super.onViewCreated(view, savedInstanceState)
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+    }
-            if (tvViewModel != null) {
+
-                if (tvViewModel.videoUrl.value!!.size > 1) {
+    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
-                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
+        if (hasFocus) {
-                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
+            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
-                        tvViewModel.setVideoIndex(0)
+            (activity as MainActivity).keepRunnable()
-                    }
-                    tvViewModel.changed()
-                }
-            }
         }
     }
 
-    private fun setupEventListeners() {
+    override fun onItemClicked(tvViewModel: TVViewModel) {
-        onItemViewClickedListener = ItemViewClickedListener()
+        if (this.isHidden) {
-        onItemViewSelectedListener = ItemViewSelectedListener()
+            (activity as? MainActivity)?.switchMainFragment()
+            return
+        }
+
+        if (itemPosition != tvViewModel.id.value!!) {
+            itemPosition = tvViewModel.id.value!!
+            tvListViewModel.setItemPosition(itemPosition)
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+        }
+        (activity as? MainActivity)?.switchMainFragment()
     }
 
-    private inner class ItemViewClickedListener : OnItemViewClickedListener {
+    fun setPosition() {
-        override fun onItemClicked(
+        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            itemViewHolder: Presenter.ViewHolder,
+        Log.i(TAG, "tvViewModel $tvViewModel")
-            item: Any,
+        Log.i(TAG, "rowList ${rowList.size}")
-            rowViewHolder: RowPresenter.ViewHolder,
+        rowList[tvViewModel!!.getRowPosition()].post {
-            row: Row
+            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
-        ) {
+                tvViewModel.getItemPosition()
-            if (item is TVViewModel) {
+            )?.requestFocus()
-                if (itemPosition != item.id.value!!) {
-                    itemPosition = item.id.value!!
-                    tvListViewModel.setItemPosition(itemPosition)
-                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
-                }
-                (activity as? MainActivity)?.switchMainFragment()
-            }
         }
     }
 
-    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
+    fun setPosition(rowPosition: Int, itemPosition: Int) {
-        override fun onItemSelected(
+        rowList[rowPosition].post {
-            itemViewHolder: Presenter.ViewHolder?, item: Any?,
+            ((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
-            rowViewHolder: RowPresenter.ViewHolder, row: Row
+                itemPosition
-        ) {
+            )?.requestFocus()
-            if (item is TVViewModel) {
-                tvListViewModel.setItemPositionCurrent(item.id.value!!)
-                (activity as MainActivity).mainActive()
-            }
         }
     }
 
@@ -321,7 +289,7 @@ class MainFragment : BrowseSupportFragment() {
             putInt(POSITION, itemPosition)
             apply()
         }
-        Log.i(TAG, "$POSITION $itemPosition saved")
+        Log.i(TAG, "$POSITION saved")
     }
 
     override fun onDestroy() {
@@ -332,6 +300,12 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
+    override fun onDestroyView() {
+        Log.i(TAG, "onDestroyView")
+        super.onDestroyView()
+        _binding = null
+    }
+
     companion object {
         private const val TAG = "MainFragment"
         private const val POSITION = "position"

app/src/main/java/com/lizongying/mytv/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,23 @@ 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)
-
+        playerView = _binding!!.playerView
-        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?.viewTreeObserver?.addOnGlobalLayoutListener(object :
             ViewTreeObserver.OnGlobalLayoutListener {
             override fun onGlobalLayout() {
@@ -96,10 +78,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
             setMediaItem(MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
             prepare()
         }
-        exoPlayer?.run {
-            setMediaItem(com.google.android.exoplayer2.MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
-            prepare()
-        }
     }
 
     override fun onStart() {
@@ -109,11 +87,8 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
             Log.i(TAG, "replay")
             playerView!!.player?.prepare()
             playerView!!.player?.play()
-        }
+        } else {
-        if (exoPlayer?.isPlaying == false) {
+            Log.i(TAG, "playing")
-            Log.i(TAG, "replay")
-            exoPlayer?.prepare()
-            exoPlayer?.play()
         }
     }
 
@@ -127,9 +102,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
         if (playerView != null && playerView!!.player?.isPlaying == true) {
             playerView!!.player?.stop()
         }
-        if (exoPlayer?.isPlaying == true) {
-            exoPlayer?.stop()
-        }
     }
 
     override fun onDestroy() {
@@ -137,7 +109,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
         if (playerView != null) {
             playerView!!.player?.release()
         }
-        exoPlayer?.release()
     }
 
     override fun onDestroyView() {
@@ -148,16 +119,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

@@ -9,8 +9,6 @@ import com.lizongying.mytv.Utils.getDateFormat
 import com.lizongying.mytv.api.ApiClient
 import com.lizongying.mytv.api.Auth
 import com.lizongying.mytv.api.AuthRequest
-import com.lizongying.mytv.api.FAuth
-import com.lizongying.mytv.api.FAuthService
 import com.lizongying.mytv.api.Info
 import com.lizongying.mytv.api.LiveInfo
 import com.lizongying.mytv.api.LiveInfoRequest
@@ -35,12 +33,9 @@ class Request {
     private var yspApiService: YSPApiService = ApiClient().yspApiService
     private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
     private var yspProtoService: YSPProtoService = ApiClient().yspProtoService
-    private var fAuthService: FAuthService = ApiClient().fAuthService
     private var ysp: YSP? = null
     private var token = ""
 
-    private var needAuth = false
-
     // TODO onDestroy
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var btraceRunnable: BtraceRunnable
@@ -59,7 +54,7 @@ class Request {
     }
 
     var call: Call<LiveInfo>? = null
-    private var callAuth: Call<Auth>? = null
+    var callAuth: Call<Auth>? = null
 
     private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
         callAuth?.cancel()
@@ -79,7 +74,7 @@ class Request {
                         Log.i(TAG, "token ${liveInfo.data.token}")
                         ysp?.token = liveInfo.data.token
                         fetchVideo(tvModel, cookie)
-                    } else {
+                    }  else {
                         Log.e(TAG, "$title token error")
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
@@ -124,7 +119,7 @@ class Request {
                     if (tvModel.getTV().needToken) {
                         if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                             if (!tvModel.getTV().mustToken) {
-                                fetchAuth(tvModel, cookie)
+                                fetchVideo(tvModel, cookie)
                             }
                         } else {
                             token = ""
@@ -149,13 +144,7 @@ class Request {
         tvModel.seq = 0
         val data = ysp?.switch(tvModel)
         val request = data?.let { LiveInfoRequest(it) }
-        call = request?.let {
+        call = request?.let { yspApiService.getLiveInfo("guid=${ysp?.getGuid()}; $cookie", ysp!!.token, it) }
-            yspApiService.getLiveInfo(
-                "guid=${ysp?.getGuid()}; $cookie",
-                ysp!!.token,
-                it
-            )
-        }
 
         call?.enqueue(object : Callback<LiveInfo> {
             override fun onResponse(call: Call<LiveInfo>, response: Response<LiveInfo>) {
@@ -192,16 +181,13 @@ class Request {
                                     if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                         if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
-//                                            fetchAuth(tvModel, cookie)
                                         }
                                     } else {
                                         token = ""
                                         fetchVideo(tvModel)
-//                                        fetchAuth(tvModel)
                                     }
                                 } else {
                                     fetchVideo(tvModel, cookie)
-//                                    fetchAuth(tvModel, cookie)
                                 }
                             }
                         }
@@ -217,16 +203,13 @@ class Request {
                                     if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                         if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
-//                                            fetchAuth(tvModel, cookie)
                                         }
                                     } else {
                                         token = ""
                                         fetchVideo(tvModel)
-//                                        fetchAuth(tvModel)
                                     }
                                 } else {
                                     fetchVideo(tvModel, cookie)
-//                                    fetchAuth(tvModel, cookie)
                                 }
                             }
                         }
@@ -239,23 +222,20 @@ class Request {
                             if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchVideo(tvModel, cookie)
-//                                    fetchAuth(tvModel, cookie)
                                 }
                             } else {
                                 token = ""
                                 fetchVideo(tvModel)
-//                                fetchAuth(tvModel)
                             }
                         } else {
                             fetchVideo(tvModel, cookie)
-//                            fetchAuth(tvModel, cookie)
                         }
                     }
                 }
             }
 
             override fun onFailure(call: Call<LiveInfo>, t: Throwable) {
-                Log.e(TAG, "$title fetchVideo request error $t")
+                Log.e(TAG, "$title request error $t")
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {
@@ -277,7 +257,7 @@ class Request {
 
     fun fetchAuth(tvModel: TVViewModel) {
         if (token == "") {
-            yspTokenService.getInfo("")
+            yspTokenService.getInfo()
                 .enqueue(object : Callback<Info> {
                     override fun onResponse(call: Call<Info>, response: Response<Info>) {
                         if (response.isSuccessful) {
@@ -324,14 +304,14 @@ class Request {
 
     fun fetchVideo(tvModel: TVViewModel) {
         if (token == "") {
-            yspTokenService.getInfo("")
+            yspTokenService.getInfo()
                 .enqueue(object : Callback<Info> {
                     override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                        if (response.isSuccessful && response.body()?.data?.token != null) {
+                        if (response.isSuccessful) {
                             token = response.body()?.data?.token!!
                             Log.i(TAG, "info success $token")
                             val cookie =
-                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
                             fetchVideo(tvModel, cookie)
                         } else {
                             Log.e(TAG, "info status error")
@@ -364,67 +344,20 @@ class Request {
                 })
         } else {
             val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
             fetchVideo(tvModel, cookie)
         }
     }
 
-    private var fAuth: Call<FAuth>? = null
-    fun fetchFAuth(tvModel: TVViewModel) {
-        call?.cancel()
-        callAuth?.cancel()
-        fAuth?.cancel()
-
-        val title = tvModel.title.value
-
-        fAuth = fAuthService.getAuth(tvModel.getTV().pid, "HD")
-        fAuth?.enqueue(object : Callback<FAuth> {
-            override fun onResponse(call: Call<FAuth>, response: Response<FAuth>) {
-                if (response.isSuccessful && response.body()?.data?.live_url != null) {
-                    val url = response.body()?.data?.live_url!!
-//                    Log.d(TAG, "$title url $url")
-                    tvModel.addVideoUrl(url)
-                    tvModel.allReady()
-                    tvModel.retryTimes = 0
-                } else {
-                    Log.e(TAG, "auth status error")
-                    if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                        tvModel.tokenRetryTimes++
-                        fetchFAuth(tvModel)
-                    }
-                }
-            }
-
-            override fun onFailure(call: Call<FAuth>, t: Throwable) {
-                Log.e(TAG, "auth request error $t")
-                if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                    tvModel.tokenRetryTimes++
-                    fetchFAuth(tvModel)
-                }
-            }
-        })
-    }
-
     fun fetchData(tvModel: TVViewModel) {
-        if (tvModel.getTV().channel == "港澳台") {
-            fetchFAuth(tvModel)
-            return
-        }
-
         if (tvModel.getTV().needToken) {
-            if (needAuth) {
+//            fetchVideo(tvModel)
-                fetchAuth(tvModel)
+            fetchAuth(tvModel)
-            } else {
-                fetchVideo(tvModel)
-            }
         } else {
             val cookie =
                 "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205"
-            if (needAuth) {
+//            fetchVideo(tvModel, cookie)
-                fetchAuth(tvModel, cookie)
+            fetchAuth(tvModel, cookie)
-            } else {
-                fetchVideo(tvModel, cookie)
-            }
         }
     }
 
@@ -436,7 +369,7 @@ class Request {
     }
 
     fun fetchToken() {
-        yspTokenService.getInfo(token)
+        yspTokenService.getInfo()
             .enqueue(object : Callback<Info> {
                 override fun onResponse(call: Call<Info>, response: Response<Info>) {
                     if (response.isSuccessful) {

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

@@ -1,9 +1,11 @@
 package com.lizongying.mytv
 
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.RequiresApi
 import androidx.fragment.app.DialogFragment
 import com.lizongying.mytv.databinding.DialogBinding
 
@@ -13,7 +15,6 @@ class SettingFragment(
     private val versionCode: Long,
     private val channelReversal: Boolean,
     private val channelNum: Boolean,
-    private val bootStartup: Boolean,
 ) :
     DialogFragment() {
 
@@ -40,21 +41,12 @@ class SettingFragment(
         switchChannelReversal?.isChecked = channelReversal
         switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
             (activity as MainActivity).saveChannelReversal(isChecked)
-            (activity as MainActivity).settingActive()
         }
 
         val switchChannelNum = _binding?.switchChannelNum
         switchChannelNum?.isChecked = channelNum
         switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
             (activity as MainActivity).saveChannelNum(isChecked)
-            (activity as MainActivity).settingActive()
-        }
-
-        val switchBootStartup = _binding?.switchBootStartup
-        switchBootStartup?.isChecked = bootStartup
-        switchBootStartup?.setOnCheckedChangeListener { _, isChecked ->
-            (activity as MainActivity).saveBootStartup(isChecked)
-            (activity as MainActivity).settingActive()
         }
 
         updateManager = UpdateManager(context, this, versionCode)

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

@@ -1,22 +1,15 @@
 package com.lizongying.mytv
 
-import android.content.Context
-import android.util.Log
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.IOException
-
 object TVList {
     var list = mapOf(
-        "央视" to listOf(
+        "央视频道" to listOf(
             TV(
                 0,
                 "CCTV1 综合",
                 "CCTV1",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226231/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
                 "600001859",
                 "2022576801",
@@ -30,7 +23,7 @@ object TVList {
                 "CCTV2",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
                 "600001800",
                 "2022576701",
@@ -44,7 +37,7 @@ object TVList {
                 "CCTV3",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226397/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
                 "600001801",
                 "2022576501",
@@ -61,7 +54,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8"
                 ),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp",
                 "600001814",
                 "2022576601",
@@ -75,7 +68,7 @@ object TVList {
                 "CCTV5",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226395/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp",
                 "600001818",
                 "2022576401",
@@ -89,7 +82,7 @@ object TVList {
                 "CCTV6",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226393/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
                 "600108442",
                 "2013693901",
@@ -103,7 +96,7 @@ object TVList {
                 "CCTV7",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226192/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp",
                 "600004092",
                 "2022576201",
@@ -117,7 +110,7 @@ object TVList {
                 "CCTV8",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226391/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/ad51de94426a0ba039e6dd6a8534ea98ecc813a6176bde87b4f18cc34d6d7590.png?imageMogr2/format/webp",
                 "600001803",
                 "2022576101",
@@ -131,7 +124,7 @@ object TVList {
                 "CCTV9",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226197/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp",
                 "600004078",
                 "2022576001",
@@ -145,7 +138,7 @@ object TVList {
                 "CCTV10",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226189/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp",
                 "600001805",
                 "2022573001",
@@ -159,7 +152,7 @@ object TVList {
                 "CCTV11",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226240/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp",
                 "600001806",
                 "2022575901",
@@ -173,7 +166,7 @@ object TVList {
                 "CCTV12",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226190/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp",
                 "600001807",
                 "2022575801",
@@ -190,7 +183,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226233/index.m3u8"
                 ),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/266da7b43c03e2312186b4a999e0f060e8f15b10d2cc2c9aa32171819254cf1a.png?imageMogr2/format/webp",
                 "600001811",
                 "2022575701",
@@ -204,7 +197,7 @@ object TVList {
                 "CCTV14",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp",
                 "600001809",
                 "2022575601",
@@ -218,7 +211,7 @@ object TVList {
                 "CCTV15",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp",
                 "600001815",
                 "2022575501",
@@ -235,7 +228,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8"
                 ),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp",
                 "600098637",
                 "2022575401",
@@ -249,7 +242,7 @@ object TVList {
                 "CCTV17",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226198/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp",
                 "600001810",
                 "2022575301",
@@ -263,7 +256,7 @@ object TVList {
                 "CCTV5+",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226221/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp",
                 "600001817",
                 "2022576301",
@@ -277,7 +270,7 @@ object TVList {
                 "CCTV4K",
                 listOf(),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
                 "600002264",
                 "2022575201",
@@ -291,7 +284,7 @@ object TVList {
                 "CCTV8K",
                 listOf(),
                 0,
-                "央视",
+                "央视频道",
                 "",
                 "600156816",
                 "2020603421",
@@ -305,7 +298,7 @@ object TVList {
                 "CCTV风云剧场频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226950/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/4d549e53e6d0f632d5a633d1945280797b153e588f919221a07faa869812cc89.png?imageMogr2/format/webp",
                 "600099658",
                 "2012513603",
@@ -319,7 +312,7 @@ object TVList {
                 "CCTV第一剧场频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226959/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/a556bd7d93ce65e18f243a8892b5604f4faa994a4897315914216a710a706208.png?imageMogr2/format/webp",
                 "600099655",
                 "2012514403",
@@ -333,7 +326,7 @@ object TVList {
                 "CCTV怀旧剧场频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226972/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/5661bd04fecdb6e899f801147a22ab5d3a475bf2b62e30aec2c0023190ebc9b1.png?imageMogr2/format/webp",
                 "600099620",
                 "2012511203",
@@ -347,7 +340,7 @@ object TVList {
                 "CCTV世界地理频道",
                 listOf(),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/bb3c6c9e145d698137f5bb64a582021a01b51344b929003630eb769ea65832a9.png?imageMogr2/format/webp",
                 "600099637",
                 "2012513303",
@@ -361,7 +354,7 @@ object TVList {
                 "CCTV风云音乐频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226953/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/bbf1d024c5228b8dd128b0e3cb1717d173fab4ee84c3a4c8a57b1a215362ca3b.png?imageMogr2/format/webp",
                 "600099660",
                 "2012514103",
@@ -375,7 +368,7 @@ object TVList {
                 "CCTV兵器科技频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226975/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/4c6b6a6d3839889f34d33db3c2f80233b26b74d3489b393487635f8704e70796.png?imageMogr2/format/webp",
                 "600099649",
                 "2012513403",
@@ -389,7 +382,7 @@ object TVList {
                 "CCTV风云足球频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226984/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/cd1e2bb52b06a991de168733e5ff0f1d85adc8042d40c8f393f723543e5dd08a.png?imageMogr2/format/webp",
                 "600099636",
                 "2012514203",
@@ -403,7 +396,7 @@ object TVList {
                 "CCTV高尔夫·网球频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226978/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/cdd1b31ede7a5ad049ed53d9a072422f829e72dd062ed2c19e077fdd01699071.png?imageMogr2/format/webp",
                 "600099659",
                 "2012512503",
@@ -417,7 +410,7 @@ object TVList {
                 "CCTV女性时尚频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226969/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/fa28955ce8b2539d728bf4c6a13a46ff57ad76eae46627f7bcfb1ed8a613d3fc.png?imageMogr2/format/webp",
                 "600099650",
                 "2012513903",
@@ -431,7 +424,7 @@ object TVList {
                 "CCTV央视文化精品频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226981/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/14ac5ce40482cacd3d4b37435222bfe86af2b452a2f04ecbfc1d13d76edd7c57.png?imageMogr2/format/webp",
                 "600099653",
                 "2012513803",
@@ -445,7 +438,7 @@ object TVList {
                 "CCTV央视台球频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226956/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/10e14a92478011aa6c3c8562e62127f3b1908e29fcd78e4b2b24b9e6d3ec2fbc.png?imageMogr2/format/webp",
                 "600099652",
                 "2012513703",
@@ -459,7 +452,7 @@ object TVList {
                 "CCTV电视指南频道",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226987/index.m3u8"),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/244d72c0eb1615ed7d51c2f5db5a67f306aa3f58c05bc2d34de3aa7e956dc8c9.png?imageMogr2/format/webp",
                 "600099656",
                 "2012514003",
@@ -473,7 +466,7 @@ object TVList {
                 "CCTV卫生健康频道",
                 listOf(),
                 0,
-                "央视",
+                "央视频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/54a6863656fdfd8f803be193ddf22441c5000a108833889816fd2d8911715ce8.png?imageMogr2/format/webp",
                 "600099651",
                 "2012513503",
@@ -482,14 +475,14 @@ object TVList {
                 mustToken = true
             ),
         ),
-        "地方" to listOf(
+        "地方频道" to listOf(
             TV(
                 33,
                 "东方卫视",
                 "东方卫视",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226217/index.m3u8"),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp",
                 "600002483",
                 "2000292403",
@@ -506,7 +499,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226211/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp",
                 "600002475",
                 "2000296203",
@@ -523,7 +516,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226194/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp",
                 "600002508",
                 "2000294503",
@@ -540,7 +533,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226201/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/ac4ed6058a87c101ae7147ebc38905d0cae047fb73fd277ee5049b84f52bda36.png?imageMogr2/format/webp",
                 "600002505",
                 "2000281303",
@@ -557,7 +550,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp",
                 "600002521",
                 "2000295603",
@@ -574,7 +567,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225764/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/3c760d0d00463855890e8a1864ea4a6b6dd66b90c29b4ac714a4b17c16519871.png?imageMogr2/format/webp",
                 "600002503",
                 "2000294103",
@@ -588,7 +581,7 @@ object TVList {
                 "山东卫视",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226209/index.m3u8"),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/22d403f07a7cf5410b3ad3ddb65a11aa229a32475fac213f5344c9f0ec330ca1.png?imageMogr2/format/webp",
                 "600002513",
                 "2000294803",
@@ -602,7 +595,7 @@ object TVList {
                 "广东卫视",
                 listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226216/index.m3u8"),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/28886880a4dc0f06fb7e0a528a1def0591d61a65870e29176ede0cc92033bbfd.png?imageMogr2/format/webp",
                 "600002485",
                 "2000292703",
@@ -619,7 +612,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225770/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/54b7e97cb816bb223fe05f3fc44da2c7820eb66e8550c19d23100f2c414ecc38.png?imageMogr2/format/webp",
                 "600002509",
                 "2000294203",
@@ -636,7 +629,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226202/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/657651f411de2673d1770d9a78b44c1265704f7468cc41d4be7f51d630768494.png?imageMogr2/format/webp",
                 "600002531",
                 "2000297803",
@@ -653,7 +646,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225767/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/74925962148a6d31c85808b6cd4e444c2a54bab393d2c5fc85e960b50e22fa86.png?imageMogr2/format/webp",
                 "600002525",
                 "2000296103",
@@ -670,7 +663,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225750/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/d545becdc81c60197b08c7f47380705e4665ed3fe55efc8b855e486f6e655378.png?imageMogr2/format/webp",
                 "600002493",
                 "2000293403",
@@ -687,7 +680,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225793/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/4eb45f4781d33d872af027dc01c941559aab55667dd99cc5c22bef7037807b13.png?imageMogr2/format/webp",
                 "600002490",
                 "2000293303",
@@ -704,7 +697,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226222/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/f4f23633c578beea49a3841d88d3490100f029ee349059fa532869db889872c5.png?imageMogr2/format/webp",
                 "600002309",
                 "2000272103",
@@ -721,7 +714,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226215/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/d8273ae9be698ce2db21f5b886ecac95a73429593f93713c60ed8c12c38bf0d3.png?imageMogr2/format/webp",
                 "600002498",
                 "2000293903",
@@ -738,7 +731,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226199/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/a66c836bd98ba3e41a2e9a570d4b9c50dedc6839e9de333e2e78212ad505f37e.png?imageMogr2/format/webp",
                 "600002520",
                 "2000295503",
@@ -755,7 +748,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226203/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/f35fa04b51b1ee4984b03578b65403570868ebca03c6c01e11b097f999a58d9b.png?imageMogr2/format/webp",
                 "600002532",
                 "2000298003",
@@ -772,7 +765,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp",
                 "600002481",
                 "2000292203",
@@ -789,7 +782,7 @@ object TVList {
                     "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
                 "600002516",
                 "2000295003",
@@ -806,7 +799,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225766/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp",
                 "600002484",
                 "2000292503",
@@ -823,7 +816,7 @@ object TVList {
                     "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225769/index.m3u8"
                 ),
                 0,
-                "地方",
+                "地方频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp",
                 "600002506",
                 "2000291503",
@@ -837,7 +830,7 @@ object TVList {
                 "天津卫视",
                 listOf(),
                 0,
-                "地方",
+                "地方频道",
                 "",
                 "600152137",
                 "2019927003",
@@ -851,7 +844,7 @@ object TVList {
                 "新疆卫视",
                 listOf(),
                 0,
-                "地方",
+                "地方频道",
                 "",
                 "600152138",
                 "2019927403",
@@ -865,7 +858,7 @@ object TVList {
                 "兵团卫视",
                 listOf(),
                 0,
-                "地方",
+                "地方频道",
                 "",
                 "600170344",
                 "2022606701",
@@ -874,58 +867,14 @@ object TVList {
                 mustToken = false
             ),
         ),
-        "港澳台" to listOf(
+        "国际频道" to listOf(
             TV(
                 57,
-                "凤凰卫视资讯台",
-                "",
-                listOf(),
-                0,
-                "港澳台",
-                "http://c1.fengshows-cdn.com/a/2021_22/79dcc3a9da358a3.png",
-                "7c96b084-60e1-40a9-89c5-682b994fb680",
-                "",
-                "",
-                false,
-                mustToken = false
-            ),
-            TV(
-                58,
-                "凤凰卫视中文台",
-                "",
-                listOf(),
-                0,
-                "港澳台",
-                "http://c1.fengshows-cdn.com/a/2021_22/ede3d9e09be28e5.png",
-                "f7f48462-9b13-485b-8101-7b54716411ec",
-                "",
-                "",
-                false,
-                mustToken = false
-            ),
-            TV(
-                59,
-                "凤凰卫视香港台",
-                "",
-                listOf(),
-                0,
-                "港澳台",
-                "http://c1.fengshows-cdn.com/a/2021_23/325d941090bee17.png",
-                "15e02d92-1698-416c-af2f-3e9a872b4d78",
-                "",
-                "",
-                false,
-                mustToken = false
-            ),
-        ),
-        "国际" to listOf(
-            TV(
-                60,
                 "CGTN",
                 "CGTN",
                 listOf("http://live.cgtn.com/1000/prog_index.m3u8"),
                 0,
-                "国际",
+                "国际频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp",
                 "600014550",
                 "2022575001",
@@ -934,12 +883,12 @@ object TVList {
                 mustToken = false
             ),
             TV(
-                61,
+                58,
                 "CGTN 法语频道",
                 "CGTN法语频道",
                 listOf("https://livefr.cgtn.com/1000f/prog_index.m3u8"),
                 0,
-                "国际",
+                "国际频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp",
                 "600084704",
                 "2022574901",
@@ -948,12 +897,12 @@ object TVList {
                 mustToken = false
             ),
             TV(
-                62,
+                59,
                 "CGTN 俄语频道",
                 "CGTN俄语频道",
                 listOf("http://liveru.cgtn.com/1000r/prog_index.m3u8"),
                 0,
-                "国际",
+                "国际频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp",
                 "600084758",
                 "2022574801",
@@ -962,12 +911,12 @@ object TVList {
                 mustToken = false
             ),
             TV(
-                63,
+                60,
                 "CGTN 阿拉伯语频道",
                 "CGTN阿拉伯语频道",
                 listOf("http://livear.cgtn.com/1000a/prog_index.m3u8"),
                 0,
-                "国际",
+                "国际频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp",
                 "600084782",
                 "2022574601",
@@ -976,7 +925,7 @@ object TVList {
                 mustToken = false
             ),
             TV(
-                64,
+                61,
                 "CGTN 西班牙语频道",
                 "CGTN西班牙语频道",
                 listOf(
@@ -984,7 +933,7 @@ object TVList {
                     "http://livees.cgtn.com/1000e/prog_index.m3u8"
                 ),
                 0,
-                "国际",
+                "国际频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp",
                 "600084744",
                 "2022571701",
@@ -993,12 +942,12 @@ object TVList {
                 mustToken = false
             ),
             TV(
-                65,
+                62,
                 "CGTN 纪录频道",
                 "CGTN外语纪录频道",
                 listOf("https://livedoc.cgtn.com/500d/prog_index.m3u8"),
                 0,
-                "国际",
+                "国际频道",
                 "https://resources.yangshipin.cn/assets/oms/image/202309/74d3ac436a7e374879578de1d87a941fbf566d39d5632b027c5097891ed32bd5.png?imageMogr2/format/webp",
                 "600084781",
                 "2022574701",
@@ -1008,63 +957,4 @@ object TVList {
             ),
         )
     )
-
-    /**
-     * 初始化
-     *
-     * @param context Context
-     */
-    fun init(context: Context) {
-        CoroutineScope(Dispatchers.Default).launch {
-            //获取本地版本号
-            val localVersion = ChannelUtils.getLocalVersion(context)
-            //获取服务器版本号
-            val serverVersion = try {
-                ChannelUtils.getServerVersion(context)
-            } catch (e: IOException) {
-                Log.e("TVList", "无法从服务器获取版本信息", e)
-                Integer.MIN_VALUE
-            }
-            //频道列表
-            val channelTVMap: MutableMap<String, MutableList<TV>> = mutableMapOf()
-            //是否从服务器更新
-            var updateFromServer = false
-            //获取频道列表
-            val tvList: List<TV> = if (localVersion < serverVersion) {
-                //获取服务器地址
-                val url = ChannelUtils.getServerUrl(context)
-                //是否从服务器更新
-                updateFromServer = true
-                Log.i("TVList", "从服务器获取频道信息")
-                try {
-                    ChannelUtils.getServerChannel(url)
-                } catch (e: IOException) {
-                    Log.e("TVList", "无法从服务器获取频道信息", e)
-                    updateFromServer = false
-                    ChannelUtils.getLocalChannel(context)
-                }
-            } else {
-                Log.i("TVList", "从本地获取频道信息")
-                //获取本地频道
-                ChannelUtils.getLocalChannel(context)
-            }
-            //按频道分类
-            for (tv in tvList) {
-                val key = tv.channel
-                if (channelTVMap.containsKey(key)) {
-                    val list = channelTVMap[key]!!
-                    list.add(tv)
-                    channelTVMap[key] = list
-                } else {
-                    channelTVMap[key] = mutableListOf(tv)
-                }
-            }
-            //保存频道列表
-            list = channelTVMap
-            //保存版本号
-            if (updateFromServer) {
-                ChannelUtils.updateLocalChannel(context, serverVersion, tvList)
-            }
-        }
-    }
 }

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

@@ -1,12 +1,13 @@
 package com.lizongying.mytv
 
+import android.content.Context
 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.File
 import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -73,5 +74,48 @@ object Utils {
         ).toInt()
     }
 
-    fun isTmallDevice() = Build.MANUFACTURER.equals("Tmall", ignoreCase = true)
+    /**
+     * 获取可读写的目录
+     *
+     * @param context 应用环境信息
+     *
+     * @return 可读写的目录
+     *
+     */
+    fun getAppDirectory(context: Context): File {
+        return context.filesDir
+    }
+
+    /**
+     * 更新channels.json
+     *
+     * @param context 应用环境信息
+     *
+     * @return 无
+     *
+     * @throws IOException 网络请求失败
+     */
+    fun updateChannel(context: Context) {
+        val client = okhttp3.OkHttpClient()
+        val request = okhttp3.Request.Builder().url(getServerUrl(context)).build()
+        client.newCall(request).execute().use { response ->
+            if (!response.isSuccessful) throw IOException("Unexpected code $response")
+            val body = response.body()
+            //覆盖channels.json
+            val file = File(getAppDirectory(context), "channels.json")
+            if (!file.exists()) {
+                file.createNewFile()
+            }
+            file.writeText(body!!.string())
+        }
+    }
+
+    /**
+     * 从res/values/server.xml获取服务器地址
+     * @param context 应用环境信息
+     * @return 服务器地址
+     */
+    private fun getServerUrl(context: Context): String {
+        return context.resources.getString(R.string.server_url)
+    }
 }

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

@@ -5,6 +5,8 @@ import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.protobuf.ProtoConverterFactory
+import java.net.InetSocketAddress
+import java.net.Proxy
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
@@ -16,7 +18,7 @@ class ApiClient {
     private val devUrl = "http://10.0.2.2:8081/"
     private val protoUrl = "https://capi.yangshipin.cn/"
     private val traceUrl = "https://btrace.yangshipin.cn/"
-    private val fUrl = "https://m.fengshows.com/"
+
 
     private var okHttpClient = getUnsafeOkHttpClient()
 
@@ -38,7 +40,7 @@ class ApiClient {
 
     val releaseService: ReleaseService by lazy {
         Retrofit.Builder()
-            .baseUrl(myUrl)
+            .baseUrl(devUrl)
             .client(okHttpClient)
             .addConverterFactory(GsonConverterFactory.create())
             .build().create(ReleaseService::class.java)
@@ -60,14 +62,6 @@ class ApiClient {
             .build().create(YSPBtraceService::class.java)
     }
 
-    val fAuthService: FAuthService by lazy {
-        Retrofit.Builder()
-            .baseUrl(fUrl)
-            .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build().create(FAuthService::class.java)
-    }
-
     private fun getUnsafeOkHttpClient(): OkHttpClient {
         try {
             val trustAllCerts: Array<TrustManager> = arrayOf(

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

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

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

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

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

@@ -1,6 +1,5 @@
 package com.lizongying.mytv.api
 
-
 data class Info(
     val code: Int?,
     val msg: String?,

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

@@ -2,12 +2,10 @@ package com.lizongying.mytv.api
 
 import retrofit2.Call
 import retrofit2.http.GET
-import retrofit2.http.Query
 
 
 interface YSPTokenService {
     @GET("my-tv/v1/info")
     fun getInfo(
-        @Query("token") token: String = "",
     ): Call<Info>
 }

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

@@ -13,6 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:layout_marginTop="0dp"
+        android:text="99"
         android:textColor="#FFEEEEEE"
         android:textStyle="bold"
         android:textSize="50sp" />

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

@@ -64,12 +64,6 @@
                 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>
         <ImageView
             android:layout_width="300dp"

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

@@ -2,7 +2,7 @@
   {
     "id": 0,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
     "pid": "600001859",
     "sid": "2000210103",
@@ -17,7 +17,7 @@
   {
     "id": 1,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
     "pid": "600001800",
     "sid": "2000203603",
@@ -32,7 +32,7 @@
   {
     "id": 2,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
     "pid": "600001801",
     "sid": "2000203803",
@@ -47,7 +47,7 @@
   {
     "id": 3,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp",
     "pid": "600001814",
     "sid": "2000204803",
@@ -63,7 +63,7 @@
   {
     "id": 4,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp",
     "pid": "600001818",
     "sid": "2000205103",
@@ -78,7 +78,7 @@
   {
     "id": 5,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
     "pid": "600001802",
     "sid": "2013693901",
@@ -93,7 +93,7 @@
   {
     "id": 6,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp",
     "pid": "600004092",
     "sid": "2000510003",
@@ -108,7 +108,7 @@
   {
     "id": 7,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ad51de94426a0ba039e6dd6a8534ea98ecc813a6176bde87b4f18cc34d6d7590.png?imageMogr2/format/webp",
     "pid": "600001803",
     "sid": "2000203903",
@@ -123,7 +123,7 @@
   {
     "id": 8,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp",
     "pid": "600004078",
     "sid": "2000499403",
@@ -138,7 +138,7 @@
   {
     "id": 9,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp",
     "pid": "600001805",
     "sid": "2000203503",
@@ -153,7 +153,7 @@
   {
     "id": 10,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp",
     "pid": "600001806",
     "sid": "2000204103",
@@ -168,7 +168,7 @@
   {
     "id": 11,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp",
     "pid": "600001807",
     "sid": "2000202603",
@@ -183,7 +183,7 @@
   {
     "id": 12,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/266da7b43c03e2312186b4a999e0f060e8f15b10d2cc2c9aa32171819254cf1a.png?imageMogr2/format/webp",
     "pid": "600001811",
     "sid": "2000204603",
@@ -199,7 +199,7 @@
   {
     "id": 13,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp",
     "pid": "600001809",
     "sid": "2000204403",
@@ -214,7 +214,7 @@
   {
     "id": 14,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp",
     "pid": "600001815",
     "sid": "2000205003",
@@ -229,7 +229,7 @@
   {
     "id": 15,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp",
     "pid": "600098637",
     "sid": "2012375003",
@@ -245,7 +245,7 @@
   {
     "id": 16,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp",
     "pid": "600001810",
     "sid": "2000204203",
@@ -260,7 +260,7 @@
   {
     "id": 17,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp",
     "pid": "600001817",
     "sid": "2000204503",
@@ -275,7 +275,7 @@
   {
     "id": 18,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
     "pid": "600002264",
     "sid": "2000266303",
@@ -290,7 +290,7 @@
   {
     "id": 19,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "",
     "pid": "600156816",
     "sid": "2020603421",
@@ -305,7 +305,7 @@
   {
     "id": 20,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4d549e53e6d0f632d5a633d1945280797b153e588f919221a07faa869812cc89.png?imageMogr2/format/webp",
     "pid": "600099658",
     "sid": "2012513603",
@@ -320,7 +320,7 @@
   {
     "id": 21,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a556bd7d93ce65e18f243a8892b5604f4faa994a4897315914216a710a706208.png?imageMogr2/format/webp",
     "pid": "600099655",
     "sid": "2012514403",
@@ -335,7 +335,7 @@
   {
     "id": 22,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/5661bd04fecdb6e899f801147a22ab5d3a475bf2b62e30aec2c0023190ebc9b1.png?imageMogr2/format/webp",
     "pid": "600099620",
     "sid": "2012511203",
@@ -350,7 +350,7 @@
   {
     "id": 23,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bb3c6c9e145d698137f5bb64a582021a01b51344b929003630eb769ea65832a9.png?imageMogr2/format/webp",
     "pid": "600099637",
     "sid": "2012513303",
@@ -365,7 +365,7 @@
   {
     "id": 24,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bbf1d024c5228b8dd128b0e3cb1717d173fab4ee84c3a4c8a57b1a215362ca3b.png?imageMogr2/format/webp",
     "pid": "600099660",
     "sid": "2012514103",
@@ -380,7 +380,7 @@
   {
     "id": 25,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4c6b6a6d3839889f34d33db3c2f80233b26b74d3489b393487635f8704e70796.png?imageMogr2/format/webp",
     "pid": "600099649",
     "sid": "2012513403",
@@ -395,7 +395,7 @@
   {
     "id": 26,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cd1e2bb52b06a991de168733e5ff0f1d85adc8042d40c8f393f723543e5dd08a.png?imageMogr2/format/webp",
     "pid": "600099636",
     "sid": "2012514203",
@@ -410,7 +410,7 @@
   {
     "id": 27,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cdd1b31ede7a5ad049ed53d9a072422f829e72dd062ed2c19e077fdd01699071.png?imageMogr2/format/webp",
     "pid": "600099659",
     "sid": "2012512503",
@@ -425,7 +425,7 @@
   {
     "id": 28,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/fa28955ce8b2539d728bf4c6a13a46ff57ad76eae46627f7bcfb1ed8a613d3fc.png?imageMogr2/format/webp",
     "pid": "600099650",
     "sid": "2012513903",
@@ -440,7 +440,7 @@
   {
     "id": 29,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/14ac5ce40482cacd3d4b37435222bfe86af2b452a2f04ecbfc1d13d76edd7c57.png?imageMogr2/format/webp",
     "pid": "600099653",
     "sid": "2012513803",
@@ -455,7 +455,7 @@
   {
     "id": 30,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/10e14a92478011aa6c3c8562e62127f3b1908e29fcd78e4b2b24b9e6d3ec2fbc.png?imageMogr2/format/webp",
     "pid": "600099652",
     "sid": "2012513703",
@@ -470,7 +470,7 @@
   {
     "id": 31,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/244d72c0eb1615ed7d51c2f5db5a67f306aa3f58c05bc2d34de3aa7e956dc8c9.png?imageMogr2/format/webp",
     "pid": "600099656",
     "sid": "2012514003",
@@ -485,7 +485,7 @@
   {
     "id": 32,
     "videoIndex": 0,
-    "channel": "央视",
+    "channel": "央视频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54a6863656fdfd8f803be193ddf22441c5000a108833889816fd2d8911715ce8.png?imageMogr2/format/webp",
     "pid": "600099651",
     "sid": "2012513503",
@@ -500,7 +500,7 @@
   {
     "id": 33,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp",
     "pid": "600002483",
     "sid": "2000292403",
@@ -515,7 +515,7 @@
   {
     "id": 34,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp",
     "pid": "600002475",
     "sid": "2000296203",
@@ -531,7 +531,7 @@
   {
     "id": 35,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp",
     "pid": "600002508",
     "sid": "2000294503",
@@ -547,7 +547,7 @@
   {
     "id": 36,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ac4ed6058a87c101ae7147ebc38905d0cae047fb73fd277ee5049b84f52bda36.png?imageMogr2/format/webp",
     "pid": "600002505",
     "sid": "2000281303",
@@ -563,7 +563,7 @@
   {
     "id": 37,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp",
     "pid": "600002521",
     "sid": "2000295603",
@@ -579,7 +579,7 @@
   {
     "id": 38,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3c760d0d00463855890e8a1864ea4a6b6dd66b90c29b4ac714a4b17c16519871.png?imageMogr2/format/webp",
     "pid": "600002503",
     "sid": "2000294103",
@@ -595,7 +595,7 @@
   {
     "id": 39,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/22d403f07a7cf5410b3ad3ddb65a11aa229a32475fac213f5344c9f0ec330ca1.png?imageMogr2/format/webp",
     "pid": "600002513",
     "sid": "2000294803",
@@ -610,7 +610,7 @@
   {
     "id": 40,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/28886880a4dc0f06fb7e0a528a1def0591d61a65870e29176ede0cc92033bbfd.png?imageMogr2/format/webp",
     "pid": "600002485",
     "sid": "2000292703",
@@ -625,7 +625,7 @@
   {
     "id": 41,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54b7e97cb816bb223fe05f3fc44da2c7820eb66e8550c19d23100f2c414ecc38.png?imageMogr2/format/webp",
     "pid": "600002509",
     "sid": "2000294203",
@@ -641,7 +641,7 @@
   {
     "id": 42,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/657651f411de2673d1770d9a78b44c1265704f7468cc41d4be7f51d630768494.png?imageMogr2/format/webp",
     "pid": "600002531",
     "sid": "2000297803",
@@ -657,7 +657,7 @@
   {
     "id": 43,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/74925962148a6d31c85808b6cd4e444c2a54bab393d2c5fc85e960b50e22fa86.png?imageMogr2/format/webp",
     "pid": "600002525",
     "sid": "2000296103",
@@ -673,7 +673,7 @@
   {
     "id": 44,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d545becdc81c60197b08c7f47380705e4665ed3fe55efc8b855e486f6e655378.png?imageMogr2/format/webp",
     "pid": "600002493",
     "sid": "2000293403",
@@ -689,7 +689,7 @@
   {
     "id": 45,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4eb45f4781d33d872af027dc01c941559aab55667dd99cc5c22bef7037807b13.png?imageMogr2/format/webp",
     "pid": "600002490",
     "sid": "2000293303",
@@ -705,7 +705,7 @@
   {
     "id": 46,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f4f23633c578beea49a3841d88d3490100f029ee349059fa532869db889872c5.png?imageMogr2/format/webp",
     "pid": "600002309",
     "sid": "2000272103",
@@ -721,7 +721,7 @@
   {
     "id": 47,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d8273ae9be698ce2db21f5b886ecac95a73429593f93713c60ed8c12c38bf0d3.png?imageMogr2/format/webp",
     "pid": "600002498",
     "sid": "2000293903",
@@ -737,7 +737,7 @@
   {
     "id": 48,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a66c836bd98ba3e41a2e9a570d4b9c50dedc6839e9de333e2e78212ad505f37e.png?imageMogr2/format/webp",
     "pid": "600002520",
     "sid": "2000295503",
@@ -753,7 +753,7 @@
   {
     "id": 49,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f35fa04b51b1ee4984b03578b65403570868ebca03c6c01e11b097f999a58d9b.png?imageMogr2/format/webp",
     "pid": "600002532",
     "sid": "2000298003",
@@ -769,7 +769,7 @@
   {
     "id": 50,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp",
     "pid": "600002481",
     "sid": "2000292203",
@@ -785,7 +785,7 @@
   {
     "id": 51,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
     "pid": "600002516",
     "sid": "2000295003",
@@ -801,7 +801,7 @@
   {
     "id": 52,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp",
     "pid": "600002484",
     "sid": "2000292503",
@@ -817,7 +817,7 @@
   {
     "id": 53,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp",
     "pid": "600002506",
     "sid": "2000291503",
@@ -833,7 +833,7 @@
   {
     "id": 54,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "",
     "pid": "600152137",
     "sid": "2019927003",
@@ -848,7 +848,7 @@
   {
     "id": 55,
     "videoIndex": 0,
-    "channel": "地方",
+    "channel": "地方频道",
     "logo": "",
     "pid": "600152138",
     "sid": "2019927403",

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

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

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

@@ -3,5 +3,4 @@
     <string name="title_channel_reversal">换台反转</string>
     <string name="title_channel_num">数字选台</string>
     <string name="check_version">检查更新</string>
-    <string name="title_boot_startup">开机自启</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>