add phoenix tv

fix: LibChecker -> my-tv

.github/ISSUE_TEMPLATE/bug.yml

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

README.md

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

app/build.gradle

@@ -101,7 +101,7 @@ dependencies {
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
 
     // 21:2.9.0 17:2.6.4
-    def retrofit2_version = "2.6.4"
+    def retrofit2_version = "2.9.0"
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
     implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"

app/src/main/AndroidManifest.xml

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

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

@@ -1,139 +0,0 @@
-package com.lizongying.mytv
-
-import android.graphics.Color
-import android.view.ContextThemeWrapper
-import android.view.KeyEvent
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.ScaleAnimation
-import android.widget.ImageView
-import androidx.leanback.widget.ImageCardView
-import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.lizongying.mytv.models.TVListViewModel
-import com.lizongying.mytv.models.TVViewModel
-
-
-class CardAdapter(
-    private val recyclerView: RecyclerView,
-    private val mainFragment: MainFragment,
-    private var tvListViewModel: TVListViewModel,
-) :
-    RecyclerView.Adapter<CardAdapter.ViewHolder>() {
-
-    private var listener: ItemListener? = null
-    private var focused: View? = null
-
-    var visiable = false
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val cardView = object :
-            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
-        cardView.isFocusable = true
-        cardView.isFocusableInTouchMode = true
-        return ViewHolder(cardView)
-    }
-
-    fun clear() {
-        focused?.clearFocus()
-        recyclerView.invalidate()
-    }
-
-    private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float, duration: Long) {
-        val scaleAnimation = ScaleAnimation(
-            fromScale, toScale,
-            fromScale, toScale,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
-            ScaleAnimation.RELATIVE_TO_SELF, 0.5f
-        )
-        scaleAnimation.duration = duration
-        scaleAnimation.fillAfter = false
-        view.startAnimation(scaleAnimation)
-    }
-
-    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
-        val item = tvListViewModel.getTVViewModel(position)
-
-        val tvViewModel = item as TVViewModel
-        val cardView = viewHolder.view as ImageCardView
-        cardView.tag = tvViewModel
-
-        val onFocusChangeListener = View.OnFocusChangeListener { view, hasFocus ->
-            if (hasFocus) {
-                listener?.onItemHasFocus(item)
-                focused = cardView
-
-                startScaleAnimation(cardView, 0.9f, 1.0f, 200)
-//
-//                if (mainFragment.shouldHasFocus(view.tag as TVViewModel)) {
-//                }
-
-//                if (visiable) {
-//                    startScaleAnimation(cardView, 0.9f, 1.0f, 200)
-//                } else {
-//                    visiable = true
-//                }
-            }
-        }
-
-        cardView.onFocusChangeListener = onFocusChangeListener
-
-        cardView.setOnClickListener { _ ->
-            listener?.onItemClicked(item)
-        }
-
-        cardView.setOnKeyListener { _, keyCode, event: KeyEvent? ->
-            if (event?.action == KeyEvent.ACTION_DOWN) {
-                return@setOnKeyListener listener?.onKey(keyCode) ?: false
-            }
-            false
-        }
-
-        cardView.titleText = tvViewModel.title.value
-
-        Glide.with(viewHolder.view.context)
-            .load(tvViewModel.logo.value)
-            .centerInside()
-            .into(cardView.mainImageView)
-
-        cardView.mainImageView.setBackgroundColor(Color.WHITE)
-        cardView.setMainImageScaleType(ImageView.ScaleType.CENTER_INSIDE)
-
-        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
-        if (!epg.isNullOrEmpty()) {
-            cardView.contentText = epg.last().title
-        } else {
-            cardView.contentText = ""
-        }
-    }
-
-    override fun getItemCount() = tvListViewModel.size()
-
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val view = itemView
-    }
-
-    fun toPosition(position: Int) {
-        recyclerView.post {
-            recyclerView.scrollToPosition(position)
-            recyclerView.getChildAt(position)?.isSelected
-            recyclerView.getChildAt(position)?.requestFocus()
-        }
-    }
-
-    interface ItemListener {
-        fun onItemHasFocus(tvViewModel: TVViewModel)
-        fun onItemClicked(tvViewModel: TVViewModel)
-        fun onKey(keyCode: Int): Boolean
-    }
-
-    fun setItemListener(listener: ItemListener) {
-        this.listener = listener
-    }
-
-    companion object {
-        private const val TAG = "CardAdapter"
-    }
-}
-

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

@@ -0,0 +1,82 @@
+package com.lizongying.mytv
+
+import android.graphics.Color
+import android.view.ContextThemeWrapper
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.leanback.widget.ImageCardView
+import androidx.leanback.widget.Presenter
+import androidx.lifecycle.LifecycleOwner
+import com.bumptech.glide.Glide
+import com.lizongying.mytv.models.TVViewModel
+
+class CardPresenter(
+    private val owner: LifecycleOwner,
+) : Presenter() {
+
+    override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
+        val cardView = object :
+            ImageCardView(ContextThemeWrapper(parent.context, R.style.CustomImageCardTheme)) {}
+
+        cardView.isFocusable = true
+        cardView.isFocusableInTouchMode = true
+        return ViewHolder(cardView)
+    }
+
+    override fun onBindViewHolder(viewHolder: ViewHolder, item: Any) {
+        val tvViewModel = item as TVViewModel
+        val cardView = viewHolder.view as ImageCardView
+
+        cardView.titleText = tvViewModel.title.value
+        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)
+        }
+
+        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
+            }
+        }
+    }
+
+    override fun onUnbindViewHolder(viewHolder: ViewHolder) {
+        val cardView = viewHolder.view as ImageCardView
+        cardView.mainImage = null
+    }
+
+    companion object {
+        private const val TAG = "CardPresenter"
+        private const val CARD_WIDTH = 300
+        private const val CARD_HEIGHT = 101
+    }
+}

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

