add time

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

.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,85 +1,5 @@
 ## 更新日志
 
-### v2.0.7
-
-* 修复部分设备闪退的问题
-* 修复设置页可能显示不全的问题
-
-### 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（通用）
 
 * 修复播放过程中的卡顿问题
@@ -100,6 +20,7 @@
 * 增加时间显示
 * 频道号优化
 * 设置中增加退出按钮
+*
 
 ### v1.7.4（通用）
 
@@ -208,6 +129,8 @@
 
 * 修复播放失败的问题
 
+### 以下已不可用
+
 ### v1.5.3（安卓5及以上专用）
 
 * 修复部分情况下APP切换后无法继续播放的问题

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)
@@ -26,24 +27,21 @@
 ## TODO
 
 * 音量不同
-* 大湾区卫视、广东4k超高清、广东珠江、三沙卫视、翡翠
+* 大湾区卫视、广东4k超高清、广东珠江、三沙卫视
 * CHC高清三个电影频道
 * 地方频道
 * 收藏夹
 * 海外
-* 隐藏频道
-* 亮度调节
-* 音量调节
-* 軟解
-* 网格空白处退出
+* 节目增加预告
+* 频道列表优化
+* 自动更新
+* 显示时间
+* 软解
+* 不同分辨率
+* “比如：我输了3跳转到3号频道后数字没有消失时，这时我发现按错了频道，然后我想马上换到6频道输到6就变成36了”
 
-## 版权说明
-
-本项目仅供学习研究，禁止用于商业用途，请于下载二十四小时内删除。
-
-本项目可能随时终止，请大家谨慎使用，建议使用官方渠道进行观看。
-
-本项目使用的部分代码、图片、文字等资源来源于网络，如有侵权，请联系删除。
+無法自啟的設備：
+斐讯N1盒子，[Phicomm] Phicomm p230 (Android 7.1.2)
 
 ## 赞赏
 

app/build.gradle

@@ -13,7 +13,7 @@ android {
 
     defaultConfig {
         applicationId "com.lizongying.mytv"
-        minSdk 17
+        minSdk 21
         targetSdk 33
         versionCode VersionCode()
         versionName VersionName()
@@ -77,9 +77,10 @@ static def VersionCode() {
         def replace = [v: "", ".": " ", "-": " "]
         def arr = (process.text.trim().replace(replace) + " 0").split(" ")
         def versionCode = arr[0].toInteger() * 16777216 + arr[1].toInteger() * 65536 + arr[2].toInteger() * 256 + arr[3].toInteger()
+        println("VersionCode $versionCode")
         return versionCode
     } catch (ignored) {
-        return 1
+        return 0
     }
 }
 
@@ -87,20 +88,14 @@ static def VersionName() {
     try {
         def process = "git describe --tags --always".execute()
         process.waitFor()
-        def versionName = process.text.trim() - "v"
-        if (versionName.isEmpty()) {
-            versionName = "1.0.0"
-        }
-        return versionName
+        return process.text.trim() - "v"
     } catch (ignored) {
         return "1.0.0"
     }
 }
 
 dependencies {
-
-//    minSdk17
-    def media3_version = "1.2.1"
+    def media3_version = "1.3.1"
 
     implementation "androidx.media3:media3-ui:$media3_version"
 
@@ -110,23 +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'
-    // Gson 2.10.1 and older: API level 19
-    implementation("com.google.code.gson:gson:2.10.1")
     implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
     implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version"
     implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
 
+    implementation '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")
@@ -134,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

@@ -12,10 +12,9 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
-        android:name=".MyTVApplication"
+        android:name=".MyApplication"
         android:allowBackup="true"
         android:banner="@drawable/banner"
         android:icon="@drawable/logo"
@@ -37,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
@@ -62,16 +58,5 @@
             android:name=".InitializerProvider"
             android:authorities="${applicationId}.InitializerProvider"
             android:exported="false" />
-
-        <meta-data android:name="android.max_aspect" android:value="2.5" />
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
     </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,30 +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)
-        binding.time.textSize = application.px2PxFont(binding.time.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)
     }
@@ -61,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 {
@@ -87,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/ConfirmationFragment.kt

@@ -7,33 +7,24 @@ import androidx.fragment.app.DialogFragment
 
 class ConfirmationFragment(
     private val listener: ConfirmationListener,
-    private val message: String,
-    private val update: Boolean
+    private val message: String
 ) : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         return activity?.let {
             val builder = AlertDialog.Builder(it)
-            builder.setTitle(message)
-            if (update) {
-                builder.setMessage("确定更新吗？")
-                    .setPositiveButton(
-                        "确定"
-                    ) { _, _ ->
-                        listener.onConfirm()
-                    }
-                    .setNegativeButton(
-                        "取消"
-                    ) { _, _ ->
-                        listener.onCancel()
-                    }
-            } else {
-                builder.setMessage("")
-                    .setNegativeButton(
-                        "好的"
-                    ) { _, _ ->
-                    }
-            }
+            builder.setTitle("确定更新吗？")
+                .setMessage(message)
+                .setPositiveButton(
+                    "确定"
+                ) { _, _ ->
+                    listener.onConfirm()
+                }
+                .setNegativeButton(
+                    "取消"
+                ) { _, _ ->
+                    listener.onCancel()
+                }
             builder.create()
         } ?: throw IllegalStateException("Activity cannot be null")
     }

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

@@ -1,5 +1,8 @@
 package com.lizongying.mytv
 
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -9,35 +12,28 @@ import android.view.GestureDetector
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
-import android.view.View.SYSTEM_UI_FLAG_FULLSCREEN
 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
 import kotlinx.coroutines.launch
 
 
-class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPreferenceChangeListener {
+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
 
@@ -45,98 +41,67 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
 
     private val handler = Handler()
     private val delayHideMain: Long = 10000
-    private val delayHideSetting: Long = 15000
+    private val delayHideSetting: Long = 10000
 
     init {
-        Utils.setRequestListener(this)
-    }
-
-    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)
 
-        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.decorView.apply {
-            systemUiVisibility =
-                SYSTEM_UI_FLAG_FULLSCREEN or
-                        SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
-                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-                        SYSTEM_UI_FLAG_HIDE_NAVIGATION or
-                        SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
-                        View.SYSTEM_UI_FLAG_IMMERSIVE
-        }
-
-        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
-//        }
-
         setContentView(R.layout.activity_main)
 
         Request.setRequestListener(this)
 
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
+
         if (savedInstanceState == null) {
-            val transaction = supportFragmentManager.beginTransaction()
+            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)
-
-            if (!SP.time) {
-                transaction.hide(timeFragment)
-            } else {
-                transaction.show(timeFragment)
-            }
-
-            transaction.commitNow()
+                .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++
+        }
 
-        SP.setOnSharedPreferenceChangeListener(this)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -146,52 +111,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
         }
     }
 
-    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 showLoadingFragment() {
-        showFragment(loadingFragment)
-    }
-
-    fun hideLoadingFragment() {
-        hideFragment(loadingFragment)
-    }
-
-    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
@@ -208,6 +127,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
 
     fun play(tvViewModel: TVViewModel) {
         playerFragment.play(tvViewModel)
+        mainFragment.view?.requestFocus()
     }
 
     fun play(itemPosition: Int) {
@@ -222,11 +142,18 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
         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 {
@@ -244,6 +171,12 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
     fun settingDelayHide() {
         handler.removeCallbacks(hideSetting)
         handler.postDelayed(hideSetting, delayHideSetting)
+        showTime()
+    }
+
+    fun settingHideNow() {
+        handler.removeCallbacks(hideSetting)
+        handler.postDelayed(hideSetting, 0)
     }
 
     fun settingNeverHide() {
@@ -271,37 +204,27 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
     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 {
@@ -314,7 +237,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
     private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
 
         override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-            Log.i(TAG, "onSingleTapConfirmed")
             switchMainFragment()
             return true
         }
@@ -362,12 +284,14 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
             return
         }
 
-        if (settingFragment.isVisible) {
-            return
+        Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
+        if (!settingFragment.isVisible) {
+            settingFragment.show(supportFragmentManager, "setting")
+            settingDelayHide()
+        } else {
+            handler.removeCallbacks(hideSetting)
+            settingFragment.dismiss()
         }
-
-        settingFragment.show(supportFragmentManager, TAG)
-        settingDelayHide()
     }
 
     private val hideSetting = Runnable {
@@ -376,10 +300,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
         }
     }
 
-    private fun hideSettingFragment() {
-        handler.postDelayed(hideSetting, 0)
-    }
-
     private fun channelUp() {
         if (mainFragment.isHidden) {
             if (SP.channelReversal) {
@@ -419,11 +339,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
             return
         }
 
-        if (settingFragment.isVisible) {
-            hideSettingFragment()
-            return
-        }
-
         if (doubleBackToExitPressedOnce) {
             super.onBackPressed()
             return
@@ -437,14 +352,8 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
         }, 2000)
     }
 
-    private fun active() {
-        if (settingFragment.isVisible) {
-            settingDelayHide()
-        }
-    }
-
-    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")
@@ -512,7 +421,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
             }
 
             KeyEvent.KEYCODE_UNKNOWN -> {
-//                showSetting()
+                showSetting()
                 return true
             }
 
