readme

创建 SP 工具类，管理所有（除 ChannelUtils 以外）用户偏好设置

.github/workflows/build.yml

@@ -37,6 +37,13 @@ jobs:
           # override default build-tools version (29.0.3) -- optional
           BUILD_TOOLS_VERSION: "34.0.0"
 
+      - name: Get History
+        id: get_history
+        run: |
+          chmod +x history.sh
+          output=$(./history.sh)
+          echo "$output" > history.md
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -47,6 +54,7 @@ jobs:
           release_name: Release ${{ github.ref }}
           draft: false
           prerelease: false
+          body_path: history.md
 
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1
@@ -56,4 +64,19 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ${{ steps.sign_app.outputs.signedReleaseFile }}
           asset_name: my-tv-${{ github.ref_name }}.apk
-          asset_content_type: application/vnd.android.package-archive
+          asset_content_type: application/vnd.android.package-archive
+
+      - name: Gitee Create Release
+        run: |
+          latest_commit=$(git rev-parse HEAD)
+          history=$(cat history.md)
+          curl -v POST https://gitee.com/api/v5/repos/${{ github.repository }}/releases \
+          -H "Content-Type: application/json" \
+          -d '{
+            "access_token": "${{ secrets.GITEE_ACCESS_TOKEN}}",
+            "tag_name": "${{ github.ref_name }}",
+            "name": "Release ${{ github.ref_name }}",
+            "body": "'"$history"'",
+            "prerelease": false,
+            "target_commitish": "'"$latest_commit"'"
+          }'

HISTORY.md

@@ -1,216 +1,265 @@
-## 更新日志
+## 更新日誌
+
+### v2.1.0
+
+* 恢復播放
+
+### 以下已不可用
+
+### 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（通用）
 
@@ -218,40 +267,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
 
@@ -263,32 +312,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

@@ -1,6 +1,6 @@
 .PHONY: all
 
-all: info
+all: info gen-version
 
 branch := $(shell git rev-parse --abbrev-ref HEAD)
 commit := $(shell git rev-parse --short HEAD)
@@ -9,3 +9,11 @@ info:
 	@echo 'SHELL='$(SHELL)
 	@echo 'branch='$(branch)
 	@echo 'commit='$(commit)
+
+gen-version:
+	git describe --tags --always
+	git describe --tags --always | sed 's/v/ /g' | sed 's/\./ /g' | sed 's/-/ /g' | awk '{print ($$1*16777216)+($$2*65536)+($$3*256)+$$4}'
+
+#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$(v)" "\"}"}' > version.json

README.md

@@ -37,8 +37,16 @@
 * 軟解
 * 自動更新
 
+無法自啟的設備：
+斐讯N1盒子，[Phicomm] Phicomm p230 (Android 7.1.2)
+
+閃退：
+中国移动盒子(新魔百和M302A) 4.4.2
+
 ## 版权说明
 
+[LICENSE](./LICENSE)
+
 本项目仅供学习研究，禁止用于商业用途，请于下载二十四小时内删除。
 
 本项目可能随时终止，请大家谨慎使用，建议使用官方渠道进行观看。

app/build.gradle

@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         applicationId "com.lizongying.mytv"
-        minSdk 17
+        minSdk 21
         targetSdk 33
         versionCode VersionCode()
         versionName VersionName()
@@ -95,7 +95,7 @@ static def VersionName() {
 }
 
 dependencies {
-    def media3_version = "1.2.1"
+    def media3_version = "1.3.1"
 
     implementation "androidx.media3:media3-ui:$media3_version"
 
@@ -105,21 +105,20 @@ dependencies {
     // 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"
+    // 21:2.11.0 17:2.6.4
+    def retrofit2_version = "2.11.0"
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.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 'androidx.leanback:leanback:1.2.0-alpha04'
+    
     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 'androidx.core:core-ktx:1.13.0'
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2"
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC")
@@ -127,6 +126,4 @@ dependencies {
     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'
 }

app/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
-        android:name=".MyTvApplication"
+        android:name=".MyApplication"
         android:allowBackup="true"
         android:banner="@drawable/banner"
         android:icon="@drawable/logo"
@@ -36,9 +36,6 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <meta-data
-                android:name="android.windowLayoutInDisplayCutoutMode"
-                android:value="shortEdges" />
         </activity>
 
         <receiver
@@ -61,7 +58,5 @@
             android:name=".InitializerProvider"
             android:authorities="${applicationId}.InitializerProvider"
             android:exported="false" />
-
-        <meta-data android:name="android.max_aspect" android:value="2.5" />
     </application>
 </manifest>

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

@@ -1,217 +0,0 @@
-package com.lizongying.mytv
-
-import android.util.Log
-import android.view.KeyEvent
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewConfiguration
-import android.view.ViewGroup
-import android.view.animation.ScaleAnimation
-import androidx.core.view.marginTop
-import androidx.core.view.setPadding
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.lizongying.mytv.databinding.CardBinding
-import com.lizongying.mytv.models.TVListViewModel
-import com.lizongying.mytv.models.TVViewModel
-import kotlin.math.abs
-
-
-class CardAdapter(
-    private val recyclerView: RecyclerView,
-    private val mainFragment: MainFragment,
-    private var tvListViewModel: TVListViewModel,
-) :
-    RecyclerView.Adapter<CardAdapter.ViewHolder>() {
-
-    private var listener: ItemListener? = null
-    private var focused: View? = null
-
-    var focusable = false
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        val binding = CardBinding.inflate(inflater, parent, false)
-
-        val application = mainFragment.requireActivity().applicationContext as MyTvApplication
-
-        binding.card.layoutParams.width = application.px2Px(binding.card.layoutParams.width)
-        binding.card.layoutParams.height = application.px2Px(binding.card.layoutParams.height)
-        binding.icon.layoutParams.height = application.px2Px(binding.icon.layoutParams.height)
-        binding.icon.setPadding(application.px2Px(binding.icon.paddingTop))
-        binding.main.layoutParams.height = application.px2Px(binding.main.layoutParams.height)
-        binding.main.setPadding(application.px2Px(binding.main.paddingTop))
-        binding.title.textSize = application.px2PxFont(binding.title.textSize)
-        binding.desc.textSize = application.px2PxFont(binding.desc.textSize)
-        val layoutParams = binding.desc.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParams.topMargin = application.px2Px(binding.desc.marginTop)
-        binding.desc.layoutParams = layoutParams
-
-        val cardView = binding.root
-        cardView.isClickable = true
-        cardView.isFocusable = true
-        cardView.isFocusableInTouchMode = true
-        return ViewHolder(cardView, binding)
-    }
-
-    fun clear() {
-        focused?.clearFocus()
-        recyclerView.invalidate()
-    }
-
-    private fun startScaleAnimation(view: View) {
-        val scaleAnimation = ScaleAnimation(
-            0.9f, 1.0f,
-            0.9f, 1.0f,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f
-        )
-        scaleAnimation.duration = 200
-        scaleAnimation.fillAfter = false
-        view.startAnimation(scaleAnimation)
-    }
-
-    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
-        val item = tvListViewModel.getTVViewModel(position)
-
-        val tvViewModel = item as TVViewModel
-        val cardView = viewHolder.view
-        cardView.tag = tvViewModel
-
-        val onFocusChangeListener = View.OnFocusChangeListener { view, hasFocus ->
-            if (hasFocus) {
-                listener?.onItemHasFocus(item)
-                focused = cardView
-
-                if (focusable) {
-                    startScaleAnimation(cardView)
-                    viewHolder.focus(true)
-                }
-            } else {
-                viewHolder.focus(false)
-            }
-        }
-
-        cardView.onFocusChangeListener = onFocusChangeListener
-
-        cardView.setOnClickListener { _ ->
-            listener?.onItemClicked(item)
-        }
-
-        var downX = 0f
-        var downY = 0f
-        val touchSlop = ViewConfiguration.get(cardView.context).scaledTouchSlop
-
-        cardView.setOnTouchListener { _, event ->
-            when (event.action) {
-                MotionEvent.ACTION_DOWN -> {
-                    downX = event.x
-                    downY = event.y
-                    true
-                }
-
-                MotionEvent.ACTION_UP -> {
-                    val upX = event.x
-                    val upY = event.y
-                    val deltaX = abs(upX - downX)
-                    val deltaY = abs(upY - downY)
-                    if (deltaX < touchSlop && deltaY < touchSlop) {
-                        // 如果位移量小于阈值，则执行点击操作
-                        cardView.performClick()
-                    }
-                    true
-                }
-
-                else -> false
-            }
-        }
-
-        cardView.setOnKeyListener { _, keyCode, event: KeyEvent? ->
-            if (event?.action == KeyEvent.ACTION_DOWN) {
-                return@setOnKeyListener listener?.onKey(keyCode) ?: false
-            }
-            false
-        }
-
-        viewHolder.binding.title.text = tvViewModel.getTV().title
-
-        viewHolder.binding.icon.let {
-            Glide.with(viewHolder.view.context)
-                .load(tvViewModel.getTV().logo)
-                .centerInside()
-                .into(it)
-        }
-
-        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
-        if (!epg.isNullOrEmpty()) {
-            viewHolder.binding.desc.text = epg.last().title
-        } else {
-            viewHolder.binding.desc.text = ""
-        }
-    }
-
-    override fun getItemCount() = tvListViewModel.size()
-
-    class ViewHolder(itemView: View, var binding: CardBinding) : RecyclerView.ViewHolder(itemView) {
-        val view = itemView
-
-        fun focus(hasFocus: Boolean) {
-            if (hasFocus) {
-                binding.main.setBackgroundResource(R.drawable.rounded_light_bottom)
-            } else {
-                binding.main.setBackgroundResource(R.drawable.rounded_dark_bottom)
-            }
-        }
-    }
-
-    fun updateEPG() {
-        for (i in 0 until recyclerView.childCount) {
-            val childView = recyclerView.getChildAt(i)
-
-            val viewHolder = recyclerView.getChildViewHolder(childView) as ViewHolder
-
-            if (viewHolder.view.tag != null && viewHolder.view.tag is TVViewModel) {
-                val tvViewModel = viewHolder.view.tag as TVViewModel
-
-                val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
-
-                if (!epg.isNullOrEmpty()) {
-                    val title = epg.last().title
-                    if (viewHolder.binding.desc.text != title) {
-                        viewHolder.binding.desc.text = title
-                        Log.i(TAG, "updateEPG $title")
-                    }
-                } else {
-                    if (viewHolder.binding.desc.text != "") {
-                        viewHolder.binding.desc.text = ""
-                        Log.i(TAG, "updateEPG")
-                    }
-                }
-            }
-        }
-    }
-
-    fun toPosition(position: Int) {
-        recyclerView.post {
-            recyclerView.scrollToPosition(position)
-            recyclerView.getChildAt(position)?.isSelected
-            recyclerView.getChildAt(position)?.requestFocus()
-        }
-    }
-
-    interface ItemListener {
-        fun onItemHasFocus(tvViewModel: TVViewModel)
-        fun onItemClicked(tvViewModel: TVViewModel)
-        fun onKey(keyCode: Int): Boolean
-    }
-
-    fun setItemListener(listener: ItemListener) {
-        this.listener = listener
-    }
-
-    companion object {
-        private const val TAG = "CardAdapter"
-    }
-}
-

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

