phoenix epg

README.md

@@ -14,12 +14,26 @@
 
 ## 更新日志
 
+### v1.6.6（通用）
+
+* 更新重庆卫视图标
+* 凤凰卫视增强画质
+* 凤凰卫视增加EPG
+
 ### v1.6.4（通用）
 
 * 增加CETV1
 * 增加凤凰卫视
 * 默认关闭开机启动
 
+### v1.6.3（安卓5及以上专用）
+
+* 增加CETV1
+* 凤凰卫视增强画质
+* 默认关闭开机启动
+* 延迟菜单自动关闭时间
+* 解决一些可能导致首次打开时黑屏的问题
+
 ### v1.6.2（通用）
 
 * 修复按键无效的问题
@@ -211,11 +225,11 @@ adb install my-tv.apk
 * 地方频道
 * 收藏夹
 * 自定义源
-* 凤凰卫视、凤凰资讯台
 * 海外
 * 1.5.0 无法安装，1.5.1 可以安装
 * 节目增加预告
 * 频道列表优化
+* epg更新后菜单更新
 
 ## 赞赏
 

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

@@ -88,46 +88,19 @@ class CardAdapter(
 
         cardView.titleText = tvViewModel.title.value
 
-        when (tvViewModel.title.value) {
+        Glide.with(viewHolder.view.context)
-            "CCTV8K 超高清" -> Glide.with(viewHolder.view.context)
+            .load(tvViewModel.logo.value)
-                .load(R.drawable.cctv8k)
+            .centerInside()
-                .centerInside()
+            .into(cardView.mainImageView)
-                .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)
-
-            "CETV1" -> Glide.with(viewHolder.view.context)
-                .load(R.drawable.cetv1)
-                .centerInside()
-                .into(cardView.mainImageView)
-
-            else -> Glide.with(viewHolder.view.context)
-                .load(tvViewModel.logo.value)
-                .centerInside()
-                .into(cardView.mainImageView)
-        }
 
         cardView.mainImageView.setBackgroundColor(Color.WHITE)
         cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
 
