fix update manager

创建 SP 工具类，管理所有（除 ChannelUtils 以外）用户偏好设置

.github/ISSUE_TEMPLATE/bug.yml

@@ -19,8 +19,8 @@ body:
       label: my-ty 版本
       description: 请选择正在使用的版本
       options:
-        - 最新稳定版
-        - 最新 CI 版
+        - 通用版
+        - 专用版
     validations:
       required: true
   - type: textarea

README.md

@@ -14,6 +14,31 @@
 
 ## 更新日志
 
+### v1.6.6（通用）
+
+* 更新重庆卫视图标
+* 凤凰卫视增强画质
+* 凤凰卫视增加EPG
+
+### v1.6.5（安卓5及以上专用）
+
+* 增加CETV1图标
+* 稳定性提升
+
+### v1.6.4（通用）
+
+* 增加CETV1
+* 增加凤凰卫视
+* 默认关闭开机启动
+
+### v1.6.3（安卓5及以上专用）
+
+* 增加CETV1
+* 凤凰卫视增强画质
+* 默认关闭开机启动
+* 延迟菜单自动关闭时间
+* 解决一些可能导致首次打开时黑屏的问题
+
 ### v1.6.2（通用）
 
 * 修复按键无效的问题
@@ -199,17 +224,16 @@ adb install my-tv.apk
 ## TODO
 
 * 音量不同
-* 大湾区卫视、广东4k超高清、广东珠江
-* CETV教育频道
+* 大湾区卫视、广东4k超高清、广东珠江、三沙卫视
 * CHC高清三个电影频道
 * 地方频道
 * 收藏夹
 * 自定义源
-* 凤凰卫视、凤凰资讯台
 * 海外
-* 1.5.0 无法安装，1.5.1 可以安装
 * 节目增加预告
 * 频道列表优化
+* 自动更新
+* 時間
 
 ## 赞赏
 

app/build.gradle

@@ -54,7 +54,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget=17
+        jvmTarget = 17
     }
 
     // Encapsulates your external native build configurations.
