opitimize request

HISTORY.md

@@ -1,5 +1,20 @@
 ## 更新日志
 
+### v1.9.0（通用）
+
+* 减少视频播放失败情况
+* 全面屏手机居中显示
+
+### v1.8.8（通用）
+
+* 样式优化
+
+### v1.8.6（通用）
+
+* 增加错误显示
+* 节目预告优化
+* 频道列表页单击切换频道
+
 ### v1.8.4（通用）
 
 * 解決部分情況下打開後黑屏问题

README.md

@@ -4,17 +4,16 @@
 
 ## 使用
 
-下载安装:
-[github](https://github.com/lizongying/my-tv/releases/)
-[gitee](https://gitee.com/lizongying/my-tv/releases/)
-
-小米电视可以使用小米电视助手进行安装
-
-如电视可以启用ADB，也可以通过ADB进行安装：
-
-```shell
-adb install my-tv.apk
-```
+1. 下载
+    * [github](https://github.com/lizongying/my-tv/releases/)
+    * [gitee](https://gitee.com/lizongying/my-tv/releases/)
+2. 安裝
+    * U盘安装
+    * 小米电视可以使用小米电视助手进行安装
+    * 如电视可以启用ADB，也可以通过ADB进行安装
+       ```shell
+       adb install my-tv.apk
+       ```
 
 ![image](./screenshots/img_3.png)
 ![image](./screenshots/img_2.png)
@@ -32,14 +31,11 @@ adb install my-tv.apk
 * 地方频道
 * 收藏夹
 * 海外
-* 1.5.0 无法安装，1.5.1 可以安装
-* 节目增加预告
-* epg更新后菜单更新
 * 隐藏频道
 * 亮度调节
 * 音量调节
-* 错误页
-* 频道列表页只点击一次即可
+* 軟解
+* 自動更新
 
 ## 版权说明
 

app/src/main/AndroidManifest.xml

@@ -36,6 +36,9 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.windowLayoutInDisplayCutoutMode"
+                android:value="shortEdges" />
         </activity>
 
         <receiver
@@ -58,5 +61,7 @@
             android:name=".InitializerProvider"
             android:authorities="${applicationId}.InitializerProvider"
             android:exported="false" />
+
+        <meta-data android:name="android.max_aspect" android:value="2.5" />
     </application>
 </manifest>

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

@@ -1,8 +1,11 @@
 package com.lizongying.mytv
 
+import android.util.Log
 import android.view.KeyEvent
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
+import android.view.ViewConfiguration
 import android.view.ViewGroup
 import android.view.animation.ScaleAnimation
 import androidx.core.view.marginTop
@@ -12,6 +15,7 @@ import com.bumptech.glide.Glide
 import com.lizongying.mytv.databinding.CardBinding
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
+import kotlin.math.abs
 
 
 class CardAdapter(
@@ -45,6 +49,7 @@ class CardAdapter(
         binding.desc.layoutParams = layoutParams
 
         val cardView = binding.root
+        cardView.isClickable = true
         cardView.isFocusable = true
         cardView.isFocusableInTouchMode = true
         return ViewHolder(cardView, binding)
@@ -55,14 +60,14 @@ class CardAdapter(
         recyclerView.invalidate()
     }
 
-    private fun startScaleAnimation(view: View, fromScale: Float, toScale: Float, duration: Long) {
+    private fun startScaleAnimation(view: View) {
         val scaleAnimation = ScaleAnimation(
-            fromScale, toScale,
-            fromScale, toScale,
+            0.9f, 1.0f,
+            0.9f, 1.0f,
             ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
             ScaleAnimation.RELATIVE_TO_SELF, 0.5f
         )
-        scaleAnimation.duration = duration
+        scaleAnimation.duration = 200
         scaleAnimation.fillAfter = false
         view.startAnimation(scaleAnimation)
     }
@@ -80,7 +85,7 @@ class CardAdapter(
                 focused = cardView
 
                 if (focusable) {
-                    startScaleAnimation(cardView, 0.9f, 1.0f, 200)
+                    startScaleAnimation(cardView)
                     viewHolder.focus(true)
                 }
             } else {
@@ -94,6 +99,34 @@ class CardAdapter(
             listener?.onItemClicked(item)
         }
 
+        var downX = 0f
+        var downY = 0f
+        val touchSlop = ViewConfiguration.get(cardView.context).scaledTouchSlop
+
+        cardView.setOnTouchListener { _, event ->
+            when (event.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    downX = event.x
+                    downY = event.y
+                    true
+                }
+
+                MotionEvent.ACTION_UP -> {
+                    val upX = event.x
+                    val upY = event.y
+                    val deltaX = abs(upX - downX)
+                    val deltaY = abs(upY - downY)
+                    if (deltaX < touchSlop && deltaY < touchSlop) {
+                        // 如果位移量小于阈值，则执行点击操作
+                        cardView.performClick()
+                    }
+                    true
+                }
+
+                else -> false
+            }
+        }
+
         cardView.setOnKeyListener { _, keyCode, event: KeyEvent? ->
             if (event?.action == KeyEvent.ACTION_DOWN) {
                 return@setOnKeyListener listener?.onKey(keyCode) ?: false
@@ -132,6 +165,33 @@ class CardAdapter(
         }
     }
 
+    fun updateEPG() {
+        for (i in 0 until recyclerView.childCount) {
+            val childView = recyclerView.getChildAt(i)
+
+            val viewHolder = recyclerView.getChildViewHolder(childView) as ViewHolder
+
+            if (viewHolder.view.tag != null && viewHolder.view.tag is TVViewModel) {
+                val tvViewModel = viewHolder.view.tag as TVViewModel
+
+                val epg = tvViewModel.epg.value?.filter { it.beginTime < Utils.getDateTimestamp() }
+
+                if (!epg.isNullOrEmpty()) {
+                    val title = epg.last().title
+                    if (viewHolder.binding.desc.text != title) {
+                        viewHolder.binding.desc.text = title
+                        Log.i(TAG, "updateEPG $title")
+                    }
+                } else {
+                    if (viewHolder.binding.desc.text != "") {
+                        viewHolder.binding.desc.text = ""
+                        Log.i(TAG, "updateEPG")
+                    }
+                }
+            }
+        }
+    }
+
     fun toPosition(position: Int) {
         recyclerView.post {
             recyclerView.scrollToPosition(position)

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

@@ -6,7 +6,7 @@ import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.marginRight
+import androidx.core.view.marginEnd
 import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import com.lizongying.mytv.databinding.ChannelBinding
@@ -30,38 +30,20 @@ class ChannelFragment : Fragment() {
 
         val application = requireActivity().applicationContext as MyTvApplication
 
-        val width = application.getWidth()
-        val height = application.getHeight()
-
-        val ratio = 16f / 9f
-
-        if (width.toFloat() / height > ratio) {
-            val x =
-                ((Resources.getSystem().displayMetrics.widthPixels - height * ratio) / 2).toInt()
-            val originalLayoutParams =
-                binding.channel.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.rightMargin += x
-            binding.channel.layoutParams = originalLayoutParams
-        }
-
-        if (width.toFloat() / height < ratio) {
-            val y =
-                ((height - Resources.getSystem().displayMetrics.widthPixels / ratio) / 2).toInt()
-            val originalLayoutParams =
-                binding.channel.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.topMargin += y
-            binding.channel.layoutParams = originalLayoutParams
-        }
-
         binding.channel.layoutParams.width = application.px2Px(binding.channel.layoutParams.width)
         binding.channel.layoutParams.height = application.px2Px(binding.channel.layoutParams.height)
+
         val layoutParams = binding.channel.layoutParams as ViewGroup.MarginLayoutParams
         layoutParams.topMargin = application.px2Px(binding.channel.marginTop)
-        layoutParams.rightMargin = application.px2Px(binding.channel.marginRight)
+        layoutParams.marginEnd = application.px2Px(binding.channel.marginEnd)
         binding.channel.layoutParams = layoutParams
+
         binding.content.textSize = application.px2PxFont(binding.content.textSize)
 
-        (activity as MainActivity).fragmentReady("ChannelFragment")
+        binding.main.layoutParams.width = application.shouldWidthPx()
+        binding.main.layoutParams.height = application.shouldHeightPx()
+
+        (activity as MainActivity).fragmentReady(TAG)
         return binding.root
     }
 

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

@@ -0,0 +1,49 @@
+package com.lizongying.mytv
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.marginStart
+import androidx.core.view.marginTop
+import androidx.fragment.app.Fragment
+import com.lizongying.mytv.databinding.ErrorBinding
+
+class ErrorFragment : Fragment() {
+    private var _binding: ErrorBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = ErrorBinding.inflate(inflater, container, false)
+
+        val application = requireActivity().applicationContext as MyTvApplication
+
+        binding.logo.layoutParams.width = application.px2Px(binding.logo.layoutParams.width)
+        binding.logo.layoutParams.height = application.px2Px(binding.logo.layoutParams.height)
+
+        val layoutParams = binding.msg.layoutParams as ViewGroup.MarginLayoutParams
+        layoutParams.topMargin = application.px2Px(binding.msg.marginTop)
+        binding.msg.layoutParams = layoutParams
+
+        binding.msg.textSize = application.px2PxFont(binding.msg.textSize)
+
+        (activity as MainActivity).fragmentReady(TAG)
+        return binding.root
+    }
+
+    fun show(msg: String) {
+        binding.msg.text = msg
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        private const val TAG = "ErrorFragment"
+    }
+}

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

@@ -8,7 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.marginBottom
-import androidx.core.view.marginLeft
+import androidx.core.view.marginStart
 import androidx.core.view.marginTop
 import androidx.core.view.setPadding
 import androidx.fragment.app.Fragment
@@ -30,45 +30,43 @@ class InfoFragment : Fragment() {
         _binding = InfoBinding.inflate(inflater, container, false)
 
         val application = requireActivity().applicationContext as MyTvApplication
-        val width = application.getWidth()
-        val height = application.getHeight()
-
-        val ratio = 16f / 9f
-
-        if (width.toFloat() / height < ratio) {
-            val y =
-                ((height - Resources.getSystem().displayMetrics.widthPixels / ratio) / 2).toInt()
-            val originalLayoutParams = binding.info.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.bottomMargin += y
-            binding.info.layoutParams = originalLayoutParams
-        }
 
         binding.info.layoutParams.width = application.px2Px(binding.info.layoutParams.width)
         binding.info.layoutParams.height = application.px2Px(binding.info.layoutParams.height)
+
         val layoutParams = binding.info.layoutParams as ViewGroup.MarginLayoutParams
         layoutParams.bottomMargin = application.px2Px(binding.info.marginBottom)
         binding.info.layoutParams = layoutParams
+
         binding.logo.layoutParams.width = application.px2Px(binding.logo.layoutParams.width)
         binding.logo.setPadding(application.px2Px(binding.logo.paddingTop))
         binding.main.layoutParams.width = application.px2Px(binding.main.layoutParams.width)
         binding.main.setPadding(application.px2Px(binding.main.paddingTop))
+
         val layoutParamsMain = binding.main.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsMain.leftMargin = application.px2Px(binding.main.marginLeft)
+        layoutParamsMain.marginStart = application.px2Px(binding.main.marginStart)
         binding.main.layoutParams = layoutParamsMain
 
         val layoutParamsDesc = binding.desc.layoutParams as ViewGroup.MarginLayoutParams
         layoutParamsDesc.topMargin = application.px2Px(binding.desc.marginTop)
         binding.desc.layoutParams = layoutParamsDesc
+
         binding.title.textSize = application.px2PxFont(binding.title.textSize)
         binding.desc.textSize = application.px2PxFont(binding.desc.textSize)
 
+        binding.container.layoutParams.width = application.shouldWidthPx()
+        binding.container.layoutParams.height = application.shouldHeightPx()
+
         _binding!!.root.visibility = View.GONE
 
-        (activity as MainActivity).fragmentReady("InfoFragment")
+        (activity as MainActivity).fragmentReady(TAG)
         return binding.root
     }
 
     fun show(tvViewModel: TVViewModel) {
+        if (_binding == null) {
+            return
+        }
         binding.title.text = tvViewModel.getTV().title
 
         Glide.with(this)

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

@@ -0,0 +1,37 @@
+package com.lizongying.mytv
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.lizongying.mytv.databinding.LoadingBinding
+
+class LoadingFragment : Fragment() {
+    private var _binding: LoadingBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = LoadingBinding.inflate(inflater, container, false)
+
+        val application = requireActivity().applicationContext as MyTvApplication
+
+        binding.bar.layoutParams.width = application.px2Px(binding.bar.layoutParams.width)
+        binding.bar.layoutParams.height = application.px2Px(binding.bar.layoutParams.height)
+
+        (activity as MainActivity).fragmentReady(TAG)
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        private const val TAG = "LoadingFragment"
+    }
+}

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

@@ -11,12 +11,17 @@ import android.util.Log
 import android.view.GestureDetector
 import android.view.KeyEvent
 import android.view.MotionEvent
+import android.view.View.SYSTEM_UI_FLAG_FULLSCREEN
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+import android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+import android.view.View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
 import android.view.WindowManager
 import android.widget.Toast
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
 import com.lizongying.mytv.models.TVViewModel
+import com.lizongying.mytv.requests.Request
 import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -27,6 +32,9 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
 
     private var ready = 0
     private val playerFragment = PlayerFragment()
+    private val errorFragment = ErrorFragment()
+
+    //    private val loadingFragment = LoadingFragment()
     private val mainFragment = MainFragment()
     private val infoFragment = InfoFragment()
     private val channelFragment = ChannelFragment()
@@ -53,47 +61,68 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Log.i(TAG, "onCreate")
         super.onCreate(savedInstanceState)
-
         setContentView(R.layout.activity_main)
 
         Request.setRequestListener(this)
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            val lp = window.attributes
+            lp.layoutInDisplayCutoutMode =
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+            window.setAttributes(lp)
+        }
+
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
-        window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
+        window.decorView.systemUiVisibility =
+            SYSTEM_UI_FLAG_FULLSCREEN or
+                    SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or SYSTEM_UI_FLAG_HIDE_NAVIGATION or
+                    SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+//            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+//            window.statusBarColor = Color.TRANSPARENT
+//            window.navigationBarColor = Color.TRANSPARENT
+//        }
 
         if (savedInstanceState == null) {
             supportFragmentManager.beginTransaction()
                 .add(R.id.main_browse_fragment, playerFragment)
+                .add(R.id.main_browse_fragment, errorFragment)
+//                .add(R.id.main_browse_fragment, loadingFragment)
                 .add(R.id.main_browse_fragment, timeFragment)
                 .add(R.id.main_browse_fragment, infoFragment)
                 .add(R.id.main_browse_fragment, channelFragment)
                 .add(R.id.main_browse_fragment, mainFragment)
                 .hide(mainFragment)
+                .hide(errorFragment)
+//                .hide(loadingFragment)
+                .hide(timeFragment)
                 .commit()
         }
         gestureDetector = GestureDetector(this, GestureListener())
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            val connectivityManager =
-                getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            connectivityManager.registerDefaultNetworkCallback(object :
-                ConnectivityManager.NetworkCallback() {
-                override fun onAvailable(network: Network) {
-                    super.onAvailable(network)
-                    Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
-                    if (this@MainActivity.isNetworkConnected) {
-                        Log.i(TAG, "net isNetworkConnected")
-                        ready++
-                    }
-                }
-            })
-        } else {
-            Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
-            ready++
-        }
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+//            val connectivityManager =
+//                getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+//            connectivityManager.registerDefaultNetworkCallback(object :
+//                ConnectivityManager.NetworkCallback() {
+//                override fun onAvailable(network: Network) {
+//                    super.onAvailable(network)
+//                    Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
+//                    if (this@MainActivity.isNetworkConnected) {
+//                        Log.i(TAG, "net isNetworkConnected")
+//                        ready++
+//                    }
+//                }
+//            })
+//        } else {
+//            Log.i(TAG, "net ${Build.VERSION.SDK_INT}")
+//            ready++
+//        }
+
+        showTime()
+        mainFragment.changeMenu()
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
@@ -103,6 +132,44 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         }
     }
 
+    fun showErrorFragment(msg: String) {
+        errorFragment.show(msg)
+        if (errorFragment.isVisible) {
+            return
+        }
+        supportFragmentManager.beginTransaction()
+            .show(errorFragment)
+            .commit()
+    }
+
+    fun hideErrorFragment() {
+        errorFragment.show("")
+        if (!errorFragment.isVisible) {
+            return
+        }
+        supportFragmentManager.beginTransaction()
+            .hide(errorFragment)
+            .commit()
+    }
+
+    fun showPlayerFragment() {
+        if (playerFragment.isVisible) {
+            return
+        }
+        supportFragmentManager.beginTransaction()
+            .show(playerFragment)
+            .commit()
+    }
+
+    fun hidePlayerFragment() {
+        if (!playerFragment.isVisible) {
+            return
+        }
+        supportFragmentManager.beginTransaction()
+            .hide(playerFragment)
+            .commit()
+    }
+
     private fun showChannel(channel: String) {
         if (!mainFragment.isHidden) {
             return
@@ -156,6 +223,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         handler.removeCallbacks(hideSetting)
         handler.postDelayed(hideSetting, delayHideSetting)
         showTime()
+        mainFragment.changeMenu()
     }
 
     fun settingNeverHide() {
@@ -185,18 +253,35 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         Log.i(TAG, "ready $tag $ready ")
         if (ready == 7) {
             mainFragment.fragmentReady()
-            showTime()
         }
     }
 
     private fun showTime() {
-        Log.i(TAG, "showTime ${SP.time}")
         if (SP.time) {
-            timeFragment.show()
+            showFragment(timeFragment)
         } else {
-            timeFragment.hide()
+            hideFragment(timeFragment)
         }
-        mainFragment.changeStyle()
+    }
+
+    private fun showFragment(fragment: Fragment) {
+        if (!fragment.isHidden) {
+            return
+        }
+
+        supportFragmentManager.beginTransaction()
+            .show(fragment)
+            .commitNow()
+    }
+
+    private fun hideFragment(fragment: Fragment) {
+        if (fragment.isHidden) {
+            return
+        }
+
+        supportFragmentManager.beginTransaction()
+            .hide(fragment)
+            .commitNow()
     }
 
     override fun onTouchEvent(event: MotionEvent?): Boolean {
@@ -271,6 +356,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         if (settingFragment.isVisible) {
             settingFragment.dismiss()
             showTime()
+            mainFragment.changeMenu()
         }
     }
 

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

@@ -1,6 +1,7 @@
 package com.lizongying.mytv
 
 import android.content.res.Resources
+import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
@@ -9,7 +10,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.view.marginBottom
-import androidx.core.view.marginLeft
+import androidx.core.view.marginStart
 import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
@@ -20,8 +21,10 @@ import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.databinding.MenuBinding
 import com.lizongying.mytv.databinding.RowBinding
 import com.lizongying.mytv.models.ProgramType
+import com.lizongying.mytv.models.TVList
 import com.lizongying.mytv.models.TVListViewModel
 import com.lizongying.mytv.models.TVViewModel
+import com.lizongying.mytv.requests.Request
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -49,37 +52,10 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
 
         application = requireActivity().applicationContext as MyTvApplication
 
-        val width = application.getWidth()
-        val height = application.getHeight()
+        binding.menu.layoutParams.width = application.shouldWidthPx()
+        binding.menu.layoutParams.height = application.shouldHeightPx()
 
-        val ratio = 16f / 9f
-
-        if (width.toFloat() / height > ratio) {
-            val x =
-                ((Resources.getSystem().displayMetrics.widthPixels - height * ratio) / 2).toInt()
-            val originalLayoutParams =
-                binding.scroll.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.leftMargin += x
-            originalLayoutParams.rightMargin += x
-            binding.scroll.layoutParams = originalLayoutParams
-
-            Log.i(
-                TAG,
-                "binding.scroll ${Resources.getSystem().displayMetrics.widthPixels} ${height * ratio}"
-            )
-        }
-
-        if (width.toFloat() / height < ratio) {
-            val y =
-                ((height - Resources.getSystem().displayMetrics.widthPixels / ratio) / 2).toInt()
-            val originalLayoutParams =
-                binding.scroll.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.topMargin += y
-            originalLayoutParams.bottomMargin += y
-            binding.scroll.layoutParams = originalLayoutParams
-        }
-
-        binding.menu.setOnClickListener {
+        binding.container.setOnClickListener {
             hideSelf()
         }
 
@@ -164,7 +140,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                     itemBinding.header.layoutParams as ViewGroup.MarginLayoutParams
                 layoutParamsHeader.topMargin = application.px2Px(itemBinding.header.marginTop)
                 layoutParamsHeader.bottomMargin = application.px2Px(itemBinding.header.marginBottom)
-                layoutParamsHeader.leftMargin = application.px2Px(itemBinding.header.marginLeft)
+                layoutParamsHeader.marginStart = application.px2Px(itemBinding.header.marginStart)
                 itemBinding.header.layoutParams = layoutParamsHeader
                 itemBinding.header.textSize = application.px2PxFont(itemBinding.header.textSize)
 
@@ -183,8 +159,13 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                     if (tvViewModel.errInfo.value != null
                         && tvViewModel.getTV().id == itemPosition
                     ) {
-                        Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT)
-                            .show()
+                        if (tvViewModel.errInfo.value == "") {
+                            (activity as? MainActivity)?.showPlayerFragment()
+                            (activity as? MainActivity)?.hideErrorFragment()
+                        } else {
+                            (activity as? MainActivity)?.hidePlayerFragment()
+                            (activity as? MainActivity)?.showErrorFragment(tvViewModel.errInfo.value.toString())
+                        }
                     }
                 }
                 tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
@@ -224,11 +205,11 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
                     }
                 }
             }
-            (activity as MainActivity).fragmentReady("MainFragment")
+            (activity as MainActivity).fragmentReady(TAG)
         }
     }
 