-        tvViewModel.program.observe(owner) { _ ->
+        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
-            val program = tvViewModel.getProgramOne()
+        if (!epg.isNullOrEmpty()) {
-            if (program != null) {
+            cardView.contentText = epg.last().title
-                cardView.contentText = program.name
+        } else {
-            }
+            cardView.contentText = ""
         }
     }
 

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) {
+        Glide.with(this)
-            "CCTV8K 超高清" -> Glide.with(this)
+            .load(tvViewModel.logo.value)
-                .load(R.drawable.cctv8k)
+            .into(binding.infoLogo)
-                .into(binding.infoLogo)
 
-            "天津卫视" -> Glide.with(this)
+        Log.i(TAG, "${tvViewModel.title.value} ${tvViewModel.epg.value}")
-                .load(R.drawable.tianjin)
+        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
-                .into(binding.infoLogo)
+        if (!epg.isNullOrEmpty()) {
-
+            binding.infoDesc.text = epg.last().title
-            "新疆卫视" -> Glide.with(this)
+        } else {
-                .load(R.drawable.xinjiang)
+            binding.infoDesc.text = ""
-                .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
         }
 
         handler.removeCallbacks(removeRunnable)

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

@@ -25,7 +25,7 @@ import kotlinx.coroutines.launch
 import java.security.MessageDigest
 
 
-class MainActivity : FragmentActivity() {
+class MainActivity : FragmentActivity(), Request.RequestListener {
 
     private var ready = 0
     private var playerFragment = PlayerFragment()
@@ -39,24 +39,17 @@ class MainActivity : FragmentActivity() {
     private lateinit var gestureDetector: GestureDetector
 
     private val handler = Handler()
-    private val delayHideMain: Long = 5000
+    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)
         setContentView(R.layout.activity_main)
 
+        Request.onCreate()
+        Request.setRequestListener(this)
+
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
         window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
@@ -78,7 +71,13 @@ class MainActivity : FragmentActivity() {
         } else {
             packageInfo.versionCode.toLong()
         }
-        settingFragment = SettingFragment(versionName, versionCode, SP.channelReversal, SP.channelNum, SP.bootStartup)
+        settingFragment = SettingFragment(
+            versionName,
+            versionCode,
+            SP.channelReversal,
+            SP.channelNum,
+            SP.bootStartup
+        )
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -172,7 +171,7 @@ class MainActivity : FragmentActivity() {
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 4) {
+        if (ready == 5) {
             mainFragment.fragmentReady()
         }
     }
@@ -519,6 +518,15 @@ class MainActivity : FragmentActivity() {
         handler.removeCallbacks(hideMain)
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        Request.onDestroy()
+    }
+
+    override fun onRequestFinished() {
+        fragmentReady()
+    }
+
     private companion object {
         const val TAG = "MainActivity"
     }

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

@@ -1,8 +1,6 @@
 package com.lizongying.mytv
 
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.util.Log
 import android.view.KeyEvent
 import android.view.LayoutInflater
@@ -14,7 +12,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.lizongying.mytv.Utils.dpToPx
-import com.lizongying.mytv.Utils.getDateTimestamp
+import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.databinding.RowBinding
 import com.lizongying.mytv.databinding.ShowBinding
 import com.lizongying.mytv.models.TVListViewModel
@@ -32,15 +30,10 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     private var _binding: ShowBinding? = null
     private val binding get() = _binding!!
 
-    private var request = Request()
-
     var tvListViewModel = TVListViewModel()
 
     private var lastVideoUrl = ""
 
-    private val handler = Handler(Looper.getMainLooper())
-    private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -52,7 +45,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        activity?.let { request.initYSP(it) }
+        activity?.let { YSP.init(it) }
 
         itemPosition = SP.itemPosition
 
@@ -71,6 +64,8 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                     tvViewModel.setItemPosition(idx2)
                     tvListViewModelCurrent.addTVViewModel(tvViewModel)
                     tvListViewModel.addTVViewModel(tvViewModel)
+
+                    updateEPG(tvViewModel)
                 }
                 tvListViewModel.maxNum.add(v.size)
 
@@ -112,9 +107,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                 idx++
             }
 
-            mUpdateProgramRunnable = UpdateProgramRunnable()
-            handler.post(mUpdateProgramRunnable)
-
             if (itemPosition >= tvListViewModel.size()) {
                 itemPosition = 0
             }
@@ -155,7 +147,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                         if (tvViewModel.pid.value != "") {
                             Log.i(TAG, "request $title")
                             lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { request.fetchData(it) }
+                                tvViewModel.let { Request.fetchData(it) }
                             }
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
                             setPosition(
@@ -304,30 +296,11 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         }
     }
 