@@ -71,9 +71,14 @@ android {
 
 static def VersionCode() {
     try {
-        def process = 'git rev-list --count HEAD'.execute()
+        def p = "git describe --tags --always"
+        def process = p.execute()
         process.waitFor()
-        return process.text.toInteger()
+        def replace = [v: "", ".": " ", "-": " "]
+        def arr = (process.text.trim().replace(replace) + " 0").split(" ")
+        def versionCode = arr[0].toInteger() * 16777216 + arr[1].toInteger() * 65536 + arr[2].toInteger() * 256 + arr[3].toInteger()
+        println("VersionCode $versionCode")
+        return versionCode
     } catch (ignored) {
         return 0
     }
@@ -81,7 +86,7 @@ static def VersionCode() {
 
 static def VersionName() {
     try {
-        def process = 'git describe --tags --always'.execute()
+        def process = "git describe --tags --always".execute()
         process.waitFor()
         return process.text.trim() - "v"
     } catch (ignored) {

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
         android:name="android.software.leanback"
         android:required="true" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <application
         android:allowBackup="true"
@@ -38,5 +39,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
+        <provider
+            android:name=".InitializerProvider"
+            android:authorities="${applicationId}.InitializerProvider"
+            android:exported="false"/>
     </application>
 </manifest>

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

@@ -7,8 +7,7 @@ import android.content.Intent
 class BootReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
-        val sp = context.getSharedPreferences("MainActivity", Context.MODE_PRIVATE)
-        if (sp.getBoolean(MainActivity.BOOT_STARTUP, true)) {
+        if (SP.bootStartup) {
             context.startActivity(
                 Intent(context, MainActivity::class.java)
                     .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

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,31 +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)
-
-            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/InitializerProvider.kt

@@ -0,0 +1,39 @@
+package com.lizongying.mytv
+
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.net.Uri
+
+internal class InitializerProvider : ContentProvider() {
+
+    // Happens before Application#onCreate.It's fine to init something here
+    override fun onCreate(): Boolean {
+        SP.init(context!!)
+        return true
+    }
+
+    override fun query(
+        uri: Uri,
+        projection: Array<out String>?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+        sortOrder: String?,
+    ) = unsupported()
+
+    override fun getType(uri: Uri) = unsupported()
+
+    override fun insert(uri: Uri, values: ContentValues?) = unsupported()
+
+    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?) =
+        unsupported()
+
+    override fun update(
+        uri: Uri,
+        values: ContentValues?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+    ) = unsupported()
+
+    private fun unsupported(errorMessage: String? = null): Nothing =
+        throw UnsupportedOperationException(errorMessage)
+}

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

@@ -1,12 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.Context
-import android.content.SharedPreferences
-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
@@ -18,52 +11,35 @@ import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.models.TVViewModel
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
-import java.security.MessageDigest
 
 
-class MainActivity : FragmentActivity() {
+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
 
     private lateinit var gestureDetector: GestureDetector
 
     private val handler = Handler()
-    private val delayHideMain: Long = 5000
+    private val delayHideMain: Long = 10000
     private val delayHideSetting: Long = 10000
 
-    lateinit var sharedPref: SharedPreferences
-    private var channelReversal = false
-    private var channelNum = true
-    private var bootStartup = true
-
-    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,26 +54,11 @@ class MainActivity : FragmentActivity() {
                 .commit()
         }
         gestureDetector = GestureDetector(this, GestureListener())
-
-        sharedPref = getPreferences(Context.MODE_PRIVATE)
-        channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, channelReversal)
-        channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
-        bootStartup = sharedPref.getBoolean(BOOT_STARTUP, bootStartup)
-
-        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, channelReversal, channelNum, bootStartup)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
         infoFragment.show(tvViewModel)
-        if (channelNum) {
+        if (SP.channelNum) {
             channelFragment.show(tvViewModel)
         }
     }
@@ -111,7 +72,7 @@ class MainActivity : FragmentActivity() {
             return
         }
 
-        if (channelNum) {
+        if (SP.channelNum) {
             channelFragment.show(channel)
         }
     }
@@ -185,7 +146,7 @@ class MainActivity : FragmentActivity() {
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 4) {
+        if (ready == 5) {
             mainFragment.fragmentReady()
         }
     }
@@ -200,11 +161,15 @@ class MainActivity : FragmentActivity() {
     private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
 
         override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-            Log.i(TAG, "onSingleTapConfirmed")
             switchMainFragment()
             return true
         }
 
+        override fun onDoubleTap(e: MotionEvent): Boolean {
+            showSetting()
+            return true
+        }
+
         override fun onFling(
             e1: MotionEvent?,
             e2: MotionEvent,
@@ -238,30 +203,6 @@ class MainActivity : FragmentActivity() {
         }
     }
 
-    fun saveChannelReversal(channelReversal: Boolean) {
-        with(sharedPref.edit()) {
-            putBoolean(CHANNEL_REVERSAL, channelReversal)
-            apply()
-        }
-        this.channelReversal = channelReversal
-    }
-
-    fun saveChannelNum(channelNum: Boolean) {
-        with(sharedPref.edit()) {
-            putBoolean(CHANNEL_NUM, channelNum)
-            apply()
-        }
-        this.channelNum = channelNum
-    }
-
-    fun saveBootStartup(bootStartup: Boolean) {
-        with(sharedPref.edit()) {
-            putBoolean(BOOT_STARTUP, bootStartup)
-            apply()
-        }
-        this.bootStartup = bootStartup
-    }
-
     private fun showSetting() {
         if (!mainFragment.isHidden) {
             return
@@ -285,7 +226,7 @@ class MainActivity : FragmentActivity() {
 
     private fun channelUp() {
         if (mainFragment.isHidden) {
-            if (channelReversal) {
+            if (SP.channelReversal) {
                 next()
                 return
             }
@@ -302,7 +243,7 @@ class MainActivity : FragmentActivity() {
 
     private fun channelDown() {
         if (mainFragment.isHidden) {
-            if (channelReversal) {
+            if (SP.channelReversal) {
                 prev()
                 return
             }
@@ -475,56 +416,7 @@ class MainActivity : FragmentActivity() {
         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")
@@ -545,10 +437,16 @@ class MainActivity : FragmentActivity() {
         handler.removeCallbacks(hideMain)
     }
 
-    companion object {
-        private const val TAG = "MainActivity"
-        private const val CHANNEL_REVERSAL = "channel_reversal"
-        private const val CHANNEL_NUM = "channel_num"
-        const val BOOT_STARTUP = "boot_startup"
+    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,6 +1,5 @@
 package com.lizongying.mytv
 
-import android.content.SharedPreferences
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -19,6 +18,7 @@ import androidx.leanback.widget.Row
 import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.Utils.getDateTimestamp
+import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
@@ -30,17 +30,10 @@ class MainFragment : BrowseSupportFragment() {
 
     private var rowsAdapter: ArrayObjectAdapter? = null
 
-    private var request = Request()
-
     var tvListViewModel = TVListViewModel()
 
-    private lateinit var sharedPref: SharedPreferences
-
     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)
@@ -55,16 +48,12 @@ class MainFragment : BrowseSupportFragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        activity?.let { request.initYSP(it) }
-        sharedPref = (activity as? MainActivity)?.sharedPref!!
+        activity?.let { YSP.init(it) }
 
         loadRows()
 
         setupEventListeners()
 
-        mUpdateProgramRunnable = UpdateProgramRunnable()
-        handler.post(mUpdateProgramRunnable)
-
         tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
             tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
                 if (tvViewModel.errInfo.value != null
@@ -91,7 +80,7 @@ class MainFragment : BrowseSupportFragment() {
                     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)
                         setSelectedPosition(
@@ -146,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)
@@ -155,7 +146,7 @@ class MainFragment : BrowseSupportFragment() {
 
         adapter = rowsAdapter
 
-        itemPosition = sharedPref.getInt(POSITION, 0)
+        itemPosition = SP.itemPosition
         if (itemPosition >= tvListViewModel.size()) {
             itemPosition = 0
         }
@@ -282,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)
         }
     }
 
@@ -317,19 +289,13 @@ class MainFragment : BrowseSupportFragment() {
     override fun onStop() {
         Log.i(TAG, "onStop")
         super.onStop()
-        with(sharedPref.edit()) {
-            putInt(POSITION, itemPosition)
-            apply()
-        }
+        SP.itemPosition = itemPosition
         Log.i(TAG, "$POSITION $itemPosition saved")
     }
 
     override fun onDestroy() {
         Log.i(TAG, "onDestroy")
         super.onDestroy()
-        if (::mUpdateProgramRunnable.isInitialized) {
-            handler.removeCallbacks(mUpdateProgramRunnable)
-        }
     }
 
     companion object {

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,26 +54,43 @@ 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 {
-        handler.post(tokenRunnable)
+    private var listener: RequestListener? = null
+
+    private var initRetryTimes = 0
+    private var initRetryMaxTimes = 1
+
+    fun onCreate() {
+        Log.i(TAG, "onCreate")
+        fetchInfoV2()
     }
 
-    fun initYSP(context: Context) {
-        ysp = YSP(context)
+    fun onDestroy() {
+        Log.i(TAG, "onDestroy")
+        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 callFAuth: Call<FAuth>? = null
+    private var callPage: Call<pageModel.Response>? = null
+
+    private fun cancelCall() {
+        call?.cancel()
+        callAuth?.cancel()
+        callInfo?.cancel()
+        callFAuth?.cancel()
+        callPage?.cancel()
+    }
 
     private fun fetchAuth(tvModel: TVViewModel, cookie: String) {
-        callAuth?.cancel()
+        cancelCall()
 
         val title = tvModel.title.value
 
-        val data = ysp?.getAuthData(tvModel)
-        val request = data?.let { AuthRequest(it) }
-        callAuth = request?.let { yspApiService.getAuth("guid=${ysp?.getGuid()}; $cookie", it) }
-
+        val data = YSP.getAuthData(tvModel)
+        val request = AuthRequest(data)
+        callAuth = request.let { yspApiService.getAuth("guid=${YSP.getGuid()}; $cookie", it) }
         callAuth?.enqueue(object : Callback<Auth> {
             override fun onResponse(call: Call<Auth>, response: Response<Auth>) {
                 if (response.isSuccessful) {
@@ -77,19 +98,19 @@ 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")
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
                             if (tvModel.getTV().needToken) {
-                                if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                     if (!tvModel.getTV().mustToken) {
                                         fetchAuth(tvModel, cookie)
                                     }
                                 } else {
-                                    token = ""
+                                    tvModel.needGetToken = true
                                     fetchAuth(tvModel)
                                 }
                             } else {
@@ -102,12 +123,12 @@ class Request {
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
                         if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchAuth(tvModel, cookie)
                                 }
                             } else {
-                                token = ""
+                                tvModel.needGetToken = true
                                 fetchAuth(tvModel)
                             }
                         } else {
@@ -122,12 +143,12 @@ class Request {
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                             if (!tvModel.getTV().mustToken) {
                                 fetchAuth(tvModel, cookie)
                             }
                         } else {
-                            token = ""
+                            tvModel.needGetToken = true
                             fetchAuth(tvModel)
                         }
                     } else {
@@ -138,8 +159,9 @@ class Request {
         })
     }
 
-    fun fetchVideo(tvModel: TVViewModel, cookie: String) {
-        call?.cancel()
+    private fun fetchVideo(tvModel: TVViewModel, cookie: String) {
+        cancelCall()
+
         if (::btraceRunnable.isInitialized) {
             handler.removeCallbacks(btraceRunnable)
         }
@@ -147,12 +169,12 @@ class Request {
         val title = tvModel.title.value
 
         tvModel.seq = 0
-        val data = ysp?.switch(tvModel)
-        val request = data?.let { LiveInfoRequest(it) }
-        call = request?.let {
+        val data = YSP.switch(tvModel)
+        val request = LiveInfoRequest(data)
+        call = request.let {
             yspApiService.getLiveInfo(
-                "guid=${ysp?.getGuid()}; $cookie",
-                ysp!!.token,
+                "guid=${YSP.getGuid()}; $cookie",
+                YSP.token,
                 it
             )
         }
@@ -189,13 +211,13 @@ class Request {
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
                                 if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                         if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
 //                                            fetchAuth(tvModel, cookie)
                                         }
                                     } else {
-                                        token = ""
+                                        tvModel.needGetToken = true
                                         fetchVideo(tvModel)
 //                                        fetchAuth(tvModel)
                                     }
@@ -214,13 +236,13 @@ class Request {
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
                                 if (tvModel.getTV().needToken) {
-                                    if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                                    if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                         if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
 //                                            fetchAuth(tvModel, cookie)
                                         }
                                     } else {
-                                        token = ""
+                                        tvModel.needGetToken = true
                                         fetchVideo(tvModel)
 //                                        fetchAuth(tvModel)
                                     }
@@ -236,13 +258,13 @@ class Request {
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
                         if (tvModel.getTV().needToken) {
-                            if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                            if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchVideo(tvModel, cookie)
 //                                    fetchAuth(tvModel, cookie)
                                 }
                             } else {
-                                token = ""
+                                tvModel.needGetToken = true
                                 fetchVideo(tvModel)
 //                                fetchAuth(tvModel)
                             }
@@ -259,12 +281,12 @@ class Request {
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
                     if (tvModel.getTV().needToken) {
-                        if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+                        if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
                             if (!tvModel.getTV().mustToken) {
                                 fetchVideo(tvModel, cookie)
                             }
                         } else {
-                            token = ""
+                            tvModel.needGetToken = true
                             fetchVideo(tvModel)
                         }
                     } else {
@@ -275,37 +297,31 @@ class Request {
         })
     }
 
-    fun fetchAuth(tvModel: TVViewModel) {
-        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")
-                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                            tvModel.tokenRetryTimes++
-                            fetchVideo(tvModel)
+    private fun fetchAuth(tvModel: TVViewModel) {
+        cancelCall()
+        if (tvModel.needGetToken) {
+            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")
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        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 if (response.code() == 304) {
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        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.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                            tvModel.tokenYSPRetryTimes++
+                            fetchAuth(tvModel)
                         } else {
                             if (!tvModel.getTV().mustToken) {
                                 val cookie =
@@ -314,7 +330,22 @@ class Request {
                             }
                         }
                     }
-                })
+                }
+
+                override fun onFailure(call: Call<Info>, t: Throwable) {
+                    Log.e(TAG, "info request error $t")
+                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                        tvModel.tokenYSPRetryTimes++
+                        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"
@@ -322,36 +353,31 @@ class Request {
         }
     }
 
-    fun fetchVideo(tvModel: TVViewModel) {
-        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")
-                        if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
-                            tvModel.tokenRetryTimes++
+    private fun fetchVideo(tvModel: TVViewModel) {
+        cancelCall()
+        Log.d(TAG, "fetchVideo")
+        if (tvModel.needGetToken) {
+            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")
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        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 if (response.code() == 304) {
+                        tvModel.needGetToken = false
+                        tvModel.tokenYSPRetryTimes = 0
+                        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.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                            tvModel.tokenYSPRetryTimes++
                             fetchVideo(tvModel)
                         } else {
                             if (!tvModel.getTV().mustToken) {
@@ -361,7 +387,22 @@ class Request {
                             }
                         }
                     }
-                })
+                }
+
+                override fun onFailure(call: Call<Info>, t: Throwable) {
+                    Log.e(TAG, "info request error $t")
+                    if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+                        tvModel.tokenYSPRetryTimes++
+                        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"
@@ -369,27 +410,29 @@ class 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
 
-        fAuth = fAuthService.getAuth(tvModel.getTV().pid, "HD")
-        fAuth?.enqueue(object : Callback<FAuth> {
+        var qa = "HD"
+        if (tokenFH != "") {
+            qa = "FHD"
+        }
+
+        callFAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
+        callFAuth?.enqueue(object : Callback<FAuth> {
             override fun onResponse(call: Call<FAuth>, response: Response<FAuth>) {
                 if (response.isSuccessful && response.body()?.data?.live_url != null) {
                     val url = response.body()?.data?.live_url!!
 //                    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)
                     }
                 }
@@ -397,8 +440,8 @@ class 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)
                 }
             }
@@ -428,32 +471,133 @@ class Request {
         }
     }
 
-    inner class TokenRunnable : Runnable {
+    class TokenRunnable : Runnable {
         override fun run() {
-            fetchToken()
-            handler.postDelayed(this, 600000)
+//            fetchToken()
         }
     }
 
-    fun fetchToken() {
-        yspTokenService.getInfo(token)
-            .enqueue(object : Callback<Info> {
-                override fun onResponse(call: Call<Info>, response: Response<Info>) {
+    private fun fetchInfoV2() {
+        yspTokenService.getInfoV2()
+            .enqueue(object : Callback<InfoV2> {
+                override fun onResponse(call: Call<InfoV2>, response: Response<InfoV2>) {
                     if (response.isSuccessful) {
-                        token = response.body()?.data?.token!!
-                        Log.i(TAG, "info success $token")
+                        val t = response.body()?.t
+                        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")
+                        }
+                        listener?.onRequestFinished()
                     } else {
                         Log.e(TAG, "token status error")
+                        handler.postDelayed(
+                            tokenRunnable,
+                            30 * 60 * 1000
+                        )
+                        if (initRetryTimes < initRetryMaxTimes) {
+                            initRetryTimes++
+                            fetchInfoV2()
+                        } else {
+                            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
+                    )
+
+                    if (initRetryTimes < initRetryMaxTimes) {
+                        initRetryTimes++
+                        fetchInfoV2()
+                    } else {
+                        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 +607,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 +619,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(),
         )
@@ -496,7 +640,8 @@ class 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>
@@ -529,7 +674,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 +685,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 +699,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 +737,11 @@ class Request {
         }
     }
 
-    companion object {
-        private const val TAG = "Request"
+    interface RequestListener {
+        fun onRequestFinished()
+    }
+
+    fun setRequestListener(listener: RequestListener) {
+        this.listener = listener
     }
 }

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

@@ -0,0 +1,53 @@
+package com.lizongying.mytv
+
+import android.content.Context
+import android.content.SharedPreferences
+
+object SP {
+    // Name of the sp file TODO Should use a meaningful name and do migrations
+    private const val SP_FILE_NAME = "MainActivity"
+
+    // If Change channel with up and down in reversed order or not
+    private const val KEY_CHANNEL_REVERSAL = "channel_reversal"
+
+    // If use channel num to select channel or not
+    private const val KEY_CHANNEL_NUM = "channel_num"
+
+    // If start app on device boot or not
+    private const val KEY_BOOT_STARTUP = "boot_startup"
+
+    // Position in list of the selected channel item
+    private const val KEY_POSITION = "position"
+
+    // guid
+    private const val KEY_GUID = "guid"
+
+    private lateinit var sp: SharedPreferences
+
+    /**
+     * The method must be invoked as early as possible(At least before using the keys)
+     */
+    fun init(context: Context) {
+        sp = context.getSharedPreferences(SP_FILE_NAME, Context.MODE_PRIVATE)
+    }
+
+    var channelReversal: Boolean
+        get() = sp.getBoolean(KEY_CHANNEL_REVERSAL, false)
+        set(value) = sp.edit().putBoolean(KEY_CHANNEL_REVERSAL, value).apply()
+
+    var channelNum: Boolean
+        get() = sp.getBoolean(KEY_CHANNEL_NUM, true)
+        set(value) = sp.edit().putBoolean(KEY_CHANNEL_NUM, value).apply()
+
+    var bootStartup: Boolean
+        get() = sp.getBoolean(KEY_BOOT_STARTUP, false)
+        set(value) = sp.edit().putBoolean(KEY_BOOT_STARTUP, value).apply()
+
+    var itemPosition: Int
+        get() = sp.getInt(KEY_POSITION, 0)
+        set(value) = sp.edit().putInt(KEY_POSITION, value).apply()
+
+    var guid: String
+        get() = sp.getString(KEY_GUID, "") ?: ""
+        set(value) = sp.edit().putString(KEY_GUID, value).apply()
+}

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.versionName.text = "当前版本: v${context.appVersionName}"
+        binding.version.text = "https://github.com/lizongying/my-tv"
 
-        val switchChannelReversal = _binding?.switchChannelReversal
-        switchChannelReversal?.isChecked = channelReversal
-        switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
-            (activity as MainActivity).saveChannelReversal(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 ->
-            (activity as MainActivity).saveChannelNum(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 ->
-            (activity as MainActivity).saveBootStartup(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

@@ -7,9 +7,8 @@ data class TV(
     var title: String,
     var alias: String = "",
     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 = "",
@@ -23,7 +22,6 @@ data class TV(
                 "id=" + id +
                 ", title='" + title + '\'' +
                 ", videoUrl='" + videoUrl + '\'' +
-                ", videoIndex='" + videoIndex + '\'' +
                 ", logo='" + logo + '\'' +
                 ", pid='" + pid + '\'' +
                 ", sid='" + sid + '\'' +

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

@@ -1,5 +1,6 @@
 package com.lizongying.mytv
 
+import android.app.Activity
 import android.app.DownloadManager
 import android.app.DownloadManager.Request
 import android.content.BroadcastReceiver
@@ -13,8 +14,10 @@ import android.os.Environment
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import android.widget.Toast
-import com.lizongying.mytv.api.Release
+import androidx.core.app.ActivityCompat
+import androidx.core.content.PermissionChecker
+import androidx.core.content.PermissionChecker.checkSelfPermission
+import com.lizongying.mytv.api.ReleaseV2
 import com.lizongying.mytv.requests.MyRequest
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -23,81 +26,115 @@ import java.io.File
 
 
 class UpdateManager(
-    private var context: Context?,
+    private var context: Context,
     private var settingFragment: SettingFragment,
     private var versionCode: Long
 ) :
     ConfirmationDialogFragment.ConfirmationDialogListener {
 
     private var myRequest = MyRequest()
-    private var release: Release? = null
+    private var release: ReleaseV2? = null
 
     private var downloadReceiver: DownloadReceiver? = null
 
     fun checkAndUpdate() {
+        if (!haveStoragePermission()) {
+            return
+        }
         CoroutineScope(Dispatchers.Main).launch {
+            var text = "版本获取失败"
             try {
                 release = myRequest.getRelease()
-                updateUI(release)
-                Log.i(TAG, "versionCode $versionCode ${release?.data?.versionCode}")
-                if (release != null) {
-                    if (release?.data?.versionCode!! >= versionCode) {
+                Log.i(TAG, "versionCode $versionCode ${release?.c}")
+                if (release?.c != null) {
+                    if (release?.c!! >= versionCode) {
+                        text = "最新版本：${release?.n}"
                         val dialog = ConfirmationDialogFragment(this@UpdateManager)
                         dialog.show(settingFragment.fragmentManager, "ConfirmationDialogFragment")
                     } else {
-                        Toast.makeText(context, "不需要更新", Toast.LENGTH_LONG)
-                            .show()
+                        text = "已是最新版本，不需要更新"
                     }
                 }
             } catch (e: Exception) {
                 Log.e(TAG, "Error occurred: ${e.message}", e)
             }
+            updateUI(text)
         }
     }
 
-    private fun updateUI(release: Release?) {
-        if (release?.data?.versionName.isNullOrEmpty()) {
-            settingFragment.setVersionName("版本获取失败")
-        } else {
-            settingFragment.setVersionName("最新版本：${release?.data?.versionName!!}")
+    private fun updateUI(text: String) {
+        settingFragment.setVersionName(text)
+    }
+
+    fun haveStoragePermission(): Boolean {
+        if (Build.VERSION.SDK_INT >= 23) {
+            if (checkSelfPermission(context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                === PermissionChecker.PERMISSION_GRANTED
+            ) {
+                Log.e("Permission error", "You have permission")
+                return true
+            } else {
+                Log.e("Permission error", "You have asked for permission")
+                ActivityCompat.requestPermissions(
+                    context as Activity, arrayOf(
+                        android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+                    ), 1
+                )
+                return false
+            }
+        } else { //you don't need to worry about these stuff below api level 23
+            Log.e("Permission error", "You already have the permission")
+            return true
         }
     }
 
-    private fun startDownload(release: Release) {
-        val apkFileName = "my-tv-${release.data.versionName}.apk"
+
+    private fun startDownload(release: ReleaseV2) {
+        val apkFileName = "my-tv-${release.n}.apk"
         Log.i(TAG, "apkFileName $apkFileName")
         val 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)
+            context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+        val request = Request(Uri.parse(release.u))
+        Log.i(TAG, "url ${Uri.parse(release.u)}")
+        context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)?.mkdirs()
+        request.setDestinationInExternalFilesDir(
+            context,
+            Environment.DIRECTORY_DOWNLOADS,
+            apkFileName
+        )
         request.setTitle("New Version Download")
         request.setNotificationVisibility(Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+        request.setAllowedOverRoaming(false)
+        request.setMimeType("application/vnd.android.package-archive")
 
         // 获取下载任务的引用
         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%")
         }
     }
 
-    private fun getDownloadProgress(context: Context, downloadId: Long, progressListener: (Int) -> Unit) {
+    private fun getDownloadProgress(
+        context: Context,
+        downloadId: Long,
+        progressListener: (Int) -> Unit
+    ) {
         val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
         val handler = Handler(Looper.getMainLooper())
         val intervalMillis: Long = 1000
@@ -179,10 +216,9 @@ class UpdateManager(
     override fun onCancel() {
     }
 
-
     fun destroy() {
         if (downloadReceiver != null) {
-            context!!.unregisterReceiver(downloadReceiver)
+            context.unregisterReceiver(downloadReceiver)
             Log.i(TAG, "destroy downloadReceiver")
         }
     }

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

@@ -26,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 {

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

@@ -1,7 +1,11 @@
 package com.lizongying.mytv.api
 
 
+import android.os.Build
+import android.util.Log
+import okhttp3.ConnectionSpec
 import okhttp3.OkHttpClient
+import okhttp3.TlsVersion
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.protobuf.ProtoConverterFactory
@@ -13,7 +17,6 @@ import javax.net.ssl.X509TrustManager
 class ApiClient {
     private val yspUrl = "https://player-api.yangshipin.cn/"
     private val myUrl = "https://lyrics.run/"
-    private val devUrl = "http://10.0.2.2:8081/"
     private val protoUrl = "https://capi.yangshipin.cn/"
     private val traceUrl = "https://btrace.yangshipin.cn/"
     private val fUrl = "https://m.fengshows.com/"
@@ -68,6 +71,36 @@ class ApiClient {
             .build().create(FAuthService::class.java)
     }
 
+    private fun enableTls12OnPreLollipop(client: OkHttpClient.Builder): OkHttpClient.Builder {
+        if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT < 22) {
+            try {
+                val sc = SSLContext.getInstance("TLSv1.2")
+
+                sc.init(null, null, null)
+
+                // a more robust version is to pass a custom X509TrustManager
+                // as the second parameter and make checkServerTrusted to accept your server.
+                // Credits: https://github.com/square/okhttp/issues/2372#issuecomment-1774955225
+                client.sslSocketFactory(Tls12SocketFactory(sc.socketFactory))
+
+                val cs = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+                    .tlsVersions(TlsVersion.TLS_1_2)
+                    .build()
+
+                val specs: MutableList<ConnectionSpec> = ArrayList()
+                specs.add(cs)
+                specs.add(ConnectionSpec.COMPATIBLE_TLS)
+                specs.add(ConnectionSpec.CLEARTEXT)
+
+                client.connectionSpecs(specs)
+            } catch (exc: java.lang.Exception) {
+                Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc)
+            }
+        }
+
+        return client
+    }
+
     private fun getUnsafeOkHttpClient(): OkHttpClient {
         try {
             val trustAllCerts: Array<TrustManager> = arrayOf(
@@ -93,11 +126,12 @@ class ApiClient {
             val sslContext = SSLContext.getInstance("SSL")
             sslContext.init(null, trustAllCerts, java.security.SecureRandom())
 
-            return OkHttpClient.Builder()
+            val builder = OkHttpClient.Builder()
                 .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)
                 .hostnameVerifier { _, _ -> true }
                 .dns(DnsCache())
-                .build()
+
+            return enableTls12OnPreLollipop(builder).build()
 
         } catch (e: Exception) {
             throw RuntimeException(e)

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

@@ -1,6 +1,5 @@
 package com.lizongying.mytv.api
 
-
 data class Info(
     val code: Int?,
     val msg: String?,
@@ -11,18 +10,23 @@ data class Info(
     )
 }
 
-data class Release(
-    val code: Int?,
-    val msg: String?,
-    val data: Data,
-) {
-    data class Data(
-        val versionName: String,
-        val versionCode: Int,
-        val downloadUrl: String,
-        val updateTime: Int,
-    )
-}
+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 ReleaseV2(
+    val n: String?,
+    val u: String?,
+    val c: Int?,
+)
 
 data class TimeResponse(
     val data: Time

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

@@ -2,10 +2,11 @@ package com.lizongying.mytv.api
 
 import retrofit2.Call
 import retrofit2.http.GET
-
+import retrofit2.http.Path
 
 interface ReleaseService {
-    @GET("my-tv/v1/release")
+    @GET("my-tv/v2/release/{name}")
     fun getRelease(
-    ): Call<Release>
+        @Path("name") date: String = "1",
+    ): Call<ReleaseV2>
 }

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

@@ -0,0 +1,74 @@
+package com.lizongying.mytv.api
+
+import java.io.IOException
+import java.net.InetAddress
+import java.net.Socket
+import java.net.UnknownHostException
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
+
+
+/**
+ * Enables TLS v1.2 when creating SSLSockets.
+ *
+ *
+ * For some reason, android supports TLS v1.2 from API 16, but enables it by
+ * default only from API 20.
+ * @link https://developer.android.com/reference/javax/net/ssl/SSLSocket.html
+ * @see SSLSocketFactory
+ */
+class Tls12SocketFactory(val delegate: SSLSocketFactory) : SSLSocketFactory() {
+    override fun getDefaultCipherSuites(): Array<String> {
+        return delegate.defaultCipherSuites
+    }
+
+    override fun getSupportedCipherSuites(): Array<String> {
+        return delegate.supportedCipherSuites
+    }
+
+    @Throws(IOException::class)
+    override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket {
+        return patch(delegate.createSocket(s, host, port, autoClose))
+    }
+
+    @Throws(IOException::class, UnknownHostException::class)
+    override fun createSocket(host: String, port: Int): Socket {
+        return patch(delegate.createSocket(host, port))
+    }
+
+    @Throws(IOException::class, UnknownHostException::class)
+    override fun createSocket(
+        host: String,
+        port: Int,
+        localHost: InetAddress,
+        localPort: Int
+    ): Socket {
+        return patch(delegate.createSocket(host, port, localHost, localPort))
+    }
+
+    @Throws(IOException::class)
+    override fun createSocket(host: InetAddress, port: Int): Socket {
+        return patch(delegate.createSocket(host, port))
+    }
+
+    @Throws(IOException::class)
+    override fun createSocket(
+        address: InetAddress,
+        port: Int,
+        localAddress: InetAddress,
+        localPort: Int
+    ): Socket {
+        return patch(delegate.createSocket(address, port, localAddress, localPort))
+    }
+
+    private fun patch(s: Socket): Socket {
+        if (s is SSLSocket) {
+            s.enabledProtocols = TLS_V12_ONLY
+        }
+        return s
+    }
+
+    companion object {
+        private val TLS_V12_ONLY = arrayOf("TLSv1.2")
+    }
+}

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

@@ -1,15 +1,17 @@
 package com.lizongying.mytv.api
 
 import android.content.Context
-import android.content.SharedPreferences
 import com.lizongying.mytv.Encryptor
 import com.lizongying.mytv.MainActivity
+import com.lizongying.mytv.SP
 import com.lizongying.mytv.Utils.getDateTimestamp
 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,17 +55,10 @@ class YSP(var context: Context) {
     private var appid = "ysp_pc"
     var token = ""
 
-    private var encryptor: Encryptor? = null
-    private lateinit var sharedPref: SharedPreferences
-
-    init {
-        if (context is MainActivity) {
-            encryptor = Encryptor()
-            encryptor!!.init(context)
-
-            sharedPref = (context as MainActivity).sharedPref
-        }
+    private var encryptor = Encryptor()
 
+    fun init(context: Context) {
+        encryptor.init(context)
         guid = getGuid()
     }
 
@@ -81,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"}"""
     }
@@ -110,23 +105,17 @@ class YSP(var context: Context) {
     }
 
     fun getGuid(): String {
-        var guid = sharedPref.getString("guid", "")
-        if (guid == null || guid.length < 18) {
+        var guid = SP.guid
+        if (guid.length < 18) {
             guid = generateGuid()
-            with(sharedPref.edit()) {
-                putString("guid", guid)
-                apply()
-            }
+            SP.guid = guid
         }
         return guid
     }
 
     private fun newGuid(): String {
         guid = generateGuid()
-        with(sharedPref.edit()) {
-            putString("guid", guid)
-            apply()
-        }
+        SP.guid = guid
         return guid
     }
 
@@ -143,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() {
 
@@ -20,10 +22,13 @@ 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 tokenYSPRetryTimes = 0
+    var tokenYSPRetryMaxTimes = 0
+    var tokenFHRetryTimes = 0
+    var tokenFHRetryMaxTimes = 4
+
+    var needGetToken = false
 
     private val _errInfo = MutableLiveData<String>()
     val errInfo: LiveData<String>
@@ -33,9 +38,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 +58,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 +78,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")) {
@@ -88,9 +90,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         } else {
             tv.videoUrl = tv.videoUrl + listOf(url)
         }
-        tv.videoIndex = tv.videoUrl.lastIndex
         _videoUrl.value = tv.videoUrl
-        _videoIndex.value = tv.videoIndex
+        _videoIndex.value = tv.videoUrl.lastIndex
     }
 
     fun firstSource() {
@@ -114,23 +115,17 @@ 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
         _videoUrl.value = tv.videoUrl
-        _videoIndex.value = tv.videoIndex
+        _videoIndex.value = tv.videoUrl.lastIndex
         _logo.value = tv.logo
         _programId.value = tv.programId
         _pid.value = tv.pid
         _sid.value = tv.sid
-        _program.value = mutableListOf()
     }
 
-
     fun getRowPosition(): Int {
         return rowPosition
     }
@@ -159,46 +154,22 @@ 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
     }
 
-
-    private var mHeaders: Map<String, String>? = mapOf()
-
-    fun setHeaders(headers: Map<String, String>) {
-        mHeaders = headers
-    }
-
-    fun setMinimumLoadableRetryCount(minimumLoadableRetryCount: Int) {
-        mMinimumLoadableRetryCount = minimumLoadableRetryCount
+    fun addFEPG(p: List<FEPG>) {
+        _epg.value = p.map { EPG(it.title, formatFTime(it.event_time)) }.toMutableList()
     }
 
     /**
@@ -207,7 +178,7 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     @OptIn(UnstableApi::class)
     fun buildSource(): HlsMediaSource {
         val httpDataSource = DefaultHttpDataSource.Factory()
-        mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
+//        mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
 
         return HlsMediaSource.Factory(httpDataSource).createMediaSource(
             MediaItem.fromUri(

app/src/main/java/com/lizongying/mytv/requests/MyRequest.kt

@@ -1,7 +1,7 @@
 package com.lizongying.mytv.requests
 
 import com.lizongying.mytv.api.ApiClient
-import com.lizongying.mytv.api.Release
+import com.lizongying.mytv.api.ReleaseV2
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import retrofit2.Call
@@ -13,17 +13,17 @@ import kotlin.coroutines.suspendCoroutine
 class MyRequest {
     private var releaseService = ApiClient().releaseService
 
-    suspend fun getRelease(): Release? {
+    suspend fun getRelease(): ReleaseV2? {
         return withContext(Dispatchers.IO) {
             fetchRelease()
         }
     }
 
-    private suspend fun fetchRelease(): Release? {
+    private suspend fun fetchRelease(): ReleaseV2? {
         return suspendCoroutine { continuation ->
             releaseService.getRelease()
-                .enqueue(object : Callback<Release> {
-                    override fun onResponse(call: Call<Release>, response: Response<Release>) {
+                .enqueue(object : Callback<ReleaseV2> {
+                    override fun onResponse(call: Call<ReleaseV2>, response: Response<ReleaseV2>) {
                         if (response.isSuccessful) {
                             continuation.resume(response.body())
                         } else {
@@ -31,7 +31,7 @@ class MyRequest {
                         }
                     }
 
-                    override fun onFailure(call: Call<Release>, t: Throwable) {
+                    override fun onFailure(call: Call<ReleaseV2>, t: Throwable) {
                         continuation.resume(null)
                     }
                 })

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

@@ -1,7 +1,6 @@
 [
   {
     "id": 0,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
     "pid": "600001859",
@@ -16,7 +15,6 @@
   },
   {
     "id": 1,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
     "pid": "600001800",
@@ -31,7 +29,6 @@
   },
   {
     "id": 2,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
     "pid": "600001801",
@@ -46,7 +43,6 @@
   },
   {
     "id": 3,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp",
     "pid": "600001814",
@@ -62,7 +58,6 @@
   },
   {
     "id": 4,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp",
     "pid": "600001818",
@@ -77,7 +72,6 @@
   },
   {
     "id": 5,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
     "pid": "600001802",
@@ -92,7 +86,6 @@
   },
   {
     "id": 6,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp",
     "pid": "600004092",
@@ -107,7 +100,6 @@
   },
   {
     "id": 7,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ad51de94426a0ba039e6dd6a8534ea98ecc813a6176bde87b4f18cc34d6d7590.png?imageMogr2/format/webp",
     "pid": "600001803",
@@ -122,7 +114,6 @@
   },
   {
     "id": 8,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp",
     "pid": "600004078",
@@ -130,14 +121,13 @@
     "programId": "600004078",
     "needToken": true,
     "mustToken": false,
-    "title": "CCTV9 记录",
+    "title": "CCTV9 纪录",
     "videoUrl": [
       "http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226197/index.m3u8"
     ]
   },
   {
     "id": 9,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp",
     "pid": "600001805",
@@ -152,7 +142,6 @@
   },
   {
     "id": 10,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp",
     "pid": "600001806",
@@ -167,7 +156,6 @@
   },
   {
     "id": 11,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp",
     "pid": "600001807",
@@ -182,7 +170,6 @@
   },
   {
     "id": 12,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/266da7b43c03e2312186b4a999e0f060e8f15b10d2cc2c9aa32171819254cf1a.png?imageMogr2/format/webp",
     "pid": "600001811",
@@ -198,7 +185,6 @@
   },
   {
     "id": 13,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp",
     "pid": "600001809",
@@ -213,7 +199,6 @@
   },
   {
     "id": 14,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp",
     "pid": "600001815",
@@ -228,7 +213,6 @@
   },
   {
     "id": 15,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp",
     "pid": "600098637",
@@ -244,7 +228,6 @@
   },
   {
     "id": 16,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp",
     "pid": "600001810",
@@ -259,7 +242,6 @@
   },
   {
     "id": 17,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp",
     "pid": "600001817",
@@ -274,7 +256,6 @@
   },
   {
     "id": 18,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
     "pid": "600002264",
@@ -289,7 +270,6 @@
   },
   {
     "id": 19,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "",
     "pid": "600156816",
@@ -304,7 +284,6 @@
   },
   {
     "id": 20,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4d549e53e6d0f632d5a633d1945280797b153e588f919221a07faa869812cc89.png?imageMogr2/format/webp",
     "pid": "600099658",
@@ -319,7 +298,6 @@
   },
   {
     "id": 21,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a556bd7d93ce65e18f243a8892b5604f4faa994a4897315914216a710a706208.png?imageMogr2/format/webp",
     "pid": "600099655",
@@ -334,7 +312,6 @@
   },
   {
     "id": 22,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/5661bd04fecdb6e899f801147a22ab5d3a475bf2b62e30aec2c0023190ebc9b1.png?imageMogr2/format/webp",
     "pid": "600099620",
@@ -349,7 +326,6 @@
   },
   {
     "id": 23,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bb3c6c9e145d698137f5bb64a582021a01b51344b929003630eb769ea65832a9.png?imageMogr2/format/webp",
     "pid": "600099637",
@@ -364,7 +340,6 @@
   },
   {
     "id": 24,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bbf1d024c5228b8dd128b0e3cb1717d173fab4ee84c3a4c8a57b1a215362ca3b.png?imageMogr2/format/webp",
     "pid": "600099660",
@@ -379,7 +354,6 @@
   },
   {
     "id": 25,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4c6b6a6d3839889f34d33db3c2f80233b26b74d3489b393487635f8704e70796.png?imageMogr2/format/webp",
     "pid": "600099649",
@@ -394,7 +368,6 @@
   },
   {
     "id": 26,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cd1e2bb52b06a991de168733e5ff0f1d85adc8042d40c8f393f723543e5dd08a.png?imageMogr2/format/webp",
     "pid": "600099636",
@@ -409,7 +382,6 @@
   },
   {
     "id": 27,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cdd1b31ede7a5ad049ed53d9a072422f829e72dd062ed2c19e077fdd01699071.png?imageMogr2/format/webp",
     "pid": "600099659",
@@ -424,7 +396,6 @@
   },
   {
     "id": 28,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/fa28955ce8b2539d728bf4c6a13a46ff57ad76eae46627f7bcfb1ed8a613d3fc.png?imageMogr2/format/webp",
     "pid": "600099650",
@@ -439,7 +410,6 @@
   },
   {
     "id": 29,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/14ac5ce40482cacd3d4b37435222bfe86af2b452a2f04ecbfc1d13d76edd7c57.png?imageMogr2/format/webp",
     "pid": "600099653",
@@ -454,7 +424,6 @@
   },
   {
     "id": 30,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/10e14a92478011aa6c3c8562e62127f3b1908e29fcd78e4b2b24b9e6d3ec2fbc.png?imageMogr2/format/webp",
     "pid": "600099652",
@@ -469,7 +438,6 @@
   },
   {
     "id": 31,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/244d72c0eb1615ed7d51c2f5db5a67f306aa3f58c05bc2d34de3aa7e956dc8c9.png?imageMogr2/format/webp",
     "pid": "600099656",
@@ -484,7 +452,6 @@
   },
   {
     "id": 32,
-    "videoIndex": 0,
     "channel": "央视",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54a6863656fdfd8f803be193ddf22441c5000a108833889816fd2d8911715ce8.png?imageMogr2/format/webp",
     "pid": "600099651",
@@ -499,7 +466,6 @@
   },
   {
     "id": 33,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp",
     "pid": "600002483",
@@ -514,7 +480,6 @@
   },
   {
     "id": 34,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp",
     "pid": "600002475",
@@ -530,7 +495,6 @@
   },
   {
     "id": 35,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp",
     "pid": "600002508",
@@ -546,7 +510,6 @@
   },
   {
     "id": 36,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ac4ed6058a87c101ae7147ebc38905d0cae047fb73fd277ee5049b84f52bda36.png?imageMogr2/format/webp",
     "pid": "600002505",
@@ -562,7 +525,6 @@
   },
   {
     "id": 37,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp",
     "pid": "600002521",
@@ -578,7 +540,6 @@
   },
   {
     "id": 38,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3c760d0d00463855890e8a1864ea4a6b6dd66b90c29b4ac714a4b17c16519871.png?imageMogr2/format/webp",
     "pid": "600002503",
@@ -594,7 +555,6 @@
   },
   {
     "id": 39,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/22d403f07a7cf5410b3ad3ddb65a11aa229a32475fac213f5344c9f0ec330ca1.png?imageMogr2/format/webp",
     "pid": "600002513",
@@ -609,7 +569,6 @@
   },
   {
     "id": 40,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/28886880a4dc0f06fb7e0a528a1def0591d61a65870e29176ede0cc92033bbfd.png?imageMogr2/format/webp",
     "pid": "600002485",
@@ -624,7 +583,6 @@
   },
   {
     "id": 41,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54b7e97cb816bb223fe05f3fc44da2c7820eb66e8550c19d23100f2c414ecc38.png?imageMogr2/format/webp",
     "pid": "600002509",
@@ -640,7 +598,6 @@
   },
   {
     "id": 42,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/657651f411de2673d1770d9a78b44c1265704f7468cc41d4be7f51d630768494.png?imageMogr2/format/webp",
     "pid": "600002531",
@@ -656,7 +613,6 @@
   },
   {
     "id": 43,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/74925962148a6d31c85808b6cd4e444c2a54bab393d2c5fc85e960b50e22fa86.png?imageMogr2/format/webp",
     "pid": "600002525",
@@ -672,7 +628,6 @@
   },
   {
     "id": 44,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d545becdc81c60197b08c7f47380705e4665ed3fe55efc8b855e486f6e655378.png?imageMogr2/format/webp",
     "pid": "600002493",
@@ -688,7 +643,6 @@
   },
   {
     "id": 45,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4eb45f4781d33d872af027dc01c941559aab55667dd99cc5c22bef7037807b13.png?imageMogr2/format/webp",
     "pid": "600002490",
@@ -704,7 +658,6 @@
   },
   {
     "id": 46,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f4f23633c578beea49a3841d88d3490100f029ee349059fa532869db889872c5.png?imageMogr2/format/webp",
     "pid": "600002309",
@@ -720,7 +673,6 @@
   },
   {
     "id": 47,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d8273ae9be698ce2db21f5b886ecac95a73429593f93713c60ed8c12c38bf0d3.png?imageMogr2/format/webp",
     "pid": "600002498",
@@ -736,7 +688,6 @@
   },
   {
     "id": 48,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a66c836bd98ba3e41a2e9a570d4b9c50dedc6839e9de333e2e78212ad505f37e.png?imageMogr2/format/webp",
     "pid": "600002520",
@@ -752,7 +703,6 @@
   },
   {
     "id": 49,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f35fa04b51b1ee4984b03578b65403570868ebca03c6c01e11b097f999a58d9b.png?imageMogr2/format/webp",
     "pid": "600002532",
@@ -768,7 +718,6 @@
   },
   {
     "id": 50,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp",
     "pid": "600002481",
@@ -784,7 +733,6 @@
   },
   {
     "id": 51,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
     "pid": "600002516",
@@ -800,7 +748,6 @@
   },
   {
     "id": 52,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp",
     "pid": "600002484",
@@ -816,7 +763,6 @@
   },
   {
     "id": 53,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp",
     "pid": "600002506",
@@ -832,7 +778,6 @@
   },
   {
     "id": 54,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "",
     "pid": "600152137",
@@ -847,7 +792,6 @@
   },
   {
     "id": 55,
-    "videoIndex": 0,
     "channel": "地方",
     "logo": "",
     "pid": "600152138",
@@ -862,8 +806,7 @@
   },
   {
     "id": 56,
-    "videoIndex": 0,
-    "channel": "国际频道",
+    "channel": "国际",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp",
     "pid": "600014550",
     "sid": "2001656803",
@@ -877,8 +820,7 @@
   },
   {
     "id": 57,
-    "videoIndex": 0,
-    "channel": "国际频道",
+    "channel": "国际",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp",
     "pid": "600084704",
     "sid": "2010153503",
@@ -892,8 +834,7 @@
   },
   {
     "id": 58,
-    "videoIndex": 0,
-    "channel": "国际频道",
+    "channel": "国际",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp",
     "pid": "600084758",
     "sid": "2010152603",
@@ -907,8 +848,7 @@
   },
   {
     "id": 59,
-    "videoIndex": 0,
-    "channel": "国际频道",
+    "channel": "国际",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp",
     "pid": "600084782",
     "sid": "2010155203",
@@ -922,8 +862,7 @@
   },
   {
     "id": 60,
-    "videoIndex": 0,
-    "channel": "国际频道",
+    "channel": "国际",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp",
     "pid": "600084744",
     "sid": "2010152503",
@@ -938,8 +877,7 @@
   },
   {
     "id": 61,
-    "videoIndex": 0,
-    "channel": "国际频道",
+    "channel": "国际",
     "logo": "https://resources.yangshipin.cn/assets/oms/image/202309/74d3ac436a7e374879578de1d87a941fbf566d39d5632b027c5097891ed32bd5.png?imageMogr2/format/webp",
     "pid": "600084781",
     "sid": "2010155403",

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.2.2' apply false
-    id 'com.android.library' version '8.2.2' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Dec 01 13:53:24 HKT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME