fix crash on 4.2

.github/workflows/build.yml

@@ -37,13 +37,6 @@ 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
@@ -54,7 +47,6 @@ jobs:
           release_name: Release ${{ github.ref }}
           draft: false
           prerelease: false
-          body_path: history.md
 
       - name: Upload Release Asset
         uses: actions/upload-release-asset@v1
@@ -64,19 +56,4 @@ 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
-
-      - 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"'"
-          }'
+          asset_content_type: application/vnd.android.package-archive

HISTORY.md

@@ -1,265 +1,189 @@
-## 更新日誌
-
-### 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及以上專用）
+### 以下已不可用
 
-* 修復部分情況下APP切換後無法繼續播放的問題
-* 優化重試邏輯
+### v1.5.3（安卓5及以上专用）
+
+* 修复部分情况下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（通用）
 
@@ -267,40 +191,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
 
@@ -312,32 +236,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 gen-version
+all: info
 
 branch := $(shell git rev-parse --abbrev-ref HEAD)
 commit := $(shell git rev-parse --short HEAD)
@@ -9,11 +9,3 @@ 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

@@ -4,16 +4,17 @@
 
 ## 使用
 
-1. 下载
-    * [github](https://github.com/lizongying/my-tv/releases/)
-    * [gitee](https://gitee.com/lizongying/my-tv/releases/)
-2. 安裝
-    * U盘安装
-    * 小米电视可以使用小米电视助手进行安装
-    * 如电视可以启用ADB，也可以通过ADB进行安装
-       ```shell
-       adb install my-tv.apk
-       ```
+下载安装:
+[github](https://github.com/lizongying/my-tv/releases/)
+[gitee](https://gitee.com/lizongying/my-tv/releases/)
+
+小米电视可以使用小米电视助手进行安装
+
+如电视可以启用ADB，也可以通过ADB进行安装：
+
+```shell
+adb install my-tv.apk
+```
 
 ![image](./screenshots/img_3.png)
 ![image](./screenshots/img_2.png)
@@ -31,22 +32,17 @@
 * 地方频道
 * 收藏夹
 * 海外
-* 隐藏频道
+* 1.5.0 无法安装，1.5.1 可以安装
+* 节目增加预告
+* 频道列表优化
+* epg更新后菜单更新
+* 防止菜单第一个获取焦点
+* 隐藏
 * 亮度调节
 * 音量调节
-* 軟解
-* 自動更新
-
-無法自啟的設備：
-斐讯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 21
+        minSdk 17
         targetSdk 33
         versionCode VersionCode()
         versionName VersionName()
@@ -95,7 +95,7 @@ static def VersionName() {
 }
 
 dependencies {
-    def media3_version = "1.3.1"
+    def media3_version = "1.2.1"
 
     implementation "androidx.media3:media3-ui:$media3_version"
 
@@ -105,25 +105,23 @@ dependencies {
     // For HLS playback support with ExoPlayer
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
 
-    // 21:2.11.0 17:2.6.4
-    def retrofit2_version = "2.11.0"
+    // 21:2.9.0 17:2.6.4
+    def retrofit2_version = "2.6.4"
 
     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.13.0'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
-
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2"
+    implementation 'androidx.core:core-ktx:1.11.0-beta02'
+    implementation 'androidx.leanback:leanback:1.2.0-alpha02'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC")
 
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.3'
     implementation 'com.google.android.exoplayer:exoplayer-core:2.13.3'
     implementation 'com.google.android.exoplayer:exoplayer-hls:2.13.3'
+
+    implementation 'javax.annotation:javax.annotation-api:1.3.2'
 }

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

@@ -0,0 +1,142 @@
+package com.lizongying.mytv
+
+import android.graphics.Color
+import android.view.ContextThemeWrapper
+import android.view.KeyEvent
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.ScaleAnimation
+import android.widget.ImageView
+import androidx.core.view.updatePadding
+import androidx.leanback.widget.ImageCardView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.lizongying.mytv.models.TVListViewModel
+import com.lizongying.mytv.models.TVViewModel
+
+
+class CardAdapter(
+    private val recyclerView: RecyclerView,
+    private val mainFragment: MainFragment,
+    private var tvListViewModel: TVListViewModel,
+) :
+    RecyclerView.Adapter<CardAdapter.ViewHolder>() {
+
+    private var listener: ItemListener? = null
+    private var focused: View? = null
+
+    var visiable = false
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val cardView = object :
+            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
+        cardView.isFocusable = true
+        cardView.isFocusableInTouchMode = true
+        cardView.updatePadding(1, 0, 1, 0)
+        return ViewHolder(cardView)
+    }
+
+    fun clear() {
+        focused?.clearFocus()
+        recyclerView.invalidate()
+    }
+
+    private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float, duration: Long) {
+        val scaleAnimation = ScaleAnimation(
+            fromScale, toScale,
+            fromScale, toScale,
+            ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
+            ScaleAnimation.RELATIVE_TO_SELF, 0.5f
+        )
+        scaleAnimation.duration = duration
+        scaleAnimation.fillAfter = false
+        view.startAnimation(scaleAnimation)
+    }
+
+    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
+        val item = tvListViewModel.getTVViewModel(position)
+
+        val tvViewModel = item as TVViewModel
+        val cardView = viewHolder.view as ImageCardView
+        cardView.tag = tvViewModel
+
+        val onFocusChangeListener = View.OnFocusChangeListener { view, hasFocus ->
+            if (hasFocus) {
+                listener?.onItemHasFocus(item)
+                focused = cardView
+
+                startScaleAnimation(cardView, 0.9f, 1.0f, 200)
+//
+//                if (mainFragment.shouldHasFocus(view.tag as TVViewModel)) {
+//                }
+
+//                if (visiable) {
+//                    startScaleAnimation(cardView, 0.9f, 1.0f, 200)
+//                } else {
+//                    visiable = true
+//                }
+            }
+        }
+
+        cardView.onFocusChangeListener = onFocusChangeListener
+
+        cardView.setOnClickListener { _ ->
+            listener?.onItemClicked(item)
+        }
+
+        cardView.setOnKeyListener { _, keyCode, event: KeyEvent? ->
+            if (event?.action == KeyEvent.ACTION_DOWN) {
+                return@setOnKeyListener listener?.onKey(keyCode) ?: false
+            }
+            false
+        }
+
+        cardView.titleText = tvViewModel.getTV().title
+
+        cardView.mainImageView?.let {
+            Glide.with(viewHolder.view.context)
+                .load(tvViewModel.getTV().logo)
+                .centerInside()
+                .into(it)
+        }
+
+        cardView.mainImageView?.setBackgroundColor(Color.WHITE)
+        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
+
+        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+        if (!epg.isNullOrEmpty()) {
+            cardView.contentText = epg.last().title
+        } else {
+            cardView.contentText = ""
+        }
+    }
+
+    override fun getItemCount() = tvListViewModel.size()
+
+    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val view = itemView
+    }
+
+    fun toPosition(position: Int) {
+        recyclerView.post {
+            recyclerView.scrollToPosition(position)
+            recyclerView.getChildAt(position)?.isSelected
+            recyclerView.getChildAt(position)?.requestFocus()
+        }
+    }
+
+    interface ItemListener {
+        fun onItemHasFocus(tvViewModel: TVViewModel)
+        fun onItemClicked(tvViewModel: TVViewModel)
+        fun onKey(keyCode: Int): Boolean
+    }
+
+    fun setItemListener(listener: ItemListener) {
+        this.listener = listener
+    }
+
+    companion object {
+        private const val TAG = "CardAdapter"
+    }
+}
+

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

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

@@ -2,7 +2,6 @@ package com.lizongying.mytv
 
 import android.os.Bundle
 import android.os.Handler
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -44,17 +43,17 @@ class ChannelFragment : Fragment() {
         if (screenWidth / screenHeight > ratio) {
             val x = ((screenWidth - screenHeight * ratio) / 2).toInt()
             val originalLayoutParams =
-                binding.channelFragment.layoutParams as ViewGroup.MarginLayoutParams
+                binding.channel.layoutParams as ViewGroup.MarginLayoutParams
             originalLayoutParams.rightMargin += x
-            binding.channelFragment.layoutParams = originalLayoutParams
+            binding.channel.layoutParams = originalLayoutParams
         }
 
         if (screenWidth / screenHeight < ratio) {
             val y = ((screenHeight - screenWidth / ratio) / 2).toInt()
             val originalLayoutParams =
-                binding.channelFragment.layoutParams as ViewGroup.MarginLayoutParams
+                binding.channel.layoutParams as ViewGroup.MarginLayoutParams
             originalLayoutParams.topMargin += y
-            binding.channelFragment.layoutParams = originalLayoutParams
+            binding.channel.layoutParams = originalLayoutParams
         }
 
         (activity as MainActivity).fragmentReady("ChannelFragment")
@@ -64,7 +63,7 @@ class ChannelFragment : Fragment() {
     fun show(tvViewModel: TVViewModel) {
         handler.removeCallbacks(hideRunnable)
         handler.removeCallbacks(playRunnable)
-        binding.channelContent.text = (tvViewModel.getTV().id.plus(1)).toString()
+        binding.content.text = (tvViewModel.getTV().id.plus(1)).toString()
         view?.visibility = View.VISIBLE
         handler.postDelayed(hideRunnable, delay)
     }
@@ -74,13 +73,11 @@ 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.channelContent.text = "${this.channel}"
+            binding.content.text = "${this.channel}"
             view?.visibility = View.VISIBLE
             handler.postDelayed(playRunnable, delay)
         } else {
@@ -102,20 +99,18 @@ class ChannelFragment : Fragment() {
     }
 
     private val hideRunnable = Runnable {
-        binding.channelContent.text = ""
+        binding.content.text = ""
         view?.visibility = View.GONE
         channel = 0
         channelCount = 0
-        Log.i(TAG, "hideRunnable")
     }
 
     private val playRunnable = Runnable {
         (activity as MainActivity).play(channel - 1)
-        binding.channelContent.text = ""
+        binding.content.text = ""
         view?.visibility = View.GONE
         channel = 0
         channelCount = 0
-        Log.i(TAG, "playRunnable")
     }
 
     override fun onDestroyView() {

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

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

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

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

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

@@ -23,7 +23,31 @@ class InfoFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         _binding = InfoBinding.inflate(inflater, container, false)
+
+        val activity = requireActivity()
+        val application = activity.applicationContext as MyApplication
+        val displayMetrics = application.getDisplayMetrics()
+
+        displayMetrics.density
+
+        var screenWidth = displayMetrics.widthPixels
+        var screenHeight = displayMetrics.heightPixels
+        if (screenHeight > screenWidth) {
+            screenWidth = displayMetrics.heightPixels
+            screenHeight = displayMetrics.widthPixels
+        }
+
+        val ratio = 16f / 9f
+
+        if (screenWidth / screenHeight < ratio) {
+            val y = ((screenHeight - screenWidth / ratio) / 2).toInt()
+            val originalLayoutParams = binding.info.layoutParams as ViewGroup.MarginLayoutParams
+            originalLayoutParams.bottomMargin += y
+            binding.info.layoutParams = originalLayoutParams
+        }
+
         _binding!!.root.visibility = View.GONE
+
         (activity as MainActivity).fragmentReady("InfoFragment")
         return binding.root
     }

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

@@ -11,7 +11,6 @@ import android.util.Log
 import android.view.GestureDetector
 import android.view.KeyEvent
 import android.view.MotionEvent
-import android.view.View
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
@@ -33,7 +32,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private val channelFragment = ChannelFragment()
     private var timeFragment = TimeFragment()
     private val settingFragment = SettingFragment()
-    private val errorFragment = ErrorFragment()
 
     private var doubleBackToExitPressedOnce = false
 
@@ -77,12 +75,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }
         gestureDetector = GestureDetector(this, GestureListener())
 
-        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
@@ -154,6 +146,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
+            mainFragment.setPosition()
             transaction.show(mainFragment)
             mainActive()
         } else {
@@ -174,11 +167,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         showTime()
     }
 
-    fun settingHideNow() {
-        handler.removeCallbacks(hideSetting)
-        handler.postDelayed(hideSetting, 0)
-    }
-
     fun settingNeverHide() {
         handler.removeCallbacks(hideSetting)
     }
@@ -219,14 +207,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }
     }
 
