add channel

README.md

@@ -14,6 +14,25 @@
 
 ## 更新日志
 
+### 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（高版本专用）
 
 * 数字选台配置

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

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

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

@@ -2,7 +2,6 @@ package com.lizongying.mytv
 
 import android.os.Bundle
 import android.os.Handler
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,49 +15,52 @@ class ChannelFragment : Fragment() {
 
     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) {
-        binding.channelContent.text = tvViewModel.id.value.toString()
-        handler.removeCallbacks(removeRunnable)
+        handler.removeCallbacks(hideRunnable)
+        handler.removeCallbacks(playRunnable)
+        binding.channelContent.text = (tvViewModel.id.value?.plus(1)).toString()
         view?.visibility = View.VISIBLE
-        handler.postDelayed(removeRunnable, delay)
+        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
-            handler.removeCallbacks(removeRunnable)
             view?.visibility = View.VISIBLE
-            handler.postDelayed(removeRunnable, delay)
+            handler.postDelayed(playRunnable, delay)
         } else {
-            val ch = "${binding.channelContent.text}$channel".toInt()
-            Log.i(TAG, "channel $ch")
-            (activity as MainActivity).play(ch)
-            binding.channelContent.text = ""
-            view?.visibility = View.GONE
+            handler.postDelayed(playRunnable, 0)
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        handler.postDelayed(removeRunnable, delay)
-    }
-
     override fun onPause() {
         super.onPause()
-        handler.removeCallbacks(removeRunnable)
+        handler.removeCallbacks(hideRunnable)
+        handler.removeCallbacks(playRunnable)
     }
 
-    private val removeRunnable = Runnable {
+    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
     }

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

