fix crash on setting

HISTORY.md

@@ -0,0 +1,229 @@
+## 更新日志
+
+### v1.7.2（通用）
+
+* 支持节目列表网格样式和行样式切换，软件重启后生效
+* 节目列表样式变更
+
+### v1.7.1（安卓5及以上专用）
+
+* 解决设置页更新闪退的问题
+* 凤凰卫视回归
+* 解决368问题
+
+### v1.7.0（通用）
+
+* 网络请求优化
+
+### v1.6.9（安卓5及以上专用）
+
+* 去掉港澳台和国际频道
+* 解决部分情况下3、6、8等频道无法播放的问题
+* 解决部分情况下启动后黑屏问题
+
+### v1.6.8（通用）
+
+* 修复部分设备崩溃的问题
+* 修复部分设备凤凰卫视无法播放的问题
+
+### v1.6.7（安卓5及以上专用）
+
+* 手机双击打开配置
+* 自动更新
+
+### v1.6.6（通用）
+
+* 更新重庆卫视图标
+* 凤凰卫视增强画质
+* 凤凰卫视增加EPG
+
+### v1.6.5（安卓5及以上专用）
+
+* 增加CETV1图标
+* 稳定性提升
+
+### v1.6.4（通用）
+
+* 增加CETV1
+* 增加凤凰卫视
+* 默认关闭开机启动
+
+### v1.6.3（安卓5及以上专用）
+
+* 增加CETV1
+* 凤凰卫视增强画质
+* 默认关闭开机启动
+* 延迟菜单自动关闭时间
+* 解决一些可能导致首次打开时黑屏的问题
+
+### v1.6.2（通用）
+
+* 修复按键无效的问题
+* 新的频道列表样式
+
+### v1.6.1（安卓5及以上专用）
+
+* 增加凤凰卫视
+
+### v1.6.0（通用）
+
+* 通用（春晚緊急修復）
+
+### v1.5.9（安卓5及以上专用）
+
+* 解决天猫魔盒闪退问题
+
+### v1.5.8（通用）
+
+* 修复央视6画质差的问题
+* 增加兵团卫视
+* 播放失败重试
+
+### v1.5.7（安卓5及以上专用）
+
+* 修复播放失败的问题
+
+### v1.5.6（通用）
+
+* 解决部分设备系统时间不对导致播放失败的问题
+
+### v1.5.5（安卓5及以上专用）
+
+* 修复播放失败的问题
+* 修复APP恢复后频道号、频道列表不自动消失的问题
+
+### v1.5.4（通用）
+
+* 修复播放失败的问题
+
+### 以下已不可用
+
+### v1.5.3（安卓5及以上专用）
+
+* 修复部分情况下APP切换后无法继续播放的问题
+* 优化重试逻辑
+
+### v1.5.2（通用）
+
+* 修复APP恢复后频道号、频道列表不自动消失的问题
+
+### v1.5.1（安卓5及以上专用）
+
+* 性能优化
+
+### v1.5.0（通用）
+
+* 修复部分情况下APP切换后无法继续播放的问题
+
+### v1.4.9（安卓5及以上专用）
+
+* 同步v1.4.8
+
+### v1.4.8（通用）
+
+* 频道号从1开始，CCTV5+为18
+* 提高CCTV6清晰度
+* 增加天津卫视、新疆卫视
+
+### v1.4.7（安卓5及以上专用）
+
+* 修复部分用户CCTV13播放过程中卡住的问题
+* 调整CCTV的频道顺序
+
+### v1.4.6（通用）
+
+* 10以下频道不再需要先按0
+
+### v1.4.5（安卓5及以上专用）
+
+* 数字选台配置
+
+### 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
+
+* 部分错误会提示用户
+* 菜单3秒钟后自动关闭
+
+### v1.3.2
+
+* 增加重试，减少因网络问题导致的播放失败
+* 优化横幅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
+* 解决部分频道无法播放的问题
+* 修复切换时有时没有恢复播放的问题
+* 左右键不再切换源
+* 增大频道信息标题尺寸，缩小与节目信息的间隔
+
+### v1.2.5
+
+* 美化频道信息显示
+* 优化节目单获取
+
+### v1.2.4
+
+* 改变换台滑动方向，上一个频道下滑，下一个频道上滑
+* 软件退出时，退出播放器
+* 播放相同的频道，不再重复加载
+* 暂时移除部分频道
+
+### v1.2.3
+
+* 固定视频比列为16:9
+* 隐藏全面屏底部的小横条
+* 移除移动专区
+* 修复一个闪退问题
+* 更换图标和应用名

README.md

@@ -4,203 +4,9 @@
 
 ## 使用
 