-    fun changeStyle() {
+    fun changeMenu() {
         if (SP.grid) {
             for (i in rowList) {
                 if (i is RecyclerView) {
@@ -266,14 +247,12 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     }
 
     override fun onItemHasFocus(tvViewModel: TVViewModel) {
-        tvListViewModel.setItemPositionCurrent(tvViewModel.getTV().id)
-
         val row = tvViewModel.getRowPosition()
 
         for (i in rowList) {
             if (i.tag as Int != row) {
                 ((i as RecyclerView).adapter as CardAdapter).focusable = false
-                ((i as RecyclerView).adapter as CardAdapter).clear()
+                (i.adapter as CardAdapter).clear()
             } else {
                 ((i as RecyclerView).adapter as CardAdapter).focusable = true
             }
@@ -283,7 +262,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
     }
 
     override fun onItemClicked(tvViewModel: TVViewModel) {
-        Log.i(TAG, "onItemClicked")
         if (this.isHidden) {
             (activity as? MainActivity)?.switchMainFragment()
             return
@@ -293,6 +271,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
             itemPosition = tvViewModel.getTV().id
             tvListViewModel.setItemPosition(itemPosition)
             tvListViewModel.getTVViewModel(itemPosition)?.changed("menu")
+            Log.i(TAG, "onItemClicked ${tvViewModel.getTV().id}")
         }
         (activity as? MainActivity)?.switchMainFragment()
     }
@@ -410,8 +389,9 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
             Log.i(TAG, "toPosition $rowPosition $itemPosition")
             for (i in rowList) {
                 if (i.tag as Int == rowPosition) {
-                    ((i as RecyclerView).adapter as CardAdapter).focusable = true
-                    ((i as RecyclerView).adapter as CardAdapter).toPosition(itemPosition!!)
+                    ((i as RecyclerView).adapter as CardAdapter).updateEPG()
+                    (i.adapter as CardAdapter).focusable = true
+                    (i.adapter as CardAdapter).toPosition(itemPosition!!)
                     break
                 }
             }
@@ -429,13 +409,6 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
         super.onResume()
     }
 
-    override fun onStop() {
-        Log.i(TAG, "onStop")
-        super.onStop()
-        SP.itemPosition = itemPosition
-        Log.i(TAG, "$POSITION $itemPosition saved")
-    }
-
     override fun onDestroy() {
         Log.i(TAG, "onDestroy")
         super.onDestroy()

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

@@ -12,8 +12,12 @@ class MyTvApplication : Application() {
     private lateinit var displayMetrics: DisplayMetrics
     private lateinit var realDisplayMetrics: DisplayMetrics
 
+    private lateinit var windowManager: WindowManager
+
     private var width = 0
     private var height = 0
+    private var shouldWidth = 0
+    private var shouldHeight = 0
     private var deviation = 0
     private var ratio = 1.0
     private var density = 2.0f
@@ -24,7 +28,7 @@ class MyTvApplication : Application() {
 
         displayMetrics = DisplayMetrics()
         realDisplayMetrics = DisplayMetrics()
-        val windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
+        windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
         windowManager.defaultDisplay.getMetrics(displayMetrics)
         windowManager.defaultDisplay.getRealMetrics(realDisplayMetrics)
 
@@ -44,6 +48,16 @@ class MyTvApplication : Application() {
             height * 2 / 1080.0 / density
         }
 
+        if ((width.toDouble() / height) < (16.0 / 9.0)) {
+            ratio = width * 2 / 1920.0 / density
+            shouldWidth = width
+            shouldHeight = (width * 9.0 / 16.0).toInt()
+        } else {
+            ratio = height * 2 / 1080.0 / density
+            shouldHeight = height
+            shouldWidth = (height * 16.0 / 9.0).toInt()
+        }
+
         deviation = width - Resources.getSystem().displayMetrics.widthPixels
         scale = Resources.getSystem().displayMetrics.scaledDensity
     }
@@ -56,18 +70,26 @@ class MyTvApplication : Application() {
         return realDisplayMetrics
     }
 
+    fun shouldWidthPx(): Int {
+        return shouldWidth
+    }
+
+    fun shouldHeightPx(): Int {
+        return shouldHeight
+    }
+
     fun getWidth(): Int {
         return width
     }
 
-    fun getDeviation(): Int {
-        return deviation
-    }
-
     fun getHeight(): Int {
         return height
     }
 
+    fun getDeviation(): Int {
+        return deviation
+    }
+
     fun getRatio(): Double {
         return ratio
     }

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

@@ -78,14 +78,22 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
 
                     override fun onPlayerError(error: PlaybackException) {
                         super.onPlayerError(error)
-
                         Log.e(TAG, "PlaybackException $error")
+                        val err = "播放错误"
+                        tvViewModel?.setErrInfo(err)
                         tvViewModel?.changed("retry")
                     }
+
+                    override fun onIsPlayingChanged(isPlaying: Boolean) {
+                        super.onIsPlayingChanged(isPlaying)
+                        if (isPlaying) {
+                            tvViewModel?.setErrInfo("")
+                        }
+                    }
                 })
             }
         })
-        (activity as MainActivity).fragmentReady("PlayerFragment")
+        (activity as MainActivity).fragmentReady(TAG)
         return _binding!!.root
     }
 
