gradle lib version

HISTORY.md

@@ -1,256 +1,277 @@
-## 更新日志
+## 更新日誌
 
-### v2.0.5
+### v2.1.3
 
-* 设置页增加恢复默认按钮，目前只用于同步系统时间
+*
 
-### v2.0.4
+### v2.1.2
 
-* 修复不能播放的问题
-* 包含国际频道
+*
 
-### v2.0.3
+### v2.1.1
 
-* 修复不能播放的问题
-* 不包含国际频道
+* 平衡聲音
 
-### v2.0.0
+### v2.1.0
 
-* 解决卡顿问题
-* 解决网格样式时，点击空白处不退出的问题
-* 解决频道列表样式切换可能不生效的问题
-
-### v1.9.8（通用）
-
-* 优化在线升级
-* 优化可能状态错误的问题
-
-### v1.9.6（通用）
-
-* 优化在线升级
-* 优化可能状态错误的问题
-
-### v1.9.4（通用）
-
-* 修复默认时间不显示问题
-* 设置页居中
-* 频道号和时间对齐
-
-### v1.9.2（通用）
-
-* 修复一个重试的错误
-
-### v1.9.0（通用）
-
-* 减少视频播放失败情况
-* 全面屏手机居中显示
-
-### v1.8.8（通用）
-
-* 样式优化
-
-### v1.8.6（通用）
-
-* 增加错误显示
-* 节目预告优化
-* 频道列表页单击切换频道
-
-### v1.8.4（通用）
-
-* 解決部分情況下打開後黑屏问题
-* 延长频道信息显示时间，增加信息显示长度
-* 调整频道列表间距
-* 其他样式优化
-
-### v1.8.2（通用）
-
-* 修复无法播放问题
+* 恢復播放
 
 ### 以下已不可用
 
+### v2.0.9
+
+* 修復部分設備閃退的問題
+* 修復設置頁可能顯示不全的問題
+
+### v2.0.5
+
+* 設置頁增加恢復默認按鈕，目前只用於同步系統時間
+
+### v2.0.4
+
+* 修復不能播放的問題
+* 包含國際頻道
+
+### v2.0.3
+
+* 修復不能播放的問題
+* 不包含國際頻道
+
+### v2.0.0
+
+* 解決卡頓問題
+* 解決網格樣式時，點擊空白處不退出的問題
+* 解決頻道列表樣式切換可能不生效的問題
+
+### v1.9.8（通用）
+
+* 優化在線升級
+* 優化可能狀態錯誤的問題
+
+### v1.9.6（通用）
+
+* 優化在線升級
+* 優化可能狀態錯誤的問題
+
+### v1.9.4（通用）
+
+* 修復默認時間不顯示問題
+* 設置頁居中
+* 頻道號和時間對齊
+
+### v1.9.2（通用）
+
+* 修復一個重試的錯誤
+
+### v1.9.0（通用）
+
+* 減少視頻播放失敗情況
+* 全面屏手機居中顯示
+
+### v1.8.8（通用）
+
+* 樣式優化
+
+### v1.8.6（通用）
+
+* 增加錯誤顯示
+* 節目預告優化
+* 頻道列表頁單擊切換頻道
+
+### v1.8.4（通用）
+
+* 解決部分情況下打開後黑屏問題
+* 延長頻道信息顯示時間，增加信息顯示長度
+* 調整頻道列表間距
+* 其他樣式優化
+
+### v1.8.2（通用）
+
+* 修復無法播放問題
+
 ### v1.8.0（通用）
 
-* 修复返回键无法退出问题
-* 设置中增加退出按钮
-* 修改非电视上的样式
-* 修复低版本闪退问题
+* 修復返回鍵無法退出問題
+* 設置中增加退出按鈕
+* 修改非電視上的樣式
+* 修復低版本閃退問題
 
 ### v1.7.8（通用）
 
-* 修复播放过程中的卡顿问题
-* 增加时间显示
-* 频道号优化
-* 遥控器左键打开频道列表
-* 遥控器右键打开设置菜单
-* 频道列表空白处点击隐藏频道列表
+* 修復播放過程中的卡頓問題
+* 增加時間顯示
+* 頻道號優化
+* 遙控器左鍵打開頻道列表
+* 遙控器右鍵打開設置菜單
+* 頻道列表空白處點擊隱藏頻道列表
 
 ### v1.7.6（通用）
 
-* 临时去掉部分频道，提高频道的可用性
-* 部分频道增加节目单
+* 臨時去掉部分頻道，提高頻道的可用性
+* 部分頻道增加節目單
 
-### v1.7.5（安卓5及以上专用）
+### v1.7.5（安卓5及以上專用）
 
-* 修复播放过程中的卡顿问题
-* 增加时间显示
-* 频道号优化
-* 设置中增加退出按钮
+* 修復播放過程中的卡頓問題
+* 增加時間顯示
+* 頻道號優化
+* 設置中增加退出按鈕
 
 ### v1.7.4（通用）
 
-* 修复368
+* 修復368
 
-### v1.7.3（安卓5及以上专用）
+### v1.7.3（安卓5及以上專用）
 
-* 临时去掉部分频道，提高频道的可用性
-* 部分频道增加节目单
-* 遥控器左键进入节目列表
-* 遥控器右键进入菜单
+* 臨時去掉部分頻道，提高頻道的可用性
+* 部分頻道增加節目單
+* 遙控器左鍵進入節目列表
+* 遙控器右鍵進入菜單
 
 ### v1.7.2（通用）
 
-* 支持节目列表网格样式和行样式切换，软件重启后生效
-* 节目列表样式变更
+* 支持節目列表網格樣式和行樣式切換，軟件重啟後生效
+* 節目列表樣式變更
 
-### v1.7.1（安卓5及以上专用）
+### v1.7.1（安卓5及以上專用）
 
