number selection

.github/ISSUE_TEMPLATE/bug.yml

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

.github/ISSUE_TEMPLATE/fr.yml

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

HISTORY.md

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

README.md

@@ -1,12 +1,55 @@
 # 我的电视
 
-电视直播软件，安装即可使用
+安卓电视直播软件，内置直播源
 
 ## 使用
 
-下载安装:
+下载安装 [releases](https://github.com/lizongying/my-tv/releases/)
-[github](https://github.com/lizongying/my-tv/releases/)
+
-[gitee](https://gitee.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.4.4（安卓4专用）
+
+* 优化图标显示
+* 增加换台反转
+
+### v1.3.3
+
+* 部分错误会提示用户
+* 菜单3秒钟后自动关闭
+
+### v1.3.2
+
+* 增加重试，减少因网络问题导致的播放失败
+* 优化横幅banner
+
+### v1.2.6
+
+* 支持安卓4.2
+* 解决部分频道无法播放的问题
+* 修复切换时有时没有恢复播放的问题
+* 左右键不再切换源
+* 增大频道信息标题尺寸，缩小与节目信息的间隔
+
+### v1.2.5
+
+* 美化频道信息显示
+* 优化节目单获取
+
+### v1.2.4
+
+* 改变换台滑动方向，上一个频道下滑，下一个频道上滑
+* 软件退出时，退出播放器
+* 播放相同的频道，不再重复加载
+* 暂时移除部分频道
+
+## 其他
 
 小米电视可以使用小米电视助手进行安装
 
@@ -16,29 +59,6 @@
 adb install my-tv.apk
 ```
 
-![image](./screenshots/img_3.png)
-![image](./screenshots/img_2.png)
-![image](./screenshots/img_1.png)
-
-## 更新日志
-
-[更新日志](./HISTORY.md)
-
-## TODO
-
-* 音量不同
-* 大湾区卫视、广东4k超高清、广东珠江、三沙卫视
-* CHC高清三个电影频道
-* 地方频道
-* 收藏夹
-* 自定义源
-* 海外
-* 节目增加预告
-* 频道列表优化
-* 自动更新
-* 显示时间
-* 软解
-
 ## 赞赏
 
 ![image](./screenshots/appreciate.jpeg)

app/build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 android {
     namespace 'com.lizongying.mytv'
-    compileSdk 34
+    compileSdk 33
 
     viewBinding {
         enabled = true
@@ -54,7 +54,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = 17
+        jvmTarget=17
     }
 
     // Encapsulates your external native build configurations.
@@ -71,14 +71,9 @@ android {
 
 static def VersionCode() {
     try {
-        def p = "git describe --tags --always"
+        def process = 'git rev-list --count HEAD'.execute()
-        def process = p.execute()
         process.waitFor()
-        def replace = [v: "", ".": " ", "-": " "]
+        return process.text.toInteger()
-        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
     }
@@ -86,7 +81,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) {
@@ -95,7 +90,7 @@ static def VersionName() {
 }
 
 dependencies {
-    def media3_version = "1.2.1"
+    def media3_version = "1.1.1"
 
     implementation "androidx.media3:media3-ui:$media3_version"
 
@@ -106,7 +101,7 @@ dependencies {
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
 
     // 21:2.9.0 17:2.6.4
-    def retrofit2_version = "2.9.0"
+    def retrofit2_version = "2.6.4"
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
     implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
@@ -118,8 +113,4 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC")
-
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.3'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.13.3'
-    implementation 'com.google.android.exoplayer:exoplayer-hls:2.13.3'
 }

app/src/main/AndroidManifest.xml

@@ -7,24 +7,19 @@
         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"
-        android:largeHeap="true"
         android:icon="@drawable/logo"
-        android:logo="@drawable/logo"
-        android:banner="@drawable/banner"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:networkSecurityConfig="@xml/network"
-        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.MyTV">
         <activity
             android:keepScreenOn="true"
             android:name=".MainActivity"
+            android:banner="@drawable/banner"
             android:exported="true"
+            android:icon="@drawable/logo"
+            android:logo="@drawable/logo"
             android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -32,23 +27,5 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <receiver
-            android:name=".BootReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </receiver>
-        <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"
-            android:exported="false"/>
     </application>
 </manifest>

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

@@ -1,18 +0,0 @@
-package com.lizongying.mytv
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-
-class BootReceiver : BroadcastReceiver() {
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (SP.bootStartup) {
-            context.startActivity(
-                Intent(context, MainActivity::class.java)
-                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            )
-        }
-    }
-
-}

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

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

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

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

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

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

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

@@ -1,37 +0,0 @@
-package com.lizongying.mytv
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.os.Bundle
-import androidx.fragment.app.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(message)
-                .setPositiveButton(
-                    "确定"
-                ) { _, _ ->
-                    listener.onConfirm()
-                }
-                .setNegativeButton(
-                    "取消"
-                ) { _, _ ->
-                    listener.onCancel()
-                }
-            builder.create()
-        } ?: throw IllegalStateException("Activity cannot be null")
-    }
-
-    interface ConfirmationListener {
-        fun onConfirm()
-        fun onCancel()
-    }
-}
-

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

@@ -9,8 +9,6 @@ class Encryptor {
 
     external fun hash(data: ByteArray): ByteArray?
 
-    external fun hash2(data: ByteArray): ByteArray?
-
     companion object {
         init {
             System.loadLibrary("native")

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

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

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

@@ -1,105 +0,0 @@
-@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)
-        ""
-    }
-}

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

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

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

@@ -1,39 +0,0 @@
-package com.lizongying.mytv
-
-import android.content.ContentProvider
-import android.content.ContentValues
-import android.net.Uri
-
-internal class InitializerProvider : ContentProvider() {
-
-    // Happens before Application#onCreate.It's fine to init something here
-    override fun onCreate(): Boolean {
-        SP.init(context!!)
-        return true
-    }
-
-    override fun query(
-        uri: Uri,
-        projection: Array<out String>?,
-        selection: String?,
-        selectionArgs: Array<out String>?,
-        sortOrder: String?,
-    ) = unsupported()
-
-    override fun getType(uri: Uri) = unsupported()
-
-    override fun insert(uri: Uri, values: ContentValues?) = unsupported()
-
-    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?) =
-        unsupported()
-
-    override fun update(
-        uri: Uri,
-        values: ContentValues?,
-        selection: String?,
-        selectionArgs: Array<out String>?,
-    ) = unsupported()
-
-    private fun unsupported(errorMessage: String? = null): Nothing =
-        throw UnsupportedOperationException(errorMessage)
-}

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

@@ -1,8 +1,11 @@
 package com.lizongying.mytv
 
 import android.content.Context
-import android.net.ConnectivityManager
+import android.content.SharedPreferences
-import android.net.Network
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.Signature
+import android.content.pm.SigningInfo
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -11,56 +14,39 @@ import android.util.Log
 import android.view.GestureDetector
 import android.view.KeyEvent
 import android.view.MotionEvent
-import android.view.View
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.models.TVViewModel
-import kotlinx.coroutines.CoroutineStart
+import java.security.MessageDigest
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
 
 
-class MainActivity : FragmentActivity(), Request.RequestListener {
+class MainActivity : FragmentActivity() {
 
-    private var ready = 0
+    var playerFragment = PlayerFragment()
-    private val playerFragment = PlayerFragment()
+    private val mainFragment = MainFragment2()
-    private val mainFragment = MainFragment()
     private val infoFragment = InfoFragment()
     private val channelFragment = ChannelFragment()
-    private val settingFragment = SettingFragment()
-    private val errorFragment = ErrorFragment()
 
     private var doubleBackToExitPressedOnce = false
 
     private lateinit var gestureDetector: GestureDetector
 
     private val handler = Handler()
-    private val delayHideMain: Long = 10000
+    private val delay: Long = 4000
-    private val delayHideSetting: Long = 10000
+    private val delayHideHelp: Long = 10000
 
-    init {
+    private lateinit var sharedPref: SharedPreferences
-        lifecycleScope.launch(Dispatchers.IO) {
+    private var channelReversal = false
-            val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
 
-            utilsJob.start()
+    private var versionName = ""
-
+    private lateinit var dialogFragment: MyDialogFragment
-//            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,57 +57,24 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
                 .add(R.id.main_browse_fragment, infoFragment)
                 .add(R.id.main_browse_fragment, channelFragment)
                 .add(R.id.main_browse_fragment, mainFragment)
+                .hide(infoFragment)
+                .hide(channelFragment)
                 .hide(mainFragment)
                 .commit()
+            mainFragment.view?.requestFocus()
         }
         gestureDetector = GestureDetector(this, GestureListener())
 
-        errorFragment.buttonClickListener = View.OnClickListener {
+        sharedPref = getPreferences(Context.MODE_PRIVATE)
-            supportFragmentManager.beginTransaction()
+        channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, false)
-                .remove(errorFragment)
-                .commit()
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            val connectivityManager =
-                getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            connectivityManager.registerDefaultNetworkCallback(object :
-                ConnectivityManager.NetworkCallback() {
-                override fun onAvailable(network: Network) {
-                    super.onAvailable(network)
-                    Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
-                    if (this@MainActivity.isNetworkConnected) {
-                        Log.i(TAG, "net isNetworkConnected")
-                        ready++
-                    }
-                }
-            })
-        } else {
-            Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
-            ready++
-        }
 
+        versionName = getPackageInfo().versionName
+        dialogFragment = MyDialogFragment(versionName, channelReversal)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
         infoFragment.show(tvViewModel)
-        if (SP.channelNum) {
+        channelFragment.show(tvViewModel)
-            channelFragment.show(tvViewModel)
-        }
-    }
-
-    private fun showChannel(channel: String) {
-        if (!mainFragment.isHidden) {
-            return
-        }
-
-        if (settingFragment.isVisible) {
-            return
-        }
-
-        if (SP.channelNum) {
-            channelFragment.show(channel)
-        }
     }
 
     fun play(tvViewModel: TVViewModel) {
@@ -153,8 +106,9 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
+            mainFragment.setPosition()
             transaction.show(mainFragment)
-            mainActive()
+            keepRunnable()
         } else {
             transaction.hide(mainFragment)
         }
@@ -162,21 +116,12 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         transaction.commit()
     }
 
-    fun mainActive() {
+    fun keepRunnable() {
-        handler.removeCallbacks(hideMain)
+        handler.removeCallbacks(hideRunnable)
-        handler.postDelayed(hideMain, delayHideMain)
+        handler.postDelayed(hideRunnable, delay)
     }
 
-    fun settingDelayHide() {
+    private val hideRunnable = Runnable {
-        handler.removeCallbacks(hideSetting)
-        handler.postDelayed(hideSetting, delayHideSetting)
-    }
-
-    fun settingNeverHide() {
-        handler.removeCallbacks(hideSetting)
-    }
-
-    private val hideMain = Runnable {
         if (!mainFragment.isHidden) {
             supportFragmentManager.beginTransaction().hide(mainFragment).commit()
         }
@@ -195,19 +140,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     }
 
     fun fragmentReady() {
-        ready++
+        mainFragment.fragmentReady()
-        Log.i(TAG, "ready $ready")
-        if (ready == 6) {
-            mainFragment.fragmentReady()
-        }
-    }
-
-    fun isPlaying() {
-        if (errorFragment.isVisible) {
-            supportFragmentManager.beginTransaction()
-                .remove(errorFragment)
-                .commit()
-        }
     }
 
     override fun onTouchEvent(event: MotionEvent?): Boolean {
@@ -220,17 +153,13 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
 
         override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+            Log.i(TAG, "onSingleTapConfirmed")
             switchMainFragment()
             return true
         }
 
-        override fun onDoubleTap(e: MotionEvent): Boolean {
-            showSetting()
-            return true
-        }
-
         override fun onFling(
-            e1: MotionEvent?,
+            e1: MotionEvent,
             e2: MotionEvent,
             velocityX: Float,
             velocityY: Float
@@ -262,30 +191,39 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }
     }
 
-    private fun showSetting() {
+    fun saveChannelReversal(channelReversal: Boolean) {
+        with(sharedPref.edit()) {
+            putBoolean(CHANNEL_REVERSAL, channelReversal)
+            apply()
+        }
+        this.channelReversal = channelReversal
+    }
+
+    private fun showHelp() {
         if (!mainFragment.isHidden) {
             return
         }
 
-        Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
+        Log.i(TAG, "dialogFragment ${dialogFragment.isVisible}")
-        if (!settingFragment.isVisible) {
+        if (!dialogFragment.isVisible) {
-            settingFragment.show(supportFragmentManager, "setting")
+            dialogFragment.show(supportFragmentManager, "settings_dialog")
-            settingDelayHide()
+            handler.removeCallbacks(hideHelp)
+            handler.postDelayed(hideHelp, delayHideHelp)
         } else {
-            handler.removeCallbacks(hideSetting)
+            handler.removeCallbacks(hideHelp)
-            settingFragment.dismiss()
+            dialogFragment.dismiss()
         }
     }
 
-    private val hideSetting = Runnable {
+    private val hideHelp = Runnable {
-        if (settingFragment.isVisible) {
+        if (dialogFragment.isVisible) {
-            settingFragment.dismiss()
+            dialogFragment.dismiss()
         }
     }
 
     private fun channelUp() {
         if (mainFragment.isHidden) {
-            if (SP.channelReversal) {
+            if (channelReversal) {
                 next()
                 return
             }
@@ -302,7 +240,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
     private fun channelDown() {
         if (mainFragment.isHidden) {
-            if (SP.channelReversal) {
+            if (channelReversal) {
                 prev()
                 return
             }
@@ -335,8 +273,19 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }, 2000)
     }
 
+    private fun showChannel(channel: String) {
+        if (!mainFragment.isHidden) {
+            return
+        }
+
+        if (dialogFragment.isVisible) {
+            return
+        }
+
+        channelFragment.show(channel)
+    }
+
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        Log.i(TAG, "keyCode $keyCode, event $event")
         when (keyCode) {
             KeyEvent.KEYCODE_0 -> {
                 showChannel("0")
@@ -399,27 +348,27 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_BOOKMARK -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
             KeyEvent.KEYCODE_UNKNOWN -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
             KeyEvent.KEYCODE_HELP -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
             KeyEvent.KEYCODE_SETTINGS -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
             KeyEvent.KEYCODE_MENU -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
@@ -476,43 +425,59 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         return super.onKeyDown(keyCode, event)
     }
 
-    private fun getAppSignature() = this.appSignature
+    private fun getPackageInfo(): PackageInfo {
+        val flag = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            PackageManager.GET_SIGNATURES
+        } else {
+            PackageManager.GET_SIGNING_CERTIFICATES
+        }
 
-    override fun onStart() {
+        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-        Log.i(TAG, "onStart")
+            packageManager.getPackageInfo(packageName, flag)
-        super.onStart()
+        } else {
-    }
+            packageManager.getPackageInfo(
-
+                packageName,
-    override fun onResume() {
+                PackageManager.PackageInfoFlags.of(PackageManager.GET_SIGNING_CERTIFICATES.toLong())
-        Log.i(TAG, "onResume")
+            )
-        super.onResume()
-        if (!mainFragment.isHidden) {
-            handler.postDelayed(hideMain, delayHideMain)
         }
     }
 
-    override fun onPause() {
+    private fun getAppSignature(): String {
-        Log.i(TAG, "onPause")
+        val packageInfo = getPackageInfo()
-        super.onPause()
-        handler.removeCallbacks(hideMain)
-    }
 
-    override fun onDestroy() {
+        var sign: Signature? = null
-        super.onDestroy()
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-        Request.onDestroy()
+            val signatures: Array<out Signature>? = packageInfo.signatures
-    }
+            if (signatures != null) {
-
+                sign = signatures[0]
-    override fun onRequestFinished(message: String?) {
+            }
-        if (message != null && !errorFragment.isVisible) {
+        } else {
-            supportFragmentManager.beginTransaction()
+            val signingInfo: SigningInfo? = packageInfo.signingInfo
-                .add(R.id.main_browse_fragment, errorFragment)
+            if (signingInfo != null) {
-                .commitNow()
+                sign = signingInfo.apkContentsSigners[0]
-            errorFragment.setErrorContent(message)
+            }
         }
-        fragmentReady()
+        if (sign == null) {
+            return ""
+        }
+
+        return hashSignature(sign)
     }
 
-    private companion object {
+    private fun hashSignature(signature: Signature): String {
-        const val TAG = "MainActivity"
+        return try {
+            val md = MessageDigest.getInstance("SHA-256")
+            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)
+            ""
+        }
+    }
+
+    companion object {
+        private const val TAG = "MainActivity"
+        private const val CHANNEL_REVERSAL = "channel_reversal"
     }
 }

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

@@ -1,10 +1,11 @@
 package com.lizongying.mytv
 
+import android.content.Context
+import android.content.SharedPreferences
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
 import androidx.leanback.app.BrowseSupportFragment
 import androidx.leanback.widget.ArrayObjectAdapter
@@ -18,69 +19,54 @@ import androidx.leanback.widget.Presenter
 import androidx.leanback.widget.Row
 import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
-import com.lizongying.mytv.api.YSP
+import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class MainFragment : BrowseSupportFragment() {
 
-    private var itemPosition = 0
+class MainFragment : BrowseSupportFragment() {
+    var itemPosition: Int = 0
+
+    private var request: Request = Request()
 
     private var rowsAdapter: ArrayObjectAdapter? = null
 
     var tvListViewModel = TVListViewModel()
 
-    private var lastVideoUrl = ""
+    private var sharedPref: SharedPreferences? = null
+
+    private var lastVideoUrl: String = ""
+
+    private val handler = Handler(Looper.getMainLooper())
+    private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
+
+    private var ready = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
         headersState = HEADERS_DISABLED
     }
 
-//    override fun onCreateView(
-//        inflater: LayoutInflater,
-//        container: ViewGroup?,
-//        savedInstanceState: Bundle?
-//    ): View? {
-//        val rootView = super.onCreateView(inflater, container, savedInstanceState)
-//        rootView?.setOnClickListener {
-//            Log.i(TAG, "main on click")
-//            fragmentManager!!.beginTransaction().hide(this).commit()
-//        }
-//        mainFragment.view?.setOnClickListener {
-//            Log.i(TAG, "mainFragment on click")
-//            fragmentManager!!.beginTransaction().hide(this).commit()
-//        }
-//        getRowsSupportFragment().view?.setOnClickListener {
-//            Log.i(TAG, "getRowsSupportFragment on click")
-//            fragmentManager!!.beginTransaction().hide(this).commit()
-//        }
-//
-//
-//        return rootView
-//    }
-
-    override fun onStart() {
-        Log.i(TAG, "onStart")
-        super.onStart()
-    }
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        activity?.let { YSP.init(it) }
+        activity?.let { request.initYSP(it) }
+
+        sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
 
         loadRows()
 
         setupEventListeners()
 
-        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+        mUpdateProgramRunnable = UpdateProgramRunnable()
+        handler.post(mUpdateProgramRunnable)
+
+        tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
             tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
                 if (tvViewModel.errInfo.value != null
-                    && tvViewModel.getTV().id == itemPosition
+                    && tvViewModel.id.value == itemPosition
                 ) {
                     Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
                 }
@@ -89,21 +75,21 @@ class MainFragment : BrowseSupportFragment() {
 
                 // not first time && channel not change
                 if (tvViewModel.ready.value != null
-                    && tvViewModel.getTV().id == itemPosition
+                    && tvViewModel.id.value == itemPosition
                     && check(tvViewModel)
                 ) {
-                    Log.i(TAG, "ready ${tvViewModel.getTV().title}")
+                    Log.i(TAG, "ready ${tvViewModel.title.value}")
                     (activity as? MainActivity)?.play(tvViewModel)
                 }
             }
             tvViewModel.change.observe(viewLifecycleOwner) { _ ->
                 if (tvViewModel.change.value != null) {
-                    val title = tvViewModel.getTV().title
+                    val title = tvViewModel.title.value
                     Log.i(TAG, "switch $title")
-                    if (tvViewModel.getTV().pid != "") {
+                    if (tvViewModel.pid.value != "") {
-                        Log.i(TAG, "request $title")
+                        Log.i(TAG, "request $title ${tvViewModel.pid.value}")
                         lifecycleScope.launch(Dispatchers.IO) {
-                            tvViewModel.let { Request.fetchData(it) }
+                            tvViewModel.let { request.fetchData(it) }
                         }
                         (activity as? MainActivity)?.showInfoFragment(tvViewModel)
                         setSelectedPosition(
@@ -114,6 +100,7 @@ class MainFragment : BrowseSupportFragment() {
                         if (check(tvViewModel)) {
                             (activity as? MainActivity)?.play(tvViewModel)
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+
                             setSelectedPosition(
                                 tvViewModel.getRowPosition(), true,
                                 SelectItemViewHolderTask(tvViewModel.getItemPosition())
@@ -124,7 +111,59 @@ class MainFragment : BrowseSupportFragment() {
             }
         }
 
-        (activity as MainActivity).fragmentReady()
+        fragmentReady()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        handler.removeCallbacks(mUpdateProgramRunnable)
+        with(sharedPref!!.edit()) {
+            putInt("position", itemPosition)
+            apply()
+        }
+    }
+
+    fun updateProgram(tvViewModel: TVViewModel) {
+        val timestamp = getDateTimestamp()
+        if (timestamp - tvViewModel.programUpdateTime > 60) {
+            if (tvViewModel.program.value!!.isEmpty()) {
+                tvViewModel.programUpdateTime = timestamp
+                request.fetchProgram(tvViewModel)
+            } else {
+                if (timestamp - tvViewModel.program.value!!.last().et < 600) {
+                    tvViewModel.programUpdateTime = timestamp
+                    request.fetchProgram(tvViewModel)
+                }
+            }
+        }
+    }
+
+    inner class UpdateProgramRunnable : Runnable {
+        override fun run() {
+            tvListViewModel.getTVListViewModel().value?.filter { it.programId.value != null }
+                ?.forEach { tvViewModel ->
+                    updateProgram(
+                        tvViewModel
+                    )
+                }
+            handler.postDelayed(this, 60000)
+        }
+    }
+
+    fun check(tvViewModel: TVViewModel): Boolean {
+        val title = tvViewModel.title.value
+        val videoUrl = tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
+        if (videoUrl == null || videoUrl == "") {
+            Log.e(TAG, "$title videoUrl is empty")
+            return false
+        }
+
+        if (videoUrl == lastVideoUrl) {
+            Log.e(TAG, "$title videoUrl is duplication")
+            return false
+        }
+
+        return true
     }
 
     fun toLastPosition() {
@@ -147,7 +186,7 @@ class MainFragment : BrowseSupportFragment() {
     private fun loadRows() {
         rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
 
-        val cardPresenter = CardPresenter(context!!)
+        val cardPresenter = CardPresenter(viewLifecycleOwner)
 
         var idx: Long = 0
         for ((k, v) in TVList.list) {
@@ -167,13 +206,51 @@ class MainFragment : BrowseSupportFragment() {
 
         adapter = rowsAdapter
 
-        itemPosition = SP.itemPosition
+        itemPosition = sharedPref?.getInt("position", 0)!!
         if (itemPosition >= tvListViewModel.size()) {
             itemPosition = 0
         }
         tvListViewModel.setItemPosition(itemPosition)
     }
 
+    fun fragmentReady() {
+        ready++
+        Log.i(TAG, "ready $ready")
+        if (ready == 3) {
+//            request.fetchPage()
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
+
+            (activity as? MainActivity)?.switchMainFragment()
+        }
+    }
+
+    fun prev() {
+        view?.post {
+            itemPosition--
+            if (itemPosition == -1) {
+                itemPosition = tvListViewModel.size() - 1
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
+        }
+    }
+
+    fun next() {
+        view?.post {
+            itemPosition++
+            if (itemPosition == tvListViewModel.size()) {
+                itemPosition = 0
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
+        }
+    }
+
     fun prevSource() {
         view?.post {
             val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
@@ -217,10 +294,12 @@ class MainFragment : BrowseSupportFragment() {
             row: Row
         ) {
             if (item is TVViewModel) {
-                if (itemPosition != item.getTV().id) {
+                if (itemPosition != item.id.value!!) {
-                    itemPosition = item.getTV().id
+                    itemPosition = item.id.value!!
                     tvListViewModel.setItemPosition(itemPosition)
-                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
+
+                    val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+                    tvViewModel?.changed()
                 }
                 (activity as? MainActivity)?.switchMainFragment()
             }
@@ -233,97 +312,18 @@ class MainFragment : BrowseSupportFragment() {
             rowViewHolder: RowPresenter.ViewHolder, row: Row
         ) {
             if (item is TVViewModel) {
-                tvListViewModel.setItemPositionCurrent(item.getTV().id)
+                tvListViewModel.setItemPositionCurrent(item.id.value!!)
-                (activity as MainActivity).mainActive()
+                (activity as MainActivity).keepRunnable()
             }
         }
     }
 
-    fun check(tvViewModel: TVViewModel): Boolean {
-        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")
-            return false
-        }
-
-        if (videoUrl == lastVideoUrl) {
-            Log.e(TAG, "$title videoUrl is duplication")
-            return false
-        }
-
-        return true
-    }
-
-    fun fragmentReady() {
-        tvListViewModel.getTVViewModel(itemPosition)?.changed()
-
-        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-            updateEPG(tvViewModel)
-        }
-    }
-
-    fun play(itemPosition: Int) {
-        view?.post {
-            if (itemPosition > -1 && itemPosition < tvListViewModel.size()) {
-                this.itemPosition = itemPosition
-                tvListViewModel.setItemPosition(itemPosition)
-                tvListViewModel.getTVViewModel(itemPosition)?.changed()
-            } else {
-                Toast.makeText(context, "频道不存在", Toast.LENGTH_SHORT).show()
-            }
-        }
-    }
-
-    fun prev() {
-        view?.post {
-            itemPosition--
-            if (itemPosition == -1) {
-                itemPosition = tvListViewModel.size() - 1
-            }
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-    }
-
-    fun next() {
-        view?.post {
-            itemPosition++
-            if (itemPosition == tvListViewModel.size()) {
-                itemPosition = 0
-            }
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-    }
-
-    private fun updateEPG(tvViewModel: TVViewModel) {
-        if (tvViewModel.getTV().channel == "港澳台") {
-            Request.fetchFEPG(tvViewModel)
-        } else {
-            Request.fetchYEPG(tvViewModel)
-        }
-    }
-
     override fun onResume() {
-        Log.i(TAG, "onResume")
         super.onResume()
-    }
+        view!!.requestFocus()
-
-    override fun onStop() {
-        Log.i(TAG, "onStop")
-        super.onStop()
-        SP.itemPosition = itemPosition
-        Log.i(TAG, "$POSITION $itemPosition saved")
-    }
-
-    override fun onDestroy() {
-        Log.i(TAG, "onDestroy")
-        super.onDestroy()
     }
 
     companion object {
         private const val TAG = "MainFragment"
-        private const val POSITION = "position"
     }
 }

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

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

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

@@ -0,0 +1,49 @@
+package com.lizongying.mytv
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import com.lizongying.mytv.databinding.DialogBinding
+
+
+class MyDialogFragment(private val versionName: String, private val channelReversal: Boolean) :
+    DialogFragment() {
+
+    private var _binding: DialogBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = DialogBinding.inflate(inflater, container, false)
+        _binding?.version?.text =
+            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+
+        val switchView = _binding?.switchView
+        switchView?.isChecked = channelReversal
+        switchView?.setOnCheckedChangeListener { _, isChecked ->
+            (activity as MainActivity).saveChannelReversal(isChecked)
+        }
+
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        const val TAG = "MyDialogFragment"
+    }
+}
+

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

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

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

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

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

@@ -1,21 +1,15 @@
 package com.lizongying.mytv
 
+import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
 import com.lizongying.mytv.Utils.getDateFormat
 import com.lizongying.mytv.api.ApiClient
-import com.lizongying.mytv.api.Auth
-import com.lizongying.mytv.api.AuthRequest
-import com.lizongying.mytv.api.FAuth
-import com.lizongying.mytv.api.FAuthService
-import com.lizongying.mytv.api.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
@@ -24,178 +18,94 @@ import com.lizongying.mytv.api.YSPTokenService
 import com.lizongying.mytv.models.TVViewModel
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.oms.common.proto.pageModel
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.epgProgramModel
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
-import kotlin.math.max
 
 
-object Request {
+class 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 lateinit var myRunnable: MyRunnable
-    private var tokenRunnable: TokenRunnable = TokenRunnable()
 
-    private val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
+    private var mapping = mapOf(
-    private val input =
+        "CCTV4K" to "CCTV4K 超高清",
-        """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()
+        "CCTV1" to "CCTV1 综合",
+        "CCTV2" to "CCTV2 财经",
+        "CCTV4" to "CCTV4 中文国际",
+        "CCTV5" to "CCTV5 体育",
+        "CCTV5+" to "CCTV5+ 体育赛事",
+        "CCTV7" to "CCTV7 国防军事",
+        "CCTV9" to "CCTV9 记录",
+        "CCTV10" to "CCTV10 科教",
+        "CCTV11" to "CCTV11 戏曲",
+        "CCTV12" to "CCTV12 社会与法",
+        "CCTV13" to "CCTV13 新闻",
+        "CCTV14" to "CCTV14 少儿",
+        "CCTV15" to "CCTV15 音乐",
+        "CCTV16-HD" to "CCTV16 奥林匹克",
+        "CCTV17" to "CCTV17 农业农村",
+        "CGTN" to "CGTN",
+        "CGTN法语频道" to "CGTN 法语频道",
+        "CGTN俄语频道" to "CGTN 俄语频道",
+        "CGTN阿拉伯语频道" to "CGTN 阿拉伯语频道",
+        "CGTN西班牙语频道" to "CGTN 西班牙语频道",
+        "CGTN外语纪录频道" to "CGTN 纪录频道",
+        "东方卫视" to "东方卫视",
+        "湖南卫视" to "湖南卫视",
+        "湖北卫视" to "湖北卫视",
+        "辽宁卫视" to "辽宁卫视",
+        "江苏卫视" to "江苏卫视",
+        "江西卫视" to "江西卫视",
+        "山东卫视" to "山东卫视",
+        "广东卫视" to "广东卫视",
+        "广西卫视" to "广西卫视",
+        "重庆卫视" to "重庆卫视",
+        "河南卫视" to "河南卫视",
+        "河北卫视" to "河北卫视",
+        "贵州卫视" to "贵州卫视",
+        "北京卫视" to "北京卫视",
+        "黑龙江卫视" to "黑龙江卫视",
+        "浙江卫视" to "浙江卫视",
+        "安徽卫视" to "安徽卫视",
+        "深圳卫视" to "深圳卫视",
+        "四川卫视" to "四川卫视",
+        "福建东南卫视" to "东南卫视",
+        "海南卫视" to "海南卫视",
+    )
 
-    private var listener: RequestListener? = null
+    fun initYSP(context: Context) {
-
+        ysp = YSP(context)
-    private var initRetryTimes = 0
-    private var initRetryMaxTimes = 0
-
-    private var openid = "vu0-8lgGV2LW9QjDeucB9H12d_6HQWmTFgqCWg5o-VBQN4"
-
-    fun onCreate() {
-        Log.i(TAG, "onCreate")
-        fetchInfoV2()
     }
 
-    fun onDestroy() {
+    var call: Call<LiveInfo>? = null
-        Log.i(TAG, "onDestroy")
-        handler.removeCallbacks(tokenRunnable)
-    }
 
-    private var call: Call<LiveInfo>? = null
+    fun fetchVideo(tvModel: TVViewModel, cookie: String) {
-    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()
+        if (::myRunnable.isInitialized) {
-        callInfo?.cancel()
+            handler.removeCallbacks(myRunnable)
-        callFAuth?.cancel()
-        callPage?.cancel()
-    }
-
-    private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
-        cancelCall()
-
-        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) {
-                    val liveInfo = response.body()
-
-                    if (liveInfo?.data?.token != null) {
-                        Log.i(TAG, "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.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
-                                    if (!tvModel.getTV().mustToken) {
-                                        fetchAuth(tvModel, cookie)
-                                    }
-                                } else {
-                                    tvModel.needGetToken = true
-                                    fetchAuth(tvModel)
-                                }
-                            } else {
-                                fetchAuth(tvModel, cookie)
-                            }
-                        }
-                    }
-                } else {
-                    Log.e(TAG, "$title auth status error")
-                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                        tvModel.retryTimes++
-                        if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
-                                if (!tvModel.getTV().mustToken) {
-                                    fetchAuth(tvModel, cookie)
-                                }
-                            } else {
-                                tvModel.needGetToken = true
-                                fetchAuth(tvModel)
-                            }
-                        } else {
-                            fetchAuth(tvModel, cookie)
-                        }
-                    }
-                }
-            }
-
-            override fun onFailure(call: Call<Auth>, t: Throwable) {
-                Log.e(TAG, "$title auth request error $t")
-                if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                    tvModel.retryTimes++
-                    if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
-                            if (!tvModel.getTV().mustToken) {
-                                fetchAuth(tvModel, cookie)
-                            }
-                        } else {
-                            tvModel.needGetToken = true
-                            fetchAuth(tvModel)
-                        }
-                    } else {
-                        fetchAuth(tvModel, cookie)
-                    }
-                }
-            }
-        })
-    }
-
-    private fun fetchVideo(tvModel: TVViewModel, cookie: String) {
-        cancelCall()
-
-        if (::btraceRunnable.isInitialized) {
-            handler.removeCallbacks(btraceRunnable)
         }
 
-        val title = tvModel.getTV().title
+        val title = tvModel.title.value
 
         tvModel.seq = 0
-        val data = YSP.switch(tvModel)
+        val data = ysp?.switch(tvModel)
-        val request = LiveInfoRequest(data)
+        val request = data?.let { LiveInfoRequest(it) }
-        call = request.let {
+        call = request?.let { yspApiService.getLiveInfo("guid=${ysp?.getGuid()}; $cookie", it) }
-            if (token == "") {
-                yspApiService.getLiveInfoV2(
-                    "guid=${YSP.getGuid()}; $cookie",
-                    it,
-                )
-            } else {
-                yspApiService.getLiveInfo(
-                    "guid=${YSP.getGuid()}; $cookie",
-                    YSP.token,
-                    it
-                )
-            }
-        }
 
         call?.enqueue(object : Callback<LiveInfo> {
             override fun onResponse(call: Call<LiveInfo>, response: Response<LiveInfo>) {
                 if (response.isSuccessful) {
                     val liveInfo = response.body()
-
                     if (liveInfo?.data?.playurl != null) {
                         val chanll = liveInfo.data.chanll
                         val decodedBytes = Base64.decode(
@@ -203,6 +113,7 @@ object Request {
                             Base64.DEFAULT
                         )
                         val decodedString = String(decodedBytes)
+                        val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
                         val matchResult = regex.find(decodedString)
                         if (matchResult != null) {
                             val (key, iv) = matchResult.destructured
@@ -211,32 +122,18 @@ object Request {
                             val url = liveInfo.data.playurl + "&revoi=" + encryptTripleDES(
                                 keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
                                 ivBytes
-                            ).uppercase() + liveInfo.data.extended_param
+                            ).uppercase()
-                            Log.d(TAG, "$title url $url")
+                            Log.i(TAG, "$title url $url")
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()
                             tvModel.retryTimes = 0
-                            btraceRunnable = BtraceRunnable(tvModel)
+                            myRunnable = MyRunnable(tvModel)
-                            handler.post(btraceRunnable)
+                            handler.post(myRunnable)
                         } else {
                             Log.e(TAG, "$title key error")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                if (tvModel.getTV().needToken) {
+                                fetchVideo(tvModel, cookie)
-                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
-                                        if (!tvModel.getTV().mustToken) {
-                                            fetchVideo(tvModel, cookie)
-//                                            fetchAuth(tvModel, cookie)
-                                        }
-                                    } else {
-                                        tvModel.needGetToken = true
-                                        fetchVideo(tvModel)
-//                                        fetchAuth(tvModel)
-                                    }
-                                } else {
-                                    fetchVideo(tvModel, cookie)
-//                                    fetchAuth(tvModel, cookie)
-                                }
                             }
                         }
                     } else {
@@ -247,376 +144,68 @@ object Request {
                             Log.e(TAG, "$title url error $request $liveInfo")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                if (tvModel.getTV().needToken) {
+                                fetchVideo(tvModel, cookie)
-                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
-                                        if (!tvModel.getTV().mustToken) {
-                                            fetchVideo(tvModel, cookie)
-//                                            fetchAuth(tvModel, cookie)
-                                        }
-                                    } else {
-                                        tvModel.needGetToken = true
-                                        fetchVideo(tvModel)
-//                                        fetchAuth(tvModel)
-                                    }
-                                } else {
-                                    fetchVideo(tvModel, cookie)
-//                                    fetchAuth(tvModel, cookie)
-                                }
                             }
                         }
                     }
                 } else {
-                    Log.e(TAG, "$title status error $data")
+                    Log.e(TAG, "$title status error")
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
-                        if (tvModel.getTV().needToken) {
+                        fetchVideo(tvModel, cookie)
-                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
-                                if (!tvModel.getTV().mustToken) {
-                                    fetchVideo(tvModel, cookie)
-//                                    fetchAuth(tvModel, cookie)
-                                }
-                            } else {
-                                tvModel.needGetToken = true
-                                fetchVideo(tvModel)
-//                                fetchAuth(tvModel)
-                            }
-                        } else {
-                            fetchVideo(tvModel, cookie)
-//                            fetchAuth(tvModel, cookie)
-                        }
                     }
                 }
             }
 
             override fun onFailure(call: Call<LiveInfo>, t: Throwable) {
-                Log.e(TAG, "$title fetchVideo request error $t")
+                Log.e(TAG, "$title request error")
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
-                    if (tvModel.getTV().needToken) {
+                    fetchVideo(tvModel, cookie)
-                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
-                            if (!tvModel.getTV().mustToken) {
-                                fetchVideo(tvModel, cookie)
-                            }
-                        } else {
-                            tvModel.needGetToken = true
-                            fetchVideo(tvModel)
-                        }
-                    } else {
-                        fetchVideo(tvModel, cookie)
-                    }
                 }
             }
         })
     }
 
-    private fun fetchAuth(tvModel: TVViewModel) {
+    fun fetchVideo(tvModel: TVViewModel) {
-        cancelCall()
+        yspTokenService.getInfo()
-        if (tvModel.needGetToken) {
+            .enqueue(object : Callback<Info> {
-            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) {
+                    if (response.isSuccessful) {
-                        token = response.body()?.data?.token!!
+                        val 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"
+                            "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                        fetchAuth(tvModel, cookie)
-                    } else if (response.code() == 304) {
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
-                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
                         fetchVideo(tvModel, cookie)
                     } else {
                         Log.e(TAG, "info status error")
-                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                            tvModel.tokenYSPRetryTimes++
+                            tvModel.retryTimes++
-                            fetchAuth(tvModel)
+                            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)
-                            }
                         }
                     }
                 }
 
                 override fun onFailure(call: Call<Info>, t: Throwable) {
                     Log.e(TAG, "info request error $t")
-                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                        tvModel.tokenYSPRetryTimes++
+                        tvModel.retryTimes++
                         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=$openid; vusession=$token"
-            fetchAuth(tvModel, cookie)
-        }
     }
 
-    private fun fetchVideo(tvModel: TVViewModel) {
+    fun fetchData(tvModel: TVViewModel) {
-        cancelCall()
+        if (tvModel.needToken) {
-        Log.d(TAG, "fetchVideo")
+            fetchVideo(tvModel)
-        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) {
-                                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.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 =
+            val cookie = "vplatform=109"
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
             fetchVideo(tvModel, cookie)
         }
     }
 
-    private fun fetchFAuth(tvModel: TVViewModel) {
+    inner class MyRunnable(private val tvModel: TVViewModel) : Runnable {
-        cancelCall()
-
-        val title = tvModel.getTV().title
-
-        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.tokenFHRetryTimes = 0
-                } else {
-                    Log.e(TAG, "auth status error ${response.code()}")
-                    if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
-                        tvModel.tokenFHRetryTimes++
-                        fetchFAuth(tvModel)
-                    }
-                }
-            }
-
-            override fun onFailure(call: Call<FAuth>, t: Throwable) {
-                Log.e(TAG, "auth request error $t")
-                if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
-                    tvModel.tokenFHRetryTimes++
-                    fetchFAuth(tvModel)
-                }
-            }
-        })
-    }
-
-    fun fetchData(tvModel: TVViewModel) {
-        if (tvModel.getTV().channel == "港澳台") {
-            fetchFAuth(tvModel)
-            return
-        }
-
-        if (tvModel.getTV().needToken) {
-            if (token == "") {
-                tvModel.needGetToken = true
-            }
-            if (needAuth) {
-                fetchAuth(tvModel)
-            } else {
-                fetchVideo(tvModel)
-            }
-        } else {
-            val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; updateProtocol=1; deviceModel=120"
-            if (needAuth) {
-                fetchAuth(tvModel, cookie)
-            } else {
-                fetchVideo(tvModel, cookie)
-            }
-        }
-    }
-
-    class TokenRunnable : Runnable {
-        override fun run() {
-//            fetchToken()
-        }
-    }
-
-    private fun fetchInfoV2() {
-        yspTokenService.getInfoV2()
-            .enqueue(object : Callback<InfoV2> {
-                override fun onResponse(call: Call<InfoV2>, response: Response<InfoV2>) {
-                    if (response.isSuccessful) {
-                        val o = response.body()?.o
-                        val t = response.body()?.t
-                        val f = response.body()?.f
-                        val e = response.body()?.e
-                        val c = response.body()?.c
-                        if (!o.isNullOrEmpty()) {
-                            openid = o
-                        }
-                        if (!t.isNullOrEmpty()) {
-                            token = t
-                            Log.i(TAG, "token success $token")
-                            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<InfoV2>, t: Throwable) {
-                    Log.e(TAG, "token request error $t")
-                    handler.postDelayed(
-                        tokenRunnable,
-                        30 * 60 * 1000
-                    )
-
-                    if (initRetryTimes < initRetryMaxTimes) {
-                        initRetryTimes++
-                        fetchInfoV2()
-                    } else {
-                        listener?.onRequestFinished("网络错误")
-                    }
-                }
-            })
-    }
-
-    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)
@@ -624,13 +213,13 @@ object Request {
     }
 
     fun fetchBtrace(tvModel: TVViewModel) {
-        val title = tvModel.getTV().title
+        val title = tvModel.title.value
 
-        val guid = YSP.getGuid()
+        val guid = ysp?.getGuid()!!
-        val pid = tvModel.getTV().pid
+        val pid = tvModel.pid.value!!
-        val sid = tvModel.getTV().sid
+        val sid = tvModel.sid.value!!
         yspBtraceService.kvcollect(
-            c_timestamp = YSP.generateGuid(),
+            c_timestamp = ysp?.generateGuid()!!,
             guid = guid,
             c_guid = guid,
             prog = sid,
@@ -638,7 +227,7 @@ object 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(),
         )
@@ -659,28 +248,36 @@ object Request {
     }
 
     fun fetchPage() {
-        callPage = yspProtoService.getPage()
+        yspProtoService.getPage().enqueue(object : Callback<pageModel.Response> {
-        callPage?.enqueue(object : Callback<pageModel.Response> {
             override fun onResponse(
                 call: Call<pageModel.Response>,
                 response: Response<pageModel.Response>
             ) {
                 if (response.isSuccessful) {
                     val body = response.body()
+
                     if (body?.data?.feedModuleListCount == 1) {
                         for (item in body.data?.feedModuleListList!![0]?.dataTvChannelListList!!) {
-                            Log.d(
+                            if (item.isVip && !item.isLimitedFree) {
+                                continue
+                            }
+                            Log.i(
                                 TAG,
                                 "${item.channelName},${item.pid},${item.streamId}"
                             )
-
+                            var channelType = "央视频道"
-                            for ((_, v) in TVList.list) {
+                            if (item?.channelType === "weishi") {
-                                for (v2 in v) {
+                                channelType = "地方频道"
-                                    if (v2.title == item.channelName || v2.alias == item.channelName) {
+                            }
-                                        v2.pid = item.pid
+                            if (!mapping.containsKey(item.channelName)) {
-                                        v2.sid = item.streamId
+                                continue
-                                    }
+                            }
-                                }
+                            val tv =
+                                TVList.list[channelType]?.find { it.title == mapping[item.channelName] }
+                            if (tv != null) {
+                                tv.logo = item.tvLogo
+                                tv.pid = item.pid
+                                tv.sid = item.streamId
                             }
                         }
                     }
@@ -693,9 +290,9 @@ object Request {
         })
     }
 
-    fun fetchYEPG(tvViewModel: TVViewModel) {
+    fun fetchProgram(tvViewModel: TVViewModel) {
-        val title = tvViewModel.getTV().title
+        val title = tvViewModel.title.value
-        yspProtoService.getProgram(tvViewModel.getTV().programId, getDateFormat("yyyyMMdd"))
+        yspProtoService.getProgram(tvViewModel.programId.value!!, getDateFormat("yyyyMMdd"))
             .enqueue(object : Callback<epgProgramModel.Response> {
                 override fun onResponse(
                     call: Call<epgProgramModel.Response>,
@@ -704,11 +301,9 @@ object Request {
                     if (response.isSuccessful) {
                         val program = response.body()
                         if (program != null) {
-                            tvViewModel.addYEPG(program.dataListList)
+                            tvViewModel.addProgram(program.dataListList)
-                            Log.d(TAG, "$title program ${program.dataListList.size}")
+                            Log.i(TAG, "$title program ${program.dataListList.size}")
                         }
-                    } else {
-                        Log.w(TAG, "$title program error")
                     }
                 }
 
@@ -718,49 +313,23 @@ object 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 {
+        val plaintext =
+            """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,AppleM1Pro,OpenGL4.1)"}"""
         return try {
             val keySpec = SecretKeySpec(key, "DESede")
             val ivSpec = IvParameterSpec(iv)
             val cipher = Cipher.getInstance("DESede/CBC/PKCS5Padding")
             cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec)
-            return cipher.doFinal(input).let { it -> it.joinToString("") { "%02x".format(it) } }
+            val encryptedBytes = cipher.doFinal(plaintext.toByteArray())
+            return encryptedBytes.let { it -> it.joinToString("") { "%02x".format(it) } }
         } catch (e: Exception) {
             e.printStackTrace()
             ""
         }
     }
 
-    interface RequestListener {
+    companion object {
-        fun onRequestFinished(message: String?)
+        private const val TAG = "Request"
-    }
-
-    fun setRequestListener(listener: RequestListener) {
-        this.listener = listener
     }
 }

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

@@ -1,53 +0,0 @@
-package com.lizongying.mytv
-
-import android.content.Context
-import android.content.SharedPreferences
-
-object SP {
-    // Name of the sp file TODO Should use a meaningful name and do migrations
-    private const val SP_FILE_NAME = "MainActivity"
-
-    // If Change channel with up and down in reversed order or not
-    private const val KEY_CHANNEL_REVERSAL = "channel_reversal"
-
-    // If use channel num to select channel or not
-    private const val KEY_CHANNEL_NUM = "channel_num"
-
-    // If start app on device boot or not
-    private const val KEY_BOOT_STARTUP = "boot_startup"
-
-    // Position in list of the selected channel item
-    private const val KEY_POSITION = "position"
-
-    // guid
-    private const val KEY_GUID = "guid"
-
-    private lateinit var sp: SharedPreferences
-
-    /**
-     * The method must be invoked as early as possible(At least before using the keys)
-     */
-    fun init(context: Context) {
-        sp = context.getSharedPreferences(SP_FILE_NAME, Context.MODE_PRIVATE)
-    }
-
-    var channelReversal: Boolean
-        get() = sp.getBoolean(KEY_CHANNEL_REVERSAL, false)
-        set(value) = sp.edit().putBoolean(KEY_CHANNEL_REVERSAL, value).apply()
-
-    var channelNum: Boolean
-        get() = sp.getBoolean(KEY_CHANNEL_NUM, true)
-        set(value) = sp.edit().putBoolean(KEY_CHANNEL_NUM, value).apply()
-
-    var bootStartup: Boolean
-        get() = sp.getBoolean(KEY_BOOT_STARTUP, false)
-        set(value) = sp.edit().putBoolean(KEY_BOOT_STARTUP, 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, "") ?: ""
-        set(value) = sp.edit().putString(KEY_GUID, value).apply()
-}

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

@@ -1,94 +0,0 @@
-package com.lizongying.mytv
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import com.lizongying.mytv.databinding.SettingBinding
-
-
-class SettingFragment : DialogFragment() {
-
-    private var _binding: SettingBinding? = null
-    private val binding get() = _binding!!
-
-    private lateinit var updateManager: UpdateManager
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        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"
-
-        binding.switchChannelReversal.run {
-            isChecked = SP.channelReversal
-            setOnCheckedChangeListener { _, isChecked ->
-                SP.channelReversal = isChecked
-                (activity as MainActivity).settingDelayHide()
-            }
-        }
-
-        binding.switchChannelNum.run {
-            isChecked = SP.channelNum
-            setOnCheckedChangeListener { _, isChecked ->
-                SP.channelNum = isChecked
-                (activity as MainActivity).settingDelayHide()
-            }
-        }
-
-        binding.switchBootStartup.run {
-            isChecked = SP.bootStartup
-            setOnCheckedChangeListener { _, isChecked ->
-                SP.bootStartup = 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) {
-        if (_binding != null) {
-            binding.versionName.text = versionName
-        }
-    }
-
-    internal class OnClickListenerCheckVersion(
-        private val mainActivity: MainActivity,
-        private val updateManager: UpdateManager
-    ) :
-        View.OnClickListener {
-        override fun onClick(view: View?) {
-            mainActivity.settingDelayHide()
-            updateManager.checkAndUpdate()
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        const val TAG = "SettingFragment"
-    }
-}
-

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

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

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

@@ -1,224 +0,0 @@
-package com.lizongying.mytv
-
-import android.app.Activity
-import android.app.DownloadManager
-import android.app.DownloadManager.Request
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.database.Cursor
-import android.net.Uri
-import android.os.Build
-import android.os.Environment
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-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
-import kotlinx.coroutines.launch
-import java.io.File
-
-
-class UpdateManager(
-    private var context: Context,
-    private var settingFragment: SettingFragment,
-    private var versionCode: Long
-) :
-    ConfirmationFragment.ConfirmationListener {
-
-    private var myRequest = MyRequest()
-    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()
-                Log.i(TAG, "versionCode $versionCode ${release?.c}")
-                if (release?.c != null) {
-                    text = if (release?.c!! > versionCode) {
-                        "最新版本：${release?.n}\n${release?.d ?: ""}"
-                    } else {
-                        "已是最新版本，不需要更新"
-                    }
-                }
-            } catch (e: Exception) {
-                Log.e(TAG, "Error occurred: ${e.message}", e)
-            }
-            updateUI(text)
-        }
-    }
-
-    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: 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.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)
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context.registerReceiver(
-                downloadReceiver,
-                IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
-                Context.RECEIVER_NOT_EXPORTED,
-            )
-        } else {
-            context.registerReceiver(
-                downloadReceiver,
-                IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-            )
-        }
-
-        getDownloadProgress(context, downloadReference) { progress ->
-            println("Download progress: $progress%")
-        }
-    }
-
-    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
-
-        handler.post(object : Runnable {
-            override fun run() {
-                Log.i(TAG, "search")
-                val query = DownloadManager.Query().setFilterById(downloadId)
-                val cursor: Cursor = downloadManager.query(query)
-                cursor.use {
-                    if (it.moveToFirst()) {
-                        val bytesDownloadedIndex =
-                            it.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
-                        val bytesTotalIndex =
-                            it.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
-
-                        // 检查列名是否存在
-                        if (bytesDownloadedIndex != -1 && bytesTotalIndex != -1) {
-                            val bytesDownloaded = it.getInt(bytesDownloadedIndex)
-                            val bytesTotal = it.getInt(bytesTotalIndex)
-
-                            if (bytesTotal != -1) {
-                                val progress = (bytesDownloaded * 100L / bytesTotal).toInt()
-                                progressListener(progress)
-                                if (progress == 100) {
-                                    return
-                                }
-                            }
-                        }
-                    }
-                }
-
-//                handler.postDelayed(this, intervalMillis)
-            }
-        })
-    }
-
-    private class DownloadReceiver(
-        private val context: Context,
-        private val apkFileName: String,
-        private val downloadReference: Long
-    ) : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            val reference = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
-            Log.i(TAG, "reference $reference")
-            val progress = intent.getIntExtra("progress", 0)
-            Log.i(TAG, "progress $progress")
-
-            // 检查是否是我们发起的下载
-            if (reference == downloadReference) {
-                // 下载完成，触发安装
-                installNewVersion()
-            }
-        }
-
-        private fun installNewVersion() {
-            val installIntent = Intent(Intent.ACTION_VIEW)
-            val apkUri = Uri.fromFile(
-                File(
-                    Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
-                    apkFileName
-                )
-            )
-            installIntent.setDataAndType(apkUri, "application/vnd.android.package-archive")
-            installIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            context.startActivity(installIntent)
-        }
-    }
-
-    companion object {
-        private const val TAG = "UpdateManager"
-    }
-
-    override fun onConfirm() {
-        Log.i(TAG, "onConfirm $release")
-        release?.let { startDownload(it) }
-    }
-
-    override fun onCancel() {
-    }
-
-    fun destroy() {
-        if (downloadReceiver != null) {
-            context.unregisterReceiver(downloadReceiver)
-            Log.i(TAG, "destroy downloadReceiver")
-        }
-    }
-}

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

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

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

@@ -1,16 +1,10 @@
 package com.lizongying.mytv.api
 
 
-import android.os.Build
-import android.util.Log
-import okhttp3.ConnectionSpec
 import okhttp3.OkHttpClient
-import okhttp3.TlsVersion
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.protobuf.ProtoConverterFactory
-import java.net.InetSocketAddress
-import java.net.Proxy
 import javax.net.ssl.SSLContext
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
@@ -21,7 +15,6 @@ class ApiClient {
     private val myUrl = "https://lyrics.run/"
     private val protoUrl = "https://capi.yangshipin.cn/"
     private val traceUrl = "https://btrace.yangshipin.cn/"
-    private val fUrl = "https://m.fengshows.com/"
 
     private var okHttpClient = getUnsafeOkHttpClient()
 
@@ -41,14 +34,6 @@ class ApiClient {
             .build().create(YSPTokenService::class.java)
     }
 
-    val releaseService: ReleaseService by lazy {
-        Retrofit.Builder()
-            .baseUrl(myUrl)
-            .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build().create(ReleaseService::class.java)
-    }
-
     val yspProtoService: YSPProtoService by lazy {
         Retrofit.Builder()
             .baseUrl(protoUrl)
@@ -65,44 +50,6 @@ class ApiClient {
             .build().create(YSPBtraceService::class.java)
     }
 
-    val fAuthService: FAuthService by lazy {
-        Retrofit.Builder()
-            .baseUrl(fUrl)
-            .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build().create(FAuthService::class.java)
-    }
-
-    private fun 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(
@@ -128,15 +75,11 @@ class ApiClient {
             val sslContext = SSLContext.getInstance("SSL")
             sslContext.init(null, trustAllCerts, java.security.SecureRandom())
 
-            val proxy = Proxy(Proxy.Type.HTTP, InetSocketAddress("10.0.2.2", 8888))
+            return OkHttpClient.Builder()
-
-            val builder = OkHttpClient.Builder()
                 .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)
                 .hostnameVerifier { _, _ -> true }
-//                .proxy(proxy)
                 .dns(DnsCache())
-
+                .build()
-            return enableTls12OnPreLollipop(builder).build()
 
         } catch (e: Exception) {
             throw RuntimeException(e)

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

@@ -1,37 +0,0 @@
-package com.lizongying.mytv.api
-
-import android.util.Log
-import okhttp3.MediaType
-import okhttp3.RequestBody
-import okio.BufferedSink
-import java.io.IOException
-
-data class Auth(
-    val code: Int,
-    val msg: String,
-    val data: AuthData,
-)
-
-data class AuthData(
-    val token: String,
-)
-
-data class AuthRequest(
-    var data: String,
-) : RequestBody() {
-    override fun contentType(): MediaType? {
-        return MediaType.parse("application/x-www-form-urlencoded;charset=UTF-8")
-    }
-
-    override fun writeTo(sink: BufferedSink) {
-        try {
-            sink.writeUtf8(data)
-        } catch (e: IOException) {
-            Log.e(TAG, "$e")
-        }
-    }
-
-    companion object {
-        private const val TAG = "AuthRequest"
-    }
-}

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

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

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

@@ -1,23 +0,0 @@
-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>>
-}

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

@@ -1,7 +0,0 @@
-package com.lizongying.mytv.api
-
-
-data class FEPG(
-    val title: String,
-    val event_time: String,
-)

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

@@ -3,37 +3,9 @@ package com.lizongying.mytv.api
 data class Info(
     val code: Int?,
     val msg: String?,
-    val data: Data,
+    val data: InfoData,
-) {
-    data class Data(
-        val token: String,
-    )
-}
-
-data class Token(
-    val e: Int?,
-    val t: String?,
 )
 
-data class InfoV2(
+data class InfoData(
-    val o: String?,
+    val token: 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
-) {
-    data class Time(
-        val t: String
-    )
-}

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

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

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

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

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

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

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

@@ -1,18 +1,15 @@
 package com.lizongying.mytv.api
 
 import android.content.Context
-import android.util.Log
+import android.content.SharedPreferences
 import com.lizongying.mytv.Encryptor
 import com.lizongying.mytv.MainActivity
-import com.lizongying.mytv.SP
 import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.models.TVViewModel
 import kotlin.math.floor
 import kotlin.random.Random
 
-object YSP {
+class YSP(var context: Context) {
-    private const val TAG = "YSP"
-
     private var cnlid = ""
 
     private var livepid = ""
@@ -53,19 +50,23 @@ object YSP {
 
     private var signature = ""
 
-    private var appid = "ysp_pc"
+    private var encryptor: Encryptor? = null
-    var token = ""
+    private var sharedPref: SharedPreferences? = null
 
-    private var encryptor = Encryptor()
+    init {
+        if (context is MainActivity) {
+            encryptor = Encryptor()
+            encryptor!!.init(context)
+
+            sharedPref = (context as MainActivity).getPreferences(Context.MODE_PRIVATE)
+        }
 
-    fun init(context: Context) {
-        encryptor.init(context)
         guid = getGuid()
     }
 
     fun switch(tvModel: TVViewModel): String {
-        livepid = tvModel.getTV().pid
+        livepid = tvModel.pid.value!!
-        cnlid = tvModel.getTV().sid
+        cnlid = tvModel.sid.value!!
         defn = "fhd"
 
         randStr = getRand()
@@ -76,23 +77,15 @@ object YSP {
 
         timeStr = getTimeStr()
 
+//        guid = "lq3oqitm_1e15dnzgjnb"
+//        randStr = "BfcCPQp8Hq"
+//        timeStr = "1702166501"
+
         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"}"""
-    }
+//        return """{"cnlid":"2000203803","livepid":"600001801","stream":"2","guid":"lq1y36mb_ccfwmja9zan","cKey":"--01A9F5E89BB86A0C61F4025BEDE15309B6913A79FD1AF1EE7F5EC9C7605F377D1D2281488385C32DEB9E7D0DD3559CB700BD7AF44DD5C9DE0AE14D94B8214027B5D664C108AEE23532348DCC61B86F7C8FBB6CF14D588E6093A25E97DF6D66F4882AB28F17016472DD43D45EF076B7F505176A5E8DEDF2662E5F9AB12B69CB20BCE1579BE724091F3AF6826AE34B713906F3FE139C3783F80EECBD08416DC525E1","adjust":1,"sphttps":"1","platform":"5910204","cmd":"2","encryptVer":"8.1","dtype":"1","devid":"devid","otype":"ojson","appVer":"V1.0.0","app_version":"V1.0.0","rand_str":"IOS2soOw44","channel":"ysp_tx","defn":"fhd","signature":"6ca945f651817de8c6e6910457ceafd6"}"""
-
-    fun getAuthData(tvModel: TVViewModel): String {
-        livepid = tvModel.getTV().pid
-
-        randStr = getRand()
-
-        if (tvModel.retryTimes > 0) {
-            guid = newGuid()
-        }
-
-        signature = getAuthSignature()
-        return """pid=$livepid&guid=$guid&appid=$appid&rand_str=$randStr&signature=$signature"""
     }
 
     private fun getTimeStr(): String {
@@ -106,17 +99,23 @@ object YSP {
     }
 
     fun getGuid(): String {
-        var guid = SP.guid
+        var guid = sharedPref?.getString("guid", "")
-        if (guid.length < 18) {
+        if (guid == null || guid.length < 18) {
             guid = generateGuid()
-            SP.guid = guid
+            with(sharedPref!!.edit()) {
+                putString("guid", guid)
+                apply()
+            }
         }
         return guid
     }
 
     private fun newGuid(): String {
         guid = generateGuid()
-        SP.guid = guid
+        with(sharedPref!!.edit()) {
+            putString("guid", guid)
+            apply()
+        }
         return guid
     }
 
@@ -133,14 +132,12 @@ object YSP {
     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 {
+    companion object {
-        val e =
+        private const val TAG = "YSP"
-            "appid=${appid}&guid=${guid}&pid=${livepid}&rand_str=${randStr}".toByteArray()
-        val hashedData = encryptor.hash2(e) ?: return ""
-        return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
     }
 }

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

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

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

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

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

@@ -1,7 +0,0 @@
-package com.lizongying.mytv.models
-
-
-data class EPG(
-    val title: String,
-    val beginTime: Int,
-)

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

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

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

@@ -1,36 +1,47 @@
 package com.lizongying.mytv.models
 
+import android.net.Uri
 import android.util.Log
+import androidx.annotation.OptIn
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.media3.common.MediaItem
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.DefaultHttpDataSource
+import androidx.media3.exoplayer.hls.HlsMediaSource
 import com.lizongying.mytv.TV
-import com.lizongying.mytv.api.FEPG
+import com.lizongying.mytv.Utils.getDateTimestamp
 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() {
 
     private var rowPosition: Int = 0
     private var itemPosition: Int = 0
 
-    var retryTimes = 0
+    var retryTimes: Int = 0
-    var retryMaxTimes = 8
+    var retryMaxTimes: Int = 5
-    var tokenYSPRetryTimes = 0
+    var programUpdateTime: Long = 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 var _epg = MutableLiveData<MutableList<EPG>>()
+    private val _programId = MutableLiveData<String>()
-    val epg: LiveData<MutableList<EPG>>
+    val programId: LiveData<String>
-        get() = _epg
+        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 val _videoUrl = MutableLiveData<List<String>>()
     val videoUrl: LiveData<List<String>>
@@ -40,6 +51,18 @@ 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
@@ -48,8 +71,31 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val ready: LiveData<Boolean>
         get() = _ready
 
+    private var mMinimumLoadableRetryCount = 5
+
     var seq = 0
 
+    var needToken = false
+
+    private val channelsNeedToken = arrayOf(
+        "CCTV3 综艺",
+        "CCTV6 电影",
+        "CCTV8 电视剧",
+        "风云剧场",
+        "第一剧场",
+        "怀旧剧场",
+        "世界地理",
+        "风云音乐",
+        "兵器科技",
+        "风云足球",
+        "高尔夫网球",
+        "女性时尚",
+        "央视文化精品",
+        "央视台球",
+        "电视指南",
+        "卫生健康",
+    )
+
     fun addVideoUrl(url: String) {
         if (_videoUrl.value?.isNotEmpty() == true) {
             if (_videoUrl.value!!.last().contains("cctv.cn")) {
@@ -60,8 +106,9 @@ 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.videoUrl.lastIndex
+        _videoIndex.value = tv.videoIndex
     }
 
     fun firstSource() {
@@ -85,9 +132,24 @@ 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.videoUrl.lastIndex
+        _videoIndex.value = tv.videoIndex
+        _logo.value = tv.logo
+        _programId.value = tv.programId
+        _pid.value = tv.pid
+        _sid.value = tv.sid
+        _program.value = mutableListOf()
+
+        if (tv.title in channelsNeedToken) {
+            needToken = true
+        }
     }
 
     fun getRowPosition(): Int {
@@ -110,30 +172,66 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _errInfo.value = info
     }
 
+    fun update(t: TV) {
+        tv = t
+    }
+
     fun getTV(): TV {
         return tv
     }
 
-    fun addYEPG(p: MutableList<Program>) {
+    fun getProgramOne(): Program? {
-        _epg.value = p.map { EPG(it.name, it.st.toInt()) }.toMutableList()
+        val programNew =
-    }
+            (_program.value?.filter { it.et > getDateTimestamp() })?.toMutableList()
-
+        if (programNew != null && _program.value != programNew) {
-    private fun formatFTime(s: String): Int {
+            _program.value = programNew
-        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
+        if (_program.value!!.isEmpty()) {
+            return null
+        }
+        return _program.value?.first()
     }
 
-    fun addFEPG(p: List<FEPG>) {
+    fun addProgram(p: MutableList<Program>) {
-        _epg.value = p.map { EPG(it.title, formatFTime(it.event_time)) }.toMutableList()
+        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()
+        }
     }
 
-    fun getVideoUrlCurrent(): String {
+
-        return _videoUrl.value!![_videoIndex.value!!]
+    private var mHeaders: Map<String, String>? = mapOf()
+
+    fun setHeaders(headers: Map<String, String>) {
+        mHeaders = headers
+    }
+
+    fun setMinimumLoadableRetryCount(minimumLoadableRetryCount: Int) {
+        mMinimumLoadableRetryCount = minimumLoadableRetryCount
+    }
+
+    @OptIn(UnstableApi::class)
+    fun buildSource(videoUrl: String, mHeaders: Map<String, String>?): HlsMediaSource {
+        val httpDataSource = DefaultHttpDataSource.Factory()
+        mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
+
+        return HlsMediaSource.Factory(httpDataSource).createMediaSource(
+            MediaItem.fromUri(
+                Uri.parse(videoUrl)
+            )
+        )
     }
 
     companion object {

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

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

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

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

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    >
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingTop="20dp"
+            android:paddingLeft="7dp"
+            android:paddingRight="7dp"
+            android:background="#FF263238"
+            >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/app_name"
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:text="当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+                ></TextView>
+            <Switch
+                android:id="@+id/switch_view"
+                android:text="@string/title_channel_reversal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+        <ImageView
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            android:src="@drawable/appreciate"
+            android:background="@color/white" />
+    </LinearLayout>
+</FrameLayout>

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

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

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

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

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

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialog"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    >
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <LinearLayout
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:paddingTop="20dp"
-            android:paddingLeft="7dp"
-            android:paddingRight="7dp"
-            android:background="#FF263238"
-            >
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:textSize="16sp" />
-            <TextView
-                android:id="@+id/version"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
-                />
-            <LinearLayout
-                android:layout_width="300dp"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                >
-                <Button
-                    android:id="@+id/check_version"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="10dp"
-                    android:text="@string/check_version"
-                    />
-                <ProgressBar
-                    android:visibility="gone"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    />
-                <TextView
-                    android:id="@+id/version_name"
-                    android:text=""
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
-            <Switch
-                android:id="@+id/switch_channel_reversal"
-                android:text="@string/title_channel_reversal"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <Switch
-                android:id="@+id/switch_channel_num"
-                android:text="@string/title_channel_num"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <Switch
-                android:id="@+id/switch_boot_startup"
-                android:text="@string/title_boot_startup"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
-        <ImageView
-            android:layout_width="300dp"
-            android:layout_height="wrap_content"
-            android:src="@drawable/appreciate"
-            android:background="@color/white" />
-    </LinearLayout>
-</FrameLayout>

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

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

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

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

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

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

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

@@ -1,8 +1,4 @@
 <resources>
     <string name="app_name">我的电视</string>
-    <string name="title_channel_reversal">换台反转</string>
+    <string name="title_channel_reversal">频道反转</string>
-    <string name="title_channel_num">数字选台</string>
-    <string name="check_version">检查更新</string>
-    <string name="title_boot_startup">开机自启</string>
-    <string name="dismiss_error">好的</string>
 </resources>

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

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

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

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

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

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