fix the menu did not appear

README.md

@@ -1,6 +1,6 @@
 # 我的电视
 
-电视直播软件，安装即可使用
+安卓电视直播软件，内置直播源
 
 ## 使用
 
@@ -14,42 +14,6 @@
 
 ## 更新日志
 
-### v1.5.1（高版本专用）
-
-* 性能优化
-
-### v1.5.0（通用版）
-
-* 修复部分情况下APP切换后无法继续播放的问题
-
-### v1.4.9（高版本专用）
-
-* 同步v1.4.8
-
-### v1.4.8（通用版）
-
-* 频道号从1开始，CCTV5+为18
-* 提高CCTV6清晰度
-* 增加天津卫视、新疆卫视
-
-### v1.4.7（高版本专用）
-
-* 修复部分用户CCTV13播放过程中卡住的问题
-* 调整CCTV的频道顺序
-
-### v1.4.6（通用版）
-
-* 10以下频道不再需要先按0
-
-### v1.4.5（高版本专用）
-
-* 数字选台配置
-
-### v1.4.4（通用版）
-
-* 优化图标显示
-* 增加换台反转
-
 ### v1.3.3
 
 * 部分错误会提示用户

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/AndroidManifest.xml

@@ -9,19 +9,17 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:allowBackup="true"
-        android:largeHeap="true"
-        android:icon="@drawable/logo"
-        android:logo="@drawable/logo"
-        android:banner="@drawable/banner"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:networkSecurityConfig="@xml/network"
-        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.MyTV">
         <activity
             android:keepScreenOn="true"
             android:name=".MainActivity"
+            android:banner="@drawable/banner"
             android:exported="true"
