fix ysp

完成服务器有关所有功能，并优化相关代码

README.md

@@ -112,4 +112,4 @@ adb install my-tv.apk
 
 ## 赞赏
 
-![image](./screenshots/appreciate.jpeg)
+![image](./screenshots/zfb.jpg)

app/build.gradle

@@ -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,119 +0,0 @@
-package com.lizongying.mytv
-
-import android.graphics.Color
-import android.view.ContextThemeWrapper
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.ScaleAnimation
-import android.widget.ImageView
-import androidx.leanback.widget.ImageCardView
-import androidx.lifecycle.LifecycleOwner
-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 owner: LifecycleOwner, private var tvListViewModel: TVListViewModel) :
-    RecyclerView.Adapter<CardAdapter.ViewHolder>() {
-
-    private var listener: ItemListener? = null
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val cardView = object :
-            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
-        startScaleAnimation(cardView, 1.0f, 0.9f)
-        cardView.isFocusable = true
-        cardView.isFocusableInTouchMode = true
-
-        return ViewHolder(cardView)
-    }
-
-    private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float) {
-        val scaleAnimation = ScaleAnimation(
-            fromScale, toScale,
-            fromScale, toScale,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f
-        )
-        scaleAnimation.duration = 200
-        scaleAnimation.fillAfter = true
-
-        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.setOnFocusChangeListener { _, hasFocus ->
-            listener?.onItemFocusChange(item, hasFocus)
-            if (hasFocus) {
-                startScaleAnimation(cardView, 0.9f, 1.0f)
-            } else {
-                startScaleAnimation(cardView, 1.0f, 0.9f)
-            }
-        }
-
-        cardView.setOnClickListener { _ ->
-            listener?.onItemClicked(item)
-        }
-
-        cardView.titleText = tvViewModel.title.value
-        cardView.tag = tvViewModel.videoUrl.value
-
-        when (tvViewModel.title.value) {
-            "CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.cctv8k)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "天津卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.tianjin)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            "新疆卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.xinjiang)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            else -> Glide.with(viewHolder.view.context)
-                .load(tvViewModel.logo.value)
-                .centerInside()
-                .into(cardView.mainImageView)
-        }
-
-        cardView.mainImageView.setBackgroundColor(Color.WHITE)
-        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
-
-        tvViewModel.program.observe(owner) { _ ->
-            val program = tvViewModel.getProgramOne()
-            if (program != null) {
-                cardView.contentText = program.name
-            }
-        }
-    }
-
-    override fun getItemCount() = tvListViewModel.size()
-
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val view = itemView
-    }
-
-    interface ItemListener {
-        fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean)
-        fun onItemClicked(tvViewModel: TVViewModel)
-    }
-
-    fun setItemListener(listener: ItemListener) {
-        this.listener = listener
-    }
-
-    companion object {
-        private const val TAG = "CardAdapter"
-    }
-}
-

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/MainActivity.kt