@@ -146,7 +154,7 @@ class PlayerFragment : Fragment(), SurfaceHolder.Callback {
     }
 
     companion object {
-        private const val TAG = "PlaybackVideoFragment"
+        private const val TAG = "PlayerFragment"
     }
 
     override fun surfaceCreated(holder: SurfaceHolder) {

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

@@ -101,9 +101,9 @@ class SettingFragment : DialogFragment() {
         )
         binding.name.textSize = application.px2PxFont(binding.name.textSize)
         binding.version.textSize = application.px2PxFont(binding.version.textSize)
-        val layoutParamsDesc = binding.version.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParamsDesc.topMargin = application.px2Px(binding.version.marginTop)
-        binding.version.layoutParams = layoutParamsDesc
+        val layoutParamsVersion = binding.version.layoutParams as ViewGroup.MarginLayoutParams
+        layoutParamsVersion.topMargin = application.px2Px(binding.version.marginTop)
+        binding.version.layoutParams = layoutParamsVersion
 
         binding.checkVersion.textSize = application.px2PxFont(binding.checkVersion.textSize)
         val layoutParamsCheckVersion =

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

@@ -6,7 +6,7 @@ import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.marginRight
+import androidx.core.view.marginEnd
 import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import com.lizongying.mytv.Utils.getDateFormat
@@ -27,52 +27,33 @@ class TimeFragment : Fragment() {
 
         val application = requireActivity().applicationContext as MyTvApplication
 
-        val width = application.getWidth()
-        val height = application.getHeight()
-
-        val ratio = 16f / 9f
-
-        if (width.toFloat() / height > ratio) {
-            val x =
-                ((Resources.getSystem().displayMetrics.widthPixels - height * ratio) / 2).toInt()
-            val originalLayoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.rightMargin += x
-            binding.time.layoutParams = originalLayoutParams
-        }
-
-        if (width.toFloat() / height < ratio) {
-            val y =
-                ((height - Resources.getSystem().displayMetrics.widthPixels / ratio) / 2).toInt()
-            val originalLayoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
-            originalLayoutParams.topMargin += y
-            binding.time.layoutParams = originalLayoutParams
-        }
-
         binding.time.layoutParams.width = application.px2Px(binding.time.layoutParams.width)
         binding.time.layoutParams.height = application.px2Px(binding.time.layoutParams.height)
+
         val layoutParams = binding.time.layoutParams as ViewGroup.MarginLayoutParams
         layoutParams.topMargin = application.px2Px(binding.time.marginTop)
-        layoutParams.rightMargin = application.px2Px(binding.time.marginRight)
+        layoutParams.marginEnd = application.px2Px(binding.time.marginEnd)
         binding.time.layoutParams = layoutParams
+
         binding.content.textSize = application.px2PxFont(binding.content.textSize)
 
-        (activity as MainActivity).fragmentReady("TimeFragment")
+        binding.main.layoutParams.width = application.shouldWidthPx()
+        binding.main.layoutParams.height = application.shouldHeightPx()
+
+        (activity as MainActivity).fragmentReady(TAG)
         return binding.root
     }
 
-    override fun onResume() {
-        super.onResume()
-        if (view?.visibility == View.VISIBLE) {
+    override fun onHiddenChanged(hidden: Boolean) {
+        super.onHiddenChanged(hidden)
+        if (!hidden) {
             handler.removeCallbacks(showRunnable)
             handler.postDelayed(showRunnable, 0)
+        } else {
+            handler.removeCallbacks(showRunnable)
         }
     }
 
-    override fun onPause() {
-        super.onPause()
-        handler.removeCallbacks(showRunnable)
-    }
-
     private val showRunnable: Runnable = Runnable {
         run {
             if (_binding == null) {
@@ -83,17 +64,6 @@ class TimeFragment : Fragment() {
         }
     }
 
-    fun show() {
-        view?.visibility = View.VISIBLE
-        handler.removeCallbacks(showRunnable)
-        handler.postDelayed(showRunnable, 0)
-    }
-
-    fun hide() {
-        view?.visibility = View.GONE
-        handler.removeCallbacks(showRunnable)
-    }
-
     override fun onDestroyView() {
         handler.removeCallbacks(showRunnable)
         super.onDestroyView()

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

@@ -18,7 +18,7 @@ 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 com.lizongying.mytv.requests.ReleaseRequest
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -32,7 +32,7 @@ class UpdateManager(
 ) :
     ConfirmationFragment.ConfirmationListener {
 
-    private var myRequest = MyRequest()
+    private var myRequest = ReleaseRequest()
     private var release: ReleaseV2? = null
 
     private var downloadReceiver: DownloadReceiver? = null

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

@@ -5,6 +5,7 @@ import android.os.Build
 import android.util.TypedValue
 import com.google.gson.Gson
 import com.lizongying.mytv.api.TimeResponse
+import com.lizongying.mytv.requests.Request
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.IOException

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

@@ -1,4 +1,4 @@
-package com.lizongying.mytv
+package com.lizongying.mytv.api
 
 import android.content.Context
 

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

@@ -1,7 +1,6 @@
 package com.lizongying.mytv.api
 
 import android.content.Context
-import com.lizongying.mytv.Encryptor
 import com.lizongying.mytv.SP
 import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.models.TVViewModel

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

@@ -1,4 +1,4 @@
-package com.lizongying.mytv
+package com.lizongying.mytv.models
 
 import com.lizongying.mytv.models.ProgramType
 import java.io.Serializable
@@ -28,6 +28,8 @@ data class TV(
                 ", pid='" + pid + '\'' +
                 ", sid='" + sid + '\'' +
                 ", programType='" + programType + '\'' +
+                ", needToken='" + needToken + '\'' +
+                ", mustToken='" + mustToken + '\'' +
                 '}'
     }
 }

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

@@ -1,6 +1,6 @@
-package com.lizongying.mytv
+package com.lizongying.mytv.models
 
-import com.lizongying.mytv.models.ProgramType
+import com.lizongying.mytv.R
 
 object TVList {
     val list: Map<String, List<TV>> by lazy {
@@ -900,6 +900,7 @@ object TVList {
             v.forEach { v1 ->
                 if (!v1.mustToken) {
                     v1.id = id
+                    v1.needToken = false
                     id++
                     group.add(v1)
                 }

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

@@ -3,6 +3,7 @@ package com.lizongying.mytv.models
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.lizongying.mytv.SP
 
 class TVListViewModel : ViewModel() {
 
@@ -16,10 +17,6 @@ class TVListViewModel : ViewModel() {
     val itemPosition: LiveData<Int>
         get() = _itemPosition
 
-    private val _itemPositionCurrent = MutableLiveData<Int>()
-    val itemPositionCurrent: LiveData<Int>
-        get() = _itemPositionCurrent
-
     fun addTVViewModel(tvViewModel: TVViewModel) {
         if (_tvListViewModel.value == null) {
             _tvListViewModel.value = mutableListOf(tvViewModel)
@@ -32,23 +29,16 @@ class TVListViewModel : ViewModel() {
         return _tvListViewModel.value?.get(id)
     }
 
-    fun getTVViewModelCurrent(): TVViewModel? {
-        return _itemPositionCurrent.value?.let { _tvListViewModel.value?.get(it) }
-    }
-
     fun setItemPosition(position: Int) {
         _itemPosition.value = position
-        _itemPositionCurrent.value = position
-    }
-
-    fun setItemPositionCurrent(position: Int) {
-        _itemPositionCurrent.value = position
+        SP.itemPosition = position
     }
 
     fun size(): Int {
         if (_tvListViewModel.value == null) {
             return 0
         }
+
         return _tvListViewModel.value!!.size
     }
 }

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

@@ -1,10 +1,8 @@
 package com.lizongying.mytv.models
 
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.lizongying.mytv.TV
 import com.lizongying.mytv.api.FEPG
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.programModel.Program
 import com.tencent.videolite.android.datamodel.cctvjce.TVProgram
@@ -18,6 +16,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
 
     var retryTimes = 0
     var retryMaxTimes = 8
+    var authYSPRetryTimes = 0
+    var authYSPRetryMaxTimes = 3
     var tokenYSPRetryTimes = 0
     var tokenYSPRetryMaxTimes = 0
     var tokenFHRetryTimes = 0
@@ -56,24 +56,15 @@ class TVViewModel(private var tv: TV) : ViewModel() {
             if (_videoUrl.value!!.last().contains("cctv.cn")) {
                 tv.videoUrl = tv.videoUrl.subList(0, tv.videoUrl.lastIndex) + listOf(url)
             } else {
-                tv.videoUrl = tv.videoUrl + listOf(url)
+                tv.videoUrl += listOf(url)
             }
         } else {
-            tv.videoUrl = tv.videoUrl + listOf(url)
+            tv.videoUrl += listOf(url)
         }
         _videoUrl.value = tv.videoUrl
         _videoIndex.value = tv.videoUrl.lastIndex
     }
 
-    fun firstSource() {
-        if (_videoUrl.value!!.isNotEmpty()) {
-            setVideoIndex(0)
-            allReady()
-        } else {
-            Log.e(TAG, "no first")
-        }
-    }
-
     fun changed(from: String) {
         _change.value = from
     }
@@ -82,10 +73,6 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _ready.value = true
     }
 
-    fun setVideoIndex(videoIndex: Int) {
-        _videoIndex.value = videoIndex
-    }
-
     init {
         _videoUrl.value = tv.videoUrl
         _videoIndex.value = tv.videoUrl.lastIndex

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

@@ -10,7 +10,7 @@ import retrofit2.Response
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-class MyRequest {
+class ReleaseRequest {
     private var releaseService = ApiClient().releaseService
 
     suspend fun getRelease(): ReleaseV2? {
@@ -39,6 +39,6 @@ class MyRequest {
     }
 
     companion object {
-        private const val TAG = "MyRequest"
+        private const val TAG = "ReleaseRequest"
     }
 }

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

@@ -1,11 +1,10 @@
-package com.lizongying.mytv
+package com.lizongying.mytv.requests
 
 import android.os.Handler
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
-import com.google.gson.Gson
-import java.net.URLDecoder
+import com.lizongying.mytv.Utils
 import com.lizongying.mytv.Utils.getDateFormat
 import com.lizongying.mytv.api.ApiClient
 import com.lizongying.mytv.api.Auth
@@ -25,6 +24,7 @@ import com.lizongying.mytv.api.YSPBtraceService
 import com.lizongying.mytv.api.YSPJceService
 import com.lizongying.mytv.api.YSPProtoService
 import com.lizongying.mytv.api.YSPTokenService
+import com.lizongying.mytv.models.TVList
 import com.lizongying.mytv.models.TVViewModel
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.oms.common.proto.pageModel
 import com.lizongying.mytv.proto.Ysp.cn.yangshipin.omstv.common.proto.epgProgramModel
@@ -118,11 +118,19 @@ object Request {
                                 } else {
                                     if (!tvModel.getTV().mustToken) {
                                         fetchAuth(tvModel, cookie)
+                                    } else {
+                                        val err = "错误"
+                                        Log.e(TAG, "$title $err")
+                                        tvModel.setErrInfo(err)
                                     }
                                 }
                             } else {
                                 fetchAuth(tvModel, cookie)
                             }
+                        } else {
+                            val err = "认证结果错误"
+                            Log.e(TAG, "$title $err")
+                            tvModel.setErrInfo(err)
                         }
                     }
                 } else {
@@ -137,11 +145,19 @@ object Request {
                             } else {
                                 if (!tvModel.getTV().mustToken) {
                                     fetchAuth(tvModel, cookie)
+                                } else {
+                                    val err = "错误"
+                                    Log.e(TAG, "$title $err")
+                                    tvModel.setErrInfo(err)
                                 }
                             }
                         } else {
                             fetchAuth(tvModel, cookie)
                         }
+                    } else {
+                        val err = "认证状态错误"
+                        Log.e(TAG, "$title $err")
+                        tvModel.setErrInfo(err)
                     }
                 }
             }
@@ -158,11 +174,19 @@ object Request {
                         } else {
                             if (!tvModel.getTV().mustToken) {
                                 fetchAuth(tvModel, cookie)
+                            } else {
+                                val err = "错误"
+                                Log.e(TAG, "$title $err")
+                                tvModel.setErrInfo(err)
                             }
                         }
                     } else {
                         fetchAuth(tvModel, cookie)
                     }
+                } else {
+                    val err = "认证请求错误"
+                    Log.e(TAG, "$title $err")
+                    tvModel.setErrInfo(err)
                 }
             }
         })
@@ -171,7 +195,7 @@ object Request {
     private fun fetchVideo(tvModel: TVViewModel, cookie: String) {
         cancelCall()
 
-        if (::btraceRunnable.isInitialized) {
+        if (Request::btraceRunnable.isInitialized) {
             handler.removeCallbacks(btraceRunnable)
         }
 
@@ -223,24 +247,42 @@ object Request {
                                     if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
                                         tvModel.tokenYSPRetryTimes++
                                         tvModel.needGetToken = true
-                                        fetchVideo(tvModel)
-//                                        fetchAuth(tvModel)
+                                        if (needAuth) {
+                                            fetchAuth(tvModel)
+                                        } else {
+                                            fetchVideo(tvModel)
+                                        }
                                     } else {
                                         if (!tvModel.getTV().mustToken) {
-                                            fetchVideo(tvModel, cookie)
-//                                            fetchAuth(tvModel, cookie)
+                                            if (needAuth) {
+                                                fetchAuth(tvModel, cookie)
+                                            } else {
+                                                fetchVideo(tvModel, cookie)
+                                            }
+                                        } else {
+                                            val err = "错误"
+                                            Log.e(TAG, "$title $err")
+                                            tvModel.setErrInfo(err)
                                         }
                                     }
                                 } else {
-                                    fetchVideo(tvModel, cookie)
-//                                    fetchAuth(tvModel, cookie)
+                                    if (needAuth) {
+                                        fetchAuth(tvModel, cookie)
+                                    } else {
+                                        fetchVideo(tvModel, cookie)
+                                    }
                                 }
+                            } else {
+                                val err = "结果错误"
+                                Log.e(TAG, "$title $err")
+                                tvModel.setErrInfo(err)
                             }
                         }
                     } else {
                         if (liveInfo?.data?.errinfo != null && liveInfo.data.errinfo == "应版权方要求，暂停提供直播信号，请点击观看其他精彩节目") {
-                            Log.e(TAG, "$title error ${liveInfo.data.errinfo}")
-                            tvModel.setErrInfo(liveInfo.data.errinfo)
+                            val err = "版权错误"
+                            Log.e(TAG, "$title $err")
+                            tvModel.setErrInfo(err)
                         } else {
                             Log.e(TAG, "$title url error $request $liveInfo")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
@@ -249,18 +291,35 @@ object Request {
                                     if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
                                         tvModel.tokenYSPRetryTimes++
                                         tvModel.needGetToken = true
-                                        fetchVideo(tvModel)
-//                                        fetchAuth(tvModel)
+                                        if (needAuth) {
+                                            fetchAuth(tvModel)
+                                        } else {
+                                            fetchVideo(tvModel)
+                                        }
                                     } else {
                                         if (!tvModel.getTV().mustToken) {
-                                            fetchVideo(tvModel, cookie)
-//                                            fetchAuth(tvModel, cookie)
+                                            if (needAuth) {
+                                                fetchAuth(tvModel, cookie)
+                                            } else {
+                                                fetchVideo(tvModel, cookie)
+                                            }
+                                        } else {
+                                            val err = "错误"
+                                            Log.e(TAG, "$title $err")
+                                            tvModel.setErrInfo(err)
                                         }
                                     }
                                 } else {
-                                    fetchVideo(tvModel, cookie)
-//                                    fetchAuth(tvModel, cookie)
+                                    if (needAuth) {
+                                        fetchAuth(tvModel, cookie)
+                                    } else {
+                                        fetchVideo(tvModel, cookie)
+                                    }
                                 }
+                            } else {
+                                val err = "其他错误"
+                                Log.e(TAG, "$title $err")
+                                tvModel.setErrInfo(err)
                             }
                         }
                     }