+            android:icon="@drawable/logo"
+            android:logo="@drawable/logo"
             android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -31,31 +31,23 @@ class CardPresenter(
         cardView.setMainImageDimensions(CARD_WIDTH, CARD_HEIGHT)
         cardView.tag = tvViewModel.videoUrl.value
 
-        when (tvViewModel.title.value) {
-            "CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.cctv8k)
-                .centerInside()
-                .into(cardView.mainImageView)
+        if (tvViewModel.logo.value != null) {
+            if (tvViewModel.title.value == "CCTV8K 超高清") {
+                Glide.with(viewHolder.view.context)
+                    .load(R.drawable.cctv8k)
+                    .centerInside()
+                    .into(cardView.mainImageView)
+            } else {
+                Glide.with(viewHolder.view.context)
+                    .load(tvViewModel.logo.value)
+                    .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.setBackgroundColor(Color.WHITE)
+            cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
         }
 
-        cardView.setBackgroundColor(Color.WHITE)
-        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
-
         tvViewModel.program.observe(owner) { _ ->
             val program = tvViewModel.getProgramOne()
             if (program != null) {

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

@@ -1,76 +0,0 @@
-package com.lizongying.mytv
-
-import android.os.Bundle
-import android.os.Handler
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import com.lizongying.mytv.databinding.ChannelBinding
-import com.lizongying.mytv.models.TVViewModel
-
-class ChannelFragment : Fragment() {
-    private var _binding: ChannelBinding? = null
-    private val binding get() = _binding!!
-
-    private val handler = Handler()
-    private val delay: Long = 3000
-    private var channel = 0
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = ChannelBinding.inflate(inflater, container, false)
-        _binding!!.root.visibility = View.GONE
-        (activity as MainActivity).fragmentReady()
-        return binding.root
-    }
-
-    fun show(tvViewModel: TVViewModel) {
-        handler.removeCallbacks(hideRunnable)
-        handler.removeCallbacks(playRunnable)
-        binding.channelContent.text = (tvViewModel.id.value?.plus(1)).toString()
-        view?.visibility = View.VISIBLE
-        handler.postDelayed(hideRunnable, delay)
-    }
-
-    fun show(channel: String) {
-        this.channel = "${binding.channelContent.text}$channel".toInt()
-        handler.removeCallbacks(hideRunnable)
-        handler.removeCallbacks(playRunnable)
-        if (binding.channelContent.text == "") {
-            binding.channelContent.text = channel
-            view?.visibility = View.VISIBLE
-            handler.postDelayed(playRunnable, delay)
-        } else {
-            handler.postDelayed(playRunnable, 0)
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        handler.removeCallbacks(hideRunnable)
-        handler.removeCallbacks(playRunnable)
-    }
-
-    private val hideRunnable = Runnable {
-        binding.channelContent.text = ""
-        view?.visibility = View.GONE
-    }
-
-    private val playRunnable = Runnable {
-        (activity as MainActivity).play(channel - 1)
-        binding.channelContent.text = ""
-        view?.visibility = View.GONE
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        private const val TAG = "ChannelFragment"
-    }
-}

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

@@ -2,6 +2,7 @@ package com.lizongying.mytv
 
 import android.os.Bundle
 import android.os.Handler
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -22,28 +23,25 @@ class InfoFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         _binding = InfoBinding.inflate(inflater, container, false)
-        _binding!!.root.visibility = View.GONE
         (activity as MainActivity).fragmentReady()
         return binding.root
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        // Use a Handler to delay the fragment transaction
+        handler.postDelayed(removeRunnable, delay)
+    }
+
     fun show(tvViewModel: TVViewModel) {
         binding.textView.text = tvViewModel.title.value
-
-        when (tvViewModel.title.value) {
-            "CCTV8K 超高清" -> Glide.with(this)
+        if (tvViewModel.title.value == "CCTV8K 超高清") {
+            Glide.with(this)
                 .load(R.drawable.cctv8k)
                 .into(binding.infoLogo)
-
-            "天津卫视" -> Glide.with(this)
-                .load(R.drawable.tianjin)
-                .into(binding.infoLogo)
-
-            "新疆卫视" -> Glide.with(this)
-                .load(R.drawable.xinjiang)
-                .into(binding.infoLogo)
-
-            else -> Glide.with(this)
+        } else {
+            Glide.with(this)
                 .load(tvViewModel.logo.value)
                 .into(binding.infoLogo)
         }
@@ -58,13 +56,10 @@ class InfoFragment : Fragment() {
         handler.postDelayed(removeRunnable, delay)
     }
 
-    override fun onResume() {
-        super.onResume()
-        handler.postDelayed(removeRunnable, delay)
-    }
-
     override fun onPause() {
         super.onPause()
+        Log.i(TAG, "onPause")
+        // Cancel the delayed task when the fragment is paused
         handler.removeCallbacks(removeRunnable)
     }
 

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

@@ -1,11 +1,11 @@
 package com.lizongying.mytv
 
-import android.content.Context
-import android.content.SharedPreferences
+import android.app.AlertDialog
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.Signature
 import android.content.pm.SigningInfo
+import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
@@ -16,7 +16,11 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
 import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import com.lizongying.mytv.models.TVViewModel
 import java.security.MessageDigest
@@ -27,25 +31,15 @@ class MainActivity : FragmentActivity() {
     var playerFragment = PlayerFragment()
     private val mainFragment = MainFragment()
     private val infoFragment = InfoFragment()
-    private val channelFragment = ChannelFragment()
-    private lateinit var settingFragment: SettingFragment
 
     private var doubleBackToExitPressedOnce = false
 
     private lateinit var gestureDetector: GestureDetector
 
     private val handler = Handler()
-    private val delayHideMain: Long = 5000
-    private val delayHideSetting: Long = 10000
-
-    lateinit var sharedPref: SharedPreferences
-    private var channelReversal = false
-    private var channelNum = true
-
-    private var versionName = ""
+    private val delay: Long = 4000
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
@@ -57,40 +51,16 @@ class MainActivity : FragmentActivity() {
             supportFragmentManager.beginTransaction()
                 .add(R.id.main_browse_fragment, playerFragment)
                 .add(R.id.main_browse_fragment, infoFragment)
-                .add(R.id.main_browse_fragment, channelFragment)
                 .add(R.id.main_browse_fragment, mainFragment)
-                .hide(mainFragment)
+                .hide(infoFragment)
                 .commit()
+            mainFragment.view?.requestFocus()
         }
         gestureDetector = GestureDetector(this, GestureListener())
-
-        sharedPref = getPreferences(Context.MODE_PRIVATE)
-        channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, channelReversal)
-        channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
-
-        versionName = getPackageInfo().versionName
-        settingFragment = SettingFragment(versionName, channelReversal, channelNum)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
         infoFragment.show(tvViewModel)
-        if (channelNum) {
-            channelFragment.show(tvViewModel)
-        }
-    }
-
-    private fun showChannel(channel: String) {
-        if (!mainFragment.isHidden) {
-            return
-        }
-
-        if (settingFragment.isVisible) {
-            return
-        }
-
-        if (channelNum) {
-            channelFragment.show(channel)
-        }
     }
 
     fun play(tvViewModel: TVViewModel) {
@@ -98,10 +68,6 @@ class MainActivity : FragmentActivity() {
         mainFragment.view?.requestFocus()
     }
 
-    fun play(itemPosition: Int) {
-        mainFragment.play(itemPosition)
-    }
-
     fun prev() {
         mainFragment.prev()
     }
@@ -111,18 +77,17 @@ class MainActivity : FragmentActivity() {
     }
 
     private fun prevSource() {
-//        mainFragment.prevSource()
+        mainFragment.prevSource()
     }
 
     private fun nextSource() {
-//        mainFragment.nextSource()
+        mainFragment.nextSource()
     }
 
     fun switchMainFragment() {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
-            mainFragment.setPosition()
             transaction.show(mainFragment)
             keepRunnable()
         } else {
@@ -133,14 +98,12 @@ class MainActivity : FragmentActivity() {
     }
 
     fun keepRunnable() {
-        handler.removeCallbacks(hideMain)
-        handler.postDelayed(hideMain, delayHideMain)
+        handler.removeCallbacks(hideRunnable)
+        handler.postDelayed(hideRunnable, delay)
     }
 
-    private val hideMain = Runnable {
-        if (!mainFragment.isHidden) {
-            supportFragmentManager.beginTransaction().hide(mainFragment).commit()
-        }
+    private val hideRunnable = Runnable {
+        supportFragmentManager.beginTransaction().hide(mainFragment).commit()
     }
 
     private fun mainFragmentIsHidden(): Boolean {
@@ -207,180 +170,69 @@ class MainActivity : FragmentActivity() {
         }
     }
 
-    fun saveChannelReversal(channelReversal: Boolean) {
-        with(sharedPref.edit()) {
-            putBoolean(CHANNEL_REVERSAL, channelReversal)
-            apply()
-        }
-        this.channelReversal = channelReversal
-    }
+    private fun showHelp() {
+        val versionName = getPackageInfo().versionName
 
-    fun saveChannelNum(channelNum: Boolean) {
-        with(sharedPref.edit()) {
-            putBoolean(CHANNEL_NUM, channelNum)
-            apply()
-        }
-        this.channelNum = channelNum
-    }
+        val textView = TextView(this)
+        textView.text =
+            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+        textView.setBackgroundColor(0xFF263238.toInt())
+        textView.setPadding(20, 50, 20, 20)
 
-    private fun showSetting() {
-        if (!mainFragment.isHidden) {
-            return
-        }
+        val imageView = ImageView(this)
+        val drawable = ContextCompat.getDrawable(this, R.drawable.appreciate)
+        imageView.setImageDrawable(drawable)
+        imageView.setBackgroundColor(Color.WHITE)
 
-        Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
-        if (!settingFragment.isVisible) {
-            settingFragment.show(supportFragmentManager, "setting")
-            handler.removeCallbacks(hideSetting)
-            handler.postDelayed(hideSetting, delayHideSetting)
-        } else {
-            handler.removeCallbacks(hideSetting)
-            settingFragment.dismiss()
-        }
-    }
+        val linearLayout = LinearLayout(this)
+        linearLayout.orientation = LinearLayout.VERTICAL
+        linearLayout.addView(textView)
+        linearLayout.addView(imageView)
 
-    private val hideSetting = Runnable {
-        if (settingFragment.isVisible) {
-            settingFragment.dismiss()
-        }
-    }
+        val layoutParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+        imageView.layoutParams = layoutParams
+        textView.layoutParams = layoutParams
 
-    private fun channelUp() {
-        if (mainFragment.isHidden) {
-            if (channelReversal) {
-                next()
-                return
-            }
-            prev()
-        } else {
-//                    if (mainFragment.selectedPosition == 0) {
-//                        mainFragment.setSelectedPosition(
-//                            mainFragment.tvListViewModel.maxNum.size - 1,
-//                            false
-//                        )
-//                    }
-        }
-    }
+        val builder: AlertDialog.Builder = AlertDialog.Builder(this)
+        builder
+            .setView(linearLayout)
 
-    private fun channelDown() {
-        if (mainFragment.isHidden) {
-            if (channelReversal) {
-                prev()
-                return
-            }
-            next()
-        } else {
-//                    if (mainFragment.selectedPosition == mainFragment.tvListViewModel.maxNum.size - 1) {
-////                        mainFragment.setSelectedPosition(0, false)
-//                        hideMainFragment()
-//                        return false
-//                    }
-        }
-    }
-
-    private fun back() {
-        if (!mainFragmentIsHidden()) {
-            hideMainFragment()
-            return
-        }
-
-        if (doubleBackToExitPressedOnce) {
-            super.onBackPressed()
-            return
-        }
-
-        doubleBackToExitPressedOnce = true
-        Toast.makeText(this, "再按一次退出", Toast.LENGTH_SHORT).show()
-
-        Handler(Looper.getMainLooper()).postDelayed({
-            doubleBackToExitPressedOnce = false
-        }, 2000)
+        val dialog: AlertDialog = builder.create()
+        dialog.show()
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         when (keyCode) {
-            KeyEvent.KEYCODE_0 -> {
-                showChannel("0")
-                return true
-            }
-
-            KeyEvent.KEYCODE_1 -> {
-                showChannel("1")
-                return true
-            }
-
-            KeyEvent.KEYCODE_2 -> {
-                showChannel("2")
-                return true
-            }
-
-            KeyEvent.KEYCODE_3 -> {
-                showChannel("3")
-                return true
-            }
-
-            KeyEvent.KEYCODE_4 -> {
-                showChannel("4")
-                return true
-            }
-
-            KeyEvent.KEYCODE_5 -> {
-                showChannel("5")
-                return true
-            }
-
-            KeyEvent.KEYCODE_6 -> {
-                showChannel("6")
-                return true
-            }
-
-            KeyEvent.KEYCODE_7 -> {
-                showChannel("7")
-                return true
-            }
-
-            KeyEvent.KEYCODE_8 -> {
-                showChannel("8")
-                return true
-            }
-
-            KeyEvent.KEYCODE_9 -> {
-                showChannel("9")
-                return true
-            }
-
-            KeyEvent.KEYCODE_ESCAPE -> {
-                back()
-                return true
-            }
-
             KeyEvent.KEYCODE_BACK -> {
-                back()
-                return true
-            }
+                if (!mainFragmentIsHidden()) {
+                    hideMainFragment()
+                    return true
+                }
 
-            KeyEvent.KEYCODE_BOOKMARK -> {
-                showSetting()
-                return true
-            }
+                if (doubleBackToExitPressedOnce) {
+                    super.onBackPressed()
+                    return true
+                }
 
-            KeyEvent.KEYCODE_UNKNOWN -> {
-                showSetting()
-                return true
-            }
+                this.doubleBackToExitPressedOnce = true
+                Toast.makeText(this, "再按一次退出", Toast.LENGTH_SHORT).show()
 
-            KeyEvent.KEYCODE_HELP -> {
-                showSetting()
+                Handler(Looper.getMainLooper()).postDelayed({
+                    doubleBackToExitPressedOnce = false
+                }, 2000)
                 return true
             }
 
             KeyEvent.KEYCODE_SETTINGS -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
             KeyEvent.KEYCODE_MENU -> {
-                showSetting()
+                showHelp()
                 return true
             }
 
@@ -393,19 +245,28 @@ class MainActivity : FragmentActivity() {
             }
 
             KeyEvent.KEYCODE_DPAD_UP -> {
-                channelUp()
-            }
-
-            KeyEvent.KEYCODE_CHANNEL_UP -> {
-                channelUp()
+                if (mainFragment.isHidden) {
+                    prev()
+                } else {
+//                    if (mainFragment.selectedPosition == 0) {
+//                        mainFragment.setSelectedPosition(
+//                            mainFragment.tvListViewModel.maxNum.size - 1,
+//                            false
+//                        )
+//                    }
+                }
             }
 
             KeyEvent.KEYCODE_DPAD_DOWN -> {
-                channelDown()
-            }
-
-            KeyEvent.KEYCODE_CHANNEL_DOWN -> {
-                channelDown()
+                if (mainFragment.isHidden) {
+                    next()
+                } else {
+//                    if (mainFragment.selectedPosition == mainFragment.tvListViewModel.maxNum.size - 1) {
+////                        mainFragment.setSelectedPosition(0, false)
+//                        hideMainFragment()
+//                        return false
+//                    }
+                }
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
@@ -478,7 +339,7 @@ class MainActivity : FragmentActivity() {
 
     private fun hashSignature(signature: Signature): String {
         return try {
-            val md = MessageDigest.getInstance("MD5")
+            val md = MessageDigest.getInstance("SHA-256")
             md.update(signature.toByteArray())
             val digest = md.digest()
             digest.let { it -> it.joinToString("") { "%02x".format(it) } }
@@ -488,25 +349,7 @@ class MainActivity : FragmentActivity() {
         }
     }
 
-    override fun onStart() {
-        Log.i(TAG, "onStart")
-        super.onStart()
-    }
-
-    override fun onResume() {
-        Log.i(TAG, "onResume")
-        super.onResume()
-    }
-
-    override fun onPause() {
-        Log.i(TAG, "onPause")
-        super.onPause()
-        handler.removeCallbacks(hideMain)
-    }
-
     companion object {
         private const val TAG = "MainActivity"
-        private const val CHANNEL_REVERSAL = "channel_reversal"
-        private const val CHANNEL_NUM = "channel_num"
     }
 }

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

@@ -1,197 +1,152 @@
 package com.lizongying.mytv
 
+import android.content.Context
 import android.content.SharedPreferences
 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 {
 
-    private var itemPosition = 0
+class MainFragment : BrowseSupportFragment() {
+    var itemPosition: Int = 0
 
-    private var rowList: MutableList<View> = mutableListOf()
+    private var request: Request = Request()
 
-    private var _binding: ShowBinding? = null
-    private val binding get() = _binding!!
-
-    private var request = Request()
+    private var rowsAdapter: ArrayObjectAdapter? = null
 
     var tvListViewModel = TVListViewModel()
 
-    private lateinit var sharedPref: SharedPreferences
+    private var sharedPref: SharedPreferences? = null
 
-    private var lastVideoUrl = ""
+    private var lastVideoUrl: String = ""
 
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
 
     private var ready = 0
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = ShowBinding.inflate(inflater, container, false)
-        return binding.root
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        headersState = HEADERS_DISABLED
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
         activity?.let { request.initYSP(it) }
-        sharedPref = (activity as? MainActivity)?.sharedPref!!
 
-        view?.post {
-            val content = binding.content
+        sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
 
-            var idx: Long = 0
-            for ((k, v) in TVList.list) {
-                val itemBinding: RowBinding =
-                    RowBinding.inflate(layoutInflater, content, false)
+        loadRows()
 
-                val tvListViewModelCurrent = TVListViewModel()
-                for ((idx2, v1) in v.withIndex()) {
-                    val tvViewModel = TVViewModel(v1)
-                    tvViewModel.setRowPosition(idx.toInt())
-                    tvViewModel.setItemPosition(idx2)
-                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
-                    tvListViewModel.addTVViewModel(tvViewModel)
+        setupEventListeners()
+
+        mUpdateProgramRunnable = UpdateProgramRunnable()
+        handler.post(mUpdateProgramRunnable)
+
+        tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                if (tvViewModel.errInfo.value != null
+                    && 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()
-            handler.post(mUpdateProgramRunnable)
-
-            itemPosition = sharedPref.getInt(POSITION, 0)
-            if (itemPosition >= tvListViewModel.size()) {
-                itemPosition = 0
+                // not first time && channel not change
+                if (tvViewModel.ready.value != null
+                    && tvViewModel.id.value == itemPosition
+                    && check(tvViewModel)
+                ) {
+                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                    (activity as? MainActivity)?.play(tvViewModel)
+                }
             }
-            tvListViewModel.setItemPosition(itemPosition)
-            setPosition()
-            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.errInfo.value != null
-                        && tvViewModel.id.value == itemPosition
-                    ) {
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
-                            .show()
-                    }
-                }
-                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
-
-                    // not first time && channel not change
-                    if (tvViewModel.ready.value != null
-                        && tvViewModel.id.value == itemPosition
-                        && 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 ${tvViewModel.pid.value}")
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { request.fetchData(it) }
-                            }
+            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 ${tvViewModel.pid.value}")
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            tvViewModel.let { request.fetchData(it) }
+                        }
+                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
+                        setSelectedPosition(
+                            tvViewModel.getRowPosition(), true,
+                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
+                        )
+                    } else {
+                        if (check(tvViewModel)) {
+                            (activity as? MainActivity)?.play(tvViewModel)
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setPosition(
-                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+
+                            setSelectedPosition(
+                                tvViewModel.getRowPosition(), true,
+                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
                             )
-                        } else {
-                            if (check(tvViewModel)) {
-                                (activity as? MainActivity)?.play(tvViewModel)
-                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                                setPosition(
-                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
-                                )
-                            }
                         }
                     }
                 }
             }
+        }
 
-            fragmentReady()
+        fragmentReady()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        handler.removeCallbacks(mUpdateProgramRunnable)
+        with(sharedPref!!.edit()) {
+            putInt("position", itemPosition)
+            apply()
         }
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-    }
-
-    override fun onItemFocusChange(tvViewModel: TVViewModel, hasFocus: Boolean) {
-        if (hasFocus) {
-            tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
-            (activity as MainActivity).keepRunnable()
+    fun updateProgram(tvViewModel: TVViewModel) {
+        val timestamp = getDateTimestamp()
+        if (timestamp - tvViewModel.programUpdateTime > 60) {
+            if (tvViewModel.program.value!!.isEmpty()) {
+                tvViewModel.programUpdateTime = timestamp
+                request.fetchProgram(tvViewModel)
+            } else {
+                if (timestamp - tvViewModel.program.value!!.last().et < 600) {
+                    tvViewModel.programUpdateTime = timestamp
+                    request.fetchProgram(tvViewModel)
+                }
+            }
         }
     }
 
-    override fun onItemClicked(tvViewModel: TVViewModel) {
-        if (this.isHidden) {
-            (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() {
-        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-        rowList[tvViewModel!!.getRowPosition()].post {
-            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
-                tvViewModel.getItemPosition()
-            )?.requestFocus()
-        }
-    }
-
-    fun setPosition(rowPosition: Int, itemPosition: Int) {
-        rowList[rowPosition].post {
-            ((rowList[rowPosition] as RecyclerView).layoutManager as LinearLayoutManager).findViewByPosition(
-                itemPosition
-            )?.requestFocus()
+    inner class UpdateProgramRunnable : Runnable {
+        override fun run() {
+            tvListViewModel.getTVListViewModel().value?.filter { it.programId.value != null }
+                ?.forEach { tvViewModel ->
+                    updateProgram(
+                        tvViewModel
+                    )
+                }
+            handler.postDelayed(this, 60000)
         }
     }
 
@@ -211,24 +166,62 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         return true
     }
 
+    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 fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 4) {
+        if (ready == 3) {
 //            request.fetchPage()
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-    }
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
 
-    fun play(itemPosition: Int) {
-        view?.post {
-            if (itemPosition > -1 && itemPosition < tvListViewModel.size()) {
-                this.itemPosition = itemPosition
-                tvListViewModel.setItemPosition(itemPosition)
-                tvListViewModel.getTVViewModel(itemPosition)?.changed()
-            } else {
-                Toast.makeText(context, "频道不存在", Toast.LENGTH_SHORT).show()
-            }
+            (activity as? MainActivity)?.switchMainFragment()
         }
     }
 
@@ -239,7 +232,9 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                 itemPosition = tvListViewModel.size() - 1
             }
             tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
         }
     }
 
@@ -250,66 +245,85 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                 itemPosition = 0
             }
             tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            tvViewModel?.changed()
         }
     }
 
-    fun updateProgram(tvViewModel: TVViewModel) {
-        val timestamp = getDateTimestamp()
-        if (timestamp - tvViewModel.programUpdateTime > 60) {
-            if (tvViewModel.program.value!!.isEmpty()) {
-                tvViewModel.programUpdateTime = timestamp
-                request.fetchProgram(tvViewModel)
-            } else {
-                if (tvViewModel.program.value!!.last().et - timestamp < 600) {
-                    tvViewModel.programUpdateTime = timestamp
-                    request.fetchProgram(tvViewModel)
+    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()
                 }
             }
         }
     }
 
-    inner class UpdateProgramRunnable : Runnable {
-        override fun run() {
-            tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null }
-                ?.forEach { tvViewModel ->
-                    updateProgram(
-                        tvViewModel
-                    )
+    fun nextSource() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
+                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
+                        tvViewModel.setVideoIndex(0)
+                    }
+                    tvViewModel.changed()
                 }
-            handler.postDelayed(this, 60000)
+            }
+        }
+    }
+
+    private fun setupEventListeners() {
+        onItemViewClickedListener = ItemViewClickedListener()
+        onItemViewSelectedListener = ItemViewSelectedListener()
+    }
+
+    private inner class ItemViewClickedListener : OnItemViewClickedListener {
+        override fun onItemClicked(
+            itemViewHolder: Presenter.ViewHolder,
+            item: Any,
+            rowViewHolder: RowPresenter.ViewHolder,
+            row: Row
+        ) {
+            if (item is TVViewModel) {
+                if (itemPosition != item.id.value!!) {
+                    itemPosition = item.id.value!!
+                    tvListViewModel.setItemPosition(itemPosition)
+
+                    val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+                    tvViewModel?.changed()
+                }
+                (activity as? MainActivity)?.switchMainFragment()
+            }
+        }
+    }
+
+    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
+        override fun onItemSelected(
+            itemViewHolder: Presenter.ViewHolder?, item: Any?,
+            rowViewHolder: RowPresenter.ViewHolder, row: Row
+        ) {
+            if (item is TVViewModel) {
+                tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                (activity as MainActivity).keepRunnable()
+            }
         }
     }
 
     override fun onResume() {
-        Log.i(TAG, "onResume")
         super.onResume()
-    }
-
-    override fun onStop() {
-        Log.i(TAG, "onStop")
-        super.onStop()
-        with(sharedPref.edit()) {
-            putInt(POSITION, itemPosition)
-            apply()
-        }
-        Log.i(TAG, "$POSITION saved")
-    }
-
-    override fun onDestroy() {
-        Log.i(TAG, "onDestroy")
-        super.onDestroy()
-        handler.removeCallbacks(mUpdateProgramRunnable)
-    }
-
-    override fun onDestroyView() {
-        Log.i(TAG, "onDestroyView")
-        super.onDestroyView()
-        _binding = null
+        view!!.requestFocus()
     }
 
     companion object {
         private const val TAG = "MainFragment"
-        private const val POSITION = "position"
     }
 }

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

@@ -74,31 +74,24 @@ class PlayerFragment : Fragment() {
     @OptIn(UnstableApi::class)
     fun play(tvViewModel: TVViewModel) {
         this.tvViewModel = tvViewModel
+        val videoUrlCurrent =
+            tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
         playerView?.player?.run {
-            setMediaItem(MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
+            videoUrlCurrent?.let { setMediaItem(MediaItem.fromUri(it)) }
             prepare()
         }
     }
 
     override fun onStart() {
-        Log.i(TAG, "onStart")
         super.onStart()
-        if (playerView != null && playerView!!.player?.isPlaying == false) {
-            Log.i(TAG, "replay")
-            playerView!!.player?.prepare()
-        } else {
-            Log.i(TAG, "playing")
+        if (playerView != null) {
+            playerView!!.player?.play()
         }
     }
 
-    override fun onResume() {
-        Log.i(TAG, "onResume")
-        super.onResume()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        if (playerView != null && playerView!!.player?.isPlaying == true) {
+    override fun onStop() {
+        super.onStop()
+        if (playerView != null) {
             playerView!!.player?.stop()
         }
     }
@@ -110,11 +103,6 @@ class PlayerFragment : Fragment() {
         }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
     companion object {
         private const val TAG = "PlaybackVideoFragment"
     }

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

@@ -32,12 +32,10 @@ class Request {
     private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
     private var yspProtoService: YSPProtoService = ApiClient().yspProtoService
     private var ysp: YSP? = null
-    private var token = ""
 
     // TODO onDestroy
     private val handler = Handler(Looper.getMainLooper())
-    private lateinit var btraceRunnable: BtraceRunnable
-    private var tokenRunnable: TokenRunnable = TokenRunnable()
+    private lateinit var myRunnable: MyRunnable
 
     private var mapping = mapOf(
         "CCTV4K" to "CCTV4K 超高清",
@@ -83,14 +81,8 @@ class Request {
         "四川卫视" to "四川卫视",
         "福建东南卫视" to "东南卫视",
         "海南卫视" to "海南卫视",
-        "天津卫视" to "天津卫视",
-        "新疆卫视" to "新疆卫视",
     )
 
-    init {
-        handler.post(tokenRunnable)
-    }
-
     fun initYSP(context: Context) {
         ysp = YSP(context)
     }
@@ -99,8 +91,8 @@ class Request {
 
     fun fetchVideo(tvModel: TVViewModel, cookie: String) {
         call?.cancel()
-        if (::btraceRunnable.isInitialized) {
-            handler.removeCallbacks(btraceRunnable)
+        if (::myRunnable.isInitialized) {
+            handler.removeCallbacks(myRunnable)
         }
 
         val title = tvModel.title.value
@@ -131,22 +123,17 @@ class Request {
                                 keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
                                 ivBytes
                             ).uppercase()
-//                            Log.d(TAG, "$title url $url")
+                            Log.i(TAG, "$title url $url")
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()
                             tvModel.retryTimes = 0
-                            btraceRunnable = BtraceRunnable(tvModel)
-                            handler.post(btraceRunnable)
+                            myRunnable = MyRunnable(tvModel)
+                            handler.post(myRunnable)
                         } else {
                             Log.e(TAG, "$title key error")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                if (tvModel.needToken) {
-                                    token = ""
-                                    fetchVideo(tvModel)
-                                } else {
-                                    fetchVideo(tvModel, cookie)
-                                }
+                                fetchVideo(tvModel, cookie)
                             }
                         }
                     } else {
@@ -157,12 +144,7 @@ class Request {
                             Log.e(TAG, "$title url error $request $liveInfo")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                if (tvModel.needToken) {
-                                    token = ""
-                                    fetchVideo(tvModel)
-                                } else {
-                                    fetchVideo(tvModel, cookie)
-                                }
+                                fetchVideo(tvModel, cookie)
                             }
                         }
                     }
@@ -170,12 +152,7 @@ class Request {
                     Log.e(TAG, "$title status error")
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
-                        if (tvModel.needToken) {
-                            token = ""
-                            fetchVideo(tvModel)
-                        } else {
-                            fetchVideo(tvModel, cookie)
-                        }
+                        fetchVideo(tvModel, cookie)
                     }
                 }
             }
@@ -184,50 +161,39 @@ class Request {
                 Log.e(TAG, "$title request error")
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
-                    if (tvModel.needToken) {
-                        token = ""
-                        fetchVideo(tvModel)
-                    } else {
-                        fetchVideo(tvModel, cookie)
-                    }
+                    fetchVideo(tvModel, cookie)
                 }
             }
         })
     }
 
     fun fetchVideo(tvModel: TVViewModel) {
-        if (token == "") {
-            yspTokenService.getInfo()
-                .enqueue(object : Callback<Info> {
-                    override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                        if (response.isSuccessful) {
-                            token = response.body()?.data?.token!!
-                            Log.i(TAG, "info success $token")
-                            val cookie =
-                                "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                            fetchVideo(tvModel, cookie)
-                        } else {
-                            Log.e(TAG, "info status error")
-                            if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                                tvModel.retryTimes++
-                                fetchVideo(tvModel)
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call<Info>, t: Throwable) {
-                        Log.e(TAG, "info request error $t")
+        yspTokenService.getInfo()
+            .enqueue(object : Callback<Info> {
+                override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                    if (response.isSuccessful) {
+                        val token = response.body()?.data?.token
+                        Log.i(TAG, "info success $token")
+                        val cookie =
+                            "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                        fetchVideo(tvModel, cookie)
+                    } else {
+                        Log.e(TAG, "info status error")
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
                             fetchVideo(tvModel)
                         }
                     }
-                })
-        } else {
-            val cookie =
-                "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-            fetchVideo(tvModel, cookie)
-        }
+                }
+
+                override fun onFailure(call: Call<Info>, t: Throwable) {
+                    Log.e(TAG, "info request error $t")
+                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                        tvModel.retryTimes++
+                        fetchVideo(tvModel)
+                    }
+                }
+            })
     }
 
     fun fetchData(tvModel: TVViewModel) {
@@ -239,32 +205,7 @@ class Request {
         }
     }
 
-    inner class TokenRunnable : Runnable {
-        override fun run() {
-            fetchToken()
-            handler.postDelayed(this, 600000)
-        }
-    }
-
-    fun fetchToken() {
-        yspTokenService.getInfo()
-            .enqueue(object : Callback<Info> {
-                override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                    if (response.isSuccessful) {
-                        token = response.body()?.data?.token!!
-                        Log.i(TAG, "info success $token")
-                    } else {
-                        Log.e(TAG, "token status error")
-                    }
-                }
-
-                override fun onFailure(call: Call<Info>, t: Throwable) {
-                    Log.e(TAG, "token request error $t")
-                }
-            })
-    }
-
-    inner class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
+    inner class MyRunnable(private val tvModel: TVViewModel) : Runnable {
         override fun run() {
             fetchBtrace(tvModel)
             handler.postDelayed(this, 60000)
@@ -361,10 +302,8 @@ class Request {
                         val program = response.body()
                         if (program != null) {
                             tvViewModel.addProgram(program.dataListList)
-                            Log.d(TAG, "$title program ${program.dataListList.size}")
+                            Log.i(TAG, "$title program ${program.dataListList.size}")
                         }
-                    } else {
-                        Log.w(TAG, "$title program error")
                     }
                 }
 

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

@@ -1,58 +0,0 @@
-package com.lizongying.mytv
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import com.lizongying.mytv.databinding.DialogBinding
-
-
-class SettingFragment(private val versionName: String,
-                      private val channelReversal: Boolean,
-                      private val channelNum: Boolean,
-    ) :
-    DialogFragment() {
-
-    private var _binding: DialogBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = DialogBinding.inflate(inflater, container, false)
-        _binding?.version?.text =
-            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
-
-        val switchChannelReversal = _binding?.switchChannelReversal
-        switchChannelReversal?.isChecked = channelReversal
-        switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
-            (activity as MainActivity).saveChannelReversal(isChecked)
-        }
-
-        val switchChannelNum = _binding?.switchChannelNum
-        switchChannelNum?.isChecked = channelNum
-        switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
-            (activity as MainActivity).saveChannelNum(isChecked)
-        }
-
-        return binding.root
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        const val TAG = "SettingFragment"
-    }
-}
-

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

@@ -7,7 +7,7 @@ object TVList {
 
     private var mappingLogo = mapOf(
         "CCTV4K 超高清" to "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
-        "CCTV8K 超高清" to "",
+        "CCTV8K 超高清" to "https://static.wikia.nocookie.net/logos/images/6/69/CCTV8K.png/revision/latest/scale-to-width-down/120?cb=20230104110835&path-prefix=vi",
         "CCTV1 综合" to "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
         "CCTV2 财经" to "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
         "CCTV3 综艺" to "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
@@ -66,8 +66,6 @@ object TVList {
         "四川卫视" to "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
         "东南卫视" to "https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp",
         "海南卫视" to "https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp",
-        "天津卫视" to "",
-        "新疆卫视" to "",
     )
     private var mappingEPG = mapOf(
         "CCTV4K 超高清" to "600002264",
@@ -130,8 +128,6 @@ object TVList {
         "四川卫视" to "600002516",
         "东南卫视" to "600002484",
         "海南卫视" to "600002506",
-        "天津卫视" to "600152137",
-        "新疆卫视" to "600152138",
     )
     private var mappingVideo = mapOf(
         "CCTV4K 超高清" to arrayOf("600002264", "2000266303"),
@@ -142,14 +138,14 @@ object TVList {
         "CCTV4 中文国际" to arrayOf("600001814", "2000204803"),
         "CCTV5 体育" to arrayOf("600001818", "2000205103"),
         "CCTV5+ 体育赛事" to arrayOf("600001817", "2000204503"),
-        "CCTV6 电影" to arrayOf("600001802", "2013693901"),
+        "CCTV6 电影" to arrayOf("600001802", "2000203303"),
         "CCTV7 国防军事" to arrayOf("600004092", "2000510003"),
         "CCTV8 电视剧" to arrayOf("600001803", "2000203903"),
         "CCTV9 记录" to arrayOf("600004078", "2000499403"),
         "CCTV10 科教" to arrayOf("600001805", "2000203503"),
         "CCTV11 戏曲" to arrayOf("600001806", "2000204103"),
         "CCTV12 社会与法" to arrayOf("600001807", "2000202603"),
-        "CCTV13 新闻" to arrayOf("600001811","2000204603"),
+//        "CCTV13 新闻" to arrayOf("600001811","2000204603"),
         "CCTV14 少儿" to arrayOf("600001809", "2000204403"),
         "CCTV15 音乐" to arrayOf("600001815", "2000205003"),
         "CCTV16 奥林匹克" to arrayOf("600098637", "2012375003"),
@@ -194,19 +190,20 @@ object TVList {
         "四川卫视" to arrayOf("600002516", "2000295003"),
         "东南卫视" to arrayOf("600002484", "2000292503"),
         "海南卫视" to arrayOf("600002506", "2000291503"),
-        "天津卫视" to arrayOf("600152137", "2019927003"),
-        "新疆卫视" to arrayOf("600152138", "2019927403"),
     )
     private var count: Int = 0
 
     private fun setupTV(): Map<String, List<TV>> {
         val tvs = """
 央视频道
+CCTV4K 超高清,
+CCTV8K 超高清,
 CCTV1 综合,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226231/index.m3u8
 CCTV2 财经,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index.m3u8
 CCTV3 综艺,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226397/index.m3u8
 CCTV4 中文国际,http://39.134.24.161/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8
 CCTV5 体育,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226395/index.m3u8
+CCTV5+ 体育赛事,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226221/index.m3u8
 CCTV6 电影,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226393/index.m3u8
 CCTV7 国防军事,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226192/index.m3u8
 CCTV8 电视剧,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226391/index.m3u8
@@ -219,9 +216,6 @@ CCTV14 少儿,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/inde
 CCTV15 音乐,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8
 CCTV16 奥林匹克,http://39.134.24.162/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8
 CCTV17 农业农村,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226198/index.m3u8
-CCTV5+ 体育赛事,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226221/index.m3u8
-CCTV4K 超高清,
-CCTV8K 超高清,
 风云剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226950/index.m3u8
 第一剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226959/index.m3u8
 怀旧剧场,http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226972/index.m3u8
@@ -257,8 +251,6 @@ CCTV8K 超高清,
 四川卫视,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8;http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8
 东南卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226341/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225766/index.m3u8
 海南卫视,http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226465/index.m3u8;http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225769/index.m3u8
-天津卫视,
-新疆卫视,
 国际频道
 CGTN,http://live.cgtn.com/1000/prog_index.m3u8
 CGTN 法语频道,https://livefr.cgtn.com/1000f/prog_index.m3u8
@@ -277,6 +269,9 @@ CGTN 纪录频道,https://livedoc.cgtn.com/500d/prog_index.m3u8
             }
             if (!i.contains(",")) {
                 channel = i.trim()
+                if (channel == "移动专区") {
+                    break
+                }
                 continue
             }
             val p = i.split(",")

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

@@ -1,7 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.res.Resources
-import android.util.TypedValue
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -14,20 +12,4 @@ object Utils {
     fun getDateTimestamp(): Long {
         return Date().time / 1000
     }
-
-    fun dpToPx(dp: Float): Int {
-        return TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            dp,
-            Resources.getSystem().displayMetrics
-        ).toInt()
-    }
-
-    fun dpToPx(dp: Int): Int {
-        return TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            dp.toFloat(),
-            Resources.getSystem().displayMetrics
-        ).toInt()
-    }
 }

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

@@ -2,7 +2,6 @@ package com.lizongying.mytv.api
 
 import android.content.Context
 import android.content.SharedPreferences
-import android.util.Log
 import com.lizongying.mytv.Encryptor
 import com.lizongying.mytv.MainActivity
 import com.lizongying.mytv.Utils.getDateTimestamp
@@ -52,14 +51,14 @@ class YSP(var context: Context) {
     private var signature = ""
 
     private var encryptor: Encryptor? = null
-    private lateinit var sharedPref: SharedPreferences
+    private var sharedPref: SharedPreferences? = null
 
     init {
         if (context is MainActivity) {
             encryptor = Encryptor()
             encryptor!!.init(context)
 
-            sharedPref = (context as MainActivity).sharedPref
+            sharedPref = (context as MainActivity).getPreferences(Context.MODE_PRIVATE)
         }
 
         guid = getGuid()
@@ -78,10 +77,15 @@ class YSP(var context: Context) {
 
         timeStr = getTimeStr()
 
+//        guid = "lq3oqitm_1e15dnzgjnb"
+//        randStr = "BfcCPQp8Hq"
+//        timeStr = "1702166501"
+
         cKey =
             encryptor!!.encrypt(cnlid, timeStr, appVer, guid, platform)
         signature = getSignature()
         return """{"cnlid":"$cnlid","livepid":"$livepid","stream":"$stream","guid":"$guid","cKey":"$cKey","adjust":$adjust,"sphttps":"$sphttps","platform":"$platform","cmd":"$cmd","encryptVer":"$encryptVer","dtype":"$dtype","devid":"$devid","otype":"$otype","appVer":"$appVer","app_version":"$appVersion","rand_str":"$randStr","channel":"$channel","defn":"$defn","signature":"$signature"}"""
+//        return """{"cnlid":"2000203803","livepid":"600001801","stream":"2","guid":"lq1y36mb_ccfwmja9zan","cKey":"--01A9F5E89BB86A0C61F4025BEDE15309B6913A79FD1AF1EE7F5EC9C7605F377D1D2281488385C32DEB9E7D0DD3559CB700BD7AF44DD5C9DE0AE14D94B8214027B5D664C108AEE23532348DCC61B86F7C8FBB6CF14D588E6093A25E97DF6D66F4882AB28F17016472DD43D45EF076B7F505176A5E8DEDF2662E5F9AB12B69CB20BCE1579BE724091F3AF6826AE34B713906F3FE139C3783F80EECBD08416DC525E1","adjust":1,"sphttps":"1","platform":"5910204","cmd":"2","encryptVer":"8.1","dtype":"1","devid":"devid","otype":"ojson","appVer":"V1.0.0","app_version":"V1.0.0","rand_str":"IOS2soOw44","channel":"ysp_tx","defn":"fhd","signature":"6ca945f651817de8c6e6910457ceafd6"}"""
     }
 
     private fun getTimeStr(): String {
@@ -95,10 +99,10 @@ class YSP(var context: Context) {
     }
 
     fun getGuid(): String {
-        var guid = sharedPref.getString("guid", "")
+        var guid = sharedPref?.getString("guid", "")
         if (guid == null || guid.length < 18) {
             guid = generateGuid()
-            with(sharedPref.edit()) {
+            with(sharedPref!!.edit()) {
                 putString("guid", guid)
                 apply()
             }
@@ -108,7 +112,7 @@ class YSP(var context: Context) {
 
     private fun newGuid(): String {
         guid = generateGuid()
-        with(sharedPref.edit()) {
+        with(sharedPref!!.edit()) {
             putString("guid", guid)
             apply()
         }

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

@@ -8,9 +8,7 @@ class TVListViewModel : ViewModel() {
 
     var maxNum = mutableListOf<Int>()
 
-    private val _tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
-    val tvListViewModel: LiveData<MutableList<TVViewModel>>
-        get() = _tvListViewModel
+    private val tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
 
     private val _itemPosition = MutableLiveData<Int>()
     val itemPosition: LiveData<Int>
@@ -20,20 +18,22 @@ class TVListViewModel : ViewModel() {
     val itemPositionCurrent: LiveData<Int>
         get() = _itemPositionCurrent
 
+    fun getTVListViewModel(): MutableLiveData<MutableList<TVViewModel>> {
+        return tvListViewModel
+    }
+
     fun addTVViewModel(tvViewModel: TVViewModel) {
-        if (_tvListViewModel.value == null) {
-            _tvListViewModel.value = mutableListOf(tvViewModel)
-        } else {
-            _tvListViewModel.value?.add(tvViewModel)
-        }
+        val currentTVModelList = tvListViewModel.value ?: mutableListOf()
+        currentTVModelList.add(tvViewModel)
+        tvListViewModel.value = currentTVModelList
     }
 
     fun getTVViewModel(id: Int): TVViewModel? {
-        return _tvListViewModel.value?.get(id)
+        return tvListViewModel.value?.get(id)
     }
 
     fun getTVViewModelCurrent(): TVViewModel? {
-        return _itemPositionCurrent.value?.let { _tvListViewModel.value?.get(it) }
+        return _itemPositionCurrent.value?.let { tvListViewModel.value?.get(it) }
     }
 
     fun setItemPosition(position: Int) {
@@ -46,9 +46,6 @@ class TVListViewModel : ViewModel() {
     }
 
     fun size(): Int {
-        if (_tvListViewModel.value == null) {
-            return 0
-        }
-        return _tvListViewModel.value!!.size
+        return tvListViewModel.value!!.size
     }
 }

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

@@ -20,7 +20,7 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     private var itemPosition: Int = 0
 
     var retryTimes: Int = 0
-    var retryMaxTimes: Int = 8
+    var retryMaxTimes: Int = 5
     var programUpdateTime: Long = 0
 
     private val _errInfo = MutableLiveData<String>()
@@ -78,20 +78,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     var needToken = false
 
     private val channelsNeedToken = arrayOf(
-        "CCTV4K 超高清",
-        "CCTV2 财经",
-        "CCTV5 体育",
-        "CCTV5+ 体育赛事",
-        "CCTV7 国防军事",
-        "CCTV9 记录",
-        "CCTV10 科教",
-        "CCTV11 戏曲",
-        "CCTV12 社会与法",
-        "CCTV14 少儿",
-        "CCTV15 音乐",
-        "CCTV16 奥林匹克",
-        "CCTV17 农业农村",
-
         "CCTV3 综艺",
         "CCTV6 电影",
         "CCTV8 电视剧",
@@ -108,30 +94,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         "央视台球",
         "电视指南",
         "卫生健康",
-
-        "东方卫视",
-        "湖南卫视",
-        "湖北卫视",
-        "辽宁卫视",
-        "江苏卫视",
-        "江西卫视",
-        "山东卫视",
-        "广东卫视",
-        "广西卫视",
-        "重庆卫视",
-        "河南卫视",
-        "河北卫视",
-        "贵州卫视",
-        "北京卫视",
-        "黑龙江卫视",
-        "浙江卫视",
-        "安徽卫视",
-        "深圳卫视",
-        "四川卫视",
-        "东南卫视",
-        "海南卫视",
-        "天津卫视",
-        "新疆卫视",
     )
 
     fun addVideoUrl(url: String) {
@@ -260,25 +222,18 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         mMinimumLoadableRetryCount = minimumLoadableRetryCount
     }
 
-    /**
-     * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
-     */
     @OptIn(UnstableApi::class)
-    fun buildSource(): HlsMediaSource {
+    fun buildSource(videoUrl: String, mHeaders: Map<String, String>?): HlsMediaSource {
         val httpDataSource = DefaultHttpDataSource.Factory()
         mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
 
         return HlsMediaSource.Factory(httpDataSource).createMediaSource(
             MediaItem.fromUri(
-                Uri.parse(getVideoUrlCurrent())
+                Uri.parse(videoUrl)
             )
         )
     }
 
-    fun getVideoUrlCurrent(): String {
-        return _videoUrl.value!![_videoIndex.value!!]
-    }
-
     companion object {
         private const val TAG = "TVViewModel"
     }

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

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/channel_fragment"
-    android:layout_width="80dp"
-    android:layout_height="80dp"
-    android:layout_gravity="end|top"
-    android:layout_marginTop="20dp"
-    android:layout_marginEnd="50dp">
-
-    <TextView
-        android:id="@+id/channel_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginTop="0dp"
-        android:text="99"
-        android:textColor="#FFEEEEEE"
-        android:textStyle="bold"
-        android:textSize="50sp" />
-</FrameLayout>

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

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialog"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    >
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <LinearLayout
-            android:layout_width="300dp"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:paddingTop="20dp"
-            android:paddingLeft="7dp"
-            android:paddingRight="7dp"
-            android:background="#FF263238"
-            >
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:textSize="16sp" />
-            <TextView
-                android:id="@+id/version"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
-                ></TextView>
-            <Switch
-                android:id="@+id/switch_channel_reversal"
-                android:text="@string/title_channel_reversal"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <Switch
-                android:id="@+id/switch_channel_num"
-                android:text="@string/title_channel_num"
-                android:layout_marginTop="10dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
-        <ImageView
-            android:layout_width="300dp"
-            android:layout_height="wrap_content"
-            android:src="@drawable/appreciate"
-            android:background="@color/white" />
-    </LinearLayout>
-</FrameLayout>

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

@@ -12,6 +12,7 @@
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:contentDescription="@string/logo"
         android:padding="10dp" />
 
     <LinearLayout

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/strings.xml

@@ -1,5 +1,4 @@
 <resources>
     <string name="app_name">我的电视</string>
-    <string name="title_channel_reversal">换台反转</string>
-    <string name="title_channel_num">数字选台</string>
+    <string name="logo">logo</string>
 </resources>

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

@@ -1,25 +1,11 @@
 <resources>
 
-    <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
-        <item name="cardType">infoUnder</item>
-        <item name="infoVisibility">always</item>
-        <!-- In order to keep backward compatibility we have to create an icon on right. -->
-        <item name="lbImageCardViewType">Title|Content|IconOnRight</item>
-        <!-- Deprecated. Use 'Widget.Leanback.ImageCardView.InfoAreaStyle' instead. -->
-        <item name="infoAreaBackground">@null</item>
-    </style>
 
-    <style name="CustomImageCardViewImageStyle" parent="Widget.Leanback.ImageCardView.ImageStyle">
-        <item name="android:layout_width">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 name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
+        <item name="lbImageCardViewType">Title|Content</item>
     </style>
 
     <style name="CustomImageCardTheme" parent="Theme.Leanback">
         <item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
-        <item name="imageCardViewImageStyle">@style/CustomImageCardViewImageStyle</item>
     </style>
 </resources>

app/src/main/res/xml/network.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <base-config cleartextTrafficPermitted="true">
-        <trust-anchors>
-            <certificates src="system" />
-            <certificates src="user" />
-        </trust-anchors>
-    </base-config>
-</network-security-config>

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.2.1' apply false
-    id 'com.android.library' version '8.2.1' apply false
+    id 'com.android.application' version '8.2.0' apply false
+    id 'com.android.library' version '8.2.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.21' apply false
 }