-    fun isPlaying() {
-        if (errorFragment.isVisible) {
-            supportFragmentManager.beginTransaction()
-                .remove(errorFragment)
-                .commit()
-        }
-    }
-
     override fun onTouchEvent(event: MotionEvent?): Boolean {
         if (event != null) {
             gestureDetector.onTouchEvent(event)
@@ -237,6 +217,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
 
         override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+            Log.i(TAG, "onSingleTapConfirmed")
             switchMainFragment()
             return true
         }
@@ -297,9 +278,14 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private val hideSetting = Runnable {
         if (settingFragment.isVisible) {
             settingFragment.dismiss()
+            showTime()
         }
     }
 
+    private fun hideSettingFragment() {
+        handler.postDelayed(hideSetting, 0)
+    }
+
     private fun channelUp() {
         if (mainFragment.isHidden) {
             if (SP.channelReversal) {
@@ -339,6 +325,11 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             return
         }
 
+        if (settingFragment.isVisible) {
+            hideSettingFragment()
+            return
+        }
+
         if (doubleBackToExitPressedOnce) {
             super.onBackPressed()
             return
@@ -352,8 +343,9 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }, 2000)
     }
 
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        Log.i(TAG, "keyCode $keyCode, event $event")
+
+    fun onKey(keyCode: Int): Boolean {
+        Log.i(TAG, "keyCode $keyCode")
         when (keyCode) {
             KeyEvent.KEYCODE_0 -> {
                 showChannel("0")
@@ -465,19 +457,26 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
-                if (!mainFragment.isVisible && !settingFragment.isVisible) {
+                if (mainFragment.isHidden && !settingFragment.isVisible) {
                     switchMainFragment()
                     return true
                 }
             }
 
             KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                if (!mainFragment.isVisible && !settingFragment.isVisible) {
+                if (mainFragment.isHidden && !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)
     }
@@ -509,13 +508,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     }
 
     override fun onRequestFinished(message: String?) {
-        if (message != null && !errorFragment.isVisible) {
-            supportFragmentManager.beginTransaction()
-                .add(R.id.main_browse_fragment, errorFragment)
-                .commitNow()
-            errorFragment.setErrorContent(message)
-        }
-        fragmentReady("Request")
+        fragmentReady("request")
     }
 
     private companion object {

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

@@ -2,71 +2,90 @@ package com.lizongying.mytv
 
 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.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.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.lizongying.mytv.Utils.dpToPx
 import com.lizongying.mytv.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.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class MainFragment : BrowseSupportFragment() {
+
+class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var itemPosition = 0
 
-    private var rowsAdapter: ArrayObjectAdapter? = null
+    private var rowList: MutableList<View> = mutableListOf()
+
+    private var _binding: MenuBinding? = null
+    private val binding get() = _binding!!
 
     var tvListViewModel = TVListViewModel()
 
     private var lastVideoUrl = ""
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        Log.i(TAG, "onCreate")
-        super.onCreate(savedInstanceState)
-        headersState = HEADERS_DISABLED
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = MenuBinding.inflate(inflater, container, false)
+
+        val activity = requireActivity()
+        val application = activity.applicationContext as MyApplication
+        val displayMetrics = application.getDisplayMetrics()
+
+        displayMetrics.density
+
+        var screenWidth = displayMetrics.widthPixels
+        var screenHeight = displayMetrics.heightPixels
+        if (screenHeight > screenWidth) {
+            screenWidth = displayMetrics.heightPixels
+            screenHeight = displayMetrics.widthPixels
+        }
+
+        val ratio = 16f / 9f
+
+        if (screenWidth / screenHeight > ratio) {
+            val x = ((screenWidth - screenHeight * ratio) / 2).toInt()
+            val originalLayoutParams =
+                binding.scroll.layoutParams as ViewGroup.MarginLayoutParams
+            originalLayoutParams.leftMargin += x
+            originalLayoutParams.rightMargin += x
+            binding.scroll.layoutParams = originalLayoutParams
+        }
+
+        if (screenWidth / screenHeight < ratio) {
+            val y = ((screenHeight - screenWidth / ratio) / 2).toInt()
+            val originalLayoutParams =
+                binding.scroll.layoutParams as ViewGroup.MarginLayoutParams
+            originalLayoutParams.topMargin += y
+            originalLayoutParams.bottomMargin += y
+            binding.scroll.layoutParams = originalLayoutParams
+        }
+
+        binding.menu.setOnClickListener {
+            hideSelf()
+        }
+
+        return binding.root
     }
 
-//    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()
+    private fun hideSelf() {
+        requireActivity().supportFragmentManager.beginTransaction()
+            .hide(this)
+            .commit()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -74,168 +93,199 @@ class MainFragment : BrowseSupportFragment() {
 
         activity?.let { YSP.init(it) }
 
-        loadRows()
-
-        setupEventListeners()
-
-        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                if (tvViewModel.errInfo.value != null
-                    && tvViewModel.getTV().id == itemPosition
-                ) {
-                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
-                }
-            }
-            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
-
-                // not first time && channel not change
-                if (tvViewModel.ready.value != null
-                    && tvViewModel.getTV().id == itemPosition
-                    && check(tvViewModel)
-                ) {
-                    Log.i(TAG, "ready ${tvViewModel.getTV().title}")
-                    (activity as? MainActivity)?.play(tvViewModel)
-                }
-            }
-            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-                if (tvViewModel.change.value != null) {
-                    val title = tvViewModel.getTV().title
-                    Log.i(TAG, "switch $title")
-                    if (tvViewModel.getTV().pid != "") {
-                        Log.i(TAG, "request $title")
-                        lifecycleScope.launch(Dispatchers.IO) {
-                            tvViewModel.let { Request.fetchData(it) }
-                        }
-                        (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)
-                            setSelectedPosition(
-                                tvViewModel.getRowPosition(), true,
-                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
-                            )
-                        }
-                    }
-                }
-            }
-        }
-
-        (activity as MainActivity).fragmentReady("MainFragment")
-    }
-
-    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)
-            }
-            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)
+            val content = binding.content
+
+            var idx: Long = 0
+            for ((k, v) in TVList.list) {
+                val itemBinding: RowBinding =
+                    RowBinding.inflate(layoutInflater, content, false)
+
+                val tvListViewModelCurrent = TVListViewModel()
+                for ((idx2, v1) in v.withIndex()) {
+                    val tvViewModel = TVViewModel(v1)
+                    tvViewModel.setRowPosition(idx.toInt())
+                    tvViewModel.setItemPosition(idx2)
+                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
+                    tvListViewModel.addTVViewModel(tvViewModel)
+                }
+                tvListViewModel.maxNum.add(v.size)
+
+                val adapter =
+                    CardAdapter(
+                        itemBinding.rowItems,
+                        this,
+                        tvListViewModelCurrent,
+                    )
+                rowList.add(itemBinding.rowItems)
+
+                adapter.setItemListener(this)
+
+                itemBinding.rowHeader.text = k
+                itemBinding.rowItems.tag = idx.toInt()
+                itemBinding.rowItems.adapter = adapter
+
+                itemBinding.rowItems.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                    override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                        super.onScrolled(recyclerView, dx, dy)
+                        (activity as MainActivity).mainActive()
                     }
