request optimize

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

@@ -31,41 +31,19 @@ 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)
-
-            "天津卫视" -> 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)
-
-            "兵团卫视" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.bingtuan)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            else -> Glide.with(viewHolder.view.context)
-                .load(tvViewModel.logo.value)
-                .centerInside()
-                .into(cardView.mainImageView)
-        }
+        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) {
-                cardView.contentText = program.name
-            }
+        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+        if (!epg.isNullOrEmpty()) {
+            cardView.contentText = epg.last().title
+        } else {
+            cardView.contentText = ""
         }
     }
 

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

@@ -0,0 +1,84 @@
+@file:Suppress("DEPRECATION")
+
+package com.lizongying.mytv
+
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.Signature
+import android.content.pm.SigningInfo
+import android.os.Build
+import android.util.Log
+import java.security.MessageDigest
+
+private const val TAG = "Extensions"
+
+private val Context.packageInfo: PackageInfo
+    get() {
+        val flag = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            PackageManager.GET_SIGNATURES
+        } else {
+            PackageManager.GET_SIGNING_CERTIFICATES
+        }
+        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            packageManager.getPackageInfo(packageName, flag)
+        } else {
+            packageManager.getPackageInfo(
+                packageName,
+                PackageManager.PackageInfoFlags.of(PackageManager.GET_SIGNING_CERTIFICATES.toLong())
+            )
+        }
+    }
+
+/**
+ * Return the version code of the app which is defined in build.gradle.
+ * eg:100
+ */
+val Context.appVersionCode: Long
+    get() {
+        val packageInfo = this.packageInfo
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            packageInfo.longVersionCode
+        } else {
+            packageInfo.versionCode.toLong()
+        }
+    }
+
+/**
+ * Return the version name of the app which is defined in build.gradle.
+ * eg:1.0.0
+ */
+val Context.appVersionName: String get() = packageInfo.versionName
+
+val Context.appSignature: String
+    get() {
+        val packageInfo = this.packageInfo
+        var sign: Signature? = null
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            val signatures: Array<out Signature>? = packageInfo.signatures
+            if (signatures != null) {
+                sign = signatures[0]
+            }
+        } else {
+            val signingInfo: SigningInfo? = packageInfo.signingInfo
+            if (signingInfo != null) {
+                sign = signingInfo.apkContentsSigners[0]
+            }
+        }
+        if (sign == null) {
+            return ""
+        }
+        return hashSignature(sign)
+    }
+
+private fun hashSignature(signature: Signature): String {
+    return try {
+        val md = MessageDigest.getInstance("MD5")
+        md.update(signature.toByteArray())
+        val digest = md.digest()
+        digest.let { it -> it.joinToString("") { "%02x".format(it) } }
+    } catch (e: Exception) {
+        Log.e(TAG, "Error hashing signature", e)
+        ""
+    }
+}

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
@@ -30,35 +31,16 @@ class InfoFragment : Fragment() {
     fun show(tvViewModel: TVViewModel) {
         binding.textView.text = tvViewModel.title.value
 
-        when (tvViewModel.title.value) {
-            "CCTV8K 超高清" -> Glide.with(this)
-                .load(R.drawable.cctv8k)
-                .into(binding.infoLogo)
+        Glide.with(this)
+            .load(tvViewModel.logo.value)
+            .into(binding.infoLogo)
 
-            "天津卫视" -> Glide.with(this)
-                .load(R.drawable.tianjin)
-                .into(binding.infoLogo)
-
-            "新疆卫视" -> Glide.with(this)
-                .load(R.drawable.xinjiang)
-                .into(binding.infoLogo)
-
-            "兵团卫视" -> Glide.with(this)
-                .load(R.drawable.bingtuan)
-                .into(binding.infoLogo)
-
-            "CETV1" -> Glide.with(this)
-                .load(R.drawable.cetv1)
-                .into(binding.infoLogo)
-
-            else -> Glide.with(this)
-                .load(tvViewModel.logo.value)
-                .into(binding.infoLogo)
-        }
-
-        val program = tvViewModel.getProgramOne()
-        if (program != null) {
-            binding.infoDesc.text = program.name
+        Log.i(TAG, "${tvViewModel.title.value} ${tvViewModel.epg.value}")
+        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+        if (!epg.isNullOrEmpty()) {
+            binding.infoDesc.text = epg.last().title
+        } else {
+            binding.infoDesc.text = ""
         }
 
         handler.removeCallbacks(removeRunnable)

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

@@ -1,10 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
-import android.content.pm.Signature
-import android.content.pm.SigningInfo
-import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -22,17 +17,16 @@ import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
-import java.security.MessageDigest
 
 
 class MainActivity : FragmentActivity(), Request.RequestListener {
 
     private var ready = 0
-    private var playerFragment = PlayerFragment()
-    private var mainFragment = MainFragment()
-    private var infoFragment = InfoFragment()
-    private var channelFragment = ChannelFragment()
-    private lateinit var settingFragment: SettingFragment
+    private val playerFragment = PlayerFragment()
+    private val mainFragment = MainFragment()
+    private val infoFragment = InfoFragment()
+    private val channelFragment = ChannelFragment()
+    private val settingFragment = SettingFragment()
 
     private var doubleBackToExitPressedOnce = false
 
@@ -42,16 +36,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private val delayHideMain: Long = 10000
     private val delayHideSetting: Long = 10000
 
-//    init {
-//        lifecycleScope.launch(Dispatchers.IO) {
-//            val utilsJob = async(start = CoroutineStart.LAZY) { Utils.init() }
-//
-//            utilsJob.start()
-//
-//            utilsJob.await()
-//        }
-//    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
@@ -74,20 +58,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
                 .commit()
         }
         gestureDetector = GestureDetector(this, GestureListener())
-        val packageInfo = getPackageInfo()
-        val versionName = packageInfo.versionName
-        val versionCode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            packageInfo.longVersionCode
-        } else {
-            packageInfo.versionCode.toLong()
-        }
-        settingFragment = SettingFragment(
-            versionName,
-            versionCode,
-            SP.channelReversal,
-            SP.channelNum,
-            SP.bootStartup
-        )
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -446,56 +416,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         return super.onKeyDown(keyCode, event)
     }
 
-    private fun getPackageInfo(): PackageInfo {
-        val flag = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            PackageManager.GET_SIGNATURES
-        } else {
-            PackageManager.GET_SIGNING_CERTIFICATES
-        }
-
-        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            packageManager.getPackageInfo(packageName, flag)
-        } else {
-            packageManager.getPackageInfo(
-                packageName,
-                PackageManager.PackageInfoFlags.of(PackageManager.GET_SIGNING_CERTIFICATES.toLong())
-            )
-        }
-    }
-
-    private fun getAppSignature(): String {
-        val packageInfo = getPackageInfo()
-
-        var sign: Signature? = null
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-            val signatures: Array<out Signature>? = packageInfo.signatures
-            if (signatures != null) {
-                sign = signatures[0]
-            }
-        } else {
-            val signingInfo: SigningInfo? = packageInfo.signingInfo
-            if (signingInfo != null) {
-                sign = signingInfo.apkContentsSigners[0]
-            }
-        }
-        if (sign == null) {
-            return ""
-        }
-
-        return hashSignature(sign)
-    }
-
-    private fun hashSignature(signature: Signature): String {
-        return try {
-            val md = MessageDigest.getInstance("MD5")
-            md.update(signature.toByteArray())
-            val digest = md.digest()
-            digest.let { it -> it.joinToString("") { "%02x".format(it) } }
-        } catch (e: Exception) {
-            Log.e(TAG, "Error hashing signature", e)
-            ""
-        }
-    }
+    private fun getAppSignature() = this.appSignature
 
     override fun onStart() {
         Log.i(TAG, "onStart")
@@ -528,5 +449,4 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private companion object {
         const val TAG = "MainActivity"
     }
-
 }

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