-    fun updateProgram(tvViewModel: TVViewModel) {
+    private fun updateEPG(tvViewModel: TVViewModel) {
-        val timestamp = getDateTimestamp()
+        if (tvViewModel.getTV().channel == "港澳台") {
-        if (timestamp - tvViewModel.programUpdateTime > 60) {
+            Request.fetchFEPG(tvViewModel)
-            if (tvViewModel.program.value!!.isEmpty()) {
+        } else {
-                tvViewModel.programUpdateTime = timestamp
+            Request.fetchYEPG(tvViewModel)
-                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)
         }
     }
 
@@ -346,9 +319,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     override fun onDestroy() {
         Log.i(TAG, "onDestroy")
         super.onDestroy()
-        if (::mUpdateProgramRunnable.isInitialized) {
-            handler.removeCallbacks(mUpdateProgramRunnable)
-        }
     }
 
     override fun onDestroyView() {

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

@@ -1,6 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
@@ -11,9 +10,12 @@ 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
 import com.lizongying.mytv.api.LiveInfoRequest
+import com.lizongying.mytv.api.Token
 import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.api.YSPApiService
 import com.lizongying.mytv.api.YSPBtraceService
@@ -28,20 +30,22 @@ import retrofit2.Response
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
+import kotlin.math.max
 
 
-class Request {
+object Request {
+    private const val TAG = "Request"
     private var yspTokenService: YSPTokenService = ApiClient().yspTokenService
     private var yspApiService: YSPApiService = ApiClient().yspApiService
     private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
     private var yspProtoService: YSPProtoService = ApiClient().yspProtoService
     private var fAuthService: FAuthService = ApiClient().fAuthService
-    private var ysp: YSP? = null
+
     private var token = ""
+    private var tokenFH = ""
 
     private var needAuth = false
 
-    // TODO onDestroy
     private val handler = Handler(Looper.getMainLooper())
     private lateinit var btraceRunnable: BtraceRunnable
     private var tokenRunnable: TokenRunnable = TokenRunnable()
@@ -50,12 +54,16 @@ class Request {
     private val input =
         """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()
 
-    init {
+    private var listener: RequestListener? = null
-        handler.post(tokenRunnable)
+
+    fun onCreate() {
+        Log.i(TAG, "onCreate")
+        fetchInfoV2()
     }
 
-    fun initYSP(context: Context) {
+    fun onDestroy() {
-        ysp = YSP(context)
+        Log.i(TAG, "onDestroy")
+        handler.removeCallbacks(tokenRunnable)
     }
 
     var call: Call<LiveInfo>? = null
@@ -66,9 +74,9 @@ class Request {
 
         val title = tvModel.title.value
 
-        val data = ysp?.getAuthData(tvModel)
+        val data = YSP.getAuthData(tvModel)
-        val request = data?.let { AuthRequest(it) }
+        val request = AuthRequest(data)
-        callAuth = request?.let { yspApiService.getAuth("guid=${ysp?.getGuid()}; $cookie", it) }
+        callAuth = request.let { yspApiService.getAuth("guid=${YSP.getGuid()}; $cookie", it) }
 
         callAuth?.enqueue(object : Callback<Auth> {
             override fun onResponse(call: Call<Auth>, response: Response<Auth>) {
@@ -77,7 +85,7 @@ class Request {
 
                     if (liveInfo?.data?.token != null) {
                         Log.i(TAG, "token ${liveInfo.data.token}")
-                        ysp?.token = liveInfo.data.token
+                        YSP.token = liveInfo.data.token
                         fetchVideo(tvModel, cookie)
                     } else {
                         Log.e(TAG, "$title token error")
@@ -147,12 +155,12 @@ class Request {
         val title = tvModel.title.value
 
         tvModel.seq = 0
-        val data = ysp?.switch(tvModel)
+        val data = YSP.switch(tvModel)
-        val request = data?.let { LiveInfoRequest(it) }
+        val request = LiveInfoRequest(data)
-        call = request?.let {
+        call = request.let {
             yspApiService.getLiveInfo(
-                "guid=${ysp?.getGuid()}; $cookie",
+                "guid=${YSP.getGuid()}; $cookie",
-                ysp!!.token,
+                YSP.token,
                 it
             )
         }
@@ -323,6 +331,7 @@ class Request {
     }
 
     fun fetchVideo(tvModel: TVViewModel) {
+        Log.d(TAG, "fetchVideo")
         if (token == "") {
             yspTokenService.getInfo("")
                 .enqueue(object : Callback<Info> {
@@ -377,7 +386,12 @@ class Request {
 
         val title = tvModel.title.value
 
-        fAuth = fAuthService.getAuth(tvModel.getTV().pid, "HD")
+        var qa = "HD"
+        if (tokenFH != "") {
+            qa = "FHD"
+        }
+
+        fAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
         fAuth?.enqueue(object : Callback<FAuth> {
             override fun onResponse(call: Call<FAuth>, response: Response<FAuth>) {
                 if (response.isSuccessful && response.body()?.data?.live_url != null) {
@@ -428,32 +442,122 @@ class Request {
         }
     }
 
-    inner class TokenRunnable : Runnable {
+    class TokenRunnable : Runnable {
         override fun run() {
             fetchToken()
             handler.postDelayed(this, 600000)
         }
     }
 
-    fun fetchToken() {
+    private fun fetchInfoV2() {
-        yspTokenService.getInfo(token)
+        yspTokenService.getInfoV2()
-            .enqueue(object : Callback<Info> {
+            .enqueue(object : Callback<InfoV2> {
-                override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                override fun onResponse(call: Call<InfoV2>, response: Response<InfoV2>) {
                     if (response.isSuccessful) {
-                        token = response.body()?.data?.token!!
+                        val t = response.body()?.t
-                        Log.i(TAG, "info success $token")
+                        val f = response.body()?.f
+                        val e = response.body()?.e
+                        val c = response.body()?.c
+                        if (!t.isNullOrEmpty()) {
+                            token = t
+                            Log.i(TAG, "token success $token")
+                            if (e != null) {
+                                handler.postDelayed(
+                                    tokenRunnable,
+                                    max(30 * 60 * 1000, (e - 1500) * 1000).toLong()
+                                )
+                            } else {
+                                Log.e(TAG, "e empty")
+                                handler.postDelayed(
+                                    tokenRunnable,
+                                    30 * 60 * 1000
+                                )
+                            }
+                        } else {
+                            Log.e(TAG, "token empty")
+                            handler.postDelayed(
+                                tokenRunnable,
+                                30 * 60 * 1000
+                            )
+                        }
+                        if (!f.isNullOrEmpty()) {
+                            tokenFH = f
+                            Log.i(TAG, "tokenFH success $tokenFH")
+                        }
+                        if (c != null) {
+                            Utils.setBetween(c * 1000L)
+                            Log.i(TAG, "current time $c")
+                        }
                     } else {
                         Log.e(TAG, "token status error")
+                        handler.postDelayed(
+                            tokenRunnable,
+                            30 * 60 * 1000
+                        )
                     }
+                    listener?.onRequestFinished()
                 }
 
-                override fun onFailure(call: Call<Info>, t: Throwable) {
+                override fun onFailure(call: Call<InfoV2>, t: Throwable) {
                     Log.e(TAG, "token request error $t")
+                    handler.postDelayed(
+                        tokenRunnable,
+                        30 * 60 * 1000
+                    )
+                    listener?.onRequestFinished()
                 }
             })
     }
 
-    inner class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
+    fun fetchToken() {
+        yspTokenService.getToken(token)
+            .enqueue(object : Callback<Token> {
+                override fun onResponse(call: Call<Token>, response: Response<Token>) {
+                    if (response.isSuccessful) {
+                        val t = response.body()?.t
+                        val e = response.body()?.e
+                        if (!t.isNullOrEmpty()) {
+                            token = t
+                            Log.e(TAG, "token success $token")
+                            if (e != null) {
+                                handler.postDelayed(
+                                    tokenRunnable,
+                                    max(30 * 60 * 1000, (e - 1500) * 1000).toLong()
+                                )
+                            } else {
+                                Log.e(TAG, "e empty")
+                                handler.postDelayed(
+                                    tokenRunnable,
+                                    30 * 60 * 1000
+                                )
+                            }
+                        } else {
+                            Log.e(TAG, "token empty")
+                            handler.postDelayed(
+                                tokenRunnable,
+                                30 * 60 * 1000
+                            )
+                        }
+                    } else {
+                        Log.e(TAG, "token status error")
+                        handler.postDelayed(
+                            tokenRunnable,
+                            30 * 60 * 1000
+                        )
+                    }
+                }
+
+                override fun onFailure(call: Call<Token>, t: Throwable) {
+                    Log.e(TAG, "token request error $t")
+                    handler.postDelayed(
+                        tokenRunnable,
+                        30 * 60 * 1000
+                    )
+                }
+            })
+    }
+
+    class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
         override fun run() {
             fetchBtrace(tvModel)
             handler.postDelayed(this, 60000)
@@ -463,11 +567,11 @@ class Request {
     fun fetchBtrace(tvModel: TVViewModel) {
         val title = tvModel.title.value
 
-        val guid = ysp?.getGuid()!!
+        val guid = YSP.getGuid()
         val pid = tvModel.pid.value!!
         val sid = tvModel.sid.value!!
         yspBtraceService.kvcollect(
-            c_timestamp = ysp?.generateGuid()!!,
+            c_timestamp = YSP.generateGuid(),
             guid = guid,
             c_guid = guid,
             prog = sid,
@@ -475,7 +579,7 @@ class Request {
             fpid = pid,
             livepid = pid,
             sUrl = "https://www.yangshipin.cn/#/tv/home?pid=$pid",
-            playno = ysp?.getRand()!!,
+            playno = YSP.getRand(),
             ftime = getDateFormat("yyyy-MM-dd HH:mm:ss"),
             seq = tvModel.seq.toString(),
         )
@@ -529,7 +633,7 @@ class 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> {
@@ -540,7 +644,7 @@ class 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 {
@@ -554,6 +658,31 @@ class 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")
@@ -567,7 +696,11 @@ class Request {
         }
     }
 
-    companion object {
+    interface RequestListener {
-        private const val TAG = "Request"
+        fun onRequestFinished()
+    }
+
+    fun setRequestListener(listener: RequestListener) {
+        this.listener = listener
     }
 }

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

@@ -1,6 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.Context
 import android.content.res.Resources
 import android.os.Build
 import android.util.TypedValue
@@ -8,7 +7,6 @@ import com.google.gson.Gson
 import com.lizongying.mytv.api.TimeResponse
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import java.io.File
 import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -28,6 +26,10 @@ object Utils {
         return (System.currentTimeMillis() - between) / 1000
     }
 
+    fun setBetween(currentTimeMillis: Long) {
+        between = System.currentTimeMillis() - currentTimeMillis
+    }
+
     suspend fun init() {
         var currentTimeMillis: Long = 0
         try {
@@ -76,49 +78,4 @@ object Utils {
     }
 
     fun isTmallDevice() = Build.MANUFACTURER.equals("Tmall", ignoreCase = true)
-
-    /**
-     * 获取可读写的目录
-     *
-     * @param context 应用环境信息
-     *
-     * @return 可读写的目录
-     *
-     */
-    fun getAppDirectory(context: Context): File {
-        return context.filesDir
-    }
-
-    /**
-     * 更新channels.json
-     *
-     * @param context 应用环境信息
-     *
-     * @return 无
-     *
-     * @throws IOException 网络请求失败
-     */
-    fun updateChannel(context: Context) {
-        val client = okhttp3.OkHttpClient()
-        val request = okhttp3.Request.Builder().url(getServerUrl(context)).build()
-        client.newCall(request).execute().use { response ->
-            if (!response.isSuccessful) throw IOException("Unexpected code $response")
-            val body = response.body()
-            //覆盖channels.json
-            val file = File(getAppDirectory(context), "channels.json")
-            if (!file.exists()) {
-                file.createNewFile()
-            }
-            file.writeText(body!!.string())
-        }
-    }
-
-    /**
-     * 从res/values/server.xml获取服务器地址
-     * @param context 应用环境信息
-     * @return 服务器地址
-     */
-    private fun getServerUrl(context: Context): String {
-        return context.resources.getString(R.string.server_url)
-    }
 }

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

@@ -2,12 +2,22 @@ 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 {
     @GET("api/v3/hub/live/auth-url")
     fun getAuth(
+        @Header("token") token: String,
         @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/api/Info.kt

@@ -10,6 +10,18 @@ data class Info(
     )
 }
 
+data class Token(
+    val e: Int?,
+    val t: String?,
+)
+
+data class InfoV2(
+    val f: String?,
+    val t: String?,
+    val e: Int?,
+    val c: Int?,
+)
+
 data class Release(
     val code: Int?,
     val msg: String?,

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

@@ -9,7 +9,9 @@ import com.lizongying.mytv.models.TVViewModel
 import kotlin.math.floor
 import kotlin.random.Random
 
-class YSP(var context: Context) {
+object YSP {
+    private const val TAG = "YSP"
+
     private var cnlid = ""
 
     private var livepid = ""
@@ -53,14 +55,10 @@ class YSP(var context: Context) {
     private var appid = "ysp_pc"
     var token = ""
 
-    private var encryptor: Encryptor? = null
+    private var encryptor = Encryptor()
-
-    init {
-        if (context is MainActivity) {
-            encryptor = Encryptor()
-            encryptor!!.init(context)
-        }
 
+    fun init(context: Context) {
+        encryptor.init(context)
         guid = getGuid()
     }
 
@@ -78,7 +76,7 @@ class YSP(var context: Context) {
         timeStr = getTimeStr()
 
         cKey =
-            encryptor!!.encrypt(cnlid, timeStr, appVer, guid, platform)
+            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"}"""
     }
@@ -134,18 +132,14 @@ class YSP(var context: Context) {
     private fun getSignature(): String {
         val e =
             "adjust=${adjust}&appVer=${appVer}&app_version=$appVersion&cKey=$cKey&channel=$channel&cmd=$cmd&cnlid=$cnlid&defn=${defn}&devid=${devid}&dtype=${dtype}&encryptVer=${encryptVer}&guid=${guid}&livepid=${livepid}&otype=${otype}&platform=${platform}&rand_str=${randStr}&sphttps=${sphttps}&stream=${stream}".toByteArray()
-        val hashedData = encryptor?.hash(e) ?: return ""
+        val hashedData = encryptor.hash(e) ?: return ""
         return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
     }
 
     private fun getAuthSignature(): String {
         val e =
             "appid=${appid}&guid=${guid}&pid=${livepid}&rand_str=${randStr}".toByteArray()
-        val hashedData = encryptor?.hash2(e) ?: return ""
+        val hashedData = encryptor.hash2(e) ?: return ""
         return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
     }
-
-    companion object {
-        private const val TAG = "YSP"
-    }
 }

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

@@ -10,4 +10,13 @@ interface YSPTokenService {
     fun getInfo(
         @Query("token") token: String = "",
     ): Call<Info>
+
+    @GET("my-tv/v2/token")
+    fun getToken(
+        @Query("token") token: String = "",
+    ): Call<Token>
+
+    @GET("my-tv/v2/info")
+    fun getInfoV2(
+    ): Call<InfoV2>
 }

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() {
 
@@ -33,9 +35,9 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val programId: LiveData<String>
         get() = _programId
 
-    private var _program = MutableLiveData<MutableList<Program>>()
+    private var _epg = MutableLiveData<MutableList<EPG>>()
-    val program: LiveData<MutableList<Program>>
+    val epg: LiveData<MutableList<EPG>>
-        get() = _program
+        get() = _epg
 
     private val _id = MutableLiveData<Int>()
     val id: LiveData<Int>
@@ -53,8 +55,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val videoIndex: LiveData<Int>
         get() = _videoIndex
 
-    private val _logo = MutableLiveData<String>()
+    private val _logo = MutableLiveData<Any>()
-    val logo: LiveData<String>
+    val logo: LiveData<Any>
         get() = _logo
 
     private val _pid = MutableLiveData<String>()
@@ -73,11 +75,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 +113,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 +122,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 +152,23 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         return tv
     }
 
-    fun getProgramOne(): Program? {
+    fun addYEPG(p: MutableList<Program>) {
-        val programNew =
+        _epg.value = p.map { EPG(it.name, it.st.toInt()) }.toMutableList()
-            (_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 addProgram(p: MutableList<Program>) {
+    private fun formatFTime(s: String): Int {
-        val timestamp = getDateTimestamp()
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss")
-
+        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
-        // after now & not empty & different
+        val date = dateFormat.parse(s.substring(0, 19))
-        val p1 = (p.filter { it.et > timestamp }).toMutableList()
+        if (date != null) {
-        if (p1.isEmpty() || _program.value == p1) {
+            return (date.time / 1000).toInt()
-            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()
         }
+        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 +176,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         mHeaders = headers
     }
 
-    fun setMinimumLoadableRetryCount(minimumLoadableRetryCount: Int) {
-        mMinimumLoadableRetryCount = minimumLoadableRetryCount
-    }
-
     /**
      * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
      */