@@ -532,7 +441,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
             }
 
             KeyEvent.KEYCODE_ENTER -> {
-                active()
                 switchMainFragment()
             }
 
@@ -541,7 +449,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
             }
 
             KeyEvent.KEYCODE_DPAD_UP -> {
-                active()
                 channelUp()
             }
 
@@ -550,7 +457,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
             }
 
             KeyEvent.KEYCODE_DPAD_DOWN -> {
-                active()
                 channelDown()
             }
 
@@ -559,28 +465,19 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
-                active()
-                if (mainFragment.isHidden && !settingFragment.isVisible) {
+                if (!mainFragment.isVisible && !settingFragment.isVisible) {
                     switchMainFragment()
                     return true
                 }
             }
 
             KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                active()
-                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)
     }
@@ -588,20 +485,13 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
     private fun getAppSignature() = this.appSignature
 
     override fun onStart() {
-        Log.i(TAG, "onStart MainActivity")
-        syncTime()
+        Log.i(TAG, "onStart")
         super.onStart()
     }
 
     override fun onResume() {
         Log.i(TAG, "onResume")
         super.onResume()
-    }
-
-    override fun onResumeFragments() {
-        super.onResumeFragments()
-        mainFragment.changeMenu()
-
         if (!mainFragment.isHidden) {
             handler.postDelayed(hideMain, delayHideMain)
         }
@@ -619,18 +509,16 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
     }
 
     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 {
         const val TAG = "MainActivity"
     }
-
-    override fun onSharedPreferenceChanged(key: String) {
-        Log.i(TAG, "$key changed")
-        when (key) {
-            SP.KEY_GRID -> mainFragment.changeMenu()
-            SP.KEY_TIME -> showTime()
-        }
-    }
 }

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

@@ -2,83 +2,71 @@ package com.lizongying.mytv
 
 import android.os.Bundle
 import android.util.Log
-import android.view.GestureDetector
-import android.view.KeyEvent
 import android.view.LayoutInflater
-import android.view.MotionEvent
 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
-
-    private lateinit var gestureDetector: GestureDetector
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        val context = requireContext()
-        _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()
-        }
-
-        gestureDetector = GestureDetector(context, GestureListener())
-
-        return binding.root
+    override fun onCreate(savedInstanceState: Bundle?) {
+        Log.i(TAG, "onCreate")
+        super.onCreate(savedInstanceState)
+        headersState = HEADERS_DISABLED
     }
 
-    private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
-        override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-            Log.i(TAG, "onSingleTapConfirmed")
-            hideSelf()
-            return true
-        }
-    }
+//    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
+//    }
 
-    private fun hideSelf() {
-        requireActivity().supportFragmentManager.beginTransaction()
-            .hide(this)
-            .commit()
+    override fun onStart() {
+        Log.i(TAG, "onStart")
+        super.onStart()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -86,247 +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()
-                }
-
-                itemBinding.items.addOnItemTouchListener(object : RecyclerView.OnItemTouchListener {
-                    override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
-                        gestureDetector.onTouchEvent(e)
-                        return false
-                    }
-
-                    override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {
-                        TODO("Not yet implemented")
-                    }
-
-                    override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-                        TODO("Not yet implemented")
-                    }
-                })
-
-                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()
-                            (activity as? MainActivity)?.hideLoadingFragment()
-                        } else {
-                            (activity as? MainActivity)?.hidePlayerFragment()
-                            (activity as? MainActivity)?.hideLoadingFragment()
-                            (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()
             }
         }
     }
@@ -348,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)
@@ -360,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()
             }
@@ -374,7 +283,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                 itemPosition = tvListViewModel.size() - 1
             }
             tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed("prev")
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
         }
     }
 
@@ -385,7 +294,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                 itemPosition = 0
             }
             tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed("next")
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
         }
     }
 
@@ -405,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/OnSharedPreferenceChangeListener.kt

@@ -1,6 +0,0 @@
-package com.lizongying.mytv
-
-
-interface OnSharedPreferenceChangeListener {
-    fun onSharedPreferenceChanged(key: String)
-}

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

@@ -15,7 +15,6 @@ import androidx.media3.common.PlaybackException
 import androidx.media3.common.Player
 import androidx.media3.common.VideoSize
 import androidx.media3.common.util.UnstableApi
-import androidx.media3.exoplayer.DefaultRenderersFactory
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.PlayerView
 import com.google.android.exoplayer2.SimpleExoPlayer
@@ -53,16 +52,10 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
 
         playerView?.viewTreeObserver?.addOnGlobalLayoutListener(object :
             ViewTreeObserver.OnGlobalLayoutListener {
-            @OptIn(UnstableApi::class)
             override fun onGlobalLayout() {
                 playerView!!.viewTreeObserver.removeOnGlobalLayoutListener(this)
-
-//                val renderersFactory = context?.let { DefaultRenderersFactory(it) }
-//                renderersFactory?.setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON)
-
                 playerView!!.player = activity?.let {
                     ExoPlayer.Builder(it)
-//                        .setRenderersFactory(renderersFactory!!)
                         .build()
                 }
                 playerView!!.player?.playWhenReady = true
@@ -85,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
     }
 
@@ -161,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,11 @@
-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.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
@@ -18,14 +19,12 @@ import com.lizongying.mytv.api.KvcollectRequest
 import com.lizongying.mytv.api.KvcollectRequest2
 import com.lizongying.mytv.api.LiveInfo
 import com.lizongying.mytv.api.LiveInfoRequest
-import com.lizongying.mytv.api.Token2
 import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.api.YSPApiService
 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
@@ -43,7 +42,6 @@ import kotlin.random.Random
 object Request {
     private const val TAG = "Request"
     private var yspTokenService: YSPTokenService = ApiClient().yspTokenService
-    private var yspToken2Service: YSPApiService = ApiClient().yspToken2Service
     private var yspApiService: YSPApiService = ApiClient().yspApiService
     private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
     private var yspBtraceService2: YSPBtraceService = ApiClient().yspBtraceService2
@@ -56,9 +54,8 @@ object Request {
     private var token = ""
     private var tokenFH = ""
 
-    private var needAuth = true
+    private var needAuth = false
     private var needToken = false
-    private var needToken2 = true
 
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var btraceRunnable: BtraceRunnable
@@ -77,7 +74,6 @@ object Request {
     }
 
     private var call: Call<LiveInfo>? = null
-    private var callToken: Call<Token2>? = null
     private var callAuth: Call<Auth>? = null
     private var callInfo: Call<Info>? = null
     private var callFAuth: Call<FAuth>? = null
@@ -88,117 +84,11 @@ object Request {
     private fun cancelCall() {
         call?.cancel()
         callAuth?.cancel()
-        callToken?.cancel()
         callInfo?.cancel()
         callFAuth?.cancel()
         callPage?.cancel()
     }
 
-
-    private fun fetchToken(tvModel: TVViewModel, cookie: String) {
-        cancelCall()
-
-        val title = tvModel.getTV().title
-
-        callToken = yspToken2Service.getToken("guid=${YSP.getGuid()}; $cookie",  "519748109", YSP.getGuid(),  "59306155", "b42702bf7309a179d102f3d51b1add2fda0bc7ada64cb801" ,"1", YSP.getTimeStr())
-        callToken?.enqueue(object : Callback<Token2> {
-            override fun onResponse(call: Call<Token2>, response: Response<Token2>) {
-                if (response.isSuccessful) {
-                    val liveInfo = response.body()
-
-                    if (liveInfo?.data?.token != null) {
-                        Log.i(TAG, "token ${liveInfo.data.token}")
-                        YSP.token2 = liveInfo.data.token
-
-                        YSP.getTokenData(tvModel)
-
-                        fetchAuth(tvModel, cookie)
-                    } else {
-                        Log.e(TAG, "$title token error")
-                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                            tvModel.retryTimes++
-                            if (tvModel.getTV().needToken) {
-                                if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
-                                    tvModel.tokenYSPRetryTimes++
-                                    tvModel.needGetToken = true
-                                    fetchToken(tvModel)
-                                } else {
-                                    if (!tvModel.getTV().mustToken) {
-                                        fetchToken(tvModel, cookie)
-                                    } else {
-                                        val err = "错误"
-                                        Log.e(TAG, "$title $err")
-                                        tvModel.setErrInfo(err)
-                                    }
-                                }
-                            } else {
-                                fetchToken(tvModel, cookie)
-                            }
-                        } else {
-                            val err = "认证结果错误"
-                            Log.e(TAG, "$title $err")
-                            tvModel.setErrInfo(err)
-                        }
-                    }
-                } else {
-                    Log.e(TAG, "$title token status error")
-                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                        tvModel.retryTimes++
-                        if (tvModel.getTV().needToken) {
-                            if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
-                                tvModel.tokenYSPRetryTimes++
-                                tvModel.needGetToken = true
-                                fetchToken(tvModel)
-                            } else {
-                                if (!tvModel.getTV().mustToken) {
-                                    fetchToken(tvModel, cookie)
-                                } else {
-                                    val err = "错误"
-                                    Log.e(TAG, "$title $err")
-                                    tvModel.setErrInfo(err)
-                                }
-                            }
-                        } else {
-                            fetchToken(tvModel, cookie)
-                        }
-                    } else {
-                        val err = "认证状态错误"
-                        Log.e(TAG, "$title $err")
-                        tvModel.setErrInfo(err)
-                    }
-                }
-            }
-
-            override fun onFailure(call: Call<Token2>, t: Throwable) {
-                Log.e(TAG, "$title token request error $t")
-                if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                    tvModel.retryTimes++
-                    if (tvModel.getTV().needToken) {
-                        if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
-                            tvModel.tokenYSPRetryTimes++
-                            tvModel.needGetToken = true
-                            fetchToken(tvModel)
-                        } else {
-                            if (!tvModel.getTV().mustToken) {
-                                fetchToken(tvModel, cookie)
-                            } else {
-                                val err = "错误"
-                                Log.e(TAG, "$title $err")
-                                tvModel.setErrInfo(err)
-                            }
-                        }
-                    } else {
-                        fetchToken(tvModel, cookie)
-                    }
-                } else {
-                    val err = "认证请求错误"
-                    Log.e(TAG, "$title $err")
-                    tvModel.setErrInfo(err)
-                }
-            }
-        })
-    }
-
     private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
         cancelCall()
 