@@ -34,9 +34,6 @@ class MainFragment : BrowseSupportFragment() {
 
     private var lastVideoUrl = ""
 
-    private val handler = Handler(Looper.getMainLooper())
-    private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
-
     override fun onCreate(savedInstanceState: Bundle?) {
         Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
@@ -57,9 +54,6 @@ class MainFragment : BrowseSupportFragment() {
 
         setupEventListeners()
 
-        mUpdateProgramRunnable = UpdateProgramRunnable()
-        handler.post(mUpdateProgramRunnable)
-
         tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
             tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
                 if (tvViewModel.errInfo.value != null
@@ -141,6 +135,8 @@ class MainFragment : BrowseSupportFragment() {
                 tvViewModel.setItemPosition(idx2)
                 tvListViewModel.addTVViewModel(tvViewModel)
                 listRowAdapter.add(tvViewModel)
+
+                updateEPG(tvViewModel)
             }
             tvListViewModel.maxNum.add(v.size)
             val header = HeaderItem(idx, k)
@@ -277,30 +273,11 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
-    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 && it.programId.value != "" }
-                ?.forEach { tvViewModel ->
-                    updateProgram(
-                        tvViewModel
-                    )
-                }
-            handler.postDelayed(this, 60000)
+    private fun updateEPG(tvViewModel: TVViewModel) {
+        if (tvViewModel.getTV().channel == "港澳台") {
+            Request.fetchFEPG(tvViewModel)
+        } else {
+            Request.fetchYEPG(tvViewModel)
         }
     }
 
@@ -313,18 +290,16 @@ class MainFragment : BrowseSupportFragment() {
         Log.i(TAG, "onStop")
         super.onStop()
         SP.itemPosition = itemPosition
-        Log.i(TAG, "position saved")
+        Log.i(TAG, "$POSITION $itemPosition saved")
     }
 
     override fun onDestroy() {
         Log.i(TAG, "onDestroy")
         super.onDestroy()
-        if (::mUpdateProgramRunnable.isInitialized) {
-            handler.removeCallbacks(mUpdateProgramRunnable)
-        }
     }
 
     companion object {
         private const val TAG = "MainFragment"
+        private const val POSITION = "position"
     }
 }

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

@@ -10,6 +10,7 @@ import com.lizongying.mytv.api.Auth
 import com.lizongying.mytv.api.AuthRequest
 import com.lizongying.mytv.api.FAuth
 import com.lizongying.mytv.api.FAuthService
+import com.lizongying.mytv.api.FEPG
 import com.lizongying.mytv.api.Info
 import com.lizongying.mytv.api.InfoV2
 import com.lizongying.mytv.api.LiveInfo
@@ -55,6 +56,9 @@ object Request {
 
     private var listener: RequestListener? = null
 
+    private var initRetryTimes = 0
+    private var initRetryMaxTimes = 1
+
     fun onCreate() {
         Log.i(TAG, "onCreate")
         fetchInfoV2()
@@ -65,11 +69,22 @@ object Request {
         handler.removeCallbacks(tokenRunnable)
     }
 
-    var call: Call<LiveInfo>? = null
+    private var call: Call<LiveInfo>? = null
     private var callAuth: Call<Auth>? = null
+    private var callInfo: Call<Info>? = null
+    private var fAuth: Call<FAuth>? = null
+    private var callPage: Call<pageModel.Response>? = null
+
+    private fun cancelCall() {
+        call?.cancel()
+        callAuth?.cancel()
+        callInfo?.cancel()
+        fAuth?.cancel()
+        callPage?.cancel()
+    }
 
     private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
-        callAuth?.cancel()
+        cancelCall()
 
         val title = tvModel.title.value
 
@@ -145,8 +160,9 @@ object Request {
         })
     }
 
-    fun fetchVideo(tvModel: TVViewModel, cookie: String) {
-        call?.cancel()
+    private fun fetchVideo(tvModel: TVViewModel, cookie: String) {
+        cancelCall()
+
         if (::btraceRunnable.isInitialized) {
             handler.removeCallbacks(btraceRunnable)
         }
@@ -282,37 +298,23 @@ object Request {
         })
     }
 
-    fun fetchAuth(tvModel: TVViewModel) {
+    private fun fetchAuth(tvModel: TVViewModel) {
+        cancelCall()
         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 =
-                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                            fetchAuth(tvModel, cookie)
-                        } else {
-                            Log.e(TAG, "info status error")
-                            if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                                tvModel.tokenRetryTimes++
-                                fetchAuth(tvModel)
-                            } else {
-                                if (!tvModel.getTV().mustToken) {
-                                    val cookie =
-                                        "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
-                                    fetchAuth(tvModel, cookie)
-                                }
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call<Info>, t: Throwable) {
-                        Log.e(TAG, "info request error $t")
+            callInfo = yspTokenService.getInfo("")
+            callInfo?.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 =
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                        fetchAuth(tvModel, cookie)
+                    } else {
+                        Log.e(TAG, "info status error")
                         if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
                             tvModel.tokenRetryTimes++
-                            fetchVideo(tvModel)
+                            fetchAuth(tvModel)
                         } else {
                             if (!tvModel.getTV().mustToken) {
                                 val cookie =
@@ -321,7 +323,22 @@ object Request {
                             }
                         }
                     }
-                })
+                }
+
+                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.getTV().mustToken) {
+                            val cookie =
+                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
+                            fetchAuth(tvModel, cookie)
+                        }
+                    }
+                }
+            })
         } else {
             val cookie =
                 "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
@@ -329,35 +346,21 @@ object Request {
         }
     }
 