-* 解决设置页更新闪退的问题
-* 凤凰卫视回归
-* 解决368问题
+* 解決設置頁更新閃退的問題
+* 鳳凰衛視回歸
+* 解決368問題
 
 ### v1.7.0（通用）
 
-* 网络请求优化
+* 網絡請求優化
 
-### v1.6.9（安卓5及以上专用）
+### v1.6.9（安卓5及以上專用）
 
-* 去掉港澳台和国际频道
-* 解决部分情况下3、6、8等频道无法播放的问题
-* 解决部分情况下启动后黑屏问题
+* 去掉港澳台和國際頻道
+* 解決部分情況下3、6、8等頻道無法播放的問題
+* 解決部分情況下啟動後黑屏問題
 
 ### v1.6.8（通用）
 
-* 修复部分设备崩溃的问题
-* 修复部分设备凤凰卫视无法播放的问题
+* 修復部分設備崩潰的問題
+* 修復部分設備鳳凰衛視無法播放的問題
 
-### v1.6.7（安卓5及以上专用）
+### v1.6.7（安卓5及以上專用）
 
-* 手机双击打开配置
-* 自动更新
+* 手機雙擊打開配置
+* 自動更新
 
 ### v1.6.6（通用）
 
-* 更新重庆卫视图标
-* 凤凰卫视增强画质
-* 凤凰卫视增加EPG
+* 更新重慶衛視圖標
+* 鳳凰衛視增強畫質
+* 鳳凰衛視增加EPG
 
-### v1.6.5（安卓5及以上专用）
+### v1.6.5（安卓5及以上專用）
 
-* 增加CETV1图标
-* 稳定性提升
+* 增加CETV1圖標
+* 穩定性提升
 
 ### v1.6.4（通用）
 
 * 增加CETV1
-* 增加凤凰卫视
-* 默认关闭开机启动
+* 增加鳳凰衛視
+* 默認關閉開機啟動
 
-### v1.6.3（安卓5及以上专用）
+### v1.6.3（安卓5及以上專用）
 
 * 增加CETV1
-* 凤凰卫视增强画质
-* 默认关闭开机启动
-* 延迟菜单自动关闭时间
-* 解决一些可能导致首次打开时黑屏的问题
+* 鳳凰衛視增強畫質
+* 默認關閉開機啟動
+* 延遲菜單自動關閉時間
+* 解決一些可能導致首次打開時黑屏的問題
 
 ### v1.6.2（通用）
 
-* 修复按键无效的问题
-* 新的频道列表样式
+* 修復按鍵無效的問題
+* 新的頻道列表樣式
 
-### v1.6.1（安卓5及以上专用）
+### v1.6.1（安卓5及以上專用）
 
-* 增加凤凰卫视
+* 增加鳳凰衛視
 
 ### v1.6.0（通用）
 
 * 通用（春晚緊急修復）
 
-### v1.5.9（安卓5及以上专用）
+### v1.5.9（安卓5及以上專用）
 
-* 解决天猫魔盒闪退问题
+* 解決天貓魔盒閃退問題
 
 ### v1.5.8（通用）
 
-* 修复央视6画质差的问题
-* 增加兵团卫视
-* 播放失败重试
+* 修復央視6畫質差的問題
+* 增加兵團衛視
+* 播放失敗重試
 
-### v1.5.7（安卓5及以上专用）
+### v1.5.7（安卓5及以上專用）
 
-* 修复播放失败的问题
+* 修復播放失敗的問題
 
 ### v1.5.6（通用）
 
-* 解决部分设备系统时间不对导致播放失败的问题
+* 解決部分設備系統時間不對導致播放失敗的問題
 
-### v1.5.5（安卓5及以上专用）
+### v1.5.5（安卓5及以上專用）
 
-* 修复播放失败的问题
-* 修复APP恢复后频道号、频道列表不自动消失的问题
+* 修復播放失敗的問題
+* 修復APP恢復後頻道號、頻道列表不自動消失的問題
 
 ### v1.5.4（通用）
 
-* 修复播放失败的问题
+* 修復播放失敗的問題
 
-### v1.5.3（安卓5及以上专用）
+### v1.5.3（安卓5及以上專用）
 
-* 修复部分情况下APP切换后无法继续播放的问题
-* 优化重试逻辑
+* 修復部分情況下APP切換後無法繼續播放的問題
+* 優化重試邏輯
 
 ### v1.5.2（通用）
 
-* 修复APP恢复后频道号、频道列表不自动消失的问题
+* 修復APP恢復後頻道號、頻道列表不自動消失的問題
 
-### v1.5.1（安卓5及以上专用）
+### v1.5.1（安卓5及以上專用）
 
-* 性能优化
+* 性能優化
 
 ### v1.5.0（通用）
 
-* 修复部分情况下APP切换后无法继续播放的问题
+* 修復部分情況下APP切換後無法繼續播放的問題
 
-### v1.4.9（安卓5及以上专用）
+### v1.4.9（安卓5及以上專用）
 
 * 同步v1.4.8
 
 ### v1.4.8（通用）
 
-* 频道号从1开始，CCTV5+为18
+* 頻道號從1開始，CCTV5+為18
 * 提高CCTV6清晰度
-* 增加天津卫视、新疆卫视
+* 增加天津衛視、新疆衛視
 
-### v1.4.7（安卓5及以上专用）
+### v1.4.7（安卓5及以上專用）
 
-* 修复部分用户CCTV13播放过程中卡住的问题
-* 调整CCTV的频道顺序
+* 修復部分用戶CCTV13播放過程中卡住的問題
+* 調整CCTV的頻道順序
 
 ### v1.4.6（通用）
 
-* 10以下频道不再需要先按0
+* 10以下頻道不再需要先按0
 
-### v1.4.5（安卓5及以上专用）
+### v1.4.5（安卓5及以上專用）
 