@@ -272,18 +331,35 @@ object Request {
                             if (needToken && tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
                                 tvModel.tokenYSPRetryTimes++
                                 tvModel.needGetToken = true
-                                fetchVideo(tvModel)
-//                                fetchAuth(tvModel)
+                                if (needAuth) {
+                                    fetchAuth(tvModel, cookie)
+                                } else {
+                                    fetchVideo(tvModel, cookie)
+                                }
                             } else {
                                 if (!tvModel.getTV().mustToken) {
-                                    fetchVideo(tvModel, cookie)
-//                                    fetchAuth(tvModel, cookie)
+                                    if (needAuth) {
+                                        fetchAuth(tvModel, cookie)
+                                    } else {
+                                        fetchVideo(tvModel, cookie)
+                                    }
+                                } else {
+                                    val err = "错误"
+                                    Log.e(TAG, "$title $err")
+                                    tvModel.setErrInfo(err)
                                 }
                             }
                         } else {
-                            fetchVideo(tvModel, cookie)
-//                            fetchAuth(tvModel, cookie)
+                            if (needAuth) {
+                                fetchAuth(tvModel, cookie)
+                            } else {
+                                fetchVideo(tvModel, cookie)
+                            }
                         }
+                    } else {
+                        val err = "状态错误"
+                        Log.e(TAG, "$title $err")
+                        tvModel.setErrInfo(err)
                     }
                 }
             }