@@ -213,11 +103,11 @@ object Request {
                     val liveInfo = response.body()
 
                     if (liveInfo?.data?.token != null) {
-                        Log.i(TAG, "auth ${liveInfo.data.token}")
+                        Log.i(TAG, "token ${liveInfo.data.token}")
                         YSP.token = liveInfo.data.token
                         fetchVideo(tvModel, cookie)
                     } else {
-                        Log.e(TAG, "$title auth error")
+                        Log.e(TAG, "$title token error")
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
                             if (tvModel.getTV().needToken) {
@@ -228,19 +118,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 {
@@ -255,19 +137,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)
                     }
                 }
             }
@@ -284,19 +158,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)
                 }
             }
         })
@@ -305,7 +171,7 @@ object Request {
     private fun fetchVideo(tvModel: TVViewModel, cookie: String) {
         cancelCall()
 
-        if (Request::btraceRunnable.isInitialized) {
+        if (::btraceRunnable.isInitialized) {
             handler.removeCallbacks(btraceRunnable)
         }
 
@@ -316,13 +182,8 @@ object Request {
         val request = LiveInfoRequest(data)
         call = request.let {
             yspApiService.getLiveInfo(
-                "guid=${YSP.getGuid()}; gr_user_id=261eecf2-0ce4-4316-a6a1-7171e3de7389; $cookie; newLogin=1; nseqId=${YSP.nseqId}; nrequest-id=${YSP.nrequest_id}",
+                "guid=${YSP.getGuid()}; $cookie",
                 YSP.token,
-                YSP.yspsdkinput,
-                YSP.openapi_signature,
-                "${YSP.nseqId}",
-                YSP.nrequest_id,
-                "519748109",
                 it
             )
         }
@@ -362,42 +223,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) {
@@ -406,35 +249,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)
                             }
                         }
                     }
@@ -446,35 +272,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)
                     }
                 }
             }
@@ -491,82 +300,16 @@ 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)
                 }
             }
         })
     }
 
-    private fun fetchToken(tvModel: TVViewModel) {
-        cancelCall()
-        if (tvModel.needGetToken) {
-            callInfo = yspTokenService.getInfo("")
-            callInfo?.enqueue(object : Callback<Info> {
-                override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                    if (response.isSuccessful && response.body()?.data?.token != null) {
-                        token = response.body()?.data?.token!!
-                        Log.i(TAG, "info success $token")
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
-                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; appid=1400421205; yspappid=519748109;yspopenid=$openid; vusession=$token"
-                        fetchAuth(tvModel, cookie)
-                    } else if (response.code() == 304) {
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
-                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; appid=1400421205; yspappid=519748109; yspopenid=$openid; vusession=$token"
-                        fetchVideo(tvModel, cookie)
-                    } else {
-                        Log.e(TAG, "info status error")
-                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
-                            tvModel.tokenYSPRetryTimes++
-                            fetchToken(tvModel)
-                        } else {
-                            if (!tvModel.getTV().mustToken) {
-                                val cookie =
-                                    "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; appid=1400421205; yspappid=519748109"
-                                fetchToken(tvModel, cookie)
-                            } else {
-//                                TODO
-                            }
-                        }
-                    }
-                }
-
-                override fun onFailure(call: Call<Info>, t: Throwable) {
-                    Log.e(TAG, "info request error $t")
-                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
-                        tvModel.tokenYSPRetryTimes++
-                        fetchAuth(tvModel)
-                    } else {
-                        if (!tvModel.getTV().mustToken) {
-                            val cookie =
-                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; appid=1400421205; yspappid=519748109"
-                            fetchToken(tvModel, cookie)
-                        } else {
-//                                TODO
-                        }
-                    }
-                }
-            })
-        } else {
-            val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; appid=1400421205; yspappid=519748109;yspopenid=$openid; vusession=$token"
-            fetchToken(tvModel, cookie)
-        }
-    }
-
     private fun fetchAuth(tvModel: TVViewModel) {
         cancelCall()
         if (tvModel.needGetToken) {
@@ -597,8 +340,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
                             }
                         }
                     }
@@ -614,15 +355,13 @@ 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
                         }
                     }
                 }
             })
         } else {
             val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124; yspopenid=$openid; vusession=$token"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=$openid; vusession=$token"
             fetchAuth(tvModel, cookie)
         }
     }
@@ -658,8 +397,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
                             }
                         }
                     }
@@ -675,8 +412,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
                         }
                     }
                 }
@@ -712,10 +447,6 @@ object Request {
                     if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
                         tvModel.tokenFHRetryTimes++
                         fetchFAuth(tvModel)
-                    } else {
-                        val err = "状态错误"
-                        Log.e(TAG, "$title $err")
-                        tvModel.setErrInfo(err)
                     }
                 }
             }
@@ -725,10 +456,6 @@ object Request {
                 if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
                     tvModel.tokenFHRetryTimes++
                     fetchFAuth(tvModel)
-                } else {
-                    val err = "请求错误"
-                    Log.e(TAG, "$title $err")
-                    tvModel.setErrInfo(err)
                 }
             }
         })
