fix 368

fix version code
2026-10-27 14:46:30 +08:00 · 2024-03-29 17:04:11 +08:00 · 2024-03-17 09:38:46 +08:00 · 2024-03-17 09:35:34 +08:00 · 2024-03-16 16:17:10 +08:00 · 2024-03-16 13:14:14 +08:00
41 changed files with 2198 additions and 1847 deletions
@@ -0,0 +1,229 @@
+## 更新日志
+
+### v1.7.2（通用）
+
+* 支持节目列表网格样式和行样式切换，软件重启后生效
+* 节目列表样式变更
+
+### v1.7.1（安卓5及以上专用）
+
+* 解决设置页更新闪退的问题
+* 凤凰卫视回归
+* 解决368问题
+
+### v1.7.0（通用）
+
+* 网络请求优化
+
+### v1.6.9（安卓5及以上专用）
+
+* 去掉港澳台和国际频道
+* 解决部分情况下3、6、8等频道无法播放的问题
+* 解决部分情况下启动后黑屏问题
+
+### v1.6.8（通用）
+
+* 修复部分设备崩溃的问题
+* 修复部分设备凤凰卫视无法播放的问题
+
+### v1.6.7（安卓5及以上专用）
+
+* 手机双击打开配置
+* 自动更新
+
+### v1.6.6（通用）
+
+* 更新重庆卫视图标
+* 凤凰卫视增强画质
+* 凤凰卫视增加EPG
+
+### v1.6.5（安卓5及以上专用）
+
+* 增加CETV1图标
+* 稳定性提升
+
+### v1.6.4（通用）
+
+* 增加CETV1
+* 增加凤凰卫视
+* 默认关闭开机启动
+
+### v1.6.3（安卓5及以上专用）
+
+* 增加CETV1
+* 凤凰卫视增强画质
+* 默认关闭开机启动
+* 延迟菜单自动关闭时间
+* 解决一些可能导致首次打开时黑屏的问题
+
+### v1.6.2（通用）
+
+* 修复按键无效的问题
+* 新的频道列表样式
+
+### v1.6.1（安卓5及以上专用）
+
+* 增加凤凰卫视
+
+### v1.6.0（通用）
+
+* 通用（春晚緊急修復）
+
+### v1.5.9（安卓5及以上专用）
+
+* 解决天猫魔盒闪退问题
+
+### v1.5.8（通用）
+
+* 修复央视6画质差的问题
+* 增加兵团卫视
+* 播放失败重试
+
+### v1.5.7（安卓5及以上专用）
+
+* 修复播放失败的问题
+
+### v1.5.6（通用）
+
+* 解决部分设备系统时间不对导致播放失败的问题
+
+### v1.5.5（安卓5及以上专用）
+
+* 修复播放失败的问题
+* 修复APP恢复后频道号、频道列表不自动消失的问题
+
+### v1.5.4（通用）
+
+* 修复播放失败的问题
+
+### 以下已不可用
+
+### v1.5.3（安卓5及以上专用）
+
+* 修复部分情况下APP切换后无法继续播放的问题
+* 优化重试逻辑
+
+### v1.5.2（通用）
+
+* 修复APP恢复后频道号、频道列表不自动消失的问题
+
+### v1.5.1（安卓5及以上专用）
+
+* 性能优化
+
+### v1.5.0（通用）
+
+* 修复部分情况下APP切换后无法继续播放的问题
+
+### v1.4.9（安卓5及以上专用）
+
+* 同步v1.4.8
+
+### v1.4.8（通用）
+
+* 频道号从1开始，CCTV5+为18
+* 提高CCTV6清晰度
+* 增加天津卫视、新疆卫视
+
+### v1.4.7（安卓5及以上专用）
+
+* 修复部分用户CCTV13播放过程中卡住的问题
+* 调整CCTV的频道顺序
+
+### v1.4.6（通用）
+
+* 10以下频道不再需要先按0
+
+### v1.4.5（安卓5及以上专用）
+
+* 数字选台配置
+
+### v1.4.4（通用）
+
+* 优化图标显示
+* 增加换台反转
+
+### v1.4.3（安卓5及以上专用）
+
+* 支持频道反转配置
+
+### v1.4.2（通用）
+
+* 支持安卓4
+
+### v1.4.1
+
+* 解决部分用户无法打开菜单的问题
+
+### v1.4.0
+
+* 解决极个别高版本机型黑屏问题
+
+### v1.3.9
+
+* 提高稳定性
+* 提高连接速度
+
+### v1.3.4
+
+* 部分错误会提示用户
+* 菜单3秒钟后自动关闭
+
+### v1.3.3
+
+* 部分错误会提示用户
+* 菜单3秒钟后自动关闭
+
+### v1.3.2
+
+* 增加重试，减少因网络问题导致的播放失败
+* 优化横幅banner
+
+### v1.3.1
+
+* 增加CCTV 8K 超高清频道
+* 增加国际频道栏目
+
+### v1.3.0
+
+* 处理368可能失败的情形
+
+### v1.2.9
+
+* 支持3、6、8
+
+### v1.2.8
+
+* 兼容16:10等分辨率
+
+### v1.2.7
+
+* 此版本是为了测试安卓6.0以下版本，如之前可以正常运行，请勿安装。
+
+### v1.2.6
+
+* 支持安卓4.2
+* 解决部分频道无法播放的问题
+* 修复切换时有时没有恢复播放的问题
+* 左右键不再切换源
+* 增大频道信息标题尺寸，缩小与节目信息的间隔
+
+### v1.2.5
+
+* 美化频道信息显示
+* 优化节目单获取
+
+### v1.2.4
+
+* 改变换台滑动方向，上一个频道下滑，下一个频道上滑
+* 软件退出时，退出播放器
+* 播放相同的频道，不再重复加载
+* 暂时移除部分频道
+
+### v1.2.3
+
+* 固定视频比列为16:9
+* 隐藏全面屏底部的小横条
+* 移除移动专区
+* 修复一个闪退问题
+* 更换图标和应用名
@@ -4,195 +4,9 @@

 ## 使用

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

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