@@ -0,0 +1,157 @@
+package com.lizongying.mytv
+
+import android.content.Context
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.File
+
+/**
+ *@author LeGend
+ *@date 2024/2/4 22:42
+ */
+object ChannelUtils {
+    /**
+     * 获取服务器channel版本
+     *
+     * @param context Context
+     *
+     * @return 服务器channel版本
+     */
+    suspend fun getServerVersion(context: Context): Int {
+        return withContext(Dispatchers.IO) {
+            val client = okhttp3.OkHttpClient.Builder().connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
+                .readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
+            client.newCall(okhttp3.Request.Builder().url(getServerVersionUrl(context)).build()).execute()
+                .use { response ->
+                    if (!response.isSuccessful) throw java.io.IOException("Unexpected code $response")
+                    val body = response.body()
+                    body?.string()?.toInt() ?: 0
+                }
+        }
+    }
+
+    /**
+     * 获取服务器channel
+     *
+     * @param url String 服务器地址
+     *
+     * @return Array<TV> 服务器channel
+     *
+     * @throws java.io.IOException 网络请求失败
+     */
+    suspend fun getServerChannel(url: String): List<TV> {
+        val result = withContext(Dispatchers.IO) {
+            val client = okhttp3.OkHttpClient.Builder().connectTimeout(500, java.util.concurrent.TimeUnit.MILLISECONDS)
+                .readTimeout(1, java.util.concurrent.TimeUnit.SECONDS).build()
+            val request = okhttp3.Request.Builder().url(url).build()
+            client.newCall(request).execute().use { response ->
+                if (!response.isSuccessful) throw java.io.IOException("Unexpected code $response")
+                val body = response.body()
+                body?.string() ?: ""
+            }
+        }
+        return withContext(Dispatchers.Default) {
+            val type = object : com.google.gson.reflect.TypeToken<List<TV>>() {}.type
+            com.google.gson.Gson().fromJson(result, type)
+        }
+    }
+
+    /**
+     * 获取服务器地址
+     *
+     * @param context Context
+     *
+     * @return 服务器地址
+     */
+    fun getServerUrl(context: Context): String {
+        return context.resources.getString(R.string.server_url)
+    }
+
+    /**
+     * 获取serverVersion的URL
+     *
+     * @param context Context
+     *
+     * @return serverVersionURL 服务器版本地址
+     */
+    suspend fun getServerVersionUrl(context: Context): String {
+        return withContext(Dispatchers.IO) {
+            context.resources.getString(R.string.server_version_url)
+        }
+    }
+
+
+    /**
+     * 获取本地channel版本
+     *
+     * @param context Context
+     *
+     * @return 本地channel
+     */
+    suspend fun getLocalVersion(context: Context): Int {
+        return withContext(Dispatchers.IO) {
+            val file = File(getAppDirectory(context), "channels")
+            //检查本地是否已经有保存的channels.json,若无保存的Channel.json则从读取assert中文件
+            val savedVersion =
+                context.getSharedPreferences("saved_version", Context.MODE_PRIVATE).getInt("version", Integer.MIN_VALUE)
+            if (!file.exists() || savedVersion == Integer.MIN_VALUE) {
+                context.resources.getInteger(R.integer.local_channel_version)
+            } else {
+                savedVersion
+            }
+        }
+    }
+
+    /**
+     * 获取本地可读取的目录
+     * @param context Context
+     *
+     * @return 可读取的目录
+     */
+    private fun getAppDirectory(context: Context): File {
+        return context.filesDir
+    }
+
+    /**
+     * 获取本地channel
+     *
+     * @param context Context
+     *
+     * @return Array<TV> 本地channel
+     */
+    suspend fun getLocalChannel(context: Context): List<TV> {
+        val str = withContext(Dispatchers.IO) {
+            if (File(getAppDirectory(context), "channels").exists()) {
+                File(getAppDirectory(context), "channels").readText()
+            } else {
+                context.resources.openRawResource(R.raw.channels).bufferedReader().use { it.readText() }
+            }
+        }
+        return withContext(Dispatchers.Default) {
+            val type = object : com.google.gson.reflect.TypeToken<List<TV>>() {}.type
+            com.google.gson.Gson().fromJson(str, type)
+        }
+    }
+
+    /**
+     * 更新channels.json
+     *
+     * @param context Context
+     *
+     * @return 无
+     *
+     * @throws java.io.IOException 写入失败
+     */
+    suspend fun updateLocalChannel(context: Context, version: Int, channels: List<TV>) {
+        withContext(Dispatchers.IO) {
+            val file = File(getAppDirectory(context), "channels")
+            if (!file.exists()) {
+                file.createNewFile()
+            }
+            file.writeText(com.google.gson.Gson().toJson(channels))
+            context.getSharedPreferences("saved_version", Context.MODE_PRIVATE).edit().putInt(
+                "version", version
+            ).apply()
+        }
+    }
+}

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

@@ -1,51 +0,0 @@
-package com.lizongying.mytv
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Rect
-import android.view.View
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-
-class GrayOverlayItemDecoration(private val context: Context) : RecyclerView.ItemDecoration() {
-
-    private val grayOverlayPaint = Paint().apply {
-        color = ContextCompat.getColor(context, R.color.gray_overlay)
-        style = Paint.Style.FILL
-    }
-
-    override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-        super.onDrawOver(c, parent, state)
-
-        val childCount = parent.childCount
-        for (i in 0 until childCount) {
-            val child = parent.getChildAt(i)
-            if (!child.hasFocus()) {
-//                child.alpha = 0.7f
-                // 计算遮罩层的大小
-                val overlayRect = Rect(
-                    child.left,
-                    child.top,
-                    child.right,
-                    child.bottom
-                )
-                // 绘制灰色遮罩层
-                c.drawRect(overlayRect, grayOverlayPaint)
-            } else {
-//                child.alpha = 1f
-            }
-        }
-    }
-
-    override fun getItemOffsets(
-        outRect: Rect,
-        view: View,
-        parent: RecyclerView,
-        state: RecyclerView.State
-    ) {
-        super.getItemOffsets(outRect, view, parent, state)
-        // 在此处设置偏移量为0，以防止遮罩层影响项的布局
-        outRect.setEmpty()
-    }
-}

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