-    fun fetchVideo(tvModel: TVViewModel) {
+    private fun fetchVideo(tvModel: TVViewModel) {
+        cancelCall()
         Log.d(TAG, "fetchVideo")
         if (token == "") {
-            yspTokenService.getInfo("")
-                .enqueue(object : Callback<Info> {
-                    override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                        if (response.isSuccessful && response.body()?.data?.token != null) {
-                            token = response.body()?.data?.token!!
-                            Log.i(TAG, "info success $token")
-                            val cookie =
-                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; 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.getTV().mustToken) {
-                                    val cookie =
-                                        "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
-                                    fetchVideo(tvModel, cookie)
-                                }
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call<Info>, t: Throwable) {
-                        Log.e(TAG, "info request error $t")
+            callInfo = yspTokenService.getInfo("")
+            callInfo?.enqueue(object : Callback<Info> {
+                override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                    if (response.isSuccessful && response.body()?.data?.token != null) {
+                        token = response.body()?.data?.token!!
+                        Log.i(TAG, "info success $token")
+                        val cookie =
+                            "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; 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)
@@ -369,7 +372,22 @@ object Request {
                             }
                         }
                     }
-                })
+                }
+
+                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.getTV().mustToken) {
+                            val cookie =
+                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
+                            fetchVideo(tvModel, cookie)
+                        }
+                    }
+                }
+            })
         } else {
             val cookie =
                 "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
@@ -377,11 +395,8 @@ object Request {
         }
     }
 