@@ -0,0 +1,76 @@
+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 com.bumptech.glide.Glide
+import com.lizongying.mytv.models.TVViewModel
+
+class CardPresenter(
+    private val context: Context,
+) : Presenter() {
+
+    override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
+        val cardView = object :
+            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
+
+        cardView.isFocusable = true
+        cardView.isFocusableInTouchMode = true
+        return ViewHolder(cardView)
+    }
+
+    override fun onBindViewHolder(viewHolder: ViewHolder, item: Any?) {
+        val tvViewModel = item as TVViewModel
+        val cardView = viewHolder.view as ImageCardView
+
+        cardView.titleText = tvViewModel.getTV().title
+        cardView.setMainImageDimensions(CARD_WIDTH, CARD_HEIGHT)
+        cardView.tag = tvViewModel.videoUrl.value
+
+        cardView.mainImageView?.let {
+            Glide.with(viewHolder.view.context)
+                .load(tvViewModel.getTV().logo)
+                .centerInside()
+                .into(it)
+        }
+
+        cardView.setBackgroundColor(Color.WHITE)
+        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
+
+//        cardView.setOnFocusChangeListener { v, hasFocus ->
+//            run {
+//                if (hasFocus) {
+//                    if (v != null) {
+//                        (v as ImageCardView).setInfoAreaBackgroundColor(context.resources.getColor(R.color.focus))
+//                    }
+//                } else {
+//                    if (v != null) {
+//                        (v as ImageCardView).setInfoAreaBackgroundColor(context.resources.getColor(R.color.ic_launcher_background))
+//                    }
+//                }
+//            }
+//        }
+
+        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+        if (!epg.isNullOrEmpty()) {
+            cardView.contentText = epg.last().title
+        } else {
+            cardView.contentText = ""
+        }
+    }
+
+    override fun onUnbindViewHolder(viewHolder: ViewHolder) {
+        val cardView = viewHolder.view as ImageCardView
+        cardView.mainImage = null
+    }
+
+    companion object {
+        private const val TAG = "CardPresenter"
+        private const val CARD_WIDTH = 300
+        private const val CARD_HEIGHT = 101
+    }
+}

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

@@ -1,13 +1,11 @@
 package com.lizongying.mytv
 
-import android.content.res.Resources
 import android.os.Bundle
 import android.os.Handler
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.marginEnd
-import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import com.lizongying.mytv.databinding.ChannelBinding
 import com.lizongying.mytv.models.TVViewModel
@@ -17,7 +15,7 @@ class ChannelFragment : Fragment() {
     private val binding get() = _binding!!
 
     private val handler = Handler()
-    private val delay: Long = 5000
+    private val delay: Long = 3000
     private var channel = 0
     private var channelCount = 0
 
@@ -28,29 +26,45 @@ class ChannelFragment : Fragment() {
         _binding = ChannelBinding.inflate(inflater, container, false)
         _binding!!.root.visibility = View.GONE
 
-        val application = requireActivity().applicationContext as MyTvApplication
+        val activity = requireActivity()
+        val application = activity.applicationContext as MyApplication
+        val displayMetrics = application.getDisplayMetrics()
 
-        binding.channel.layoutParams.width = application.px2Px(binding.channel.layoutParams.width)
-        binding.channel.layoutParams.height = application.px2Px(binding.channel.layoutParams.height)
+        displayMetrics.density
 
-        val layoutParams = binding.channel.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParams.topMargin = application.px2Px(binding.channel.marginTop)
-        layoutParams.marginEnd = application.px2Px(binding.channel.marginEnd)
-        binding.channel.layoutParams = layoutParams
+        var screenWidth = displayMetrics.widthPixels
+        var screenHeight = displayMetrics.heightPixels
+        if (screenHeight > screenWidth) {
+            screenWidth = displayMetrics.heightPixels
+            screenHeight = displayMetrics.widthPixels
+        }
 
-        binding.content.textSize = application.px2PxFont(binding.content.textSize)
+        val ratio = 16f / 9f
 
-        binding.main.layoutParams.width = application.shouldWidthPx()
-        binding.main.layoutParams.height = application.shouldHeightPx()
+        if (screenWidth / screenHeight > ratio) {
+            val x = ((screenWidth - screenHeight * ratio) / 2).toInt()
+            val originalLayoutParams =
+                binding.channelFragment.layoutParams as ViewGroup.MarginLayoutParams
+            originalLayoutParams.rightMargin += x
+            binding.channelFragment.layoutParams = originalLayoutParams
+        }
 
-        (activity as MainActivity).fragmentReady(TAG)
+        if (screenWidth / screenHeight < ratio) {
+            val y = ((screenHeight - screenWidth / ratio) / 2).toInt()
+            val originalLayoutParams =
+                binding.channelFragment.layoutParams as ViewGroup.MarginLayoutParams
+            originalLayoutParams.topMargin += y
+            binding.channelFragment.layoutParams = originalLayoutParams
+        }
+
+        (activity as MainActivity).fragmentReady("ChannelFragment")
         return binding.root
     }
 
     fun show(tvViewModel: TVViewModel) {
         handler.removeCallbacks(hideRunnable)
         handler.removeCallbacks(playRunnable)
-        binding.content.text = (tvViewModel.getTV().id.plus(1)).toString()
+        binding.channelContent.text = (tvViewModel.getTV().id.plus(1)).toString()
         view?.visibility = View.VISIBLE
         handler.postDelayed(hideRunnable, delay)
     }
@@ -60,11 +74,13 @@ class ChannelFragment : Fragment() {
             return
         }
         channelCount++
+        Log.i(TAG, "channelCount ${channelCount}")
         this.channel = "${this.channel}$channel".toInt()
+        Log.i(TAG, "this.channel ${this.channel}")
         handler.removeCallbacks(hideRunnable)
         handler.removeCallbacks(playRunnable)
         if (channelCount < 2) {
-            binding.content.text = "${this.channel}"
+            binding.channelContent.text = "${this.channel}"
             view?.visibility = View.VISIBLE
             handler.postDelayed(playRunnable, delay)
         } else {
@@ -86,18 +102,20 @@ class ChannelFragment : Fragment() {
     }
 
     private val hideRunnable = Runnable {
-        binding.content.text = ""
+        binding.channelContent.text = ""
         view?.visibility = View.GONE
         channel = 0
         channelCount = 0
+        Log.i(TAG, "hideRunnable")
     }
 
     private val playRunnable = Runnable {
         (activity as MainActivity).play(channel - 1)
-        binding.content.text = ""
+        binding.channelContent.text = ""
         view?.visibility = View.GONE
         channel = 0
         channelCount = 0
+        Log.i(TAG, "playRunnable")
     }
 
     override fun onDestroyView() {

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

@@ -1,4 +1,4 @@
-package com.lizongying.mytv.api
+package com.lizongying.mytv
 
 import android.content.Context
 

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

@@ -1,49 +1,28 @@
 package com.lizongying.mytv
 
-import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.marginStart
-import androidx.core.view.marginTop
-import androidx.fragment.app.Fragment
-import com.lizongying.mytv.databinding.ErrorBinding
+import androidx.core.content.ContextCompat
+import androidx.leanback.app.ErrorSupportFragment
 
-class ErrorFragment : Fragment() {
-    private var _binding: ErrorBinding? = null
-    private val binding get() = _binding!!
+class ErrorFragment : ErrorSupportFragment() {
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = ErrorBinding.inflate(inflater, container, false)
+    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
+        )
 
-        val application = requireActivity().applicationContext as MyTvApplication
-
-        binding.logo.layoutParams.width = application.px2Px(binding.logo.layoutParams.width)
-        binding.logo.layoutParams.height = application.px2Px(binding.logo.layoutParams.height)
-
-        val layoutParams = binding.msg.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParams.topMargin = application.px2Px(binding.msg.marginTop)
-        binding.msg.layoutParams = layoutParams
-
-        binding.msg.textSize = application.px2PxFont(binding.msg.textSize)
-
-        (activity as MainActivity).fragmentReady(TAG)
-        return binding.root
-    }
-
-    fun show(msg: String) {
-        binding.msg.text = msg
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+        buttonText = resources.getString(R.string.dismiss_error)
+        buttonClickListener = View.OnClickListener {
+            fragmentManager!!.beginTransaction().remove(this@ErrorFragment).commit()
+        }
     }
 
     companion object {
-        private const val TAG = "ErrorFragment"
+        private const val TRANSLUCENT = false
     }
 }

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

@@ -1,16 +1,11 @@
 package com.lizongying.mytv
 
-import android.content.res.Resources
 import android.os.Bundle
 import android.os.Handler
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.marginBottom
-import androidx.core.view.marginStart
-import androidx.core.view.marginTop
-import androidx.core.view.setPadding
 import androidx.fragment.app.Fragment
 import com.bumptech.glide.Glide
 import com.lizongying.mytv.databinding.InfoBinding
@@ -21,64 +16,31 @@ class InfoFragment : Fragment() {
     private val binding get() = _binding!!
 
     private val handler = Handler()
-    private val delay: Long = 5000
+    private val delay: Long = 3000
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
         _binding = InfoBinding.inflate(inflater, container, false)
-
-        val application = requireActivity().applicationContext as MyTvApplication
-
-        binding.info.layoutParams.width = application.px2Px(binding.info.layoutParams.width)
-        binding.info.layoutParams.height = application.px2Px(binding.info.layoutParams.height)
-
-        val layoutParams = binding.info.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParams.bottomMargin = application.px2Px(binding.info.marginBottom)
-        binding.info.layoutParams = layoutParams
-
-        binding.logo.layoutParams.width = application.px2Px(binding.logo.layoutParams.width)
-        binding.logo.setPadding(application.px2Px(binding.logo.paddingTop))
-        binding.main.layoutParams.width = application.px2Px(binding.main.layoutParams.width)
-        binding.main.setPadding(application.px2Px(binding.main.paddingTop))
-
-        val layoutParamsMain = binding.main.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsMain.marginStart = application.px2Px(binding.main.marginStart)
-        binding.main.layoutParams = layoutParamsMain
-
-        val layoutParamsDesc = binding.desc.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsDesc.topMargin = application.px2Px(binding.desc.marginTop)
-        binding.desc.layoutParams = layoutParamsDesc
-
-        binding.title.textSize = application.px2PxFont(binding.title.textSize)
-        binding.desc.textSize = application.px2PxFont(binding.desc.textSize)
-
-        binding.container.layoutParams.width = application.shouldWidthPx()
-        binding.container.layoutParams.height = application.shouldHeightPx()
-
         _binding!!.root.visibility = View.GONE
-
-        (activity as MainActivity).fragmentReady(TAG)
+        (activity as MainActivity).fragmentReady("InfoFragment")
         return binding.root
     }
 
     fun show(tvViewModel: TVViewModel) {
-        if (_binding == null) {
-            return
-        }
-        binding.title.text = tvViewModel.getTV().title
+        binding.textView.text = tvViewModel.getTV().title
 
         Glide.with(this)
             .load(tvViewModel.getTV().logo)
-            .into(binding.logo)
+            .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.desc.text = epg.last().title
+            binding.infoDesc.text = epg.last().title
         } else {
-            binding.desc.text = ""
+            binding.infoDesc.text = ""
         }
 
         handler.removeCallbacks(removeRunnable)

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

@@ -1,29 +0,0 @@
-package com.lizongying.mytv
-
-import android.content.Context
-import android.graphics.Rect
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-
-class ItemDecoration(context: Context) : RecyclerView.ItemDecoration() {
-
-    private var application: MyTvApplication
-
-    init {
-        application = context.applicationContext as MyTvApplication
-    }
-
-    override fun getItemOffsets(
-        outRect: Rect,
-        view: View,
-        parent: RecyclerView,
-        state: RecyclerView.State
-    ) {
-        super.getItemOffsets(outRect, view, parent, state)
-        val space = application.dp2Px(5)
-        outRect.top = space
-        outRect.bottom = space
-        outRect.left = space
-        outRect.right = space
-    }
-}

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

@@ -1,37 +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.Fragment
-import com.lizongying.mytv.databinding.LoadingBinding
-
-class LoadingFragment : Fragment() {
-    private var _binding: LoadingBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = LoadingBinding.inflate(inflater, container, false)
-
-        val application = requireActivity().applicationContext as MyTvApplication
-
-        binding.bar.layoutParams.width = application.px2Px(binding.bar.layoutParams.width)
-        binding.bar.layoutParams.height = application.px2Px(binding.bar.layoutParams.height)
-
-        (activity as MainActivity).fragmentReady(TAG)
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        private const val TAG = "LoadingFragment"
-    }
-}

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

@@ -11,17 +11,13 @@ import android.util.Log
 import android.view.GestureDetector
 import android.view.KeyEvent
 import android.view.MotionEvent
-import android.view.View.SYSTEM_UI_FLAG_FULLSCREEN
+import android.view.View
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-import android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-import android.view.View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.models.TVViewModel
-import com.lizongying.mytv.requests.Request
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -32,14 +28,12 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
     private var ready = 0
     private val playerFragment = PlayerFragment()
-    private val errorFragment = ErrorFragment()
-
-    //    private val loadingFragment = LoadingFragment()
     private val mainFragment = MainFragment()
     private val infoFragment = InfoFragment()
     private val channelFragment = ChannelFragment()
     private var timeFragment = TimeFragment()
     private val settingFragment = SettingFragment()
+    private val errorFragment = ErrorFragment()
 
     private var doubleBackToExitPressedOnce = false
 
@@ -50,79 +44,64 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private val delayHideSetting: Long = 10000
 
     init {
-        Utils.setRequestListener(this)
-    }
-
-    private fun syncTime() {
         lifecycleScope.launch(Dispatchers.IO) {
             val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
+
             utilsJob.start()
+
+//            utilsJob.await()
         }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
+
         setContentView(R.layout.activity_main)
 
         Request.setRequestListener(this)
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            val lp = window.attributes
-            lp.layoutInDisplayCutoutMode =
-                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-            window.setAttributes(lp)
-        }
-
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-        window.decorView.systemUiVisibility =
-            SYSTEM_UI_FLAG_FULLSCREEN or
-                    SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or SYSTEM_UI_FLAG_HIDE_NAVIGATION or
-                    SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-//            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-//            window.statusBarColor = Color.TRANSPARENT
-//            window.navigationBarColor = Color.TRANSPARENT
-//        }
+        window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
 
         if (savedInstanceState == null) {
             supportFragmentManager.beginTransaction()
                 .add(R.id.main_browse_fragment, playerFragment)
-                .add(R.id.main_browse_fragment, errorFragment)
-//                .add(R.id.main_browse_fragment, loadingFragment)
                 .add(R.id.main_browse_fragment, timeFragment)
                 .add(R.id.main_browse_fragment, infoFragment)
                 .add(R.id.main_browse_fragment, channelFragment)
                 .add(R.id.main_browse_fragment, mainFragment)
                 .hide(mainFragment)
-                .hide(errorFragment)
-//                .hide(loadingFragment)
-                .hide(timeFragment)
                 .commit()
         }
         gestureDetector = GestureDetector(this, GestureListener())
 
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-//            val connectivityManager =
-//                getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-//            connectivityManager.registerDefaultNetworkCallback(object :
-//                ConnectivityManager.NetworkCallback() {
-//                override fun onAvailable(network: Network) {
-//                    super.onAvailable(network)
-//                    Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
-//                    if (this@MainActivity.isNetworkConnected) {
-//                        Log.i(TAG, "net isNetworkConnected")
-//                        ready++
-//                    }
-//                }
-//            })
-//        } else {
-//            Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
-//            ready++
-//        }
+        errorFragment.buttonClickListener = View.OnClickListener {
+            supportFragmentManager.beginTransaction()
+                .remove(errorFragment)
+                .commit()
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            val connectivityManager =
+                getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            connectivityManager.registerDefaultNetworkCallback(object :
+                ConnectivityManager.NetworkCallback() {
+                override fun onAvailable(network: Network) {
+                    super.onAvailable(network)
+                    Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
+                    if (this@MainActivity.isNetworkConnected) {
+                        Log.i(TAG, "net isNetworkConnected")
+                        ready++
+                    }
+                }
+            })
+        } else {
+            Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
+            ready++
+        }
 
-        showTime()
-        mainFragment.changeMenu()
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -132,44 +111,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }
     }
 