@@ -300,11 +376,17 @@ object Request {
                         } else {
                             if (!tvModel.getTV().mustToken) {
                                 fetchVideo(tvModel, cookie)
+                            } else {
+//                                TODO
                             }
                         }
                     } else {
                         fetchVideo(tvModel, cookie)
                     }
+                } else {
+                    val err = "请求错误"
+                    Log.e(TAG, "$title $err")
+                    tvModel.setErrInfo(err)
                 }
             }
         })
@@ -340,6 +422,8 @@ object Request {
                                 val cookie =
                                     "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                                 fetchAuth(tvModel, cookie)
+                            } else {
+//                                TODO
                             }
                         }
                     }
@@ -355,6 +439,8 @@ object Request {
                             val cookie =
                                 "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                             fetchAuth(tvModel, cookie)
+                        } else {
+//                                TODO
                         }
                     }
                 }
@@ -397,6 +483,8 @@ object Request {
                                 val cookie =
                                     "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                                 fetchVideo(tvModel, cookie)
+                            } else {
+//                                TODO
                             }
                         }
                     }
@@ -412,6 +500,8 @@ object Request {
                             val cookie =
                                 "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109"
                             fetchVideo(tvModel, cookie)
+                        } else {
+//                                TODO
                         }
                     }
                 }