-    private var fAuth: Call<FAuth>? = null
-    fun fetchFAuth(tvModel: TVViewModel) {
-        call?.cancel()
-        callAuth?.cancel()
-        fAuth?.cancel()
+    private fun fetchFAuth(tvModel: TVViewModel) {
+        cancelCall()
 
         val title = tvModel.title.value
 
@@ -398,11 +413,11 @@ object Request {
 //                    Log.d(TAG, "$title url $url")
                     tvModel.addVideoUrl(url)
                     tvModel.allReady()
-                    tvModel.retryTimes = 0
+                    tvModel.tokenFHRetryTimes = 0
                 } else {
-                    Log.e(TAG, "auth status error")
-                    if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                        tvModel.tokenRetryTimes++
+                    Log.e(TAG, "auth status error ${response.code()}")
+                    if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
+                        tvModel.tokenFHRetryTimes++
                         fetchFAuth(tvModel)
                     }
                 }
@@ -410,8 +425,8 @@ object Request {
 
             override fun onFailure(call: Call<FAuth>, t: Throwable) {
                 Log.e(TAG, "auth request error $t")
-                if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                    tvModel.tokenRetryTimes++
+                if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
+                    tvModel.tokenFHRetryTimes++
                     fetchFAuth(tvModel)
                 }
             }
@@ -419,7 +434,6 @@ object Request {
     }
 
     fun fetchData(tvModel: TVViewModel) {
-        Log.d(TAG, "fetchData")
         if (tvModel.getTV().channel == "港澳台") {
             fetchFAuth(tvModel)
             return
@@ -444,7 +458,7 @@ object Request {
 
     class TokenRunnable : Runnable {
         override fun run() {
-            fetchToken()
+//            fetchToken()
         }
     }
 
@@ -463,20 +477,20 @@ object Request {
                             if (e != null) {
                                 handler.postDelayed(
                                     tokenRunnable,
-                                    max(600000, (e - 1500) * 1000).toLong()
+                                    max(30 * 60 * 1000, (e - 1500) * 1000).toLong()
                                 )
                             } else {
                                 Log.e(TAG, "e empty")
                                 handler.postDelayed(
                                     tokenRunnable,
-                                    600000
+                                    30 * 60 * 1000
                                 )
                             }
                         } else {
                             Log.e(TAG, "token empty")
                             handler.postDelayed(
                                 tokenRunnable,
-                                600000
+                                30 * 60 * 1000
                             )
                         }
                         if (!f.isNullOrEmpty()) {
@@ -487,23 +501,35 @@ object Request {
                             Utils.setBetween(c * 1000L)
                             Log.i(TAG, "current time $c")
                         }
+                        listener?.onRequestFinished()
                     } else {
                         Log.e(TAG, "token status error")
                         handler.postDelayed(
                             tokenRunnable,
-                            600000
+                            30 * 60 * 1000
                         )
+                        if (initRetryTimes < initRetryMaxTimes) {
+                            initRetryTimes++
+                            fetchInfoV2()
+                        } else {
+                            listener?.onRequestFinished()
+                        }
                     }
-                    listener?.onRequestFinished()
                 }
 
                 override fun onFailure(call: Call<InfoV2>, t: Throwable) {
                     Log.e(TAG, "token request error $t")
                     handler.postDelayed(
                         tokenRunnable,
-                        600000
+                        30 * 60 * 1000
                     )
-                    listener?.onRequestFinished()
+
+                    if (initRetryTimes < initRetryMaxTimes) {
+                        initRetryTimes++
+                        fetchInfoV2()
+                    } else {
+                        listener?.onRequestFinished()
+                    }
                 }
             })
     }