-    fun showErrorFragment(msg: String) {
-        errorFragment.show(msg)
-        if (errorFragment.isVisible) {
-            return
-        }
-        supportFragmentManager.beginTransaction()
-            .show(errorFragment)
-            .commit()
-    }
-
-    fun hideErrorFragment() {
-        errorFragment.show("")
-        if (!errorFragment.isVisible) {
-            return
-        }
-        supportFragmentManager.beginTransaction()
-            .hide(errorFragment)
-            .commit()
-    }
-
-    fun showPlayerFragment() {
-        if (playerFragment.isVisible) {
-            return
-        }
-        supportFragmentManager.beginTransaction()
-            .show(playerFragment)
-            .commit()
-    }
-
-    fun hidePlayerFragment() {
-        if (!playerFragment.isVisible) {
-            return
-        }
-        supportFragmentManager.beginTransaction()
-            .hide(playerFragment)
-            .commit()
-    }
-
     private fun showChannel(channel: String) {
         if (!mainFragment.isHidden) {
             return
@@ -186,6 +127,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
     fun play(tvViewModel: TVViewModel) {
         playerFragment.play(tvViewModel)
+        mainFragment.view?.requestFocus()
     }
 
     fun play(itemPosition: Int) {
@@ -200,11 +142,18 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         mainFragment.next()
     }
 
+    private fun prevSource() {
+//        mainFragment.prevSource()
+    }
+
+    private fun nextSource() {
+//        mainFragment.nextSource()
+    }
+
     fun switchMainFragment() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
-            mainFragment.setPosition()
             transaction.show(mainFragment)
             mainActive()
         } else {
@@ -223,7 +172,11 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         handler.removeCallbacks(hideSetting)
         handler.postDelayed(hideSetting, delayHideSetting)
         showTime()
-        mainFragment.changeMenu()
+    }
+
+    fun settingHideNow() {
+        handler.removeCallbacks(hideSetting)
+        handler.postDelayed(hideSetting, 0)
     }
 
     fun settingNeverHide() {
@@ -251,37 +204,27 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     fun fragmentReady(tag: String) {
         ready++
         Log.i(TAG, "ready $tag $ready ")
-        if (ready == 7) {
+        if (ready == 6) {
             mainFragment.fragmentReady()
+            showTime()
         }
     }
 
     private fun showTime() {
+        Log.i(TAG, "showTime ${SP.time}")
         if (SP.time) {
-            showFragment(timeFragment)
+            timeFragment.show()
         } else {
-            hideFragment(timeFragment)
+            timeFragment.hide()
         }
     }
 
-    private fun showFragment(fragment: Fragment) {
-        if (!fragment.isHidden) {
-            return
+    fun isPlaying() {
+        if (errorFragment.isVisible) {
+            supportFragmentManager.beginTransaction()
+                .remove(errorFragment)
+                .commit()
         }
-
-        supportFragmentManager.beginTransaction()
-            .show(fragment)
-            .commitNow()
-    }
-
-    private fun hideFragment(fragment: Fragment) {
-        if (fragment.isHidden) {
-            return
-        }
-
-        supportFragmentManager.beginTransaction()
-            .hide(fragment)
-            .commitNow()
     }
 
     override fun onTouchEvent(event: MotionEvent?): Boolean {
@@ -294,7 +237,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
 
         override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-            Log.i(TAG, "onSingleTapConfirmed")
             switchMainFragment()
             return true
         }
@@ -355,15 +297,9 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private val hideSetting = Runnable {
         if (settingFragment.isVisible) {
             settingFragment.dismiss()
-            showTime()
-            mainFragment.changeMenu()
         }
     }
 
-    private fun hideSettingFragment() {
-        handler.postDelayed(hideSetting, 0)
-    }
-
     private fun channelUp() {
         if (mainFragment.isHidden) {
             if (SP.channelReversal) {
@@ -403,11 +339,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             return
         }
 
-        if (settingFragment.isVisible) {
-            hideSettingFragment()
-            return
-        }
-
         if (doubleBackToExitPressedOnce) {
             super.onBackPressed()
             return
@@ -421,9 +352,8 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }, 2000)
     }
 
-
-    fun onKey(keyCode: Int): Boolean {
-        Log.i(TAG, "keyCode $keyCode")
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        Log.i(TAG, "keyCode $keyCode, event $event")
         when (keyCode) {
             KeyEvent.KEYCODE_0 -> {
                 showChannel("0")
@@ -535,26 +465,19 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
-                if (mainFragment.isHidden && !settingFragment.isVisible) {
+                if (!mainFragment.isVisible && !settingFragment.isVisible) {
                     switchMainFragment()
                     return true
                 }
             }
 
             KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                if (mainFragment.isHidden && !settingFragment.isVisible) {
+                if (!mainFragment.isVisible && !settingFragment.isVisible) {
                     showSetting()
                     return true
                 }
             }
         }
-        return false
-    }
-
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        if (onKey(keyCode)) {
-            return true
-        }
 
         return super.onKeyDown(keyCode, event)
     }
@@ -562,8 +485,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private fun getAppSignature() = this.appSignature
 
     override fun onStart() {
-        Log.i(TAG, "onStart MainActivity")
-        syncTime()
+        Log.i(TAG, "onStart")
         super.onStart()
     }
 
@@ -587,7 +509,13 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     }
 
     override fun onRequestFinished(message: String?) {
-        fragmentReady("request")
+        if (message != null && !errorFragment.isVisible) {
+            supportFragmentManager.beginTransaction()
+                .add(R.id.main_browse_fragment, errorFragment)
+                .commitNow()
+            errorFragment.setErrorContent(message)
+        }
+        fragmentReady("Request")
     }
 
     private companion object {

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

@@ -1,71 +1,72 @@
 package com.lizongying.mytv
 
-import android.content.res.Resources
-import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
-import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.view.marginBottom
-import androidx.core.view.marginStart
-import androidx.core.view.marginTop
-import androidx.fragment.app.Fragment
+import androidx.leanback.app.BrowseSupportFragment
+import androidx.leanback.widget.ArrayObjectAdapter
+import androidx.leanback.widget.HeaderItem
+import androidx.leanback.widget.ListRow
+import androidx.leanback.widget.ListRowPresenter
+import androidx.leanback.widget.ListRowPresenter.SelectItemViewHolderTask
+import androidx.leanback.widget.OnItemViewClickedListener
+import androidx.leanback.widget.OnItemViewSelectedListener
+import androidx.leanback.widget.Presenter
+import androidx.leanback.widget.Row
+import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.lizongying.mytv.api.YSP
-import com.lizongying.mytv.databinding.MenuBinding
-import com.lizongying.mytv.databinding.RowBinding
 import com.lizongying.mytv.models.ProgramType
-import com.lizongying.mytv.models.TVList
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
-import com.lizongying.mytv.requests.Request
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-
-class MainFragment : Fragment(), CardAdapter.ItemListener {
+class MainFragment : BrowseSupportFragment() {
 
     private var itemPosition = 0
 
-    private var rowList: MutableList<View> = mutableListOf()
-
-    private var _binding: MenuBinding? = null
-    private val binding get() = _binding!!
+    private var rowsAdapter: ArrayObjectAdapter? = null
 
     var tvListViewModel = TVListViewModel()
 
     private var lastVideoUrl = ""
 
-    private lateinit var application: MyTvApplication
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = MenuBinding.inflate(inflater, container, false)
-
-        application = requireActivity().applicationContext as MyTvApplication
-
-        binding.menu.layoutParams.width = application.shouldWidthPx()
-        binding.menu.layoutParams.height = application.shouldHeightPx()
-
-        binding.container.setOnClickListener {
-            hideSelf()
-        }
-
-        return binding.root
+    override fun onCreate(savedInstanceState: Bundle?) {
+        Log.i(TAG, "onCreate")
+        super.onCreate(savedInstanceState)
+        headersState = HEADERS_DISABLED
     }
 
-    private fun hideSelf() {
-        requireActivity().supportFragmentManager.beginTransaction()
-            .hide(this)
-            .commit()
+//    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?) {
@@ -73,230 +74,168 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
 
         activity?.let { YSP.init(it) }
 
-        itemPosition = SP.itemPosition
+        loadRows()
 
-        view?.post {
-            val content = binding.content
+        setupEventListeners()
 
-            var idx: Long = 0
-            for ((k, v) in TVList.list) {
-                val itemBinding: RowBinding =
-                    RowBinding.inflate(layoutInflater, content, false)
-
-                val tvListViewModelCurrent = TVListViewModel()
-                for ((idx2, v1) in v.withIndex()) {
-                    val tvViewModel = TVViewModel(v1)
-                    tvViewModel.setRowPosition(idx.toInt())
-                    tvViewModel.setItemPosition(idx2)
-                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
-                    tvListViewModel.addTVViewModel(tvViewModel)
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                if (tvViewModel.errInfo.value != null
+                    && tvViewModel.getTV().id == itemPosition
+                ) {
+                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
                 }
-                tvListViewModel.maxNum.add(v.size)
-
-                val adapter =
-                    CardAdapter(
-                        itemBinding.items,
-                        this,
-                        tvListViewModelCurrent,
-                    )
-                rowList.add(itemBinding.items)
-
-                adapter.setItemListener(this)
-
-                itemBinding.header.text = k
-                itemBinding.items.tag = idx.toInt()
-                itemBinding.items.adapter = adapter
-
-                itemBinding.items.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                    override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                        super.onScrolled(recyclerView, dx, dy)
-                        (activity as MainActivity).mainActive()
-                    }
-                })
-
-                val itemDecoration = context?.let { ItemDecoration(it) }
-                if (itemDecoration != null) {
-                    itemBinding.items.addItemDecoration(itemDecoration)
-                }
-
-                if (SP.grid) {
-                    itemBinding.items.layoutManager =
-                        GridLayoutManager(context, 6)
-                    itemBinding.items.layoutParams.height =
-                        application.dp2Px(110 * ((tvListViewModelCurrent.size() + 6 - 1) / 6) + 5)
-                } else {
-                    itemBinding.items.layoutManager =
-                        LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-                }
-
-                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
-                layoutParams.topMargin = application.dp2Px(11)
-                itemBinding.row.layoutParams = layoutParams
-                itemBinding.row.setOnClickListener {
-                    hideSelf()
-                }
-
-                val layoutParamsHeader =
-                    itemBinding.header.layoutParams as ViewGroup.MarginLayoutParams
-                layoutParamsHeader.topMargin = application.px2Px(itemBinding.header.marginTop)
-                layoutParamsHeader.bottomMargin = application.px2Px(itemBinding.header.marginBottom)
-                layoutParamsHeader.marginStart = application.px2Px(itemBinding.header.marginStart)
-                itemBinding.header.layoutParams = layoutParamsHeader
-                itemBinding.header.textSize = application.px2PxFont(itemBinding.header.textSize)
-
-                content.addView(itemBinding.row)
-
-                idx++
             }
+            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
 
-            if (itemPosition >= tvListViewModel.size()) {
-                itemPosition = 0
+                // not first time && channel not change
+                if (tvViewModel.ready.value != null
+                    && tvViewModel.getTV().id == itemPosition
+                    && check(tvViewModel)
+                ) {
+                    Log.i(TAG, "ready ${tvViewModel.getTV().title}")
+                    (activity as? MainActivity)?.play(tvViewModel)
+                }
             }
-
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.errInfo.value != null
-                        && tvViewModel.getTV().id == itemPosition
-                    ) {
-                        if (tvViewModel.errInfo.value == "") {
-                            (activity as? MainActivity)?.showPlayerFragment()
-                            (activity as? MainActivity)?.hideErrorFragment()
-                        } else {
-                            (activity as? MainActivity)?.hidePlayerFragment()
-                            (activity as? MainActivity)?.showErrorFragment(tvViewModel.errInfo.value.toString())
+            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
+                if (tvViewModel.change.value != null) {
+                    val title = tvViewModel.getTV().title
+                    Log.i(TAG, "switch $title")
+                    if (tvViewModel.getTV().pid != "") {
+                        Log.i(TAG, "request $title")
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            tvViewModel.let { Request.fetchData(it) }
                         }
-                    }
-                }
-                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
-
-                    // not first time && channel not change
-                    if (tvViewModel.ready.value != null
-                        && tvViewModel.getTV().id == itemPosition
-                        && check(tvViewModel)
-                    ) {
-                        Log.i(TAG, "ready ${tvViewModel.getTV().title}")
-                        (activity as? MainActivity)?.play(tvViewModel)
-                    }
-                }
-                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.change.value != null) {
-                        val title = tvViewModel.getTV().title
-                        Log.i(TAG, "switch $title")
-                        if (tvViewModel.getTV().pid != "") {
-                            Log.i(TAG, "request $title")
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { Request.fetchData(it) }
-                            }
+                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                        setSelectedPosition(
+                            tvViewModel.getRowPosition(), true,
+                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
+                        )
+                    } else {
+                        if (check(tvViewModel)) {
+                            (activity as? MainActivity)?.play(tvViewModel)
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setPosition(
-                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                            setSelectedPosition(
+                                tvViewModel.getRowPosition(), true,
+                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
                             )
-                        } else {
-                            if (check(tvViewModel)) {
-                                // TODO lastVideoUrl
-                                (activity as? MainActivity)?.play(tvViewModel)
-                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                                setPosition(
-                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
-                                )
-                            }
                         }
                     }
                 }
             }
-            (activity as MainActivity).fragmentReady(TAG)
         }
+
+        (activity as MainActivity).fragmentReady("MainFragment")
     }
 
-    fun changeMenu() {
-        if (SP.grid) {
-            for (i in rowList) {
-                if (i is RecyclerView) {
-                    i.layoutManager = GridLayoutManager(context, 6)
-                    i.layoutParams.height =
-                        application.dp2Px(110 * (((i.adapter as CardAdapter).getItemCount() + 6 - 1) / 6) + 5)
-                }
+    fun toLastPosition() {
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
+        )
+    }
+
+    fun toFirstPosition() {
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(0)
+        )
+    }
+
+    override fun startHeadersTransition(withHeaders: Boolean) {
+    }
+
+    private fun loadRows() {
+        rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
+
+        val cardPresenter = CardPresenter(context!!)
+
+        var idx: Long = 0
+        for ((k, v) in TVList.list) {
+            val listRowAdapter = ArrayObjectAdapter(cardPresenter)
+            for ((idx2, v1) in v.withIndex()) {
+                val tvViewModel = TVViewModel(v1)
+                tvViewModel.setRowPosition(idx.toInt())
+                tvViewModel.setItemPosition(idx2)
+                tvListViewModel.addTVViewModel(tvViewModel)
+                listRowAdapter.add(tvViewModel)
             }
-        } else {
-            for (i in rowList) {
-                if (i is RecyclerView) {
-                    i.layoutManager =
-                        LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-                    i.layoutParams.height = application.dp2Px(110 + 5)
+            tvListViewModel.maxNum.add(v.size)
+            val header = HeaderItem(idx, k)
+            rowsAdapter!!.add(ListRow(header, listRowAdapter))
+            idx++
+        }
+
+        adapter = rowsAdapter
+
+        itemPosition = SP.itemPosition
+        if (itemPosition >= tvListViewModel.size()) {
+            itemPosition = 0
+        }
+        tvListViewModel.setItemPosition(itemPosition)
+    }
+
+    fun prevSource() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.minus(1)
+                    if (videoIndex == -1) {
+                        tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
+                    }
+                    tvViewModel.changed()
                 }
             }
         }
     }
 
-    override fun onKey(keyCode: Int): Boolean {
-        if (this.isHidden) {
-            when (keyCode) {
-                KeyEvent.KEYCODE_DPAD_UP -> {
-                    (activity as MainActivity).onKey(keyCode)
-                    return true
-                }
-
-                KeyEvent.KEYCODE_DPAD_DOWN -> {
-                    (activity as MainActivity).onKey(keyCode)
-                    return true
+    fun nextSource() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
+                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
+                        tvViewModel.setVideoIndex(0)
+                    }
+                    tvViewModel.changed()
                 }
             }
         }
-        return false
     }
 