-* 数字选台配置
+* 數字選台配置
 
 ### v1.4.4（通用）
 
-* 优化图标显示
-* 增加换台反转
+* 優化圖標顯示
+* 增加換台反轉
 
-### v1.4.3（安卓5及以上专用）
+### v1.4.3（安卓5及以上專用）
 
-* 支持频道反转配置
+* 支持頻道反轉配置
 
 ### v1.4.2（通用）
 
@@ -258,40 +279,40 @@
 
 ### v1.4.1
 
-* 解决部分用户无法打开菜单的问题
+* 解決部分用戶無法打開菜單的問題
 
 ### v1.4.0
 
-* 解决极个别高版本机型黑屏问题
+* 解決極個別高版本機型黑屏問題
 
 ### v1.3.9
 
-* 提高稳定性
-* 提高连接速度
+* 提高穩定性
+* 提高連接速度
 
 ### v1.3.4
 
-* 部分错误会提示用户
-* 菜单3秒钟后自动关闭
+* 部分錯誤會提示用戶
+* 菜單3秒鐘後自動關閉
 
 ### v1.3.3
 
-* 部分错误会提示用户
-* 菜单3秒钟后自动关闭
+* 部分錯誤會提示用戶
+* 菜單3秒鐘後自動關閉
 
 ### v1.3.2
 
-* 增加重试，减少因网络问题导致的播放失败
-* 优化横幅banner
+* 增加重試，減少因網絡問題導致的播放失敗
+* 優化橫幅banner
 
 ### v1.3.1
 
-* 增加CCTV 8K 超高清频道
-* 增加国际频道栏目
+* 增加CCTV 8K 超高清頻道
+* 增加國際頻道欄目
 
 ### v1.3.0
 
-* 处理368可能失败的情形
+* 處理368可能失敗的情形
 
 ### v1.2.9
 
@@ -303,32 +324,32 @@
 
 ### v1.2.7
 
-* 此版本是为了测试安卓6.0以下版本，如之前可以正常运行，请勿安装。
+* 此版本是為了測試安卓6.0以下版本，如之前可以正常運行，請勿安裝。
 
 ### v1.2.6
 
 * 支持安卓4.2
-* 解决部分频道无法播放的问题
-* 修复切换时有时没有恢复播放的问题
-* 左右键不再切换源
-* 增大频道信息标题尺寸，缩小与节目信息的间隔
+* 解決部分頻道無法播放的問題
+* 修復切換時有時沒有恢復播放的問題
+* 左右鍵不再切換源
+* 增大頻道信息標題尺寸，縮小與節目信息的間隔
 
 ### v1.2.5
 
-* 美化频道信息显示
-* 优化节目单获取
+* 美化頻道信息顯示
+* 優化節目單獲取
 
 ### v1.2.4
 
-* 改变换台滑动方向，上一个频道下滑，下一个频道上滑
-* 软件退出时，退出播放器
-* 播放相同的频道，不再重复加载
-* 暂时移除部分频道
+* 改變換台滑動方向，上一個頻道下滑，下一個頻道上滑
+* 軟件退出時，退出播放器
+* 播放相同的頻道，不再重複加載
+* 暫時移除部分頻道
 
 ### v1.2.3
 
-* 固定视频比列为16:9
-* 隐藏全面屏底部的小横条
-* 移除移动专区
-* 修复一个闪退问题
-* 更换图标和应用名
+* 固定視頻比例為16:9
+* 隱藏全面屏底部的小橫條
+* 移除移動專區
+* 修復一個閃退問題
+* 更換圖標和應用名

Makefile

@@ -16,4 +16,4 @@ gen-version:
 
 #make gen v=v2.0.0
 gen:
-	echo $(v) | sed 's/v/ /g' | sed 's/\./ /g' | sed 's/-/ /g' | awk '{print "{\"version_code\": " ($$1*16777216)+($$2*65536)+($$3*256)+$$4 ", \"version_name\": \"" "$(v)" "\"}"}' > version.json
+	echo $(v) | sed 's/v/ /g' | sed 's/\./ /g' | sed 's/-/ /g' | awk '{print "{\"version_code\": " ($$1*16777216)+($$2*65536)+($$3*256)+$$4 ", \"version_name\": \"" "v$(v)" "\"}"}' > version.json

README.md

@@ -35,7 +35,6 @@
 * 亮度调节
 * 音量调节
 * 軟解
-* 网格空白处退出
 
 ## 版权说明
 

app/.gitignore

@@ -4,3 +4,4 @@
 /CMakeFiles/
 /Makefile
 /src/main/cpp/native.c
+/src/main/cpp/aes.c

app/CMakeLists.txt

@@ -21,7 +21,9 @@ if (IS_SO_BUILD)
             SHARED
 
             # Provides a relative path to your source file(s).