@@ -521,27 +547,27 @@ object Request {
                             if (e != null) {
                                 handler.postDelayed(
                                     tokenRunnable,
-                                    max(600000, (e - 1500) * 1000).toLong()
+                                    max(30 * 60 * 1000, (e - 1500) * 1000).toLong()
                                 )
                             } else {
                                 Log.e(TAG, "e empty")
                                 handler.postDelayed(
                                     tokenRunnable,
-                                    600000
+                                    30 * 60 * 1000
                                 )
                             }
                         } else {
                             Log.e(TAG, "token empty")
                             handler.postDelayed(
                                 tokenRunnable,
-                                600000
+                                30 * 60 * 1000
                             )
                         }
                     } else {
                         Log.e(TAG, "token status error")
                         handler.postDelayed(
                             tokenRunnable,
-                            600000
+                            30 * 60 * 1000
                         )
                     }
                 }
@@ -550,7 +576,7 @@ object Request {
                     Log.e(TAG, "token request error $t")
                     handler.postDelayed(
                         tokenRunnable,
-                        600000
+                        30 * 60 * 1000
                     )
                 }
             })
@@ -599,7 +625,8 @@ object Request {
     }
 
     fun fetchPage() {
-        yspProtoService.getPage().enqueue(object : Callback<pageModel.Response> {
+        callPage = yspProtoService.getPage()
+        callPage?.enqueue(object : Callback<pageModel.Response> {
             override fun onResponse(
                 call: Call<pageModel.Response>,
                 response: Response<pageModel.Response>
@@ -632,7 +659,7 @@ object Request {
         })
     }
 
-    fun fetchProgram(tvViewModel: TVViewModel) {
+    fun fetchYEPG(tvViewModel: TVViewModel) {
         val title = tvViewModel.title.value
         yspProtoService.getProgram(tvViewModel.programId.value!!, getDateFormat("yyyyMMdd"))
             .enqueue(object : Callback<epgProgramModel.Response> {
@@ -643,7 +670,7 @@ object Request {
                     if (response.isSuccessful) {
                         val program = response.body()
                         if (program != null) {
-                            tvViewModel.addProgram(program.dataListList)
+                            tvViewModel.addYEPG(program.dataListList)
                             Log.d(TAG, "$title program ${program.dataListList.size}")
                         }
                     } else {
@@ -657,6 +684,31 @@ object Request {
             })
     }
 
+    fun fetchFEPG(tvViewModel: TVViewModel) {
+        val title = tvViewModel.title.value
+        fAuthService.getEPG(tvViewModel.pid.value!!, getDateFormat("yyyyMMdd"))
+            .enqueue(object : Callback<List<FEPG>> {
+                override fun onResponse(
+                    call: Call<List<FEPG>>,
+                    response: Response<List<FEPG>>
+                ) {
+                    if (response.isSuccessful) {
+                        val program = response.body()
+                        if (program != null) {
+                            tvViewModel.addFEPG(program)
+                            Log.d(TAG, "$title program ${program.size}")
+                        }
+                    } else {
+                        Log.w(TAG, "$title program error")
+                    }
+                }
+
+                override fun onFailure(call: Call<List<FEPG>>, t: Throwable) {
+                    Log.e(TAG, "$title program request failed $t")
+                }
+            })
+    }
+
     private fun encryptTripleDES(key: ByteArray, iv: ByteArray): String {
         return try {
             val keySpec = SecretKeySpec(key, "DESede")

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

@@ -8,14 +8,7 @@ import androidx.fragment.app.DialogFragment
 import com.lizongying.mytv.databinding.DialogBinding
 
 
-class SettingFragment(
-    private val versionName: String,
-    private val versionCode: Long,
-    private val channelReversal: Boolean,
-    private val channelNum: Boolean,
-    private val bootStartup: Boolean,
-) :
-    DialogFragment() {
+class SettingFragment : DialogFragment() {
 
     private var _binding: DialogBinding? = null
     private val binding get() = _binding!!
@@ -32,33 +25,37 @@ class SettingFragment(
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        val context = requireContext() // It‘s safe to get context here.
         _binding = DialogBinding.inflate(inflater, container, false)
-        _binding?.version?.text =
-            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+        binding.version.text =
+            "当前版本: ${context.appVersionName}\n获取最新: https://github.com/lizongying/my-tv/releases/"
 
-        val switchChannelReversal = _binding?.switchChannelReversal
-        switchChannelReversal?.isChecked = channelReversal
-        switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
-            SP.channelReversal = isChecked
-            (activity as MainActivity).settingActive()
+        binding.switchChannelReversal.run {
+            isChecked = SP.channelReversal
+            setOnCheckedChangeListener { _, isChecked ->
+                SP.channelReversal = isChecked
+                (activity as MainActivity).settingActive()
+            }
         }
 
-        val switchChannelNum = _binding?.switchChannelNum
-        switchChannelNum?.isChecked = channelNum
-        switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
-            SP.channelNum = isChecked
-            (activity as MainActivity).settingActive()
+        binding.switchChannelNum.run {
+            isChecked = SP.channelNum
+            setOnCheckedChangeListener { _, isChecked ->
+                SP.channelNum = isChecked
+                (activity as MainActivity).settingActive()
+            }
         }
 
-        val switchBootStartup = _binding?.switchBootStartup
-        switchBootStartup?.isChecked = bootStartup
-        switchBootStartup?.setOnCheckedChangeListener { _, isChecked ->
-            SP.bootStartup = isChecked
-            (activity as MainActivity).settingActive()
+        binding.switchBootStartup.run {
+            isChecked = SP.bootStartup
+            setOnCheckedChangeListener { _, isChecked ->
+                SP.bootStartup = isChecked
+                (activity as MainActivity).settingActive()
+            }
         }
 
-        updateManager = UpdateManager(context, this, versionCode)
-        _binding?.checkVersion?.setOnClickListener(OnClickListenerCheckVersion(updateManager))
+        updateManager = UpdateManager(context, this, context.appVersionCode)
+        binding.checkVersion.setOnClickListener(OnClickListenerCheckVersion(updateManager))
 
         return binding.root
     }

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

@@ -9,7 +9,7 @@ data class TV(
     var videoUrl: List<String>,
     var videoIndex: Int = 0,
     var channel: String = "",
-    var logo: String = "",
+    var logo: Any = "",
     var pid: String = "",
     var sid: String = "",
     var programId: String = "",

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

@@ -23,7 +23,7 @@ import java.io.File
 
 
 class UpdateManager(
-    private var context: Context?,
+    private var context: Context,
     private var settingFragment: SettingFragment,
     private var versionCode: Long
 ) :
@@ -67,7 +67,7 @@ class UpdateManager(
         val apkFileName = "my-tv-${release.data.versionName}.apk"
         Log.i(TAG, "apkFileName $apkFileName")
         val downloadManager =
-            context!!.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+            context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
         val request = Request(Uri.parse(release.data.downloadUrl))
         Log.i(TAG, "url ${Uri.parse(release.data.downloadUrl)}")
         request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, apkFileName)
@@ -77,22 +77,22 @@ class UpdateManager(
         // 获取下载任务的引用
         val downloadReference = downloadManager.enqueue(request)
 
-        downloadReceiver = DownloadReceiver(context!!, apkFileName, downloadReference)
+        downloadReceiver = DownloadReceiver(context, apkFileName, downloadReference)
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            context!!.registerReceiver(
+            context.registerReceiver(
                 downloadReceiver,
                 IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE),
                 Context.RECEIVER_NOT_EXPORTED,
             )
         } else {
-            context!!.registerReceiver(
+            context.registerReceiver(
                 downloadReceiver,
                 IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
             )
         }
 
-        getDownloadProgress(context!!, downloadReference) { progress ->
+        getDownloadProgress(context, downloadReference) { progress ->
             println("Download progress: $progress%")
         }
     }
@@ -182,7 +182,7 @@ class UpdateManager(
 
     fun destroy() {
         if (downloadReceiver != null) {
-            context!!.unregisterReceiver(downloadReceiver)
+            context.unregisterReceiver(downloadReceiver)
             Log.i(TAG, "destroy downloadReceiver")
         }
     }

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

@@ -3,6 +3,7 @@ package com.lizongying.mytv.api
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Header
+import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface FAuthService {
@@ -12,4 +13,11 @@ interface FAuthService {
         @Query("live_id") live_id: String = "",
         @Query("live_qa") live_qa: String = "",
     ): Call<FAuth>
+
+    @GET("api/v3/live/{liveId}/resources")
+    fun getEPG(
+        @Path("liveId") liveId: String,
+        @Query("date") date: String,
+        @Query("dir") dir: String = "asc"
+    ): Call<List<FEPG>>
 }

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

@@ -0,0 +1,7 @@
+package com.lizongying.mytv.api
+
+
+data class FEPG(
+    val title: String,
+    val event_time: String,
+)

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

@@ -0,0 +1,7 @@
+package com.lizongying.mytv.models
+
+
+data class EPG(
+    val title: String,
+    val beginTime: Int,
+)

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

@@ -11,8 +11,10 @@ import androidx.media3.common.util.UnstableApi
 import androidx.media3.datasource.DefaultHttpDataSource
 import androidx.media3.exoplayer.hls.HlsMediaSource
 import com.lizongying.mytv.TV
-import com.lizongying.mytv.Utils.getDateTimestamp
+import com.lizongying.mytv.api.FEPG
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.programModel.Program
+import java.text.SimpleDateFormat
+import java.util.TimeZone
 
 class TVViewModel(private var tv: TV) : ViewModel() {
 
@@ -20,10 +22,11 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     private var itemPosition: Int = 0
 
     var retryTimes = 0
-    var tokenRetryTimes = 0
     var retryMaxTimes = 8
-    var tokenRetryMaxTimes = 2
-    var programUpdateTime: Long = 0
+    var tokenRetryTimes = 0
+    var tokenRetryMaxTimes = 0
+    var tokenFHRetryTimes = 0
+    var tokenFHRetryMaxTimes = 2
 
     private val _errInfo = MutableLiveData<String>()
     val errInfo: LiveData<String>
@@ -33,9 +36,9 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val programId: LiveData<String>
         get() = _programId
 
-    private var _program = MutableLiveData<MutableList<Program>>()
-    val program: LiveData<MutableList<Program>>
-        get() = _program
+    private var _epg = MutableLiveData<MutableList<EPG>>()
+    val epg: LiveData<MutableList<EPG>>
+        get() = _epg
 
     private val _id = MutableLiveData<Int>()
     val id: LiveData<Int>
@@ -53,8 +56,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val videoIndex: LiveData<Int>
         get() = _videoIndex
 
-    private val _logo = MutableLiveData<String>()
-    val logo: LiveData<String>
+    private val _logo = MutableLiveData<Any>()
+    val logo: LiveData<Any>
         get() = _logo
 
     private val _pid = MutableLiveData<String>()
@@ -73,11 +76,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val ready: LiveData<Boolean>
         get() = _ready
 
-    private var mMinimumLoadableRetryCount = 5
-
     var seq = 0
 
-
     fun addVideoUrl(url: String) {
         if (_videoUrl.value?.isNotEmpty() == true) {
             if (_videoUrl.value!!.last().contains("cctv.cn")) {
@@ -114,10 +114,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _videoIndex.value = videoIndex
     }
 
-    fun setLogo(url: String) {
-        _logo.value = url
-    }
-
     init {
         _id.value = tv.id
         _title.value = tv.title
@@ -127,10 +123,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _programId.value = tv.programId
         _pid.value = tv.pid
         _sid.value = tv.sid
-        _program.value = mutableListOf()
     }
 
-
     fun getRowPosition(): Int {
         return rowPosition
     }
@@ -159,37 +153,23 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         return tv
     }
 
-    fun getProgramOne(): Program? {
-        val programNew =
-            (_program.value?.filter { it.et > getDateTimestamp() })?.toMutableList()
-        if (programNew != null && _program.value != programNew) {
-            _program.value = programNew
-        }
-        if (_program.value!!.isEmpty()) {
-            return null
-        }
-        return _program.value?.first()
+    fun addYEPG(p: MutableList<Program>) {
+        _epg.value = p.map { EPG(it.name, it.st.toInt()) }.toMutableList()
     }
 
-    fun addProgram(p: MutableList<Program>) {
-        val timestamp = getDateTimestamp()
-
-        // after now & not empty & different
-        val p1 = (p.filter { it.et > timestamp }).toMutableList()
-        if (p1.isEmpty() || _program.value == p1) {
-            return
-        }
-
-        if (_program.value!!.isEmpty()) {
-            _program.value = p1
-        } else {
-            _program.value =
-                ((_program.value?.filter { it.et > timestamp && it.st < p1.first().st })?.plus(
-                    p1
-                ))?.toMutableList()
+    private fun formatFTime(s: String): Int {
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss")
+        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
+        val date = dateFormat.parse(s.substring(0, 19))
+        if (date != null) {
+            return (date.time / 1000).toInt()
         }
+        return 0
     }
 
+    fun addFEPG(p: List<FEPG>) {
+        _epg.value = p.map { EPG(it.title, formatFTime(it.event_time)) }.toMutableList()
+    }
 
     private var mHeaders: Map<String, String>? = mapOf()
 
@@ -197,10 +177,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         mHeaders = headers
     }
 
-    fun setMinimumLoadableRetryCount(minimumLoadableRetryCount: Int) {
-        mMinimumLoadableRetryCount = minimumLoadableRetryCount
-    }
-
     /**
      * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
      */

app/src/main/res/raw/channels.json

@@ -130,7 +130,7 @@
     "programId": "600004078",
     "needToken": true,
     "mustToken": false,
-    "title": "CCTV9 记录",
+    "title": "CCTV9 纪录",
     "videoUrl": [
       "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226197/index.m3u8"
     ]