@@ -447,6 +537,10 @@ object Request {
                     if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
                         tvModel.tokenFHRetryTimes++
                         fetchFAuth(tvModel)
+                    } else {
+                        val err = "状态错误"
+                        Log.e(TAG, "$title $err")
+                        tvModel.setErrInfo(err)
                     }
                 }
             }
@@ -456,6 +550,10 @@ object Request {
                 if (tvModel.tokenFHRetryTimes < tvModel.tokenFHRetryMaxTimes) {
                     tvModel.tokenFHRetryTimes++
                     fetchFAuth(tvModel)
+                } else {
+                    val err = "请求错误"
+                    Log.e(TAG, "$title $err")
+                    tvModel.setErrInfo(err)
                 }
             }
         })
@@ -817,6 +915,6 @@ object Request {
     }
 
     fun setRequestListener(listener: RequestListener) {
-        this.listener = listener
+        Request.listener = listener
     }
 }

app/src/main/res/drawable/sad_cloud.xml

@@ -0,0 +1,23 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="50"
+    android:viewportHeight="50"
+    android:width="62.5dp"
+    android:height="62.5dp">
+    <group
+        android:scaleX="0.1"
+        android:scaleY="-0.1"
+        android:translateY="50">
+        <path
+            android:pathData="M205 377c-27 -27 -40 -33 -65 -29 -30 4 -70 -19 -70 -40 0 -5 -16 -24 -35 -42 -38 -36 -44 -66 -23 -111 22 -49 51 -55 248 -55l182 0 29 29c46 46 37 106 -20 136 -20 10 -31 25 -35 49 -4 22 -20 46 -42 65 -29 26 -43 31 -85 31 -44 0 -55 -4 -84 -33zm138 2c29 -13 57 -58 57 -93 0 -17 5 -26 15 -26 24 0 65 -46 65 -71 0 -13 -10 -33 -22 -46 -21 -22 -26 -23 -205 -23 -182 0 -184 0 -208 25 -33 32 -32 70 3 105 16 15 36 40 45 54 18 27 54 35 74 15 8 -8 16 -2 29 19 9 17 27 35 38 41 28 13 80 13 109 0z"
+            android:fillColor="#FFEEEEEE" />
+        <path
+            android:pathData="M174 269c-10 -17 13 -36 27 -22 12 12 4 33 -11 33 -5 0 -12 -5 -16 -11z"
+            android:fillColor="#FFEEEEEE" />
+        <path
+            android:pathData="M294 269c-10 -17 13 -36 27 -22 12 12 4 33 -11 33 -5 0 -12 -5 -16 -11z"
+            android:fillColor="#FFEEEEEE" />
+        <path
+            android:pathData="M194 196c-32 -14 -50 -33 -41 -42 3 -3 20 4 38 15 43 26 75 26 118 0 34 -20 49 -20 36 1 -10 16 -69 40 -97 40 -13 -1 -37 -7 -54 -14z"
+            android:fillColor="#FFEEEEEE" />
+    </group>
+</vector>

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