-                    tvViewModel.changed()
-                }
-            }
-        }
-    }
+                })
 
-    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)
+                val itemDecoration = context?.let { GrayOverlayItemDecoration(it) }
+                if (itemDecoration != null) {
+                    itemBinding.rowItems.addItemDecoration(itemDecoration)
+                }
+
+                if (SP.grid) {
+                    itemBinding.rowItems.layoutManager =
+                        GridLayoutManager(context, 6)
+                    itemBinding.rowItems.layoutParams.height =
+                        dpToPx(92 * ((tvListViewModelCurrent.size() + 6 - 1) / 6))
+                } else {
+                    itemBinding.rowItems.layoutManager =
+                        LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+                }
+
+                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
+                layoutParams.topMargin = dpToPx(11F)
+                itemBinding.row.layoutParams = layoutParams
+                itemBinding.row.setOnClickListener {
+                    hideSelf()
+                }
+                content.addView(itemBinding.row)
+
+                idx++
+            }
+
+            if (itemPosition >= tvListViewModel.size()) {
+                itemPosition = 0
+            }
+
+            tvListViewModel.setItemPosition(itemPosition)
+            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                    if (tvViewModel.errInfo.value != null
+                        && tvViewModel.getTV().id == itemPosition
+                    ) {
+                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
+                            .show()
+                    }
+                }
+                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
+
+                    // not first time && channel not change
+                    if (tvViewModel.ready.value != null
+                        && tvViewModel.getTV().id == itemPosition
+                        && check(tvViewModel)
+                    ) {
+                        Log.i(TAG, "ready ${tvViewModel.getTV().title}")
+                        (activity as? MainActivity)?.play(tvViewModel)
+                    }
+                }
+                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
+                    if (tvViewModel.change.value != null) {
+                        val title = tvViewModel.getTV().title
+                        Log.i(TAG, "switch $title")
+                        if (tvViewModel.getTV().pid != "") {
+                            Log.i(TAG, "request $title")
+                            lifecycleScope.launch(Dispatchers.IO) {
+                                tvViewModel.let { Request.fetchData(it) }
+                            }
+                            (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                            setPosition(
+                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                            )
+                        } else {
+                            if (check(tvViewModel)) {
+                                // TODO lastVideoUrl
+                                (activity as? MainActivity)?.play(tvViewModel)
+                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                                setPosition(
+                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                                )
+                            }
+                        }
                     }
-                    tvViewModel.changed()
                 }
             }