-    override fun onItemHasFocus(tvViewModel: TVViewModel) {
-        val row = tvViewModel.getRowPosition()
+    private fun setupEventListeners() {
+        onItemViewClickedListener = ItemViewClickedListener()
+        onItemViewSelectedListener = ItemViewSelectedListener()
+    }
 
-        for (i in rowList) {
-            if (i.tag as Int != row) {
-                ((i as RecyclerView).adapter as CardAdapter).focusable = false
-                (i.adapter as CardAdapter).clear()
-            } else {
-                ((i as RecyclerView).adapter as CardAdapter).focusable = true
+    private inner class ItemViewClickedListener : OnItemViewClickedListener {
+        override fun onItemClicked(
+            itemViewHolder: Presenter.ViewHolder,
+            item: Any,
+            rowViewHolder: RowPresenter.ViewHolder,
+            row: Row
+        ) {
+            if (item is TVViewModel) {
+                if (itemPosition != item.getTV().id) {
+                    itemPosition = item.getTV().id
+                    tvListViewModel.setItemPosition(itemPosition)
+                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
+                }
+                (activity as? MainActivity)?.switchMainFragment()
             }
         }
-
-        (activity as MainActivity).mainActive()
     }
 
-    override fun onItemClicked(tvViewModel: TVViewModel) {
-        if (this.isHidden) {
-            (activity as? MainActivity)?.switchMainFragment()
-            return
-        }
-
-        if (itemPosition != tvViewModel.getTV().id) {
-            itemPosition = tvViewModel.getTV().id
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed("menu")
-            Log.i(TAG, "onItemClicked ${tvViewModel.getTV().id}")
-        }
-        (activity as? MainActivity)?.switchMainFragment()
-    }
-
-    fun setPosition() {
-        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition) ?: return
-        val rowPosition = tvViewModel.getRowPosition()
-        val itemPosition = tvViewModel.getItemPosition()
-        setPosition(rowPosition, itemPosition)
-    }
-
-    fun setPosition(rowPosition: Int, itemPosition: Int) {
-        rowList[rowPosition].post {
-            when (val layoutManager = (rowList[rowPosition] as RecyclerView).layoutManager) {
-                is GridLayoutManager -> {
-                    layoutManager.findViewByPosition(
-                        itemPosition
-                    )?.requestFocus()
-                }
-
-                is LinearLayoutManager -> {
-                    layoutManager.findViewByPosition(
-                        itemPosition
-                    )?.requestFocus()
-                }
+    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
+        override fun onItemSelected(
+            itemViewHolder: Presenter.ViewHolder?, item: Any?,
+            rowViewHolder: RowPresenter.ViewHolder, row: Row
+        ) {
+            if (item is TVViewModel) {
+                tvListViewModel.setItemPositionCurrent(item.getTV().id)
+                (activity as MainActivity).mainActive()
             }
         }
     }
@@ -318,7 +257,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     }
 
     fun fragmentReady() {
-        tvListViewModel.getTVViewModel(itemPosition)?.changed("init")
+        tvListViewModel.getTVViewModel(itemPosition)?.changed()
 
         tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
             updateEPG(tvViewModel)
@@ -330,7 +269,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
             if (itemPosition > -1 && itemPosition < tvListViewModel.size()) {
                 this.itemPosition = itemPosition
                 tvListViewModel.setItemPosition(itemPosition)
-                tvListViewModel.getTVViewModel(itemPosition)?.changed("num")
+                tvListViewModel.getTVViewModel(itemPosition)?.changed()
             } else {
                 Toast.makeText(context, "频道不存在", Toast.LENGTH_SHORT).show()
             }
@@ -344,7 +283,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                 itemPosition = tvListViewModel.size() - 1
             }
             tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed("prev")
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
         }
     }
 
@@ -355,7 +294,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                 itemPosition = 0
             }
             tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed("next")
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
         }
     }
 