@@ -1,18 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/channel"
-    android:layout_width="90dp"
-    android:layout_height="60dp"
-    android:layout_gravity="end|top"
-    android:layout_marginTop="20dp"
-    android:layout_marginEnd="170dp">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    >
+    <FrameLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:textColor="#FFEEEEEE"
-        android:textStyle="bold"
-        android:textSize="40sp" />
-</FrameLayout>
+        <FrameLayout
+            android:id="@+id/channel"
+            android:layout_width="90dp"
+            android:layout_height="60dp"
+            android:layout_gravity="end|top"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="170dp">
+
+            <TextView
+                android:id="@+id/content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:textSize="40sp" />
+        </FrameLayout>
+    </FrameLayout>
+</LinearLayout>

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/error"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black" >
+
+    <LinearLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <ImageView
+            android:id="@+id/logo"
+            android:src="@drawable/sad_cloud"
+            android:layout_width="50dp"
+            android:layout_height="50dp" />
+
+        <TextView
+            android:id="@+id/msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:textColor="#FFEEEEEE"
+            android:text="Message"
+            android:textSize="20sp" />
+    </LinearLayout>
+</FrameLayout>

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

@@ -1,46 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/info"
-    android:layout_width="400dp"
-    android:layout_height="80dp"
-    android:layout_gravity="center_horizontal|bottom"
-    android:layout_marginBottom="20dp">
-
-    <ImageView
-        android:id="@+id/logo"
-        android:layout_width="100dp"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    >
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/rounded_white_left"
-        android:padding="10dp" />
+        >
 
