fix retry bug

README.md

@@ -1,6 +1,6 @@
 # 我的电视
 
-安卓电视直播软件，内置直播源
+电视直播软件，安装即可使用
 
 ## 使用
 
@@ -14,10 +14,28 @@
 
 ## 更新日志
 
+### v1.5.1（高版本专用）
+
+* 性能优化
+
+### v1.4.9（高版本专用）
+
+* 同步v1.4.8
+
+### v1.4.8（通用版）
+
+* 频道号从1开始，CCTV5+为18
+* 提高CCTV6清晰度
+* 增加天津卫视、新疆卫视
+
 ### v1.4.7（高版本专用）
 
-* 修复部分用户cctv13播放过程中卡住的问题
-* 调整cctv的频道顺序
+* 修复部分用户CCTV13播放过程中卡住的问题
+* 调整CCTV的频道顺序
+
+### v1.4.6（通用版）
+
+* 10以下频道不再需要先按0
 
 ### v1.4.5（高版本专用）
 

app/src/main/AndroidManifest.xml

@@ -9,17 +9,19 @@
     <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: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/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,6 +15,7 @@ class ChannelFragment : Fragment() {
 
     private val handler = Handler()
     private val delay: Long = 3000
+    private var channel = 0
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -28,37 +28,39 @@ class ChannelFragment : Fragment() {
     }
 
     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()
-            (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
@@ -30,12 +29,21 @@ class InfoFragment : Fragment() {
 
     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)
         }

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

@@ -35,16 +35,17 @@ class MainActivity : FragmentActivity() {
     private lateinit var gestureDetector: GestureDetector
 
     private val handler = Handler()
-    private val delay: Long = 4000
-    private val delayHideHelp: Long = 10000
+    private val delayHideMain: Long = 5000
+    private val delayHideSetting: Long = 10000
 
-    private lateinit var sharedPref: SharedPreferences
+    lateinit var sharedPref: SharedPreferences
     private var channelReversal = false
     private var channelNum = true
 
     private var versionName = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
@@ -60,7 +61,6 @@ class MainActivity : FragmentActivity() {
                 .add(R.id.main_browse_fragment, mainFragment)
                 .hide(mainFragment)
                 .commit()
-            mainFragment.view?.requestFocus()
         }
         gestureDetector = GestureDetector(this, GestureListener())
 
@@ -132,11 +132,11 @@ class MainActivity : FragmentActivity() {
     }
 
     fun keepRunnable() {
-        handler.removeCallbacks(hideRunnable)
-        handler.postDelayed(hideRunnable, delay)
+        handler.removeCallbacks(hideMain)
+        handler.postDelayed(hideMain, delayHideMain)
     }
 
-    private val hideRunnable = Runnable {
+    private val hideMain = Runnable {
         if (!mainFragment.isHidden) {
             supportFragmentManager.beginTransaction().hide(mainFragment).commit()
         }
@@ -222,7 +222,7 @@ class MainActivity : FragmentActivity() {
         this.channelNum = channelNum
     }
 
-    private fun showHelp() {
+    private fun showSetting() {
         if (!mainFragment.isHidden) {
             return
         }
@@ -230,15 +230,15 @@ class MainActivity : FragmentActivity() {
         Log.i(TAG, "settingFragment ${settingFragment.isVisible}")
         if (!settingFragment.isVisible) {
             settingFragment.show(supportFragmentManager, "setting")
-            handler.removeCallbacks(hideHelp)
-            handler.postDelayed(hideHelp, delayHideHelp)
+            handler.removeCallbacks(hideSetting)
+            handler.postDelayed(hideSetting, delayHideSetting)
         } else {
-            handler.removeCallbacks(hideHelp)
+            handler.removeCallbacks(hideSetting)
             settingFragment.dismiss()
         }
     }
 
-    private val hideHelp = Runnable {
+    private val hideSetting = Runnable {
         if (settingFragment.isVisible) {
             settingFragment.dismiss()
         }
@@ -359,27 +359,27 @@ class MainActivity : FragmentActivity() {
             }
 
             KeyEvent.KEYCODE_BOOKMARK -> {
-                showHelp()
+                showSetting()
                 return true
             }
 
             KeyEvent.KEYCODE_UNKNOWN -> {
-                showHelp()
+                showSetting()
                 return true
             }
 
             KeyEvent.KEYCODE_HELP -> {
-                showHelp()
+                showSetting()
                 return true
             }
 
             KeyEvent.KEYCODE_SETTINGS -> {
-                showHelp()
+                showSetting()
                 return true
             }
 
             KeyEvent.KEYCODE_MENU -> {
-                showHelp()
+                showSetting()
                 return true
             }
 
@@ -477,7 +477,7 @@ class MainActivity : FragmentActivity() {
 
     private fun hashSignature(signature: Signature): String {
         return try {
-            val md = MessageDigest.getInstance("SHA-256")
+            val md = MessageDigest.getInstance("MD5")
             md.update(signature.toByteArray())
             val digest = md.digest()
             digest.let { it -> it.joinToString("") { "%02x".format(it) } }
@@ -487,6 +487,22 @@ 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"

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

@@ -1,6 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.os.Handler
@@ -35,7 +34,7 @@ class MainFragment : BrowseSupportFragment() {
 
     var tvListViewModel = TVListViewModel()
 
-    private var sharedPref: SharedPreferences? = null
+    private lateinit var sharedPref: SharedPreferences
 
     private var lastVideoUrl = ""
 
@@ -45,15 +44,21 @@ class MainFragment : BrowseSupportFragment() {
     private var ready = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
         headersState = HEADERS_DISABLED
     }
 
+    override fun onStart() {
+        Log.i(TAG, "onStart")
+        super.onStart()
+    }
+
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
         activity?.let { request.initYSP(it) }
-        sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
+        sharedPref = (activity as? MainActivity)?.sharedPref!!
 
         loadRows()
 
@@ -62,7 +67,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
@@ -84,9 +89,8 @@ class MainFragment : BrowseSupportFragment() {
             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}")
+                        Log.i(TAG, "request $title")
                         lifecycleScope.launch(Dispatchers.IO) {
                             tvViewModel.let { request.fetchData(it) }
                         }
@@ -152,7 +156,7 @@ class MainFragment : BrowseSupportFragment() {
 
         adapter = rowsAdapter
 
-        itemPosition = sharedPref?.getInt(POSITION, 0)!!
+        itemPosition = sharedPref.getInt(POSITION, 0)
         if (itemPosition >= tvListViewModel.size()) {
             itemPosition = 0
         }
@@ -251,10 +255,12 @@ class MainFragment : BrowseSupportFragment() {
 
     fun play(itemPosition: Int) {
         view?.post {
-            if (itemPosition < tvListViewModel.size()) {
+            if (itemPosition > -1 && itemPosition < tvListViewModel.size()) {
                 this.itemPosition = itemPosition
                 tvListViewModel.setItemPosition(itemPosition)
                 tvListViewModel.getTVViewModel(itemPosition)?.changed()
+            } else {
+                Toast.makeText(context, "频道不存在", Toast.LENGTH_SHORT).show()
             }
         }
     }
@@ -288,7 +294,7 @@ class MainFragment : BrowseSupportFragment() {
                 tvViewModel.programUpdateTime = timestamp
                 request.fetchProgram(tvViewModel)
             } else {
-                if (timestamp - tvViewModel.program.value!!.last().et < 600) {
+                if (tvViewModel.program.value!!.last().et - timestamp < 600) {
                     tvViewModel.programUpdateTime = timestamp
                     request.fetchProgram(tvViewModel)
                 }
@@ -298,7 +304,7 @@ class MainFragment : BrowseSupportFragment() {
 
     inner class UpdateProgramRunnable : Runnable {
         override fun run() {
-            tvListViewModel.getTVListViewModel().value?.filter { it.programId.value != null }
+            tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null && it.programId.value != "" }
                 ?.forEach { tvViewModel ->
                     updateProgram(
                         tvViewModel
@@ -308,14 +314,19 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
+    override fun onResume() {
+        Log.i(TAG, "onResume")
+        super.onResume()
+    }
+
     override fun onStop() {
         Log.i(TAG, "onStop")
         super.onStop()
-        with(sharedPref!!.edit()) {
+        with(sharedPref.edit()) {
             putInt(POSITION, itemPosition)
             apply()
         }
-        Log.i(TAG, "POSITION saved")
+        Log.i(TAG, "$POSITION saved")
     }
 
     override fun onDestroy() {
@@ -324,11 +335,6 @@ class MainFragment : BrowseSupportFragment() {
         handler.removeCallbacks(mUpdateProgramRunnable)
     }
 
-    override fun onResume() {
-        super.onResume()
-        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,23 +74,31 @@ class PlayerFragment : Fragment() {
     @OptIn(UnstableApi::class)
     fun play(tvViewModel: TVViewModel) {
         this.tvViewModel = tvViewModel
-        val videoUrlCurrent = tvViewModel.getVideoUrlCurrent()
         playerView?.player?.run {
-            setMediaItem(MediaItem.fromUri(videoUrlCurrent))
+            setMediaItem(MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
             prepare()
         }
     }
 
     override fun onStart() {
+        Log.i(TAG, "onStart")
         super.onStart()
-        if (playerView != null) {
-            playerView!!.player?.play()
+        if (playerView != null && playerView!!.player?.isPlaying == false) {
+            Log.i(TAG, "replay")
+            playerView!!.player?.prepare()
+        } else {
+            Log.i(TAG, "playing")
         }
     }
 
-    override fun onStop() {
-        super.onStop()
-        if (playerView != null) {
+    override fun onResume() {
+        Log.i(TAG, "onResume")
+        super.onResume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        if (playerView != null && playerView!!.player?.isPlaying == true) {
             playerView!!.player?.stop()
         }
     }

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

@@ -32,10 +32,14 @@ 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 myRunnable: MyRunnable
+    private lateinit var btraceRunnable: BtraceRunnable
+    private var tokenRunnable: TokenRunnable = TokenRunnable()
+
+    private val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
 
     private var mapping = mapOf(
         "CCTV4K" to "CCTV4K 超高清",
@@ -81,8 +85,14 @@ class Request {
         "四川卫视" to "四川卫视",
         "福建东南卫视" to "东南卫视",
         "海南卫视" to "海南卫视",
+        "天津卫视" to "天津卫视",
+        "新疆卫视" to "新疆卫视",
     )
 
+    init {
+        handler.post(tokenRunnable)
+    }
+
     fun initYSP(context: Context) {
         ysp = YSP(context)
     }
@@ -91,8 +101,8 @@ class Request {
 
     fun fetchVideo(tvModel: TVViewModel, cookie: String) {
         call?.cancel()
-        if (::myRunnable.isInitialized) {
-            handler.removeCallbacks(myRunnable)
+        if (::btraceRunnable.isInitialized) {
+            handler.removeCallbacks(btraceRunnable)
         }
 
         val title = tvModel.title.value
@@ -113,7 +123,6 @@ class Request {
                             Base64.DEFAULT
                         )
                         val decodedString = String(decodedBytes)
-                        val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
                         val matchResult = regex.find(decodedString)
                         if (matchResult != null) {
                             val (key, iv) = matchResult.destructured
@@ -123,17 +132,28 @@ 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
-                            myRunnable = MyRunnable(tvModel)
-                            handler.post(myRunnable)
+                            btraceRunnable = BtraceRunnable(tvModel)
+                            handler.post(btraceRunnable)
                         } else {
                             Log.e(TAG, "$title key error")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                fetchVideo(tvModel, cookie)
+                                if (tvModel.needToken) {
+                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                        if (!tvModel.mustToken) {
+                                            fetchVideo(tvModel, cookie)
+                                        }
+                                    } else {
+                                        token = ""
+                                        fetchVideo(tvModel)
+                                    }
+                                } else {
+                                    fetchVideo(tvModel, cookie)
+                                }
                             }
                         }
                     } else {
@@ -144,7 +164,18 @@ class Request {
                             Log.e(TAG, "$title url error $request $liveInfo")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                fetchVideo(tvModel, cookie)
+                                if (tvModel.needToken) {
+                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                        if (!tvModel.mustToken) {
+                                            fetchVideo(tvModel, cookie)
+                                        }
+                                    } else {
+                                        token = ""
+                                        fetchVideo(tvModel)
+                                    }
+                                } else {
+                                    fetchVideo(tvModel, cookie)
+                                }
                             }
                         }
                     }
@@ -152,7 +183,18 @@ class Request {
                     Log.e(TAG, "$title status error")
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
-                        fetchVideo(tvModel, cookie)
+                        if (tvModel.needToken) {
+                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                if (!tvModel.mustToken) {
+                                    fetchVideo(tvModel, cookie)
+                                }
+                            } else {
+                                token = ""
+                                fetchVideo(tvModel)
+                            }
+                        } else {
+                            fetchVideo(tvModel, cookie)
+                        }
                     }
                 }
             }
@@ -161,39 +203,66 @@ class Request {
                 Log.e(TAG, "$title request error")
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
-                    fetchVideo(tvModel, cookie)
+                    if (tvModel.needToken) {
+                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                            if (!tvModel.mustToken) {
+                                fetchVideo(tvModel, cookie)
+                            }
+                        } else {
+                            token = ""
+                            fetchVideo(tvModel)
+                        }
+                    } else {
+                        fetchVideo(tvModel, cookie)
+                    }
                 }
             }
         })
     }
 
     fun fetchVideo(tvModel: TVViewModel) {
-        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)
+        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.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
+                                tvModel.tokenRetryTimes++
+                                fetchVideo(tvModel)
+                            } else {
+                                if (!tvModel.mustToken) {
+                                    val cookie = "vplatform=109"
+                                    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)
+                    override fun onFailure(call: Call<Info>, t: Throwable) {
+                        Log.e(TAG, "info request error $t")
+                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
+                            tvModel.tokenRetryTimes++
+                            fetchVideo(tvModel)
+                        } else {
+                            if (!tvModel.mustToken) {
+                                val cookie = "vplatform=109"
+                                fetchVideo(tvModel, cookie)
+                            }
+                        }
                     }
-                }
-            })
+                })
+        } else {
+            val cookie =
+                "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+            fetchVideo(tvModel, cookie)
+        }
     }
 
     fun fetchData(tvModel: TVViewModel) {
@@ -205,7 +274,32 @@ class Request {
         }
     }
 
-    inner class MyRunnable(private val tvModel: TVViewModel) : Runnable {
+    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 {
         override fun run() {
             fetchBtrace(tvModel)
             handler.postDelayed(this, 60000)
@@ -302,8 +396,10 @@ class Request {
                         val program = response.body()
                         if (program != null) {
                             tvViewModel.addProgram(program.dataListList)
-                            Log.i(TAG, "$title program ${program.dataListList.size}")
+                            Log.d(TAG, "$title program ${program.dataListList.size}")
                         }
+                    } else {
+                        Log.w(TAG, "$title program error")
                     }
                 }
 

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,10 +66,12 @@ 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",
-        "CCTV8K 超高清" to "600156816",
+//        "CCTV8K 超高清" to "600156816",
         "CCTV1 综合" to "600001859",
         "CCTV2 财经" to "600001800",
         "CCTV3 综艺" to "600001801",
@@ -93,7 +95,7 @@ object TVList {
         "CGTN 俄语频道" to "600084758",
         "CGTN 阿拉伯语频道" to "600084782",
         "CGTN 西班牙语频道" to "600084744",
-        "CGTN 记录频道" to "600084781",
+//        "CGTN 记录频道" to "600084781",
         "风云剧场" to "600099658",
         "第一剧场" to "600099655",
         "怀旧剧场" to "600099620",
@@ -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,7 +142,7 @@ 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"),
@@ -190,6 +194,8 @@ 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
 
@@ -201,7 +207,6 @@ CCTV2 财经,http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index
 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
@@ -214,6 +219,7 @@ 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
@@ -251,6 +257,8 @@ 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
@@ -269,9 +277,6 @@ 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/api/YSP.kt

@@ -51,14 +51,14 @@ class YSP(var context: Context) {
     private var signature = ""
 
     private var encryptor: Encryptor? = null
-    private var sharedPref: SharedPreferences? = null
+    private lateinit var sharedPref: SharedPreferences
 
     init {
         if (context is MainActivity) {
             encryptor = Encryptor()
             encryptor!!.init(context)
 
-            sharedPref = (context as MainActivity).getPreferences(Context.MODE_PRIVATE)
+            sharedPref = (context as MainActivity).sharedPref
         }
 
         guid = getGuid()
@@ -77,15 +77,10 @@ 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 {
@@ -99,10 +94,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()
             }
@@ -112,7 +107,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,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

@@ -19,8 +19,10 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     private var rowPosition: Int = 0
     private var itemPosition: Int = 0
 
-    var retryTimes: Int = 0
-    var retryMaxTimes: Int = 8
+    var retryTimes = 0
+    var tokenRetryTimes = 0
+    var retryMaxTimes = 8
+    var tokenRetryMaxTimes = 2
     var programUpdateTime: Long = 0
 
     private val _errInfo = MutableLiveData<String>()
@@ -77,7 +79,66 @@ class TVViewModel(private var tv: TV) : ViewModel() {
 
     var needToken = false
 
+    var mustToken = false
+
     private val channelsNeedToken = arrayOf(
+        "CCTV4K 超高清",
+        "CCTV2 财经",
+        "CCTV5 体育",
+        "CCTV5+ 体育赛事",
+        "CCTV7 国防军事",
+        "CCTV9 记录",
+        "CCTV10 科教",
+        "CCTV11 戏曲",
+        "CCTV12 社会与法",
+        "CCTV14 少儿",
+        "CCTV15 音乐",
+        "CCTV16 奥林匹克",
+        "CCTV17 农业农村",
+
+        "CCTV3 综艺",
+        "CCTV6 电影",
+        "CCTV8 电视剧",
+        "风云剧场",
+        "第一剧场",
+        "怀旧剧场",
+        "世界地理",
+        "风云音乐",
+        "兵器科技",
+        "风云足球",
+        "高尔夫网球",
+        "女性时尚",
+        "央视文化精品",
+        "央视台球",
+        "电视指南",
+        "卫生健康",
+
+        "东方卫视",
+        "湖南卫视",
+        "湖北卫视",
+        "辽宁卫视",
+        "江苏卫视",
+        "江西卫视",
+        "山东卫视",
+        "广东卫视",
+        "广西卫视",
+        "重庆卫视",
+        "河南卫视",
+        "河北卫视",
+        "贵州卫视",
+        "北京卫视",
+        "黑龙江卫视",
+        "浙江卫视",
+        "安徽卫视",
+        "深圳卫视",
+        "四川卫视",
+        "东南卫视",
+        "海南卫视",
+        "天津卫视",
+        "新疆卫视",
+    )
+
+    private val channelsMustToken = arrayOf(
         "CCTV3 综艺",
         "CCTV6 电影",
         "CCTV8 电视剧",
@@ -150,6 +211,9 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         if (tv.title in channelsNeedToken) {
             needToken = true
         }
+        if (tv.title in channelsMustToken) {
+            mustToken = true
+        }
     }
 
     fun getRowPosition(): Int {

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

@@ -0,0 +1,9 @@
+<?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>