-            src/main/cpp/native.c)
+            src/main/cpp/native.c
+            src/main/cpp/aes.c
+    )
 
     # 设置编译输出路径
     set_target_properties(

app/build.gradle

@@ -26,6 +26,7 @@ android {
             cmake {
                 arguments "-DIS_SO_BUILD=${project.hasProperty('IS_SO_BUILD') ? project.IS_SO_BUILD : true}"
 
+//                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
                 abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
@@ -98,42 +99,25 @@ static def VersionName() {
 }
 
 dependencies {
-
-//    minSdk17
-    def media3_version = "1.2.1"
-
-    implementation "androidx.media3:media3-ui:$media3_version"
-
-    // For media playback using ExoPlayer
-    implementation "androidx.media3:media3-exoplayer:$media3_version"
-
-    // For HLS playback support with ExoPlayer
-    implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
-
-    // 21:2.9.0 17:2.6.4
-    def retrofit2_version = "2.6.4"
-
-    implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
-    // Gson 2.10.1 and older: API level 19
-    implementation("com.google.code.gson:gson:2.10.1")
-    implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
-    implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version"
-    implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
-
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
-
-    implementation 'androidx.core:core-ktx:1.11.0-beta02'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.leanback:leanback:1.2.0-alpha02'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.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'
-
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
+    implementation(libs.media3.ui)
+    implementation(libs.failureaccess)
+    implementation(libs.guava)
+    implementation(libs.media3.common)
+    implementation(libs.media3.exoplayer)
+    implementation(libs.media3.exoplayer.hls)
+    implementation(libs.protobuf.kotlin)
+    implementation(libs.gson)
+    implementation(libs.converter.gson)
+    implementation(libs.converter.protobuf)
+    implementation(libs.retrofit)
+    implementation(libs.glide)
+    implementation(libs.work.runtime.ktx)
+    implementation(libs.core.ktx)
+    implementation(libs.multidex)
+    implementation(libs.leanback)
+    implementation(libs.lifecycle.runtime.ktx)
+    implementation(libs.constraintlayout)
+    implementation(libs.serialization.json)
+    implementation(libs.coroutines.android)
+    implementation(libs.javax.annotation.api)
 }

app/proguard-rules.pro

@@ -18,4 +18,10 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class com.google.gson.** { *; }
+-dontwarn com.google.gson.**
+
+-keep class com.google.guava.** { *; }
+-dontwarn com.google.guava.**

app/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />

app/src/main/cpp/include/aes.h

@@ -0,0 +1,9 @@
+#ifndef AES_H
+#define AES_H
+
+#include <stddef.h>
+
+void init();
+void encode(const char *in, size_t size, char *out);
+
+#endif

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

@@ -3,13 +3,37 @@ package com.lizongying.mytv
 import android.app.AlertDialog
 import android.app.Dialog
 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.ConfirmationBinding
 
 class ConfirmationFragment(
     private val listener: ConfirmationListener,
     private val message: String,
     private val update: Boolean
 ) : DialogFragment() {
+//
+//    private var _binding: ConfirmationBinding? = null
+//    private val binding get() = _binding!!
+//
+//    override fun onCreateView(
+//        inflater: LayoutInflater, container: ViewGroup?,
+//        savedInstanceState: Bundle?
+//    ): View {
+//        _binding = ConfirmationBinding.inflate(inflater, container, false)
+//        return binding.root
+//    }
+//
+//    fun updateProgress(progress: Int) {
+//        binding.progressBar.progress = progress
+//    }
+//
+//    override fun onDestroyView() {
+//        super.onDestroyView()
+//        _binding = null
+//    }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {

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

@@ -5,7 +5,10 @@ import android.content.Context
 import android.content.res.Resources
 import android.util.DisplayMetrics
 import android.view.WindowManager
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStore
 import androidx.multidex.MultiDex
+import com.lizongying.mytv.models.MyViewModel
 
 
 class MyTVApplication : Application() {
@@ -23,6 +26,8 @@ class MyTVApplication : Application() {
     private var density = 2.0f
     private var scale = 1.0f
 
+    lateinit var myViewModel: MyViewModel
+
     override fun onCreate() {
         super.onCreate()
 
@@ -60,6 +65,11 @@ class MyTVApplication : Application() {
 
         deviation = width - Resources.getSystem().displayMetrics.widthPixels
         scale = Resources.getSystem().displayMetrics.scaledDensity
+
+        myViewModel = ViewModelProvider(
+            ViewModelStore(),
+            ViewModelProvider.NewInstanceFactory()
+        )[MyViewModel::class.java]
     }
 
     fun getDisplayMetrics(): DisplayMetrics {

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
@@ -15,41 +13,26 @@ import androidx.media3.common.PlaybackException
 import androidx.media3.common.Player
 import androidx.media3.common.VideoSize
 import androidx.media3.common.util.UnstableApi
-import androidx.media3.exoplayer.DefaultRenderersFactory
 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)
 
-        if (Utils.isTmallDevice()) {
-            _binding!!.playerView.visibility = View.GONE
-            surfaceView = _binding!!.surfaceView
-            surfaceHolder = surfaceView.holder
-            surfaceHolder.addCallback(this)
-        } else {
-            _binding!!.surfaceView.visibility = View.GONE
-            playerView = _binding!!.playerView
-        }
+        playerView = _binding!!.playerView
 
         playerView?.viewTreeObserver?.addOnGlobalLayoutListener(object :
             ViewTreeObserver.OnGlobalLayoutListener {
@@ -110,10 +93,7 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
         playerView?.player?.run {
             setMediaItem(MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
             prepare()
-        }
-        exoPlayer?.run {
-            setMediaItem(com.google.android.exoplayer2.MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
-            prepare()
+            volume = tvViewModel.getTV().volume
         }
     }
 
@@ -125,11 +105,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
             playerView!!.player?.prepare()
             playerView!!.player?.play()
         }
-        if (exoPlayer?.isPlaying == false) {
-            Log.i(TAG, "replay")
-            exoPlayer?.prepare()
-            exoPlayer?.play()
-        }
     }
 
     override fun onResume() {
@@ -142,9 +117,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
         if (playerView != null && playerView!!.player?.isPlaying == true) {
             playerView!!.player?.stop()
         }
-        if (exoPlayer?.isPlaying == true) {
-            exoPlayer?.stop()
-        }
     }
 
     override fun onDestroy() {
@@ -152,7 +124,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
         if (playerView != null) {
             playerView!!.player?.release()
         }
-        exoPlayer?.release()
     }
 
     override fun onDestroyView() {
@@ -163,16 +134,4 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
     companion object {
         private const val TAG = "PlayerFragment"
     }
-
-    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/SettingFragment.kt

@@ -6,11 +6,14 @@ import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import androidx.core.view.marginEnd
 import androidx.core.view.marginTop
 import androidx.fragment.app.DialogFragment
@@ -159,6 +162,21 @@ class SettingFragment : DialogFragment() {
             requireActivity().finishAffinity()
         }
 
+//        val myViewModel = application.myViewModel
+//        application.myViewModel.downloadProgress.observe(viewLifecycleOwner) { _ ->
+//            val downloadProgress = myViewModel.downloadProgress.value
+//            if (downloadProgress != null) {
+//                if (downloadProgress == 100) {
+//                    binding.progressBar.visibility = GONE
+//                } else {
+//                    if (!binding.progressBar.isVisible) {
+//                        binding.progressBar.visibility = VISIBLE
+//                    }
+//                    binding.progressBar.progress = downloadProgress
+//                }
+//            }
+//        }
+
         updateManager = UpdateManager(context, context.appVersionCode)
 
         return binding.root

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

@@ -1,26 +1,17 @@
 package com.lizongying.mytv
 
-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.fragment.app.FragmentActivity
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.workDataOf
 import com.lizongying.mytv.api.ApiClient
 import com.lizongying.mytv.requests.ReleaseRequest
 import com.lizongying.mytv.requests.ReleaseResponse
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.io.File
 
 
 class UpdateManager(
@@ -32,17 +23,15 @@ class UpdateManager(
     private var releaseRequest = ReleaseRequest()
     private var release: ReleaseResponse? = null
 
-    private var downloadReceiver: DownloadReceiver? = null
-
     fun checkAndUpdate() {
         CoroutineScope(Dispatchers.Main).launch {
             var text = "版本获取失败"
             var update = false
             try {
                 release = releaseRequest.getRelease()
-                Log.i(TAG, "versionCode $versionCode ${release?.version_code}")
-                if (release?.version_code != null) {
-                    if (release?.version_code!! > versionCode) {
+                val code = release?.version_code
+                if (code != null) {
+                    if (code.toLong() >= versionCode) {
                         text = "最新版本：${release?.version_name}"
                         update = true
                     } else {
@@ -61,170 +50,24 @@ class UpdateManager(
         dialog.show((context as FragmentActivity).supportFragmentManager, TAG)
     }
 
-    private fun startDownload(release: ReleaseResponse) {
+    private fun startDownload(context: Context, release: ReleaseResponse) {
+        val versionName = release.version_name
         val apkName = "my-tv"
         val apkFileName = "$apkName-${release.version_name}.apk"
-        val downloadManager =
-            context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        val request =
-            Request(Uri.parse("${ApiClient.DOWNLOAD_HOST}${release.version_name}/$apkName-${release.version_name}.apk"))
-        Log.i(
-            TAG,
-            "url ${Uri.parse("${ApiClient.DOWNLOAD_HOST}${release.version_name}/$apkName-${release.version_name}.apk")}"
-        )
-        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)?.mkdirs()
-        Log.i(TAG, "save dir ${Environment.DIRECTORY_DOWNLOADS}")
-        request.setDestinationInExternalFilesDir(
-            context,
-            Environment.DIRECTORY_DOWNLOADS,
-            apkFileName
-        )
-        request.setTitle("${context.resources.getString(R.string.app_name)} ${release.version_name}")
-        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,
+        val downloadUrl =
+            "${ApiClient.DOWNLOAD_HOST}${release.version_name}/$apkName-${release.version_name}.apk"
+        Log.i(TAG, "downloadUrl: $downloadUrl")
+        val downloadRequest = OneTimeWorkRequestBuilder<UpdateWorker>()
+            .setInputData(
+                workDataOf(
+                    "VERSION_NAME" to versionName,
+                    "APK_FILENAME" to apkFileName,
+                    "DOWNLOAD_URL" to downloadUrl
+                )
             )
-        } else {
-            context.registerReceiver(
-                downloadReceiver,
-                IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-            )
-        }
+            .build()
 
-        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")
-
-            if (reference == downloadReference) {
-                val downloadManager =
-                    context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-                val query = DownloadManager.Query().setFilterById(downloadReference)
-                val cursor = downloadManager.query(query)
-                if (cursor != null && cursor.moveToFirst()) {
-                    val statusIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)
-                    if (statusIndex < 0) {
-                        Log.i(TAG, "Download failure")
-                        return
-                    }
-                    val status = cursor.getInt(statusIndex)
-
-                    val progressIndex =
-                        cursor.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
-                    if (progressIndex < 0) {
-                        Log.i(TAG, "Download failure")
-                        return
-                    }
-                    val progress = cursor.getInt(progressIndex)
-
-                    val totalSizeIndex =
-                        cursor.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
-                    val totalSize = cursor.getInt(totalSizeIndex)
-
-                    cursor.close()
-
-                    when (status) {
-                        DownloadManager.STATUS_SUCCESSFUL -> {
-                            installNewVersion()
-                        }
-
-                        DownloadManager.STATUS_FAILED -> {
-                            // Handle download failure
-                            Log.i(TAG, "Download failure")
-                        }
-
-                        else -> {
-                            // Update UI with download progress
-                            val percentage = progress * 100 / totalSize
-                            Log.i(TAG, "Download progress: $percentage%")
-                        }
-                    }
-                }
-            }
-        }
-
-        private fun installNewVersion() {
-            val apkFile = File(
-                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
-                apkFileName
-            )
-            Log.i(TAG, "apkFile $apkFile")
-
-            if (apkFile.exists()) {
-                val apkUri = Uri.parse("file://$apkFile")
-                Log.i(TAG, "apkUri $apkUri")
-                val installIntent = Intent(Intent.ACTION_VIEW).apply {
-                    setDataAndType(apkUri, "application/vnd.android.package-archive")
-                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
-                }
-
-                context.startActivity(installIntent)
-            } else {
-                Log.e(TAG, "APK file does not exist!")
-            }
-        }
+        WorkManager.getInstance(context).enqueue(downloadRequest)
     }
 
     companion object {
@@ -233,16 +76,9 @@ class UpdateManager(
 
     override fun onConfirm() {
         Log.i(TAG, "onConfirm $release")
-        release?.let { startDownload(it) }
+        release?.let { startDownload(context, it) }
     }
 
     override fun onCancel() {
     }
-
-    fun destroy() {
-        if (downloadReceiver != null) {
-            context.unregisterReceiver(downloadReceiver)
-            Log.i(TAG, "destroy downloadReceiver")
-        }
-    }
 }

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

@@ -0,0 +1,158 @@
+package com.lizongying.mytv
+
+import android.app.DownloadManager
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.content.FileProvider
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import com.lizongying.mytv.models.MyViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.File
+
+class UpdateWorker(context: Context, params: WorkerParameters) : CoroutineWorker(context, params) {
+
+    private lateinit var notificationManager: NotificationManager
+    private lateinit var notificationBuilder: NotificationCompat.Builder
+
+    private lateinit var myViewModel: MyViewModel
+
+    override suspend fun doWork(): Result {
+        val downloadUrl = inputData.getString("DOWNLOAD_URL") ?: return Result.failure()
+        val apkFileName = inputData.getString("APK_FILENAME") ?: return Result.failure()
+        val versionName = inputData.getString("VERSION_NAME") ?: return Result.failure()
+
+        showNotification(applicationContext)
+
+        val app = applicationContext as MyTVApplication
+        myViewModel = app.myViewModel
+
+        return withContext(Dispatchers.IO) {
+            try {
+                downloadAndInstall(applicationContext, downloadUrl, apkFileName, versionName)
+                Result.success()
+            } catch (e: Exception) {
+                Result.failure()
+            }
+        }
+    }
+
+    private fun showNotification(context: Context) {
+        notificationManager =
+            context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        notificationBuilder = NotificationCompat.Builder(context, "download_channel").apply {
+            setSmallIcon(android.R.drawable.stat_sys_download)
+            setContentTitle("Downloading Update")
+            setContentText("Download in progress")
+            priority = NotificationCompat.PRIORITY_LOW
+            setOngoing(true)
+            setProgress(100, 0, false)
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                "download_channel",
+                "Download Updates",
+                NotificationManager.IMPORTANCE_LOW
+            )
+            notificationManager.createNotificationChannel(channel)
+        }
+
+        notificationManager.notify(1, notificationBuilder.build())
+    }
+
+    private fun downloadAndInstall(
+        context: Context,
+        downloadUrl: String,
+        apkFileName: String,
+        versionName: String
+    ) {
+        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)?.mkdirs()
+        Log.i(TAG, "save dir ${Environment.DIRECTORY_DOWNLOADS}")
+        val request = DownloadManager.Request(Uri.parse(downloadUrl)).apply {
+            setTitle("${context.resources.getString(R.string.app_name)} $versionName Downloading")
+            setDescription("Downloading the latest version of the app")
+            setDestinationInExternalFilesDir(context, Environment.DIRECTORY_DOWNLOADS, apkFileName)
+
+            setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+//            setAllowedOverRoaming(false)
+            setMimeType("application/vnd.android.package-archive")
+        }
+
+        val manager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+        val downloadId = manager.enqueue(request)
+
+        var downloading = true
+        while (downloading) {
+            val query = DownloadManager.Query().setFilterById(downloadId)
+            val cursor = manager.query(query)
+            if (cursor.moveToFirst()) {
+                val bytesDownloaded =
+                    cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR))
+                val bytesTotal =
+                    cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_TOTAL_SIZE_BYTES))
+
+                if (bytesTotal > 0) {
+                    val progress = (bytesDownloaded * 100L / bytesTotal).toInt()
+                    Log.i(TAG, "progress $progress")
+//                    myViewModel.setDownloadProgress(progress)
+                    notificationBuilder.setProgress(100, progress, false)
+                    notificationManager.notify(1, notificationBuilder.build())
+                }
+
+                when (cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_STATUS))) {
+                    DownloadManager.STATUS_SUCCESSFUL -> downloading = false
+                    DownloadManager.STATUS_FAILED -> {
+                        downloading = false
+                        throw Exception("Download failed")
+                    }
+                }
+            }
+            cursor.close()
+        }
+
+        notificationBuilder.setContentText("Download complete")
+            .setProgress(0, 0, false)
+            .setOngoing(false)
+        notificationManager.notify(1, notificationBuilder.build())
+
+        val apkFile = File(
+            context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
+            apkFileName
+        )
+
+        if (apkFile.exists()) {
+            val apkUri: Uri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                FileProvider.getUriForFile(context, context.packageName + ".fileprovider", apkFile)
+                    .apply {
+                        Intent.FLAG_GRANT_READ_URI_PERMISSION
+                    }
+            } else {
+                Uri.parse("file://${apkFile.absolutePath}")
+//                Uri.fromFile(apkFile)
+            }
+//            val apkUri = Uri.parse("file://$apkFile")
+            Log.i(TAG, "apkUri $apkUri")
+            val installIntent = Intent(Intent.ACTION_VIEW).apply {
+                setDataAndType(apkUri, "application/vnd.android.package-archive")
+                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+
+            context.startActivity(installIntent)
+        } else {
+            Log.e(TAG, "APK file does not exist!")
+        }
+    }
+
+    companion object {
+        private const val TAG = "UpdateWorker"
+    }
+}

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

@@ -3,6 +3,7 @@ package com.lizongying.mytv.api
 
 import android.os.Build
 import android.util.Log
+import com.google.gson.Gson
 import com.lizongying.mytv.jce.JceConverterFactory
 import com.lizongying.mytv.requests.ReleaseService
 import okhttp3.ConnectionSpec
@@ -30,12 +31,13 @@ class ApiClient {
     private val fUrl = "https://m.fengshows.com/"
 
     private var okHttpClient = getUnsafeOkHttpClient()
+    private var gson = Gson()
 
     val yspApiService: YSPApiService by lazy {
         Retrofit.Builder()
             .baseUrl(yspUrl)
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(gson))
             .build().create(YSPApiService::class.java)
     }
 
@@ -43,7 +45,7 @@ class ApiClient {
         Retrofit.Builder()
             .baseUrl(myUrl)
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(gson))
             .build().create(YSPTokenService::class.java)
     }
 
@@ -51,7 +53,7 @@ class ApiClient {
         Retrofit.Builder()
             .baseUrl(HOST)
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(gson))
             .build().create(ReleaseService::class.java)
     }
 
@@ -67,7 +69,7 @@ class ApiClient {
         Retrofit.Builder()
             .baseUrl(traceUrl)
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(gson))
             .build().create(YSPBtraceService::class.java)
     }
 
@@ -75,7 +77,7 @@ class ApiClient {
         Retrofit.Builder()
             .baseUrl(trace2Url)
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(gson))
             .build().create(YSPBtraceService::class.java)
     }
 
@@ -83,7 +85,7 @@ class ApiClient {
         Retrofit.Builder()
             .baseUrl(tokenUrl)
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(gson))
             .build().create(YSPApiService::class.java)
     }
 
@@ -91,7 +93,7 @@ class ApiClient {
         Retrofit.Builder()
             .baseUrl(trace3Url)
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(gson))
             .build().create(YSPBtraceService::class.java)
     }
 
@@ -107,7 +109,7 @@ class ApiClient {
         Retrofit.Builder()
             .baseUrl(fUrl)
             .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create(gson))
             .build().create(FAuthService::class.java)
     }
 
@@ -166,7 +168,7 @@ 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))
+            val proxy = Proxy(Proxy.Type.HTTP, InetSocketAddress("10.0.2.2", 8888))
 
             val builder = OkHttpClient.Builder()
                 .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)

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