-下载安装 [releases](https://github.com/lizongying/my-tv/releases/)
-
-更多地址 [my-tv](https://lyrics.run/my-tv.html)
-
-![image](./screenshots/img_3.png)
-![image](./screenshots/img_2.png)
-![image](./screenshots/img_1.png)
-
-## 更新日志
-
-### v1.6.4（通用）
-
-* 增加CETV1
-* 增加凤凰卫视
-* 默认关闭开机启动
-
-### v1.6.3（安卓5及以上专用）
-
-* 增加CETV1
-* 凤凰卫视增强画质
-* 默认关闭开机启动
-* 延迟菜单自动关闭时间
-* 解决一些可能导致首次打开时黑屏的问题
-
-### v1.6.2（通用）
-
-* 修复按键无效的问题
-* 新的频道列表样式
-
-### v1.6.1（安卓5及以上专用）
-
-* 增加凤凰卫视
-
-### v1.6.0（通用）
-
-* 通用（春晚緊急修復）
-
-### v1.5.9（安卓5及以上专用）
-
-* 解决天猫魔盒闪退问题
-
-### v1.5.8（通用）
-
-* 修复央视6画质差的问题
-* 增加兵团卫视
-* 播放失败重试
-
-### v1.5.7（安卓5及以上专用）
-
-* 修复播放失败的问题
-
-### v1.5.6（通用）
-
-* 解决部分设备系统时间不对导致播放失败的问题
-
-### v1.5.5（安卓5及以上专用）
-
-* 修复播放失败的问题
-* 修复APP恢复后频道号、频道列表不自动消失的问题
-
-### v1.5.4（通用）
-
-* 修复播放失败的问题
-
-### 以下已不可用
-
-### v1.5.3（安卓5及以上专用）
-
-* 修复部分情况下APP切换后无法继续播放的问题
-* 优化重试逻辑
-
-### v1.5.2（通用）
-
-* 修复APP恢复后频道号、频道列表不自动消失的问题
-
-### v1.5.1（安卓5及以上专用）
-
-* 性能优化
-
-### v1.5.0（通用）
-
-* 修复部分情况下APP切换后无法继续播放的问题
-
-### v1.4.9（安卓5及以上专用）
-
-* 同步v1.4.8
-
-### v1.4.8（通用）
-
-* 频道号从1开始，CCTV5+为18
-* 提高CCTV6清晰度
-* 增加天津卫视、新疆卫视
-
-### v1.4.7（安卓5及以上专用）
-
-* 修复部分用户CCTV13播放过程中卡住的问题
-* 调整CCTV的频道顺序
-
-### v1.4.6（通用）
-
-* 10以下频道不再需要先按0
-
-### v1.4.5（安卓5及以上专用）
-
-* 数字选台配置
-
-### 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
-
-* 部分错误会提示用户
-* 菜单3秒钟后自动关闭
-
-### v1.3.2
-
-* 增加重试，减少因网络问题导致的播放失败
-* 优化横幅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
-* 解决部分频道无法播放的问题
-* 修复切换时有时没有恢复播放的问题
-* 左右键不再切换源
-* 增大频道信息标题尺寸，缩小与节目信息的间隔
-
-### v1.2.5
-
-* 美化频道信息显示
-* 优化节目单获取
-
-### v1.2.4
-
-* 改变换台滑动方向，上一个频道下滑，下一个频道上滑
-* 软件退出时，退出播放器
-* 播放相同的频道，不再重复加载
-* 暂时移除部分频道
-
-### v1.2.3
-
-* 固定视频比列为16:9
-* 隐藏全面屏底部的小横条
-* 移除移动专区
-* 修复一个闪退问题
-* 更换图标和应用名
-
-## 其他
+下载安装:
+[github](https://github.com/lizongying/my-tv/releases/)
+[gitee](https://gitee.com/lizongying/my-tv/releases/)
 
 小米电视可以使用小米电视助手进行安装
 
@@ -210,6 +16,14 @@
 adb install my-tv.apk
 ```
 
+![image](./screenshots/img_3.png)
+![image](./screenshots/img_2.png)
+![image](./screenshots/img_1.png)
+
+## 更新日志
+
+[更新日志](./HISTORY.md)
+
 ## TODO
 
 * 音量不同
@@ -222,6 +36,8 @@ adb install my-tv.apk
 * 节目增加预告
 * 频道列表优化
 * 自动更新
+* 显示时间
+* 软解
 
 ## 赞赏
 

app/build.gradle

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

app/src/main/AndroidManifest.xml

@@ -7,6 +7,8 @@
         android:name="android.software.leanback"
         android:required="true" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <application
         android:allowBackup="true"
@@ -38,6 +40,12 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
+        <receiver android:name=".NetworkChangeReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+            </intent-filter>
+        </receiver>
         <provider
             android:name=".InitializerProvider"
             android:authorities="${applicationId}.InitializerProvider"

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

@@ -1,17 +1,17 @@
 package com.lizongying.mytv
 
+import android.content.Context
 import android.graphics.Color
 import android.view.ContextThemeWrapper
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.leanback.widget.ImageCardView
 import androidx.leanback.widget.Presenter
-import androidx.lifecycle.LifecycleOwner
 import com.bumptech.glide.Glide
 import com.lizongying.mytv.models.TVViewModel
 
 class CardPresenter(
-    private val owner: LifecycleOwner,
+    private val context: Context,
 ) : Presenter() {
 
     override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
@@ -27,18 +27,32 @@ class CardPresenter(
         val tvViewModel = item as TVViewModel
         val cardView = viewHolder.view as ImageCardView
 
-        cardView.titleText = tvViewModel.title.value
+        cardView.titleText = tvViewModel.getTV().title
         cardView.setMainImageDimensions(CARD_WIDTH, CARD_HEIGHT)
         cardView.tag = tvViewModel.videoUrl.value
 
         Glide.with(viewHolder.view.context)
-            .load(tvViewModel.logo.value)
+            .load(tvViewModel.getTV().logo)
             .centerInside()
             .into(cardView.mainImageView)
 
         cardView.setBackgroundColor(Color.WHITE)
         cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
 
+//        cardView.setOnFocusChangeListener { v, hasFocus ->
+//            run {
+//                if (hasFocus) {
+//                    if (v != null) {
+//                        (v as ImageCardView).setInfoAreaBackgroundColor(context.resources.getColor(R.color.focus))
+//                    }
+//                } else {
+//                    if (v != null) {
+//                        (v as ImageCardView).setInfoAreaBackgroundColor(context.resources.getColor(R.color.ic_launcher_background))
+//                    }
+//                }
+//            }
+//        }
+
         val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
         if (!epg.isNullOrEmpty()) {
             cardView.contentText = epg.last().title

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

@@ -30,7 +30,7 @@ class ChannelFragment : Fragment() {
     fun show(tvViewModel: TVViewModel) {
         handler.removeCallbacks(hideRunnable)
         handler.removeCallbacks(playRunnable)
-        binding.channelContent.text = (tvViewModel.id.value?.plus(1)).toString()
+        binding.channelContent.text = (tvViewModel.getTV().id.plus(1)).toString()
         view?.visibility = View.VISIBLE
         handler.postDelayed(hideRunnable, delay)
     }

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

@@ -5,14 +5,16 @@ import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 
-class ConfirmationDialogFragment(private val listener: ConfirmationDialogListener) :
-    DialogFragment() {
+class ConfirmationFragment(
+    private val listener: ConfirmationListener,
+    private val message: String
+) : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {
             val builder = AlertDialog.Builder(it)
-            builder.setTitle("确认")
-                .setMessage("确认更新吗？")
+            builder.setTitle("确定更新吗？")
+                .setMessage(message)
                 .setPositiveButton(
                     "确定"
                 ) { _, _ ->
@@ -23,12 +25,11 @@ class ConfirmationDialogFragment(private val listener: ConfirmationDialogListene
                 ) { _, _ ->
                     listener.onCancel()
                 }
-            // 创建并返回 AlertDialog 对象
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }
 
-    interface ConfirmationDialogListener {
+    interface ConfirmationListener {
         fun onConfirm()
         fun onCancel()
     }

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

@@ -0,0 +1,28 @@
+package com.lizongying.mytv
+
+import android.view.View
+import androidx.core.content.ContextCompat
+import androidx.leanback.app.ErrorSupportFragment
+
+class ErrorFragment : ErrorSupportFragment() {
+
+    internal fun setErrorContent(message: String) {
+        imageDrawable =
+            ContextCompat.getDrawable(context!!, androidx.leanback.R.drawable.lb_ic_sad_cloud)
+        this.message = message
+        setDefaultBackground(TRANSLUCENT)
+        backgroundDrawable = ContextCompat.getDrawable(
+            context!!,
+            R.color.black
+        )
+
+        buttonText = resources.getString(R.string.dismiss_error)
+        buttonClickListener = View.OnClickListener {
+            fragmentManager!!.beginTransaction().remove(this@ErrorFragment).commit()
+        }
+    }
+
+    companion object {
+        private const val TRANSLUCENT = false
+    }
+}

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

@@ -7,6 +7,8 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.Signature
 import android.content.pm.SigningInfo
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
 import android.os.Build
 import android.util.Log
 import java.security.MessageDigest
@@ -71,6 +73,25 @@ val Context.appSignature: String
         return hashSignature(sign)
     }
 
+
+val Context.isNetworkConnected: Boolean
+    get() {
+        val connectivityManager =
+            this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val network = connectivityManager.activeNetwork
+            val networkCapabilities = connectivityManager.getNetworkCapabilities(network)
+            return networkCapabilities != null &&
+                    (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ||
+                            networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ||
+                            networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET))
+        } else {
+            val networkInfo = connectivityManager.activeNetworkInfo
+            return networkInfo != null && networkInfo.isConnectedOrConnecting
+        }
+    }
+
 private fun hashSignature(signature: Signature): String {
     return try {
         val md = MessageDigest.getInstance("MD5")

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

@@ -29,13 +29,13 @@ class InfoFragment : Fragment() {
     }
 
     fun show(tvViewModel: TVViewModel) {
-        binding.textView.text = tvViewModel.title.value
+        binding.textView.text = tvViewModel.getTV().title
 
         Glide.with(this)
-            .load(tvViewModel.logo.value)
+            .load(tvViewModel.getTV().logo)
             .into(binding.infoLogo)
 
-        Log.i(TAG, "${tvViewModel.title.value} ${tvViewModel.epg.value}")
+        Log.i(TAG, "${tvViewModel.getTV().title} ${tvViewModel.epg.value}")
         val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
         if (!epg.isNullOrEmpty()) {
             binding.infoDesc.text = epg.last().title

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

@@ -1,5 +1,9 @@
 package com.lizongying.mytv
 
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -7,6 +11,7 @@ import android.util.Log
 import android.view.GestureDetector
 import android.view.KeyEvent
 import android.view.MotionEvent
+import android.view.View
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
@@ -27,6 +32,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private val infoFragment = InfoFragment()
     private val channelFragment = ChannelFragment()
     private val settingFragment = SettingFragment()
+    private val errorFragment = ErrorFragment()
 
     private var doubleBackToExitPressedOnce = false
 
@@ -36,9 +42,20 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private val delayHideMain: Long = 10000
     private val delayHideSetting: Long = 10000
 
+    init {
+        lifecycleScope.launch(Dispatchers.IO) {
+            val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
+
+            utilsJob.start()
+
+//            utilsJob.await()
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
+
         setContentView(R.layout.activity_main)
 
         Request.onCreate()
@@ -58,6 +75,32 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
                 .commit()
         }
         gestureDetector = GestureDetector(this, GestureListener())
+
+        errorFragment.buttonClickListener = View.OnClickListener {
+            supportFragmentManager.beginTransaction()
+                .remove(errorFragment)
+                .commit()
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            val connectivityManager =
+                getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            connectivityManager.registerDefaultNetworkCallback(object :
+                ConnectivityManager.NetworkCallback() {
+                override fun onAvailable(network: Network) {
+                    super.onAvailable(network)
+                    Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
+                    if (this@MainActivity.isNetworkConnected) {
+                        Log.i(TAG, "net isNetworkConnected")
+                        ready++
+                    }
+                }
+            })
+        } else {
+            Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
+            ready++
+        }
+
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -124,11 +167,15 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         handler.postDelayed(hideMain, delayHideMain)
     }
 
-    fun settingActive() {
+    fun settingDelayHide() {
         handler.removeCallbacks(hideSetting)
         handler.postDelayed(hideSetting, delayHideSetting)
     }
 
+    fun settingNeverHide() {
+        handler.removeCallbacks(hideSetting)
+    }
+
     private val hideMain = Runnable {
         if (!mainFragment.isHidden) {
             supportFragmentManager.beginTransaction().hide(mainFragment).commit()
@@ -150,11 +197,19 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 5) {
+        if (ready == 6) {
             mainFragment.fragmentReady()
         }
     }
 
+    fun isPlaying() {
+        if (errorFragment.isVisible) {
+            supportFragmentManager.beginTransaction()
+                .remove(errorFragment)
+                .commit()
+        }
+    }
+
     override fun onTouchEvent(event: MotionEvent?): Boolean {
         if (event != null) {
             gestureDetector.onTouchEvent(event)
@@ -165,11 +220,15 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
 
         override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-            Log.i(TAG, "onSingleTapConfirmed")
             switchMainFragment()
             return true
         }
 
+        override fun onDoubleTap(e: MotionEvent): Boolean {
+            showSetting()
+            return true
+        }
+
         override fun onFling(
             e1: MotionEvent?,
             e2: MotionEvent,
@@ -211,7 +270,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
         if (!settingFragment.isVisible) {
             settingFragment.show(supportFragmentManager, "setting")
-            settingActive()
+            settingDelayHide()
         } else {
             handler.removeCallbacks(hideSetting)
             settingFragment.dismiss()
@@ -277,6 +336,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        Log.i(TAG, "keyCode $keyCode, event $event")
         when (keyCode) {
             KeyEvent.KEYCODE_0 -> {
                 showChannel("0")
@@ -442,7 +502,13 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         Request.onDestroy()
     }
 
-    override fun onRequestFinished() {
+    override fun onRequestFinished(message: String?) {
+        if (message != null && !errorFragment.isVisible) {
+            supportFragmentManager.beginTransaction()
+                .add(R.id.main_browse_fragment, errorFragment)
+                .commitNow()
+            errorFragment.setErrorContent(message)
+        }
         fragmentReady()
     }
 

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

@@ -1,9 +1,10 @@
 package com.lizongying.mytv
 
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
 import androidx.leanback.app.BrowseSupportFragment
 import androidx.leanback.widget.ArrayObjectAdapter
@@ -17,7 +18,6 @@ import androidx.leanback.widget.Presenter
 import androidx.leanback.widget.Row
 import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
-import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
@@ -40,6 +40,29 @@ class MainFragment : BrowseSupportFragment() {
         headersState = HEADERS_DISABLED
     }
 
+//    override fun onCreateView(
+//        inflater: LayoutInflater,
+//        container: ViewGroup?,
+//        savedInstanceState: Bundle?
+//    ): View? {
+//        val rootView = super.onCreateView(inflater, container, savedInstanceState)
+//        rootView?.setOnClickListener {
+//            Log.i(TAG, "main on click")
+//            fragmentManager!!.beginTransaction().hide(this).commit()
+//        }
+//        mainFragment.view?.setOnClickListener {
+//            Log.i(TAG, "mainFragment on click")
+//            fragmentManager!!.beginTransaction().hide(this).commit()
+//        }
+//        getRowsSupportFragment().view?.setOnClickListener {
+//            Log.i(TAG, "getRowsSupportFragment on click")
+//            fragmentManager!!.beginTransaction().hide(this).commit()
+//        }
+//
+//
+//        return rootView
+//    }
+
     override fun onStart() {
         Log.i(TAG, "onStart")
         super.onStart()
@@ -57,7 +80,7 @@ class MainFragment : BrowseSupportFragment() {
         tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
             tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
                 if (tvViewModel.errInfo.value != null
-                    && tvViewModel.id.value == itemPosition
+                    && tvViewModel.getTV().id == itemPosition
                 ) {
                     Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
                 }
@@ -66,18 +89,18 @@ class MainFragment : BrowseSupportFragment() {
 
                 // not first time && channel not change
                 if (tvViewModel.ready.value != null
-                    && tvViewModel.id.value == itemPosition
+                    && tvViewModel.getTV().id == itemPosition
                     && check(tvViewModel)
                 ) {
-                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                    Log.i(TAG, "ready ${tvViewModel.getTV().title}")
                     (activity as? MainActivity)?.play(tvViewModel)
                 }
             }
             tvViewModel.change.observe(viewLifecycleOwner) { _ ->
                 if (tvViewModel.change.value != null) {
-                    val title = tvViewModel.title.value
+                    val title = tvViewModel.getTV().title
                     Log.i(TAG, "switch $title")
-                    if (tvViewModel.pid.value != "") {
+                    if (tvViewModel.getTV().pid != "") {
                         Log.i(TAG, "request $title")
                         lifecycleScope.launch(Dispatchers.IO) {
                             tvViewModel.let { Request.fetchData(it) }
@@ -124,7 +147,7 @@ class MainFragment : BrowseSupportFragment() {
     private fun loadRows() {
         rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
 
-        val cardPresenter = CardPresenter(viewLifecycleOwner)
+        val cardPresenter = CardPresenter(context!!)
 
         var idx: Long = 0
         for ((k, v) in TVList.list) {
@@ -135,8 +158,6 @@ class MainFragment : BrowseSupportFragment() {
                 tvViewModel.setItemPosition(idx2)
                 tvListViewModel.addTVViewModel(tvViewModel)
                 listRowAdapter.add(tvViewModel)
-
-                updateEPG(tvViewModel)
             }
             tvListViewModel.maxNum.add(v.size)
             val header = HeaderItem(idx, k)
@@ -196,8 +217,8 @@ class MainFragment : BrowseSupportFragment() {
             row: Row
         ) {
             if (item is TVViewModel) {
-                if (itemPosition != item.id.value!!) {
-                    itemPosition = item.id.value!!
+                if (itemPosition != item.getTV().id) {
+                    itemPosition = item.getTV().id
                     tvListViewModel.setItemPosition(itemPosition)
                     tvListViewModel.getTVViewModel(itemPosition)?.changed()
                 }
@@ -212,14 +233,14 @@ class MainFragment : BrowseSupportFragment() {
             rowViewHolder: RowPresenter.ViewHolder, row: Row
         ) {
             if (item is TVViewModel) {
-                tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                tvListViewModel.setItemPositionCurrent(item.getTV().id)
                 (activity as MainActivity).mainActive()
             }
         }
     }
 
     fun check(tvViewModel: TVViewModel): Boolean {
-        val title = tvViewModel.title.value
+        val title = tvViewModel.getTV().title
         val videoUrl = tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
         if (videoUrl == null || videoUrl == "") {
             Log.e(TAG, "$title videoUrl is empty")
@@ -235,8 +256,11 @@ class MainFragment : BrowseSupportFragment() {
     }
 
     fun fragmentReady() {
-//            request.fetchPage()
         tvListViewModel.getTVViewModel(itemPosition)?.changed()
+
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+            updateEPG(tvViewModel)
+        }
     }
 
     fun play(itemPosition: Int) {

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

@@ -0,0 +1,16 @@
+package com.lizongying.mytv
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.net.ConnectivityManager
+
+class NetworkChangeReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context?, intent: Intent?) {
+        if (intent?.action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
+            val isConnected = context?.isNetworkConnected
+            if (isConnected == true) {
+            }
+        }
+    }
+}

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

@@ -82,6 +82,13 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
                         Log.e(TAG, "PlaybackException $error")
                         tvViewModel?.changed()
                     }
+
+                    override fun onIsPlayingChanged(isPlaying: Boolean) {
+                        super.onIsPlayingChanged(isPlaying)
+                        if (isPlaying) {
+                            (activity as MainActivity).isPlaying()
+                        }
+                    }
                 })
             }
         })

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

@@ -24,6 +24,9 @@ import com.lizongying.mytv.api.YSPTokenService
 import com.lizongying.mytv.models.TVViewModel
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.oms.common.proto.pageModel
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.epgProgramModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -57,7 +60,9 @@ object Request {
     private var listener: RequestListener? = null
 
     private var initRetryTimes = 0
-    private var initRetryMaxTimes = 1
+    private var initRetryMaxTimes = 0
+
+    private var openid = "vu0-8lgGV2LW9QjDeucB9H12d_6HQWmTFgqCWg5o-VBQN4"
 
     fun onCreate() {
         Log.i(TAG, "onCreate")
@@ -72,26 +77,25 @@ object Request {
     private var call: Call<LiveInfo>? = null
     private var callAuth: Call<Auth>? = null
     private var callInfo: Call<Info>? = null
-    private var fAuth: Call<FAuth>? = null
+    private var callFAuth: Call<FAuth>? = null
     private var callPage: Call<pageModel.Response>? = null
 
     private fun cancelCall() {
         call?.cancel()
         callAuth?.cancel()
         callInfo?.cancel()
-        fAuth?.cancel()
+        callFAuth?.cancel()
         callPage?.cancel()
     }
 
     private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
         cancelCall()
 
-        val title = tvModel.title.value
+        val title = tvModel.getTV().title
 
         val data = YSP.getAuthData(tvModel)
         val request = AuthRequest(data)
         callAuth = request.let { yspApiService.getAuth("guid=${YSP.getGuid()}; $cookie", it) }
-
         callAuth?.enqueue(object : Callback<Auth> {
             override fun onResponse(call: Call<Auth>, response: Response<Auth>) {
                 if (response.isSuccessful) {
@@ -106,12 +110,12 @@ object Request {
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
                             if (tvModel.getTV().needToken) {
-                                if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                     if (!tvModel.getTV().mustToken) {
                                         fetchAuth(tvModel, cookie)
                                     }
                                 } else {
-                                    token = ""
+                                    tvModel.needGetToken = true
                                     fetchAuth(tvModel)
                                 }
                             } else {
@@ -124,12 +128,12 @@ object Request {
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
                         if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchAuth(tvModel, cookie)
                                 }
                             } else {
-                                token = ""
+                                tvModel.needGetToken = true
                                 fetchAuth(tvModel)
                             }
                         } else {
@@ -144,12 +148,12 @@ object Request {
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                             if (!tvModel.getTV().mustToken) {
                                 fetchAuth(tvModel, cookie)
                             }
                         } else {
-                            token = ""
+                            tvModel.needGetToken = true
                             fetchAuth(tvModel)
                         }
                     } else {
@@ -167,17 +171,24 @@ object Request {
             handler.removeCallbacks(btraceRunnable)
         }
 
-        val title = tvModel.title.value
+        val title = tvModel.getTV().title
 
         tvModel.seq = 0
         val data = YSP.switch(tvModel)
         val request = LiveInfoRequest(data)
         call = request.let {
-            yspApiService.getLiveInfo(
-                "guid=${YSP.getGuid()}; $cookie",
-                YSP.token,
-                it
-            )
+            if (token == "") {
+                yspApiService.getLiveInfoV2(
+                    "guid=${YSP.getGuid()}; $cookie",
+                    it,
+                )
+            } else {
+                yspApiService.getLiveInfo(
+                    "guid=${YSP.getGuid()}; $cookie",
+                    YSP.token,
+                    it
+                )
+            }
         }
 
         call?.enqueue(object : Callback<LiveInfo> {
@@ -212,13 +223,13 @@ object Request {
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
                                 if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                         if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
 //                                            fetchAuth(tvModel, cookie)
                                         }
                                     } else {
-                                        token = ""
+                                        tvModel.needGetToken = true
                                         fetchVideo(tvModel)
 //                                        fetchAuth(tvModel)
                                     }
@@ -237,13 +248,13 @@ object Request {
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
                                 if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                         if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
 //                                            fetchAuth(tvModel, cookie)
                                         }
                                     } else {
-                                        token = ""
+                                        tvModel.needGetToken = true
                                         fetchVideo(tvModel)
 //                                        fetchAuth(tvModel)
                                     }
@@ -255,17 +266,17 @@ object Request {
                         }
                     }
                 } else {
-                    Log.e(TAG, "$title status error")
+                    Log.e(TAG, "$title status error $data")
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
                         if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchVideo(tvModel, cookie)
 //                                    fetchAuth(tvModel, cookie)
                                 }
                             } else {
-                                token = ""
+                                tvModel.needGetToken = true
                                 fetchVideo(tvModel)
 //                                fetchAuth(tvModel)
                             }
@@ -282,12 +293,12 @@ object Request {
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                             if (!tvModel.getTV().mustToken) {
                                 fetchVideo(tvModel, cookie)
                             }
                         } else {
-                            token = ""
+                            tvModel.needGetToken = true
                             fetchVideo(tvModel)
                         }
                     } else {
@@ -300,20 +311,28 @@ object Request {
 
     private fun fetchAuth(tvModel: TVViewModel) {
         cancelCall()
-        if (token == "") {
+        if (tvModel.needGetToken) {
             callInfo = yspTokenService.getInfo("")
             callInfo?.enqueue(object : Callback<Info> {
                 override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                    if (response.isSuccessful) {
+                    if (response.isSuccessful && response.body()?.data?.token != null) {
                         token = response.body()?.data?.token!!
                         Log.i(TAG, "info success $token")
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
                         val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=$openid; vusession=$token"
                         fetchAuth(tvModel, cookie)
+                    } else if (response.code() == 304) {
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        val cookie =
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
+                        fetchVideo(tvModel, cookie)
                     } else {
                         Log.e(TAG, "info status error")
-                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                            tvModel.tokenRetryTimes++
+                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                            tvModel.tokenYSPRetryTimes++
                             fetchAuth(tvModel)
                         } else {
                             if (!tvModel.getTV().mustToken) {
@@ -327,8 +346,8 @@ object Request {
 
                 override fun onFailure(call: Call<Info>, t: Throwable) {
                     Log.e(TAG, "info request error $t")
-                    if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                        tvModel.tokenRetryTimes++
+                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                        tvModel.tokenYSPRetryTimes++
                         fetchVideo(tvModel)
                     } else {
                         if (!tvModel.getTV().mustToken) {
@@ -341,7 +360,7 @@ object 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=$openid; vusession=$token"
             fetchAuth(tvModel, cookie)
         }
     }
@@ -349,20 +368,28 @@ object Request {
     private fun fetchVideo(tvModel: TVViewModel) {
         cancelCall()
         Log.d(TAG, "fetchVideo")
-        if (token == "") {
+        if (tvModel.needGetToken) {
             callInfo = yspTokenService.getInfo("")
             callInfo?.enqueue(object : Callback<Info> {
                 override fun onResponse(call: Call<Info>, response: Response<Info>) {
                     if (response.isSuccessful && response.body()?.data?.token != null) {
                         token = response.body()?.data?.token!!
                         Log.i(TAG, "info success $token")
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
                         val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
+                        fetchVideo(tvModel, cookie)
+                    } else if (response.code() == 304) {
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        val cookie =
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
                         fetchVideo(tvModel, cookie)
                     } else {
                         Log.e(TAG, "info status error")
-                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                            tvModel.tokenRetryTimes++
+                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                            tvModel.tokenYSPRetryTimes++
                             fetchVideo(tvModel)
                         } else {
                             if (!tvModel.getTV().mustToken) {
@@ -376,8 +403,8 @@ object Request {
 
                 override fun onFailure(call: Call<Info>, t: Throwable) {
                     Log.e(TAG, "info request error $t")
-                    if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                        tvModel.tokenRetryTimes++
+                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                        tvModel.tokenYSPRetryTimes++
                         fetchVideo(tvModel)
                     } else {
                         if (!tvModel.getTV().mustToken) {
@@ -390,7 +417,7 @@ object 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=$openid; vusession=$token"
             fetchVideo(tvModel, cookie)
         }
     }
@@ -398,15 +425,15 @@ object Request {
     private fun fetchFAuth(tvModel: TVViewModel) {
         cancelCall()
 
-        val title = tvModel.title.value
+        val title = tvModel.getTV().title
 
         var qa = "HD"
         if (tokenFH != "") {
             qa = "FHD"
         }
 
-        fAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
-        fAuth?.enqueue(object : Callback<FAuth> {
+        callFAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
+        callFAuth?.enqueue(object : Callback<FAuth> {
             override fun onResponse(call: Call<FAuth>, response: Response<FAuth>) {
                 if (response.isSuccessful && response.body()?.data?.live_url != null) {
                     val url = response.body()?.data?.live_url!!
@@ -440,6 +467,9 @@ object Request {
         }
 
         if (tvModel.getTV().needToken) {
+            if (token == "") {
+                tvModel.needGetToken = true
+            }
             if (needAuth) {
                 fetchAuth(tvModel)
             } else {
@@ -447,7 +477,7 @@ object Request {
             }
         } else {
             val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; updateProtocol=1; deviceModel=120"
             if (needAuth) {
                 fetchAuth(tvModel, cookie)
             } else {
@@ -467,10 +497,14 @@ object Request {
             .enqueue(object : Callback<InfoV2> {
                 override fun onResponse(call: Call<InfoV2>, response: Response<InfoV2>) {
                     if (response.isSuccessful) {
+                        val o = response.body()?.o
                         val t = response.body()?.t
                         val f = response.body()?.f
                         val e = response.body()?.e
                         val c = response.body()?.c
+                        if (!o.isNullOrEmpty()) {
+                            openid = o
+                        }
                         if (!t.isNullOrEmpty()) {
                             token = t
                             Log.i(TAG, "token success $token")
@@ -501,7 +535,7 @@ object Request {
                             Utils.setBetween(c * 1000L)
                             Log.i(TAG, "current time $c")
                         }
-                        listener?.onRequestFinished()
+                        listener?.onRequestFinished(null)
                     } else {
                         Log.e(TAG, "token status error")
                         handler.postDelayed(
@@ -512,7 +546,7 @@ object Request {
                             initRetryTimes++
                             fetchInfoV2()
                         } else {
-                            listener?.onRequestFinished()
+                            listener?.onRequestFinished("状态错误")
                         }
                     }
                 }
@@ -528,7 +562,7 @@ object Request {
                         initRetryTimes++
                         fetchInfoV2()
                     } else {
-                        listener?.onRequestFinished()
+                        listener?.onRequestFinished("网络错误")
                     }
                 }
             })
@@ -590,11 +624,11 @@ object Request {
     }
 
     fun fetchBtrace(tvModel: TVViewModel) {
-        val title = tvModel.title.value
+        val title = tvModel.getTV().title
 
         val guid = YSP.getGuid()
-        val pid = tvModel.pid.value!!
-        val sid = tvModel.sid.value!!
+        val pid = tvModel.getTV().pid
+        val sid = tvModel.getTV().sid
         yspBtraceService.kvcollect(
             c_timestamp = YSP.generateGuid(),
             guid = guid,
@@ -660,8 +694,8 @@ object Request {
     }
 
     fun fetchYEPG(tvViewModel: TVViewModel) {
-        val title = tvViewModel.title.value
-        yspProtoService.getProgram(tvViewModel.programId.value!!, getDateFormat("yyyyMMdd"))
+        val title = tvViewModel.getTV().title
+        yspProtoService.getProgram(tvViewModel.getTV().programId, getDateFormat("yyyyMMdd"))
             .enqueue(object : Callback<epgProgramModel.Response> {
                 override fun onResponse(
                     call: Call<epgProgramModel.Response>,
@@ -685,8 +719,8 @@ object Request {
     }
 
     fun fetchFEPG(tvViewModel: TVViewModel) {
-        val title = tvViewModel.title.value
-        fAuthService.getEPG(tvViewModel.pid.value!!, getDateFormat("yyyyMMdd"))
+        val title = tvViewModel.getTV().title
+        fAuthService.getEPG(tvViewModel.getTV().pid, getDateFormat("yyyyMMdd"))
             .enqueue(object : Callback<List<FEPG>> {
                 override fun onResponse(
                     call: Call<List<FEPG>>,
@@ -723,7 +757,7 @@ object Request {
     }
 
     interface RequestListener {
-        fun onRequestFinished()
+        fun onRequestFinished(message: String?)
     }
 
     fun setRequestListener(listener: RequestListener) {

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

@@ -6,14 +6,19 @@ import android.content.SharedPreferences
 object SP {
     // Name of the sp file TODO Should use a meaningful name and do migrations
     private const val SP_FILE_NAME = "MainActivity"
+
     // If Change channel with up and down in reversed order or not
     private const val KEY_CHANNEL_REVERSAL = "channel_reversal"
+
     // If use channel num to select channel or not
     private const val KEY_CHANNEL_NUM = "channel_num"
+
     // If start app on device boot or not
     private const val KEY_BOOT_STARTUP = "boot_startup"
+
     // Position in list of the selected channel item
     private const val KEY_POSITION = "position"
+
     // guid
     private const val KEY_GUID = "guid"
 
@@ -43,6 +48,6 @@ object SP {
         set(value) = sp.edit().putInt(KEY_POSITION, value).apply()
 
     var guid: String
-        get() = sp.getString(KEY_GUID, "")  ?: ""
+        get() = sp.getString(KEY_GUID, "") ?: ""
         set(value) = sp.edit().putString(KEY_GUID, value).apply()
 }

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

@@ -5,12 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import com.lizongying.mytv.databinding.DialogBinding
+import com.lizongying.mytv.databinding.SettingBinding
 
 
 class SettingFragment : DialogFragment() {
 
-    private var _binding: DialogBinding? = null
+    private var _binding: SettingBinding? = null
     private val binding get() = _binding!!
 
     private lateinit var updateManager: UpdateManager
@@ -26,15 +26,15 @@ class SettingFragment : DialogFragment() {
         savedInstanceState: Bundle?
     ): View {
         val context = requireContext() // It‘s safe to get context here.
-        _binding = DialogBinding.inflate(inflater, container, false)
-        binding.version.text =
-            "当前版本: ${context.appVersionName}\n获取最新: https://github.com/lizongying/my-tv/releases/"
+        _binding = SettingBinding.inflate(inflater, container, false)
+        binding.versionName.text = "当前版本: v${context.appVersionName}"
+        binding.version.text = "https://github.com/lizongying/my-tv"
 
         binding.switchChannelReversal.run {
             isChecked = SP.channelReversal
             setOnCheckedChangeListener { _, isChecked ->
                 SP.channelReversal = isChecked
-                (activity as MainActivity).settingActive()
+                (activity as MainActivity).settingDelayHide()
             }
         }
 
@@ -42,7 +42,7 @@ class SettingFragment : DialogFragment() {
             isChecked = SP.channelNum
             setOnCheckedChangeListener { _, isChecked ->
                 SP.channelNum = isChecked
-                (activity as MainActivity).settingActive()
+                (activity as MainActivity).settingDelayHide()
             }
         }
 
@@ -50,23 +50,34 @@ class SettingFragment : DialogFragment() {
             isChecked = SP.bootStartup
             setOnCheckedChangeListener { _, isChecked ->
                 SP.bootStartup = isChecked
-                (activity as MainActivity).settingActive()
+                (activity as MainActivity).settingDelayHide()
             }
         }
 
         updateManager = UpdateManager(context, this, context.appVersionCode)
-        binding.checkVersion.setOnClickListener(OnClickListenerCheckVersion(updateManager))
+        binding.checkVersion.setOnClickListener(
+            OnClickListenerCheckVersion(
+                activity as MainActivity,
+                updateManager
+            )
+        )
 
         return binding.root
     }
 
     fun setVersionName(versionName: String) {
-        binding.versionName.text = versionName
+        if (_binding != null) {
+            binding.versionName.text = versionName
+        }
     }
 
-    internal class OnClickListenerCheckVersion(private val updateManager: UpdateManager) :
+    internal class OnClickListenerCheckVersion(
+        private val mainActivity: MainActivity,
+        private val updateManager: UpdateManager
+    ) :
         View.OnClickListener {
         override fun onClick(view: View?) {
+            mainActivity.settingDelayHide()
             updateManager.checkAndUpdate()
         }
     }
@@ -76,11 +87,6 @@ class SettingFragment : DialogFragment() {
         _binding = null
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-//        updateManager.destroy()
-    }
-
     companion object {
         const val TAG = "SettingFragment"
     }

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

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

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

@@ -1,12 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.Context
-import android.util.Log
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.IOException
-
 object TVList {
     val list: Map<String, List<TV>> by lazy {
         setup()
@@ -20,7 +13,6 @@ object TVList {
                     "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",
@@ -34,7 +26,6 @@ object TVList {
                     "CCTV2 财经",
                     "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",
@@ -48,7 +39,6 @@ object TVList {
                     "CCTV3 综艺",
                     "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",
@@ -65,7 +55,6 @@ object TVList {
                         "http://39.134.24.161/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8",
                         "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8"
                     ),
-                    0,
                     "央视",
                     "https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp",
                     "600001814",
@@ -79,7 +68,6 @@ object TVList {
                     "CCTV5 体育",
                     "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",
@@ -93,7 +81,6 @@ object TVList {
                     "CCTV6 电影",
                     "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",
@@ -107,7 +94,6 @@ object TVList {
                     "CCTV7 国防军事",
                     "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",
@@ -121,7 +107,6 @@ object TVList {
                     "CCTV8 电视剧",
                     "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",
@@ -135,7 +120,6 @@ object TVList {
                     "CCTV9 纪录",
                     "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",
@@ -149,7 +133,6 @@ object TVList {
                     "CCTV10 科教",
                     "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",
@@ -163,7 +146,6 @@ object TVList {
                     "CCTV11 戏曲",
                     "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",
@@ -177,7 +159,6 @@ object TVList {
                     "CCTV12 社会与法",
                     "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",
@@ -191,10 +172,8 @@ object TVList {
                     "CCTV13 新闻",
                     "CCTV13",
                     listOf(
-                        "https://live-play.cctvnews.cctv.com/cctv/merge_cctv13.m3u8",
                         "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",
@@ -208,7 +187,6 @@ object TVList {
                     "CCTV14 少儿",
                     "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",
@@ -222,7 +200,6 @@ object TVList {
                     "CCTV15 音乐",
                     "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",
@@ -239,7 +216,6 @@ object TVList {
                         "http://39.134.24.162/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8",
                         "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8"
                     ),
-                    0,
                     "央视",
                     "https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp",
                     "600098637",
@@ -253,7 +229,6 @@ object TVList {
                     "CCTV17 农业农村",
                     "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",
@@ -267,7 +242,6 @@ object TVList {
                     "CCTV5+ 体育赛事",
                     "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",
@@ -281,7 +255,6 @@ object TVList {
                     "CCTV4K 超高清",
                     "CCTV4K",
                     listOf(),
-                    0,
                     "央视",
                     "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
                     "600002264",
@@ -295,7 +268,6 @@ object TVList {
                     "CCTV8K 超高清",
                     "CCTV8K",
                     listOf(),
-                    0,
                     "央视",
                     R.drawable.cctv8k,
                     "600156816",
@@ -309,7 +281,6 @@ 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",
@@ -323,7 +294,6 @@ 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",
@@ -337,7 +307,6 @@ 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",
@@ -351,7 +320,6 @@ object TVList {
                     "世界地理",
                     "CCTV世界地理频道",
                     listOf(),
-                    0,
                     "央视",
                     "https://resources.yangshipin.cn/assets/oms/image/202306/bb3c6c9e145d698137f5bb64a582021a01b51344b929003630eb769ea65832a9.png?imageMogr2/format/webp",
                     "600099637",
@@ -365,7 +333,6 @@ 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",
@@ -379,7 +346,6 @@ 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",
@@ -393,7 +359,6 @@ 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",
@@ -407,7 +372,6 @@ 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",
@@ -421,7 +385,6 @@ 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",
@@ -435,7 +398,6 @@ 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",
@@ -449,7 +411,6 @@ 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",
@@ -463,7 +424,6 @@ 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",
@@ -477,7 +437,6 @@ object TVList {
                     "卫生健康",
                     "CCTV卫生健康频道",
                     listOf(),
-                    0,
                     "央视",
                     "https://resources.yangshipin.cn/assets/oms/image/202306/54a6863656fdfd8f803be193ddf22441c5000a108833889816fd2d8911715ce8.png?imageMogr2/format/webp",
                     "600099651",
@@ -493,7 +452,6 @@ object TVList {
                     "东方卫视",
                     "东方卫视",
                     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",
@@ -510,7 +468,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226307/index.m3u8",
                         "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",
@@ -527,7 +484,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226477/index.m3u8",
                         "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",
@@ -544,7 +500,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226546/index.m3u8",
                         "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",
@@ -561,7 +516,6 @@ object TVList {
                         "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8",
                         "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8"
                     ),
-                    0,
                     "地方",
                     "https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp",
                     "600002521",
@@ -578,7 +532,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226344/index.m3u8",
                         "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",
@@ -592,7 +545,6 @@ 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",
@@ -606,7 +558,6 @@ 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",
@@ -623,7 +574,6 @@ object TVList {
                         "http://live.gxrb.com.cn/tv/gxtvlive03/index.m3u8",
                         "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",
@@ -640,7 +590,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226409/index.m3u8",
                         "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226202/index.m3u8"
                     ),
-                    0,
                     "地方",
                     R.drawable.chongqing,
                     "600002531",
@@ -657,7 +606,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226480/index.m3u8",
                         "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",
@@ -674,7 +622,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226406/index.m3u8",
                         "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",
@@ -691,7 +638,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226474/index.m3u8",
                         "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",
@@ -708,7 +654,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221225728/index.m3u8",
                         "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",
@@ -725,7 +670,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226327/index.m3u8",
                         "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",
@@ -742,7 +686,6 @@ object TVList {
                         "http://hw-m-l.cztv.com/channels/lantian/channel01/1080p.m3u8",
                         "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",
@@ -759,7 +702,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226391/index.m3u8",
                         "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",
@@ -776,7 +718,6 @@ object TVList {
                         "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8",
                         "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8"
                     ),
-                    0,
                     "地方",
                     "https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp",
                     "600002481",
@@ -793,7 +734,6 @@ object TVList {
                         "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8",
                         "http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8"
                     ),
-                    0,
                     "地方",
                     "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
                     "600002516",
@@ -810,7 +750,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226341/index.m3u8",
                         "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",
@@ -827,7 +766,6 @@ object TVList {
                         "http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226465/index.m3u8",
                         "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",
@@ -841,7 +779,6 @@ object TVList {
                     "天津卫视",
                     "天津卫视",
                     listOf(),
-                    0,
                     "地方",
                     R.drawable.tianjin,
                     "600152137",
@@ -855,7 +792,6 @@ object TVList {
                     "新疆卫视",
                     "新疆卫视",
                     listOf(),
-                    0,
                     "地方",
                     R.drawable.xinjiang,
                     "600152138",
@@ -869,7 +805,6 @@ object TVList {
                     "兵团卫视",
                     "兵团卫视",
                     listOf(),
-                    0,
                     "地方",
                     R.drawable.bingtuan,
                     "600170344",
@@ -883,7 +818,6 @@ object TVList {
                     "CETV1",
                     "CETV1",
                     listOf(),
-                    0,
                     "地方",
                     R.drawable.cetv1,
                     "600171827",
@@ -899,7 +833,6 @@ object TVList {
                     "凤凰卫视资讯台",
                     "",
                     listOf(),
-                    0,
                     "港澳台",
                     "http://c1.fengshows-cdn.com/a/2021_22/79dcc3a9da358a3.png",
                     "7c96b084-60e1-40a9-89c5-682b994fb680",
@@ -913,7 +846,6 @@ object TVList {
                     "凤凰卫视中文台",
                     "",
                     listOf(),
-                    0,
                     "港澳台",
                     "http://c1.fengshows-cdn.com/a/2021_22/ede3d9e09be28e5.png",
                     "f7f48462-9b13-485b-8101-7b54716411ec",
@@ -927,7 +859,6 @@ object TVList {
                     "凤凰卫视香港台",
                     "",
                     listOf(),
-                    0,
                     "港澳台",
                     "http://c1.fengshows-cdn.com/a/2021_23/325d941090bee17.png",
                     "15e02d92-1698-416c-af2f-3e9a872b4d78",
@@ -943,7 +874,6 @@ object TVList {
                     "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",
@@ -957,7 +887,6 @@ object TVList {
                     "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",
@@ -971,7 +900,6 @@ object TVList {
                     "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",
@@ -985,7 +913,6 @@ object TVList {
                     "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",
@@ -1002,7 +929,6 @@ object TVList {
                         "http://livees.cgtn.com/500e/prog_index.m3u8",
                         "http://livees.cgtn.com/1000e/prog_index.m3u8"
                     ),
-                    0,
                     "国际",
                     "https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp",
                     "600084744",
@@ -1016,7 +942,6 @@ object TVList {
                     "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",
@@ -1038,63 +963,4 @@ object TVList {
 //        list = list.filterKeys { it in array }
         return list
     }
-
-    /**
-     * 初始化
-     *
-     * @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/UpdateManager.kt

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

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

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

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

@@ -16,24 +16,19 @@ data class Token(
 )
 
 data class InfoV2(
+    val o: String?,
     val f: String?,
     val t: String?,
     val e: Int?,
     val c: Int?,
 )
 
-data class Release(
-    val code: Int?,
-    val msg: String?,
-    val data: Data,
-) {
-    data class Data(
-        val versionName: String,
-        val versionCode: Int,
-        val downloadUrl: String,
-        val updateTime: Int,
-    )
-}
+data class ReleaseV2(
+    val n: String?,
+    val u: String?,
+    val d: String?,
+    val c: Int?,
+)
 
 data class TimeResponse(
     val data: Time

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

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

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

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

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

@@ -1,6 +1,7 @@
 package com.lizongying.mytv.api
 
 import android.content.Context
+import android.util.Log
 import com.lizongying.mytv.Encryptor
 import com.lizongying.mytv.MainActivity
 import com.lizongying.mytv.SP
@@ -63,8 +64,8 @@ object YSP {
     }
 
     fun switch(tvModel: TVViewModel): String {
-        livepid = tvModel.pid.value!!
-        cnlid = tvModel.sid.value!!
+        livepid = tvModel.getTV().pid
+        cnlid = tvModel.getTV().sid
         defn = "fhd"
 
         randStr = getRand()
@@ -82,7 +83,7 @@ object YSP {
     }
 
     fun getAuthData(tvModel: TVViewModel): String {
-        livepid = tvModel.pid.value!!
+        livepid = tvModel.getTV().pid
 
         randStr = getRand()
 

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

@@ -21,6 +21,18 @@ interface YSPApiService {
         @Body request: LiveInfoRequest,
     ): Call<LiveInfo>
 
+    @POST("v1/player/get_live_info")
+    @Headers(
+        "content-type: application/json;charset=UTF-8",
+        "referer: https://www.yangshipin.cn/",
+        "yspappid: 519748109",
+        "user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+    )
+    fun getLiveInfoV2(
+        @Header("cookie") cookie: String,
+        @Body request: LiveInfoRequest,
+    ): Call<LiveInfo>
+
     @POST("v1/player/auth")
     @Headers(
         "content-type: application/x-www-form-urlencoded;charset=UTF-8",

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

@@ -1,15 +1,9 @@
 package com.lizongying.mytv.models
 
-import android.net.Uri
 import android.util.Log
-import androidx.annotation.OptIn
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import androidx.media3.common.MediaItem
-import androidx.media3.common.util.UnstableApi
-import androidx.media3.datasource.DefaultHttpDataSource
-import androidx.media3.exoplayer.hls.HlsMediaSource
 import com.lizongying.mytv.TV
 import com.lizongying.mytv.api.FEPG
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.programModel.Program
@@ -23,31 +17,21 @@ class TVViewModel(private var tv: TV) : ViewModel() {
 
     var retryTimes = 0
     var retryMaxTimes = 8
-    var tokenRetryTimes = 0
-    var tokenRetryMaxTimes = 0
+    var tokenYSPRetryTimes = 0
+    var tokenYSPRetryMaxTimes = 0
     var tokenFHRetryTimes = 0
-    var tokenFHRetryMaxTimes = 2
+    var tokenFHRetryMaxTimes = 8
+
+    var needGetToken = false
 
     private val _errInfo = MutableLiveData<String>()
     val errInfo: LiveData<String>
         get() = _errInfo
 
-    private val _programId = MutableLiveData<String>()
-    val programId: LiveData<String>
-        get() = _programId
-
     private var _epg = MutableLiveData<MutableList<EPG>>()
     val epg: LiveData<MutableList<EPG>>
         get() = _epg
 
-    private val _id = MutableLiveData<Int>()
-    val id: LiveData<Int>
-        get() = _id
-
-    private val _title = MutableLiveData<String>()
-    val title: LiveData<String>
-        get() = _title
-
     private val _videoUrl = MutableLiveData<List<String>>()
     val videoUrl: LiveData<List<String>>
         get() = _videoUrl
@@ -56,18 +40,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val videoIndex: LiveData<Int>
         get() = _videoIndex
 
-    private val _logo = MutableLiveData<Any>()
-    val logo: LiveData<Any>
-        get() = _logo
-
-    private val _pid = MutableLiveData<String>()
-    val pid: LiveData<String>
-        get() = _pid
-
-    private val _sid = MutableLiveData<String>()
-    val sid: LiveData<String>
-        get() = _sid
-
     private val _change = MutableLiveData<Boolean>()
     val change: LiveData<Boolean>
         get() = _change
@@ -88,9 +60,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         } else {
             tv.videoUrl = tv.videoUrl + listOf(url)
         }
-        tv.videoIndex = tv.videoUrl.lastIndex
         _videoUrl.value = tv.videoUrl
-        _videoIndex.value = tv.videoIndex
+        _videoIndex.value = tv.videoUrl.lastIndex
     }
 
     fun firstSource() {
@@ -115,14 +86,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     }
 
     init {
-        _id.value = tv.id
-        _title.value = tv.title
         _videoUrl.value = tv.videoUrl
-        _videoIndex.value = tv.videoIndex
-        _logo.value = tv.logo
-        _programId.value = tv.programId
-        _pid.value = tv.pid
-        _sid.value = tv.sid
+        _videoIndex.value = tv.videoUrl.lastIndex
     }
 
     fun getRowPosition(): Int {
@@ -145,10 +110,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _errInfo.value = info
     }
 
-    fun update(t: TV) {
-        tv = t
-    }
-
     fun getTV(): TV {
         return tv
     }
@@ -171,27 +132,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _epg.value = p.map { EPG(it.title, formatFTime(it.event_time)) }.toMutableList()
     }
 
-    private var mHeaders: Map<String, String>? = mapOf()
-
-    fun setHeaders(headers: Map<String, String>) {
-        mHeaders = headers
-    }
-
-    /**
-     * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
-     */
-    @OptIn(UnstableApi::class)
-    fun buildSource(): HlsMediaSource {
-        val httpDataSource = DefaultHttpDataSource.Factory()
-        mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
-
-        return HlsMediaSource.Factory(httpDataSource).createMediaSource(
-            MediaItem.fromUri(
-                Uri.parse(getVideoUrlCurrent())
-            )
-        )
-    }
-
     fun getVideoUrlCurrent(): String {
         return _videoUrl.value!![_videoIndex.value!!]
     }

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

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

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

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

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

@@ -1,5 +1,7 @@
 <resources>
+    <color name="focus">#0096a6</color>
     <color name="fastlane_background">#30000000</color>
     <color name="black">#000</color>
     <color name="white">#FFF</color>
+    <color name="ic_launcher_background">#223239</color>
 </resources>

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

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#223239</color>
 </resources>

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

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

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

@@ -4,4 +4,5 @@
     <string name="title_channel_num">数字选台</string>
     <string name="check_version">检查更新</string>
     <string name="title_boot_startup">开机自启</string>
+    <string name="dismiss_error">好的</string>
 </resources>

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

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