@@ -122,7 +122,6 @@ class MainActivity : FragmentActivity() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
-            mainFragment.setPosition()
             transaction.show(mainFragment)
             keepRunnable()
         } else {

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

@@ -5,31 +5,30 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-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.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.lizongying.mytv.Utils.dpToPx
 import com.lizongying.mytv.Utils.getDateTimestamp
-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 : Fragment(), CardAdapter.ItemListener {
+class MainFragment : BrowseSupportFragment() {
 
     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!!
 
     private var request = Request()
 
@@ -44,12 +43,15 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var ready = 0
 
-    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?) {
@@ -58,141 +60,171 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         activity?.let { request.initYSP(it) }
         sharedPref = (activity as? MainActivity)?.sharedPref!!
 
-        view?.post {
+        loadRows()
-            val content = binding.content
 
-            var idx: Long = 0
+        setupEventListeners()
-            context?.let { TVList.init(it) }
-            for ((k, v) in TVList.list) {
-                val itemBinding: RowBinding =
-                    RowBinding.inflate(layoutInflater, content, false)
 
-                val tvListViewModelCurrent = TVListViewModel()
+        mUpdateProgramRunnable = UpdateProgramRunnable()
-                for ((idx2, v1) in v.withIndex()) {
+        handler.post(mUpdateProgramRunnable)
-                    val tvViewModel = TVViewModel(v1)
+
-                    tvViewModel.setRowPosition(idx.toInt())
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-                    tvViewModel.setItemPosition(idx2)
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
+                if (tvViewModel.errInfo.value != null
-                    tvListViewModel.addTVViewModel(tvViewModel)
+                    && tvViewModel.id.value == itemPosition
+                ) {
+                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
                 }
-                tvListViewModel.maxNum.add(v.size)
-
-                val adapter = CardAdapter(viewLifecycleOwner, tvListViewModelCurrent)
-                rowList.add(itemBinding.rowItems)
-
-                adapter.setItemListener(this)
-
-                itemBinding.rowHeader.text = k
-                itemBinding.rowItems.adapter = adapter
-                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) { _ ->
 
-            mUpdateProgramRunnable = UpdateProgramRunnable()
+                // not first time && channel not change
-            handler.post(mUpdateProgramRunnable)
+                if (tvViewModel.ready.value != null
-
+                    && tvViewModel.id.value == itemPosition
-            itemPosition = sharedPref.getInt(POSITION, 0)
+                    && check(tvViewModel)
-            if (itemPosition >= tvListViewModel.size()) {
+                ) {
-                itemPosition = 0
+                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                    (activity as? MainActivity)?.play(tvViewModel)
+                }
             }
-            tvListViewModel.setItemPosition(itemPosition)
+            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-            setPosition()
+                if (tvViewModel.change.value != null) {
-            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+                    val title = tvViewModel.title.value
-                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                    if (tvViewModel.pid.value != "") {
-                    if (tvViewModel.errInfo.value != null
+                        Log.i(TAG, "request $title")
-                        && tvViewModel.id.value == itemPosition
+                        lifecycleScope.launch(Dispatchers.IO) {
-                    ) {
+                            tvViewModel.let { request.fetchData(it) }
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
+                        }
-                            .show()
+                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                    }
+                        setSelectedPosition(
-                }
+                            tvViewModel.getRowPosition(), true,
-                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
+                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
-
+                        )
-                    // not first time && channel not change
+                    } else {
-                    if (tvViewModel.ready.value != null
+                        if (check(tvViewModel)) {
-                        && tvViewModel.id.value == itemPosition
+                            (activity as? MainActivity)?.play(tvViewModel)
-                        && check(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)) {
-                                (activity as? MainActivity)?.play(tvViewModel)
-                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                                setPosition(
-                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
-                                )
-                            }
                         }
                     }
                 }
             }
+        }
 
-            fragmentReady()
+        fragmentReady()
+    }
+
+    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(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)
+            }
+            tvListViewModel.maxNum.add(v.size)
+            val header = HeaderItem(idx, k)
+            rowsAdapter!!.add(ListRow(header, listRowAdapter))
+            idx++
+        }
+
+        adapter = rowsAdapter
+
+        itemPosition = sharedPref.getInt(POSITION, 0)
+        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 onViewCreated(view: View, savedInstanceState: Bundle?) {
+    fun nextSource() {
-        super.onViewCreated(view, savedInstanceState)
+        view?.post {
-    }
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-
+            if (tvViewModel != null) {
-    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
-        if (hasFocus) {
+                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
-            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
+                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
-            (activity as MainActivity).keepRunnable()
+                        tvViewModel.setVideoIndex(0)
+                    }
+                    tvViewModel.changed()
+                }
+            }
         }
     }
 