+            (activity as MainActivity).fragmentReady("MainFragment")
         }
     }
 
-    private fun setupEventListeners() {
-        onItemViewClickedListener = ItemViewClickedListener()
-        onItemViewSelectedListener = ItemViewSelectedListener()
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
     }
 
-    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()
+    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
                 }
-                (activity as? MainActivity)?.switchMainFragment()
             }
         }
+        return false
     }
 
-    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()
+    override fun onItemHasFocus(tvViewModel: TVViewModel) {
+        tvListViewModel.setItemPositionCurrent(tvViewModel.getTV().id)
+
+        val row = tvViewModel.getRowPosition()
+
+        for (i in rowList) {
+            if (i.tag as Int != row) {
+                ((i as RecyclerView).adapter as CardAdapter).clear()
+            }
+        }
+
+        (activity as MainActivity).mainActive()
+    }
+
+    override fun onItemClicked(tvViewModel: TVViewModel) {
+        Log.i(TAG, "onItemClicked")
+        if (this.isHidden) {
+            (activity as? MainActivity)?.switchMainFragment()
+            return
+        }
+
+        if (itemPosition != tvViewModel.getTV().id) {
+            itemPosition = tvViewModel.getTV().id
+            tvListViewModel.setItemPosition(itemPosition)
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+        }
+        (activity as? MainActivity)?.switchMainFragment()
+    }
+
+    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()
+                }
             }
         }
     }