@@ -202,20 +16,28 @@
 adb install my-tv.apk
 ```

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

 * 音量不同
 * 大湾区卫视、广东4k超高清、广东珠江、三沙卫视
-* CETV教育频道
 * CHC高清三个电影频道
 * 地方频道
 * 收藏夹
 * 自定义源
-* 凤凰卫视、凤凰资讯台
 * 海外
 * 1.5.0 无法安装，1.5.1 可以安装
 * 节目增加预告
 * 频道列表优化
+* epg更新后菜单更新
+* 防止菜单第一个获取焦点

 ## 赞赏

@@ -54,7 +54,7 @@ android {
    }

    kotlinOptions {
-        jvmTarget=17
+        jvmTarget = 17
    }

    // Encapsulates your external native build configurations.
@@ -71,9 +71,14 @@ android {

 static def VersionCode() {
    try {
-        def process = 'git rev-list --count HEAD'.execute()
+        def p = "git describe --tags --always"
+        def process = p.execute()
        process.waitFor()
-        return process.text.toInteger()
+        def replace = [v: "", ".": " ", "-": " "]
+        def arr = (process.text.trim().replace(replace) + " 0").split(" ")
+        def versionCode = arr[0].toInteger() * 16777216 + arr[1].toInteger() * 65536 + arr[2].toInteger() * 256 + arr[3].toInteger()
+        println("VersionCode $versionCode")
+        return versionCode
    } catch (ignored) {
        return 0
    }
@@ -81,7 +86,7 @@ static def VersionCode() {

 static def VersionName() {
    try {
-        def process = 'git describe --tags --always'.execute()
+        def process = "git describe --tags --always".execute()
        process.waitFor()
        return process.text.trim() - "v"
    } catch (ignored) {
@@ -7,6 +7,8 @@
        android:name="android.software.leanback"
        android:required="true" />
    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <application
        android:allowBackup="true"
@@ -38,6 +40,12 @@
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </receiver>
+        <receiver android:name=".NetworkChangeReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+            </intent-filter>
+        </receiver>
        <provider
            android:name=".InitializerProvider"
            android:authorities="${applicationId}.InitializerProvider"
@@ -7,8 +7,8 @@ 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.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.lizongying.mytv.models.TVListViewModel
@@ -17,21 +17,22 @@ import com.lizongying.mytv.models.TVViewModel

 class CardAdapter(
    private val recyclerView: RecyclerView,
-    private val owner: LifecycleOwner,
+    private val mainFragment: MainFragment,
    private var tvListViewModel: TVListViewModel,
 ) :
    RecyclerView.Adapter<CardAdapter.ViewHolder>() {

    private var listener: ItemListener? = null
    private var focused: View? = null
-    private var defaultFocused = false
-    var defaultFocus: Int = -1
+
+    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)
    }

@@ -57,19 +58,23 @@ class CardAdapter(

        val tvViewModel = item as TVViewModel
        val cardView = viewHolder.view as ImageCardView
+        cardView.tag = tvViewModel

-        if (!defaultFocused && item.id.value == defaultFocus) {
-            cardView.requestFocus()
-            defaultFocused = true
-        }
-
-        val onFocusChangeListener = View.OnFocusChangeListener { _, hasFocus ->
-            listener?.onItemFocusChange(item, hasFocus)
-
-//            if (hasFocus && defaultFocus == item.id.value) {
+        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
+//                }
            }
        }

@@ -86,48 +91,21 @@ class CardAdapter(
            false
        }

-        cardView.titleText = tvViewModel.title.value
+        cardView.titleText = tvViewModel.getTV().title

-        when (tvViewModel.title.value) {
-            "CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.cctv8k)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "天津卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.tianjin)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "新疆卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.xinjiang)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "兵团卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.bingtuan)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "CETV1" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.cetv1)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            else -> Glide.with(viewHolder.view.context)
-                .load(tvViewModel.logo.value)
-                .centerInside()
-                .into(cardView.mainImageView)
-        }
+        Glide.with(viewHolder.view.context)
+            .load(tvViewModel.getTV().logo)
+            .centerInside()
+            .into(cardView.mainImageView)

        cardView.mainImageView.setBackgroundColor(Color.WHITE)
        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)

-        tvViewModel.program.observe(owner) { _ ->
-            val program = tvViewModel.getProgramOne()
-            if (program != null) {
-                cardView.contentText = program.name
-            }
+        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+        if (!epg.isNullOrEmpty()) {
+            cardView.contentText = epg.last().title
+        } else {
+            cardView.contentText = ""
        }
    }

@@ -137,8 +115,16 @@ class CardAdapter(
        val view = itemView
    }

+    fun toPosition(position: Int) {
+        recyclerView.post {
+            recyclerView.scrollToPosition(position)
+            recyclerView.getChildAt(position)?.isSelected
+            recyclerView.getChildAt(position)?.requestFocus()
+        }
+    }
+
    interface ItemListener {
-        fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean)
+        fun onItemHasFocus(tvViewModel: TVViewModel)
        fun onItemClicked(tvViewModel: TVViewModel)
        fun onKey(keyCode: Int): Boolean
    }
@@ -30,7 +30,7 @@ class ChannelFragment : Fragment() {
    fun show(tvViewModel: TVViewModel) {
        handler.removeCallbacks(hideRunnable)
        handler.removeCallbacks(playRunnable)
-        binding.channelContent.text = (tvViewModel.id.value?.plus(1)).toString()
+        binding.channelContent.text = (tvViewModel.getTV().id.plus(1)).toString()
        view?.visibility = View.VISIBLE
        handler.postDelayed(hideRunnable, delay)
    }
@@ -5,14 +5,16 @@ import android.app.Dialog
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment

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

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

-    interface ConfirmationDialogListener {
+    interface ConfirmationListener {
        fun onConfirm()
        fun onCancel()
    }
@@ -0,0 +1,105 @@
+@file:Suppress("DEPRECATION")
+
+package com.lizongying.mytv
+
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.Signature
+import android.content.pm.SigningInfo
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
+import android.os.Build
+import android.util.Log
+import java.security.MessageDigest
+
+private const val TAG = "Extensions"
+
+private val Context.packageInfo: PackageInfo
+    get() {
+        val flag = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            PackageManager.GET_SIGNATURES
+        } else {
+            PackageManager.GET_SIGNING_CERTIFICATES
+        }
+        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            packageManager.getPackageInfo(packageName, flag)
+        } else {
+            packageManager.getPackageInfo(
+                packageName,
+                PackageManager.PackageInfoFlags.of(PackageManager.GET_SIGNING_CERTIFICATES.toLong())
+            )
+        }
+    }
+
+/**
+ * Return the version code of the app which is defined in build.gradle.
+ * eg:100
+ */
+val Context.appVersionCode: Long
+    get() {
+        val packageInfo = this.packageInfo
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            packageInfo.longVersionCode
+        } else {
+            packageInfo.versionCode.toLong()
+        }
+    }
+
+/**
+ * Return the version name of the app which is defined in build.gradle.
+ * eg:1.0.0
+ */
+val Context.appVersionName: String get() = packageInfo.versionName ?: ""
+
+val Context.appSignature: String
+    get() {
+        val packageInfo = this.packageInfo
+        var sign: Signature? = null
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            val signatures: Array<out Signature>? = packageInfo.signatures
+            if (signatures != null) {
+                sign = signatures[0]
+            }
+        } else {
+            val signingInfo: SigningInfo? = packageInfo.signingInfo
+            if (signingInfo != null) {
+                sign = signingInfo.apkContentsSigners[0]
+            }
+        }
+        if (sign == null) {
+            return ""
+        }
+        return hashSignature(sign)
+    }
+
+
+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")
+        md.update(signature.toByteArray())
+        val digest = md.digest()
+        digest.let { it -> it.joinToString("") { "%02x".format(it) } }
+    } catch (e: Exception) {
+        Log.e(TAG, "Error hashing signature", e)
+        ""
+    }
+}
@@ -6,6 +6,7 @@ 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() {
@@ -22,17 +23,19 @@ class GrayOverlayItemDecoration(private val context: Context) : RecyclerView.Ite
        for (i in 0 until childCount) {
            val child = parent.getChildAt(i)
            if (!child.hasFocus()) {
-//                child.alpha = 0.7f
+                (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)
+//                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
            }
        }
@@ -2,6 +2,7 @@ package com.lizongying.mytv

 import android.os.Bundle
 import android.os.Handler
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -28,37 +29,18 @@ class InfoFragment : Fragment() {
    }

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

-        when (tvViewModel.title.value) {
-            "CCTV8K 超高清" -> Glide.with(this)
-                .load(R.drawable.cctv8k)
-                .into(binding.infoLogo)
+        Glide.with(this)
+            .load(tvViewModel.getTV().logo)
+            .into(binding.infoLogo)

-            "天津卫视" -> Glide.with(this)
-                .load(R.drawable.tianjin)
-                .into(binding.infoLogo)
-
-            "新疆卫视" -> Glide.with(this)
-                .load(R.drawable.xinjiang)
-                .into(binding.infoLogo)
-
-            "兵团卫视" -> Glide.with(this)
-                .load(R.drawable.bingtuan)
-                .into(binding.infoLogo)
-
-            "CETV1" -> Glide.with(this)
-                .load(R.drawable.cetv1)
-                .into(binding.infoLogo)
-
-            else -> Glide.with(this)
-                .load(tvViewModel.logo.value)
-                .into(binding.infoLogo)
-        }
-
-        val program = tvViewModel.getProgramOne()
-        if (program != null) {
-            binding.infoDesc.text = program.name
+        Log.i(TAG, "${tvViewModel.getTV().title} ${tvViewModel.epg.value}")
+        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+        if (!epg.isNullOrEmpty()) {
+            binding.infoDesc.text = epg.last().title
+        } else {
+            binding.infoDesc.text = ""
        }

        handler.removeCallbacks(removeRunnable)
@@ -1,9 +1,8 @@
 package com.lizongying.mytv

-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
-import android.content.pm.Signature
-import android.content.pm.SigningInfo
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -12,6 +11,7 @@ import android.util.Log
 import android.view.GestureDetector
 import android.view.KeyEvent
 import android.view.MotionEvent
+import android.view.View
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
@@ -22,24 +22,23 @@ import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
-import java.security.MessageDigest


-class MainActivity : FragmentActivity() {
+class MainActivity : FragmentActivity(), Request.RequestListener {

    private var ready = 0
-    private var playerFragment = PlayerFragment()
-    private var mainFragment = MainFragment()
-    private var infoFragment = InfoFragment()
-    private var channelFragment = ChannelFragment()
-    private lateinit var settingFragment: SettingFragment
+    private val playerFragment = PlayerFragment()
+    private val mainFragment = MainFragment()
+    private val infoFragment = InfoFragment()
+    private val channelFragment = ChannelFragment()
+    private val settingFragment = SettingFragment()

    private var doubleBackToExitPressedOnce = false

    private lateinit var gestureDetector: GestureDetector

    private val handler = Handler()
-    private val delayHideMain: Long = 5000
+    private val delayHideMain: Long = 10000
    private val delayHideSetting: Long = 10000

    init {
@@ -48,15 +47,19 @@ class MainActivity : FragmentActivity() {

            utilsJob.start()

-            utilsJob.await()
+//            utilsJob.await()
        }
    }

    override fun onCreate(savedInstanceState: Bundle?) {
        Log.i(TAG, "onCreate")
        super.onCreate(savedInstanceState)
+
        setContentView(R.layout.activity_main)

+        Request.onCreate()
+        Request.setRequestListener(this)
+
        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
        window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
@@ -71,14 +74,26 @@ class MainActivity : FragmentActivity() {
                .commit()
        }
        gestureDetector = GestureDetector(this, GestureListener())
-        val packageInfo = getPackageInfo()
-        val versionName = packageInfo.versionName
-        val versionCode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            packageInfo.longVersionCode
+
+        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 {
-            packageInfo.versionCode.toLong()
+            Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
+            ready++
        }
-        settingFragment = SettingFragment(versionName, versionCode, SP.channelReversal, SP.channelNum, SP.bootStartup)
+
    }

    fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -146,11 +161,15 @@ class MainActivity : FragmentActivity() {
        handler.postDelayed(hideMain, delayHideMain)
    }

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

+    fun settingNeverHide() {
+        handler.removeCallbacks(hideSetting)
+    }
+
    private val hideMain = Runnable {
        if (!mainFragment.isHidden) {
            supportFragmentManager.beginTransaction().hide(mainFragment).commit()
@@ -172,7 +191,7 @@ class MainActivity : FragmentActivity() {
    fun fragmentReady() {
        ready++
        Log.i(TAG, "ready $ready")
-        if (ready == 4) {
+        if (ready == 6) {
            mainFragment.fragmentReady()
        }
    }
@@ -192,6 +211,11 @@ class MainActivity : FragmentActivity() {
            return true
        }

+        override fun onDoubleTap(e: MotionEvent): Boolean {
+            showSetting()
+            return true
+        }
+
        override fun onFling(
            e1: MotionEvent?,
            e2: MotionEvent,
@@ -233,7 +257,7 @@ class MainActivity : FragmentActivity() {
        Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
        if (!settingFragment.isVisible) {
            settingFragment.show(supportFragmentManager, "setting")
-            settingActive()
+            settingDelayHide()
        } else {
            handler.removeCallbacks(hideSetting)
            settingFragment.dismiss()
@@ -449,56 +473,7 @@ class MainActivity : FragmentActivity() {
        return super.onKeyDown(keyCode, event)
    }

-    private fun getPackageInfo(): PackageInfo {
-        val flag = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            PackageManager.GET_SIGNATURES
-        } else {
-            PackageManager.GET_SIGNING_CERTIFICATES
-        }
-
-        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            packageManager.getPackageInfo(packageName, flag)
-        } else {
-            packageManager.getPackageInfo(
-                packageName,
-                PackageManager.PackageInfoFlags.of(PackageManager.GET_SIGNING_CERTIFICATES.toLong())
-            )
-        }
-    }
-
-    private fun getAppSignature(): String {
-        val packageInfo = getPackageInfo()
-
-        var sign: Signature? = null
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            val signatures: Array<out Signature>? = packageInfo.signatures
-            if (signatures != null) {
-                sign = signatures[0]
-            }
-        } else {
-            val signingInfo: SigningInfo? = packageInfo.signingInfo
-            if (signingInfo != null) {
-                sign = signingInfo.apkContentsSigners[0]
-            }
-        }
-        if (sign == null) {
-            return ""
-        }
-
-        return hashSignature(sign)
-    }
-
-    private fun hashSignature(signature: Signature): String {
-        return try {
-            val md = MessageDigest.getInstance("MD5")
-            md.update(signature.toByteArray())
-            val digest = md.digest()
-            digest.let { it -> it.joinToString("") { "%02x".format(it) } }
-        } catch (e: Exception) {
-            Log.e(TAG, "Error hashing signature", e)
-            ""
-        }
-    }
+    private fun getAppSignature() = this.appSignature

    override fun onStart() {
        Log.i(TAG, "onStart")
@@ -519,6 +494,15 @@ class MainActivity : FragmentActivity() {
        handler.removeCallbacks(hideMain)
    }

+    override fun onDestroy() {
+        super.onDestroy()
+        Request.onDestroy()
+    }
+
+    override fun onRequestFinished(message: String?) {
+        fragmentReady()
+    }
+
    private companion object {
        const val TAG = "MainActivity"
    }
@@ -1,8 +1,6 @@
 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
@@ -12,9 +10,10 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 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
@@ -32,15 +31,10 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
    private var _binding: ShowBinding? = null
    private val binding get() = _binding!!

-    private var request = Request()
-
    var tvListViewModel = TVListViewModel()

    private var lastVideoUrl = ""

-    private val handler = Handler(Looper.getMainLooper())
-    private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
-
    override fun onCreateView(
        inflater: LayoutInflater, container: ViewGroup?,
        savedInstanceState: Bundle?
@@ -52,7 +46,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
    override fun onActivityCreated(savedInstanceState: Bundle?) {
        super.onActivityCreated(savedInstanceState)

-        activity?.let { request.initYSP(it) }
+        activity?.let { YSP.init(it) }

        itemPosition = SP.itemPosition

@@ -71,13 +65,15 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                    tvViewModel.setItemPosition(idx2)
                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
                    tvListViewModel.addTVViewModel(tvViewModel)
+
+                    updateEPG(tvViewModel)
                }
                tvListViewModel.maxNum.add(v.size)

                val adapter =
                    CardAdapter(
                        itemBinding.rowItems,
-                        viewLifecycleOwner,
+                        this,
                        tvListViewModelCurrent,
                    )
                rowList.add(itemBinding.rowItems)
@@ -87,10 +83,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                itemBinding.rowHeader.text = k
                itemBinding.rowItems.tag = idx.toInt()
                itemBinding.rowItems.adapter = adapter
-                itemBinding.rowItems.layoutManager =
-                    GridLayoutManager(context, 6)
-                itemBinding.rowItems.layoutParams.height =
-                    dpToPx(92 * ((tvListViewModelCurrent.size() + 6 - 1) / 6))

                itemBinding.rowItems.addOnScrollListener(object : RecyclerView.OnScrollListener() {
                    override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
@@ -104,6 +96,16 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                    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
@@ -112,26 +114,15 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                idx++
            }

-            mUpdateProgramRunnable = UpdateProgramRunnable()
-            handler.post(mUpdateProgramRunnable)
-
            if (itemPosition >= tvListViewModel.size()) {
                itemPosition = 0
            }

-            val tv = tvListViewModel.getTVViewModel(itemPosition)
-            for (i in rowList) {
-                if (i.tag as Int == tv?.getRowPosition()) {
-                    ((i as RecyclerView).adapter as CardAdapter).defaultFocus = itemPosition
-                    break
-                }
-            }
-
            tvListViewModel.setItemPosition(itemPosition)
            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
                    if (tvViewModel.errInfo.value != null
-                        && tvViewModel.id.value == itemPosition
+                        && tvViewModel.getTV().id == itemPosition
                    ) {
                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
                            .show()
@@ -141,21 +132,21 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {

                    // not first time && channel not change
                    if (tvViewModel.ready.value != null
-                        && tvViewModel.id.value == itemPosition
+                        && tvViewModel.getTV().id == itemPosition
                        && check(tvViewModel)
                    ) {
-                        Log.i(TAG, "ready ${tvViewModel.title.value}")
+                        Log.i(TAG, "ready ${tvViewModel.getTV().title}")
                        (activity as? MainActivity)?.play(tvViewModel)
                    }
                }
                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
                    if (tvViewModel.change.value != null) {
-                        val title = tvViewModel.title.value
+                        val title = tvViewModel.getTV().title
                        Log.i(TAG, "switch $title")
-                        if (tvViewModel.pid.value != "") {
+                        if (tvViewModel.getTV().pid != "") {
                            Log.i(TAG, "request $title")
                            lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { request.fetchData(it) }
+                                tvViewModel.let { Request.fetchData(it) }
                            }
                            (activity as? MainActivity)?.showInfoFragment(tvViewModel)
                            setPosition(
@@ -199,20 +190,18 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
        return false
    }

-    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
-        if (hasFocus) {
-            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
+    override fun onItemHasFocus(tvViewModel: TVViewModel) {
+        tvListViewModel.setItemPositionCurrent(tvViewModel.getTV().id)

-            val row = tvViewModel.getRowPosition()
+        val row = tvViewModel.getRowPosition()

-            for (i in rowList) {
-                if (i.tag as Int != row) {
-                    ((i as RecyclerView).adapter as CardAdapter).clear()
-                }
+        for (i in rowList) {
+            if (i.tag as Int != row) {
+                ((i as RecyclerView).adapter as CardAdapter).clear()
            }
-
-            (activity as MainActivity).mainActive()
        }
+
+        (activity as MainActivity).mainActive()
    }

    override fun onItemClicked(tvViewModel: TVViewModel) {
@@ -222,8 +211,8 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
            return
        }

-        if (itemPosition != tvViewModel.id.value!!) {
-            itemPosition = tvViewModel.id.value!!
+        if (itemPosition != tvViewModel.getTV().id) {
+            itemPosition = tvViewModel.getTV().id
            tvListViewModel.setItemPosition(itemPosition)
            tvListViewModel.getTVViewModel(itemPosition)?.changed()
        }
@@ -232,25 +221,31 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {

    fun setPosition() {
        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-        rowList[tvViewModel!!.getRowPosition()].post {
-            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as GridLayoutManager).findViewByPosition(
-                tvViewModel.getItemPosition()
-            )?.requestFocus()
-        }
+        val rowPosition = tvViewModel!!.getRowPosition()
+        val itemPosition = tvViewModel.getItemPosition()
+        setPosition(rowPosition, itemPosition)
    }

    fun setPosition(rowPosition: Int, itemPosition: Int) {
        rowList[rowPosition].post {
-            ((rowList[rowPosition] as RecyclerView).layoutManager as GridLayoutManager).findViewByPosition(
-                itemPosition
-            )?.requestFocus()
-        }
+            when (val layoutManager = (rowList[rowPosition] as RecyclerView).layoutManager) {
+                is GridLayoutManager -> {
+                    layoutManager.findViewByPosition(
+                        itemPosition
+                    )?.requestFocus()
+                }

-        ((rowList[rowPosition] as RecyclerView).adapter as CardAdapter).defaultFocus = itemPosition
+                is LinearLayoutManager -> {
+                    layoutManager.findViewByPosition(
+                        itemPosition
+                    )?.requestFocus()
+                }
+            }
+        }
    }

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

-    fun updateProgram(tvViewModel: TVViewModel) {
-        val timestamp = getDateTimestamp()
-        if (timestamp - tvViewModel.programUpdateTime > 60) {
-            if (tvViewModel.program.value!!.isEmpty()) {
-                tvViewModel.programUpdateTime = timestamp
-                request.fetchProgram(tvViewModel)
-            } else {
-                if (tvViewModel.program.value!!.last().et - timestamp < 600) {
-                    tvViewModel.programUpdateTime = timestamp
-                    request.fetchProgram(tvViewModel)
-                }
-            }
+    private fun updateEPG(tvViewModel: TVViewModel) {
+        if (tvViewModel.getTV().channel == "港澳台") {
+            Request.fetchFEPG(tvViewModel)
+        } else {
+            Request.fetchYEPG(tvViewModel)
        }
    }

-    inner class UpdateProgramRunnable : Runnable {
-        override fun run() {
-            tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null && it.programId.value != "" }
-                ?.forEach { tvViewModel ->
-                    updateProgram(
-                        tvViewModel
-                    )
+    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
                }
-            handler.postDelayed(this, 60000)
+            }
+        } else {
+            view?.post {
+//                for (i in rowList) {
+//                    ((i as RecyclerView).adapter as CardAdapter).visiable = false
+//                }
+            }
        }
    }

@@ -346,9 +348,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
    override fun onDestroy() {
        Log.i(TAG, "onDestroy")
        super.onDestroy()
-        if (::mUpdateProgramRunnable.isInitialized) {
-            handler.removeCallbacks(mUpdateProgramRunnable)
-        }
    }

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

-import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
@@ -11,9 +10,12 @@ import com.lizongying.mytv.api.Auth
 import com.lizongying.mytv.api.AuthRequest
 import com.lizongying.mytv.api.FAuth
 import com.lizongying.mytv.api.FAuthService
+import com.lizongying.mytv.api.FEPG
 import com.lizongying.mytv.api.Info
+import com.lizongying.mytv.api.InfoV2
 import com.lizongying.mytv.api.LiveInfo
 import com.lizongying.mytv.api.LiveInfoRequest
+import com.lizongying.mytv.api.Token
 import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.api.YSPApiService
 import com.lizongying.mytv.api.YSPBtraceService
@@ -28,20 +30,22 @@ import retrofit2.Response
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
+import kotlin.math.max


-class Request {
+object Request {
+    private const val TAG = "Request"
    private var yspTokenService: YSPTokenService = ApiClient().yspTokenService
    private var yspApiService: YSPApiService = ApiClient().yspApiService
    private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
    private var yspProtoService: YSPProtoService = ApiClient().yspProtoService
    private var fAuthService: FAuthService = ApiClient().fAuthService
-    private var ysp: YSP? = null
+
    private var token = ""
+    private var tokenFH = ""

    private var needAuth = false

-    // TODO onDestroy
    private val handler = Handler(Looper.getMainLooper())
    private lateinit var btraceRunnable: BtraceRunnable
    private var tokenRunnable: TokenRunnable = TokenRunnable()
@@ -50,26 +54,45 @@ class Request {
    private val input =
        """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()

-    init {
-        handler.post(tokenRunnable)
+    private var listener: RequestListener? = null
+
+    private var initRetryTimes = 0
+    private var initRetryMaxTimes = 0
+
+    private var openid = "vu0-8lgGV2LW9QjDeucB9H12d_6HQWmTFgqCWg5o-VBQN4"
+
+    fun onCreate() {
+        Log.i(TAG, "onCreate")
+        fetchInfoV2()
    }

-    fun initYSP(context: Context) {
-        ysp = YSP(context)
+    fun onDestroy() {
+        Log.i(TAG, "onDestroy")
+        handler.removeCallbacks(tokenRunnable)
    }

-    var call: Call<LiveInfo>? = null
+    private var call: Call<LiveInfo>? = null
    private var callAuth: Call<Auth>? = null
+    private var callInfo: Call<Info>? = null
+    private var callFAuth: Call<FAuth>? = null
+    private var callPage: Call<pageModel.Response>? = null
+
+    private fun cancelCall() {
+        call?.cancel()
+        callAuth?.cancel()
+        callInfo?.cancel()
+        callFAuth?.cancel()
+        callPage?.cancel()
+    }

    private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
-        callAuth?.cancel()
+        cancelCall()

-        val title = tvModel.title.value
-
-        val data = ysp?.getAuthData(tvModel)
-        val request = data?.let { AuthRequest(it) }
-        callAuth = request?.let { yspApiService.getAuth("guid=${ysp?.getGuid()}; $cookie", it) }
+        val title = tvModel.getTV().title

+        val data = YSP.getAuthData(tvModel)
+        val request = AuthRequest(data)
+        callAuth = request.let { yspApiService.getAuth("guid=${YSP.getGuid()}; $cookie", it) }
        callAuth?.enqueue(object : Callback<Auth> {
            override fun onResponse(call: Call<Auth>, response: Response<Auth>) {
                if (response.isSuccessful) {
@@ -77,19 +100,19 @@ class Request {

                    if (liveInfo?.data?.token != null) {
                        Log.i(TAG, "token ${liveInfo.data.token}")
-                        ysp?.token = liveInfo.data.token
+                        YSP.token = liveInfo.data.token
                        fetchVideo(tvModel, cookie)
                    } else {
                        Log.e(TAG, "$title token error")
                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                            tvModel.retryTimes++
                            if (tvModel.getTV().needToken) {
-                                if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                    if (!tvModel.getTV().mustToken) {
                                        fetchAuth(tvModel, cookie)
                                    }
                                } else {
-                                    token = ""
+                                    tvModel.needGetToken = true
                                    fetchAuth(tvModel)
                                }
                            } else {
@@ -102,12 +125,12 @@ class Request {
                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                        tvModel.retryTimes++
                        if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                if (!tvModel.getTV().mustToken) {
                                    fetchAuth(tvModel, cookie)
                                }
                            } else {
-                                token = ""
+                                tvModel.needGetToken = true
                                fetchAuth(tvModel)
                            }
                        } else {
@@ -122,12 +145,12 @@ class Request {
                if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                    tvModel.retryTimes++
                    if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                            if (!tvModel.getTV().mustToken) {
                                fetchAuth(tvModel, cookie)
                            }
                        } else {
-                            token = ""
+                            tvModel.needGetToken = true
                            fetchAuth(tvModel)
                        }
                    } else {
@@ -138,21 +161,22 @@ class Request {
        })
    }

-    fun fetchVideo(tvModel: TVViewModel, cookie: String) {
-        call?.cancel()
+    private fun fetchVideo(tvModel: TVViewModel, cookie: String) {
+        cancelCall()
+
        if (::btraceRunnable.isInitialized) {
            handler.removeCallbacks(btraceRunnable)
        }

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

        tvModel.seq = 0
-        val data = ysp?.switch(tvModel)
-        val request = data?.let { LiveInfoRequest(it) }
-        call = request?.let {
+        val data = YSP.switch(tvModel)
+        val request = LiveInfoRequest(data)
+        call = request.let {
            yspApiService.getLiveInfo(
-                "guid=${ysp?.getGuid()}; $cookie",
-                ysp!!.token,
+                "guid=${YSP.getGuid()}; $cookie",
+                YSP.token,
                it
            )
        }
@@ -189,13 +213,13 @@ class Request {
                            if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                tvModel.retryTimes++
                                if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                        if (!tvModel.getTV().mustToken) {
                                            fetchVideo(tvModel, cookie)
 //                                            fetchAuth(tvModel, cookie)
                                        }
                                    } else {
-                                        token = ""
+                                        tvModel.needGetToken = true
                                        fetchVideo(tvModel)
 //                                        fetchAuth(tvModel)
                                    }
@@ -214,13 +238,13 @@ class Request {
                            if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                tvModel.retryTimes++
                                if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                        if (!tvModel.getTV().mustToken) {
                                            fetchVideo(tvModel, cookie)
 //                                            fetchAuth(tvModel, cookie)
                                        }
                                    } else {
-                                        token = ""
+                                        tvModel.needGetToken = true
                                        fetchVideo(tvModel)
 //                                        fetchAuth(tvModel)
                                    }
@@ -232,17 +256,17 @@ class Request {
                        }
                    }
                } else {
-                    Log.e(TAG, "$title status error")
+                    Log.e(TAG, "$title status error $data")
                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                        tvModel.retryTimes++
                        if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                if (!tvModel.getTV().mustToken) {
                                    fetchVideo(tvModel, cookie)
 //                                    fetchAuth(tvModel, cookie)
                                }
                            } else {
-                                token = ""
+                                tvModel.needGetToken = true
                                fetchVideo(tvModel)
 //                                fetchAuth(tvModel)
                            }
@@ -259,12 +283,12 @@ class Request {
                if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                    tvModel.retryTimes++
                    if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                            if (!tvModel.getTV().mustToken) {
                                fetchVideo(tvModel, cookie)
                            }
                        } else {
-                            token = ""
+                            tvModel.needGetToken = true
                            fetchVideo(tvModel)
                        }
                    } else {
@@ -275,37 +299,31 @@ class Request {
        })
    }

-    fun fetchAuth(tvModel: TVViewModel) {
-        if (token == "") {
-            yspTokenService.getInfo("")
-                .enqueue(object : Callback<Info> {
-                    override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                        if (response.isSuccessful) {
-                            token = response.body()?.data?.token!!
-                            Log.i(TAG, "info success $token")
-                            val cookie =
-                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                            fetchAuth(tvModel, cookie)
-                        } else {
-                            Log.e(TAG, "info status error")
-                            if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                                tvModel.tokenRetryTimes++
-                                fetchAuth(tvModel)
-                            } else {
-                                if (!tvModel.getTV().mustToken) {
-                                    val cookie =
-                                        "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
-                                    fetchAuth(tvModel, cookie)
-                                }
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call<Info>, t: Throwable) {
-                        Log.e(TAG, "info request error $t")
-                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                            tvModel.tokenRetryTimes++
-                            fetchVideo(tvModel)
+    private fun fetchAuth(tvModel: TVViewModel) {
+        cancelCall()
+        if (tvModel.needGetToken) {
+            callInfo = yspTokenService.getInfo("")
+            callInfo?.enqueue(object : Callback<Info> {
+                override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                    if (response.isSuccessful && response.body()?.data?.token != null) {
+                        token = response.body()?.data?.token!!
+                        Log.i(TAG, "info success $token")
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        val cookie =
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=$openid; vusession=$token"
+                        fetchAuth(tvModel, cookie)
+                    } else if (response.code() == 304) {
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        val cookie =
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
+                        fetchVideo(tvModel, cookie)
+                    } else {
+                        Log.e(TAG, "info status error")
+                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                            tvModel.tokenYSPRetryTimes++
+                            fetchAuth(tvModel)
                        } else {
                            if (!tvModel.getTV().mustToken) {
                                val cookie =
@@ -314,44 +332,54 @@ class Request {
                            }
                        }
                    }
-                })
+                }
+
+                override fun onFailure(call: Call<Info>, t: Throwable) {
+                    Log.e(TAG, "info request error $t")
+                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                        tvModel.tokenYSPRetryTimes++
+                        fetchVideo(tvModel)
+                    } else {
+                        if (!tvModel.getTV().mustToken) {
+                            val cookie =
+                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
+                            fetchAuth(tvModel, cookie)
+                        }
+                    }
+                }
+            })
        } else {
            val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=$openid; vusession=$token"
            fetchAuth(tvModel, cookie)
        }
    }

-    fun fetchVideo(tvModel: TVViewModel) {
-        if (token == "") {
-            yspTokenService.getInfo("")
-                .enqueue(object : Callback<Info> {
-                    override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                        if (response.isSuccessful && response.body()?.data?.token != null) {
-                            token = response.body()?.data?.token!!
-                            Log.i(TAG, "info success $token")
-                            val cookie =
-                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                            fetchVideo(tvModel, cookie)
-                        } else {
-                            Log.e(TAG, "info status error")
-                            if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                                tvModel.tokenRetryTimes++
-                                fetchVideo(tvModel)
-                            } else {
-                                if (!tvModel.getTV().mustToken) {
-                                    val cookie =
-                                        "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
-                                    fetchVideo(tvModel, cookie)
-                                }
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call<Info>, t: Throwable) {
-                        Log.e(TAG, "info request error $t")
-                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                            tvModel.tokenRetryTimes++
+    private fun fetchVideo(tvModel: TVViewModel) {
+        cancelCall()
+        Log.d(TAG, "fetchVideo")
+        if (tvModel.needGetToken) {
+            callInfo = yspTokenService.getInfo("")
+            callInfo?.enqueue(object : Callback<Info> {
+                override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                    if (response.isSuccessful && response.body()?.data?.token != null) {
+                        token = response.body()?.data?.token!!
+                        Log.i(TAG, "info success $token")
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        val cookie =
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
+                        fetchVideo(tvModel, cookie)
+                    } else if (response.code() == 304) {
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        val cookie =
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
+                        fetchVideo(tvModel, cookie)
+                    } else {
+                        Log.e(TAG, "info status error")
+                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                            tvModel.tokenYSPRetryTimes++
                            fetchVideo(tvModel)
                        } else {
                            if (!tvModel.getTV().mustToken) {
@@ -361,35 +389,52 @@ class Request {
                            }
                        }
                    }
-                })
+                }
+
+                override fun onFailure(call: Call<Info>, t: Throwable) {
+                    Log.e(TAG, "info request error $t")
+                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                        tvModel.tokenYSPRetryTimes++
+                        fetchVideo(tvModel)
+                    } else {
+                        if (!tvModel.getTV().mustToken) {
+                            val cookie =
+                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
+                            fetchVideo(tvModel, cookie)
+                        }
+                    }
+                }
+            })
        } else {
            val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
            fetchVideo(tvModel, cookie)
        }
    }

-    private var fAuth: Call<FAuth>? = null
-    fun fetchFAuth(tvModel: TVViewModel) {
-        call?.cancel()
-        callAuth?.cancel()
-        fAuth?.cancel()
+    private fun fetchFAuth(tvModel: TVViewModel) {
+        cancelCall()

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

-        fAuth = fAuthService.getAuth(tvModel.getTV().pid, "HD")
-        fAuth?.enqueue(object : Callback<FAuth> {
+        var qa = "HD"
+        if (tokenFH != "") {
+            qa = "FHD"
+        }
+
+        callFAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
+        callFAuth?.enqueue(object : Callback<FAuth> {
            override fun onResponse(call: Call<FAuth>, response: Response<FAuth>) {
                if (response.isSuccessful && response.body()?.data?.live_url != null) {
                    val url = response.body()?.data?.live_url!!
 //                    Log.d(TAG, "$title url $url")
                    tvModel.addVideoUrl(url)
                    tvModel.allReady()
-                    tvModel.retryTimes = 0
+                    tvModel.tokenFHRetryTimes = 0
                } else {
-                    Log.e(TAG, "auth status error")
-                    if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                        tvModel.tokenRetryTimes++
+                    Log.e(TAG, "auth status error ${response.code()}")
+                    if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
+                        tvModel.tokenFHRetryTimes++
                        fetchFAuth(tvModel)
                    }
                }
@@ -397,8 +442,8 @@ class Request {

            override fun onFailure(call: Call<FAuth>, t: Throwable) {
                Log.e(TAG, "auth request error $t")
-                if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                    tvModel.tokenRetryTimes++
+                if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
+                    tvModel.tokenFHRetryTimes++
                    fetchFAuth(tvModel)
                }
            }
@@ -412,6 +457,9 @@ class Request {
        }

        if (tvModel.getTV().needToken) {
+            if (token == "") {
+                tvModel.needGetToken = true
+            }
            if (needAuth) {
                fetchAuth(tvModel)
            } else {
@@ -419,7 +467,7 @@ class Request {
            }
        } else {
            val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; updateProtocol=1; deviceModel=120"
            if (needAuth) {
                fetchAuth(tvModel, cookie)
            } else {
@@ -428,32 +476,137 @@ class Request {
        }
    }

-    inner class TokenRunnable : Runnable {
+    class TokenRunnable : Runnable {
        override fun run() {
-            fetchToken()
-            handler.postDelayed(this, 600000)
+//            fetchToken()
        }
    }

-    fun fetchToken() {
-        yspTokenService.getInfo(token)
-            .enqueue(object : Callback<Info> {
-                override fun onResponse(call: Call<Info>, response: Response<Info>) {
+    private fun fetchInfoV2() {
+        yspTokenService.getInfoV2()
+            .enqueue(object : Callback<InfoV2> {
+                override fun onResponse(call: Call<InfoV2>, response: Response<InfoV2>) {
                    if (response.isSuccessful) {
-                        token = response.body()?.data?.token!!
-                        Log.i(TAG, "info success $token")
+                        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")
+                            if (e != null) {
+                                handler.postDelayed(
+                                    tokenRunnable,
+                                    max(30 * 60 * 1000, (e - 1500) * 1000).toLong()
+                                )
+                            } else {
+                                Log.e(TAG, "e empty")
+                                handler.postDelayed(
+                                    tokenRunnable,
+                                    30 * 60 * 1000
+                                )
+                            }
+                        } else {
+                            Log.e(TAG, "token empty")
+                            handler.postDelayed(
+                                tokenRunnable,
+                                30 * 60 * 1000
+                            )
+                        }
+                        if (!f.isNullOrEmpty()) {
+                            tokenFH = f
+                            Log.i(TAG, "tokenFH success $tokenFH")
+                        }
+                        if (c != null) {
+                            Utils.setBetween(c * 1000L)
+                            Log.i(TAG, "current time $c")
+                        }
+                        listener?.onRequestFinished(null)
                    } else {
                        Log.e(TAG, "token status error")
+                        handler.postDelayed(
+                            tokenRunnable,
+                            30 * 60 * 1000
+                        )
+                        if (initRetryTimes < initRetryMaxTimes) {
+                            initRetryTimes++
+                            fetchInfoV2()
+                        } else {
+                            listener?.onRequestFinished("状态错误")
+                        }
                    }
                }

-                override fun onFailure(call: Call<Info>, t: Throwable) {
+                override fun onFailure(call: Call<InfoV2>, t: Throwable) {
                    Log.e(TAG, "token request error $t")
+                    handler.postDelayed(
+                        tokenRunnable,
+                        30 * 60 * 1000
+                    )
+
+                    if (initRetryTimes < initRetryMaxTimes) {
+                        initRetryTimes++
+                        fetchInfoV2()
+                    } else {
+                        listener?.onRequestFinished("网络错误")
+                    }
                }
            })
    }

-    inner class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
+    fun fetchToken() {
+        yspTokenService.getToken(token)
+            .enqueue(object : Callback<Token> {
+                override fun onResponse(call: Call<Token>, response: Response<Token>) {
+                    if (response.isSuccessful) {
+                        val t = response.body()?.t
+                        val e = response.body()?.e
+                        if (!t.isNullOrEmpty()) {
+                            token = t
+                            Log.e(TAG, "token success $token")
+                            if (e != null) {
+                                handler.postDelayed(
+                                    tokenRunnable,
+                                    max(30 * 60 * 1000, (e - 1500) * 1000).toLong()
+                                )
+                            } else {
+                                Log.e(TAG, "e empty")
+                                handler.postDelayed(
+                                    tokenRunnable,
+                                    30 * 60 * 1000
+                                )
+                            }
+                        } else {
+                            Log.e(TAG, "token empty")
+                            handler.postDelayed(
+                                tokenRunnable,
+                                30 * 60 * 1000
+                            )
+                        }
+                    } else {
+                        Log.e(TAG, "token status error")
+                        handler.postDelayed(
+                            tokenRunnable,
+                            30 * 60 * 1000
+                        )
+                    }
+                }
+
+                override fun onFailure(call: Call<Token>, t: Throwable) {
+                    Log.e(TAG, "token request error $t")
+                    handler.postDelayed(
+                        tokenRunnable,
+                        30 * 60 * 1000
+                    )
+                }
+            })
+    }
+
+    class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
        override fun run() {
            fetchBtrace(tvModel)
            handler.postDelayed(this, 60000)
@@ -461,13 +614,13 @@ class Request {
    }

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

-        val guid = ysp?.getGuid()!!
-        val pid = tvModel.pid.value!!
-        val sid = tvModel.sid.value!!
+        val guid = YSP.getGuid()
+        val pid = tvModel.getTV().pid
+        val sid = tvModel.getTV().sid
        yspBtraceService.kvcollect(
-            c_timestamp = ysp?.generateGuid()!!,
+            c_timestamp = YSP.generateGuid(),
            guid = guid,
            c_guid = guid,
            prog = sid,
@@ -475,7 +628,7 @@ class Request {
            fpid = pid,
            livepid = pid,
            sUrl = "https://www.yangshipin.cn/#/tv/home?pid=$pid",
-            playno = ysp?.getRand()!!,
+            playno = YSP.getRand(),
            ftime = getDateFormat("yyyy-MM-dd HH:mm:ss"),
            seq = tvModel.seq.toString(),
        )
@@ -496,7 +649,8 @@ class Request {
    }

    fun fetchPage() {
-        yspProtoService.getPage().enqueue(object : Callback<pageModel.Response> {
+        callPage = yspProtoService.getPage()
+        callPage?.enqueue(object : Callback<pageModel.Response> {
            override fun onResponse(
                call: Call<pageModel.Response>,
                response: Response<pageModel.Response>
@@ -529,9 +683,9 @@ class Request {
        })
    }

-    fun fetchProgram(tvViewModel: TVViewModel) {
-        val title = tvViewModel.title.value
-        yspProtoService.getProgram(tvViewModel.programId.value!!, getDateFormat("yyyyMMdd"))
+    fun fetchYEPG(tvViewModel: TVViewModel) {
+        val title = tvViewModel.getTV().title
+        yspProtoService.getProgram(tvViewModel.getTV().programId, getDateFormat("yyyyMMdd"))
            .enqueue(object : Callback<epgProgramModel.Response> {
                override fun onResponse(
                    call: Call<epgProgramModel.Response>,
@@ -540,7 +694,7 @@ class Request {
                    if (response.isSuccessful) {
                        val program = response.body()
                        if (program != null) {
-                            tvViewModel.addProgram(program.dataListList)
+                            tvViewModel.addYEPG(program.dataListList)
                            Log.d(TAG, "$title program ${program.dataListList.size}")
                        }
                    } else {
@@ -554,6 +708,31 @@ class Request {
            })
    }

+    fun fetchFEPG(tvViewModel: TVViewModel) {
+        val title = tvViewModel.getTV().title
+        fAuthService.getEPG(tvViewModel.getTV().pid, getDateFormat("yyyyMMdd"))
+            .enqueue(object : Callback<List<FEPG>> {
+                override fun onResponse(
+                    call: Call<List<FEPG>>,
+                    response: Response<List<FEPG>>
+                ) {
+                    if (response.isSuccessful) {
+                        val program = response.body()
+                        if (program != null) {
+                            tvViewModel.addFEPG(program)
+                            Log.d(TAG, "$title program ${program.size}")
+                        }
+                    } else {
+                        Log.w(TAG, "$title program error")
+                    }
+                }
+
+                override fun onFailure(call: Call<List<FEPG>>, t: Throwable) {
+                    Log.e(TAG, "$title program request failed $t")
+                }
+            })
+    }
+
    private fun encryptTripleDES(key: ByteArray, iv: ByteArray): String {
        return try {
            val keySpec = SecretKeySpec(key, "DESede")
@@ -567,7 +746,11 @@ class Request {
        }
    }

-    companion object {
-        private const val TAG = "Request"
+    interface RequestListener {
+        fun onRequestFinished(message: String?)
+    }
+
+    fun setRequestListener(listener: RequestListener) {
+        this.listener = listener
    }
 }
@@ -6,14 +6,21 @@ import android.content.SharedPreferences
 object SP {
    // Name of the sp file TODO Should use a meaningful name and do migrations
    private const val SP_FILE_NAME = "MainActivity"
+
    // If Change channel with up and down in reversed order or not
    private const val KEY_CHANNEL_REVERSAL = "channel_reversal"
+
    // If use channel num to select channel or not
    private const val KEY_CHANNEL_NUM = "channel_num"
+
    // If start app on device boot or not
    private const val KEY_BOOT_STARTUP = "boot_startup"
+
+    private const val KEY_GRID = "grid"
+
    // Position in list of the selected channel item
    private const val KEY_POSITION = "position"
+
    // guid
    private const val KEY_GUID = "guid"

@@ -38,11 +45,15 @@ 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()

    var guid: String
-        get() = sp.getString(KEY_GUID, "")  ?: ""
+        get() = sp.getString(KEY_GUID, "") ?: ""
        set(value) = sp.edit().putString(KEY_GUID, value).apply()
 }
@@ -5,19 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import com.lizongying.mytv.databinding.DialogBinding
+import com.lizongying.mytv.databinding.SettingBinding


-class SettingFragment(
-    private val versionName: String,
-    private val versionCode: Long,
-    private val channelReversal: Boolean,
-    private val channelNum: Boolean,
-    private val bootStartup: Boolean,
-) :
-    DialogFragment() {
+class SettingFragment : DialogFragment() {

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

    private lateinit var updateManager: UpdateManager
@@ -32,44 +25,67 @@ class SettingFragment(
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
-        _binding = DialogBinding.inflate(inflater, container, false)
-        _binding?.version?.text =
-            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+        val context = requireContext() // It‘s safe to get context here.
+        _binding = SettingBinding.inflate(inflater, container, false)
+        binding.versionName.text = "当前版本: v${context.appVersionName}"
+        binding.version.text = "https://github.com/lizongying/my-tv"

-        val switchChannelReversal = _binding?.switchChannelReversal
-        switchChannelReversal?.isChecked = channelReversal
-        switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
-            SP.channelReversal = isChecked
-            (activity as MainActivity).settingActive()
+        binding.switchChannelReversal.run {
+            isChecked = SP.channelReversal
+            setOnCheckedChangeListener { _, isChecked ->
+                SP.channelReversal = isChecked
+                (activity as MainActivity).settingDelayHide()
+            }
        }

-        val switchChannelNum = _binding?.switchChannelNum
-        switchChannelNum?.isChecked = channelNum
-        switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
-            SP.channelNum = isChecked
-            (activity as MainActivity).settingActive()
+        binding.switchChannelNum.run {
+            isChecked = SP.channelNum
+            setOnCheckedChangeListener { _, isChecked ->
+                SP.channelNum = isChecked
+                (activity as MainActivity).settingDelayHide()
+            }
        }

-        val switchBootStartup = _binding?.switchBootStartup
-        switchBootStartup?.isChecked = bootStartup
-        switchBootStartup?.setOnCheckedChangeListener { _, isChecked ->
-            SP.bootStartup = isChecked
-            (activity as MainActivity).settingActive()
+        binding.switchBootStartup.run {
+            isChecked = SP.bootStartup
+            setOnCheckedChangeListener { _, isChecked ->
+                SP.bootStartup = isChecked
+                (activity as MainActivity).settingDelayHide()
+            }
        }

-        updateManager = UpdateManager(context, this, versionCode)
-        _binding?.checkVersion?.setOnClickListener(OnClickListenerCheckVersion(updateManager))
+        binding.switchGrid.run {
+            isChecked = SP.grid
+            setOnCheckedChangeListener { _, isChecked ->
+                SP.grid = isChecked
+                (activity as MainActivity).settingDelayHide()
+            }
+        }
+
+        updateManager = UpdateManager(context, this, context.appVersionCode)
+        binding.checkVersion.setOnClickListener(
+            OnClickListenerCheckVersion(
+                activity as MainActivity,
+                updateManager
+            )
+        )

        return binding.root
    }

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

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

-    override fun onDestroy() {
-        super.onDestroy()
-//        updateManager.destroy()
-    }
-
    companion object {
        const val TAG = "SettingFragment"
    }
@@ -7,9 +7,8 @@ data class TV(
    var title: String,
    var alias: String = "",
    var videoUrl: List<String>,
-    var videoIndex: Int = 0,
    var channel: String = "",
-    var logo: String = "",
+    var logo: Any = "",
    var pid: String = "",
    var sid: String = "",
    var programId: String = "",
@@ -23,7 +22,6 @@ data class TV(
                "id=" + id +
                ", title='" + title + '\'' +
                ", videoUrl='" + videoUrl + '\'' +
-                ", videoIndex='" + videoIndex + '\'' +
                ", logo='" + logo + '\'' +
                ", pid='" + pid + '\'' +
                ", sid='" + sid + '\'' +
@@ -1,5 +1,6 @@
 package com.lizongying.mytv

+import android.app.Activity
 import android.app.DownloadManager
 import android.app.DownloadManager.Request
 import android.content.BroadcastReceiver
@@ -13,8 +14,10 @@ import android.os.Environment
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import android.widget.Toast
-import com.lizongying.mytv.api.Release
+import androidx.core.app.ActivityCompat
+import androidx.core.content.PermissionChecker
+import androidx.core.content.PermissionChecker.checkSelfPermission
+import com.lizongying.mytv.api.ReleaseV2
 import com.lizongying.mytv.requests.MyRequest
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -23,81 +26,114 @@ import java.io.File


 class UpdateManager(
-    private var context: Context?,
+    private var context: Context,
    private var settingFragment: SettingFragment,
    private var versionCode: Long
 ) :
-    ConfirmationDialogFragment.ConfirmationDialogListener {
+    ConfirmationFragment.ConfirmationListener {

    private var myRequest = MyRequest()
-    private var release: Release? = null
+    private var release: ReleaseV2? = null

    private var downloadReceiver: DownloadReceiver? = null

    fun checkAndUpdate() {
+        if (!haveStoragePermission()) {
+            return
+        }
        CoroutineScope(Dispatchers.Main).launch {
+            var text = "版本获取失败"
            try {
                release = myRequest.getRelease()
-                updateUI(release)
-                Log.i(TAG, "versionCode $versionCode ${release?.data?.versionCode}")
-                if (release != null) {
-                    if (release?.data?.versionCode!! >= versionCode) {
-                        val dialog = ConfirmationDialogFragment(this@UpdateManager)
-                        dialog.show(settingFragment.fragmentManager, "ConfirmationDialogFragment")
+                Log.i(TAG, "versionCode $versionCode ${release?.c}")
+                if (release?.c != null) {
+                    text = if (release?.c!! > versionCode) {
+                        "最新版本：${release?.n}\n${release?.d ?: ""}"
                    } else {
-                        Toast.makeText(context, "不需要更新", Toast.LENGTH_LONG)
-                            .show()
+                        "已是最新版本，不需要更新"
                    }
                }
            } catch (e: Exception) {
                Log.e(TAG, "Error occurred: ${e.message}", e)
            }
+            updateUI(text)
        }
    }

-    private fun updateUI(release: Release?) {
-        if (release?.data?.versionName.isNullOrEmpty()) {
-            settingFragment.setVersionName("版本获取失败")
-        } else {
-            settingFragment.setVersionName("最新版本：${release?.data?.versionName!!}")
+    private fun updateUI(text: String) {
+        val dialog = ConfirmationFragment(this@UpdateManager, text)
+        dialog.show(settingFragment.fragmentManager, TAG)
+    }
+
+    private fun haveStoragePermission(): Boolean {
+        if (Build.VERSION.SDK_INT >= 23) {
+            if (checkSelfPermission(context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                === PermissionChecker.PERMISSION_GRANTED
+            ) {
+                Log.e("Permission error", "You have permission")
+                return true
+            } else {
+                Log.e("Permission error", "You have asked for permission")
+                ActivityCompat.requestPermissions(
+                    context as Activity, arrayOf(
+                        android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+                    ), 1
+                )
+                return false
+            }
+        } else { //you don't need to worry about these stuff below api level 23
+            Log.e("Permission error", "You already have the permission")
+            return true
        }
    }

-    private fun startDownload(release: Release) {
-        val apkFileName = "my-tv-${release.data.versionName}.apk"
+
+    private fun startDownload(release: ReleaseV2) {
+        val apkFileName = "my-tv-${release.n}.apk"
        Log.i(TAG, "apkFileName $apkFileName")
        val downloadManager =
-            context!!.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        val request = Request(Uri.parse(release.data.downloadUrl))
-        Log.i(TAG, "url ${Uri.parse(release.data.downloadUrl)}")
-        request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, apkFileName)
-        request.setTitle("New Version Download")
+            context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+        val request = Request(Uri.parse(release.u))
+        Log.i(TAG, "url ${Uri.parse(release.u)}")
+        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)?.mkdirs()
+        request.setDestinationInExternalFilesDir(
+            context,
+            Environment.DIRECTORY_DOWNLOADS,
+            apkFileName
+        )
+        request.setTitle("${settingFragment.resources.getString(R.string.app_name)} ${release.n}")
        request.setNotificationVisibility(Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+        request.setAllowedOverRoaming(false)
+        request.setMimeType("application/vnd.android.package-archive")

        // 获取下载任务的引用
        val downloadReference = downloadManager.enqueue(request)

-        downloadReceiver = DownloadReceiver(context!!, apkFileName, downloadReference)
+        downloadReceiver = DownloadReceiver(context, apkFileName, downloadReference)

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context!!.registerReceiver(
+            context.registerReceiver(
                downloadReceiver,
                IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
                Context.RECEIVER_NOT_EXPORTED,
            )
        } else {
-            context!!.registerReceiver(
+            context.registerReceiver(
                downloadReceiver,
                IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
            )
        }

-        getDownloadProgress(context!!, downloadReference) { progress ->
+        getDownloadProgress(context, downloadReference) { progress ->
            println("Download progress: $progress%")
        }
    }

-    private fun getDownloadProgress(context: Context, downloadId: Long, progressListener: (Int) -> Unit) {
+    private fun getDownloadProgress(
+        context: Context,
+        downloadId: Long,
+        progressListener: (Int) -> Unit
+    ) {
        val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
        val handler = Handler(Looper.getMainLooper())
        val intervalMillis: Long = 1000
@@ -179,10 +215,9 @@ class UpdateManager(
    override fun onCancel() {
    }

-
    fun destroy() {
        if (downloadReceiver != null) {
-            context!!.unregisterReceiver(downloadReceiver)
+            context.unregisterReceiver(downloadReceiver)
            Log.i(TAG, "destroy downloadReceiver")
        }
    }
@@ -1,6 +1,5 @@
 package com.lizongying.mytv

-import android.content.Context
 import android.content.res.Resources
 import android.os.Build
 import android.util.TypedValue
@@ -8,7 +7,6 @@ import com.google.gson.Gson
 import com.lizongying.mytv.api.TimeResponse
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import java.io.File
 import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -28,6 +26,10 @@ object Utils {
        return (System.currentTimeMillis() - between) / 1000
    }

+    fun setBetween(currentTimeMillis: Long) {
+        between = System.currentTimeMillis() - currentTimeMillis
+    }
+
    suspend fun init() {
        var currentTimeMillis: Long = 0
        try {
@@ -76,49 +78,4 @@ object Utils {
    }

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


+import android.os.Build
+import android.util.Log
+import okhttp3.ConnectionSpec
 import okhttp3.OkHttpClient
+import okhttp3.TlsVersion
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.protobuf.ProtoConverterFactory
@@ -13,7 +17,6 @@ import javax.net.ssl.X509TrustManager
 class ApiClient {
    private val yspUrl = "https://player-api.yangshipin.cn/"
    private val myUrl = "https://lyrics.run/"
-    private val devUrl = "http://10.0.2.2:8081/"
    private val protoUrl = "https://capi.yangshipin.cn/"
    private val traceUrl = "https://btrace.yangshipin.cn/"
    private val fUrl = "https://m.fengshows.com/"
@@ -68,6 +71,36 @@ class ApiClient {
            .build().create(FAuthService::class.java)
    }

+    private fun enableTls12OnPreLollipop(client: OkHttpClient.Builder): OkHttpClient.Builder {
+        if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT < 22) {
+            try {
+                val sc = SSLContext.getInstance("TLSv1.2")
+
+                sc.init(null, null, null)
+
+                // a more robust version is to pass a custom X509TrustManager
+                // as the second parameter and make checkServerTrusted to accept your server.
+                // Credits: https://github.com/square/okhttp/issues/2372#issuecomment-1774955225
+                client.sslSocketFactory(Tls12SocketFactory(sc.socketFactory))
+
+                val cs = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+                    .tlsVersions(TlsVersion.TLS_1_2)
+                    .build()
+
+                val specs: MutableList<ConnectionSpec> = ArrayList()
+                specs.add(cs)
+                specs.add(ConnectionSpec.COMPATIBLE_TLS)
+                specs.add(ConnectionSpec.CLEARTEXT)
+
+                client.connectionSpecs(specs)
+            } catch (exc: java.lang.Exception) {
+                Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc)
+            }
+        }
+
+        return client
+    }
+
    private fun getUnsafeOkHttpClient(): OkHttpClient {
        try {
            val trustAllCerts: Array<TrustManager> = arrayOf(
@@ -93,11 +126,12 @@ class ApiClient {
            val sslContext = SSLContext.getInstance("SSL")
            sslContext.init(null, trustAllCerts, java.security.SecureRandom())

-            return OkHttpClient.Builder()
+            val builder = OkHttpClient.Builder()
                .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)
                .hostnameVerifier { _, _ -> true }
                .dns(DnsCache())
-                .build()
+
+            return enableTls12OnPreLollipop(builder).build()

        } catch (e: Exception) {
            throw RuntimeException(e)
@@ -2,12 +2,22 @@ package com.lizongying.mytv.api

 import retrofit2.Call
 import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Path
 import retrofit2.http.Query

 interface FAuthService {
    @GET("api/v3/hub/live/auth-url")
    fun getAuth(
+        @Header("token") token: String,
        @Query("live_id") live_id: String = "",
        @Query("live_qa") live_qa: String = "",
    ): Call<FAuth>
+
+    @GET("api/v3/live/{liveId}/resources")
+    fun getEPG(
+        @Path("liveId") liveId: String,
+        @Query("date") date: String,
+        @Query("dir") dir: String = "asc"
+    ): Call<List<FEPG>>
 }
@@ -0,0 +1,7 @@
+package com.lizongying.mytv.api
+
+
+data class FEPG(
+    val title: String,
+    val event_time: String,
+)
@@ -10,18 +10,25 @@ data class Info(
    )
 }

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

 data class TimeResponse(
    val data: Time
@@ -2,10 +2,11 @@ package com.lizongying.mytv.api

 import retrofit2.Call
 import retrofit2.http.GET
-
+import retrofit2.http.Path

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

-class YSP(var context: Context) {
+object YSP {
+    private const val TAG = "YSP"
+
    private var cnlid = ""

    private var livepid = ""
@@ -53,20 +55,16 @@ class YSP(var context: Context) {
    private var appid = "ysp_pc"
    var token = ""

-    private var encryptor: Encryptor? = null
-
-    init {
-        if (context is MainActivity) {
-            encryptor = Encryptor()
-            encryptor!!.init(context)
-        }
+    private var encryptor = Encryptor()

+    fun init(context: Context) {
+        encryptor.init(context)
        guid = getGuid()
    }

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

        randStr = getRand()
@@ -78,13 +76,13 @@ class YSP(var context: Context) {
        timeStr = getTimeStr()

        cKey =
-            encryptor!!.encrypt(cnlid, timeStr, appVer, guid, platform)
+            encryptor.encrypt(cnlid, timeStr, appVer, guid, platform)
        signature = getSignature()
        return """{"cnlid":"$cnlid","livepid":"$livepid","stream":"$stream","guid":"$guid","cKey":"$cKey","adjust":$adjust,"sphttps":"$sphttps","platform":"$platform","cmd":"$cmd","encryptVer":"$encryptVer","dtype":"$dtype","devid":"$devid","otype":"$otype","appVer":"$appVer","app_version":"$appVersion","rand_str":"$randStr","channel":"$channel","defn":"$defn","signature":"$signature"}"""
    }

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

        randStr = getRand()

@@ -134,18 +132,14 @@ class YSP(var context: Context) {
    private fun getSignature(): String {
        val e =
            "adjust=${adjust}&appVer=${appVer}&app_version=$appVersion&cKey=$cKey&channel=$channel&cmd=$cmd&cnlid=$cnlid&defn=${defn}&devid=${devid}&dtype=${dtype}&encryptVer=${encryptVer}&guid=${guid}&livepid=${livepid}&otype=${otype}&platform=${platform}&rand_str=${randStr}&sphttps=${sphttps}&stream=${stream}".toByteArray()
-        val hashedData = encryptor?.hash(e) ?: return ""
+        val hashedData = encryptor.hash(e) ?: return ""
        return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
    }

    private fun getAuthSignature(): String {
        val e =
            "appid=${appid}&guid=${guid}&pid=${livepid}&rand_str=${randStr}".toByteArray()
-        val hashedData = encryptor?.hash2(e) ?: return ""
+        val hashedData = encryptor.hash2(e) ?: return ""
        return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
    }
-
-    companion object {
-        private const val TAG = "YSP"
-    }
 }
@@ -10,4 +10,13 @@ interface YSPTokenService {
    fun getInfo(
        @Query("token") token: String = "",
    ): Call<Info>
+
+    @GET("my-tv/v2/token")
+    fun getToken(
+        @Query("token") token: String = "",
+    ): Call<Token>
+
+    @GET("my-tv/v2/info")
+    fun getInfoV2(
+    ): Call<InfoV2>
 }
@@ -0,0 +1,7 @@
+package com.lizongying.mytv.models
+
+
+data class EPG(
+    val title: String,
+    val beginTime: Int,
+)
@@ -1,18 +1,14 @@
 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.Utils.getDateTimestamp
+import com.lizongying.mytv.api.FEPG
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.programModel.Program
+import java.text.SimpleDateFormat
+import java.util.TimeZone

 class TVViewModel(private var tv: TV) : ViewModel() {

@@ -20,30 +16,21 @@ class TVViewModel(private var tv: TV) : ViewModel() {
    private var itemPosition: Int = 0

    var retryTimes = 0
-    var tokenRetryTimes = 0
    var retryMaxTimes = 8
-    var tokenRetryMaxTimes = 2
-    var programUpdateTime: Long = 0
+    var tokenYSPRetryTimes = 0
+    var tokenYSPRetryMaxTimes = 0
+    var tokenFHRetryTimes = 0
+    var tokenFHRetryMaxTimes = 8
+
+    var needGetToken = false

    private val _errInfo = MutableLiveData<String>()
    val errInfo: LiveData<String>
        get() = _errInfo

-    private val _programId = MutableLiveData<String>()
-    val programId: LiveData<String>
-        get() = _programId
-
-    private var _program = MutableLiveData<MutableList<Program>>()
-    val program: LiveData<MutableList<Program>>
-        get() = _program
-
-    private val _id = MutableLiveData<Int>()
-    val id: LiveData<Int>
-        get() = _id
-
-    private val _title = MutableLiveData<String>()
-    val title: LiveData<String>
-        get() = _title
+    private var _epg = MutableLiveData<MutableList<EPG>>()
+    val epg: LiveData<MutableList<EPG>>
+        get() = _epg

    private val _videoUrl = MutableLiveData<List<String>>()
    val videoUrl: LiveData<List<String>>
@@ -53,18 +40,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
    val videoIndex: LiveData<Int>
        get() = _videoIndex

-    private val _logo = MutableLiveData<String>()
-    val logo: LiveData<String>
-        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
@@ -73,11 +48,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
    val ready: LiveData<Boolean>
        get() = _ready

-    private var mMinimumLoadableRetryCount = 5
-
    var seq = 0

-
    fun addVideoUrl(url: String) {
        if (_videoUrl.value?.isNotEmpty() == true) {
            if (_videoUrl.value!!.last().contains("cctv.cn")) {
@@ -88,9 +60,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
        } else {
            tv.videoUrl = tv.videoUrl + listOf(url)
        }
-        tv.videoIndex = tv.videoUrl.lastIndex
        _videoUrl.value = tv.videoUrl
-        _videoIndex.value = tv.videoIndex
+        _videoIndex.value = tv.videoUrl.lastIndex
    }

    fun firstSource() {
@@ -114,23 +85,11 @@ class TVViewModel(private var tv: TV) : ViewModel() {
        _videoIndex.value = videoIndex
    }

-    fun setLogo(url: String) {
-        _logo.value = url
-    }
-
    init {
-        _id.value = tv.id
-        _title.value = tv.title
        _videoUrl.value = tv.videoUrl
-        _videoIndex.value = tv.videoIndex
-        _logo.value = tv.logo
-        _programId.value = tv.programId
-        _pid.value = tv.pid
-        _sid.value = tv.sid
-        _program.value = mutableListOf()
+        _videoIndex.value = tv.videoUrl.lastIndex
    }

-
    fun getRowPosition(): Int {
        return rowPosition
    }
@@ -151,69 +110,26 @@ class TVViewModel(private var tv: TV) : ViewModel() {
        _errInfo.value = info
    }

-    fun update(t: TV) {
-        tv = t
-    }
-
    fun getTV(): TV {
        return tv
    }

-    fun getProgramOne(): Program? {
-        val programNew =
-            (_program.value?.filter { it.et > getDateTimestamp() })?.toMutableList()
-        if (programNew != null && _program.value != programNew) {
-            _program.value = programNew
-        }
-        if (_program.value!!.isEmpty()) {
-            return null
-        }
-        return _program.value?.first()
+    fun addYEPG(p: MutableList<Program>) {
+        _epg.value = p.map { EPG(it.name, it.st.toInt()) }.toMutableList()
    }

-    fun addProgram(p: MutableList<Program>) {
-        val timestamp = getDateTimestamp()
-
-        // after now & not empty & different
-        val p1 = (p.filter { it.et > timestamp }).toMutableList()
-        if (p1.isEmpty() || _program.value == p1) {
-            return
-        }
-
-        if (_program.value!!.isEmpty()) {
-            _program.value = p1
-        } else {
-            _program.value =
-                ((_program.value?.filter { it.et > timestamp && it.st < p1.first().st })?.plus(
-                    p1
-                ))?.toMutableList()
+    private fun formatFTime(s: String): Int {
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss")
+        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
+        val date = dateFormat.parse(s.substring(0, 19))
+        if (date != null) {
+            return (date.time / 1000).toInt()
        }
+        return 0
    }

-
-    private var mHeaders: Map<String, String>? = mapOf()
-
-    fun setHeaders(headers: Map<String, String>) {
-        mHeaders = headers
-    }
-
-    fun setMinimumLoadableRetryCount(minimumLoadableRetryCount: Int) {
-        mMinimumLoadableRetryCount = minimumLoadableRetryCount
-    }
-
-    /**
-     * (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 addFEPG(p: List<FEPG>) {
+        _epg.value = p.map { EPG(it.title, formatFTime(it.event_time)) }.toMutableList()
    }

    fun getVideoUrlCurrent(): String {
@@ -1,7 +1,7 @@
 package com.lizongying.mytv.requests

 import com.lizongying.mytv.api.ApiClient
-import com.lizongying.mytv.api.Release
+import com.lizongying.mytv.api.ReleaseV2
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import retrofit2.Call
@@ -13,17 +13,17 @@ import kotlin.coroutines.suspendCoroutine
 class MyRequest {
    private var releaseService = ApiClient().releaseService

-    suspend fun getRelease(): Release? {
+    suspend fun getRelease(): ReleaseV2? {
        return withContext(Dispatchers.IO) {
            fetchRelease()
        }
    }

-    private suspend fun fetchRelease(): Release? {
+    private suspend fun fetchRelease(): ReleaseV2? {
        return suspendCoroutine { continuation ->
            releaseService.getRelease()
-                .enqueue(object : Callback<Release> {
-                    override fun onResponse(call: Call<Release>, response: Response<Release>) {
+                .enqueue(object : Callback<ReleaseV2> {
+                    override fun onResponse(call: Call<ReleaseV2>, response: Response<ReleaseV2>) {
                        if (response.isSuccessful) {
                            continuation.resume(response.body())
                        } else {
@@ -31,7 +31,7 @@ class MyRequest {
                        }
                    }

-                    override fun onFailure(call: Call<Release>, t: Throwable) {
+                    override fun onFailure(call: Call<ReleaseV2>, t: Throwable) {
                        continuation.resume(null)
                    }
                })
@@ -70,6 +70,12 @@
                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"
@@ -130,7 +130,7 @@
    "programId": "600004078",
    "needToken": true,
    "mustToken": false,
-    "title": "CCTV9 记录",
+    "title": "CCTV9 纪录",
    "videoUrl": [
      "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226197/index.m3u8"
    ]
@@ -3,4 +3,6 @@
    <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>
@@ -4,4 +4,5 @@
    <string name="title_channel_num">数字选台</string>
    <string name="check_version">检查更新</string>
    <string name="title_boot_startup">开机自启</string>
+    <string name="title_grid">网格样式</string>
 </resources>
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.2.2' apply false
-    id 'com.android.library' version '8.2.2' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
 }
@@ -1,6 +1,6 @@
 #Fri Dec 01 13:53:24 HKT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
Author	SHA1	Message	Date
Li ZongYing	bb88e754a5	fix 368	2024-03-29 17:04:11 +08:00
Li ZongYing	49e96d18f4	fix version code	2024-03-17 09:38:46 +08:00
Li ZongYing	43343f8faa	fix version code	2024-03-17 09:35:34 +08:00
Li ZongYing	0335f58a12	fix version name	2024-03-16 16:17:10 +08:00
Li ZongYing	9450de2c91	menu style	2024-03-16 13:14:14 +08:00
Li ZongYing	d03de91c1e	request optimize	2024-03-16 10:44:55 +08:00
Li ZongYing	7057e4a8b4	request optimize	2024-03-15 22:32:43 +08:00
Li ZongYing	188431a29f	fix 4.0 crash	2024-03-14 22:08:28 +08:00
Li ZongYing	5c0152e36c	optimize fetch token	2024-03-13 12:11:51 +08:00
Li ZongYing	a63463559f	phoenix retry	2024-03-13 11:31:37 +08:00
Li ZongYing	d37ada1268	phoenix epg	2024-03-12 16:16:07 +08:00