request optimize

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

README.md

@@ -14,17 +14,6 @@
 
 ## 更新日志
 
-### v1.6.6（通用）
-
-* 更新重庆卫视图标
-* 凤凰卫视增强画质
-* 凤凰卫视增加EPG
-
-### v1.6.5（安卓5及以上专用）
-
-* 增加CETV1图标
-* 稳定性提升
-
 ### v1.6.4（通用）
 
 * 增加CETV1
@@ -225,17 +214,14 @@ adb install my-tv.apk
 
 * 音量不同
 * 大湾区卫视、广东4k超高清、广东珠江、三沙卫视
-* CETV教育频道
 * CHC高清三个电影频道
 * 地方频道
 * 收藏夹
 * 自定义源
 * 海外
-* 1.5.0 无法安装，1.5.1 可以安装
 * 节目增加预告
 * 频道列表优化
-* epg更新后菜单更新
+* 自动更新
-* 防止菜单第一个获取焦点
 
 ## 赞赏
 

app/build.gradle

@@ -81,7 +81,7 @@ static def VersionCode() {
 
 static def VersionName() {
     try {
-        def process = "git describe --tags --always | sed 's/v/ /g' | sed 's/\\./ /g' | sed 's/-/ /g' | awk '{print \$1*16777216+\$2*65536+\$3*256+\$4}'".execute()
+        def process = 'git describe --tags --always'.execute()
         process.waitFor()
         return process.text.trim() - "v"
     } catch (ignored) {
@@ -101,7 +101,7 @@ dependencies {
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
 
     // 21:2.9.0 17:2.6.4
-    def retrofit2_version = "2.6.4"
+    def retrofit2_version = "2.9.0"
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
     implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"

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

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

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

@@ -0,0 +1,60 @@
+package com.lizongying.mytv
+
+import android.graphics.Color
+import android.view.ContextThemeWrapper
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.leanback.widget.ImageCardView
+import androidx.leanback.widget.Presenter
+import androidx.lifecycle.LifecycleOwner
+import com.bumptech.glide.Glide
+import com.lizongying.mytv.models.TVViewModel
+
+class CardPresenter(
+    private val owner: LifecycleOwner,
+) : 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.title.value
+        cardView.setMainImageDimensions(CARD_WIDTH, CARD_HEIGHT)
+        cardView.tag = tvViewModel.videoUrl.value
+
+        Glide.with(viewHolder.view.context)
+            .load(tvViewModel.logo.value)
+            .centerInside()
+            .into(cardView.mainImageView)
+
+        cardView.setBackgroundColor(Color.WHITE)
+        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
+
+        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+        if (!epg.isNullOrEmpty()) {
+            cardView.contentText = epg.last().title
+        } else {
+            cardView.contentText = ""
+        }
+    }
+
+    override fun 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/ChannelUtils.kt

@@ -0,0 +1,157 @@
+package com.lizongying.mytv
+
+import android.content.Context
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.File
+
+/**
+ *@author LeGend
+ *@date 2024/2/4 22:42
+ */
+object ChannelUtils {
+    /**
+     * 获取服务器channel版本
+     *
+     * @param context Context
+     *
+     * @return 服务器channel版本
+     */
+    suspend fun getServerVersion(context: Context): Int {
+        return withContext(Dispatchers.IO) {
+            val client = okhttp3.OkHttpClient.Builder().connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
+                .readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
+            client.newCall(okhttp3.Request.Builder().url(getServerVersionUrl(context)).build()).execute()
+                .use { response ->
+                    if (!response.isSuccessful) throw java.io.IOException("Unexpected code $response")
+                    val body = response.body()
+                    body?.string()?.toInt() ?: 0
+                }
+        }
+    }
+
+    /**
+     * 获取服务器channel
+     *
+     * @param url String 服务器地址
+     *
+     * @return Array<TV> 服务器channel
+     *
+     * @throws java.io.IOException 网络请求失败
+     */
+    suspend fun getServerChannel(url: String): List<TV> {
+        val result = withContext(Dispatchers.IO) {
+            val client = okhttp3.OkHttpClient.Builder().connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
+                .readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
+            val request = okhttp3.Request.Builder().url(url).build()
+            client.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) throw java.io.IOException("Unexpected code $response")
+                val body = response.body()
+                body?.string() ?: ""
+            }
+        }
+        return withContext(Dispatchers.Default) {
+            val type = object : com.google.gson.reflect.TypeToken<List<TV>>() {}.type
+            com.google.gson.Gson().fromJson(result, type)
+        }
+    }
+
+    /**
+     * 获取服务器地址
+     *
+     * @param context Context
+     *
+     * @return 服务器地址
+     */
+    fun getServerUrl(context: Context): String {
+        return context.resources.getString(R.string.server_url)
+    }
+
+    /**
+     * 获取serverVersion的URL
+     *
+     * @param context Context
+     *
+     * @return serverVersionURL 服务器版本地址
+     */
+    suspend fun getServerVersionUrl(context: Context): String {
+        return withContext(Dispatchers.IO) {
+            context.resources.getString(R.string.server_version_url)
+        }
+    }
+
+
+    /**
+     * 获取本地channel版本
+     *
+     * @param context Context
+     *
+     * @return 本地channel
+     */
+    suspend fun getLocalVersion(context: Context): Int {
+        return withContext(Dispatchers.IO) {
+            val file = File(getAppDirectory(context), "channels")
+            //检查本地是否已经有保存的channels.json,若无保存的Channel.json则从读取assert中文件
+            val savedVersion =
+                context.getSharedPreferences("saved_version", Context.MODE_PRIVATE).getInt("version", Integer.MIN_VALUE)
+            if (!file.exists() || savedVersion == Integer.MIN_VALUE) {
+                context.resources.getInteger(R.integer.local_channel_version)
+            } else {
+                savedVersion
+            }
+        }
+    }
+
+    /**
+     * 获取本地可读取的目录
+     * @param context Context
+     *
+     * @return 可读取的目录
+     */
+    private fun getAppDirectory(context: Context): File {
+        return context.filesDir
+    }
+
+    /**
+     * 获取本地channel
+     *
+     * @param context Context
+     *
+     * @return Array<TV> 本地channel
+     */
+    suspend fun getLocalChannel(context: Context): List<TV> {
+        val str = withContext(Dispatchers.IO) {
+            if (File(getAppDirectory(context), "channels").exists()) {
+                File(getAppDirectory(context), "channels").readText()
+            } else {
+                context.resources.openRawResource(R.raw.channels).bufferedReader().use { it.readText() }
+            }
+        }
+        return withContext(Dispatchers.Default) {
+            val type = object : com.google.gson.reflect.TypeToken<List<TV>>() {}.type
+            com.google.gson.Gson().fromJson(str, type)
+        }
+    }
+
+    /**
+     * 更新channels.json
+     *
+     * @param context Context
+     *
+     * @return 无
+     *
+     * @throws java.io.IOException 写入失败
+     */
+    suspend fun updateLocalChannel(context: Context, version: Int, channels: List<TV>) {
+        withContext(Dispatchers.IO) {
+            val file = File(getAppDirectory(context), "channels")
+            if (!file.exists()) {
+                file.createNewFile()
+            }
+            file.writeText(com.google.gson.Gson().toJson(channels))
+            context.getSharedPreferences("saved_version", Context.MODE_PRIVATE).edit().putInt(
+                "version", version
+            ).apply()
+        }
+    }
+}

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

@@ -48,7 +48,7 @@ val Context.appVersionCode: Long
  * Return the version name of the app which is defined in build.gradle.
  * eg:1.0.0
  */
-val Context.appVersionName: String get() = packageInfo.versionName ?: ""
+val Context.appVersionName: String get() = packageInfo.versionName
 
 val Context.appSignature: String
     get() {

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

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

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

@@ -11,7 +11,12 @@ import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.models.TVViewModel
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
 
 
 class MainActivity : FragmentActivity(), Request.RequestListener {
@@ -105,7 +110,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
-            mainFragment.setPosition()
             transaction.show(mainFragment)
             mainActive()
         } else {
@@ -272,9 +276,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }, 2000)
     }
 