-    <LinearLayout
-        android:id="@+id/main"
-        android:layout_width="300dp"
-        android:layout_height="match_parent"
-        android:layout_marginStart="100dp"
-        android:background="@drawable/rounded_dark_right"
-        android:gravity="start|center_vertical"
-        android:orientation="vertical"
-        android:padding="7dp">
+        <LinearLayout
+            android:id="@+id/info"
+            android:layout_width="400dp"
+            android:layout_height="80dp"
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_marginBottom="20dp"
+            android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:gravity="start"
-            android:textColor="#FFEEEEEE"
-            android:textSize="20sp" />
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="100dp"
+                android:layout_height="match_parent"
+                android:background="@drawable/rounded_white_left"
+                android:padding="10dp" />
 
-        <TextView
-            android:id="@+id/desc"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:layout_marginTop="8dp"
-            android:gravity="start"
-            android:singleLine="true"
-            android:textColor="#B3EEEEEE"
-            android:textSize="14sp" />
-    </LinearLayout>
-</FrameLayout>
+            <LinearLayout
+                android:id="@+id/main"
+                android:layout_width="300dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="0dp"
+                android:background="@drawable/rounded_dark_right"
+                android:gravity="start|center_vertical"
+                android:orientation="vertical"
+                android:padding="7dp">
+
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:gravity="start"
+                    android:textColor="#FFEEEEEE"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:id="@+id/desc"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:layout_marginTop="8dp"
+                    android:gravity="start"
+                    android:singleLine="true"
+                    android:textColor="#B3EEEEEE"
+                    android:textSize="14sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/loading"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    >
+
+    <LinearLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center" >
+
+        <ProgressBar
+            android:id="@+id/bar"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:indeterminateTint="@color/white"/>
+    </LinearLayout>
+</FrameLayout>

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

@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/menu"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/transparent"
     android:clickable="true"
     android:focusable="false"
-    >
-    <ScrollView
-        android:id="@+id/scroll"
+    android:gravity="center"
+>
+
+    <FrameLayout
+        android:id="@+id/menu"
         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>
+        android:layout_height="match_parent"
+>
+
+            <ScrollView
+                android:id="@+id/scroll"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+             >
+                <LinearLayout
+                    android:id="@+id/content"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+                </LinearLayout>
+            </ScrollView>
+
+    </FrameLayout>
+</LinearLayout>

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

@@ -13,8 +13,8 @@
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:paddingTop="20dp"
-            android:paddingLeft="7dp"
-            android:paddingRight="7dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
             android:background="@drawable/rounded_dark_left"
             >
             <TextView

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

@@ -1,18 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/time"
-    android:layout_width="100dp"
-    android:layout_height="40dp"
-    android:layout_gravity="end|top"
-    android:layout_marginTop="25dp"
-    android:layout_marginEnd="50dp">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    >
+    <FrameLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
 
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:textColor="#FFEEEEEE"
-        android:textStyle="bold"
-        android:textSize="32sp" />
-</FrameLayout>
+        <FrameLayout
+            android:id="@+id/time"
+            android:layout_width="100dp"
+            android:layout_height="40dp"
+            android:layout_gravity="end|top"
+            android:layout_marginTop="25dp"
+            android:layout_marginEnd="50dp">
+
+            <TextView
+                android:id="@+id/content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:textSize="32sp" />
+        </FrameLayout>
+
+    </FrameLayout>
+</LinearLayout>

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

@@ -2,5 +2,6 @@
     <color name="black">#000</color>
     <color name="white">#FFF</color>
     <color name="focus">#0096a6</color>
-    <color name="blur">#FF263238</color>
+    <color name="blur">#223239</color>
+    <color name="ic_launcher_background">#223239</color>
 </resources>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#223239</color>
-</resources>

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

@@ -1,25 +1,3 @@
 <resources>
 
-    <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
-        <item name="cardType">infoUnder</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">150dp</item>
-        <item name="android:layout_height">40dp</item>
-        <item name="android:adjustViewBounds">true</item>
-        <item name="android:contentDescription">@null</item>
-        <item name="android:scaleType">centerInside</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>

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

@@ -1,8 +1,6 @@
 <resources>
 
     <style name="Theme.MyTV" parent="@style/Theme.Leanback">
-        <item name="browsePaddingStart">11dp</item>
-        <item name="browsePaddingEnd">11dp</item>
-        <item name="browseRowsMarginTop">54dp</item>
+        <item name="android:fitsSystemWindows">false</item>
     </style>
 </resources>