performance optimization

README.md

@@ -14,6 +14,10 @@
 
 ## 更新日志
 
+### v1.5.1（高版本专用）
+
+* 性能优化
+
 ### v1.4.9（高版本专用）
 
 * 同步v1.4.8

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

@@ -38,7 +38,7 @@ class MainActivity : FragmentActivity() {
     private val delay: Long = 4000
     private val delayHideHelp: Long = 10000
 
-    private lateinit var sharedPref: SharedPreferences
+    lateinit var sharedPref: SharedPreferences
     private var channelReversal = false
     private var channelNum = true
 
@@ -60,7 +60,6 @@ class MainActivity : FragmentActivity() {
                 .add(R.id.main_browse_fragment, mainFragment)
                 .hide(mainFragment)
                 .commit()
-            mainFragment.view?.requestFocus()
         }
         gestureDetector = GestureDetector(this, GestureListener())
 
@@ -477,7 +476,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) } }

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 = ""
 
@@ -53,7 +52,7 @@ class MainFragment : BrowseSupportFragment() {
         super.onActivityCreated(savedInstanceState)
 
         activity?.let { request.initYSP(it) }
-        sharedPref = activity?.getPreferences(Context.MODE_PRIVATE)
+        sharedPref = (activity as? MainActivity)?.sharedPref!!
 
         loadRows()
 
@@ -84,9 +83,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 +150,7 @@ class MainFragment : BrowseSupportFragment() {
 
         adapter = rowsAdapter
 
-        itemPosition = sharedPref?.getInt(POSITION, 0)!!
+        itemPosition = sharedPref.getInt(POSITION, 0)
         if (itemPosition >= tvListViewModel.size()) {
             itemPosition = 0
         }
@@ -313,7 +311,7 @@ class MainFragment : BrowseSupportFragment() {
     override fun onStop() {
         Log.i(TAG, "onStop")
         super.onStop()
-        with(sharedPref!!.edit()) {
+        with(sharedPref.edit()) {
             putInt(POSITION, itemPosition)
             apply()
         }

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

@@ -74,23 +74,22 @@ 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() {
         super.onStart()
-        if (playerView != null) {
+        if (playerView != null && playerView!!.player?.isPlaying == false) {
             playerView!!.player?.play()
         }
     }
 
     override fun onStop() {
         super.onStop()
-        if (playerView != null) {
+        if (playerView != null && playerView!!.player?.isPlaying == true) {
             playerView!!.player?.stop()
         }
     }

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

@@ -32,10 +32,12 @@ 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 var mapping = mapOf(
         "CCTV4K" to "CCTV4K 超高清",
@@ -85,6 +87,10 @@ class Request {
         "新疆卫视" to "新疆卫视",
     )
 
+    init {
+        handler.post(tokenRunnable)
+    }
+
     fun initYSP(context: Context) {
         ysp = YSP(context)
     }
@@ -93,8 +99,8 @@ class Request {
 
     fun fetchVideo(tvModel: TVViewModel, cookie: String) {
         call?.cancel()
-        if (::myRunnable.isInitialized) {
+        if (::btraceRunnable.isInitialized) {
-            handler.removeCallbacks(myRunnable)
+            handler.removeCallbacks(btraceRunnable)
         }
 
         val title = tvModel.title.value
@@ -129,15 +135,20 @@ class Request {
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()
                             tvModel.retryTimes = 0
-                            myRunnable = MyRunnable(tvModel)
+                            btraceRunnable = BtraceRunnable(tvModel)
-                            handler.post(myRunnable)
+                            handler.post(btraceRunnable)
                         } else {
                             Log.e(TAG, "$title key error")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
+                                if (tvModel.needToken) {
+                                    token = ""
+                                    fetchVideo(tvModel)
+                                } else {
                                     fetchVideo(tvModel, cookie)
                                 }
                             }
+                        }
                     } else {
                         if (liveInfo?.data?.errinfo != null && liveInfo.data.errinfo == "应版权方要求，暂停提供直播信号，请点击观看其他精彩节目") {
                             Log.e(TAG, "$title error ${liveInfo.data.errinfo}")
@@ -146,35 +157,51 @@ 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)
                                 }
                             }
                         }
+                    }
                 } else {
                     Log.e(TAG, "$title status error")
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
+                        if (tvModel.needToken) {
+                            token = ""
+                            fetchVideo(tvModel)
+                        } else {
                             fetchVideo(tvModel, cookie)
                         }
                     }
                 }
+            }
 
             override fun onFailure(call: Call<LiveInfo>, t: Throwable) {
                 Log.e(TAG, "$title request error")
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
+                    if (tvModel.needToken) {
+                        token = ""
+                        fetchVideo(tvModel)
+                    } else {
                         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) {
-                        val token = response.body()?.data?.token
+                            token = response.body()?.data?.token!!
                             Log.i(TAG, "info success $token")
                             val cookie =
                                 "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
@@ -196,6 +223,11 @@ class Request {
                         }
                     }
                 })
+        } else {
+            val cookie =
+                "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+            fetchVideo(tvModel, cookie)
+        }
     }
 
     fun fetchData(tvModel: TVViewModel) {
@@ -207,7 +239,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)
@@ -306,6 +363,8 @@ class Request {
                             tvViewModel.addProgram(program.dataListList)
                             Log.i(TAG, "$title program ${program.dataListList.size}")
                         }
+                    } else {
+                        Log.w(TAG, "$title program error")
                     }
                 }
 

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

@@ -277,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/TVViewModel.kt

@@ -78,7 +78,20 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     var needToken = false
 
     private val channelsNeedToken = arrayOf(
-//        "CCTV4K 超高清",
+        "CCTV4K 超高清",
+        "CCTV2 财经",
+        "CCTV5 体育",
+        "CCTV5+ 体育赛事",
+        "CCTV7 国防军事",
+        "CCTV9 记录",
+        "CCTV10 科教",
+        "CCTV11 戏曲",
+        "CCTV12 社会与法",
+        "CCTV14 少儿",
+        "CCTV15 音乐",
+        "CCTV16 奥林匹克",
+        "CCTV17 农业农村",
+
         "CCTV3 综艺",
         "CCTV6 电影",
         "CCTV8 电视剧",
@@ -95,6 +108,30 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         "央视台球",
         "电视指南",
         "卫生健康",
+
+        "东方卫视",
+        "湖南卫视",
+        "湖北卫视",
+        "辽宁卫视",
+        "江苏卫视",
+        "江西卫视",
+        "山东卫视",
+        "广东卫视",
+        "广西卫视",
+        "重庆卫视",
+        "河南卫视",
+        "河北卫视",
+        "贵州卫视",
+        "北京卫视",
+        "黑龙江卫视",
+        "浙江卫视",
+        "安徽卫视",
+        "深圳卫视",
+        "四川卫视",
+        "东南卫视",
+        "海南卫视",
+        "天津卫视",
+        "新疆卫视",
     )
 
     fun addVideoUrl(url: String) {