@@ -375,51 +314,23 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         }
     }
 
-    fun shouldHasFocus(tvModel: TVViewModel): Boolean {
-        return tvModel == tvListViewModel.getTVViewModel(itemPosition)
-    }
-
-    override fun onHiddenChanged(hidden: Boolean) {
-        Log.i(TAG, "onHiddenChanged $hidden")
-        super.onHiddenChanged(hidden)
-        if (!hidden) {
-            val tvModel = tvListViewModel.getTVViewModel(itemPosition)
-            val rowPosition = tvModel?.getRowPosition()
-            val itemPosition = tvModel?.getItemPosition()
-            Log.i(TAG, "toPosition $rowPosition $itemPosition")
-            for (i in rowList) {
-                if (i.tag as Int == rowPosition) {
-                    ((i as RecyclerView).adapter as CardAdapter).updateEPG()
-                    (i.adapter as CardAdapter).focusable = true
-                    (i.adapter as CardAdapter).toPosition(itemPosition!!)
-                    break
-                }
-            }
-        } else {
-            view?.post {
-                for (i in rowList) {
-                    ((i as RecyclerView).adapter as CardAdapter).focusable = false
-                }
-            }
-        }
-    }
-
     override fun onResume() {
         Log.i(TAG, "onResume")
         super.onResume()
     }
 
+    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()
     }
 
-    override fun onDestroyView() {
-        Log.i(TAG, "onDestroyView")
-        super.onDestroyView()
-        _binding = null
-    }
-
     companion object {
         private const val TAG = "MainFragment"
         private const val POSITION = "position"

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

@@ -0,0 +1,23 @@
+package com.lizongying.mytv
+
+import android.app.Application
+import android.content.Context
+import android.util.DisplayMetrics
+import android.view.WindowManager
+
+class MyApplication : Application() {
+    private lateinit var displayMetrics: DisplayMetrics
+
+    override fun onCreate() {
+        super.onCreate()
+
+        displayMetrics = DisplayMetrics()
+        val windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
+//        windowManager.defaultDisplay.getRealMetrics(displayMetrics)
+        windowManager.defaultDisplay.getMetrics(displayMetrics)
+    }
+
+    fun getDisplayMetrics(): DisplayMetrics {
+        return displayMetrics
+    }
+}

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

@@ -1,117 +0,0 @@
-package com.lizongying.mytv
-
-import android.app.Application
-import android.content.Context
-import android.content.res.Resources
-import android.util.DisplayMetrics
-import android.view.WindowManager
-import androidx.multidex.MultiDex
-
-
-class MyTvApplication : Application() {
-    private lateinit var displayMetrics: DisplayMetrics
-    private lateinit var realDisplayMetrics: DisplayMetrics
-
-    private lateinit var windowManager: WindowManager
-
-    private var width = 0
-    private var height = 0
-    private var shouldWidth = 0
-    private var shouldHeight = 0
-    private var deviation = 0
-    private var ratio = 1.0
-    private var density = 2.0f
-    private var scale = 1.0f
-
-    override fun onCreate() {
-        super.onCreate()
-
-        displayMetrics = DisplayMetrics()
-        realDisplayMetrics = DisplayMetrics()
-        windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
-        windowManager.defaultDisplay.getMetrics(displayMetrics)
-        windowManager.defaultDisplay.getRealMetrics(realDisplayMetrics)
-
-        if (realDisplayMetrics.heightPixels > realDisplayMetrics.widthPixels) {
-            width = realDisplayMetrics.heightPixels
-            height = realDisplayMetrics.widthPixels
-        } else {
-            width = realDisplayMetrics.widthPixels
-            height = realDisplayMetrics.heightPixels
-        }
-
-        density = displayMetrics.density
-
-        ratio = if ((width.toDouble() / height) < (16.0 / 9)) {
-            width * 2 / 1920.0 / density
-        } else {
-            height * 2 / 1080.0 / density
-        }
-
-        if ((width.toDouble() / height) < (16.0 / 9.0)) {
-            ratio = width * 2 / 1920.0 / density
-            shouldWidth = width
-            shouldHeight = (width * 9.0 / 16.0).toInt()
-        } else {
-            ratio = height * 2 / 1080.0 / density
-            shouldHeight = height
-            shouldWidth = (height * 16.0 / 9.0).toInt()
-        }
-
-        deviation = width - Resources.getSystem().displayMetrics.widthPixels
-        scale = Resources.getSystem().displayMetrics.scaledDensity
-    }
-
-    fun getDisplayMetrics(): DisplayMetrics {
-        return displayMetrics
-    }
-
-    fun getRealDisplayMetrics(): DisplayMetrics {
-        return realDisplayMetrics
-    }
-
-    fun shouldWidthPx(): Int {
-        return shouldWidth
-    }
-
-    fun shouldHeightPx(): Int {
-        return shouldHeight
-    }
-
-    fun getWidth(): Int {
-        return width
-    }
-
-    fun getHeight(): Int {
-        return height
-    }
-
-    fun getDeviation(): Int {
-        return deviation
-    }
-
-    fun getRatio(): Double {
-        return ratio
-    }
-
-    fun dp2Px(dp: Int): Int {
-        return (dp * ratio * density + 0.5f).toInt()
-    }
-
-    fun px2Px(px: Int): Int {
-        return (px * ratio + 0.5f).toInt()
-    }
-
-    fun px2PxFont(px: Float): Float {
-        return (px * ratio / scale).toFloat()
-    }
-
-    fun sp2Px(sp: Float): Float {
-        return (sp * ratio * scale).toFloat()
-    }
-
-    override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
-        MultiDex.install(base)
-    }
-}

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

@@ -78,22 +78,21 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
 
                     override fun onPlayerError(error: PlaybackException) {
                         super.onPlayerError(error)
+
                         Log.e(TAG, "PlaybackException $error")
-                        val err = "播放错误"
-                        tvViewModel?.setErrInfo(err)
-                        tvViewModel?.changed("retry")
+                        tvViewModel?.changed()
                     }
 
                     override fun onIsPlayingChanged(isPlaying: Boolean) {
                         super.onIsPlayingChanged(isPlaying)
                         if (isPlaying) {
-                            tvViewModel?.setErrInfo("")
+                            (activity as MainActivity).isPlaying()
                         }
                     }
                 })
             }
         })
-        (activity as MainActivity).fragmentReady(TAG)
+        (activity as MainActivity).fragmentReady("PlayerFragment")
         return _binding!!.root
     }
 
@@ -154,7 +153,7 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
     }
 
     companion object {
-        private const val TAG = "PlayerFragment"
+        private const val TAG = "PlaybackVideoFragment"
     }
 
     override fun surfaceCreated(holder: SurfaceHolder) {

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

@@ -1,10 +1,9 @@
-package com.lizongying.mytv.requests
+package com.lizongying.mytv
 
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
-import com.lizongying.mytv.Utils
 import com.lizongying.mytv.Utils.getDateFormat
 import com.lizongying.mytv.api.ApiClient
 import com.lizongying.mytv.api.Auth
@@ -24,7 +23,6 @@ import com.lizongying.mytv.api.YSPBtraceService
 import com.lizongying.mytv.api.YSPJceService
 import com.lizongying.mytv.api.YSPProtoService
 import com.lizongying.mytv.api.YSPTokenService
-import com.lizongying.mytv.models.TVList
 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
@@ -54,7 +52,7 @@ object Request {
     private var token = ""
     private var tokenFH = ""
 
-    private var needAuth = true
+    private var needAuth = false
     private var needToken = false
 
     private val handler = Handler(Looper.getMainLooper())
@@ -118,19 +116,11 @@ object Request {
                                 } else {
                                     if (!tvModel.getTV().mustToken) {
                                         fetchAuth(tvModel, cookie)
-                                    } else {
-                                        val err = "错误"
-                                        Log.e(TAG, "$title $err")
-                                        tvModel.setErrInfo(err)
                                     }
                                 }
                             } else {
                                 fetchAuth(tvModel, cookie)
                             }
-                        } else {
-                            val err = "认证结果错误"
-                            Log.e(TAG, "$title $err")
-                            tvModel.setErrInfo(err)
                         }
                     }
                 } else {
@@ -145,19 +135,11 @@ object Request {
                             } else {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchAuth(tvModel, cookie)
-                                } else {
-                                    val err = "错误"
-                                    Log.e(TAG, "$title $err")
-                                    tvModel.setErrInfo(err)
                                 }
                             }
                         } else {
                             fetchAuth(tvModel, cookie)
                         }
-                    } else {
-                        val err = "认证状态错误"
-                        Log.e(TAG, "$title $err")
-                        tvModel.setErrInfo(err)
                     }
                 }
             }
@@ -174,19 +156,11 @@ object Request {
                         } else {
                             if (!tvModel.getTV().mustToken) {
                                 fetchAuth(tvModel, cookie)
-                            } else {
-                                val err = "错误"
-                                Log.e(TAG, "$title $err")
-                                tvModel.setErrInfo(err)
                             }
                         }
                     } else {
                         fetchAuth(tvModel, cookie)
                     }
-                } else {
-                    val err = "认证请求错误"
-                    Log.e(TAG, "$title $err")
-                    tvModel.setErrInfo(err)
                 }
             }
         })