@@ -744,42 +471,19 @@ object Request {
             if (token == "") {
                 tvModel.needGetToken = true
             }
-            if (needToken2) {
-                if (needAuth) {
-                    fetchToken(tvModel)
-                } else {
-                    fetchAuth(tvModel)
-                }
+            if (needAuth) {
+                fetchAuth(tvModel)
             } else {
-                if (needAuth) {
-                    fetchAuth(tvModel)
-                } else {
-                    fetchVideo(tvModel)
-                }
+                fetchVideo(tvModel)
             }
         } else {
             val cookie =
-                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=124"
-
-            if (needToken2) {
-                if (needAuth) {
-                    fetchToken(tvModel, cookie)
-                } else {
-                    fetchAuth(tvModel, cookie)
-                }
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; updateProtocol=1; deviceModel=120"
+            if (needAuth) {
+                fetchAuth(tvModel, cookie)
             } else {
-                if (needAuth) {
-                    fetchAuth(tvModel, cookie)
-                } else {
-                    fetchVideo(tvModel, cookie)
-                }
+                fetchVideo(tvModel, cookie)
             }
-//
-//            if (needAuth) {
-//                fetchAuth(tvModel, cookie)
-//            } else {
-//                fetchVideo(tvModel, cookie)
-//            }
         }
     }
 
@@ -886,7 +590,7 @@ object Request {
         val randomNumber = Random.nextDouble()
         val url = tvModel.getTV().videoUrl.first()
 
-        val r = KvcollectRequest(
+        var r = KvcollectRequest(
             guid = guid,
             prog = sid,
             viewid = sid,
@@ -898,13 +602,30 @@ object Request {
             seq = tvModel.seq,
             durl = url,
             url = url,
-//            _dc = "",
+            _dc = randomNumber,
         )
 
-        val e =
+        var e =
             "BossId=${r.BossId}&Pwd=${r.Pwd}&_dc=${r._dc}&cdn=${r.cdn}&cmd=${r.cmd}&defn=${r.defn}&downspeed=${r.downspeed}&durl=${r.durl}&errcode=${r.errcode}&fact1=${r.fact1}&firstreport=${r.firstreport}&fplayerver=${r.fplayerver}&ftime=${r.ftime}&geturltime=6&guid=${r.guid}&hc_openid=${r.hc_openid}&hh_ua=${r.hh_ua}&live_type=${r.live_type}&livepid=${r.livepid}&login_type=${r.login_type}&open_id=&openid=${r.openid}&platform=${r.platform}&playno=${r.playno}&prd=${r.prd}&prog=${r.prog}&rand_str=${r.rand_str}&sRef=${r.sRef}&sUrl=${r.sUrl}&sdtfrom=${r.sdtfrom}&seq=${r.seq}&url=${r.url}&viewid=${r.viewid}"
+        println(e)
         r.signature = YSP.getAuthSignature(e)
-        callBtracePage = yspBtraceService2.kvcollect2(r)
+        println(r.signature)
+
+//        val ttt = """{"BossId":2727,"Pwd":1424084450,"prog":"2022576801","playno":"BEoZw3cpZh","guid":"luccvoyr_58va8i3cqw6","hh_ua":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36","cdn":"waibao","sdtfrom":"ysp_pc_01","prd":60000,"platform":"5910204","errcode":"","durl":"https://outlivecloud-cdn.ysp.cctv.cn/906028A94D533483FE8BAC5CF4DB6CC70753E25A93EF3EC50988538DEDBF10161D1EA8F67C916EE41BA9D891D7893C69500B3F1A37CA814D2EE19341197360196CD9CCF327949104097C904643D493EB5A9B588EC28A2FAC1C8E30F8EE330DB2364B0DEC0124F6990A83773FF283489A/2022576803.m3u8?from=player&svrtime=1713365896&pid=600001859&cdn=5401&revoi=6E400EC7436C79D49BA06E61333D31FB8915F3484D9426FE4CCC4DE01CB8FD1DF473A8F416EF1107B669B0A9447F913272789A827EDD3DC0FE88534D9B59A35669678946589AA4D246F8F248F7C33AB08CE72FA0A73FE7F1F9FD2091D30176895CB8BD44A5B85FAD9579C700CB2AFD8D0939574B2A3EFF4C1B237DFF3E0CD3E194662F9FDEE48D1ACD7BDFAB01868B220743021C40E0EA5514ECCF396B509DA1&app_id=519748109&guid=luccvoyr_58va8i3cqw6&ysign=bb79232986c5429600d76cfedb1d5978&ytime=1713365896&ytype=1","firstreport":1,"sUrl":"https://www.yangshipin.cn/#/tv/home?pid=600001859","sRef":"","fplayerver":"100","livepid":"600001859","viewid":"2022576801","seq":0,"cmd":263,"login_type":"","geturltime":6,"downspeed":1.75,"hc_openid":"","open_id":"","defn":"fhd","fact1":"ysp_pc_live_b","openid":"","_dc":0.7140416315131102,"live_type":"","ftime":"2024-04-17 22:58:31","url":"https://outlivecloud-cdn.ysp.cctv.cn/906028A94D533483FE8BAC5CF4DB6CC70753E25A93EF3EC50988538DEDBF10161D1EA8F67C916EE41BA9D891D7893C69500B3F1A37CA814D2EE19341197360196CD9CCF327949104097C904643D493EB5A9B588EC28A2FAC1C8E30F8EE330DB2364B0DEC0124F6990A83773FF283489A/2022576803.m3u8?from=player&svrtime=1713365896&pid=600001859&cdn=5401&revoi=6E400EC7436C79D49BA06E61333D31FB8915F3484D9426FE4CCC4DE01CB8FD1DF473A8F416EF1107B669B0A9447F913272789A827EDD3DC0FE88534D9B59A35669678946589AA4D246F8F248F7C33AB08CE72FA0A73FE7F1F9FD2091D30176895CB8BD44A5B85FAD9579C700CB2AFD8D0939574B2A3EFF4C1B237DFF3E0CD3E194662F9FDEE48D1ACD7BDFAB01868B220743021C40E0EA5514ECCF396B509DA1&app_id=519748109&guid=luccvoyr_58va8i3cqw6&ysign=bb79232986c5429600d76cfedb1d5978&ytime=1713365896&ytype=1","rand_str":"oKkkZs8lON"}"""
+//        val gson = Gson()
+//        r = gson.fromJson(ttt, KvcollectRequest::class.java)
+//
+//        e =
+//            "BossId=${r.BossId}&Pwd=${r.Pwd}&_dc=${r._dc}&cdn=${r.cdn}&cmd=${r.cmd}&defn=${r.defn}&downspeed=${r.downspeed}&durl=${r.durl}&errcode=${r.errcode}&fact1=${r.fact1}&firstreport=${r.firstreport}&fplayerver=${r.fplayerver}&ftime=${r.ftime}&geturltime=6&guid=${r.guid}&hc_openid=${r.hc_openid}&hh_ua=${r.hh_ua}&live_type=${r.live_type}&livepid=${r.livepid}&login_type=${r.login_type}&open_id=&openid=${r.openid}&platform=${r.platform}&playno=${r.playno}&prd=${r.prd}&prog=${r.prog}&rand_str=${r.rand_str}&sRef=${r.sRef}&sUrl=${r.sUrl}&sdtfrom=${r.sdtfrom}&seq=${r.seq}&url=${r.url}&viewid=${r.viewid}"
+//        println(e)
+//        e =  "BossId=2727&Pwd=1424084450&_dc=0.7140416315131102&cdn=waibao&cmd=263&defn=fhd&downspeed=1.75&durl=https://outlivecloud-cdn.ysp.cctv.cn/906028A94D533483FE8BAC5CF4DB6CC70753E25A93EF3EC50988538DEDBF10161D1EA8F67C916EE41BA9D891D7893C69500B3F1A37CA814D2EE19341197360196CD9CCF327949104097C904643D493EB5A9B588EC28A2FAC1C8E30F8EE330DB2364B0DEC0124F6990A83773FF283489A/2022576803.m3u8?from=player&svrtime=1713365896&pid=600001859&cdn=5401&revoi=6E400EC7436C79D49BA06E61333D31FB8915F3484D9426FE4CCC4DE01CB8FD1DF473A8F416EF1107B669B0A9447F913272789A827EDD3DC0FE88534D9B59A35669678946589AA4D246F8F248F7C33AB08CE72FA0A73FE7F1F9FD2091D30176895CB8BD44A5B85FAD9579C700CB2AFD8D0939574B2A3EFF4C1B237DFF3E0CD3E194662F9FDEE48D1ACD7BDFAB01868B220743021C40E0EA5514ECCF396B509DA1&app_id=519748109&guid=luccvoyr_58va8i3cqw6&ysign=bb79232986c5429600d76cfedb1d5978&ytime=1713365896&ytype=1&errcode=&fact1=ysp_pc_live_b&firstreport=1&fplayerver=100&ftime=2024-04-17 22:58:31&geturltime=6&guid=luccvoyr_58va8i3cqw6&hc_openid=&hh_ua=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36&live_type=&livepid=600001859&login_type=&open_id=&openid=&platform=5910204&playno=BEoZw3cpZh&prd=60000&prog=2022576801&rand_str=oKkkZs8lON&sRef=&sUrl=https://www.yangshipin.cn/#/tv/home?pid=600001859&sdtfrom=ysp_pc_01&seq=0&url=https://outlivecloud-cdn.ysp.cctv.cn/906028A94D533483FE8BAC5CF4DB6CC70753E25A93EF3EC50988538DEDBF10161D1EA8F67C916EE41BA9D891D7893C69500B3F1A37CA814D2EE19341197360196CD9CCF327949104097C904643D493EB5A9B588EC28A2FAC1C8E30F8EE330DB2364B0DEC0124F6990A83773FF283489A/2022576803.m3u8?from=player&svrtime=1713365896&pid=600001859&cdn=5401&revoi=6E400EC7436C79D49BA06E61333D31FB8915F3484D9426FE4CCC4DE01CB8FD1DF473A8F416EF1107B669B0A9447F913272789A827EDD3DC0FE88534D9B59A35669678946589AA4D246F8F248F7C33AB08CE72FA0A73FE7F1F9FD2091D30176895CB8BD44A5B85FAD9579C700CB2AFD8D0939574B2A3EFF4C1B237DFF3E0CD3E194662F9FDEE48D1ACD7BDFAB01868B220743021C40E0EA5514ECCF396B509DA1&app_id=519748109&guid=luccvoyr_58va8i3cqw6&ysign=bb79232986c5429600d76cfedb1d5978&ytime=1713365896&ytype=1&viewid=2022576801"
+//        println(e)
+//        r.signature = YSP.getAuthSignature(e)
+//        println(r.signature)
+
+        callBtracePage = yspBtraceService2.kvcollect2(
+            r
+        )
         callBtracePage?.enqueue(object : Callback<Void> {
             override fun onResponse(call: Call<Void>, response: Response<Void>) {
                 if (response.isSuccessful) {
@@ -930,7 +651,7 @@ object Request {
         val guid = YSP.getGuid()
         val pid = tvModel.getTV().pid
         val sid = tvModel.getTV().sid
-//        val randomNumber = Random.nextDouble()
+        val randomNumber = Random.nextDouble()
         val url = tvModel.getTV().videoUrl.first()
 
         val r = KvcollectRequest2(
@@ -945,12 +666,12 @@ object Request {
             seq = tvModel.seq,
             durl = url,
             url = url,
-            _dc = "",
+            _dc = randomNumber,
         )
 
-//        val e =
-//            "BossId=${r.BossId}&Pwd=${r.Pwd}&_dc=${r._dc}&cdn=${r.cdn}&cmd=${r.cmd}&defn=${r.defn}&downspeed=${r.downspeed}&durl=${r.durl}&errcode=${r.errcode}&fact1=${r.fact1}&firstreport=${r.firstreport}&fplayerver=${r.fplayerver}&ftime=${r.ftime}&geturltime=${r.geturltime}&guid=${r.guid}&hc_openid=${r.hc_openid}&hh_ua=${r.hh_ua}&live_type=${r.live_type}&livepid=${r.livepid}&login_type=${r.login_type}&open_id=${r.open_id}&openid=${r.openid}&platform=${r.platform}&playno=${r.playno}&prd=${r.prd}&prog=${r.prog}&rand_str=${r.rand_str}&sRef=${r.sRef}&sUrl=${r.sUrl}&sdtfrom=${r.sdtfrom}&seq=${r.seq}&url=${r.url}&viewid=${r.viewid}"
-//        r.signature = YSP.getAuthSignature(e)
+        val e =
+            "BossId=${r.BossId}&Pwd=${r.Pwd}&_dc=${r._dc}&cdn=${r.cdn}&cmd=${r.cmd}&defn=${r.defn}&downspeed=${r.downspeed}&durl=${r.durl}&errcode=${r.errcode}&fact1=${r.fact1}&firstreport=${r.firstreport}&fplayerver=${r.fplayerver}&ftime=${r.ftime}&geturltime=${r.geturltime}&guid=${r.guid}&hc_openid=${r.hc_openid}&hh_ua=${r.hh_ua}&live_type=${r.live_type}&livepid=${r.livepid}&login_type=${r.login_type}&open_id=${r.open_id}&openid=${r.openid}&platform=${r.platform}&playno=${r.playno}&prd=${r.prd}&prog=${r.prog}&rand_str=${r.rand_str}&sRef=${r.sRef}&sUrl=${r.sUrl}&sdtfrom=${r.sdtfrom}&seq=${r.seq}&url=${r.url}&viewid=${r.viewid}"
+        r.signature = YSP.getAuthSignature(e)
 
         callBtracePage = yspBtraceService3.kvcollect3(
             guid = r.guid,
@@ -959,18 +680,18 @@ object Request {
             livepid = r.livepid,
             sUrl = r.sUrl,
             playno = r.playno,
-//            rand_str = r.rand_str,
+            rand_str = r.rand_str,
             ftime = r.ftime,
             seq = "${r.seq}",
             durl = r.durl,
-//            url = r.url,
+            url = r.url,
             _dc = "${r._dc}",
-//            signature = r.signature
+            signature = r.signature
         )
         callBtracePage?.enqueue(object : Callback<Void> {
             override fun onResponse(call: Call<Void>, response: Response<Void>) {
                 if (response.isSuccessful) {
-                    Log.i(TAG, "$title kvcollect success")
+                    Log.d(TAG, "$title kvcollect success")
                 } else {
                     Log.e(TAG, "$title kvcollect status error")
                 }
@@ -1113,6 +834,6 @@ object Request {
     }
 
     fun setRequestListener(listener: RequestListener) {
-        Request.listener = listener
+        this.listener = listener
     }
 }

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

@@ -13,12 +13,12 @@ object SP {
     // If use channel num to select channel or not
     private const val KEY_CHANNEL_NUM = "channel_num"
 
-    const val KEY_TIME = "time"
+    private const val KEY_TIME = "time"
 
     // If start app on device boot or not
     private const val KEY_BOOT_STARTUP = "boot_startup"
 
-    const val KEY_GRID = "grid"
+    private const val KEY_GRID = "grid"
 
     // Position in list of the selected channel item
     private const val KEY_POSITION = "position"
@@ -28,8 +28,6 @@ object SP {
 
     private lateinit var sp: SharedPreferences
 
-    private var listener: OnSharedPreferenceChangeListener? = null
-
     /**
      * The method must be invoked as early as possible(At least before using the keys)
      */
@@ -37,10 +35,6 @@ object SP {
         sp = context.getSharedPreferences(SP_FILE_NAME, Context.MODE_PRIVATE)
     }
 
-    fun setOnSharedPreferenceChangeListener(listener: OnSharedPreferenceChangeListener) {
-        this.listener = listener
-    }
-
     var channelReversal: Boolean
         get() = sp.getBoolean(KEY_CHANNEL_REVERSAL, false)
         set(value) = sp.edit().putBoolean(KEY_CHANNEL_REVERSAL, value).apply()
@@ -51,12 +45,7 @@ object SP {
 
     var time: Boolean
         get() = sp.getBoolean(KEY_TIME, true)
-        set(value) {
-            if (value != this.time) {
-                sp.edit().putBoolean(KEY_TIME, value).apply()
-                listener?.onSharedPreferenceChanged(KEY_TIME)
-            }
-        }
+        set(value) = sp.edit().putBoolean(KEY_TIME, value).apply()
 
     var bootStartup: Boolean
         get() = sp.getBoolean(KEY_BOOT_STARTUP, false)
@@ -64,12 +53,7 @@ object SP {
 
     var grid: Boolean
         get() = sp.getBoolean(KEY_GRID, false)
-        set(value) {
-            if (value != this.grid) {
-                sp.edit().putBoolean(KEY_GRID, value).apply()
-                listener?.onSharedPreferenceChanged(KEY_GRID)
-            }
-        }
+        set(value) = sp.edit().putBoolean(KEY_GRID, value).apply()
 
     var itemPosition: Int
         get() = sp.getInt(KEY_POSITION, 0)

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

@@ -1,20 +1,11 @@
 package com.lizongying.mytv
 
-import android.Manifest
-import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
-import android.widget.Toast
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-import androidx.core.view.marginEnd
-import androidx.core.view.marginTop
 import androidx.fragment.app.DialogFragment
-import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.databinding.SettingBinding
 
 
@@ -30,11 +21,6 @@ class SettingFragment : DialogFragment() {
         dialog?.window?.apply {
             addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
             decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                attributes.layoutInDisplayCutoutMode =
-                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-                setAttributes(attributes)
-            }
         }
     }
 
@@ -85,141 +71,35 @@ class SettingFragment : DialogFragment() {
             }
         }
 
-        binding.switchGrid.run {
-            isChecked = SP.grid
-            setOnCheckedChangeListener { _, isChecked ->
-                SP.grid = isChecked
-                (activity as MainActivity).settingDelayHide()
-            }
-        }
-
-        binding.checkVersion.setOnClickListener {
-            (activity as MainActivity).settingDelayHide()
-            requestInstallPermissions()
-        }
-
-        binding.clear.setOnClickListener {
-            (requireActivity() as MainActivity).syncTime()
-            SP.guid = ""
-            YSP.getGuid()
-        }
-
-        val application = requireActivity().applicationContext as MyTVApplication
-        val textSize = application.px2PxFont(binding.switchChannelReversal.textSize)
-
-        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)
+        updateManager = UpdateManager(context, this, context.appVersionCode)
+        binding.checkVersion.setOnClickListener(
+            OnClickListenerCheckVersion(
+                activity as MainActivity,
+                updateManager
+            )
         )
-        binding.name.textSize = application.px2PxFont(binding.name.textSize)
-        binding.version.textSize = textSize
-        val layoutParamsVersion = binding.version.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsVersion.topMargin = application.px2Px(binding.version.marginTop)
-        binding.version.layoutParams = layoutParamsVersion
 
-        binding.checkVersion.textSize = textSize
-        val layoutParamsCheckVersion =
-            binding.checkVersion.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsCheckVersion.marginEnd = application.px2Px(binding.checkVersion.marginEnd)
-        binding.checkVersion.layoutParams = layoutParamsCheckVersion
-
-        binding.versionName.textSize = textSize
-
-        binding.clear.textSize = textSize
-        binding.exit.textSize = textSize
-
-        val layoutParamsChannelSwitch =
-            binding.switchChannelReversal.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsChannelSwitch.topMargin =
-            application.px2Px(binding.switchChannelReversal.marginTop)
-
-        binding.switchChannelReversal.textSize = textSize
-        binding.switchChannelReversal.layoutParams = layoutParamsChannelSwitch
-
-        binding.switchChannelNum.textSize = textSize
-        binding.switchChannelNum.layoutParams = layoutParamsChannelSwitch
-
-        binding.switchTime.textSize = textSize
-        binding.switchTime.layoutParams = layoutParamsChannelSwitch
-
-        binding.switchBootStartup.textSize = textSize
-        binding.switchBootStartup.layoutParams = layoutParamsChannelSwitch
-
-        binding.switchGrid.textSize = textSize
-        binding.switchGrid.layoutParams = layoutParamsChannelSwitch
-
-        binding.appreciate.layoutParams.width =
-            application.px2Px(binding.appreciate.layoutParams.width)
-
-        binding.exit.setOnClickListener {
+        binding.exit.setOnClickListener{
             requireActivity().finishAffinity()
         }
 
-        updateManager = UpdateManager(context, context.appVersionCode)
-
         return binding.root
     }
 
-    private fun requestInstallPermissions() {
-        val context = requireContext()
-        val permissionsList: MutableList<String> = ArrayList()
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !context.packageManager.canRequestPackageInstalls()) {
-            permissionsList.add(Manifest.permission.REQUEST_INSTALL_PACKAGES)
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-            ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.READ_EXTERNAL_STORAGE
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            permissionsList.add(Manifest.permission.READ_EXTERNAL_STORAGE)
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
-            ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            permissionsList.add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-        }
-
-        if (permissionsList.isNotEmpty()) {
-            ActivityCompat.requestPermissions(
-                requireActivity(),
-                permissionsList.toTypedArray<String>(),
-                PERMISSIONS_REQUEST_CODE
-            )
-        } else {
-            updateManager.checkAndUpdate()
+    fun setVersionName(versionName: String) {
+        if (_binding != null) {
+            binding.versionName.text = versionName
         }
     }
 
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (requestCode == PERMISSIONS_REQUEST_CODE) {
-            var allPermissionsGranted = true
-            for (result in grantResults) {
-                if (result != PackageManager.PERMISSION_GRANTED) {
-                    allPermissionsGranted = false
-                    break
-                }
-            }
-            if (allPermissionsGranted) {
-                updateManager.checkAndUpdate()
-            } else {
-                Toast.makeText(context, "权限授权失败", Toast.LENGTH_LONG).show()
-            }
+    internal class OnClickListenerCheckVersion(
+        private val mainActivity: MainActivity,
+        private val updateManager: UpdateManager
+    ) :
+        View.OnClickListener {
+        override fun onClick(view: View?) {
+            mainActivity.settingDelayHide()
+            updateManager.checkAndUpdate()
         }
     }
 
@@ -230,7 +110,6 @@ class SettingFragment : DialogFragment() {
 
     companion object {
         const val TAG = "SettingFragment"
-        const val PERMISSIONS_REQUEST_CODE = 1
     }
 }
 

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

@@ -2,11 +2,10 @@ 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
-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
@@ -22,57 +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
-
-        binding.content.textSize = application.px2PxFont(binding.content.textSize)
-        binding.channel.textSize = application.px2PxFont(binding.channel.textSize)
-
-        binding.main.layoutParams.width = application.shouldWidthPx()
-        binding.main.layoutParams.height = application.shouldHeightPx()
-
-        if (SP.time) {
-            handler.removeCallbacks(showRunnable)
-            handler.postDelayed(showRunnable, 0)
-        } else {
-            handler.removeCallbacks(showRunnable)
+        var screenWidth = displayMetrics.widthPixels
+        var screenHeight = displayMetrics.heightPixels
+        if (screenHeight > screenWidth) {
+            screenWidth = displayMetrics.heightPixels
+            screenHeight = displayMetrics.widthPixels
         }
 
-        (activity as MainActivity).fragmentReady(TAG)
+        val ratio = 16f / 9f
+
+        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
+        }
+
+        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

@@ -1,5 +1,6 @@
 package com.lizongying.mytv
 
+import android.app.Activity
 import android.app.DownloadManager
 import android.app.DownloadManager.Request
 import android.content.BroadcastReceiver
@@ -13,10 +14,11 @@ import android.os.Environment
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import androidx.fragment.app.FragmentActivity
-import com.lizongying.mytv.api.ApiClient
-import com.lizongying.mytv.requests.ReleaseRequest
-import com.lizongying.mytv.requests.ReleaseResponse
+import androidx.core.app.ActivityCompat
+import androidx.core.content.PermissionChecker
+import androidx.core.content.PermissionChecker.checkSelfPermission
+import com.lizongying.mytv.api.ReleaseV2
+import com.lizongying.mytv.requests.MyRequest
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -25,61 +27,81 @@ import java.io.File
 
 class UpdateManager(
     private var context: Context,
+    private var settingFragment: SettingFragment,
     private var versionCode: Long
 ) :
     ConfirmationFragment.ConfirmationListener {
 
-    private var releaseRequest = ReleaseRequest()
-    private var release: ReleaseResponse? = null
+    private var myRequest = MyRequest()
+    private var release: ReleaseV2? = null
 
     private var downloadReceiver: DownloadReceiver? = null
 
     fun checkAndUpdate() {
+        if (!haveStoragePermission()) {
+            return
+        }
         CoroutineScope(Dispatchers.Main).launch {
             var text = "版本获取失败"
-            var update = false
             try {
-                release = releaseRequest.getRelease()
-                Log.i(TAG, "versionCode $versionCode ${release?.version_code}")
-                if (release?.version_code != null) {
-                    if (release?.version_code!! > versionCode) {
-                        text = "最新版本：${release?.version_name}"
-                        update = true
+                release = myRequest.getRelease()
+                Log.i(TAG, "versionCode $versionCode ${release?.c}")
+                if (release?.c != null) {
+                    text = if (release?.c!! > versionCode) {
+                        "最新版本：${release?.n}\n${release?.d ?: ""}"
                     } else {
-                        text = "已是最新版本，不需要更新"
+                        "已是最新版本，不需要更新"
                     }
                 }
             } catch (e: Exception) {
                 Log.e(TAG, "Error occurred: ${e.message}", e)
             }
-            updateUI(text, update)
+            updateUI(text)
         }
     }
 
-    private fun updateUI(text: String, update: Boolean) {
-        val dialog = ConfirmationFragment(this@UpdateManager, text, update)
-        dialog.show((context as FragmentActivity).supportFragmentManager, TAG)
+    private fun updateUI(text: String) {
+        val dialog = ConfirmationFragment(this@UpdateManager, text)
+        dialog.show(settingFragment.fragmentManager, TAG)
     }
 
-    private fun startDownload(release: ReleaseResponse) {
-        val apkName = "my-tv"
-        val apkFileName = "$apkName-${release.version_name}.apk"
+    private fun haveStoragePermission(): Boolean {
+        if (Build.VERSION.SDK_INT >= 23) {
+            if (checkSelfPermission(context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                === PermissionChecker.PERMISSION_GRANTED
+            ) {
+                Log.e("Permission error", "You have permission")
+                return true
+            } else {
+                Log.e("Permission error", "You have asked for permission")
+                ActivityCompat.requestPermissions(
+                    context as Activity, arrayOf(
+                        android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+                    ), 1
+                )
+                return false
+            }
+        } else { //you don't need to worry about these stuff below api level 23
+            Log.e("Permission error", "You already have the permission")
+            return true
+        }
+    }
+
+
+    private fun startDownload(release: ReleaseV2) {
+        val apkFileName = "my-tv-${release.n}.apk"
+        Log.i(TAG, "apkFileName $apkFileName")
         val downloadManager =
             context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-        val request =
-            Request(Uri.parse("${ApiClient.DOWNLOAD_HOST}${release.version_name}/$apkName-${release.version_name}.apk"))
-        Log.i(
-            TAG,
-            "url ${Uri.parse("${ApiClient.DOWNLOAD_HOST}${release.version_name}/$apkName-${release.version_name}.apk")}"
-        )
+        val request = Request(Uri.parse(release.u))
+        Log.i(TAG, "url ${Uri.parse(release.u)}")
         context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)?.mkdirs()
-        Log.i(TAG, "save dir ${Environment.DIRECTORY_DOWNLOADS}")
         request.setDestinationInExternalFilesDir(
             context,
             Environment.DIRECTORY_DOWNLOADS,
             apkFileName
         )
-        request.setTitle("${context.resources.getString(R.string.app_name)} ${release.version_name}")
+        request.setTitle("${settingFragment.resources.getString(R.string.app_name)} ${release.n}")
         request.setNotificationVisibility(Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
         request.setAllowedOverRoaming(false)
         request.setMimeType("application/vnd.android.package-archive")
@@ -157,73 +179,27 @@ class UpdateManager(
         override fun onReceive(context: Context, intent: Intent) {
             val reference = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1)
             Log.i(TAG, "reference $reference")
+            val progress = intent.getIntExtra("progress", 0)
+            Log.i(TAG, "progress $progress")
 
+            // 检查是否是我们发起的下载
             if (reference == downloadReference) {
-                val downloadManager =
-                    context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-                val query = DownloadManager.Query().setFilterById(downloadReference)
-                val cursor = downloadManager.query(query)
-                if (cursor != null && cursor.moveToFirst()) {
-                    val statusIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)
-                    if (statusIndex < 0) {
-                        Log.i(TAG, "Download failure")
-                        return
-                    }
-                    val status = cursor.getInt(statusIndex)
-
-                    val progressIndex =
-                        cursor.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
-                    if (progressIndex < 0) {
-                        Log.i(TAG, "Download failure")
-                        return
-                    }
-                    val progress = cursor.getInt(progressIndex)
-
-                    val totalSizeIndex =
-                        cursor.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
-                    val totalSize = cursor.getInt(totalSizeIndex)
-
-                    cursor.close()
-
-                    when (status) {
-                        DownloadManager.STATUS_SUCCESSFUL -> {
-                            installNewVersion()
-                        }
-
-                        DownloadManager.STATUS_FAILED -> {
-                            // Handle download failure
-                            Log.i(TAG, "Download failure")
-                        }
-
-                        else -> {
-                            // Update UI with download progress
-                            val percentage = progress * 100 / totalSize
-                            Log.i(TAG, "Download progress: $percentage%")
-                        }
-                    }
-                }
+                // 下载完成，触发安装
+                installNewVersion()
             }
         }
 
         private fun installNewVersion() {
-            val apkFile = File(
-                context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
-                apkFileName
+            val installIntent = Intent(Intent.ACTION_VIEW)
+            val apkUri = Uri.fromFile(
+                File(
+                    Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS),
+                    apkFileName
+                )
             )
-            Log.i(TAG, "apkFile $apkFile")
-
-            if (apkFile.exists()) {
-                val apkUri = Uri.parse("file://$apkFile")
-                Log.i(TAG, "apkUri $apkUri")
-                val installIntent = Intent(Intent.ACTION_VIEW).apply {
-                    setDataAndType(apkUri, "application/vnd.android.package-archive")
-                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
-                }
-
-                context.startActivity(installIntent)
-            } else {
-                Log.e(TAG, "APK file does not exist!")
-            }
+            installIntent.setDataAndType(apkUri, "application/vnd.android.package-archive")
+            installIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(installIntent)
         }
     }
 

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

@@ -5,11 +5,8 @@ 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 okhttp3.Interceptor
-import okhttp3.Response
 import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -18,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,
@@ -36,32 +31,13 @@ object Utils {
     }
 
     suspend fun init() {
+        var currentTimeMillis: Long = 0
         try {
-            val currentTimeMillis = getTimestampFromServer()
-            if (currentTimeMillis > 0) {
-                between = System.currentTimeMillis() - currentTimeMillis
-            }
+            currentTimeMillis = getTimestampFromServer()
         } catch (e: Exception) {
             println("Failed to retrieve timestamp from server: ${e.message}")
         }
-
-        withContext(Dispatchers.Main) {
-            listener?.onRequestFinished(null)
-        }
-    }
-
-    class RetryInterceptor(private val maxRetry: Int) : Interceptor {
-        @Throws(IOException::class)
-        override fun intercept(chain: Interceptor.Chain): Response {
-            val request = chain.request()
-            var response = chain.proceed(request)
-            var tryCount = 0
-            while (!response.isSuccessful && tryCount < maxRetry) {
-                tryCount++
-                response = chain.proceed(request)
-            }
-            return response
-        }
+        between = System.currentTimeMillis() - currentTimeMillis
     }
 
     /**
@@ -71,8 +47,8 @@ object Utils {
     private suspend fun getTimestampFromServer(): Long {
         return withContext(Dispatchers.IO) {
             val client = okhttp3.OkHttpClient.Builder()
-                .addInterceptor(RetryInterceptor(3))
-                .build()
+                .connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
+                .readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
             val request = okhttp3.Request.Builder()
                 .url("https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp")
                 .build()
@@ -83,6 +59,7 @@ object Utils {
                     Gson().fromJson(string, TimeResponse::class.java).data.t.toLong()
                 }
             } catch (e: IOException) {
+                // Handle network errors
                 throw IOException("Error during network request", e)
             }
         }
@@ -95,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()
@@ -113,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/ApiClient.kt

@@ -4,7 +4,6 @@ package com.lizongying.mytv.api
 import android.os.Build
 import android.util.Log
 import com.lizongying.mytv.jce.JceConverterFactory
-import com.lizongying.mytv.requests.ReleaseService
 import okhttp3.ConnectionSpec
 import okhttp3.OkHttpClient
 import okhttp3.TlsVersion
@@ -24,7 +23,6 @@ class ApiClient {
     private val protoUrl = "https://capi.yangshipin.cn/"
     private val traceUrl = "https://btrace.yangshipin.cn/"
     private val trace2Url = "https://aatc-api.yangshipin.cn/"
-    private val tokenUrl = "https://h5access.yangshipin.cn/"
     private val trace3Url = "https://dtrace.ysp.cctv.cn/"
     private val jceUrl = "https://jacc.ysp.cctv.cn/"
     private val fUrl = "https://m.fengshows.com/"
@@ -49,7 +47,7 @@ class ApiClient {
 
     val releaseService: ReleaseService by lazy {
         Retrofit.Builder()
-            .baseUrl(HOST)
+            .baseUrl(myUrl)
             .client(okHttpClient)
             .addConverterFactory(GsonConverterFactory.create())
             .build().create(ReleaseService::class.java)
@@ -79,14 +77,6 @@ class ApiClient {
             .build().create(YSPBtraceService::class.java)
     }
 
-    val yspToken2Service: YSPApiService by lazy {
-        Retrofit.Builder()
-            .baseUrl(tokenUrl)
-            .client(okHttpClient)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build().create(YSPApiService::class.java)
-    }
-
     val yspBtraceService3: YSPBtraceService by lazy {
         Retrofit.Builder()
             .baseUrl(trace3Url)
@@ -166,7 +156,7 @@ class ApiClient {
             val sslContext = SSLContext.getInstance("SSL")
             sslContext.init(null, trustAllCerts, java.security.SecureRandom())
 
-//            val proxy = Proxy(Proxy.Type.HTTP, InetSocketAddress("10.0.2.2", 8888))
+            val proxy = Proxy(Proxy.Type.HTTP, InetSocketAddress("10.0.2.2", 8888))
 
             val builder = OkHttpClient.Builder()
                 .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)
@@ -180,9 +170,4 @@ class ApiClient {
             throw RuntimeException(e)
         }
     }
-
-    companion object {
-        const val HOST = "https://gitee.com/lizongying/my-tv/raw/"
-        const val DOWNLOAD_HOST = "https://gitee.com/lizongying/my-tv/releases/download/"
-    }
 }

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

@@ -1,17 +1,17 @@
 package com.lizongying.mytv.api
 
 data class KvcollectRequest(
-    val BossId: Int = 99150,
-    val Pwd: Int = 1999332929,
+    val BossId: Int = 2727,
+    val Pwd: Int = 1424084450,
     val cdn: String = "waibao",
     val cmd: Int = 263,
     val defn: String = "fhd",
-    val downspeed: Int = 10,
+    val downspeed: Double = 10.0,
     val durl: String = "", //
     val errcode: String = "",
     val fact1: String = "ysp_pc_live_b",
     val firstreport: Int = 0,
-    val fplayerver: String = "180",
+    val fplayerver: String = "100",
     val ftime: String = "", //
     val geturltime: Int = 0,
     val guid: String = "", //
@@ -39,17 +39,17 @@ data class KvcollectRequest(
 
 
 data class KvcollectRequest2(
-    val BossId: Int = 99150,
-    val Pwd: Int = 1999332929,
+    val BossId: Int = 2727,
+    val Pwd: Int = 1424084450,
     val cdn: String = "waibao",
     val cmd: Int = 263,
     val defn: String = "fhd",
-    val downspeed: Int = 10,
+    val downspeed: String = "10",
     val durl: String = "", //
     val errcode: String = "",
     val fact1: String = "ysp_pc_live_b",
     val firstreport: Int = 0,
-    val fplayerver: String = "180",
+    val fplayerver: String = "100",
     val ftime: String = "", //
     val geturltime: Int = 0,
     val guid: String = "", //
@@ -68,9 +68,9 @@ data class KvcollectRequest2(
     val sRef: String = "",
     val sUrl: String = "", //
     val sdtfrom: String = "ysp_pc_01",
-    val seq: Int = 0, //
+    val seq: Int = 9, //
     var signature: String = "",
     val url: String = "", //
     val viewid: String = "", //
-    val _dc: String = "",
+    val _dc: Double = 0.0,
 )

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

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

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

@@ -1,11 +0,0 @@
-package com.lizongying.mytv.api
-
-data class Token2(
-    val ret: Int?,
-    val msg: String?,
-    val data: Data,
-) {
-    data class Data(
-        val token: String,
-    )
-}

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

@@ -1,10 +1,10 @@
 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
-import java.security.MessageDigest
 import kotlin.math.floor
 import kotlin.random.Random
 
@@ -53,13 +53,6 @@ object YSP {
 
     private var appid = "ysp_pc"
     var token = ""
-    var token2 = ""
-
-    var yspsdkinput = ""
-    var openapi_signature = ""
-
-    var nseqId = 1
-    var nrequest_id = ""
 
     private var encryptor = Encryptor()
 
@@ -83,43 +76,10 @@ object YSP {
 
         cKey =
             encryptor.encrypt(cnlid, timeStr, appVer, guid, platform)
-        randStr = getRand()
         signature = getSignature()
         return """{"cnlid":"$cnlid","livepid":"$livepid","stream":"$stream","guid":"$guid","cKey":"$cKey","adjust":$adjust,"sphttps":"$sphttps","platform":"$platform","cmd":"$cmd","encryptVer":"$encryptVer","dtype":"$dtype","devid":"$devid","otype":"$otype","appVer":"$appVer","app_version":"$appVersion","rand_str":"$randStr","channel":"$channel","defn":"$defn","signature":"$signature"}"""
     }
 
-    fun getTokenData(tvModel: TVViewModel) {
-        livepid = tvModel.getTV().pid
-        cnlid = tvModel.getTV().sid
-        defn = "fhd"
-
-        randStr = getRand()
-
-        if (tvModel.retryTimes > 0) {
-            guid = newGuid()
-        }
-
-        cKey =
-            encryptor.encrypt(cnlid, timeStr, appVer, guid, platform)
-
-        yspsdkinput =
-            md("adjust=$adjust&app_version=$appVersion&appVer=$appVer&channel=$channel&cKey=$cKey&cmd=$cmd&cnlid=$cnlid&defn=$defn&devid=$devid&dtype=$dtype&encryptVer=$encryptVer&guid=$guid&livepid=$livepid&otype=$otype&platform=$platform&sphttps=$sphttps&stream=$stream")
-
-        nseqId++
-
-        nrequest_id = "999999" + getRand() + getTimeStr()
-
-        openapi_signature =
-            md("yspappid:519748109;host:www.yangshipin.cn;protocol:https:;token:$token2;input:$yspsdkinput-$guid-$nseqId-$nrequest_id;")
-    }
-
-    fun md(str: String): String {
-        val md = MessageDigest.getInstance("MD5")
-        md.update(str.toByteArray())
-        val digest = md.digest()
-        return digest.let { it -> it.joinToString("") { "%02x".format(it) } }
-    }
-
     fun getAuthData(tvModel: TVViewModel): String {
         livepid = tvModel.getTV().pid
 
@@ -133,7 +93,7 @@ object YSP {
         return """pid=$livepid&guid=$guid&appid=$appid&rand_str=$randStr&signature=$signature"""
     }
 
-    fun getTimeStr(): String {
+    private fun getTimeStr(): String {
         return getDateTimestamp().toString()
     }
 
@@ -147,7 +107,6 @@ object YSP {
         var guid = SP.guid
         if (guid.length < 18) {
             guid = generateGuid()
-            this.guid = guid
             SP.guid = guid
         }
         return guid

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

@@ -2,11 +2,9 @@ package com.lizongying.mytv.api
 
 import retrofit2.Call
 import retrofit2.http.Body
-import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.Headers
 import retrofit2.http.POST
-import retrofit2.http.Query
 
 
 interface YSPApiService {
@@ -20,11 +18,6 @@ interface YSPApiService {
     fun getLiveInfo(
         @Header("cookie") cookie: String,
         @Header("Yspplayertoken") token: String,
-        @Header("Yspsdkinput") Yspsdkinput: String,
-        @Header("yspsdksign") yspsdksign: String,
-        @Header("Seqid") Seqid: String,
-        @Header("Request-Id") RequestId: String,
-        @Header("Yspappid") Yspappid: String="519748109",
         @Body request: LiveInfoRequest,
     ): Call<LiveInfo>
 
@@ -39,20 +32,4 @@ interface YSPApiService {
         @Header("cookie") cookie: String,
         @Body request: AuthRequest,
     ): Call<Auth>
-
-    @GET("web/open/token")
-    @Headers(
-        "content-type: application/json",
-        "referer: https://www.yangshipin.cn/",
-        "user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-    )
-    fun getToken(
-        @Header("cookie") cookie: String,
-        @Query("yspappid") yspappid: String = "519748109",
-        @Query("guid") guid: String = "",
-        @Query("vappid") vappid: String = "59306155",
-        @Query("vsecret") vsecret: String = "b42702bf7309a179d102f3d51b1add2fda0bc7ada64cb801",
-        @Query("raw") raw: String = "1",
-        @Query("ts") ts: String = "",
-    ): Call<Token2>
 }

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

@@ -87,8 +87,8 @@ interface YSPBtraceService {
         "referer: https://www.yangshipin.cn/",
     )
     fun kvcollect3(
-        @Field("BossId") BossId: String = "9150",
-        @Field("Pwd") Pwd: String = "1999332929",
+        @Field("BossId") BossId: String = "9141",
+        @Field("Pwd") Pwd: String = "1137850982",
         @Field("prog") prog: String = "", //
         @Field("playno") playno: String = "", //
         @Field("guid") guid: String = "", //
@@ -102,7 +102,7 @@ interface YSPBtraceService {
         @Field("firstreport") firstreport: String = "-",
         @Field("sUrl") sUrl: String = "", //
         @Field("sRef") sRef: String = "-",
-        @Field("fplayerver") fplayerver: String = "180",
+        @Field("fplayerver") fplayerver: String = "100",
         @Field("livepid") livepid: String = "",
         @Field("viewid") viewid: String = "",
         @Field("seq") seq: String = "",
@@ -118,8 +118,8 @@ interface YSPBtraceService {
         @Field("_dc") _dc: String = "",
         @Field("live_type") live_type: String = "-",
         @Field("ftime") ftime: String = "",
-//        @Field("url") url: String = "",
-//        @Field("rand_str") rand_str: String = "", //
-//        @Field("signature") signature: String = "",
+        @Field("url") url: String = "",
+        @Field("rand_str") rand_str: String = "", //
+        @Field("signature") signature: String = "",
     ): Call<Void>
 }

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,23 +10,20 @@ import retrofit2.Response
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-class ReleaseRequest {
+class MyRequest {
     private var releaseService = ApiClient().releaseService
 
-    suspend fun getRelease(): ReleaseResponse? {
+    suspend fun getRelease(): ReleaseV2? {
         return withContext(Dispatchers.IO) {
             fetchRelease()
         }
     }
 
-    private suspend fun fetchRelease(): ReleaseResponse? {
+    private suspend fun fetchRelease(): ReleaseV2? {
         return suspendCoroutine { continuation ->
             releaseService.getRelease()
-                .enqueue(object : Callback<ReleaseResponse> {
-                    override fun onResponse(
-                        call: Call<ReleaseResponse>,
-                        response: Response<ReleaseResponse>
-                    ) {
+                .enqueue(object : Callback<ReleaseV2> {
+                    override fun onResponse(call: Call<ReleaseV2>, response: Response<ReleaseV2>) {
                         if (response.isSuccessful) {
                             continuation.resume(response.body())
                         } else {
@@ -34,7 +31,7 @@ class ReleaseRequest {
                         }
                     }
 
-                    override fun onFailure(call: Call<ReleaseResponse>, t: Throwable) {
+                    override fun onFailure(call: Call<ReleaseV2>, t: Throwable) {
                         continuation.resume(null)
                     }
                 })
@@ -42,6 +39,6 @@ class ReleaseRequest {
     }
 
     companion object {
-        private const val TAG = "ReleaseRequest"
+        private const val TAG = "MyRequest"
     }
 }

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

@@ -1,7 +0,0 @@
-package com.lizongying.mytv.requests
-
-
-data class ReleaseResponse(
-    val version_code: Int?,
-    val version_name: String?,
-)

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

@@ -1,10 +0,0 @@
-package com.lizongying.mytv.requests
-
-import retrofit2.Call
-import retrofit2.http.GET
-
-interface ReleaseService {
-    @GET("JELLY_BEAN_MR1/version.json")
-    fun getRelease(
-    ): Call<ReleaseResponse>
-}

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,44 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    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">
 
-        <RelativeLayout
-            android:id="@+id/channel"
-            android:layout_width="90dp"
-            android:layout_height="60dp"
-            android:layout_gravity="end|top"
-            android:layout_marginTop="15dp"
-            android:layout_marginEnd="170dp"
-            android:gravity="end|bottom" >
-
-            <TextView
-                android:id="@+id/content"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|bottom"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:textSize="40sp"
-                tools:text="99"
-                android:layout_alignBaseline="@+id/time"/>
-            <TextView
-                android:id="@+id/time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|bottom"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:textSize="32sp"
-                tools:text="12:34" />
-        </RelativeLayout>
-    </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,28 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/setting"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     >
-    <ScrollView
-        android:id="@+id/container"
+    <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        >
+        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:paddingBottom="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"
@@ -33,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"
                 >
@@ -44,7 +37,7 @@
                     android:id="@+id/check_version"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="14sp"
+                    android:layout_marginEnd="10dp"
                     android:text="@string/check_version"
                     />
                 <ProgressBar
@@ -55,65 +48,45 @@
                 <TextView
                     android:id="@+id/version_name"
                     android:text=""
-                    android:textSize="14sp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
             </LinearLayout>
-            <Button
-                android:id="@+id/clear"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="14sp"
-                android:text="@string/clear"
-                />
             <Button
                 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>
-    </ScrollView>
-    <ImageView
-        android:id="@+id/appreciate"
-        android:layout_width="300dp"
-        android:layout_height="wrap_content"
-        android:src="@drawable/appreciate"
-        android:background="@drawable/rounded_white_right" />
-</LinearLayout>
+        <ImageView
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            android:src="@drawable/appreciate"
+            android:background="@color/white" />
+    </LinearLayout>
+</FrameLayout>

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

@@ -1,45 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    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">
 
-        <RelativeLayout
-            android:id="@+id/time"
-            android:layout_width="120dp"
-            android:layout_height="60dp"
-            android:layout_gravity="end|top"
-            android:layout_marginTop="15dp"
-            android:layout_marginEnd="50dp"
-            android:gravity="end|bottom" >
-
-            <TextView
-                android:id="@+id/channel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|bottom"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:textSize="40sp"
-                tools:text="99"
-                android:layout_alignBaseline="@+id/content"/>
-            <TextView
-                android:id="@+id/content"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|bottom"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:textSize="32sp"
-                tools:text="12:34" />
-        </RelativeLayout>
-
-    </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,8 +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="clear">恢复默认</string>
-    <string name="exit">退出应用</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>

app/src/main/res/xml/file_paths.xml

@@ -1,3 +0,0 @@
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <external-path name="external_files" path="." />
-</paths>

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": 33556224, "version_name": "v2.0.7"}