-
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-    fun onKey(keyCode: Int): Boolean {
-        Log.i(TAG, "keyCode $keyCode")
         when (keyCode) {
             KeyEvent.KEYCODE_0 -> {
                 showChannel("0")
@@ -386,7 +388,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
-                channelUp()
 //                if (mainFragment.isHidden) {
 //                    prevSource()
 //                } else {
@@ -400,7 +401,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                channelDown()
 //                if (mainFragment.isHidden) {
 //                    nextSource()
 //                } else {
@@ -412,13 +412,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 //                }
             }
         }
-        return false
-    }
-
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        if (onKey(keyCode)) {
-            return true
-        }
 
         return super.onKeyDown(keyCode, event)
     }

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

@@ -1,46 +1,48 @@
 package com.lizongying.mytv
 
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
-import android.view.KeyEvent
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
-import androidx.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 com.lizongying.mytv.Utils.getDateTimestamp
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.lizongying.mytv.Utils.dpToPx
 import com.lizongying.mytv.api.YSP
-import com.lizongying.mytv.databinding.RowBinding
-import com.lizongying.mytv.databinding.ShowBinding
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-
+class MainFragment : BrowseSupportFragment() {
-class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var itemPosition = 0
 
-    private var rowList: MutableList<View> = mutableListOf()
+    private var rowsAdapter: ArrayObjectAdapter? = null
-
-    private var _binding: ShowBinding? = null
-    private val binding get() = _binding!!
 
     var tvListViewModel = TVListViewModel()
 
     private var lastVideoUrl = ""
 
-    override fun onCreateView(
+    override fun onCreate(savedInstanceState: Bundle?) {
-        inflater: LayoutInflater, container: ViewGroup?,
+        Log.i(TAG, "onCreate")
-        savedInstanceState: Bundle?
+        super.onCreate(savedInstanceState)
-    ): View {
+        headersState = HEADERS_DISABLED
-        _binding = ShowBinding.inflate(inflater, container, false)
+    }
-        return binding.root
+
+    override fun onStart() {
+        Log.i(TAG, "onStart")
+        super.onStart()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -48,198 +50,170 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
 
         activity?.let { YSP.init(it) }
 
-        itemPosition = SP.itemPosition
+        loadRows()
 
-        view?.post {
+        setupEventListeners()
-            val content = binding.content
 
-            var idx: Long = 0
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-            for ((k, v) in TVList.list) {
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                val itemBinding: RowBinding =
+                if (tvViewModel.errInfo.value != null
-                    RowBinding.inflate(layoutInflater, content, false)
+                    && tvViewModel.id.value == itemPosition
-
+                ) {
-                val tvListViewModelCurrent = TVListViewModel()
+                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
-                for ((idx2, v1) in v.withIndex()) {
-                    val tvViewModel = TVViewModel(v1)
-                    tvViewModel.setRowPosition(idx.toInt())
-                    tvViewModel.setItemPosition(idx2)
-                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
-                    tvListViewModel.addTVViewModel(tvViewModel)
-
-                    updateEPG(tvViewModel)
                 }
-                tvListViewModel.maxNum.add(v.size)
-
-                val adapter =
-                    CardAdapter(
-                        itemBinding.rowItems,
-                        this,
-                        tvListViewModelCurrent,
-                    )
-                rowList.add(itemBinding.rowItems)
-
-                adapter.setItemListener(this)
-
-                itemBinding.rowHeader.text = k
-                itemBinding.rowItems.tag = idx.toInt()
-                itemBinding.rowItems.adapter = adapter
-
-                itemBinding.rowItems.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                    override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                        super.onScrolled(recyclerView, dx, dy)
-                        (activity as MainActivity).mainActive()
-                    }
-                })
-
-                val itemDecoration = context?.let { GrayOverlayItemDecoration(it) }
-                if (itemDecoration != null) {
-                    itemBinding.rowItems.addItemDecoration(itemDecoration)
-                }
-
-                if (SP.grid) {
-                    itemBinding.rowItems.layoutManager =
-                        GridLayoutManager(context, 6)
-                    itemBinding.rowItems.layoutParams.height =
-                        dpToPx(92 * ((tvListViewModelCurrent.size() + 6 - 1) / 6))
-                } else {
-                    itemBinding.rowItems.layoutManager =
-                        LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-                }
-
-                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
-                layoutParams.topMargin = dpToPx(11F)
-                itemBinding.row.layoutParams = layoutParams
-                content.addView(itemBinding.row)
-
-                idx++
             }
+            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
 
-            if (itemPosition >= tvListViewModel.size()) {
+                // not first time && channel not change
-                itemPosition = 0
+                if (tvViewModel.ready.value != null
+                    && tvViewModel.id.value == itemPosition
+                    && check(tvViewModel)
+                ) {
+                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                    (activity as? MainActivity)?.play(tvViewModel)
+                }
             }
-
+            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-            tvListViewModel.setItemPosition(itemPosition)
+                if (tvViewModel.change.value != null) {
-            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+                    val title = tvViewModel.title.value
-                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                    Log.i(TAG, "switch $title")
-                    if (tvViewModel.errInfo.value != null
+                    if (tvViewModel.pid.value != "") {
-                        && tvViewModel.id.value == itemPosition
+                        Log.i(TAG, "request $title")
-                    ) {
+                        lifecycleScope.launch(Dispatchers.IO) {
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
+                            tvViewModel.let { Request.fetchData(it) }
-                            .show()
+                        }
-                    }
+                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                }
+                        setSelectedPosition(
-                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
+                            tvViewModel.getRowPosition(), true,
-
+                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
-                    // not first time && channel not change
+                        )
-                    if (tvViewModel.ready.value != null
+                    } else {
-                        && tvViewModel.id.value == itemPosition
+                        if (check(tvViewModel)) {
-                        && check(tvViewModel)
+                            (activity as? MainActivity)?.play(tvViewModel)
-                    ) {
-                        Log.i(TAG, "ready ${tvViewModel.title.value}")
-                        (activity as? MainActivity)?.play(tvViewModel)
-                    }
-                }
-                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.change.value != null) {
-                        val title = tvViewModel.title.value
-                        Log.i(TAG, "switch $title")
-                        if (tvViewModel.pid.value != "") {
-                            Log.i(TAG, "request $title")
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { Request.fetchData(it) }
-                            }
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setPosition(
+                            setSelectedPosition(
-                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                                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()
         }
+
+        (activity as MainActivity).fragmentReady()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    fun toLastPosition() {
-        super.onViewCreated(view, savedInstanceState)
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
+        )
     }
 
-    override fun onKey(keyCode: Int): Boolean {
+    fun toFirstPosition() {
-        if (this.isHidden) {
+        setSelectedPosition(
-            when (keyCode) {
+            selectedPosition, false,
-                KeyEvent.KEYCODE_DPAD_UP -> {
+            SelectItemViewHolderTask(0)
-                    (activity as MainActivity).onKey(keyCode)
+        )
-                    return true
+    }
-                }
 
-                KeyEvent.KEYCODE_DPAD_DOWN -> {
+    override fun startHeadersTransition(withHeaders: Boolean) {
-                    (activity as MainActivity).onKey(keyCode)
+    }
-                    return true
+
+    private fun loadRows() {
+        rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
+
+        val cardPresenter = CardPresenter(viewLifecycleOwner)
+
+        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)
+
+                updateEPG(tvViewModel)
+            }
+            tvListViewModel.maxNum.add(v.size)
+            val header = HeaderItem(idx, k)
+            rowsAdapter!!.add(ListRow(header, listRowAdapter))
+            idx++
+        }
+
+        adapter = rowsAdapter
+
+        itemPosition = SP.itemPosition
+        if (itemPosition >= tvListViewModel.size()) {
+            itemPosition = 0
+        }
+        tvListViewModel.setItemPosition(itemPosition)
+    }
+
+    fun prevSource() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.minus(1)
+                    if (videoIndex == -1) {
+                        tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
+                    }
+                    tvViewModel.changed()
                 }
             }
         }
-        return false
     }
 