@@ -195,7 +169,7 @@ object Request {
     private fun fetchVideo(tvModel: TVViewModel, cookie: String) {
         cancelCall()
 
-        if (Request::btraceRunnable.isInitialized) {
+        if (::btraceRunnable.isInitialized) {
             handler.removeCallbacks(btraceRunnable)
         }
 
@@ -247,42 +221,24 @@ object Request {
                                     if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
                                         tvModel.tokenYSPRetryTimes++
                                         tvModel.needGetToken = true
-                                        if (needAuth) {
-                                            fetchAuth(tvModel)
-                                        } else {
-                                            fetchVideo(tvModel)
-                                        }
+                                        fetchVideo(tvModel)
+//                                        fetchAuth(tvModel)
                                     } else {
                                         if (!tvModel.getTV().mustToken) {
-                                            if (needAuth) {
-                                                fetchAuth(tvModel, cookie)
-                                            } else {
-                                                fetchVideo(tvModel, cookie)
-                                            }
-                                        } else {
-                                            val err = "错误"
-                                            Log.e(TAG, "$title $err")
-                                            tvModel.setErrInfo(err)
+                                            fetchVideo(tvModel, cookie)
+//                                            fetchAuth(tvModel, cookie)
                                         }
                                     }
                                 } else {
-                                    if (needAuth) {
-                                        fetchAuth(tvModel, cookie)
-                                    } else {
-                                        fetchVideo(tvModel, cookie)
-                                    }
+                                    fetchVideo(tvModel, cookie)
+//                                    fetchAuth(tvModel, cookie)
                                 }
-                            } else {
-                                val err = "结果错误"
-                                Log.e(TAG, "$title $err")
-                                tvModel.setErrInfo(err)
                             }
                         }
                     } else {
                         if (liveInfo?.data?.errinfo != null && liveInfo.data.errinfo == "应版权方要求，暂停提供直播信号，请点击观看其他精彩节目") {
-                            val err = "版权错误"
-                            Log.e(TAG, "$title $err")
-                            tvModel.setErrInfo(err)
+                            Log.e(TAG, "$title error ${liveInfo.data.errinfo}")
+                            tvModel.setErrInfo(liveInfo.data.errinfo)
                         } else {
                             Log.e(TAG, "$title url error $request $liveInfo")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
@@ -291,35 +247,18 @@ object Request {
                                     if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
                                         tvModel.tokenYSPRetryTimes++
                                         tvModel.needGetToken = true
-                                        if (needAuth) {
-                                            fetchAuth(tvModel)
-                                        } else {
-                                            fetchVideo(tvModel)
-                                        }
+                                        fetchVideo(tvModel)
+//                                        fetchAuth(tvModel)
                                     } else {
                                         if (!tvModel.getTV().mustToken) {
-                                            if (needAuth) {
-                                                fetchAuth(tvModel, cookie)
-                                            } else {
-                                                fetchVideo(tvModel, cookie)
-                                            }
-                                        } else {
-                                            val err = "错误"
-                                            Log.e(TAG, "$title $err")
-                                            tvModel.setErrInfo(err)
+                                            fetchVideo(tvModel, cookie)
+//                                            fetchAuth(tvModel, cookie)
                                         }
                                     }
                                 } else {
-                                    if (needAuth) {
-                                        fetchAuth(tvModel, cookie)
-                                    } else {
-                                        fetchVideo(tvModel, cookie)
-                                    }
+                                    fetchVideo(tvModel, cookie)
+//                                    fetchAuth(tvModel, cookie)
                                 }
-                            } else {
-                                val err = "其他错误"
-                                Log.e(TAG, "$title $err")
-                                tvModel.setErrInfo(err)
                             }
                         }
                     }
@@ -331,35 +270,18 @@ object Request {
                             if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
                                 tvModel.tokenYSPRetryTimes++
                                 tvModel.needGetToken = true
-                                if (needAuth) {
-                                    fetchAuth(tvModel, cookie)
-                                } else {
-                                    fetchVideo(tvModel, cookie)
-                                }
+                                fetchVideo(tvModel)
+//                                fetchAuth(tvModel)
                             } else {
                                 if (!tvModel.getTV().mustToken) {
-                                    if (needAuth) {
-                                        fetchAuth(tvModel, cookie)
-                                    } else {
-                                        fetchVideo(tvModel, cookie)
-                                    }
-                                } else {
-                                    val err = "错误"
-                                    Log.e(TAG, "$title $err")
-                                    tvModel.setErrInfo(err)
+                                    fetchVideo(tvModel, cookie)
+//                                    fetchAuth(tvModel, cookie)
                                 }
                             }
                         } else {
-                            if (needAuth) {
-                                fetchAuth(tvModel, cookie)
-                            } else {
-                                fetchVideo(tvModel, cookie)
-                            }
+                            fetchVideo(tvModel, cookie)
+//                            fetchAuth(tvModel, cookie)
                         }
-                    } else {
-                        val err = "状态错误"
-                        Log.e(TAG, "$title $err")
-                        tvModel.setErrInfo(err)
                     }
                 }
             }
@@ -376,17 +298,11 @@ object Request {
                         } else {
                             if (!tvModel.getTV().mustToken) {
                                 fetchVideo(tvModel, cookie)
-                            } else {
-//                                TODO
                             }
                         }
                     } else {
                         fetchVideo(tvModel, cookie)
                     }
-                } else {
-                    val err = "请求错误"
-                    Log.e(TAG, "$title $err")
-                    tvModel.setErrInfo(err)
                 }
             }
         })
@@ -422,8 +338,6 @@ object Request {
                                 val cookie =
                                     "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                                 fetchAuth(tvModel, cookie)
-                            } else {
-//                                TODO
                             }
                         }
                     }
@@ -439,8 +353,6 @@ object Request {
                             val cookie =
                                 "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                             fetchAuth(tvModel, cookie)
-                        } else {
-//                                TODO
                         }
                     }
                 }
@@ -483,8 +395,6 @@ object Request {
                                 val cookie =
                                     "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                                 fetchVideo(tvModel, cookie)
-                            } else {
-//                                TODO
                             }
                         }
                     }
@@ -500,8 +410,6 @@ object Request {
                             val cookie =
                                 "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                             fetchVideo(tvModel, cookie)
-                        } else {
-//                                TODO
                         }
                     }
                 }
@@ -537,10 +445,6 @@ object Request {
                     if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
                         tvModel.tokenFHRetryTimes++
                         fetchFAuth(tvModel)
-                    } else {
-                        val err = "状态错误"
-                        Log.e(TAG, "$title $err")
-                        tvModel.setErrInfo(err)
                     }
                 }
             }
@@ -550,10 +454,6 @@ object Request {
                 if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
                     tvModel.tokenFHRetryTimes++
                     fetchFAuth(tvModel)
-                } else {
-                    val err = "请求错误"
-                    Log.e(TAG, "$title $err")
-                    tvModel.setErrInfo(err)
                 }
             }
         })
@@ -915,6 +815,6 @@ object Request {
     }
 
     fun setRequestListener(listener: RequestListener) {
-        Request.listener = listener
+        this.listener = listener
     }
 }

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

@@ -5,8 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
-import androidx.core.view.marginEnd
-import androidx.core.view.marginTop
 import androidx.fragment.app.DialogFragment
 import com.lizongying.mytv.databinding.SettingBinding
 
@@ -73,14 +71,6 @@ class SettingFragment : DialogFragment() {
             }
         }
 