@@ -257,6 +307,7 @@ class MainFragment : BrowseSupportFragment() {
     }
 
     fun fragmentReady() {
+//            request.fetchPage()
         tvListViewModel.getTVViewModel(itemPosition)?.changed()
 
         tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
@@ -314,6 +365,32 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
+    fun shouldHasFocus(tvModel: TVViewModel): Boolean {
+        return tvModel == tvListViewModel.getTVViewModel(itemPosition)
+    }
+
+    override fun onHiddenChanged(hidden: Boolean) {
+        super.onHiddenChanged(hidden)
+        if (!hidden) {
+            val tvModel = tvListViewModel.getTVViewModel(itemPosition)
+            val rowPosition = tvModel?.getRowPosition()
+            val itemPosition = tvModel?.getItemPosition()
+            Log.i(TAG, "toPosition $rowPosition $itemPosition")
+            for (i in rowList) {
+                if (i.tag as Int == rowPosition) {
+                    ((i as RecyclerView).adapter as CardAdapter).toPosition(itemPosition!!)
+                    break
+                }
+            }
+        } else {
+            view?.post {
+//                for (i in rowList) {
+//                    ((i as RecyclerView).adapter as CardAdapter).visiable = false
+//                }
+            }
+        }
+    }
+
     override fun onResume() {
         Log.i(TAG, "onResume")
         super.onResume()
@@ -331,6 +408,12 @@ class MainFragment : BrowseSupportFragment() {
         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

@@ -4,6 +4,8 @@ import android.app.Application
 import android.content.Context
 import android.util.DisplayMetrics
 import android.view.WindowManager
+import androidx.multidex.MultiDex
+
 
 class MyApplication : Application() {
     private lateinit var displayMetrics: DisplayMetrics
@@ -20,4 +22,9 @@ class MyApplication : Application() {
     fun getDisplayMetrics(): DisplayMetrics {
         return displayMetrics
     }
+
+    override fun attachBaseContext(base: Context?) {
+        super.attachBaseContext(base)
+        MultiDex.install(base)
+    }
 }

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

@@ -82,13 +82,6 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
                         Log.e(TAG, "PlaybackException $error")
                         tvViewModel?.changed()
                     }
-
-                    override fun onIsPlayingChanged(isPlaying: Boolean) {
-                        super.onIsPlayingChanged(isPlaying)
-                        if (isPlaying) {
-                            (activity as MainActivity).isPlaying()
-                        }
-                    }
                 })
             }
         })

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