-    override fun onItemHasFocus(tvViewModel: TVViewModel) {
+    fun nextSource() {
-        tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
+        view?.post {
-
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-        val row = tvViewModel.getRowPosition()
+            if (tvViewModel != null) {
-
+                if (tvViewModel.videoUrl.value!!.size > 1) {
-        for (i in rowList) {
+                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
-            if (i.tag as Int != row) {
+                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
-                ((i as RecyclerView).adapter as CardAdapter).clear()
+                        tvViewModel.setVideoIndex(0)
+                    }
+                    tvViewModel.changed()
+                }
             }
         }
-
-        (activity as MainActivity).mainActive()
     }
 
-    override fun onItemClicked(tvViewModel: TVViewModel) {
+    private fun setupEventListeners() {
-        Log.i(TAG, "onItemClicked")
+        onItemViewClickedListener = ItemViewClickedListener()
-        if (this.isHidden) {
+        onItemViewSelectedListener = ItemViewSelectedListener()
-            (activity as? MainActivity)?.switchMainFragment()
-            return
-        }
-
-        if (itemPosition != tvViewModel.id.value!!) {
-            itemPosition = tvViewModel.id.value!!
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-        (activity as? MainActivity)?.switchMainFragment()
     }
 
-    fun setPosition() {
+    private inner class ItemViewClickedListener : OnItemViewClickedListener {
-        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+        override fun onItemClicked(
-        val rowPosition = tvViewModel!!.getRowPosition()
+            itemViewHolder: Presenter.ViewHolder,
-        val itemPosition = tvViewModel.getItemPosition()
+            item: Any,
-        setPosition(rowPosition, itemPosition)
+            rowViewHolder: RowPresenter.ViewHolder,
-    }
+            row: Row
-
+        ) {
-    fun setPosition(rowPosition: Int, itemPosition: Int) {
+            if (item is TVViewModel) {
-        rowList[rowPosition].post {
+                if (itemPosition != item.id.value!!) {
-            when (val layoutManager = (rowList[rowPosition] as RecyclerView).layoutManager) {
+                    itemPosition = item.id.value!!
-                is GridLayoutManager -> {
+                    tvListViewModel.setItemPosition(itemPosition)
-                    layoutManager.findViewByPosition(
+                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
-                        itemPosition
-                    )?.requestFocus()
                 }
+                (activity as? MainActivity)?.switchMainFragment()
+            }
+        }
+    }
 
-                is LinearLayoutManager -> {
+    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
-                    layoutManager.findViewByPosition(
+        override fun onItemSelected(
-                        itemPosition
+            itemViewHolder: Presenter.ViewHolder?, item: Any?,
-                    )?.requestFocus()
+            rowViewHolder: RowPresenter.ViewHolder, row: Row
-                }
+        ) {
+            if (item is TVViewModel) {
+                tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                (activity as MainActivity).mainActive()
             }
         }
     }
@@ -307,32 +281,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         }
     }
 
-    fun shouldHasFocus(tvModel: TVViewModel): Boolean {
-        return tvModel == tvListViewModel.getTVViewModel(itemPosition)
-    }
-
-    override fun onHiddenChanged(hidden: Boolean) {
-        super.onHiddenChanged(hidden)
-        if (!hidden) {
-            val tvModel = tvListViewModel.getTVViewModel(itemPosition)
-            val rowPosition = tvModel?.getRowPosition()
-            val itemPosition = tvModel?.getItemPosition()
-            Log.i(TAG, "toPosition $rowPosition $itemPosition")
-            for (i in rowList) {
-                if (i.tag as Int == rowPosition) {
-                    ((i as RecyclerView).adapter as CardAdapter).toPosition(itemPosition!!)
-                    break
-                }
-            }
-        } else {
-            view?.post {
-//                for (i in rowList) {
-//                    ((i as RecyclerView).adapter as CardAdapter).visiable = false
-//                }
-            }
-        }
-    }
-
     override fun onResume() {
         Log.i(TAG, "onResume")
         super.onResume()
@@ -350,12 +298,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         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/Request.kt

@@ -72,14 +72,14 @@ object Request {
     private var call: Call<LiveInfo>? = null
     private var callAuth: Call<Auth>? = null
     private var callInfo: Call<Info>? = null
-    private var callFAuth: Call<FAuth>? = null
+    private var fAuth: Call<FAuth>? = null
     private var callPage: Call<pageModel.Response>? = null
 
     private fun cancelCall() {
         call?.cancel()
         callAuth?.cancel()
         callInfo?.cancel()
-        callFAuth?.cancel()
+        fAuth?.cancel()
         callPage?.cancel()
     }
 
@@ -91,6 +91,7 @@ object Request {
         val data = YSP.getAuthData(tvModel)
         val request = AuthRequest(data)
         callAuth = request.let { yspApiService.getAuth("guid=${YSP.getGuid()}; $cookie", it) }
+
         callAuth?.enqueue(object : Callback<Auth> {
             override fun onResponse(call: Call<Auth>, response: Response<Auth>) {
                 if (response.isSuccessful) {
@@ -105,12 +106,12 @@ object Request {
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
                             if (tvModel.getTV().needToken) {
-                                if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                                if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                     if (!tvModel.getTV().mustToken) {
                                         fetchAuth(tvModel, cookie)
                                     }
                                 } else {
-                                    tvModel.needGetToken = true
+                                    token = ""
                                     fetchAuth(tvModel)
                                 }
                             } else {
@@ -123,12 +124,12 @@ object Request {
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
                         if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchAuth(tvModel, cookie)
                                 }
                             } else {
-                                tvModel.needGetToken = true
+                                token = ""
                                 fetchAuth(tvModel)
                             }
                         } else {
@@ -143,12 +144,12 @@ object Request {
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                             if (!tvModel.getTV().mustToken) {
                                 fetchAuth(tvModel, cookie)
                             }
                         } else {
-                            tvModel.needGetToken = true
+                            token = ""
                             fetchAuth(tvModel)
                         }
                     } else {
@@ -211,13 +212,13 @@ object Request {
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
                                 if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                         if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
 //                                            fetchAuth(tvModel, cookie)
                                         }
                                     } else {
-                                        tvModel.needGetToken = true
+                                        token = ""
                                         fetchVideo(tvModel)
 //                                        fetchAuth(tvModel)
                                     }
@@ -236,13 +237,13 @@ object Request {
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
                                 if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                         if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
 //                                            fetchAuth(tvModel, cookie)
                                         }
                                     } else {
-                                        tvModel.needGetToken = true
+                                        token = ""
                                         fetchVideo(tvModel)
 //                                        fetchAuth(tvModel)
                                     }
@@ -258,13 +259,13 @@ object Request {
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
                         if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchVideo(tvModel, cookie)
 //                                    fetchAuth(tvModel, cookie)
                                 }
                             } else {
-                                tvModel.needGetToken = true
+                                token = ""
                                 fetchVideo(tvModel)
 //                                fetchAuth(tvModel)
                             }
@@ -281,12 +282,12 @@ object Request {
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
+                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
                             if (!tvModel.getTV().mustToken) {
                                 fetchVideo(tvModel, cookie)
                             }
                         } else {
-                            tvModel.needGetToken = true
+                            token = ""
                             fetchVideo(tvModel)
                         }
                     } else {
@@ -299,28 +300,20 @@ object Request {
 
     private fun fetchAuth(tvModel: TVViewModel) {
         cancelCall()
-        if (tvModel.needGetToken) {
+        if (token == "") {
             callInfo = yspTokenService.getInfo("")
             callInfo?.enqueue(object : Callback<Info> {
                 override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                    if (response.isSuccessful && response.body()?.data?.token != null) {
+                    if (response.isSuccessful) {
                         token = response.body()?.data?.token!!
                         Log.i(TAG, "info success $token")
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
                         val cookie =
                             "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
                         fetchAuth(tvModel, cookie)
-                    } else if (response.code() == 304) {
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
-                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                        fetchVideo(tvModel, cookie)
                     } else {
                         Log.e(TAG, "info status error")
-                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                            tvModel.tokenYSPRetryTimes++
+                            tvModel.tokenRetryTimes++
                             fetchAuth(tvModel)
                         } else {
                             if (!tvModel.getTV().mustToken) {
@@ -334,8 +327,8 @@ object Request {
 
                 override fun onFailure(call: Call<Info>, t: Throwable) {
                     Log.e(TAG, "info request error $t")
-                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                    if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                        tvModel.tokenYSPRetryTimes++
+                        tvModel.tokenRetryTimes++
                         fetchVideo(tvModel)
                     } else {
                         if (!tvModel.getTV().mustToken) {
@@ -356,28 +349,20 @@ object Request {
     private fun fetchVideo(tvModel: TVViewModel) {
         cancelCall()
         Log.d(TAG, "fetchVideo")
-        if (tvModel.needGetToken) {
+        if (token == "") {
             callInfo = yspTokenService.getInfo("")
             callInfo?.enqueue(object : Callback<Info> {
                 override fun onResponse(call: Call<Info>, response: Response<Info>) {
                     if (response.isSuccessful && response.body()?.data?.token != null) {
                         token = response.body()?.data?.token!!
                         Log.i(TAG, "info success $token")
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
-                        val cookie =
-                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                        fetchVideo(tvModel, cookie)
-                    } else if (response.code() == 304) {
-                        tvModel.needGetToken = false
-                        tvModel.tokenYSPRetryTimes = 0
                         val cookie =
                             "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
                         fetchVideo(tvModel, cookie)
                     } else {
                         Log.e(TAG, "info status error")
-                        if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                            tvModel.tokenYSPRetryTimes++
+                            tvModel.tokenRetryTimes++
                             fetchVideo(tvModel)
                         } else {
                             if (!tvModel.getTV().mustToken) {
@@ -391,8 +376,8 @@ object Request {
 
                 override fun onFailure(call: Call<Info>, t: Throwable) {
                     Log.e(TAG, "info request error $t")
-                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                    if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                        tvModel.tokenYSPRetryTimes++
+                        tvModel.tokenRetryTimes++
                         fetchVideo(tvModel)
                     } else {
                         if (!tvModel.getTV().mustToken) {
@@ -420,8 +405,8 @@ object Request {
             qa = "FHD"
         }
 
-        callFAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
+        fAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
-        callFAuth?.enqueue(object : Callback<FAuth> {
+        fAuth?.enqueue(object : Callback<FAuth> {
             override fun onResponse(call: Call<FAuth>, response: Response<FAuth>) {
                 if (response.isSuccessful && response.body()?.data?.live_url != null) {
                     val url = response.body()?.data?.live_url!!

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

@@ -6,21 +6,14 @@ import android.content.SharedPreferences
 object SP {
     // Name of the sp file TODO Should use a meaningful name and do migrations
     private const val SP_FILE_NAME = "MainActivity"
-
     // If Change channel with up and down in reversed order or not
     private const val KEY_CHANNEL_REVERSAL = "channel_reversal"
-
     // If use channel num to select channel or not
     private const val KEY_CHANNEL_NUM = "channel_num"
-
     // If start app on device boot or not
     private const val KEY_BOOT_STARTUP = "boot_startup"
-
-    private const val KEY_GRID = "grid"
-
     // Position in list of the selected channel item
     private const val KEY_POSITION = "position"
-
     // guid
     private const val KEY_GUID = "guid"
 
@@ -45,15 +38,11 @@ object SP {
         get() = sp.getBoolean(KEY_BOOT_STARTUP, false)
         set(value) = sp.edit().putBoolean(KEY_BOOT_STARTUP, value).apply()
 
-    var grid: Boolean
-        get() = sp.getBoolean(KEY_GRID, false)
-        set(value) = sp.edit().putBoolean(KEY_GRID, value).apply()
-
     var itemPosition: Int
         get() = sp.getInt(KEY_POSITION, 0)
         set(value) = sp.edit().putInt(KEY_POSITION, value).apply()
 
     var guid: String
-        get() = sp.getString(KEY_GUID, "") ?: ""
+        get() = sp.getString(KEY_GUID, "")  ?: ""
         set(value) = sp.edit().putString(KEY_GUID, value).apply()
 }

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

@@ -54,14 +54,6 @@ class SettingFragment : DialogFragment() {
             }
         }
 
-        binding.switchGrid.run {
-            isChecked = SP.grid
-            setOnCheckedChangeListener { _, isChecked ->
-                SP.grid = isChecked
-                (activity as MainActivity).settingActive()
-            }
-        }
-
         updateManager = UpdateManager(context, this, context.appVersionCode)
         binding.checkVersion.setOnClickListener(OnClickListenerCheckVersion(updateManager))
 

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

@@ -1,5 +1,12 @@
 package com.lizongying.mytv
 
+import android.content.Context
+import android.util.Log
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import java.io.IOException
+
 object TVList {
     val list: Map<String, List<TV>> by lazy {
         setup()
@@ -1031,4 +1038,63 @@ object TVList {
 //        list = list.filterKeys { it in array }
         return list
     }
+
+    /**
+     * 初始化
+     *
+     * @param context Context
+     */
+    fun init(context: Context) {
+        CoroutineScope(Dispatchers.Default).launch {
+            //获取本地版本号
+            val localVersion = ChannelUtils.getLocalVersion(context)
+            //获取服务器版本号
+            val serverVersion = try {
+                ChannelUtils.getServerVersion(context)
+            } catch (e: IOException) {
+                Log.e("TVList", "无法从服务器获取版本信息", e)
+                Integer.MIN_VALUE
+            }
+            //频道列表
+            val channelTVMap: MutableMap<String, MutableList<TV>> = mutableMapOf()
+            //是否从服务器更新
+            var updateFromServer = false
+            //获取频道列表
+            val tvList: List<TV> = if (localVersion < serverVersion) {
+                //获取服务器地址
+                val url = ChannelUtils.getServerUrl(context)
+                //是否从服务器更新
+                updateFromServer = true
+                Log.i("TVList", "从服务器获取频道信息")
+                try {
+                    ChannelUtils.getServerChannel(url)
+                } catch (e: IOException) {
+                    Log.e("TVList", "无法从服务器获取频道信息", e)
+                    updateFromServer = false
+                    ChannelUtils.getLocalChannel(context)
+                }
+            } else {
+                Log.i("TVList", "从本地获取频道信息")
+                //获取本地频道
+                ChannelUtils.getLocalChannel(context)
+            }
+            //按频道分类
+            for (tv in tvList) {
+                val key = tv.channel
+                if (channelTVMap.containsKey(key)) {
+                    val list = channelTVMap[key]!!
+                    list.add(tv)
+                    channelTVMap[key] = list
+                } else {
+                    channelTVMap[key] = mutableListOf(tv)
+                }
+            }
+            //保存频道列表
+//            list = channelTVMap
+            //保存版本号
+            if (updateFromServer) {
+                ChannelUtils.updateLocalChannel(context, serverVersion, tvList)
+            }
+        }
+    }
 }

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

@@ -1,11 +1,7 @@
 package com.lizongying.mytv.api
 
 
-import android.os.Build
-import android.util.Log
-import okhttp3.ConnectionSpec
 import okhttp3.OkHttpClient
-import okhttp3.TlsVersion
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.protobuf.ProtoConverterFactory
@@ -72,36 +68,6 @@ class ApiClient {
             .build().create(FAuthService::class.java)
     }
 
-    private fun enableTls12OnPreLollipop(client: OkHttpClient.Builder): OkHttpClient.Builder {
-        if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT < 22) {
-            try {
-                val sc = SSLContext.getInstance("TLSv1.2")
-
-                sc.init(null, null, null)
-
-                // a more robust version is to pass a custom X509TrustManager
-                // as the second parameter and make checkServerTrusted to accept your server.
-                // Credits: https://github.com/square/okhttp/issues/2372#issuecomment-1774955225
-                client.sslSocketFactory(Tls12SocketFactory(sc.socketFactory))
-
-                val cs = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
-                    .tlsVersions(TlsVersion.TLS_1_2)
-                    .build()
-
-                val specs: MutableList<ConnectionSpec> = ArrayList()
-                specs.add(cs)
-                specs.add(ConnectionSpec.COMPATIBLE_TLS)
-                specs.add(ConnectionSpec.CLEARTEXT)
-
-                client.connectionSpecs(specs)
-            } catch (exc: java.lang.Exception) {
-                Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc)
-            }
-        }
-
-        return client
-    }
-
     private fun getUnsafeOkHttpClient(): OkHttpClient {
         try {
             val trustAllCerts: Array<TrustManager> = arrayOf(
@@ -127,12 +93,11 @@ class ApiClient {
             val sslContext = SSLContext.getInstance("SSL")
             sslContext.init(null, trustAllCerts, java.security.SecureRandom())
 
-            val builder = OkHttpClient.Builder()
+            return OkHttpClient.Builder()
                 .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)
                 .hostnameVerifier { _, _ -> true }
                 .dns(DnsCache())
-
+                .build()
-            return enableTls12OnPreLollipop(builder).build()
 
         } catch (e: Exception) {
             throw RuntimeException(e)

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

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

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

@@ -23,13 +23,11 @@ class TVViewModel(private var tv: TV) : ViewModel() {
 
     var retryTimes = 0
     var retryMaxTimes = 8
-    var tokenYSPRetryTimes = 0
+    var tokenRetryTimes = 0
-    var tokenYSPRetryMaxTimes = 0
+    var tokenRetryMaxTimes = 0
     var tokenFHRetryTimes = 0
     var tokenFHRetryMaxTimes = 2
 
-    var needGetToken = false
-
     private val _errInfo = MutableLiveData<String>()
     val errInfo: LiveData<String>
         get() = _errInfo
@@ -173,13 +171,19 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _epg.value = p.map { EPG(it.title, formatFTime(it.event_time)) }.toMutableList()
     }
 
+    private var mHeaders: Map<String, String>? = mapOf()
+
+    fun setHeaders(headers: Map<String, String>) {
+        mHeaders = headers
+    }
+
     /**
      * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
      */
     @OptIn(UnstableApi::class)
     fun buildSource(): HlsMediaSource {
         val httpDataSource = DefaultHttpDataSource.Factory()
-//        mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
+        mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
 
         return HlsMediaSource.Factory(httpDataSource).createMediaSource(
             MediaItem.fromUri(

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

@@ -70,12 +70,6 @@
                 android:layout_marginTop="10dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
-            <Switch
-                android:id="@+id/switch_grid"
-                android:text="@string/title_grid"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
         </LinearLayout>
         <ImageView
             android:layout_width="300dp"

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

@@ -1,25 +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">
-
-    <TextView
-        android:id="@+id/row_header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:layout_marginTop="0dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginBottom="5dp"
-        android:gravity="start"
-        android:textColor="#FFEEEEEE"
-        android:textSize="22sp" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/row_items"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-    </androidx.recyclerview.widget.RecyclerView>
-</LinearLayout>

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

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

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

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

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

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="server_url">http://localhost:8080</string>
+    <integer name="local_channel_version">1</integer>
-</resources>
+    <string name="server_version_url">https://fastly.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@main/version.txt</string>
+    <string name="server_url">https://fastly.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@main/channels.json</string>
+</resources>

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

@@ -4,5 +4,4 @@
     <string name="title_channel_num">数字选台</string>
     <string name="check_version">检查更新</string>
     <string name="title_boot_startup">开机自启</string>
-    <string name="title_grid">网格样式</string>
 </resources>

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

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