@@ -2,7 +2,6 @@ package com.lizongying.mytv
 
 import android.os.Bundle
 import android.os.Handler
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -23,25 +22,28 @@ 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
-        if (tvViewModel.title.value == "CCTV8K 超高清") {
-            Glide.with(this)
+
+        when (tvViewModel.title.value) {
+            "CCTV8K 超高清" -> Glide.with(this)
                 .load(R.drawable.cctv8k)
                 .into(binding.infoLogo)
-        } else {
-            Glide.with(this)
+
+            "天津卫视" -> Glide.with(this)
+                .load(R.drawable.tianjin)
+                .into(binding.infoLogo)
+
+            "新疆卫视" -> Glide.with(this)
+                .load(R.drawable.xinjiang)
+                .into(binding.infoLogo)
+
+            else -> Glide.with(this)
                 .load(tvViewModel.logo.value)
                 .into(binding.infoLogo)
         }
@@ -56,10 +58,13 @@ 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

@@ -28,6 +28,7 @@ class MainActivity : FragmentActivity() {
     private val mainFragment = MainFragment()
     private val infoFragment = InfoFragment()
     private val channelFragment = ChannelFragment()
+    private lateinit var settingFragment: SettingFragment
 
     private var doubleBackToExitPressedOnce = false
 
@@ -42,7 +43,6 @@ class MainActivity : FragmentActivity() {
     private var channelNum = true
 
     private var versionName = ""
-    private lateinit var dialogFragment: MyDialogFragment
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -58,8 +58,7 @@ class MainActivity : FragmentActivity() {
                 .add(R.id.main_browse_fragment, infoFragment)
                 .add(R.id.main_browse_fragment, channelFragment)
                 .add(R.id.main_browse_fragment, mainFragment)
-                .hide(infoFragment)
-                .hide(channelFragment)
+                .hide(mainFragment)
                 .commit()
             mainFragment.view?.requestFocus()
         }
@@ -70,7 +69,7 @@ class MainActivity : FragmentActivity() {
         channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
 
         versionName = getPackageInfo().versionName
-        dialogFragment = MyDialogFragment(versionName, channelReversal, channelNum)
+        settingFragment = SettingFragment(versionName, channelReversal, channelNum)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -80,6 +79,20 @@ class MainActivity : FragmentActivity() {
         }
     }
 
+    private fun showChannel(channel: String) {
+        if (!mainFragment.isHidden) {
+            return
+        }
+
+        if (settingFragment.isVisible) {
+            return
+        }
+
+        if (channelNum) {
+            channelFragment.show(channel)
+        }
+    }
+
     fun play(tvViewModel: TVViewModel) {
         playerFragment.play(tvViewModel)
         mainFragment.view?.requestFocus()
@@ -214,20 +227,20 @@ class MainActivity : FragmentActivity() {
             return
         }
 
-        Log.i(TAG, "dialogFragment ${dialogFragment.isVisible}")
-        if (!dialogFragment.isVisible) {
-            dialogFragment.show(supportFragmentManager, "settings_dialog")
+        Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
+        if (!settingFragment.isVisible) {
+            settingFragment.show(supportFragmentManager, "setting")
             handler.removeCallbacks(hideHelp)
             handler.postDelayed(hideHelp, delayHideHelp)
         } else {
             handler.removeCallbacks(hideHelp)
-            dialogFragment.dismiss()
+            settingFragment.dismiss()
         }
     }
 
     private val hideHelp = Runnable {
-        if (dialogFragment.isVisible) {
-            dialogFragment.dismiss()
+        if (settingFragment.isVisible) {
+            settingFragment.dismiss()
         }
     }
 
@@ -283,20 +296,6 @@ class MainActivity : FragmentActivity() {
         }, 2000)
     }
 
-    private fun showChannel(channel: String) {
-        if (!mainFragment.isHidden) {
-            return
-        }
-
-        if (dialogFragment.isVisible) {
-            return
-        }
-
-        if (channelNum) {
-            channelFragment.show(channel)
-        }
-    }
-
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         when (keyCode) {
             KeyEvent.KEYCODE_0 -> {

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

@@ -25,19 +25,19 @@ import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-
 class MainFragment : BrowseSupportFragment() {
-    var itemPosition: Int = 0
 
-    private var request: Request = Request()
+    private var itemPosition = 0
 
     private var rowsAdapter: ArrayObjectAdapter? = null
 
+    private var request = Request()
+
     var tvListViewModel = TVListViewModel()
 
     private var sharedPref: SharedPreferences? = null
 
-    private var lastVideoUrl: String = ""
+    private var lastVideoUrl = ""
 
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
@@ -53,7 +53,6 @@ class MainFragment : BrowseSupportFragment() {
         super.onActivityCreated(savedInstanceState)
 
         activity?.let { request.initYSP(it) }
-
         sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
 
         loadRows()
@@ -63,7 +62,7 @@ class MainFragment : BrowseSupportFragment() {
         mUpdateProgramRunnable = UpdateProgramRunnable()
         handler.post(mUpdateProgramRunnable)
 
-        tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
             tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
                 if (tvViewModel.errInfo.value != null
                     && tvViewModel.id.value == itemPosition
@@ -100,7 +99,6 @@ class MainFragment : BrowseSupportFragment() {
                         if (check(tvViewModel)) {
                             (activity as? MainActivity)?.play(tvViewModel)
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-
                             setSelectedPosition(
                                 tvViewModel.getRowPosition(), true,
                                 SelectItemViewHolderTask(tvViewModel.getItemPosition())
@@ -114,58 +112,6 @@ class MainFragment : BrowseSupportFragment() {
         fragmentReady()
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        handler.removeCallbacks(mUpdateProgramRunnable)
-        with(sharedPref!!.edit()) {
-            putInt("position", itemPosition)
-            apply()
-        }
-    }
-
-    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)
-                }
-            }
-        }
-    }
-
-    inner class UpdateProgramRunnable : Runnable {
-        override fun run() {
-            tvListViewModel.getTVListViewModel().value?.filter { it.programId.value != null }
-                ?.forEach { tvViewModel ->
-                    updateProgram(
-                        tvViewModel
-                    )
-                }
-            handler.postDelayed(this, 60000)
-        }
-    }
-
-    fun check(tvViewModel: TVViewModel): Boolean {
-        val title = tvViewModel.title.value
-        val videoUrl = tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
-        if (videoUrl == null || videoUrl == "") {
-            Log.e(TAG, "$title videoUrl is empty")
-            return false
-        }
-
-        if (videoUrl == lastVideoUrl) {
-            Log.e(TAG, "$title videoUrl is duplication")
-            return false
-        }
-
-        return true
-    }
-
     fun toLastPosition() {
         setSelectedPosition(
             selectedPosition, false,
@@ -206,57 +152,13 @@ class MainFragment : BrowseSupportFragment() {
 
         adapter = rowsAdapter
 
-        itemPosition = sharedPref?.getInt("position", 0)!!
+        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) {
-//            request.fetchPage()
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            tvViewModel?.changed()
-
-            (activity as? MainActivity)?.switchMainFragment()
-        }
-    }
-
-    fun play(itemPosition: Int) {
-        view?.post {
-            if (itemPosition < tvListViewModel.size()) {
-                this.itemPosition = itemPosition
-                tvListViewModel.setItemPosition(itemPosition)
-                tvListViewModel.getTVViewModel(itemPosition)?.changed()
-            }
-        }
-    }
-
-    fun prev() {
-        view?.post {
-            itemPosition--
-            if (itemPosition == -1) {
-                itemPosition = tvListViewModel.size() - 1
-            }
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-    }
-
-    fun next() {
-        view?.post {
-            itemPosition++
-            if (itemPosition == tvListViewModel.size()) {
-                itemPosition = 0
-            }
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-    }
-
     fun prevSource() {
         view?.post {
             val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
@@ -322,12 +224,115 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
+    fun check(tvViewModel: TVViewModel): Boolean {
+        val title = tvViewModel.title.value
+        val videoUrl = tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
+        if (videoUrl == null || videoUrl == "") {
+            Log.e(TAG, "$title videoUrl is empty")
+            return false
+        }
+
+        if (videoUrl == lastVideoUrl) {
+            Log.e(TAG, "$title videoUrl is duplication")
+            return false
+        }
+
+        return true
+    }
+
+    fun fragmentReady() {
+        ready++
+        Log.i(TAG, "ready $ready")
+        if (ready == 4) {
+//            request.fetchPage()
+            tvListViewModel.getTVViewModel(itemPosition)?.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()
+            }
+        }
+    }
+
+    fun prev() {
+        view?.post {
+            itemPosition--
+            if (itemPosition == -1) {
+                itemPosition = tvListViewModel.size() - 1
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
+        }
+    }
+
+    fun next() {
+        view?.post {
+            itemPosition++
+            if (itemPosition == tvListViewModel.size()) {
+                itemPosition = 0
+            }
+            tvListViewModel.setItemPosition(itemPosition)
+            tvListViewModel.getTVViewModel(itemPosition)?.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)
+                }
+            }
+        }
+    }
+
+    inner class UpdateProgramRunnable : Runnable {
+        override fun run() {
+            tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null }
+                ?.forEach { tvViewModel ->
+                    updateProgram(
+                        tvViewModel
+                    )
+                }
+            handler.postDelayed(this, 60000)
+        }
+    }
+
+    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 onResume() {
         super.onResume()
-        view!!.requestFocus()
+        view?.post { view?.requestFocus() }
     }
 
     companion object {
         private const val TAG = "MainFragment"
+        private const val POSITION = "position"
     }
 }

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

@@ -74,10 +74,9 @@ class PlayerFragment : Fragment() {
     @OptIn(UnstableApi::class)
     fun play(tvViewModel: TVViewModel) {
         this.tvViewModel = tvViewModel
-        val videoUrlCurrent =
-            tvViewModel.videoIndex.value?.let { tvViewModel.videoUrl.value?.get(it) }
+        val videoUrlCurrent = tvViewModel.getVideoUrlCurrent()
         playerView?.player?.run {
-            videoUrlCurrent?.let { setMediaItem(MediaItem.fromUri(it)) }
+            setMediaItem(MediaItem.fromUri(videoUrlCurrent))
             prepare()
         }
     }

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

@@ -81,6 +81,8 @@ class Request {
         "四川卫视" to "四川卫视",
         "福建东南卫视" to "东南卫视",
         "海南卫视" to "海南卫视",
+        "天津卫视" to "天津卫视",
+        "新疆卫视" to "新疆卫视",
     )
 
     fun initYSP(context: Context) {
@@ -123,7 +125,7 @@ class Request {
                                 keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
                                 ivBytes
                             ).uppercase()
-                            Log.i(TAG, "$title url $url")
+                            Log.d(TAG, "$title url $url")
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()
                             tvModel.retryTimes = 0

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

@@ -8,9 +8,9 @@ import androidx.fragment.app.DialogFragment
 import com.lizongying.mytv.databinding.DialogBinding
 
 
-class MyDialogFragment(private val versionName: String,
-                       private val channelReversal: Boolean,
-                       private val channelNum: Boolean,
+class SettingFragment(private val versionName: String,
+                      private val channelReversal: Boolean,
+                      private val channelNum: Boolean,
     ) :
     DialogFragment() {
 
@@ -52,7 +52,7 @@ class MyDialogFragment(private val versionName: String,
     }
 
     companion object {
-        const val TAG = "MyDialogFragment"
+        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 "https://static.wikia.nocookie.net/logos/images/6/69/CCTV8K.png/revision/latest/scale-to-width-down/120?cb=20230104110835&path-prefix=vi",
+        "CCTV8K 超高清" to "",
         "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,6 +66,8 @@ 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",
@@ -128,6 +130,8 @@ object TVList {
         "四川卫视" to "600002516",
         "东南卫视" to "600002484",
         "海南卫视" to "600002506",
+        "天津卫视" to "600152137",
+        "新疆卫视" to "600152138",
     )
     private var mappingVideo = mapOf(
         "CCTV4K 超高清" to arrayOf("600002264", "2000266303"),
@@ -138,14 +142,14 @@ object TVList {
         "CCTV4 中文国际" to arrayOf("600001814", "2000204803"),
         "CCTV5 体育" to arrayOf("600001818", "2000205103"),
         "CCTV5+ 体育赛事" to arrayOf("600001817", "2000204503"),
-        "CCTV6 电影" to arrayOf("600001802", "2000203303"),
+        "CCTV6 电影" to arrayOf("600001802", "2013693901"),
         "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"),
@@ -190,20 +194,19 @@ 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
@@ -216,6 +219,9 @@ 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
@@ -251,6 +257,8 @@ CCTV17 农业农村,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/322122619
 四川卫视,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

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

@@ -1,5 +1,7 @@
 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
@@ -12,4 +14,20 @@ 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/models/TVListViewModel.kt

@@ -8,7 +8,9 @@ class TVListViewModel : ViewModel() {
 
     var maxNum = mutableListOf<Int>()
 
-    private val tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
+    private val _tvListViewModel = MutableLiveData<MutableList<TVViewModel>>()
+    val tvListViewModel: LiveData<MutableList<TVViewModel>>
+        get() = _tvListViewModel
 
     private val _itemPosition = MutableLiveData<Int>()
     val itemPosition: LiveData<Int>
@@ -18,22 +20,20 @@ class TVListViewModel : ViewModel() {
     val itemPositionCurrent: LiveData<Int>
         get() = _itemPositionCurrent
 
-    fun getTVListViewModel(): MutableLiveData<MutableList<TVViewModel>> {
-        return tvListViewModel
-    }
-
     fun addTVViewModel(tvViewModel: TVViewModel) {
-        val currentTVModelList = tvListViewModel.value ?: mutableListOf()
-        currentTVModelList.add(tvViewModel)
-        tvListViewModel.value = currentTVModelList
+        if (_tvListViewModel.value == null) {
+            _tvListViewModel.value = mutableListOf(tvViewModel)
+        } else {
+            _tvListViewModel.value?.add(tvViewModel)
+        }
     }
 
     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,6 +46,9 @@ class TVListViewModel : ViewModel() {
     }
 
     fun size(): Int {
-        return tvListViewModel.value!!.size
+        if (_tvListViewModel.value == null) {
+            return 0
+        }
+        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 = 5
+    var retryMaxTimes: Int = 8
     var programUpdateTime: Long = 0
 
     private val _errInfo = MutableLiveData<String>()
@@ -78,6 +78,7 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     var needToken = false
 
     private val channelsNeedToken = arrayOf(
+//        "CCTV4K 超高清",
         "CCTV3 综艺",
         "CCTV6 电影",
         "CCTV8 电视剧",
@@ -222,18 +223,25 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         mMinimumLoadableRetryCount = minimumLoadableRetryCount
     }
 
+    /**
+     * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
+     */
     @OptIn(UnstableApi::class)
-    fun buildSource(videoUrl: String, mHeaders: Map<String, String>?): HlsMediaSource {
+    fun buildSource(): HlsMediaSource {
         val httpDataSource = DefaultHttpDataSource.Factory()
         mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
 
         return HlsMediaSource.Factory(httpDataSource).createMediaSource(
             MediaItem.fromUri(
-                Uri.parse(videoUrl)
+                Uri.parse(getVideoUrlCurrent())
             )
         )
     }
 
+    fun getVideoUrlCurrent(): String {
+        return _videoUrl.value!![_videoIndex.value!!]
+    }
+
     companion object {
         private const val TAG = "TVViewModel"
     }

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.0' apply false
-    id 'com.android.library' version '8.2.0' apply false
+    id 'com.android.application' version '8.2.1' apply false
+    id 'com.android.library' version '8.2.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.21' apply false
 }