@@ -2,7 +2,6 @@ package com.lizongying.mytv
 
 import android.os.Bundle
 import android.os.Handler
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -31,16 +30,31 @@ class InfoFragment : Fragment() {
     fun show(tvViewModel: TVViewModel) {
         binding.textView.text = tvViewModel.title.value
 
-        Glide.with(this)
+        when (tvViewModel.title.value) {
-            .load(tvViewModel.logo.value)
+            "CCTV8K 超高清" -> Glide.with(this)
-            .into(binding.infoLogo)
+                .load(R.drawable.cctv8k)
+                .into(binding.infoLogo)
 
-        Log.i(TAG, "${tvViewModel.title.value} ${tvViewModel.epg.value}")
+            "天津卫视" -> Glide.with(this)
-        val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+                .load(R.drawable.tianjin)
-        if (!epg.isNullOrEmpty()) {
+                .into(binding.infoLogo)
-            binding.infoDesc.text = epg.last().title
+
-        } else {
+            "新疆卫视" -> Glide.with(this)
-            binding.infoDesc.text = ""
+                .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
         }
 
         handler.removeCallbacks(removeRunnable)

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

@@ -1,39 +0,0 @@
-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,5 +1,7 @@
 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
@@ -25,7 +27,7 @@ import kotlinx.coroutines.launch
 import java.security.MessageDigest
 
 
-class MainActivity : FragmentActivity(), Request.RequestListener {
+class MainActivity : FragmentActivity() {
 
     private var ready = 0
     private var playerFragment = PlayerFragment()
@@ -39,17 +41,29 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     private lateinit var gestureDetector: GestureDetector
 
     private val handler = Handler()
-    private val delayHideMain: Long = 10000
+    private val delayHideMain: Long = 5000
     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
@@ -64,6 +78,12 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
                 .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) {
@@ -71,18 +91,13 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         } else {
             packageInfo.versionCode.toLong()
         }
-        settingFragment = SettingFragment(
+        settingFragment =
-            versionName,
+            SettingFragment(versionName, versionCode, channelReversal, channelNum, bootStartup)
-            versionCode,
-            SP.channelReversal,
-            SP.channelNum,
-            SP.bootStartup
-        )
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
         infoFragment.show(tvViewModel)
-        if (SP.channelNum) {
+        if (channelNum) {
             channelFragment.show(tvViewModel)
         }
     }
@@ -96,7 +111,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             return
         }
 
-        if (SP.channelNum) {
+        if (channelNum) {
             channelFragment.show(channel)
         }
     }
@@ -130,7 +145,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         val transaction = supportFragmentManager.beginTransaction()
 
         if (mainFragment.isHidden) {
-            mainFragment.setPosition()
             transaction.show(mainFragment)
             mainActive()
         } else {
@@ -171,7 +185,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 5) {
+        if (ready == 4) {
             mainFragment.fragmentReady()
         }
     }
@@ -224,6 +238,30 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }
     }
 
+    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
@@ -247,7 +285,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
     private fun channelUp() {
         if (mainFragment.isHidden) {
-            if (SP.channelReversal) {
+            if (channelReversal) {
                 next()
                 return
             }
@@ -264,7 +302,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
     private fun channelDown() {
         if (mainFragment.isHidden) {
-            if (SP.channelReversal) {
+            if (channelReversal) {
                 prev()
                 return
             }
@@ -297,9 +335,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }, 2000)
     }
 
-
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-    fun onKey(keyCode: Int): Boolean {
-        Log.i(TAG, "keyCode $keyCode")
         when (keyCode) {
             KeyEvent.KEYCODE_0 -> {
                 showChannel("0")
@@ -411,7 +447,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
-                channelUp()
 //                if (mainFragment.isHidden) {
 //                    prevSource()
 //                } else {
@@ -425,7 +460,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                channelDown()
 //                if (mainFragment.isHidden) {
 //                    nextSource()
 //                } else {
@@ -437,13 +471,6 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 //                }
             }
         }
-        return false
-    }
-
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        if (onKey(keyCode)) {
-            return true
-        }
 
         return super.onKeyDown(keyCode, event)
     }
@@ -518,16 +545,10 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         handler.removeCallbacks(hideMain)
     }
 
-    override fun onDestroy() {
+    companion object {
-        super.onDestroy()
+        private const val TAG = "MainActivity"
-        Request.onDestroy()
+        private const val CHANNEL_REVERSAL = "channel_reversal"
-    }
+        private const val CHANNEL_NUM = "channel_num"
-
+        const val BOOT_STARTUP = "boot_startup"
-    override fun onRequestFinished() {
-        fragmentReady()
-    }
-
-    private companion object {
-        const val TAG = "MainActivity"
     }
 }

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

@@ -1,231 +1,229 @@
 package com.lizongying.mytv
 
+import android.content.SharedPreferences
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
-import android.view.KeyEvent
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
-import androidx.fragment.app.Fragment
+import androidx.leanback.app.BrowseSupportFragment
+import androidx.leanback.widget.ArrayObjectAdapter
+import androidx.leanback.widget.HeaderItem
+import androidx.leanback.widget.ListRow
+import androidx.leanback.widget.ListRowPresenter
+import androidx.leanback.widget.ListRowPresenter.SelectItemViewHolderTask
+import androidx.leanback.widget.OnItemViewClickedListener
+import androidx.leanback.widget.OnItemViewSelectedListener
+import androidx.leanback.widget.Presenter
+import androidx.leanback.widget.Row
+import androidx.leanback.widget.RowPresenter
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
+import com.lizongying.mytv.Utils.getDateTimestamp
-import androidx.recyclerview.widget.RecyclerView
-import com.lizongying.mytv.Utils.dpToPx
-import com.lizongying.mytv.api.YSP
-import com.lizongying.mytv.databinding.RowBinding
-import com.lizongying.mytv.databinding.ShowBinding
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-
+class MainFragment : BrowseSupportFragment() {
-class MainFragment : Fragment(), CardAdapter.ItemListener {
 
     private var itemPosition = 0
 
-    private var rowList: MutableList<View> = mutableListOf()
+    private var rowsAdapter: ArrayObjectAdapter? = null
 
-    private var _binding: ShowBinding? = null
+    private var request = Request()
-    private val binding get() = _binding!!
 
     var tvListViewModel = TVListViewModel()
 
+    private lateinit var sharedPref: SharedPreferences
+
     private var lastVideoUrl = ""
 
-    override fun onCreateView(
+    private val handler = Handler(Looper.getMainLooper())
-        inflater: LayoutInflater, container: ViewGroup?,
+    private lateinit var mUpdateProgramRunnable: UpdateProgramRunnable
-        savedInstanceState: Bundle?
+
-    ): View {
+    override fun onCreate(savedInstanceState: Bundle?) {
-        _binding = ShowBinding.inflate(inflater, container, false)
+        Log.i(TAG, "onCreate")
-        return binding.root
+        super.onCreate(savedInstanceState)
+        headersState = HEADERS_DISABLED
+    }
+
+    override fun onStart() {
+        Log.i(TAG, "onStart")
+        super.onStart()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        activity?.let { YSP.init(it) }
+        activity?.let { request.initYSP(it) }
+        sharedPref = (activity as? MainActivity)?.sharedPref!!
 
-        itemPosition = SP.itemPosition
+        loadRows()
 
-        view?.post {
+        setupEventListeners()
-            val content = binding.content
 
-            var idx: Long = 0
+        mUpdateProgramRunnable = UpdateProgramRunnable()
-            for ((k, v) in TVList.list) {
+        handler.post(mUpdateProgramRunnable)
-                val itemBinding: RowBinding =
-                    RowBinding.inflate(layoutInflater, content, false)
 
-                val tvListViewModelCurrent = TVListViewModel()
+        tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
-                for ((idx2, v1) in v.withIndex()) {
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
-                    val tvViewModel = TVViewModel(v1)
+                if (tvViewModel.errInfo.value != null
-                    tvViewModel.setRowPosition(idx.toInt())
+                    && tvViewModel.id.value == itemPosition
-                    tvViewModel.setItemPosition(idx2)
+                ) {
-                    tvListViewModelCurrent.addTVViewModel(tvViewModel)
+                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
-                    tvListViewModel.addTVViewModel(tvViewModel)
-
-                    updateEPG(tvViewModel)
                 }
-                tvListViewModel.maxNum.add(v.size)
-
-                val adapter =
-                    CardAdapter(
-                        itemBinding.rowItems,
-                        this,
-                        tvListViewModelCurrent,
-                    )
-                rowList.add(itemBinding.rowItems)
-
-                adapter.setItemListener(this)
-
-                itemBinding.rowHeader.text = k
-                itemBinding.rowItems.tag = idx.toInt()
-                itemBinding.rowItems.adapter = adapter
-                itemBinding.rowItems.layoutManager =
-                    GridLayoutManager(context, 6)
-                itemBinding.rowItems.layoutParams.height =
-                    dpToPx(92 * ((tvListViewModelCurrent.size() + 6 - 1) / 6))
-
-                itemBinding.rowItems.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                    override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                        super.onScrolled(recyclerView, dx, dy)
-                        (activity as MainActivity).mainActive()
-                    }
-                })
-
-                val itemDecoration = context?.let { GrayOverlayItemDecoration(it) }
-                if (itemDecoration != null) {
-                    itemBinding.rowItems.addItemDecoration(itemDecoration)
-                }
-
-                val layoutParams = itemBinding.row.layoutParams as ViewGroup.MarginLayoutParams
-                layoutParams.topMargin = dpToPx(11F)
-                itemBinding.row.layoutParams = layoutParams
-                content.addView(itemBinding.row)
-
-                idx++
             }
+            tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
 
-            if (itemPosition >= tvListViewModel.size()) {
+                // not first time && channel not change
-                itemPosition = 0
+                if (tvViewModel.ready.value != null
+                    && tvViewModel.id.value == itemPosition
+                    && check(tvViewModel)
+                ) {
+                    Log.i(TAG, "ready ${tvViewModel.title.value}")
+                    (activity as? MainActivity)?.play(tvViewModel)
+                }
             }
-
+            tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-            tvListViewModel.setItemPosition(itemPosition)
+                if (tvViewModel.change.value != null) {
-            tvListViewModel.tvListViewModel.value?.forEach { tvViewModel ->
+                    val title = tvViewModel.title.value
-                tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                    Log.i(TAG, "switch $title")
-                    if (tvViewModel.errInfo.value != null
+                    if (tvViewModel.pid.value != "") {
-                        && tvViewModel.id.value == itemPosition
+                        Log.i(TAG, "request $title")
-                    ) {
+                        lifecycleScope.launch(Dispatchers.IO) {
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
+                            tvViewModel.let { request.fetchData(it) }
-                            .show()
+                        }
-                    }
+                        (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                }
+                        setSelectedPosition(
-                tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
+                            tvViewModel.getRowPosition(), true,
-
+                            SelectItemViewHolderTask(tvViewModel.getItemPosition())
-                    // not first time && channel not change
+                        )
-                    if (tvViewModel.ready.value != null
+                    } else {
-                        && tvViewModel.id.value == itemPosition
+                        if (check(tvViewModel)) {
-                        && check(tvViewModel)
+                            (activity as? MainActivity)?.play(tvViewModel)
-                    ) {
-                        Log.i(TAG, "ready ${tvViewModel.title.value}")
-                        (activity as? MainActivity)?.play(tvViewModel)
-                    }
-                }
-                tvViewModel.change.observe(viewLifecycleOwner) { _ ->
-                    if (tvViewModel.change.value != null) {
-                        val title = tvViewModel.title.value
-                        Log.i(TAG, "switch $title")
-                        if (tvViewModel.pid.value != "") {
-                            Log.i(TAG, "request $title")
-                            lifecycleScope.launch(Dispatchers.IO) {
-                                tvViewModel.let { Request.fetchData(it) }
-                            }
                             (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                            setPosition(
+                            setSelectedPosition(
-                                tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
+                                tvViewModel.getRowPosition(), true,
+                                SelectItemViewHolderTask(tvViewModel.getItemPosition())
                             )
-                        } else {
-                            if (check(tvViewModel)) {
-                                // TODO lastVideoUrl
-                                (activity as? MainActivity)?.play(tvViewModel)
-                                (activity as? MainActivity)?.showInfoFragment(tvViewModel)
-                                setPosition(
-                                    tvViewModel.getRowPosition(), tvViewModel.getItemPosition()
-                                )
-                            }
                         }
                     }
                 }
             }
-            (activity as MainActivity).fragmentReady()
         }
+
+        (activity as MainActivity).fragmentReady()
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    fun toLastPosition() {
-        super.onViewCreated(view, savedInstanceState)
+        setSelectedPosition(
+            selectedPosition, false,
+            SelectItemViewHolderTask(tvListViewModel.maxNum[selectedPosition] - 1)
+        )
     }
 
-    override fun onKey(keyCode: Int): Boolean {
+    fun toFirstPosition() {
-        if (this.isHidden) {
+        setSelectedPosition(
-            when (keyCode) {
+            selectedPosition, false,
-                KeyEvent.KEYCODE_DPAD_UP -> {
+            SelectItemViewHolderTask(0)
-                    (activity as MainActivity).onKey(keyCode)
+        )
-                    return true
+    }
-                }
 
-                KeyEvent.KEYCODE_DPAD_DOWN -> {
+    override fun startHeadersTransition(withHeaders: Boolean) {
-                    (activity as MainActivity).onKey(keyCode)
+    }
-                    return true
+
+    private fun loadRows() {
+        rowsAdapter = ArrayObjectAdapter(ListRowPresenter())
+
+        val cardPresenter = CardPresenter(viewLifecycleOwner)
+
+        var idx: Long = 0
+        for ((k, v) in TVList.list) {
+            val listRowAdapter = ArrayObjectAdapter(cardPresenter)
+            for ((idx2, v1) in v.withIndex()) {
+                val tvViewModel = TVViewModel(v1)
+                tvViewModel.setRowPosition(idx.toInt())
+                tvViewModel.setItemPosition(idx2)
+                tvListViewModel.addTVViewModel(tvViewModel)
+                listRowAdapter.add(tvViewModel)
+            }
+            tvListViewModel.maxNum.add(v.size)
+            val header = HeaderItem(idx, k)
+            rowsAdapter!!.add(ListRow(header, listRowAdapter))
+            idx++
+        }
+
+        adapter = rowsAdapter
+
+        itemPosition = sharedPref.getInt(POSITION, 0)
+        if (itemPosition >= tvListViewModel.size()) {
+            itemPosition = 0
+        }
+        tvListViewModel.setItemPosition(itemPosition)
+    }
+
+    fun prevSource() {
+        view?.post {
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+            if (tvViewModel != null) {
+                if (tvViewModel.videoUrl.value!!.size > 1) {
+                    val videoIndex = tvViewModel.videoIndex.value?.minus(1)
+                    if (videoIndex == -1) {
+                        tvViewModel.setVideoIndex(tvViewModel.videoUrl.value!!.size - 1)
+                    }
+                    tvViewModel.changed()
                 }
             }
         }
-        return false
     }
 
-    override fun onItemHasFocus(tvViewModel: TVViewModel) {
+    fun nextSource() {
-        tvListViewModel.setItemPositionCurrent(tvViewModel.id.value!!)
+        view?.post {
-
+            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-        val row = tvViewModel.getRowPosition()
+            if (tvViewModel != null) {
-
+                if (tvViewModel.videoUrl.value!!.size > 1) {
-        for (i in rowList) {
+                    val videoIndex = tvViewModel.videoIndex.value?.plus(1)
-            if (i.tag as Int != row) {
+                    if (videoIndex == tvViewModel.videoUrl.value!!.size) {
-                ((i as RecyclerView).adapter as CardAdapter).clear()
+                        tvViewModel.setVideoIndex(0)
+                    }
+                    tvViewModel.changed()
+                }
             }
         }
-
-        (activity as MainActivity).mainActive()
     }
 
-    override fun onItemClicked(tvViewModel: TVViewModel) {
+    private fun setupEventListeners() {
-        Log.i(TAG, "onItemClicked")
+        onItemViewClickedListener = ItemViewClickedListener()
-        if (this.isHidden) {
+        onItemViewSelectedListener = ItemViewSelectedListener()
-            (activity as? MainActivity)?.switchMainFragment()
-            return
-        }
-
-        if (itemPosition != tvViewModel.id.value!!) {
-            itemPosition = tvViewModel.id.value!!
-            tvListViewModel.setItemPosition(itemPosition)
-            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-        }
-        (activity as? MainActivity)?.switchMainFragment()
     }
 
-    fun setPosition() {
+    private inner class ItemViewClickedListener : OnItemViewClickedListener {
-        val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
+        override fun onItemClicked(
-        rowList[tvViewModel!!.getRowPosition()].post {
+            itemViewHolder: Presenter.ViewHolder,
-            ((rowList[tvViewModel.getRowPosition()] as RecyclerView).layoutManager as GridLayoutManager).findViewByPosition(
+            item: Any,
-                tvViewModel.getItemPosition()
+            rowViewHolder: RowPresenter.ViewHolder,
-            )?.requestFocus()
+            row: Row
+        ) {
+            if (item is TVViewModel) {
+                if (itemPosition != item.id.value!!) {
+                    itemPosition = item.id.value!!
+                    tvListViewModel.setItemPosition(itemPosition)
+                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
+                }
+                (activity as? MainActivity)?.switchMainFragment()
+            }
         }
     }
 
-    fun setPosition(rowPosition: Int, itemPosition: Int) {
+    private inner class ItemViewSelectedListener : OnItemViewSelectedListener {
-        rowList[rowPosition].post {
+        override fun onItemSelected(
-            ((rowList[rowPosition] as RecyclerView).layoutManager as GridLayoutManager).findViewByPosition(
+            itemViewHolder: Presenter.ViewHolder?, item: Any?,
-                itemPosition
+            rowViewHolder: RowPresenter.ViewHolder, row: Row
-            )?.requestFocus()
+        ) {
+            if (item is TVViewModel) {
+                tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                (activity as MainActivity).mainActive()
+            }
         }
     }
 
@@ -284,37 +282,30 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         }
     }
 
-    private fun updateEPG(tvViewModel: TVViewModel) {
+    fun updateProgram(tvViewModel: TVViewModel) {
-        if (tvViewModel.getTV().channel == "港澳台") {
+        val timestamp = getDateTimestamp()
-            Request.fetchFEPG(tvViewModel)
+        if (timestamp - tvViewModel.programUpdateTime > 60) {
-        } else {
+            if (tvViewModel.program.value!!.isEmpty()) {
-            Request.fetchYEPG(tvViewModel)
+                tvViewModel.programUpdateTime = timestamp
+                request.fetchProgram(tvViewModel)
+            } else {
+                if (tvViewModel.program.value!!.last().et - timestamp < 600) {
+                    tvViewModel.programUpdateTime = timestamp
+                    request.fetchProgram(tvViewModel)
+                }
+            }
         }
     }
 
-    fun shouldHasFocus(tvModel: TVViewModel):Boolean {
+    inner class UpdateProgramRunnable : Runnable {
-        return tvModel == tvListViewModel.getTVViewModel(itemPosition)
+        override fun run() {
-    }
+            tvListViewModel.tvListViewModel.value?.filter { it.programId.value != null && it.programId.value != "" }
-
+                ?.forEach { tvViewModel ->
-    override fun onHiddenChanged(hidden: Boolean) {
+                    updateProgram(
-        super.onHiddenChanged(hidden)
+                        tvViewModel
-        if (!hidden) {
+                    )
-            val tvModel = tvListViewModel.getTVViewModel(itemPosition)
-            val rowPosition = tvModel?.getRowPosition()
-            val itemPosition = tvModel?.getItemPosition()
-            Log.i(TAG, "toPosition $rowPosition $itemPosition")
-            for (i in rowList) {
-                if (i.tag as Int == rowPosition) {
-                    ((i as RecyclerView).adapter as CardAdapter).toPosition(itemPosition!!)
-                    break
                 }
-            }
+            handler.postDelayed(this, 60000)
-        } else {
-            view?.post {
-//                for (i in rowList) {
-//                    ((i as RecyclerView).adapter as CardAdapter).visiable = false
-//                }
-            }
         }
     }
 
@@ -326,19 +317,19 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     override fun onStop() {
         Log.i(TAG, "onStop")
         super.onStop()
-        SP.itemPosition = itemPosition
+        with(sharedPref.edit()) {
+            putInt(POSITION, itemPosition)
+            apply()
+        }
         Log.i(TAG, "$POSITION $itemPosition saved")
     }
 
     override fun onDestroy() {
         Log.i(TAG, "onDestroy")
         super.onDestroy()
-    }
+        if (::mUpdateProgramRunnable.isInitialized) {
-
+            handler.removeCallbacks(mUpdateProgramRunnable)
-    override fun onDestroyView() {
+        }
-        Log.i(TAG, "onDestroyView")
-        super.onDestroyView()
-        _binding = null
     }
 
     companion object {

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

@@ -1,5 +1,6 @@
 package com.lizongying.mytv
 
+import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
@@ -10,12 +11,9 @@ 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
@@ -30,22 +28,20 @@ import retrofit2.Response
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
-import kotlin.math.max
 
 
-object Request {
+class 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()
@@ -54,16 +50,12 @@ object Request {
     private val input =
         """{"mver":"1","subver":"1.2","host":"www.yangshipin.cn/#/tv/home?pid=","referer":"","canvas":"YSPANGLE(Apple,ANGLEMetalRenderer:AppleM1Pro,UnspecifiedVersion)"}""".toByteArray()
 
-    private var listener: RequestListener? = null
+    init {
-
+        handler.post(tokenRunnable)
-    fun onCreate() {
-        Log.i(TAG, "onCreate")
-        fetchInfoV2()
     }
 
-    fun onDestroy() {
+    fun initYSP(context: Context) {
-        Log.i(TAG, "onDestroy")
+        ysp = YSP(context)
-        handler.removeCallbacks(tokenRunnable)
     }
 
     var call: Call<LiveInfo>? = null
@@ -74,9 +66,9 @@ object Request {
 
         val title = tvModel.title.value
 
-        val data = YSP.getAuthData(tvModel)
+        val data = ysp?.getAuthData(tvModel)
-        val request = AuthRequest(data)
+        val request = data?.let { AuthRequest(it) }
-        callAuth = request.let { yspApiService.getAuth("guid=${YSP.getGuid()}; $cookie", it) }
+        callAuth = request?.let { yspApiService.getAuth("guid=${ysp?.getGuid()}; $cookie", it) }
 
         callAuth?.enqueue(object : Callback<Auth> {
             override fun onResponse(call: Call<Auth>, response: Response<Auth>) {
@@ -85,7 +77,7 @@ object Request {
 
                     if (liveInfo?.data?.token != null) {
                         Log.i(TAG, "token ${liveInfo.data.token}")
-                        YSP.token = liveInfo.data.token
+                        ysp?.token = liveInfo.data.token
                         fetchVideo(tvModel, cookie)
                     } else {
                         Log.e(TAG, "$title token error")
@@ -147,7 +139,6 @@ object Request {
     }
 
     fun fetchVideo(tvModel: TVViewModel, cookie: String) {
-        Log.i(TAG, "fetchVideo with cookie")
         call?.cancel()
         if (::btraceRunnable.isInitialized) {
             handler.removeCallbacks(btraceRunnable)
@@ -156,12 +147,12 @@ object Request {
         val title = tvModel.title.value
 
         tvModel.seq = 0
-        val data = YSP.switch(tvModel)
+        val data = ysp?.switch(tvModel)
-        val request = LiveInfoRequest(data)
+        val request = data?.let { LiveInfoRequest(it) }
-        call = request.let {
+        call = request?.let {
             yspApiService.getLiveInfo(
-                "guid=${YSP.getGuid()}; $cookie",
+                "guid=${ysp?.getGuid()}; $cookie",
-                YSP.token,
+                ysp!!.token,
                 it
             )
         }
@@ -332,7 +323,6 @@ object Request {
     }
 
     fun fetchVideo(tvModel: TVViewModel) {
-        Log.d(TAG, "fetchVideo")
         if (token == "") {
             yspTokenService.getInfo("")
                 .enqueue(object : Callback<Info> {
@@ -387,12 +377,7 @@ object Request {
 
         val title = tvModel.title.value
 
-        var qa = "HD"
+        fAuth = fAuthService.getAuth(tvModel.getTV().pid, "HD")
-        if (tokenFH != "") {
-            qa = "FHD"
-        }
-
-        fAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
         fAuth?.enqueue(object : Callback<FAuth> {
             override fun onResponse(call: Call<FAuth>, response: Response<FAuth>) {
                 if (response.isSuccessful && response.body()?.data?.live_url != null) {
@@ -400,9 +385,9 @@ object Request {
 //                    Log.d(TAG, "$title url $url")
                     tvModel.addVideoUrl(url)
                     tvModel.allReady()
-                    tvModel.tokenRetryTimes = 0
+                    tvModel.retryTimes = 0
                 } else {
-                    Log.e(TAG, "auth status error ${response.code()}")
+                    Log.e(TAG, "auth status error")
                     if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
                         tvModel.tokenRetryTimes++
                         fetchFAuth(tvModel)
@@ -421,7 +406,6 @@ object Request {
     }
 
     fun fetchData(tvModel: TVViewModel) {
-        Log.i(TAG, "fetchData")
         if (tvModel.getTV().channel == "港澳台") {
             fetchFAuth(tvModel)
             return
@@ -444,121 +428,32 @@ object Request {
         }
     }
 
-    class TokenRunnable : Runnable {
+    inner class TokenRunnable : Runnable {
         override fun run() {
             fetchToken()
+            handler.postDelayed(this, 600000)
         }
     }
 
-    private fun fetchInfoV2() {
-        yspTokenService.getInfoV2()
-            .enqueue(object : Callback<InfoV2> {
-                override fun onResponse(call: Call<InfoV2>, response: Response<InfoV2>) {
-                    if (response.isSuccessful) {
-                        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")
-                        }
-                    } else {
-                        Log.e(TAG, "token status error")
-                        handler.postDelayed(
-                            tokenRunnable,
-                            30 * 60 * 1000
-                        )
-                    }
-                    listener?.onRequestFinished()
-                }
-
-                override fun onFailure(call: Call<InfoV2>, t: Throwable) {
-                    Log.e(TAG, "token request error $t")
-                    handler.postDelayed(
-                        tokenRunnable,
-                        30 * 60 * 1000
-                    )
-                    listener?.onRequestFinished()
-                }
-            })
-    }
-
     fun fetchToken() {
-        yspTokenService.getToken(token)
+        yspTokenService.getInfo(token)
-            .enqueue(object : Callback<Token> {
+            .enqueue(object : Callback<Info> {
-                override fun onResponse(call: Call<Token>, response: Response<Token>) {
+                override fun onResponse(call: Call<Info>, response: Response<Info>) {
                     if (response.isSuccessful) {
-                        val t = response.body()?.t
+                        token = response.body()?.data?.token!!
-                        val e = response.body()?.e
+                        Log.i(TAG, "info success $token")
-                        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) {
+                override fun onFailure(call: Call<Info>, t: Throwable) {
                     Log.e(TAG, "token request error $t")
-                    handler.postDelayed(
-                        tokenRunnable,
-                        30 * 60 * 1000
-                    )
                 }
             })
     }
 
-    class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
+    inner class BtraceRunnable(private val tvModel: TVViewModel) : Runnable {
         override fun run() {
             fetchBtrace(tvModel)
             handler.postDelayed(this, 60000)
@@ -568,11 +463,11 @@ object 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,
@@ -580,7 +475,7 @@ object 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(),
         )
@@ -634,7 +529,7 @@ object Request {
         })
     }
 
-    fun fetchYEPG(tvViewModel: TVViewModel) {
+    fun fetchProgram(tvViewModel: TVViewModel) {
         val title = tvViewModel.title.value
         yspProtoService.getProgram(tvViewModel.programId.value!!, getDateFormat("yyyyMMdd"))
             .enqueue(object : Callback<epgProgramModel.Response> {
@@ -645,7 +540,7 @@ object Request {
                     if (response.isSuccessful) {
                         val program = response.body()
                         if (program != null) {
-                            tvViewModel.addYEPG(program.dataListList)
+                            tvViewModel.addProgram(program.dataListList)
                             Log.d(TAG, "$title program ${program.dataListList.size}")
                         }
                     } else {
@@ -659,31 +554,6 @@ object Request {
             })
     }
 
-    fun fetchFEPG(tvViewModel: TVViewModel) {
-        val title = tvViewModel.title.value
-        fAuthService.getEPG(tvViewModel.pid.value!!, getDateFormat("yyyyMMdd"))
-            .enqueue(object : Callback<List<FEPG>> {
-                override fun onResponse(
-                    call: Call<List<FEPG>>,
-                    response: Response<List<FEPG>>
-                ) {
-                    if (response.isSuccessful) {
-                        val program = response.body()
-                        if (program != null) {
-                            tvViewModel.addFEPG(program)
-                            Log.d(TAG, "$title program ${program.size}")
-                        }
-                    } else {
-                        Log.w(TAG, "$title program error")
-                    }
-                }
-
-                override fun onFailure(call: Call<List<FEPG>>, t: Throwable) {
-                    Log.e(TAG, "$title program request failed $t")
-                }
-            })
-    }
-
     private fun encryptTripleDES(key: ByteArray, iv: ByteArray): String {
         return try {
             val keySpec = SecretKeySpec(key, "DESede")
@@ -697,11 +567,7 @@ object Request {
         }
     }
 
-    interface RequestListener {
+    companion object {
-        fun onRequestFinished()
+        private const val TAG = "Request"
-    }
-
-    fun setRequestListener(listener: RequestListener) {
-        this.listener = listener
     }
 }

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

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

@@ -39,21 +39,21 @@ class SettingFragment(
         val switchChannelReversal = _binding?.switchChannelReversal
         switchChannelReversal?.isChecked = channelReversal
         switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
-            SP.channelReversal = isChecked
+            (activity as MainActivity).saveChannelReversal(isChecked)
             (activity as MainActivity).settingActive()
         }
 
         val switchChannelNum = _binding?.switchChannelNum
         switchChannelNum?.isChecked = channelNum
         switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
-            SP.channelNum = isChecked
+            (activity as MainActivity).saveChannelNum(isChecked)
             (activity as MainActivity).settingActive()
         }
 
         val switchBootStartup = _binding?.switchBootStartup
         switchBootStartup?.isChecked = bootStartup
         switchBootStartup?.setOnCheckedChangeListener { _, isChecked ->
-            SP.bootStartup = isChecked
+            (activity as MainActivity).saveBootStartup(isChecked)
             (activity as MainActivity).settingActive()
         }
 

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

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

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

@@ -26,10 +26,6 @@ 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,11 +1,7 @@
 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
@@ -72,36 +68,6 @@ 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(
@@ -127,12 +93,11 @@ class ApiClient {
             val sslContext = SSLContext.getInstance("SSL")
             sslContext.init(null, trustAllCerts, java.security.SecureRandom())
 
-            val builder = OkHttpClient.Builder()
+            return 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,22 +2,12 @@ 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

@@ -1,7 +0,0 @@
-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,5 +1,6 @@
 package com.lizongying.mytv.api
 
+
 data class Info(
     val code: Int?,
     val msg: String?,
@@ -10,18 +11,6 @@ data class Info(
     )
 }
 
-data class Token(
-    val e: Int?,
-    val t: String?,
-)
-
-data class InfoV2(
-    val f: String?,
-    val t: String?,
-    val e: Int?,
-    val c: Int?,
-)
-
 data class Release(
     val code: Int?,
     val msg: String?,

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

@@ -1,74 +0,0 @@
-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,17 +1,15 @@
 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
 
-object YSP {
+class YSP(var context: Context) {
-    private const val TAG = "YSP"
-
     private var cnlid = ""
 
     private var livepid = ""
@@ -55,10 +53,17 @@ object YSP {
     private var appid = "ysp_pc"
     var token = ""
 
-    private var encryptor = Encryptor()
+    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
+        }
 
-    fun init(context: Context) {
-        encryptor.init(context)
         guid = getGuid()
     }
 
@@ -76,7 +81,7 @@ object YSP {
         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"}"""
     }
@@ -105,17 +110,23 @@ object YSP {
     }
 
     fun getGuid(): String {
-        var guid = SP.guid
+        var guid = sharedPref.getString("guid", "")
-        if (guid.length < 18) {
+        if (guid == null || guid.length < 18) {
             guid = generateGuid()
-            SP.guid = guid
+            with(sharedPref.edit()) {
+                putString("guid", guid)
+                apply()
+            }
         }
         return guid
     }
 
     private fun newGuid(): String {
         guid = generateGuid()
-        SP.guid = guid
+        with(sharedPref.edit()) {
+            putString("guid", guid)
+            apply()
+        }
         return guid
     }
 
@@ -132,14 +143,18 @@ object YSP {
     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,13 +10,4 @@ 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

@@ -1,7 +0,0 @@
-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,10 +11,8 @@ 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.api.FEPG
+import com.lizongying.mytv.Utils.getDateTimestamp
 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() {
 
@@ -35,9 +33,9 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val programId: LiveData<String>
         get() = _programId
 
-    private var _epg = MutableLiveData<MutableList<EPG>>()
+    private var _program = MutableLiveData<MutableList<Program>>()
-    val epg: LiveData<MutableList<EPG>>
+    val program: LiveData<MutableList<Program>>
-        get() = _epg
+        get() = _program
 
     private val _id = MutableLiveData<Int>()
     val id: LiveData<Int>
@@ -55,8 +53,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val videoIndex: LiveData<Int>
         get() = _videoIndex
 
-    private val _logo = MutableLiveData<Any>()
+    private val _logo = MutableLiveData<String>()
-    val logo: LiveData<Any>
+    val logo: LiveData<String>
         get() = _logo
 
     private val _pid = MutableLiveData<String>()
@@ -75,8 +73,11 @@ 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")) {
@@ -113,6 +114,10 @@ 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
@@ -122,8 +127,10 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _programId.value = tv.programId
         _pid.value = tv.pid
         _sid.value = tv.sid
+        _program.value = mutableListOf()
     }
 
+
     fun getRowPosition(): Int {
         return rowPosition
     }
@@ -152,30 +159,48 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         return tv
     }
 
-    fun addYEPG(p: MutableList<Program>) {
+    fun getProgramOne(): Program? {
-        _epg.value = p.map { EPG(it.name, it.st.toInt()) }.toMutableList()
+        val programNew =
-    }
+            (_program.value?.filter { it.et > getDateTimestamp() })?.toMutableList()
-
+        if (programNew != null && _program.value != programNew) {
-    private fun formatFTime(s: String): Int {
+            _program.value = programNew
-        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
+        if (_program.value!!.isEmpty()) {
+            return null
+        }
+        return _program.value?.first()
     }
 
-    fun addFEPG(p: List<FEPG>) {
+    fun addProgram(p: MutableList<Program>) {
-        _epg.value = p.map { EPG(it.title, formatFTime(it.event_time)) }.toMutableList()
+        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 var mHeaders: Map<String, String>? = mapOf()
 
     fun setHeaders(headers: Map<String, String>) {
         mHeaders = headers
     }
 
+    fun setMinimumLoadableRetryCount(minimumLoadableRetryCount: Int) {
+        mMinimumLoadableRetryCount = minimumLoadableRetryCount
+    }
+
     /**
      * (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
      */

app/src/main/res/layout/row.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/row_header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:layout_marginTop="0dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginBottom="5dp"
-        android:gravity="start"
-        android:textColor="#FFEEEEEE"
-        android:textSize="22sp" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/row_items"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-    </androidx.recyclerview.widget.RecyclerView>
-</LinearLayout>

app/src/main/res/layout/show.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/show_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ScrollView
-        android:id="@+id/scroll_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-        <LinearLayout
-            android:id="@+id/content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-        </LinearLayout>
-    </ScrollView>
-</FrameLayout>

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

@@ -863,7 +863,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",
@@ -878,7 +878,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",
@@ -893,7 +893,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",
@@ -908,7 +908,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",
@@ -923,7 +923,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",
@@ -939,7 +939,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",

app/src/main/res/values/colors.xml

@@ -2,5 +2,4 @@
     <color name="fastlane_background">#30000000</color>
     <color name="black">#000</color>
     <color name="white">#FFF</color>
-    <color name="gray_overlay">#7F000000</color>
 </resources>

app/src/main/res/values/server.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="server_url">http://localhost:8080</string>
+    <integer name="local_channel_version">1</integer>
+    <string name="server_version_url">https://fastly.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@main/version.txt</string>
+    <string name="server_url">https://fastly.jsdelivr.net/gh/LeGend-wLw/my-tv-json-utils@main/channels.json</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -1,25 +1,10 @@
 <resources>
 
     <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
-        <item name="cardType">infoUnder</item>
+        <item name="lbImageCardViewType">Title|Content</item>
-        <item name="infoVisibility">always</item>
-        <!-- In order to keep backward compatibility we have to create an icon on right. -->
-        <item name="lbImageCardViewType">Title|Content|IconOnRight</item>
-        <!-- Deprecated. Use 'Widget.Leanback.ImageCardView.InfoAreaStyle' instead. -->
-        <item name="infoAreaBackground">@null</item>
-    </style>
-
-    <style name="CustomImageCardViewImageStyle" parent="Widget.Leanback.ImageCardView.ImageStyle">
-        <item name="android:layout_width">160dp</item>
-        <item name="android:layout_height">40dp</item>
-        <item name="android:adjustViewBounds">true</item>
-        <item name="android:contentDescription">@null</item>
-        <item name="android:scaleType">centerCrop</item>
-        <item name="layout_viewType">main</item>
     </style>
 
     <style name="CustomImageCardTheme" parent="Theme.Leanback">
         <item name="imageCardViewStyle">@style/CustomImageCardViewStyle</item>
-        <item name="imageCardViewImageStyle">@style/CustomImageCardViewImageStyle</item>
     </style>
 </resources>