-    override fun onItemClicked(tvViewModel: TVViewModel) {
+    private fun setupEventListeners() {
-        if (this.isHidden) {
+        onItemViewClickedListener = ItemViewClickedListener()
-            (activity as? MainActivity)?.switchMainFragment()
+        onItemViewSelectedListener = ItemViewSelectedListener()
-            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(
-        rowList[tvViewModel!!.getRowPosition()].post {
+            itemViewHolder: Presenter.ViewHolder,
-            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
+            item: Any,
-                tvViewModel.getItemPosition()
+            rowViewHolder: RowPresenter.ViewHolder,
-            )?.requestFocus()
+            row: Row
+        ) {
+            if (item is TVViewModel) {
+                if (itemPosition != item.id.value!!) {
+                    itemPosition = item.id.value!!
+                    tvListViewModel.setItemPosition(itemPosition)
+                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
+                }
+                (activity as? MainActivity)?.switchMainFragment()
+            }
         }
     }
 
-    fun setPosition(rowPosition: Int, itemPosition: Int) {
+    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
-        rowList[rowPosition].post {
+        override fun onItemSelected(
-            ((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
+            itemViewHolder: Presenter.ViewHolder?, item: Any?,
-                itemPosition
+            rowViewHolder: RowPresenter.ViewHolder, row: Row
-            )?.requestFocus()
+        ) {
+            if (item is TVViewModel) {
+                tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                (activity as MainActivity).keepRunnable()
+            }
         }
     }
 
@@ -303,12 +335,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         handler.removeCallbacks(mUpdateProgramRunnable)
     }
 
-    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

@@ -41,7 +41,7 @@ class Request {
 
     private val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
     private val input =
-        """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,AppleM1Pro,OpenGL4.1)"}""".toByteArray()
+        """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()
 
     private var mapping = mapOf(
         "CCTV4K" to "CCTV4K 超高清",
@@ -118,6 +118,7 @@ class Request {
             override fun onResponse(call: Call<LiveInfo>, response: Response<LiveInfo>) {
                 if (response.isSuccessful) {
                     val liveInfo = response.body()
+
                     if (liveInfo?.data?.playurl != null) {
                         val chanll = liveInfo.data.chanll
                         val decodedBytes = Base64.decode(
@@ -133,8 +134,8 @@ class Request {
                             val url = liveInfo.data.playurl + "&revoi=" + encryptTripleDES(
                                 keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
                                 ivBytes
-                            ).uppercase()
+                            ).uppercase() + liveInfo.data.extended_param
-//                            Log.d(TAG, "$title url $url")
+                            Log.d(TAG, "$title url $url")
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()
                             tvModel.retryTimes = 0
@@ -202,7 +203,7 @@ class Request {
             }
 
             override fun onFailure(call: Call<LiveInfo>, t: Throwable) {
-                Log.e(TAG, "$title request error")
+                Log.e(TAG, "$title request error $t")
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {
@@ -354,29 +355,21 @@ class Request {
             ) {
                 if (response.isSuccessful) {
                     val body = response.body()
-
                     if (body?.data?.feedModuleListCount == 1) {
                         for (item in body.data?.feedModuleListList!![0]?.dataTvChannelListList!!) {
-                            if (item.isVip && !item.isLimitedFree) {
+                            Log.d(
-                                continue
-                            }
-                            Log.i(
                                 TAG,
                                 "${item.channelName},${item.pid},${item.streamId}"
                             )
-                            var channelType = "央视频道"
+
-                            if (item?.channelType === "weishi") {
+                            for ((_, v) in TVList.list) {
-                                channelType = "地方频道"
+                                for (v2 in v) {
-                            }
+                                    Log.i(TAG, "$v2")
-                            if (!mapping.containsKey(item.channelName)) {
+                                    if (v2.title == item.channelName || v2.alias == item.channelName) {
-                                continue
+                                        v2.pid = item.pid
-                            }
+                                        v2.sid = item.streamId
-                            val tv =
+                                    }
-                                TVList.list[channelType]?.find { it.title == mapping[item.channelName] }
+                                }
-                            if (tv != null) {
-                                tv.logo = item.tvLogo
-                                tv.pid = item.pid
-                                tv.sid = item.streamId
                             }
                         }
                     }

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

@@ -5,6 +5,7 @@ import java.io.Serializable
 data class TV(
     var id: Int = 0,
     var title: String,
+    var alias: String = "",
     var videoUrl: List<String>,
     var videoIndex: Int = 0,
     var channel: String = "",
@@ -12,10 +13,10 @@ data class TV(
     var pid: String = "",
     var sid: String = "",
     var programId: String = "",
-    var needToken:Boolean=false,
+    var needToken: Boolean = false,
-    var mustToken:Boolean=false,
+    var mustToken: Boolean = false,
 
-) : Serializable {
+    ) : Serializable {
 
     override fun toString(): String {
         return "TV{" +

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

@@ -0,0 +1,5 @@
+package com.lizongying.mytv
+
+class UpdateManager {
+
+}

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

@@ -1,12 +1,18 @@
 package com.lizongying.mytv
 
-import android.content.Context
 import android.content.res.Resources
+import android.os.SystemClock
+import android.util.Log
 import android.util.TypedValue
-import java.io.File
+import com.google.gson.Gson
+import com.lizongying.mytv.api.TimeResponse
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
-import java.io.IOException
+import java.util.Locale
 
 object Utils {
     fun getDateFormat(format: String): String {
@@ -17,6 +23,35 @@ object Utils {
         return Date().time / 1000
     }
 
+
+    init {
+        CoroutineScope(Dispatchers.Default).launch {
+            updateTimestampFromServer()
+        }
+    }
+
+    /**
+     * 从服务器获取时间戳
+     * @return Long 时间戳
+     */
+    private suspend fun updateTimestampFromServer() {
+        val currentTimeMillis = 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("https://api.m.taobao.com/rest/api3.do?api=mtop.common.getTimestamp")
+                    .build()
+            ).execute().use { response ->
+                if (!response.isSuccessful) throw java.io.IOException("Unexpected code $response")
+                val string = response.body()?.string()
+                Gson().fromJson(string, TimeResponse::class.java).data.t.toLong()
+            }
+        }
+        SystemClock.setCurrentTimeMillis(currentTimeMillis)
+    }
+
     fun dpToPx(dp: Float): Int {
         return TypedValue.applyDimension(
             TypedValue.COMPLEX_UNIT_DIP, dp, Resources.getSystem().displayMetrics
@@ -28,49 +63,4 @@ object Utils {
             TypedValue.COMPLEX_UNIT_DIP, dp.toFloat(), Resources.getSystem().displayMetrics
         ).toInt()
     }
-
-    /**
-     * 获取可读写的目录
-     *
-     * @param context 应用环境信息
-     *
-     * @return 可读写的目录
-     *
-     */
-    fun getAppDirectory(context: Context): File {
-        return context.filesDir
-    }
-
-    /**
-     * 更新channels.json
-     *
-     * @param context 应用环境信息
-     *
-     * @return 无
-     *
-     * @throws IOException 网络请求失败
-     */
-    fun updateChannel(context: Context) {
-        val client = okhttp3.OkHttpClient()
-        val request = okhttp3.Request.Builder().url(getServerUrl(context)).build()
-        client.newCall(request).execute().use { response ->
-            if (!response.isSuccessful) throw IOException("Unexpected code $response")
-            val body = response.body()
-            //覆盖channels.json
-            val file = File(getAppDirectory(context), "channels.json")
-            if (!file.exists()) {
-                file.createNewFile()
-            }
-            file.writeText(body!!.string())
-        }
-    }
-
-    /**
-     * 从res/values/server.xml获取服务器地址
-     * @param context 应用环境信息
-     * @return 服务器地址
-     */
-    private fun getServerUrl(context: Context): String {
-        return context.resources.getString(R.string.server_url)
-    }
 }

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

@@ -9,3 +9,11 @@ data class Info(
 data class InfoData(
     val token: String,
 )
+
+data class TimeResponse(
+    val data: Time
+) {
+    data class Time(
+        val t: String
+    )
+}

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

@@ -13,6 +13,7 @@ data class LiveInfo(
 )
 
 data class LiveInfoData(
+    val extended_param: String,
     val chanll: String,
     val playurl: String,
     val errinfo: String,

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

@@ -127,7 +127,6 @@ class YSP(var context: Context) {
     private fun getSignature(): String {
         val e =
             "adjust=${adjust}&appVer=${appVer}&app_version=$appVersion&cKey=$cKey&channel=$channel&cmd=$cmd&cnlid=$cnlid&defn=${defn}&devid=${devid}&dtype=${dtype}&encryptVer=${encryptVer}&guid=${guid}&livepid=${livepid}&otype=${otype}&platform=${platform}&rand_str=${randStr}&sphttps=${sphttps}&stream=${stream}".toByteArray()
-
         val hashedData = encryptor?.hash(e) ?: return ""
         return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
     }

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="match_parent"
-    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/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>
+    <string name="server_version_url">https://raw.githubusercontent.com/LeGend-wLw/my-tv-json-utils/main/version.txt</string>
+    <string name="server_url">https://github.com/LeGend-wLw/my-tv-json-utils/raw/main/channels.json</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">143dp</item>
-        <item name="android:layout_height">50dp</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>