@@ -7,6 +7,8 @@ class Encryptor {
 
     external fun encrypt(t: String, e: String, r: String, n: String, i: String): String
 
+    external fun encrypt2(t: String): String
+
     external fun hash(data: ByteArray): ByteArray?
 
     external fun hash2(data: ByteArray): ByteArray?

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

@@ -1,6 +1,7 @@
 package com.lizongying.mytv.api
 
 import android.content.Context
+import android.util.Log
 import com.lizongying.mytv.SP
 import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.models.TVViewModel
@@ -57,6 +58,7 @@ object YSP {
 
     var yspsdkinput = ""
     var openapi_signature = ""
+    var yspticket = ""
 
     var nseqId = 1
     var nrequest_id = ""
@@ -85,6 +87,8 @@ object YSP {
             encryptor.encrypt(cnlid, timeStr, appVer, guid, platform)
         randStr = getRand()
         signature = getSignature()
+        yspticket = encryptor.encrypt2("$livepid&$timeStr&$guid&519748109").lowercase()
+
         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"}"""
     }
 

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

@@ -22,6 +22,7 @@ interface YSPApiService {
         @Header("Yspplayertoken") token: String,
         @Header("Yspsdkinput") Yspsdkinput: String,
         @Header("yspsdksign") yspsdksign: String,
+        @Header("Yspticket") Yspticket: String,
         @Header("Seqid") Seqid: String,
         @Header("Request-Id") RequestId: String,
         @Header("Yspappid") Yspappid: String="519748109",

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

@@ -0,0 +1,19 @@
+package com.lizongying.mytv.models
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class MyViewModel : ViewModel() {
+    private var _downloadProgress = MutableLiveData<Int>()
+    val downloadProgress: LiveData<Int>
+        get() = _downloadProgress
+
+    fun setDownloadProgress(progress: Int) {
+        _downloadProgress.value = progress
+    }
+
+    init {
+        _downloadProgress.value = 0
+    }
+}

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

@@ -15,6 +15,7 @@ data class TV(
     var programType: ProgramType,
     var needToken: Boolean = false,
     var mustToken: Boolean = false,
+    var volume: Float = 0.1F,
 ) : Serializable {
 
     override fun toString(): String {

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

@@ -21,7 +21,8 @@ object TVList {
                     "2022576801",
                     ProgramType.Y_PROTO,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -34,7 +35,8 @@ object TVList {
                     "2022576701",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -47,7 +49,8 @@ object TVList {
                     "2022576501",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = true
+                    mustToken = true,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -60,7 +63,8 @@ object TVList {
                     "2022576601",
                     ProgramType.Y_PROTO,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -73,7 +77,8 @@ object TVList {
                     "2022576401",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -86,7 +91,8 @@ object TVList {
                     "2013693901",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = true
+                    mustToken = true,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -99,7 +105,8 @@ object TVList {
                     "2022576201",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -112,7 +119,8 @@ object TVList {
                     "2022576101",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = true
+                    mustToken = true,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -125,7 +133,8 @@ object TVList {
                     "2022576001",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -138,7 +147,8 @@ object TVList {
                     "2022573001",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -151,7 +161,8 @@ object TVList {
                     "2022575901",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -164,7 +175,8 @@ object TVList {
                     "2022575801",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -177,7 +189,8 @@ object TVList {
                     "2022575701",
                     ProgramType.Y_PROTO,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -190,7 +203,8 @@ object TVList {
                     "2022575601",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -203,7 +217,8 @@ object TVList {
                     "2022575501",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -216,7 +231,8 @@ object TVList {
                     "2022575401",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -229,7 +245,8 @@ object TVList {
                     "2022575301",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -242,7 +259,8 @@ object TVList {
                     "2022576301",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -255,7 +273,8 @@ object TVList {
                     "2022575201",
                     ProgramType.Y_PROTO,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -268,7 +287,8 @@ object TVList {
                     "2020603421",
                     ProgramType.Y_JCE,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.8F
                 ),
                 TV(
                     0,
@@ -738,7 +758,8 @@ object TVList {
                     "2019927403",
                     ProgramType.Y_JCE,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -751,7 +772,8 @@ object TVList {
                     "2022606701",
                     ProgramType.Y_JCE,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.8F
                 ),
                 TV(
                     0,
@@ -764,7 +786,8 @@ object TVList {
                     "2022823801",
                     ProgramType.Y_JCE,
                     true,
-                    mustToken = false
+                    mustToken = false,
+                    0.6F
                 ),
             ),
             "港澳台" to listOf(
@@ -779,7 +802,8 @@ object TVList {
                     "",
                     ProgramType.F,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.7F
                 ),
                 TV(
                     0,
@@ -792,7 +816,8 @@ object TVList {
                     "",
                     ProgramType.F,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.7F
                 ),
                 TV(
                     0,
@@ -805,7 +830,8 @@ object TVList {
                     "",
                     ProgramType.F,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.7F
                 ),
             ),
             "国际" to listOf(
@@ -820,7 +846,8 @@ object TVList {
                     "2022575001",
                     ProgramType.Y_PROTO,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -833,7 +860,8 @@ object TVList {
                     "2022574901",
                     ProgramType.Y_PROTO,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -846,7 +874,8 @@ object TVList {
                     "2022574801",
                     ProgramType.Y_PROTO,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -859,7 +888,8 @@ object TVList {
                     "2022574601",
                     ProgramType.Y_PROTO,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -872,7 +902,8 @@ object TVList {
                     "2022571701",
                     ProgramType.Y_PROTO,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
                 TV(
                     0,
@@ -885,7 +916,8 @@ object TVList {
                     "2022574701",
                     ProgramType.Y_PROTO,
                     false,
-                    mustToken = false
+                    mustToken = false,
+                    0.5F
                 ),
             )
         )

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

@@ -316,10 +316,11 @@ object Request {
         val request = LiveInfoRequest(data)
         call = request.let {
             yspApiService.getLiveInfo(
-                "guid=${YSP.getGuid()}; gr_user_id=261eecf2-0ce4-4316-a6a1-7171e3de7389; $cookie; newLogin=1; nseqId=${YSP.nseqId}; nrequest-id=${YSP.nrequest_id}",
+                "guid=${YSP.getGuid()}; gr_user_id=1; $cookie; newLogin=1; nseqId=${YSP.nseqId}; nrequest-id=${YSP.nrequest_id}",
                 YSP.token,
                 YSP.yspsdkinput,
                 YSP.openapi_signature,
+                YSP.yspticket,
                 "${YSP.nseqId}",
                 YSP.nrequest_id,
                 "519748109",

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

@@ -0,0 +1,24 @@
+<!-- res/layout/fragment_progress_dialog.xml -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <Button
+        android:id="@+id/btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/start_update"
+        tools:text="开始更新">
+    </Button>
+    <androidx.core.widget.ContentLoadingProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="false"
+        android:max="100"
+        android:progress="0"
+        android:progressDrawable="@android:drawable/progress_horizontal" />
+</LinearLayout>

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

@@ -6,15 +6,6 @@
     android:layout_height="match_parent"
     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/setting.xml

@@ -59,6 +59,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
             </LinearLayout>
+<!--            <androidx.core.widget.ContentLoadingProgressBar-->
+<!--                android:id="@+id/progressBar"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:indeterminate="false"-->
+<!--                android:max="100"-->
+<!--                android:progress="0"-->
+<!--                android:visibility="gone"-->
+<!--                android:progressDrawable="@android:drawable/progress_horizontal" />-->
             <Button
                 android:id="@+id/clear"
                 android:layout_width="wrap_content"

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

@@ -8,4 +8,5 @@
     <string name="title_time">显示时间</string>
     <string name="clear">恢复默认</string>
     <string name="exit">退出应用</string>
+    <string name="start_update">开始更新</string>
 </resources>

gradle/libs.versions.toml

@@ -0,0 +1,40 @@
+[versions]
+media3 = "1.2.1" # minSdk17
+gson = "2.10.1" # 2.10.1 and older: API level 19
+failureaccess = "1.0.2"
+guava = "33.2.1-android"
+retrofit = "2.6.4" # 21:2.9.0 17:2.6.4
+protobuf = "3.25.1"
+glide = "4.11.0"
+work = "2.9.0"
+core_ktx = "1.11.0-beta02"
+multidex = "2.0.1"
+leanback = "1.2.0-alpha02"
+lifecycle = "2.6.2"
+constraintlayout = "2.1.4"
+serialization = "1.6.2"
+coroutines = "1.8.0-RC"
+javax_annotation = "1.3.2"
+
+[libraries]
+media3-ui = { module = "androidx.media3:media3-ui", version.ref = "media3" }
+media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" }
+media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
+media3-exoplayer-hls = { module = "androidx.media3:media3-exoplayer-hls", version.ref = "media3" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+failureaccess = { module = "com.google.guava:failureaccess", version.ref = "failureaccess" }
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
+retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
+converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+converter-protobuf = { module = "com.squareup.retrofit2:converter-protobuf", version.ref = "retrofit" }
+protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
+glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
+work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work" }
+core-ktx = { module = "androidx.core:core-ktx", version.ref = "core_ktx" }
+multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
+leanback = { module = "androidx.leanback:leanback", version.ref = "leanback" }
+lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
+constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
+coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
+javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax_annotation" }

version.json

@@ -1 +1 @@
-{"version_code": 33555712, "version_name": "v2.0.5"}
+{"version_code": 33620736, "version_name": "v2.1.3"}