-        binding.switchGrid.run {
-            isChecked = SP.grid
-            setOnCheckedChangeListener { _, isChecked ->
-                SP.grid = isChecked
-                (activity as MainActivity).settingDelayHide()
-            }
-        }
-
         updateManager = UpdateManager(context, this, context.appVersionCode)
         binding.checkVersion.setOnClickListener(
             OnClickListenerCheckVersion(
@@ -89,67 +79,7 @@ class SettingFragment : DialogFragment() {
             )
         )
 
-        val application = requireActivity().applicationContext as MyTvApplication
-
-        binding.content.layoutParams.width =
-            application.px2Px(binding.content.layoutParams.width)
-        binding.content.setPadding(
-            application.px2Px(binding.content.paddingLeft),
-            application.px2Px(binding.content.paddingTop),
-            application.px2Px(binding.content.paddingRight),
-            application.px2Px(binding.content.paddingBottom)
-        )
-        binding.name.textSize = application.px2PxFont(binding.name.textSize)
-        binding.version.textSize = application.px2PxFont(binding.version.textSize)
-        val layoutParamsVersion = binding.version.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsVersion.topMargin = application.px2Px(binding.version.marginTop)
-        binding.version.layoutParams = layoutParamsVersion
-
-        binding.checkVersion.textSize = application.px2PxFont(binding.checkVersion.textSize)
-        val layoutParamsCheckVersion =
-            binding.checkVersion.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsCheckVersion.marginEnd = application.px2Px(binding.checkVersion.marginEnd)
-        binding.checkVersion.layoutParams = layoutParamsCheckVersion
-
-        binding.versionName.textSize = application.px2PxFont(binding.versionName.textSize)
-
-        binding.exit.textSize = application.px2PxFont(binding.exit.textSize)
-
-        binding.switchChannelReversal.textSize =
-            application.px2PxFont(binding.switchChannelReversal.textSize)
-        val layoutParamsChannelReversal =
-            binding.switchChannelReversal.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsChannelReversal.topMargin =
-            application.px2Px(binding.switchChannelReversal.marginTop)
-        binding.switchChannelReversal.layoutParams = layoutParamsChannelReversal
-
-        binding.switchChannelNum.textSize = application.px2PxFont(binding.switchChannelNum.textSize)
-        val layoutParamsChannelNum =
-            binding.switchChannelNum.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsChannelNum.topMargin = application.px2Px(binding.switchChannelNum.marginTop)
-        binding.switchChannelNum.layoutParams = layoutParamsChannelNum
-
-        binding.switchTime.textSize = application.px2PxFont(binding.switchTime.textSize)
-        val layoutParamsTime = binding.switchTime.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsTime.topMargin = application.px2Px(binding.switchTime.marginTop)
-        binding.switchTime.layoutParams = layoutParamsTime
-
-        binding.switchBootStartup.textSize =
-            application.px2PxFont(binding.switchBootStartup.textSize)
-        val layoutParamsBootStartup =
-            binding.switchBootStartup.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsBootStartup.topMargin = application.px2Px(binding.switchBootStartup.marginTop)
-        binding.switchBootStartup.layoutParams = layoutParamsBootStartup
-
-        binding.switchGrid.textSize = application.px2PxFont(binding.switchGrid.textSize)
-        val layoutParamsGrid = binding.switchGrid.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsGrid.topMargin = application.px2Px(binding.switchGrid.marginTop)
-        binding.switchGrid.layoutParams = layoutParamsGrid
-
-        binding.appreciate.layoutParams.width =
-            application.px2Px(binding.appreciate.layoutParams.width)
-
-        binding.exit.setOnClickListener {
+        binding.exit.setOnClickListener{
             requireActivity().finishAffinity()
         }
 

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

@@ -1,4 +1,4 @@
-package com.lizongying.mytv.models
+package com.lizongying.mytv
 
 import com.lizongying.mytv.models.ProgramType
 import java.io.Serializable
@@ -15,21 +15,18 @@ data class TV(
     var programType: ProgramType,
     var needToken: Boolean = false,
     var mustToken: Boolean = false,
-) : Serializable {
+
+    ) : Serializable {
 
     override fun toString(): String {
         return "TV{" +
                 "id=" + id +
                 ", title='" + title + '\'' +
-                ", alias='" + alias + '\'' +
                 ", videoUrl='" + videoUrl + '\'' +
-                ", channel='" + channel + '\'' +
                 ", logo='" + logo + '\'' +
                 ", pid='" + pid + '\'' +
                 ", sid='" + sid + '\'' +
                 ", programType='" + programType + '\'' +
-                ", needToken='" + needToken + '\'' +
-                ", mustToken='" + mustToken + '\'' +
                 '}'
     }
 }

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

@@ -1,6 +1,6 @@
-package com.lizongying.mytv.models
+package com.lizongying.mytv
 
-import com.lizongying.mytv.R
+import com.lizongying.mytv.models.ProgramType
 
 object TVList {
     val list: Map<String, List<TV>> by lazy {
@@ -900,7 +900,6 @@ object TVList {
             v.forEach { v1 ->
                 if (!v1.mustToken) {
                     v1.id = id
-                    v1.needToken = false
                     id++
                     group.add(v1)
                 }

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

@@ -1,13 +1,11 @@
 package com.lizongying.mytv
 
-import android.content.res.Resources
 import android.os.Bundle
 import android.os.Handler
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.marginEnd
-import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import com.lizongying.mytv.Utils.getDateFormat
 import com.lizongying.mytv.databinding.TimeBinding
@@ -23,49 +21,74 @@ class TimeFragment : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        Log.i(TAG, "onCreateView")
         _binding = TimeBinding.inflate(inflater, container, false)
 
-        val application = requireActivity().applicationContext as MyTvApplication
+        val activity = requireActivity()
+        val application = activity.applicationContext as MyApplication
+        val displayMetrics = application.getDisplayMetrics()
 
-        binding.time.layoutParams.width = application.px2Px(binding.time.layoutParams.width)
-        binding.time.layoutParams.height = application.px2Px(binding.time.layoutParams.height)
+        displayMetrics.density
 
-        val layoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParams.topMargin = application.px2Px(binding.time.marginTop)
-        layoutParams.marginEnd = application.px2Px(binding.time.marginEnd)
-        binding.time.layoutParams = layoutParams
+        var screenWidth = displayMetrics.widthPixels
+        var screenHeight = displayMetrics.heightPixels
+        if (screenHeight > screenWidth) {
+            screenWidth = displayMetrics.heightPixels
+            screenHeight = displayMetrics.widthPixels
+        }
 
-        binding.content.textSize = application.px2PxFont(binding.content.textSize)
+        val ratio = 16f / 9f
 
-        binding.main.layoutParams.width = application.shouldWidthPx()
-        binding.main.layoutParams.height = application.shouldHeightPx()
+        if (screenWidth / screenHeight > ratio) {
+            val x = ((screenWidth - screenHeight * ratio) / 2).toInt()
+            val originalLayoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
+            originalLayoutParams.rightMargin += x
+            binding.time.layoutParams = originalLayoutParams
+        }
 
-        (activity as MainActivity).fragmentReady(TAG)
+        if (screenWidth / screenHeight < ratio) {
+            val y = ((screenHeight - screenWidth / ratio) / 2).toInt()
+            val originalLayoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
+            originalLayoutParams.topMargin += y
+            binding.time.layoutParams = originalLayoutParams
+        }
+
+        (activity as MainActivity).fragmentReady("TimeFragment")
         return binding.root
     }
 
-    override fun onHiddenChanged(hidden: Boolean) {
-        super.onHiddenChanged(hidden)
-        if (!hidden) {
+    override fun onResume() {
+        super.onResume()
+        if (view?.visibility == View.VISIBLE) {
             handler.removeCallbacks(showRunnable)
             handler.postDelayed(showRunnable, 0)
-        } else {
-            handler.removeCallbacks(showRunnable)
         }
     }
 
+    override fun onPause() {
+        super.onPause()
+        handler.removeCallbacks(showRunnable)
+    }
+
     private val showRunnable: Runnable = Runnable {
         run {
-            if (_binding == null) {
-                return@Runnable
-            }
             binding.content.text = getDateFormat("HH:mm")
             handler.postDelayed(showRunnable, delay)
         }
     }
 
-    override fun onDestroyView() {
+    fun show() {
+        view?.visibility = View.VISIBLE
         handler.removeCallbacks(showRunnable)
+        handler.postDelayed(showRunnable, 0)
+    }
+
+    fun hide() {
+        view?.visibility = View.GONE
+        handler.removeCallbacks(showRunnable)
+    }
+
+    override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }

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

@@ -18,7 +18,7 @@ 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.ReleaseRequest
+import com.lizongying.mytv.requests.MyRequest
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -32,7 +32,7 @@ class UpdateManager(
 ) :
     ConfirmationFragment.ConfirmationListener {
 
-    private var myRequest = ReleaseRequest()
+    private var myRequest = MyRequest()
     private var release: ReleaseV2? = null
 
     private var downloadReceiver: DownloadReceiver? = null
@@ -62,7 +62,7 @@ class UpdateManager(
 
     private fun updateUI(text: String) {
         val dialog = ConfirmationFragment(this@UpdateManager, text)
-        settingFragment.fragmentManager?.let { dialog.show(it, TAG) }
+        dialog.show(settingFragment.fragmentManager, TAG)
     }
 
     private fun haveStoragePermission(): Boolean {

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

@@ -5,7 +5,6 @@ import android.os.Build
 import android.util.TypedValue
 import com.google.gson.Gson
 import com.lizongying.mytv.api.TimeResponse
-import com.lizongying.mytv.requests.Request
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.IOException
@@ -16,8 +15,6 @@ import java.util.Locale
 object Utils {
     private var between: Long = 0
 
-    private var listener: Request.RequestListener? = null
-
     fun getDateFormat(format: String): String {
         return SimpleDateFormat(
             format,
@@ -41,10 +38,6 @@ object Utils {
             println("Failed to retrieve timestamp from server: ${e.message}")
         }
         between = System.currentTimeMillis() - currentTimeMillis
-
-        withContext(Dispatchers.Main) {
-            listener?.onRequestFinished(null)
-        }
     }
 
     /**
@@ -79,8 +72,6 @@ object Utils {
     }
 
     fun dpToPx(dp: Int): Int {
-//        val density = Resources.getSystem().displayMetrics.density
-//        return (dp * density + 0.5f).toInt()
         return TypedValue.applyDimension(
             TypedValue.COMPLEX_UNIT_DIP, dp.toFloat(), Resources.getSystem().displayMetrics
         ).toInt()
@@ -97,8 +88,4 @@ object Utils {
     }
 
     fun isTmallDevice() = Build.MANUFACTURER.equals("Tmall", ignoreCase = true)
-
-    fun setRequestListener(listener: Request.RequestListener) {
-        this.listener = listener
-    }
 }

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

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

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

@@ -1,6 +1,7 @@
 package com.lizongying.mytv.api
 
 import android.content.Context
+import com.lizongying.mytv.Encryptor
 import com.lizongying.mytv.SP
 import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.models.TVViewModel

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

@@ -3,7 +3,6 @@ package com.lizongying.mytv.models
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.lizongying.mytv.SP
 
 class TVListViewModel : ViewModel() {
 
@@ -17,6 +16,10 @@ class TVListViewModel : ViewModel() {
     val itemPosition: LiveData<Int>
         get() = _itemPosition
 
+    private val _itemPositionCurrent = MutableLiveData<Int>()
+    val itemPositionCurrent: LiveData<Int>
+        get() = _itemPositionCurrent
+
     fun addTVViewModel(tvViewModel: TVViewModel) {
         if (_tvListViewModel.value == null) {
             _tvListViewModel.value = mutableListOf(tvViewModel)
@@ -29,16 +32,23 @@ class TVListViewModel : ViewModel() {
         return _tvListViewModel.value?.get(id)
     }
 
+    fun getTVViewModelCurrent(): TVViewModel? {
+        return _itemPositionCurrent.value?.let { _tvListViewModel.value?.get(it) }
+    }
+
     fun setItemPosition(position: Int) {
         _itemPosition.value = position
-        SP.itemPosition = position
+        _itemPositionCurrent.value = position
+    }
+
+    fun setItemPositionCurrent(position: Int) {
+        _itemPositionCurrent.value = position
     }
 
     fun size(): Int {
         if (_tvListViewModel.value == null) {
             return 0
         }
-
         return _tvListViewModel.value!!.size
     }
 }

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

@@ -1,8 +1,10 @@
 package com.lizongying.mytv.models
 
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.lizongying.mytv.TV
 import com.lizongying.mytv.api.FEPG
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.programModel.Program
 import com.tencent.videolite.android.datamodel.cctvjce.TVProgram
@@ -16,8 +18,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
 
     var retryTimes = 0
     var retryMaxTimes = 8
-    var authYSPRetryTimes = 0
-    var authYSPRetryMaxTimes = 3
     var tokenYSPRetryTimes = 0
     var tokenYSPRetryMaxTimes = 0
     var tokenFHRetryTimes = 0
@@ -41,8 +41,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val videoIndex: LiveData<Int>
         get() = _videoIndex
 
-    private val _change = MutableLiveData<String>()
-    val change: LiveData<String>
+    private val _change = MutableLiveData<Boolean>()
+    val change: LiveData<Boolean>
         get() = _change
 
     private val _ready = MutableLiveData<Boolean>()
@@ -56,27 +56,36 @@ class TVViewModel(private var tv: TV) : ViewModel() {
             if (_videoUrl.value!!.last().contains("cctv.cn")) {
                 tv.videoUrl = tv.videoUrl.subList(0, tv.videoUrl.lastIndex) + listOf(url)
             } else {
-                tv.videoUrl += listOf(url)
+                tv.videoUrl = tv.videoUrl + listOf(url)
             }
         } else {
-            tv.videoUrl += listOf(url)
+            tv.videoUrl = tv.videoUrl + listOf(url)
         }
         _videoUrl.value = tv.videoUrl
         _videoIndex.value = tv.videoUrl.lastIndex
     }
 
-    fun changed(from: String) {
-        retryTimes = 0
-        authYSPRetryTimes = 0
-        tokenYSPRetryTimes = 0
-        tokenFHRetryTimes = 0
-        _change.value = from
+    fun firstSource() {
+        if (_videoUrl.value!!.isNotEmpty()) {
+            setVideoIndex(0)
+            allReady()
+        } else {
+            Log.e(TAG, "no first")
+        }
+    }
+
+    fun changed() {
+        _change.value = true
     }
 
     fun allReady() {
         _ready.value = true
     }
 
+    fun setVideoIndex(videoIndex: Int) {
+        _videoIndex.value = videoIndex
+    }
+
     init {
         _videoUrl.value = tv.videoUrl
         _videoIndex.value = tv.videoUrl.lastIndex

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

@@ -10,7 +10,7 @@ import retrofit2.Response
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-class ReleaseRequest {
+class MyRequest {
     private var releaseService = ApiClient().releaseService
 
     suspend fun getRelease(): ReleaseV2? {
@@ -39,6 +39,6 @@ class ReleaseRequest {
     }
 
     companion object {
-        private const val TAG = "ReleaseRequest"
+        private const val TAG = "MyRequest"
     }
 }

app/src/main/res/drawable/rounded_background.xml

@@ -1,6 +1,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/white" />
-    <corners
-        android:topLeftRadius="4dp"
-        android:topRightRadius="4dp" />
+    <corners android:radius="4dp" /> <!-- Adjust the radius as needed -->
 </shape>

app/src/main/res/drawable/rounded_background2.xml

@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FF263238" />
+    <corners android:radius="4dp" /> <!-- Adjust the radius as needed -->
+</shape>

app/src/main/res/drawable/rounded_dark_bottom.xml

@@ -1,6 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/blur" />
-    <corners
-        android:bottomLeftRadius="4dp"
-        android:bottomRightRadius="4dp" />
-</shape>

app/src/main/res/drawable/rounded_dark_left.xml

@@ -1,6 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/blur" />
-    <corners
-        android:topLeftRadius="4dp"
-        android:bottomLeftRadius="4dp" />
-</shape>

app/src/main/res/drawable/rounded_dark_right.xml

@@ -1,6 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/blur" />
-    <corners
-        android:topRightRadius="4dp"
-        android:bottomRightRadius="4dp" />
-</shape>

app/src/main/res/drawable/rounded_light_bottom.xml

@@ -1,6 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/focus" />
-    <corners
-        android:bottomLeftRadius="4dp"
-        android:bottomRightRadius="4dp" />
-</shape>

app/src/main/res/drawable/rounded_white_left.xml

@@ -1,6 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white" />
-    <corners
-        android:topLeftRadius="4dp"
-        android:bottomLeftRadius="4dp" />
-</shape>

app/src/main/res/drawable/rounded_white_right.xml

@@ -1,6 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white" />
-    <corners
-        android:topRightRadius="4dp"
-        android:bottomRightRadius="4dp" />
-</shape>

app/src/main/res/drawable/sad_cloud.xml

@@ -1,23 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="50"
-    android:viewportHeight="50"
-    android:width="62.5dp"
-    android:height="62.5dp">
-    <group
-        android:scaleX="0.1"
-        android:scaleY="-0.1"
-        android:translateY="50">
-        <path
-            android:pathData="M205 377c-27 -27 -40 -33 -65 -29 -30 4 -70 -19 -70 -40 0 -5 -16 -24 -35 -42 -38 -36 -44 -66 -23 -111 22 -49 51 -55 248 -55l182 0 29 29c46 46 37 106 -20 136 -20 10 -31 25 -35 49 -4 22 -20 46 -42 65 -29 26 -43 31 -85 31 -44 0 -55 -4 -84 -33zm138 2c29 -13 57 -58 57 -93 0 -17 5 -26 15 -26 24 0 65 -46 65 -71 0 -13 -10 -33 -22 -46 -21 -22 -26 -23 -205 -23 -182 0 -184 0 -208 25 -33 32 -32 70 3 105 16 15 36 40 45 54 18 27 54 35 74 15 8 -8 16 -2 29 19 9 17 27 35 38 41 28 13 80 13 109 0z"
-            android:fillColor="#FFEEEEEE" />
-        <path
-            android:pathData="M174 269c-10 -17 13 -36 27 -22 12 12 4 33 -11 33 -5 0 -12 -5 -16 -11z"
-            android:fillColor="#FFEEEEEE" />
-        <path
-            android:pathData="M294 269c-10 -17 13 -36 27 -22 12 12 4 33 -11 33 -5 0 -12 -5 -16 -11z"
-            android:fillColor="#FFEEEEEE" />
-        <path
-            android:pathData="M194 196c-32 -14 -50 -33 -41 -42 3 -3 20 4 38 15 43 26 75 26 118 0 34 -20 49 -20 36 1 -10 16 -69 40 -97 40 -13 -1 -37 -7 -54 -14z"
-            android:fillColor="#FFEEEEEE" />
-    </group>
-</vector>

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

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout  xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/card"
-    android:layout_width="150dp"
-    android:layout_height="100dp"
-    android:orientation="vertical"
-    android:layout_gravity="center_vertical"
-    >
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@drawable/rounded_white_top"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:padding="5dp" />
-
-    <LinearLayout
-        android:id="@+id/main"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/icon"
-        android:background="@drawable/rounded_dark_bottom"
-        android:orientation="vertical"
-        android:padding="7dp">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:gravity="start"
-            android:text="Title"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:textColor="#FFEEEEEE"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/desc"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title"
-            android:layout_marginTop="8dp"
-            android:gravity="start"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:text="Description"
-            android:textColor="#B3EEEEEE"
-            android:textSize="12sp" />
-    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,31 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    >
-    <FrameLayout
-        android:id="@+id/main"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/channel_fragment"
+    android:layout_width="90dp"
+    android:layout_height="60dp"
+    android:layout_gravity="end|top"
+    android:layout_marginTop="20dp"
+    android:layout_marginEnd="170dp">
 
-        <FrameLayout
-            android:id="@+id/channel"
-            android:layout_width="90dp"
-            android:layout_height="60dp"
-            android:layout_gravity="end|top"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="170dp">
-
-            <TextView
-                android:id="@+id/content"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:textSize="40sp" />
-        </FrameLayout>
-    </FrameLayout>
-</LinearLayout>
+    <TextView
+        android:id="@+id/channel_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginTop="0dp"
+        android:textColor="#FFEEEEEE"
+        android:textStyle="bold"
+        android:textSize="40sp" />
+</FrameLayout>

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

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/error"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black" >
-
-    <LinearLayout
-        android:id="@+id/main"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical" >
-
-        <ImageView
-            android:id="@+id/logo"
-            android:src="@drawable/sad_cloud"
-            android:layout_width="50dp"
-            android:layout_height="50dp" />
-
-        <TextView
-            android:id="@+id/msg"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:textColor="#FFEEEEEE"
-            android:text="Message"
-            android:textSize="20sp" />
-    </LinearLayout>
-</FrameLayout>

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

@@ -1,60 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    >
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/info_fragment"
+    android:layout_width="320dp"
+    android:layout_height="80dp"
+    android:layout_gravity="center_horizontal|bottom"
+    android:layout_marginBottom="20dp"
+    android:background="@drawable/rounded_background">
+
+    <ImageView
+        android:id="@+id/info_logo"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:padding="10dp" />
+
+    <LinearLayout
+        android:layout_width="216dp"
         android:layout_height="match_parent"
-        >
+        android:layout_marginStart="100dp"
+        android:background="#FF263238"
+        android:gravity="start|center_vertical"
+        android:orientation="vertical"
+        android:padding="7dp">
 
-        <LinearLayout
-            android:id="@+id/info"
-            android:layout_width="400dp"
-            android:layout_height="80dp"
-            android:layout_gravity="center_horizontal|bottom"
-            android:layout_marginBottom="20dp"
-            android:orientation="horizontal">
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:layout_marginTop="0dp"
+            android:gravity="start"
+            android:textColor="#FFEEEEEE"
+            android:textSize="22sp" />
 
-            <ImageView
-                android:id="@+id/logo"
-                android:layout_width="100dp"
-                android:layout_height="match_parent"
-                android:background="@drawable/rounded_white_left"
-                android:padding="10dp" />
+        <TextView
+            android:id="@+id/info_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:layout_marginTop="8dp"
+            android:gravity="start"
+            android:singleLine="true"
+            android:textColor="#B3EEEEEE"
+            android:textSize="16sp" />
+    </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/main"
-                android:layout_width="300dp"
-                android:layout_height="match_parent"
-                android:layout_marginStart="0dp"
-                android:background="@drawable/rounded_dark_right"
-                android:gravity="start|center_vertical"
-                android:orientation="vertical"
-                android:padding="7dp">
-
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start"
-                    android:gravity="start"
-                    android:textColor="#FFEEEEEE"
-                    android:textSize="20sp" />
-
-                <TextView
-                    android:id="@+id/desc"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="start"
-                    android:layout_marginTop="8dp"
-                    android:gravity="start"
-                    android:singleLine="true"
-                    android:textColor="#B3EEEEEE"
-                    android:textSize="14sp" />
-            </LinearLayout>
-        </LinearLayout>
-    </FrameLayout>
-</LinearLayout>
+    <View
+        android:layout_width="8dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:background="@drawable/rounded_background2" />
+</FrameLayout>

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/loading"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    >
-
-    <LinearLayout
-        android:id="@+id/main"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center" >
-
-        <ProgressBar
-            android:id="@+id/bar"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:indeterminateTint="@color/white"/>
-    </LinearLayout>
-</FrameLayout>

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

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/transparent"
-    android:clickable="true"
-    android:focusable="false"
-    android:gravity="center"
->
-
-    <FrameLayout
-        android:id="@+id/menu"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
->
-
-            <ScrollView
-                android:id="@+id/scroll"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-             >
-                <LinearLayout
-                    android:id="@+id/content"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-                </LinearLayout>
-            </ScrollView>
-
-    </FrameLayout>
-</LinearLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/player"
+    android:id="@+id/player_fragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"

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

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent"
-    android:clickable="true"
-    android:focusable="false"
-    >
-
-    <TextView
-        android:id="@+id/header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:layout_marginTop="0dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginBottom="5dp"
-        android:gravity="start"
-        android:textColor="#FFEEEEEE"
-        android:textSize="22sp" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/items"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-    </androidx.recyclerview.widget.RecyclerView>
-</LinearLayout>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/setting"
+    android:id="@+id/dialog"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     >
@@ -8,17 +8,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
         <LinearLayout
-            android:id="@+id/content"
             android:layout_width="300dp"
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:paddingTop="20dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:background="@drawable/rounded_dark_left"
+            android:paddingLeft="7dp"
+            android:paddingRight="7dp"
+            android:background="#FF263238"
             >
             <TextView
-                android:id="@+id/name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/app_name"
@@ -29,10 +27,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:text="当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
-                android:textSize="14sp"
                 />
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="300dp"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 >
@@ -41,7 +38,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="10dp"
-                    android:textSize="14sp"
                     android:text="@string/check_version"
                     />
                 <ProgressBar
@@ -52,7 +48,6 @@
                 <TextView
                     android:id="@+id/version_name"
                     android:text=""
-                    android:textSize="14sp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
             </LinearLayout>
@@ -60,50 +55,38 @@
                 android:id="@+id/exit"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="14sp"
+                android:layout_marginEnd="10dp"
                 android:text="@string/exit"
                 />
             <Switch
                 android:id="@+id/switch_channel_reversal"
                 android:text="@string/title_channel_reversal"
-                android:textSize="14sp"
                 android:layout_marginTop="5dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
             <Switch
                 android:id="@+id/switch_channel_num"
                 android:text="@string/title_channel_num"
-                android:textSize="14sp"
                 android:layout_marginTop="5dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
             <Switch
                 android:id="@+id/switch_time"
                 android:text="@string/title_time"
-                android:textSize="14sp"
                 android:layout_marginTop="5dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
             <Switch
                 android:id="@+id/switch_boot_startup"
                 android:text="@string/title_boot_startup"
-                android:textSize="14sp"
-                android:layout_marginTop="5dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <Switch
-                android:id="@+id/switch_grid"
-                android:text="@string/title_grid"
-                android:textSize="14sp"
                 android:layout_marginTop="5dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
         </LinearLayout>
         <ImageView
-            android:id="@+id/appreciate"
             android:layout_width="300dp"
             android:layout_height="wrap_content"
             android:src="@drawable/appreciate"
-            android:background="@drawable/rounded_white_right" />
+            android:background="@color/white" />
     </LinearLayout>
 </FrameLayout>

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

@@ -1,32 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    >
-    <FrameLayout
-        android:id="@+id/main"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/time"
+    android:layout_width="100dp"
+    android:layout_height="40dp"
+    android:layout_gravity="end|top"
+    android:layout_marginTop="25dp"
+    android:layout_marginEnd="50dp">
 
-        <FrameLayout
-            android:id="@+id/time"
-            android:layout_width="100dp"
-            android:layout_height="40dp"
-            android:layout_gravity="end|top"
-            android:layout_marginTop="25dp"
-            android:layout_marginEnd="50dp">
-
-            <TextView
-                android:id="@+id/content"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:textSize="32sp" />
-        </FrameLayout>
-
-    </FrameLayout>
-</LinearLayout>
+    <TextView
+        android:id="@+id/content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginTop="0dp"
+        android:textColor="#FFEEEEEE"
+        android:textStyle="bold"
+        android:textSize="32sp" />
+</FrameLayout>

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

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

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

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="server_url">http://localhost:8080</string>
 </resources>

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

@@ -4,7 +4,7 @@
     <string name="title_channel_num">换台时显示频道号</string>
     <string name="check_version">检查更新</string>
     <string name="title_boot_startup">开机自启</string>
-    <string name="title_grid">频道列表采用网格样式</string>
+    <string name="dismiss_error">好的</string>
     <string name="title_time">显示时间</string>
     <string name="exit">退出</string>
 </resources>

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

@@ -1,3 +1,10 @@
 <resources>
 
+    <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
+        <item name="lbImageCardViewType">Title|Content</item>
+    </style>
+
+    <style name="CustomImageCardTheme" parent="Theme.Leanback">
+        <item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
+    </style>
 </resources>

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

@@ -1,6 +1,8 @@
 <resources>
 
     <style name="Theme.MyTV" parent="@style/Theme.Leanback">
-        <item name="android:fitsSystemWindows">false</item>
+        <item name="browsePaddingStart">11dp</item>
+        <item name="browsePaddingEnd">11dp</item>
+        <item name="browseRowsMarginTop">54dp</item>
     </style>
 </resources>

history.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+in_changelog=false
+
+while IFS= read -r line; do
+    if [[ "$line" == "## "* ]]; then
+        continue
+    fi
+
+    if [[ $in_changelog == false ]] && [[ "$line" == "### "* ]]; then
+        in_changelog=true
+        continue
+    fi
+
+    if [[ $in_changelog == true ]] && [[ "$line" == "### "* ]]; then
+        break
+    fi
+
+    echo "$line"
+done < HISTORY.md

version.json

@@ -0,0 +1 @@
+{"version_code": 33619968, "version_name": "v2.1.0"}