fix update manager

request optimize
phoenix EPG
2026-10-28 23:26:29 +08:00 · 2024-03-18 18:29:56 +08:00 · 2024-03-15 21:51:27 +08:00 · 2024-03-15 17:16:12 +08:00 · 2024-03-15 17:16:12 +08:00 · 2024-03-15 17:04:50 +08:00
38 changed files with 780 additions and 986 deletions
@@ -1,229 +0,0 @@
-## 更新日志
-
-### 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
-* 隐藏全面屏底部的小横条
-* 移除移动专区
-* 修复一个闪退问题
-* 更换图标和应用名
@@ -4,9 +4,214 @@

 ## 使用

-下载安装:
-[github](https://github.com/lizongying/my-tv/releases/)
-[gitee](https://gitee.com/lizongying/my-tv/releases/)
+下载安装 [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.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
+* 隐藏全面屏底部的小横条
+* 移除移动专区
+* 修复一个闪退问题
+* 更换图标和应用名
+
+## 其他

 小米电视可以使用小米电视助手进行安装

@@ -16,14 +221,6 @@
 adb install my-tv.apk
 ```

-![image](./screenshots/img_3.png)
-![image](./screenshots/img_2.png)
-![image](./screenshots/img_1.png)
-
-## 更新日志
-
-[更新日志](./HISTORY.md)
-
 ## TODO

 * 音量不同
@@ -33,11 +230,10 @@ adb install my-tv.apk
 * 收藏夹
 * 自定义源
 * 海外
-* 1.5.0 无法安装，1.5.1 可以安装
 * 节目增加预告
 * 频道列表优化
-* epg更新后菜单更新
-* 防止菜单第一个获取焦点
+* 自动更新
+* 時間

 ## 赞赏

@@ -106,7 +106,7 @@ dependencies {
    implementation "androidx.media3:media3-exoplayer-hls:$media3_version"

    // 21:2.9.0 17:2.6.4
-    def retrofit2_version = "2.6.4"
+    def retrofit2_version = "2.9.0"

    implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
    implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
@@ -7,7 +7,6 @@
        android:name="android.software.leanback"
        android:required="true" />
    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <application
@@ -40,12 +39,6 @@
                <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"
@@ -1,140 +0,0 @@
-package com.lizongying.mytv
-
-import android.graphics.Color
-import android.view.ContextThemeWrapper
-import android.view.KeyEvent
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.ScaleAnimation
-import android.widget.ImageView
-import androidx.core.view.updatePadding
-import androidx.leanback.widget.ImageCardView
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.lizongying.mytv.models.TVListViewModel
-import com.lizongying.mytv.models.TVViewModel
-
-
-class CardAdapter(
-    private val recyclerView: RecyclerView,
-    private val mainFragment: MainFragment,
-    private var tvListViewModel: TVListViewModel,
-) :
-    RecyclerView.Adapter<CardAdapter.ViewHolder>() {
-
-    private var listener: ItemListener? = null
-    private var focused: View? = null
-
-    var visiable = false
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val cardView = object :
-            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
-        cardView.isFocusable = true
-        cardView.isFocusableInTouchMode = true
-        cardView.updatePadding(1, 1, 1, 1)
-        return ViewHolder(cardView)
-    }
-
-    fun clear() {
-        focused?.clearFocus()
-        recyclerView.invalidate()
-    }
-
-    private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float, duration: Long) {
-        val scaleAnimation = ScaleAnimation(
-            fromScale, toScale,
-            fromScale, toScale,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f
-        )
-        scaleAnimation.duration = duration
-        scaleAnimation.fillAfter = false
-        view.startAnimation(scaleAnimation)
-    }
-
-    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
-        val item = tvListViewModel.getTVViewModel(position)
-
-        val tvViewModel = item as TVViewModel
-        val cardView = viewHolder.view as ImageCardView
-        cardView.tag = tvViewModel
-
-        val onFocusChangeListener = View.OnFocusChangeListener { view, hasFocus ->
-            if (hasFocus) {
-                listener?.onItemHasFocus(item)
-                focused = cardView
-
-                startScaleAnimation(cardView, 0.9f, 1.0f, 200)
-//
-//                if (mainFragment.shouldHasFocus(view.tag as TVViewModel)) {
-//                }
-
-//                if (visiable) {
-//                    startScaleAnimation(cardView, 0.9f, 1.0f, 200)
-//                } else {
-//                    visiable = true
-//                }
-            }
-        }
-
-        cardView.onFocusChangeListener = onFocusChangeListener
-
-        cardView.setOnClickListener { _ ->
-            listener?.onItemClicked(item)
-        }
-
-        cardView.setOnKeyListener { _, keyCode, event: KeyEvent? ->
-            if (event?.action == KeyEvent.ACTION_DOWN) {
-                return@setOnKeyListener listener?.onKey(keyCode) ?: false
-            }
-            false
-        }
-
-        cardView.titleText = tvViewModel.getTV().title
-
-        Glide.with(viewHolder.view.context)
-            .load(tvViewModel.getTV().logo)
-            .centerInside()
-            .into(cardView.mainImageView)
-
-        cardView.mainImageView.setBackgroundColor(Color.WHITE)
-        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
-
-        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
-        if (!epg.isNullOrEmpty()) {
-            cardView.contentText = epg.last().title
-        } else {
-            cardView.contentText = ""
-        }
-    }
-
-    override fun getItemCount() = tvListViewModel.size()
-
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val view = itemView
-    }
-
-    fun toPosition(position: Int) {
-        recyclerView.post {
-            recyclerView.scrollToPosition(position)
-            recyclerView.getChildAt(position)?.isSelected
-            recyclerView.getChildAt(position)?.requestFocus()
-        }
-    }
-
-    interface ItemListener {
-        fun onItemHasFocus(tvViewModel: TVViewModel)
-        fun onItemClicked(tvViewModel: TVViewModel)
-        fun onKey(keyCode: Int): Boolean
-    }
-
-    fun setItemListener(listener: ItemListener) {
-        this.listener = listener
-    }
-
-    companion object {
-        private const val TAG = "CardAdapter"
-    }
-}
-
@@ -0,0 +1,60 @@
+package com.lizongying.mytv
+
+import android.graphics.Color
+import android.view.ContextThemeWrapper
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.leanback.widget.ImageCardView
+import androidx.leanback.widget.Presenter
+import androidx.lifecycle.LifecycleOwner
+import com.bumptech.glide.Glide
+import com.lizongying.mytv.models.TVViewModel
+
+class CardPresenter(
+    private val owner: LifecycleOwner,
+) : Presenter() {
+
+    override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
+        val cardView = object :
+            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
+
+        cardView.isFocusable = true
+        cardView.isFocusableInTouchMode = true
+        return ViewHolder(cardView)
+    }
+
+    override fun onBindViewHolder(viewHolder: ViewHolder, item: Any) {
+        val tvViewModel = item as TVViewModel
+        val cardView = viewHolder.view as ImageCardView
+
+        cardView.titleText = tvViewModel.title.value
+        cardView.setMainImageDimensions(CARD_WIDTH, CARD_HEIGHT)
+        cardView.tag = tvViewModel.videoUrl.value
+
+        Glide.with(viewHolder.view.context)
+            .load(tvViewModel.logo.value)
+            .centerInside()
+            .into(cardView.mainImageView)
+
+        cardView.setBackgroundColor(Color.WHITE)
+        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
+
+        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+        if (!epg.isNullOrEmpty()) {
+            cardView.contentText = epg.last().title
+        } else {
+            cardView.contentText = ""
+        }
+    }
+
+    override fun onUnbindViewHolder(viewHolder: ViewHolder) {
+        val cardView = viewHolder.view as ImageCardView
+        cardView.mainImage = null
+    }
+
+    companion object {
+        private const val TAG = "CardPresenter"
+        private const val CARD_WIDTH = 300
+        private const val CARD_HEIGHT = 101
+    }
+}
@@ -30,7 +30,7 @@ class ChannelFragment : Fragment() {
    fun show(tvViewModel: TVViewModel) {
        handler.removeCallbacks(hideRunnable)
        handler.removeCallbacks(playRunnable)
-        binding.channelContent.text = (tvViewModel.getTV().id.plus(1)).toString()
+        binding.channelContent.text = (tvViewModel.id.value?.plus(1)).toString()
        view?.visibility = View.VISIBLE
        handler.postDelayed(hideRunnable, delay)
    }
@@ -0,0 +1,157 @@
+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()
+        }
+    }
+}
@@ -5,16 +5,14 @@ import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment

-class ConfirmationFragment(
-    private val listener: ConfirmationListener,
-    private val message: String
-) : DialogFragment() {
+class ConfirmationDialogFragment(private val listener: ConfirmationDialogListener) :
+    DialogFragment() {

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        return activity?.let {
            val builder = AlertDialog.Builder(it)
-            builder.setTitle("确定更新吗？")
-                .setMessage(message)
+            builder.setTitle("确认")
+                .setMessage("确认更新吗？")
                .setPositiveButton(
                    "确定"
                ) { _, _ ->
@@ -25,11 +23,12 @@ class ConfirmationFragment(
                ) { _, _ ->
                    listener.onCancel()
                }
+            // 创建并返回 AlertDialog 对象
            builder.create()
        } ?: throw IllegalStateException("Activity cannot be null")
    }

-    interface ConfirmationListener {
+    interface ConfirmationDialogListener {
        fun onConfirm()
        fun onCancel()
    }
@@ -7,8 +7,6 @@ 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
@@ -50,7 +48,7 @@ val Context.appVersionCode: Long
 * Return the version name of the app which is defined in build.gradle.
 * eg:1.0.0
 */
-val Context.appVersionName: String get() = packageInfo.versionName ?: ""
+val Context.appVersionName: String get() = packageInfo.versionName

 val Context.appSignature: String
    get() {
@@ -73,25 +71,6 @@ 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")
@@ -1,54 +0,0 @@
-package com.lizongying.mytv
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Rect
-import android.view.View
-import androidx.core.content.ContextCompat
-import androidx.leanback.widget.ImageCardView
-import androidx.recyclerview.widget.RecyclerView
-
-class GrayOverlayItemDecoration(private val context: Context) : RecyclerView.ItemDecoration() {
-
-    private val grayOverlayPaint = Paint().apply {
-        color = ContextCompat.getColor(context, R.color.gray_overlay)
-        style = Paint.Style.FILL
-    }
-
-    override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-        super.onDrawOver(c, parent, state)
-
-        val childCount = parent.childCount
-        for (i in 0 until childCount) {
-            val child = parent.getChildAt(i)
-            if (!child.hasFocus()) {
-                (child as ImageCardView).setInfoAreaBackgroundColor(ContextCompat.getColor(context, R.color.blur))
-//                child.alpha = 0.5f
-                // 计算遮罩层的大小
-//                val overlayRect = Rect(
-//                    child.left,
-//                    child.top,
-//                    child.right,
-//                    child.bottom
-//                )
-//                // 绘制灰色遮罩层
-//                c.drawRect(overlayRect, grayOverlayPaint)
-            } else {
-                (child as ImageCardView).setInfoAreaBackgroundColor(ContextCompat.getColor(context, R.color.focus))
-//                child.alpha = 1f
-            }
-        }
-    }
-
-    override fun getItemOffsets(
-        outRect: Rect,
-        view: View,
-        parent: RecyclerView,
-        state: RecyclerView.State
-    ) {
-        super.getItemOffsets(outRect, view, parent, state)
-        // 在此处设置偏移量为0，以防止遮罩层影响项的布局
-        outRect.setEmpty()
-    }
-}
@@ -29,13 +29,13 @@ class InfoFragment : Fragment() {
    }

    fun show(tvViewModel: TVViewModel) {
-        binding.textView.text = tvViewModel.getTV().title
+        binding.textView.text = tvViewModel.title.value

        Glide.with(this)
-            .load(tvViewModel.getTV().logo)
+            .load(tvViewModel.logo.value)
            .into(binding.infoLogo)

-        Log.i(TAG, "${tvViewModel.getTV().title} ${tvViewModel.epg.value}")
+        Log.i(TAG, "${tvViewModel.title.value} ${tvViewModel.epg.value}")
        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
        if (!epg.isNullOrEmpty()) {
            binding.infoDesc.text = epg.last().title
@@ -1,9 +1,5 @@
 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
@@ -11,17 +7,11 @@ 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
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.models.TVViewModel
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch


 class MainActivity : FragmentActivity(), Request.RequestListener {
@@ -41,16 +31,6 @@ 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)
@@ -74,26 +54,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
                .commit()
        }
        gestureDetector = GestureDetector(this, GestureListener())
-
-        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) {
@@ -146,7 +106,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
        val transaction = supportFragmentManager.beginTransaction()

        if (mainFragment.isHidden) {
-            mainFragment.setPosition()
            transaction.show(mainFragment)
            mainActive()
        } else {
@@ -161,15 +120,11 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
        handler.postDelayed(hideMain, delayHideMain)
    }

-    fun settingDelayHide() {
+    fun settingActive() {
        handler.removeCallbacks(hideSetting)
        handler.postDelayed(hideSetting, delayHideSetting)
    }

-    fun settingNeverHide() {
-        handler.removeCallbacks(hideSetting)
-    }
-
    private val hideMain = Runnable {
        if (!mainFragment.isHidden) {
            supportFragmentManager.beginTransaction().hide(mainFragment).commit()
@@ -191,7 +146,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
    fun fragmentReady() {
        ready++
        Log.i(TAG, "ready $ready")
-        if (ready == 6) {
+        if (ready == 5) {
            mainFragment.fragmentReady()
        }
    }
@@ -206,7 +161,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
    private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {

        override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-            Log.i(TAG, "onSingleTapConfirmed")
            switchMainFragment()
            return true
        }
@@ -257,7 +211,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
        Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
        if (!settingFragment.isVisible) {
            settingFragment.show(supportFragmentManager, "setting")
-            settingDelayHide()
+            settingActive()
        } else {
            handler.removeCallbacks(hideSetting)
            settingFragment.dismiss()
@@ -322,9 +276,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
        }, 2000)
    }

-
-    fun onKey(keyCode: Int): Boolean {
-        Log.i(TAG, "keyCode $keyCode")
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
        when (keyCode) {
            KeyEvent.KEYCODE_0 -> {
                showChannel("0")
@@ -436,7 +388,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
            }

            KeyEvent.KEYCODE_DPAD_LEFT -> {
-                channelUp()
 //                if (mainFragment.isHidden) {
 //                    prevSource()
 //                } else {
@@ -450,7 +401,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
            }

            KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                channelDown()
 //                if (mainFragment.isHidden) {
 //                    nextSource()
 //                } else {
@@ -462,13 +412,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 //                }
            }
        }
-        return false
-    }
-
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        if (onKey(keyCode)) {
-            return true
-        }

        return super.onKeyDown(keyCode, event)
    }
@@ -499,7 +442,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
        Request.onDestroy()
    }

-    override fun onRequestFinished(message: String?) {
+    override fun onRequestFinished() {
        fragmentReady()
    }

@@ -1,46 +1,48 @@
 package com.lizongying.mytv

 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
-import android.view.KeyEvent
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
-import androidx.fragment.app.Fragment
+import androidx.leanback.app.BrowseSupportFragment
+import androidx.leanback.widget.ArrayObjectAdapter
+import androidx.leanback.widget.HeaderItem
+import androidx.leanback.widget.ListRow
+import androidx.leanback.widget.ListRowPresenter
+import androidx.leanback.widget.ListRowPresenter.SelectItemViewHolderTask
+import androidx.leanback.widget.OnItemViewClickedListener
+import androidx.leanback.widget.OnItemViewSelectedListener
+import androidx.leanback.widget.Presenter
+import androidx.leanback.widget.Row
+import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.lizongying.mytv.Utils.dpToPx
+import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.api.YSP
-import com.lizongying.mytv.databinding.RowBinding
-import com.lizongying.mytv.databinding.ShowBinding
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

-
-class MainFragment : Fragment(), CardAdapter.ItemListener {
+class MainFragment : BrowseSupportFragment() {

    private var itemPosition = 0

-    private var rowList: MutableList<View> = mutableListOf()
-
-    private var _binding: ShowBinding? = null
-    private val binding get() = _binding!!
+    private var rowsAdapter: ArrayObjectAdapter? = null

    var tvListViewModel = TVListViewModel()

    private var lastVideoUrl = ""

-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = ShowBinding.inflate(inflater, container, false)
-        return binding.root
+    override fun onCreate(savedInstanceState: Bundle?) {
+        Log.i(TAG, "onCreate")
+        super.onCreate(savedInstanceState)
+        headersState = HEADERS_DISABLED
+    }
+
+    override fun onStart() {
+        Log.i(TAG, "onStart")
+        super.onStart()
    }

    override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -48,204 +50,176 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {

        activity?.let { YSP.init(it) }

-        itemPosition = SP.itemPosition
+        loadRows()

-        view?.post {
-            val content = binding.content
+        setupEventListeners()

-            var idx: Long = 0
-            for ((k, v) in TVList.list) {
-                val itemBinding: RowBinding =
-                    RowBinding.inflate(layoutInflater, content, false)
-
-                val tvListViewModelCurrent = TVListViewModel()
-                for ((idx2, v1) in v.withIndex()) {
-                    val tvViewModel = TVViewModel(v1)
-                    tvViewModel.setRowPosition(idx.toInt())
-                    tvViewModel.setItemPosition(idx2)
-                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
-                    tvListViewModel.addTVViewModel(tvViewModel)
-
-                    updateEPG(tvViewModel)
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                if (tvViewModel.errInfo.value != null
+                    && tvViewModel.id.value == itemPosition
+                ) {
+                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
                }
-                tvListViewModel.maxNum.add(v.size)
-
-                val adapter =
-                    CardAdapter(
-                        itemBinding.rowItems,
-                        this,
-                        tvListViewModelCurrent,
-                    )
-                rowList.add(itemBinding.rowItems)
-
-                adapter.setItemListener(this)
-
-                itemBinding.rowHeader.text = k
-                itemBinding.rowItems.tag = idx.toInt()
-                itemBinding.rowItems.adapter = adapter
-
-                itemBinding.rowItems.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                    override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                        super.onScrolled(recyclerView, dx, dy)
-                        (activity as MainActivity).mainActive()
-                    }
-                })
-
-                val itemDecoration = context?.let { GrayOverlayItemDecoration(it) }
-                if (itemDecoration != null) {
-                    itemBinding.rowItems.addItemDecoration(itemDecoration)
-                }
-
-                if (SP.grid) {
-                    itemBinding.rowItems.layoutManager =
-                        GridLayoutManager(context, 6)
-                    itemBinding.rowItems.layoutParams.height =
-                        dpToPx(92 * ((tvListViewModelCurrent.size() + 6 - 1) / 6))
-                } else {
-                    itemBinding.rowItems.layoutManager =
-                        LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-                }
-
-                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
-                layoutParams.topMargin = dpToPx(11F)
-                itemBinding.row.layoutParams = layoutParams
-                content.addView(itemBinding.row)
-
-                idx++
            }
+            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->

-            if (itemPosition >= tvListViewModel.size()) {
-                itemPosition = 0
+                // not first time && channel not change
+                if (tvViewModel.ready.value != null
+                    && tvViewModel.id.value == itemPosition
+                    && check(tvViewModel)
+                ) {
+                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                    (activity as? MainActivity)?.play(tvViewModel)
+                }
            }
-
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.errInfo.value != null
-                        && tvViewModel.getTV().id == itemPosition
-                    ) {
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
-                            .show()
-                    }
-                }
-                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
-
-                    // not first time && channel not change
-                    if (tvViewModel.ready.value != null
-                        && tvViewModel.getTV().id == itemPosition
-                        && check(tvViewModel)
-                    ) {
-                        Log.i(TAG, "ready ${tvViewModel.getTV().title}")
-                        (activity as? MainActivity)?.play(tvViewModel)
-                    }
-                }
-                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.change.value != null) {
-                        val title = tvViewModel.getTV().title
-                        Log.i(TAG, "switch $title")
-                        if (tvViewModel.getTV().pid != "") {
-                            Log.i(TAG, "request $title")
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { Request.fetchData(it) }
-                            }
+            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
+                if (tvViewModel.change.value != null) {
+                    val title = tvViewModel.title.value
+                    Log.i(TAG, "switch $title")
+                    if (tvViewModel.pid.value != "") {
+                        Log.i(TAG, "request $title")
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            tvViewModel.let { Request.fetchData(it) }
+                        }
+                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                        setSelectedPosition(
+                            tvViewModel.getRowPosition(), true,
+                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
+                        )
+                    } else {
+                        if (check(tvViewModel)) {
+                            (activity as? MainActivity)?.play(tvViewModel)
                            (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setPosition(
-                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                            setSelectedPosition(
+                                tvViewModel.getRowPosition(), true,
+                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
                            )
-                        } else {
-                            if (check(tvViewModel)) {
-                                // TODO lastVideoUrl
-                                (activity as? MainActivity)?.play(tvViewModel)
-                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                                setPosition(
-                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
-                                )
-                            }
                        }
                    }
                }
            }
-            (activity as MainActivity).fragmentReady()
        }
+
+        (activity as MainActivity).fragmentReady()
    }

-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    fun toLastPosition() {
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
+        )
    }

-    override fun onKey(keyCode: Int): Boolean {
-        if (this.isHidden) {
-            when (keyCode) {
-                KeyEvent.KEYCODE_DPAD_UP -> {
-                    (activity as MainActivity).onKey(keyCode)
-                    return true
-                }
+    fun toFirstPosition() {
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(0)
+        )
+    }

-                KeyEvent.KEYCODE_DPAD_DOWN -> {
-                    (activity as MainActivity).onKey(keyCode)
-                    return true
+    override fun startHeadersTransition(withHeaders: Boolean) {
+    }
+
+    private fun loadRows() {
+        rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
+
+        val cardPresenter = CardPresenter(viewLifecycleOwner)
+
+        var idx: Long = 0
+        for ((k, v) in TVList.list) {
+            val listRowAdapter = ArrayObjectAdapter(cardPresenter)
+            for ((idx2, v1) in v.withIndex()) {
+                val tvViewModel = TVViewModel(v1)
+                tvViewModel.setRowPosition(idx.toInt())
+                tvViewModel.setItemPosition(idx2)
+                tvListViewModel.addTVViewModel(tvViewModel)
+                listRowAdapter.add(tvViewModel)
+
+                updateEPG(tvViewModel)
+            }
+            tvListViewModel.maxNum.add(v.size)
+            val header = HeaderItem(idx, k)
+            rowsAdapter!!.add(ListRow(header, listRowAdapter))
+            idx++
+        }
+
+        adapter = rowsAdapter
+
+        itemPosition = SP.itemPosition
+        if (itemPosition >= tvListViewModel.size()) {
+            itemPosition = 0
+        }
+        tvListViewModel.setItemPosition(itemPosition)
+    }
+
+    fun prevSource() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.minus(1)
+                    if (videoIndex == -1) {
+                        tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
+                    }
+                    tvViewModel.changed()
                }
            }
        }
-        return false
    }

-    override fun onItemHasFocus(tvViewModel: TVViewModel) {
-        tvListViewModel.setItemPositionCurrent(tvViewModel.getTV().id)
-
-        val row = tvViewModel.getRowPosition()
-
-        for (i in rowList) {
-            if (i.tag as Int != row) {
-                ((i as RecyclerView).adapter as CardAdapter).clear()
+    fun nextSource() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
+                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
+                        tvViewModel.setVideoIndex(0)
+                    }
+                    tvViewModel.changed()
+                }
            }
        }
-
-        (activity as MainActivity).mainActive()
    }

-    override fun onItemClicked(tvViewModel: TVViewModel) {
-        Log.i(TAG, "onItemClicked")
-        if (this.isHidden) {
-            (activity as? MainActivity)?.switchMainFragment()
-            return
-        }
-
-        if (itemPosition != tvViewModel.getTV().id) {
-            itemPosition = tvViewModel.getTV().id
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-        (activity as? MainActivity)?.switchMainFragment()
+    private fun setupEventListeners() {
+        onItemViewClickedListener = ItemViewClickedListener()
+        onItemViewSelectedListener = ItemViewSelectedListener()
    }

-    fun setPosition() {
-        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-        val rowPosition = tvViewModel!!.getRowPosition()
-        val itemPosition = tvViewModel.getItemPosition()
-        setPosition(rowPosition, itemPosition)
-    }
-
-    fun setPosition(rowPosition: Int, itemPosition: Int) {
-        rowList[rowPosition].post {
-            when (val layoutManager = (rowList[rowPosition] as RecyclerView).layoutManager) {
-                is GridLayoutManager -> {
-                    layoutManager.findViewByPosition(
-                        itemPosition
-                    )?.requestFocus()
+    private inner class ItemViewClickedListener : OnItemViewClickedListener {
+        override fun onItemClicked(
+            itemViewHolder: Presenter.ViewHolder,
+            item: Any,
+            rowViewHolder: RowPresenter.ViewHolder,
+            row: Row
+        ) {
+            if (item is TVViewModel) {
+                if (itemPosition != item.id.value!!) {
+                    itemPosition = item.id.value!!
+                    tvListViewModel.setItemPosition(itemPosition)
+                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
                }
+                (activity as? MainActivity)?.switchMainFragment()
+            }
+        }
+    }

-                is LinearLayoutManager -> {
-                    layoutManager.findViewByPosition(
-                        itemPosition
-                    )?.requestFocus()
-                }
+    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
+        override fun onItemSelected(
+            itemViewHolder: Presenter.ViewHolder?, item: Any?,
+            rowViewHolder: RowPresenter.ViewHolder, row: Row
+        ) {
+            if (item is TVViewModel) {
+                tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                (activity as MainActivity).mainActive()
            }
        }
    }

    fun check(tvViewModel: TVViewModel): Boolean {
-        val title = tvViewModel.getTV().title
+        val title = tvViewModel.title.value
        val videoUrl = tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
        if (videoUrl == null || videoUrl == "") {
            Log.e(TAG, "$title videoUrl is empty")
@@ -307,32 +281,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
        }
    }

-    fun shouldHasFocus(tvModel: TVViewModel): Boolean {
-        return tvModel == tvListViewModel.getTVViewModel(itemPosition)
-    }
-
-    override fun onHiddenChanged(hidden: Boolean) {
-        super.onHiddenChanged(hidden)
-        if (!hidden) {
-            val tvModel = tvListViewModel.getTVViewModel(itemPosition)
-            val rowPosition = tvModel?.getRowPosition()
-            val itemPosition = tvModel?.getItemPosition()
-            Log.i(TAG, "toPosition $rowPosition $itemPosition")
-            for (i in rowList) {
-                if (i.tag as Int == rowPosition) {
-                    ((i as RecyclerView).adapter as CardAdapter).toPosition(itemPosition!!)
-                    break
-                }
-            }
-        } else {
-            view?.post {
-//                for (i in rowList) {
-//                    ((i as RecyclerView).adapter as CardAdapter).visiable = false
-//                }
-            }
-        }
-    }
-
    override fun onResume() {
        Log.i(TAG, "onResume")
        super.onResume()
@@ -350,12 +298,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
        super.onDestroy()
    }

-    override fun onDestroyView() {
-        Log.i(TAG, "onDestroyView")
-        super.onDestroyView()
-        _binding = null
-    }
-
    companion object {
        private const val TAG = "MainFragment"
        private const val POSITION = "position"
@@ -1,16 +0,0 @@
-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) {
-            }
-        }
-    }
-}
@@ -57,9 +57,7 @@ object Request {
    private var listener: RequestListener? = null

    private var initRetryTimes = 0
-    private var initRetryMaxTimes = 0
-
-    private var openid = "vu0-8lgGV2LW9QjDeucB9H12d_6HQWmTFgqCWg5o-VBQN4"
+    private var initRetryMaxTimes = 1

    fun onCreate() {
        Log.i(TAG, "onCreate")
@@ -88,7 +86,7 @@ object Request {
    private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
        cancelCall()

-        val title = tvModel.getTV().title
+        val title = tvModel.title.value

        val data = YSP.getAuthData(tvModel)
        val request = AuthRequest(data)
@@ -168,7 +166,7 @@ object Request {
            handler.removeCallbacks(btraceRunnable)
        }

-        val title = tvModel.getTV().title
+        val title = tvModel.title.value

        tvModel.seq = 0
        val data = YSP.switch(tvModel)
@@ -256,7 +254,7 @@ object Request {
                        }
                    }
                } else {
-                    Log.e(TAG, "$title status error $data")
+                    Log.e(TAG, "$title status error")
                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                        tvModel.retryTimes++
                        if (tvModel.getTV().needToken) {
@@ -311,13 +309,13 @@ object Request {
                        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"
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
                        fetchAuth(tvModel, cookie)
                    } else if (response.code() == 304) {
                        tvModel.needGetToken = false
                        tvModel.tokenYSPRetryTimes = 0
                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
                        fetchVideo(tvModel, cookie)
                    } else {
                        Log.e(TAG, "info status error")
@@ -350,7 +348,7 @@ object Request {
            })
        } else {
            val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=$openid; vusession=$token"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
            fetchAuth(tvModel, cookie)
        }
    }
@@ -368,13 +366,13 @@ object Request {
                        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"
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
                        fetchVideo(tvModel, cookie)
                    } else if (response.code() == 304) {
                        tvModel.needGetToken = false
                        tvModel.tokenYSPRetryTimes = 0
                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
                        fetchVideo(tvModel, cookie)
                    } else {
                        Log.e(TAG, "info status error")
@@ -407,7 +405,7 @@ object Request {
            })
        } else {
            val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
            fetchVideo(tvModel, cookie)
        }
    }
@@ -415,7 +413,7 @@ object Request {
    private fun fetchFAuth(tvModel: TVViewModel) {
        cancelCall()

-        val title = tvModel.getTV().title
+        val title = tvModel.title.value

        var qa = "HD"
        if (tokenFH != "") {
@@ -457,9 +455,6 @@ object Request {
        }

        if (tvModel.getTV().needToken) {
-            if (token == "") {
-                tvModel.needGetToken = true
-            }
            if (needAuth) {
                fetchAuth(tvModel)
            } else {
@@ -467,7 +462,7 @@ object Request {
            }
        } else {
            val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; updateProtocol=1; deviceModel=120"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205"
            if (needAuth) {
                fetchAuth(tvModel, cookie)
            } else {
@@ -487,14 +482,10 @@ 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")
@@ -525,7 +516,7 @@ object Request {
                            Utils.setBetween(c * 1000L)
                            Log.i(TAG, "current time $c")
                        }
-                        listener?.onRequestFinished(null)
+                        listener?.onRequestFinished()
                    } else {
                        Log.e(TAG, "token status error")
                        handler.postDelayed(
@@ -536,7 +527,7 @@ object Request {
                            initRetryTimes++
                            fetchInfoV2()
                        } else {
-                            listener?.onRequestFinished("状态错误")
+                            listener?.onRequestFinished()
                        }
                    }
                }
@@ -552,7 +543,7 @@ object Request {
                        initRetryTimes++
                        fetchInfoV2()
                    } else {
-                        listener?.onRequestFinished("网络错误")
+                        listener?.onRequestFinished()
                    }
                }
            })
@@ -614,11 +605,11 @@ object Request {
    }

    fun fetchBtrace(tvModel: TVViewModel) {
-        val title = tvModel.getTV().title
+        val title = tvModel.title.value

        val guid = YSP.getGuid()
-        val pid = tvModel.getTV().pid
-        val sid = tvModel.getTV().sid
+        val pid = tvModel.pid.value!!
+        val sid = tvModel.sid.value!!
        yspBtraceService.kvcollect(
            c_timestamp = YSP.generateGuid(),
            guid = guid,
@@ -684,8 +675,8 @@ object Request {
    }

    fun fetchYEPG(tvViewModel: TVViewModel) {
-        val title = tvViewModel.getTV().title
-        yspProtoService.getProgram(tvViewModel.getTV().programId, getDateFormat("yyyyMMdd"))
+        val title = tvViewModel.title.value
+        yspProtoService.getProgram(tvViewModel.programId.value!!, getDateFormat("yyyyMMdd"))
            .enqueue(object : Callback<epgProgramModel.Response> {
                override fun onResponse(
                    call: Call<epgProgramModel.Response>,
@@ -709,8 +700,8 @@ object Request {
    }

    fun fetchFEPG(tvViewModel: TVViewModel) {
-        val title = tvViewModel.getTV().title
-        fAuthService.getEPG(tvViewModel.getTV().pid, getDateFormat("yyyyMMdd"))
+        val title = tvViewModel.title.value
+        fAuthService.getEPG(tvViewModel.pid.value!!, getDateFormat("yyyyMMdd"))
            .enqueue(object : Callback<List<FEPG>> {
                override fun onResponse(
                    call: Call<List<FEPG>>,
@@ -747,7 +738,7 @@ object Request {
    }

    interface RequestListener {
-        fun onRequestFinished(message: String?)
+        fun onRequestFinished()
    }

    fun setRequestListener(listener: RequestListener) {
@@ -16,8 +16,6 @@ object SP {
    // If start app on device boot or not
    private const val KEY_BOOT_STARTUP = "boot_startup"

-    private const val KEY_GRID = "grid"
-
    // Position in list of the selected channel item
    private const val KEY_POSITION = "position"

@@ -45,10 +43,6 @@ object SP {
        get() = sp.getBoolean(KEY_BOOT_STARTUP, false)
        set(value) = sp.edit().putBoolean(KEY_BOOT_STARTUP, value).apply()

-    var grid: Boolean
-        get() = sp.getBoolean(KEY_GRID, false)
-        set(value) = sp.edit().putBoolean(KEY_GRID, value).apply()
-
    var itemPosition: Int
        get() = sp.getInt(KEY_POSITION, 0)
        set(value) = sp.edit().putInt(KEY_POSITION, value).apply()
@@ -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.SettingBinding
+import com.lizongying.mytv.databinding.DialogBinding


 class SettingFragment : DialogFragment() {

-    private var _binding: SettingBinding? = null
+    private var _binding: DialogBinding? = null
    private val binding get() = _binding!!

    private lateinit var updateManager: UpdateManager
@@ -26,7 +26,7 @@ class SettingFragment : DialogFragment() {
        savedInstanceState: Bundle?
    ): View {
        val context = requireContext() // It‘s safe to get context here.
-        _binding = SettingBinding.inflate(inflater, container, false)
+        _binding = DialogBinding.inflate(inflater, container, false)
        binding.versionName.text = "当前版本: v${context.appVersionName}"
        binding.version.text = "https://github.com/lizongying/my-tv"

@@ -34,7 +34,7 @@ class SettingFragment : DialogFragment() {
            isChecked = SP.channelReversal
            setOnCheckedChangeListener { _, isChecked ->
                SP.channelReversal = isChecked
-                (activity as MainActivity).settingDelayHide()
+                (activity as MainActivity).settingActive()
            }
        }

@@ -42,7 +42,7 @@ class SettingFragment : DialogFragment() {
            isChecked = SP.channelNum
            setOnCheckedChangeListener { _, isChecked ->
                SP.channelNum = isChecked
-                (activity as MainActivity).settingDelayHide()
+                (activity as MainActivity).settingActive()
            }
        }

@@ -50,42 +50,23 @@ class SettingFragment : DialogFragment() {
            isChecked = SP.bootStartup
            setOnCheckedChangeListener { _, isChecked ->
                SP.bootStartup = isChecked
-                (activity as MainActivity).settingDelayHide()
-            }
-        }
-
-        binding.switchGrid.run {
-            isChecked = SP.grid
-            setOnCheckedChangeListener { _, isChecked ->
-                SP.grid = isChecked
-                (activity as MainActivity).settingDelayHide()
+                (activity as MainActivity).settingActive()
            }
        }

        updateManager = UpdateManager(context, this, context.appVersionCode)
-        binding.checkVersion.setOnClickListener(
-            OnClickListenerCheckVersion(
-                activity as MainActivity,
-                updateManager
-            )
-        )
+        binding.checkVersion.setOnClickListener(OnClickListenerCheckVersion(updateManager))

        return binding.root
    }

    fun setVersionName(versionName: String) {
-        if (_binding != null) {
-            binding.versionName.text = versionName
-        }
+        binding.versionName.text = versionName
    }

-    internal class OnClickListenerCheckVersion(
-        private val mainActivity: MainActivity,
-        private val updateManager: UpdateManager
-    ) :
+    internal class OnClickListenerCheckVersion(private val updateManager: UpdateManager) :
        View.OnClickListener {
        override fun onClick(view: View?) {
-            mainActivity.settingDelayHide()
            updateManager.checkAndUpdate()
        }
    }
@@ -95,6 +76,11 @@ class SettingFragment : DialogFragment() {
        _binding = null
    }

+    override fun onDestroy() {
+        super.onDestroy()
+//        updateManager.destroy()
+    }
+
    companion object {
        const val TAG = "SettingFragment"
    }
@@ -1,5 +1,12 @@
 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()
@@ -963,4 +970,63 @@ 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)
+            }
+        }
+    }
 }
@@ -30,7 +30,7 @@ class UpdateManager(
    private var settingFragment: SettingFragment,
    private var versionCode: Long
 ) :
-    ConfirmationFragment.ConfirmationListener {
+    ConfirmationDialogFragment.ConfirmationDialogListener {

    private var myRequest = MyRequest()
    private var release: ReleaseV2? = null
@@ -47,10 +47,12 @@ class UpdateManager(
                release = myRequest.getRelease()
                Log.i(TAG, "versionCode $versionCode ${release?.c}")
                if (release?.c != null) {
-                    text = if (release?.c!! > versionCode) {
-                        "最新版本：${release?.n}\n${release?.d ?: ""}"
+                    if (release?.c!! >= versionCode) {
+                        text = "最新版本：${release?.n}"
+                        val dialog = ConfirmationDialogFragment(this@UpdateManager)
+                        dialog.show(settingFragment.fragmentManager, "ConfirmationDialogFragment")
                    } else {
-                        "已是最新版本，不需要更新"
+                        text = "已是最新版本，不需要更新"
                    }
                }
            } catch (e: Exception) {
@@ -61,11 +63,10 @@ class UpdateManager(
    }

    private fun updateUI(text: String) {
-        val dialog = ConfirmationFragment(this@UpdateManager, text)
-        dialog.show(settingFragment.fragmentManager, TAG)
+        settingFragment.setVersionName(text)
    }

-    private fun haveStoragePermission(): Boolean {
+    fun haveStoragePermission(): Boolean {
        if (Build.VERSION.SDK_INT >= 23) {
            if (checkSelfPermission(context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
                === PermissionChecker.PERMISSION_GRANTED
@@ -101,7 +102,7 @@ class UpdateManager(
            Environment.DIRECTORY_DOWNLOADS,
            apkFileName
        )
-        request.setTitle("${settingFragment.resources.getString(R.string.app_name)} ${release.n}")
+        request.setTitle("New Version Download")
        request.setNotificationVisibility(Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
        request.setAllowedOverRoaming(false)
        request.setMimeType("application/vnd.android.package-archive")
@@ -16,7 +16,6 @@ data class Token(
 )

 data class InfoV2(
-    val o: String?,
    val f: String?,
    val t: String?,
    val e: Int?,
@@ -26,7 +25,6 @@ data class InfoV2(
 data class ReleaseV2(
    val n: String?,
    val u: String?,
-    val d: String?,
    val c: Int?,
 )

@@ -7,6 +7,6 @@ import retrofit2.http.Path
 interface ReleaseService {
    @GET("my-tv/v2/release/{name}")
    fun getRelease(
-        @Path("name") date: String = "2",
+        @Path("name") date: String = "1",
    ): Call<ReleaseV2>
 }
@@ -63,8 +63,8 @@ object YSP {
    }

    fun switch(tvModel: TVViewModel): String {
-        livepid = tvModel.getTV().pid
-        cnlid = tvModel.getTV().sid
+        livepid = tvModel.pid.value!!
+        cnlid = tvModel.sid.value!!
        defn = "fhd"

        randStr = getRand()
@@ -82,7 +82,7 @@ object YSP {
    }

    fun getAuthData(tvModel: TVViewModel): String {
-        livepid = tvModel.getTV().pid
+        livepid = tvModel.pid.value!!

        randStr = getRand()

@@ -1,9 +1,15 @@
 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
@@ -20,7 +26,7 @@ class TVViewModel(private var tv: TV) : ViewModel() {
    var tokenYSPRetryTimes = 0
    var tokenYSPRetryMaxTimes = 0
    var tokenFHRetryTimes = 0
-    var tokenFHRetryMaxTimes = 8
+    var tokenFHRetryMaxTimes = 4

    var needGetToken = false

@@ -28,10 +34,22 @@ class TVViewModel(private var tv: TV) : ViewModel() {
    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
@@ -40,6 +58,18 @@ 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
@@ -86,8 +116,14 @@ class TVViewModel(private var tv: TV) : ViewModel() {
    }

    init {
+        _id.value = tv.id
+        _title.value = tv.title
        _videoUrl.value = tv.videoUrl
        _videoIndex.value = tv.videoUrl.lastIndex
+        _logo.value = tv.logo
+        _programId.value = tv.programId
+        _pid.value = tv.pid
+        _sid.value = tv.sid
    }

    fun getRowPosition(): Int {
@@ -110,6 +146,10 @@ class TVViewModel(private var tv: TV) : ViewModel() {
        _errInfo.value = info
    }

+    fun update(t: TV) {
+        tv = t
+    }
+
    fun getTV(): TV {
        return tv
    }
@@ -132,6 +172,21 @@ class TVViewModel(private var tv: TV) : ViewModel() {
        _epg.value = p.map { EPG(it.title, formatFTime(it.event_time)) }.toMutableList()
    }

+    /**
+     * (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!!]
    }
@@ -70,12 +70,6 @@
                android:layout_marginTop="10dp"
                android:layout_width="match_parent"
                android:layout_height="wrap_content" />
-            <Switch
-                android:id="@+id/switch_grid"
-                android:text="@string/title_grid"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
        </LinearLayout>
        <ImageView
            android:layout_width="300dp"
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/row_header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:layout_marginTop="0dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginBottom="5dp"
-        android:gravity="start"
-        android:textColor="#FFEEEEEE"
-        android:textSize="22sp" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/row_items"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-    </androidx.recyclerview.widget.RecyclerView>
-</LinearLayout>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/show_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <LinearLayout
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-        </LinearLayout>
-    </ScrollView>
-</FrameLayout>
@@ -1,7 +1,6 @@
 [
  {
    "id": 0,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
    "pid": "600001859",
@@ -16,7 +15,6 @@
  },
  {
    "id": 1,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
    "pid": "600001800",
@@ -31,7 +29,6 @@
  },
  {
    "id": 2,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
    "pid": "600001801",
@@ -46,7 +43,6 @@
  },
  {
    "id": 3,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp",
    "pid": "600001814",
@@ -62,7 +58,6 @@
  },
  {
    "id": 4,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp",
    "pid": "600001818",
@@ -77,7 +72,6 @@
  },
  {
    "id": 5,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
    "pid": "600001802",
@@ -92,7 +86,6 @@
  },
  {
    "id": 6,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp",
    "pid": "600004092",
@@ -107,7 +100,6 @@
  },
  {
    "id": 7,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ad51de94426a0ba039e6dd6a8534ea98ecc813a6176bde87b4f18cc34d6d7590.png?imageMogr2/format/webp",
    "pid": "600001803",
@@ -122,7 +114,6 @@
  },
  {
    "id": 8,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp",
    "pid": "600004078",
@@ -137,7 +128,6 @@
  },
  {
    "id": 9,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp",
    "pid": "600001805",
@@ -152,7 +142,6 @@
  },
  {
    "id": 10,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp",
    "pid": "600001806",
@@ -167,7 +156,6 @@
  },
  {
    "id": 11,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp",
    "pid": "600001807",
@@ -182,7 +170,6 @@
  },
  {
    "id": 12,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/266da7b43c03e2312186b4a999e0f060e8f15b10d2cc2c9aa32171819254cf1a.png?imageMogr2/format/webp",
    "pid": "600001811",
@@ -198,7 +185,6 @@
  },
  {
    "id": 13,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp",
    "pid": "600001809",
@@ -213,7 +199,6 @@
  },
  {
    "id": 14,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp",
    "pid": "600001815",
@@ -228,7 +213,6 @@
  },
  {
    "id": 15,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp",
    "pid": "600098637",
@@ -244,7 +228,6 @@
  },
  {
    "id": 16,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp",
    "pid": "600001810",
@@ -259,7 +242,6 @@
  },
  {
    "id": 17,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp",
    "pid": "600001817",
@@ -274,7 +256,6 @@
  },
  {
    "id": 18,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
    "pid": "600002264",
@@ -289,7 +270,6 @@
  },
  {
    "id": 19,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "",
    "pid": "600156816",
@@ -304,7 +284,6 @@
  },
  {
    "id": 20,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4d549e53e6d0f632d5a633d1945280797b153e588f919221a07faa869812cc89.png?imageMogr2/format/webp",
    "pid": "600099658",
@@ -319,7 +298,6 @@
  },
  {
    "id": 21,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a556bd7d93ce65e18f243a8892b5604f4faa994a4897315914216a710a706208.png?imageMogr2/format/webp",
    "pid": "600099655",
@@ -334,7 +312,6 @@
  },
  {
    "id": 22,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/5661bd04fecdb6e899f801147a22ab5d3a475bf2b62e30aec2c0023190ebc9b1.png?imageMogr2/format/webp",
    "pid": "600099620",
@@ -349,7 +326,6 @@
  },
  {
    "id": 23,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bb3c6c9e145d698137f5bb64a582021a01b51344b929003630eb769ea65832a9.png?imageMogr2/format/webp",
    "pid": "600099637",
@@ -364,7 +340,6 @@
  },
  {
    "id": 24,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bbf1d024c5228b8dd128b0e3cb1717d173fab4ee84c3a4c8a57b1a215362ca3b.png?imageMogr2/format/webp",
    "pid": "600099660",
@@ -379,7 +354,6 @@
  },
  {
    "id": 25,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4c6b6a6d3839889f34d33db3c2f80233b26b74d3489b393487635f8704e70796.png?imageMogr2/format/webp",
    "pid": "600099649",
@@ -394,7 +368,6 @@
  },
  {
    "id": 26,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cd1e2bb52b06a991de168733e5ff0f1d85adc8042d40c8f393f723543e5dd08a.png?imageMogr2/format/webp",
    "pid": "600099636",
@@ -409,7 +382,6 @@
  },
  {
    "id": 27,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cdd1b31ede7a5ad049ed53d9a072422f829e72dd062ed2c19e077fdd01699071.png?imageMogr2/format/webp",
    "pid": "600099659",
@@ -424,7 +396,6 @@
  },
  {
    "id": 28,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/fa28955ce8b2539d728bf4c6a13a46ff57ad76eae46627f7bcfb1ed8a613d3fc.png?imageMogr2/format/webp",
    "pid": "600099650",
@@ -439,7 +410,6 @@
  },
  {
    "id": 29,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/14ac5ce40482cacd3d4b37435222bfe86af2b452a2f04ecbfc1d13d76edd7c57.png?imageMogr2/format/webp",
    "pid": "600099653",
@@ -454,7 +424,6 @@
  },
  {
    "id": 30,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/10e14a92478011aa6c3c8562e62127f3b1908e29fcd78e4b2b24b9e6d3ec2fbc.png?imageMogr2/format/webp",
    "pid": "600099652",
@@ -469,7 +438,6 @@
  },
  {
    "id": 31,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/244d72c0eb1615ed7d51c2f5db5a67f306aa3f58c05bc2d34de3aa7e956dc8c9.png?imageMogr2/format/webp",
    "pid": "600099656",
@@ -484,7 +452,6 @@
  },
  {
    "id": 32,
-    "videoIndex": 0,
    "channel": "央视",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54a6863656fdfd8f803be193ddf22441c5000a108833889816fd2d8911715ce8.png?imageMogr2/format/webp",
    "pid": "600099651",
@@ -499,7 +466,6 @@
  },
  {
    "id": 33,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp",
    "pid": "600002483",
@@ -514,7 +480,6 @@
  },
  {
    "id": 34,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp",
    "pid": "600002475",
@@ -530,7 +495,6 @@
  },
  {
    "id": 35,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp",
    "pid": "600002508",
@@ -546,7 +510,6 @@
  },
  {
    "id": 36,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ac4ed6058a87c101ae7147ebc38905d0cae047fb73fd277ee5049b84f52bda36.png?imageMogr2/format/webp",
    "pid": "600002505",
@@ -562,7 +525,6 @@
  },
  {
    "id": 37,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp",
    "pid": "600002521",
@@ -578,7 +540,6 @@
  },
  {
    "id": 38,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3c760d0d00463855890e8a1864ea4a6b6dd66b90c29b4ac714a4b17c16519871.png?imageMogr2/format/webp",
    "pid": "600002503",
@@ -594,7 +555,6 @@
  },
  {
    "id": 39,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/22d403f07a7cf5410b3ad3ddb65a11aa229a32475fac213f5344c9f0ec330ca1.png?imageMogr2/format/webp",
    "pid": "600002513",
@@ -609,7 +569,6 @@
  },
  {
    "id": 40,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/28886880a4dc0f06fb7e0a528a1def0591d61a65870e29176ede0cc92033bbfd.png?imageMogr2/format/webp",
    "pid": "600002485",
@@ -624,7 +583,6 @@
  },
  {
    "id": 41,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54b7e97cb816bb223fe05f3fc44da2c7820eb66e8550c19d23100f2c414ecc38.png?imageMogr2/format/webp",
    "pid": "600002509",
@@ -640,7 +598,6 @@
  },
  {
    "id": 42,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/657651f411de2673d1770d9a78b44c1265704f7468cc41d4be7f51d630768494.png?imageMogr2/format/webp",
    "pid": "600002531",
@@ -656,7 +613,6 @@
  },
  {
    "id": 43,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/74925962148a6d31c85808b6cd4e444c2a54bab393d2c5fc85e960b50e22fa86.png?imageMogr2/format/webp",
    "pid": "600002525",
@@ -672,7 +628,6 @@
  },
  {
    "id": 44,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d545becdc81c60197b08c7f47380705e4665ed3fe55efc8b855e486f6e655378.png?imageMogr2/format/webp",
    "pid": "600002493",
@@ -688,7 +643,6 @@
  },
  {
    "id": 45,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4eb45f4781d33d872af027dc01c941559aab55667dd99cc5c22bef7037807b13.png?imageMogr2/format/webp",
    "pid": "600002490",
@@ -704,7 +658,6 @@
  },
  {
    "id": 46,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f4f23633c578beea49a3841d88d3490100f029ee349059fa532869db889872c5.png?imageMogr2/format/webp",
    "pid": "600002309",
@@ -720,7 +673,6 @@
  },
  {
    "id": 47,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d8273ae9be698ce2db21f5b886ecac95a73429593f93713c60ed8c12c38bf0d3.png?imageMogr2/format/webp",
    "pid": "600002498",
@@ -736,7 +688,6 @@
  },
  {
    "id": 48,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a66c836bd98ba3e41a2e9a570d4b9c50dedc6839e9de333e2e78212ad505f37e.png?imageMogr2/format/webp",
    "pid": "600002520",
@@ -752,7 +703,6 @@
  },
  {
    "id": 49,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f35fa04b51b1ee4984b03578b65403570868ebca03c6c01e11b097f999a58d9b.png?imageMogr2/format/webp",
    "pid": "600002532",
@@ -768,7 +718,6 @@
  },
  {
    "id": 50,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp",
    "pid": "600002481",
@@ -784,7 +733,6 @@
  },
  {
    "id": 51,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
    "pid": "600002516",
@@ -800,7 +748,6 @@
  },
  {
    "id": 52,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp",
    "pid": "600002484",
@@ -816,7 +763,6 @@
  },
  {
    "id": 53,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp",
    "pid": "600002506",
@@ -832,7 +778,6 @@
  },
  {
    "id": 54,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "",
    "pid": "600152137",
@@ -847,7 +792,6 @@
  },
  {
    "id": 55,
-    "videoIndex": 0,
    "channel": "地方",
    "logo": "",
    "pid": "600152138",
@@ -862,7 +806,6 @@
  },
  {
    "id": 56,
-    "videoIndex": 0,
    "channel": "国际",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp",
    "pid": "600014550",
@@ -877,7 +820,6 @@
  },
  {
    "id": 57,
-    "videoIndex": 0,
    "channel": "国际",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp",
    "pid": "600084704",
@@ -892,7 +834,6 @@
  },
  {
    "id": 58,
-    "videoIndex": 0,
    "channel": "国际",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp",
    "pid": "600084758",
@@ -907,7 +848,6 @@
  },
  {
    "id": 59,
-    "videoIndex": 0,
    "channel": "国际",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp",
    "pid": "600084782",
@@ -922,7 +862,6 @@
  },
  {
    "id": 60,
-    "videoIndex": 0,
    "channel": "国际",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp",
    "pid": "600084744",
@@ -938,7 +877,6 @@
  },
  {
    "id": 61,
-    "videoIndex": 0,
    "channel": "国际",
    "logo": "https://resources.yangshipin.cn/assets/oms/image/202309/74d3ac436a7e374879578de1d87a941fbf566d39d5632b027c5097891ed32bd5.png?imageMogr2/format/webp",
    "pid": "600084781",
@@ -2,7 +2,4 @@
    <color name="fastlane_background">#30000000</color>
    <color name="black">#000</color>
    <color name="white">#FFF</color>
-    <color name="gray_overlay">#7F000000</color>
-    <color name="focus">#0096a6</color>
-    <color name="blur">#FF263238</color>
 </resources>
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="server_url">http://localhost:8080</string>
-</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>
@@ -4,5 +4,4 @@
    <string name="title_channel_num">数字选台</string>
    <string name="check_version">检查更新</string>
    <string name="title_boot_startup">开机自启</string>
-    <string name="title_grid">网格样式</string>
 </resources>
@@ -1,25 +1,10 @@
 <resources>

    <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
-        <item name="cardType">infoUnder</item>
-        <item name="infoVisibility">always</item>
-        <!-- In order to keep backward compatibility we have to create an icon on right. -->
-        <item name="lbImageCardViewType">Title|Content|IconOnRight</item>
-        <!-- Deprecated. Use 'Widget.Leanback.ImageCardView.InfoAreaStyle' instead. -->
-        <item name="infoAreaBackground">@null</item>
-    </style>
-
-    <style name="CustomImageCardViewImageStyle" parent="Widget.Leanback.ImageCardView.ImageStyle">
-        <item name="android:layout_width">160dp</item>
-        <item name="android:layout_height">40dp</item>
-        <item name="android:adjustViewBounds">true</item>
-        <item name="android:contentDescription">@null</item>
-        <item name="android:scaleType">centerCrop</item>
-        <item name="layout_viewType">main</item>
+        <item name="lbImageCardViewType">Title|Content</item>
    </style>

    <style name="CustomImageCardTheme" parent="Theme.Leanback">
        <item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
-        <item name="imageCardViewImageStyle">@style/CustomImageCardViewImageStyle</item>
    </style>
 </resources>
Author	SHA1	Message	Date
Li ZongYing	7b0e144cb1	fix update manager	2024-03-18 18:29:56 +08:00
Li ZongYing	06b8df5f82	request optimize	2024-03-15 21:51:27 +08:00
Li ZongYing	7bed18ee6d	phoenix EPG	2024-03-15 17:16:12 +08:00
Li ZongYing	0c2beb936a	phoenix retry	2024-03-15 17:16:12 +08:00
WoooKong	51ab79b5ca	Optimize SettingFragment (#536 )	2024-03-15 17:04:50 +08:00
Li ZongYing	c8de039d05	logo	2024-03-11 10:26:19 +08:00
Li ZongYing	c9494f7bf3	cetv1 logo	2024-03-09 21:12:56 +08:00
Sky	79b6cfcd11	fix typo (#541 )	2024-03-09 18:59:04 +08:00
Li ZongYing	31988d0d86	fh fhd	2024-03-09 18:08:53 +08:00
Li ZongYing	e55e8ceb18	delayHideMain 10s	2024-03-09 08:50:27 +08:00
Li ZongYing	0b62742350	token-v2	2024-03-08 22:50:47 +08:00
Li ZongYing	558fe7e4e7	cetv1	2024-03-08 21:17:13 +08:00
Li ZongYing	e2145f8d0d	bootStartup->false	2024-03-06 01:27:13 +08:00
Li ZongYing	46b4df1306	readme	2024-03-06 01:25:19 +08:00
李宗英	358539f9c3	Merge pull request #455 from WoooKong/main 创建 SP 工具类，管理所有（除 ChannelUtils 以外）用户偏好设置	2024-03-06 01:13:10 +08:00
WoooKong	17d8d4cb46	还原 VersionCode	2024-03-04 18:07:15 +08:00
WoooKong	dc81112a3d	Merge branch 'main' into main	2024-03-04 17:52:02 +08:00
Li ZongYing	95ea83e45c	add phoenix tv	2024-02-25 16:08:49 +08:00
Li ZongYing	a6078e75e1	got	2024-02-25 11:16:09 +08:00
Li ZongYing	8a3720049f	update mannager	2024-02-25 10:19:35 +08:00
WoooKong	ede420a190	调整注释	2024-02-19 16:55:34 +08:00
WoooKong	f94d136a03	创建 SP 工具类，管理所有（除 ChannelUtils 以外）用户偏好设置	2024-02-19 12:23:05 +08:00
李宗英	e7780434d7	Merge pull request #442 from JohnsonRan/main fix: LibChecker -> my-tv	2024-02-18 18:30:28 +08:00
旋律旋律你在干什么	67edb2830c	fix: LibChecker -> my-tv	2024-02-18 13:06:12 +08:00
Li ZongYing	2869164368	readme	2024-02-17 09:15:16 +08:00
Li ZongYing	83a70291d4	fix tianmao-mohe	2024-02-16 22:14:11 +08:00
李宗英	872f668c59	Merge pull request #427 from DavidDengHui/patch-3 修复远程服务地址	2024-02-16 22:02:37 +08:00
李宗英	426839c747	Merge pull request #425 from DavidDengHui/patch-1 Fix MainActivity.kt	2024-02-16 21:59:33 +08:00
邓晖	3e513d5adf	Fix server.xml 原远程服务CDN地址`https://cdn.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@raw/main/channels.json`有误已修复。另外GitHub镜像服务`fastly.jsdelivr.net`要比`cdn.jsdelivr.net`快一些已修改。	2024-02-14 16:06:07 +08:00
邓晖	86d4081d03	Fix MainActivity.kt 不知道理解的对不对，第244行好像是打错了？	2024-02-14 14:37:07 +08:00
李宗英	f76aa37169	Merge pull request #402 from fanmingming/patch-1 Resolve the issue of inaccessible resources in mainland China.	2024-02-11 11:00:15 +08:00
李宗英	d944777fc6	Merge pull request #400 from tuuzed/main feat: 新增开机自启配置项，默认启用	2024-02-11 10:55:22 +08:00
范明明	a45244c552	Resolve the issue of inaccessible resources in mainland China.	2024-02-11 10:52:54 +08:00
Li ZongYing	809ec920a5	get time online	2024-02-11 10:42:00 +08:00
Li ZongYing	8e4f7df8d4	Merge remote-tracking branch 'refs/remotes/origin/main'	2024-02-11 10:30:30 +08:00
Li ZongYing	fe209183ea	fix token bug	2024-02-11 10:26:59 +08:00
Li ZongYing	b7ec58ac5b	readme	2024-02-11 10:20:58 +08:00
Li ZongYing	096acdf55e	readme	2024-02-11 10:17:15 +08:00
liuyonghui	c8d59d5aab	feat: 新增开机自启配置项，默认启用	2024-02-11 09:58:50 +08:00
李宗英	2b4b823946	Merge pull request #304 from 2926295173/patch-1 [GitHub] 创建 issue 模板，分类 issue	2024-02-08 19:01:16 +08:00
AOIAN	127ceeb0b0	Create fr.yml	2024-02-07 13:01:09 +08:00
AOIAN	9dd6a2155f	Create bug.yml	2024-02-07 12:58:05 +08:00
Li ZongYing	526a7c5c40	fix ysp	2024-02-07 02:57:36 +08:00
Li ZongYing	960f890ddd	readme	2024-02-06 23:03:36 +08:00
李宗英	0a7837c577	Merge pull request #223 from LeGend-wLw/main 完成服务器有关所有功能，并优化相关代码	2024-02-06 15:59:12 +08:00
LeGend-wLw	d8342e8c6a	Add:从淘宝服务器获取当前时间	2024-02-05 14:25:18 +08:00
LeGend-wLw	6387f48409	Add:淘宝服务器返回时间戳格式	2024-02-05 14:24:46 +08:00
LeGend-wLw	807300918c	Fix:网络请求超时时间修改为500ms	2024-02-05 14:15:52 +08:00
LeGend-wLw	36eacb7a57	Fix:添加1s超时	2024-02-05 14:14:37 +08:00
LeGend-wLw	b4abe0ccc6	Merge remote-tracking branch 'origin/main'	2024-02-05 13:24:25 +08:00
LeGend-wLw	fd1dc8d3c7	Fix:更改服务器地址为Github地址	2024-02-05 13:21:44 +08:00
LeGend-wLw	ea56bf1b80	Merge branch 'main' into main	2024-02-05 13:10:07 +08:00
Li ZongYing	4fb27ba502	fix channel number did not disappear	2024-02-05 06:12:01 +08:00
LeGend-wLw	a746fe6c65	Add:添加log信息	2024-02-04 23:58:11 +08:00
LeGend-wLw	594d5e3499	Merge branch 'main' of https://github.com/LeGend-wLw/my-tv	2024-02-04 23:52:44 +08:00
LeGend-wLw	6061187bc8	Merge branch 'lizongying:main' into main	2024-02-04 23:52:04 +08:00
LeGend-wLw	cd8b37e63c	Fix:优化从服务器获取逻辑	2024-02-04 23:49:19 +08:00
LeGend-wLw	aa3ba1d41f	Fix:移除ChannelUtils有关代码	2024-02-04 23:48:58 +08:00
LeGend-wLw	c778ac07ba	Add：添加本地文件版本，服务器版本地址	2024-02-04 23:48:39 +08:00
LeGend-wLw	700c8b4c04	Fix:移除TVList的初始化	2024-02-04 23:48:03 +08:00
LeGend-wLw	825a872a09	Fix:移除TVList的初始化	2024-02-04 23:47:54 +08:00
LeGend-wLw	54b43664ec	add:注释	2024-02-04 23:47:10 +08:00
LeGend-wLw	a93cfb455c	在应用初始化时初始化TVlist	2024-02-04 23:46:57 +08:00
LeGend-wLw	8535689e95	完成专门的ChannelUtils	2024-02-04 23:41:51 +08:00
李宗英	1714633cb7	Merge pull request #205 from LeGend-wLw/main 移除硬编码，更改为json格式，并支持从服务器上动态更新channels。	2024-02-04 22:46:08 +08:00
LeGend-wLw	f7b024f6da	防止多次初始化	2024-02-04 16:42:56 +08:00
LeGend-wLw	dd8df63b01	添加初始化TVList行为	2024-02-04 16:42:38 +08:00
LeGend-wLw	a4c95efd71	添加从服务器上获取channel.json逻辑，但未启用	2024-02-04 16:37:59 +08:00
LeGend-wLw	9f32fa3673	移除MustToken和needToken，移动到TV类中	2024-02-04 16:37:20 +08:00
LeGend-wLw	b3d0093ab0	修改为从json文件中读取channel信息	2024-02-04 16:36:34 +08:00
LeGend-wLw	5798d3a5fe	更改TV类中成员，使能和json对应	2024-02-04 16:36:05 +08:00
LeGend-wLw	4eb90de79d	当前转换成json的channel信息	2024-02-04 16:35:38 +08:00
LeGend-wLw	b8232971e2	服务器地址，未更新	2024-02-04 16:35:20 +08:00
LeGend-wLw	bc3681b0a6	将从tvModel中获取needToken和MustToken改成从TV类中获取needToken和MustToken	2024-02-04 16:34:59 +08:00
Li ZongYing	088808c3fd	fix retry bug	2024-02-03 20:07:08 +08:00
Li ZongYing	73239a6677	replay	2024-02-01 17:04:02 +08:00
Li ZongYing	cc2514a81a	performance optimization	2024-01-28 16:00:33 +08:00
Li ZongYing	bcf9bab25f	add channel	2024-01-27 19:52:36 +08:00
Li ZongYing	f7eebb3f7a	channel allow one num	2024-01-25 12:21:16 +08:00
Li ZongYing	0f4a33a3fc	change channel order	2024-01-25 11:37:06 +08:00
Li ZongYing	c17d62c698	rename to setting	2024-01-19 13:49:43 +08:00
Li ZongYing	33d3da97e5	fix 13	2024-01-18 22:19:04 +08:00
Li ZongYing	ba95ce5374	number selection	2024-01-18 21:42:06 +08:00
Li ZongYing	e1ee909071	optimize memu hiding	2024-01-17 10:19:50 +08:00
Li ZongYing	1fd0951f92	channel reversal	2024-01-16 19:04:43 +08:00
Li ZongYing	42b072f5ec	support KEYCODE_CHANNEL_UP & KEYCODE_CHANNEL_DOWN	2024-01-14 12:09:12 +08:00
Li ZongYing	a23b1e11ce	fix the menu did not appear	2024-01-14 10:15:45 +08:00
Li ZongYing	1ac6d87c3c	clean log	2024-01-12 10:13:29 +08:00
Li ZongYing	b075a7db81	trust all certs	2024-01-11 19:33:31 +08:00