@@ -4,6 +4,8 @@ import android.os.Handler
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
+import com.google.gson.Gson
+import java.net.URLDecoder
 import com.lizongying.mytv.Utils.getDateFormat
 import com.lizongying.mytv.api.ApiClient
 import com.lizongying.mytv.api.Auth

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

@@ -71,6 +71,14 @@ 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(

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 = "1",
+        @Path("name") date: String = "2",
     ): Call<ReleaseV2>
 }

app/src/main/res/layout/channel.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/channel_fragment"
+    android:id="@+id/channel"
     android:layout_width="90dp"
     android:layout_height="60dp"
     android:layout_gravity="end|top"
@@ -8,7 +8,7 @@
     android:layout_marginEnd="170dp">
 
     <TextView
-        android:id="@+id/channel_content"
+        android:id="@+id/content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"

app/src/main/res/layout/info.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/info_fragment"
+    android:id="@+id/info"
     android:layout_width="320dp"
     android:layout_height="80dp"
     android:layout_gravity="center_horizontal|bottom"

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

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

app/src/main/res/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_fragment"
+    android:id="@+id/player"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"

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

@@ -0,0 +1,29 @@
+<?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/row_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/row_items"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+    </androidx.recyclerview.widget.RecyclerView>
+</LinearLayout>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialog"
+    android:id="@+id/setting"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     >
@@ -82,6 +82,12 @@
                 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:layout_marginTop="5dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
         </LinearLayout>
         <ImageView
             android:layout_width="300dp"

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

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

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

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

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

@@ -0,0 +1,4 @@
+<?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="dismiss_error">好的</string>
+    <string name="title_grid">频道列表采用网格样式</string>
     <string name="title_time">显示时间</string>
     <string name="exit">退出</string>
 </resources>

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

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

history.sh

@@ -1,20 +0,0 @@
-#!/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

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