number selection

.github/workflows/build.yml

@@ -33,6 +33,9 @@ jobs:
           signingKeyBase64: ${{ secrets.KEYSTORE }}
           keyStorePassword: ${{ secrets.KEYSTORE_PASSWORD }}
           keyPassword: ${{ secrets.ALIAS_PASSWORD }}
+        env:
+          # override default build-tools version (29.0.3) -- optional
+          BUILD_TOOLS_VERSION: "34.0.0"
 
       - name: Create Release
         id: create_release

README.md

@@ -14,6 +14,15 @@
 
 ## 更新日志
 
+### v1.4.5（高版本专用）
+
+* 数字选台配置
+
+### v1.4.4（通用版）
+
+* 优化图标显示
+* 增加换台反转
+
 ### v1.3.3
 
 * 部分错误会提示用户

app/build.gradle

@@ -100,10 +100,13 @@ dependencies {
     // For HLS playback support with ExoPlayer
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
 
+    // 21:2.9.0 17:2.6.4
+    def retrofit2_version = "2.9.0"
+
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
-    implementation 'com.squareup.retrofit2:converter-protobuf:2.9.0'
+    implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version"
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2"
     implementation 'androidx.core:core-ktx:1.11.0-beta02'
     implementation 'androidx.leanback:leanback:1.2.0-alpha02'

app/src/main/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/logo"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.MyTV">

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

@@ -0,0 +1,74 @@
+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
+import androidx.fragment.app.Fragment
+import com.lizongying.mytv.databinding.ChannelBinding
+import com.lizongying.mytv.models.TVViewModel
+
+class ChannelFragment : Fragment() {
+    private var _binding: ChannelBinding? = null
+    private val binding get() = _binding!!
+
+    private val handler = Handler()
+    private val delay: Long = 3000
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = ChannelBinding.inflate(inflater, container, false)
+        (activity as MainActivity).fragmentReady()
+        return binding.root
+    }
+
+    fun show(tvViewModel: TVViewModel) {
+        binding.channelContent.text = tvViewModel.id.value.toString()
+        handler.removeCallbacks(removeRunnable)
+        view?.visibility = View.VISIBLE
+        handler.postDelayed(removeRunnable, delay)
+    }
+
+    fun show(channel: String) {
+        if (binding.channelContent.text == "") {
+            binding.channelContent.text = channel
+            handler.removeCallbacks(removeRunnable)
+            view?.visibility = View.VISIBLE
+            handler.postDelayed(removeRunnable, delay)
+        } else {
+            val ch = "${binding.channelContent.text}$channel".toInt()
+            Log.i(TAG, "channel $ch")
+            (activity as MainActivity).play(ch)
+            binding.channelContent.text = ""
+            view?.visibility = View.GONE
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        handler.postDelayed(removeRunnable, delay)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        handler.removeCallbacks(removeRunnable)
+    }
+
+    private val removeRunnable = Runnable {
+        binding.channelContent.text = ""
+        view?.visibility = View.GONE
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        private const val TAG = "ChannelFragment"
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.lizongying.mytv
 
-import android.app.AlertDialog
+import android.content.Context
+import android.content.SharedPreferences
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.pm.Signature
@@ -15,11 +16,7 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
 import android.view.WindowManager
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
 import android.widget.Toast
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import com.lizongying.mytv.models.TVViewModel
 import java.security.MessageDigest
@@ -30,13 +27,22 @@ class MainActivity : FragmentActivity() {
     var playerFragment = PlayerFragment()
     private val mainFragment = MainFragment()
     private val infoFragment = InfoFragment()
+    private val channelFragment = ChannelFragment()
 
     private var doubleBackToExitPressedOnce = false
 
     private lateinit var gestureDetector: GestureDetector
 
     private val handler = Handler()
-    private val delay: Long = 3000
+    private val delay: Long = 4000
+    private val delayHideHelp: Long = 10000
+
+    private lateinit var sharedPref: SharedPreferences
+    private var channelReversal = false
+    private var channelNum = true
+
+    private var versionName = ""
+    private lateinit var dialogFragment: MyDialogFragment
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -50,24 +56,39 @@ class MainActivity : FragmentActivity() {
             supportFragmentManager.beginTransaction()
                 .add(R.id.main_browse_fragment, playerFragment)
                 .add(R.id.main_browse_fragment, infoFragment)
+                .add(R.id.main_browse_fragment, channelFragment)
                 .add(R.id.main_browse_fragment, mainFragment)
                 .hide(infoFragment)
+                .hide(channelFragment)
                 .commit()
             mainFragment.view?.requestFocus()
         }
         gestureDetector = GestureDetector(this, GestureListener())
+
+        sharedPref = getPreferences(Context.MODE_PRIVATE)
+        channelReversal = sharedPref.getBoolean(CHANNEL_REVERSAL, channelReversal)
+        channelNum = sharedPref.getBoolean(CHANNEL_NUM, channelNum)
+
+        versionName = getPackageInfo().versionName
+        dialogFragment = MyDialogFragment(versionName, channelReversal, channelNum)
     }
 
     fun showInfoFragment(tvViewModel: TVViewModel) {
         infoFragment.show(tvViewModel)
+        if (channelNum) {
+            channelFragment.show(tvViewModel)
+        }
     }
 
     fun play(tvViewModel: TVViewModel) {
-        Log.i(TAG, "play: ${tvViewModel.getTV()}")
         playerFragment.play(tvViewModel)
         mainFragment.view?.requestFocus()
     }
 
+    fun play(itemPosition: Int) {
+        mainFragment.play(itemPosition)
+    }
+
     fun prev() {
         mainFragment.prev()
     }
@@ -77,11 +98,11 @@ class MainActivity : FragmentActivity() {
     }
 
     private fun prevSource() {
-        mainFragment.prevSource()
+//        mainFragment.prevSource()
     }
 
     private fun nextSource() {
-        mainFragment.nextSource()
+//        mainFragment.nextSource()
     }
 
     fun switchMainFragment() {
@@ -103,7 +124,9 @@ class MainActivity : FragmentActivity() {
     }
 
     private val hideRunnable = Runnable {
-        supportFragmentManager.beginTransaction().hide(mainFragment).commit()
+        if (!mainFragment.isHidden) {
+            supportFragmentManager.beginTransaction().hide(mainFragment).commit()
+        }
     }
 
     private fun mainFragmentIsHidden(): Boolean {
@@ -170,88 +193,219 @@ class MainActivity : FragmentActivity() {
         }
     }
 
-    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+    fun saveChannelReversal(channelReversal: Boolean) {
-        when (keyCode) {
+        with(sharedPref.edit()) {
-            KeyEvent.KEYCODE_BACK -> {
+            putBoolean(CHANNEL_REVERSAL, channelReversal)
-                if (!mainFragmentIsHidden()) {
+            apply()
-                    hideMainFragment()
+        }
-                    return true
+        this.channelReversal = channelReversal
-                }
+    }
 
-                if (doubleBackToExitPressedOnce) {
+    fun saveChannelNum(channelNum: Boolean) {
-                    super.onBackPressed()
+        with(sharedPref.edit()) {
-                    return true
+            putBoolean(CHANNEL_NUM, channelNum)
-                }
+            apply()
+        }
+        this.channelNum = channelNum
+    }
 
-                this.doubleBackToExitPressedOnce = true
+    private fun showHelp() {
-                Toast.makeText(this, "再按一次退出", Toast.LENGTH_SHORT).show()
+        if (!mainFragment.isHidden) {
+            return
+        }
 
-                Handler(Looper.getMainLooper()).postDelayed({
+        Log.i(TAG, "dialogFragment ${dialogFragment.isVisible}")
-                    doubleBackToExitPressedOnce = false
+        if (!dialogFragment.isVisible) {
-                }, 2000)
+            dialogFragment.show(supportFragmentManager, "settings_dialog")
-                return true
+            handler.removeCallbacks(hideHelp)
+            handler.postDelayed(hideHelp, delayHideHelp)
+        } else {
+            handler.removeCallbacks(hideHelp)
+            dialogFragment.dismiss()
+        }
+    }
+
+    private val hideHelp = Runnable {
+        if (dialogFragment.isVisible) {
+            dialogFragment.dismiss()
+        }
+    }
+
+    private fun channelUp() {
+        if (mainFragment.isHidden) {
+            if (channelReversal) {
+                next()
+                return
             }
-
+            prev()
-            KeyEvent.KEYCODE_MENU -> {
+        } else {
-                val versionName = getPackageInfo().versionName
-
-                val textView = TextView(this)
-                textView.text =
-                    "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
-
-                val imageView = ImageView(this)
-                val drawable = ContextCompat.getDrawable(this, R.drawable.appreciate)
-                imageView.setImageDrawable(drawable)
-
-                val linearLayout = LinearLayout(this)
-                linearLayout.orientation = LinearLayout.VERTICAL
-                linearLayout.addView(textView)
-                linearLayout.addView(imageView)
-
-                val layoutParams = LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT,
-                    LinearLayout.LayoutParams.WRAP_CONTENT
-                )
-                imageView.layoutParams = layoutParams
-                textView.layoutParams = layoutParams
-
-                val builder: AlertDialog.Builder = AlertDialog.Builder(this)
-                builder
-                    .setView(linearLayout)
-
-                val dialog: AlertDialog = builder.create()
-                dialog.show()
-                return true
-            }
-
-            KeyEvent.KEYCODE_DPAD_CENTER -> {
-                Log.i(TAG, "KEYCODE_DPAD_CENTER")
-                switchMainFragment()
-            }
-
-            KeyEvent.KEYCODE_DPAD_UP -> {
-                if (mainFragment.isHidden) {
-                    prev()
-                } else {
 //                    if (mainFragment.selectedPosition == 0) {
 //                        mainFragment.setSelectedPosition(
 //                            mainFragment.tvListViewModel.maxNum.size - 1,
 //                            false
 //                        )
 //                    }
-                }
+        }
-            }
+    }
 
-            KeyEvent.KEYCODE_DPAD_DOWN -> {
+    private fun channelDown() {
-                if (mainFragment.isHidden) {
+        if (mainFragment.isHidden) {
-                    next()
+            if (channelReversal) {
-                } else {
+                prev()
+                return
+            }
+            next()
+        } else {
 //                    if (mainFragment.selectedPosition == mainFragment.tvListViewModel.maxNum.size - 1) {
 ////                        mainFragment.setSelectedPosition(0, false)
 //                        hideMainFragment()
 //                        return false
 //                    }
-                }
+        }
+    }
+
+    private fun back() {
+        if (!mainFragmentIsHidden()) {
+            hideMainFragment()
+            return
+        }
+
+        if (doubleBackToExitPressedOnce) {
+            super.onBackPressed()
+            return
+        }
+
+        doubleBackToExitPressedOnce = true
+        Toast.makeText(this, "再按一次退出", Toast.LENGTH_SHORT).show()
+
+        Handler(Looper.getMainLooper()).postDelayed({
+            doubleBackToExitPressedOnce = false
+        }, 2000)
+    }
+
+    private fun showChannel(channel: String) {
+        if (!mainFragment.isHidden) {
+            return
+        }
+
+        if (dialogFragment.isVisible) {
+            return
+        }
+
+        if (channelNum) {
+            channelFragment.show(channel)
+        }
+    }
+
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        when (keyCode) {
+            KeyEvent.KEYCODE_0 -> {
+                showChannel("0")
+                return true
+            }
+
+            KeyEvent.KEYCODE_1 -> {
+                showChannel("1")
+                return true
+            }
+
+            KeyEvent.KEYCODE_2 -> {
+                showChannel("2")
+                return true
+            }
+
+            KeyEvent.KEYCODE_3 -> {
+                showChannel("3")
+                return true
+            }
+
+            KeyEvent.KEYCODE_4 -> {
+                showChannel("4")
+                return true
+            }
+
+            KeyEvent.KEYCODE_5 -> {
+                showChannel("5")
+                return true
+            }
+
+            KeyEvent.KEYCODE_6 -> {
+                showChannel("6")
+                return true
+            }
+
+            KeyEvent.KEYCODE_7 -> {
+                showChannel("7")
+                return true
+            }
+
+            KeyEvent.KEYCODE_8 -> {
+                showChannel("8")
+                return true
+            }
+
+            KeyEvent.KEYCODE_9 -> {
+                showChannel("9")
+                return true
+            }
+
+            KeyEvent.KEYCODE_ESCAPE -> {
+                back()
+                return true
+            }
+
+            KeyEvent.KEYCODE_BACK -> {
+                back()
+                return true
+            }
+
+            KeyEvent.KEYCODE_BOOKMARK -> {
+                showHelp()
+                return true
+            }
+
+            KeyEvent.KEYCODE_UNKNOWN -> {
+                showHelp()
+                return true
+            }
+
+            KeyEvent.KEYCODE_HELP -> {
+                showHelp()
+                return true
+            }
+
+            KeyEvent.KEYCODE_SETTINGS -> {
+                showHelp()
+                return true
+            }
+
+            KeyEvent.KEYCODE_MENU -> {
+                showHelp()
+                return true
+            }
+
+            KeyEvent.KEYCODE_ENTER -> {
+                switchMainFragment()
+            }
+
+            KeyEvent.KEYCODE_DPAD_CENTER -> {
+                switchMainFragment()
+            }
+
+            KeyEvent.KEYCODE_DPAD_UP -> {
+                channelUp()
+            }
+
+            KeyEvent.KEYCODE_CHANNEL_UP -> {
+                channelUp()
+            }
+
+            KeyEvent.KEYCODE_DPAD_DOWN -> {
+                channelDown()
+            }
+
+            KeyEvent.KEYCODE_CHANNEL_DOWN -> {
+                channelDown()
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
@@ -336,5 +490,7 @@ class MainActivity : FragmentActivity() {
 
     companion object {
         private const val TAG = "MainActivity"
+        private const val CHANNEL_REVERSAL = "channel_reversal"
+        private const val CHANNEL_NUM = "channel_num"
     }
 }

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

@@ -209,14 +209,14 @@ class MainFragment : BrowseSupportFragment() {
         itemPosition = sharedPref?.getInt("position", 0)!!
         if (itemPosition >= tvListViewModel.size()) {
             itemPosition = 0
-            tvListViewModel.setItemPosition(itemPosition)
         }
+        tvListViewModel.setItemPosition(itemPosition)
     }
 
     fun fragmentReady() {
         ready++
         Log.i(TAG, "ready $ready")
-        if (ready == 3) {
+        if (ready == 4) {
 //            request.fetchPage()
             val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
             tvViewModel?.changed()
@@ -225,6 +225,16 @@ class MainFragment : BrowseSupportFragment() {
         }
     }
 
+    fun play(itemPosition: Int) {
+        view?.post {
+            if (itemPosition < tvListViewModel.size()) {
+                this.itemPosition = itemPosition
+                tvListViewModel.setItemPosition(itemPosition)
+                tvListViewModel.getTVViewModel(itemPosition)?.changed()
+            }
+        }
+    }
+
     fun prev() {
         view?.post {
             itemPosition--
@@ -232,9 +242,7 @@ class MainFragment : BrowseSupportFragment() {
                 itemPosition = tvListViewModel.size() - 1
             }
             tvListViewModel.setItemPosition(itemPosition)
-
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            tvViewModel?.changed()
         }
     }
 
@@ -245,9 +253,7 @@ class MainFragment : BrowseSupportFragment() {
                 itemPosition = 0
             }
             tvListViewModel.setItemPosition(itemPosition)
-
+            tvListViewModel.getTVViewModel(itemPosition)?.changed()
-            val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-            tvViewModel?.changed()
         }
     }
 
@@ -297,9 +303,7 @@ class MainFragment : BrowseSupportFragment() {
                 if (itemPosition != item.id.value!!) {
                     itemPosition = item.id.value!!
                     tvListViewModel.setItemPosition(itemPosition)
-
+                    tvListViewModel.getTVViewModel(itemPosition)?.changed()
-                    val tvViewModel = tvListViewModel.getTVViewModel(itemPosition)
-                    tvViewModel?.changed()
                 }
                 (activity as? MainActivity)?.switchMainFragment()
             }

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

@@ -0,0 +1,58 @@
+package com.lizongying.mytv
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import com.lizongying.mytv.databinding.DialogBinding
+
+
+class MyDialogFragment(private val versionName: String,
+                       private val channelReversal: Boolean,
+                       private val channelNum: Boolean,
+    ) :
+    DialogFragment() {
+
+    private var _binding: DialogBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = DialogBinding.inflate(inflater, container, false)
+        _binding?.version?.text =
+            "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+
+        val switchChannelReversal = _binding?.switchChannelReversal
+        switchChannelReversal?.isChecked = channelReversal
+        switchChannelReversal?.setOnCheckedChangeListener { _, isChecked ->
+            (activity as MainActivity).saveChannelReversal(isChecked)
+        }
+
+        val switchChannelNum = _binding?.switchChannelNum
+        switchChannelNum?.isChecked = channelNum
+        switchChannelNum?.setOnCheckedChangeListener { _, isChecked ->
+            (activity as MainActivity).saveChannelNum(isChecked)
+        }
+
+        return binding.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    companion object {
+        const val TAG = "MyDialogFragment"
+    }
+}
+

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

@@ -24,6 +24,7 @@ class PlayerFragment : Fragment() {
     private var _binding: PlayerBinding? = null
     private var playerView: PlayerView? = null
     private var tvViewModel: TVViewModel? = null
+    private val aspectRatio = 16f / 9f
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -43,10 +44,9 @@ class PlayerFragment : Fragment() {
                 playerView!!.player?.playWhenReady = true
                 playerView!!.player?.addListener(object : Player.Listener {
                     override fun onVideoSizeChanged(videoSize: VideoSize) {
-                        val aspectRatio = 16f / 9f
-                        val layoutParams = playerView?.layoutParams
                         val ratio = playerView?.measuredWidth?.div(playerView?.measuredHeight!!)
                         if (ratio != null) {
+                            val layoutParams = playerView?.layoutParams
                             if (ratio < aspectRatio) {
                                 layoutParams?.height =
                                     (playerView?.measuredWidth?.div(aspectRatio))?.toInt()
@@ -103,6 +103,11 @@ class PlayerFragment : Fragment() {
         }
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     companion object {
         private const val TAG = "PlaybackVideoFragment"
     }

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

@@ -7,11 +7,9 @@ import android.util.Base64
 import android.util.Log
 import com.lizongying.mytv.Utils.getDateFormat
 import com.lizongying.mytv.api.ApiClient
-import com.lizongying.mytv.api.BtraceClient
 import com.lizongying.mytv.api.Info
 import com.lizongying.mytv.api.LiveInfo
 import com.lizongying.mytv.api.LiveInfoRequest
-import com.lizongying.mytv.api.ProtoClient
 import com.lizongying.mytv.api.YSP
 import com.lizongying.mytv.api.YSPApiService
 import com.lizongying.mytv.api.YSPBtraceService
@@ -31,8 +29,8 @@ import javax.crypto.spec.SecretKeySpec
 class Request {
     private var yspTokenService: YSPTokenService = ApiClient().yspTokenService
     private var yspApiService: YSPApiService = ApiClient().yspApiService
-    private var yspBtraceService: YSPBtraceService = BtraceClient().yspBtraceService
+    private var yspBtraceService: YSPBtraceService = ApiClient().yspBtraceService
-    private var yspProtoService: YSPProtoService = ProtoClient().yspProtoService
+    private var yspProtoService: YSPProtoService = ApiClient().yspProtoService
     private var ysp: YSP? = null
 
     // TODO onDestroy
@@ -62,7 +60,6 @@ class Request {
         "CGTN阿拉伯语频道" to "CGTN 阿拉伯语频道",
         "CGTN西班牙语频道" to "CGTN 西班牙语频道",
         "CGTN外语纪录频道" to "CGTN 纪录频道",
-
         "东方卫视" to "东方卫视",
         "湖南卫视" to "湖南卫视",
         "湖北卫视" to "湖北卫视",
@@ -90,7 +87,10 @@ class Request {
         ysp = YSP(context)
     }
 
+    var call: Call<LiveInfo>? = null
+
     fun fetchVideo(tvModel: TVViewModel, cookie: String) {
+        call?.cancel()
         if (::myRunnable.isInitialized) {
             handler.removeCallbacks(myRunnable)
         }
@@ -100,71 +100,71 @@ class Request {
         tvModel.seq = 0
         val data = ysp?.switch(tvModel)
         val request = data?.let { LiveInfoRequest(it) }
+        call = request?.let { yspApiService.getLiveInfo("guid=${ysp?.getGuid()}; $cookie", it) }
 
-        request?.let { yspApiService.getLiveInfo(cookie, it) }
+        call?.enqueue(object : Callback<LiveInfo> {
-            ?.enqueue(object : Callback<LiveInfo> {
+            override fun onResponse(call: Call<LiveInfo>, response: Response<LiveInfo>) {
-                override fun onResponse(call: Call<LiveInfo>, response: Response<LiveInfo>) {
+                if (response.isSuccessful) {
-                    if (response.isSuccessful) {
+                    val liveInfo = response.body()
-                        val liveInfo = response.body()
+                    if (liveInfo?.data?.playurl != null) {
-                        if (liveInfo?.data?.playurl != null) {
+                        val chanll = liveInfo.data.chanll
-                            val chanll = liveInfo.data.chanll
+                        val decodedBytes = Base64.decode(
-                            val decodedBytes = Base64.decode(
+                            chanll.substring(9, chanll.length - 3),
-                                chanll.substring(9, chanll.length - 3),
+                            Base64.DEFAULT
-                                Base64.DEFAULT
+                        )
-                            )
+                        val decodedString = String(decodedBytes)
-                            val decodedString = String(decodedBytes)
+                        val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
-                            val regex = Regex("""des_key = "([^"]+).+var des_iv = "([^"]+)""")
+                        val matchResult = regex.find(decodedString)
-                            val matchResult = regex.find(decodedString)
+                        if (matchResult != null) {
-                            if (matchResult != null) {
+                            val (key, iv) = matchResult.destructured
-                                val (key, iv) = matchResult.destructured
+                            val keyBytes = Base64.decode(key, Base64.DEFAULT)
-                                val keyBytes = Base64.decode(key, Base64.DEFAULT)
+                            val ivBytes = Base64.decode(iv, Base64.DEFAULT)
-                                val ivBytes = Base64.decode(iv, Base64.DEFAULT)
+                            val url = liveInfo.data.playurl + "&revoi=" + encryptTripleDES(
-                                val url = liveInfo.data.playurl + "&revoi=" + encryptTripleDES(
+                                keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
-                                    keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
+                                ivBytes
-                                    ivBytes
+                            ).uppercase()
-                                ).uppercase()
+                            Log.i(TAG, "$title url $url")
-                                Log.i(TAG, "$title url $url")
+                            tvModel.addVideoUrl(url)
-                                tvModel.addVideoUrl(url)
+                            tvModel.allReady()
-                                tvModel.allReady()
+                            tvModel.retryTimes = 0
-                                tvModel.retryTimes = 0
+                            myRunnable = MyRunnable(tvModel)
-                                myRunnable = MyRunnable(tvModel)
+                            handler.post(myRunnable)
-                                handler.post(myRunnable)
-                            } else {
-                                Log.e(TAG, "$title key error")
-                                if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                                    tvModel.retryTimes++
-                                    fetchVideo(tvModel, cookie)
-                                }
-                            }
                         } else {
-                            if (liveInfo?.data?.errinfo != null && liveInfo.data.errinfo != "success!") {
+                            Log.e(TAG, "$title key error")
-                                Log.e(TAG, "$title url error ${liveInfo.data.errinfo}")
+                            if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                                tvModel.setErrInfo(liveInfo.data.errinfo)
+                                tvModel.retryTimes++
-                            } else {
+                                fetchVideo(tvModel, cookie)
-                                Log.e(TAG, "$title url error $request $liveInfo")
-                                if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                                    tvModel.retryTimes++
-                                    fetchVideo(tvModel, cookie)
-                                }
                             }
                         }
                     } else {
-                        Log.e(TAG, "$title status error")
+                        if (liveInfo?.data?.errinfo != null && liveInfo.data.errinfo == "应版权方要求，暂停提供直播信号，请点击观看其他精彩节目") {
-                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                            Log.e(TAG, "$title error ${liveInfo.data.errinfo}")
-                            tvModel.retryTimes++
+                            tvModel.setErrInfo(liveInfo.data.errinfo)
-                            fetchVideo(tvModel, cookie)
+                        } else {
+                            Log.e(TAG, "$title url error $request $liveInfo")
+                            if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                                tvModel.retryTimes++
+                                fetchVideo(tvModel, cookie)
+                            }
                         }
                     }
-                }
+                } else {
-
+                    Log.e(TAG, "$title status error")
-                override fun onFailure(call: Call<LiveInfo>, t: Throwable) {
-                    Log.e(TAG, "$title request error")
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
                         fetchVideo(tvModel, cookie)
                     }
                 }
-            })
+            }
+
+            override fun onFailure(call: Call<LiveInfo>, t: Throwable) {
+                Log.e(TAG, "$title request error")
+                if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                    tvModel.retryTimes++
+                    fetchVideo(tvModel, cookie)
+                }
+            }
+        })
     }
 
     fun fetchVideo(tvModel: TVViewModel) {
@@ -172,11 +172,10 @@ class Request {
             .enqueue(object : Callback<Info> {
                 override fun onResponse(call: Call<Info>, response: Response<Info>) {
                     if (response.isSuccessful) {
-                        val info = response.body()
+                        val token = response.body()?.data?.token
-                        val token = info?.data?.token
                         Log.i(TAG, "info success $token")
                         val cookie =
-                            "guid=1; vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                            "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
                         fetchVideo(tvModel, cookie)
                     } else {
                         Log.e(TAG, "info status error")
@@ -201,7 +200,7 @@ class Request {
         if (tvModel.needToken) {
             fetchVideo(tvModel)
         } else {
-            val cookie = "guid=1; vplatform=109"
+            val cookie = "vplatform=109"
             fetchVideo(tvModel, cookie)
         }
     }

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

@@ -1,18 +1,27 @@
 package com.lizongying.mytv.api
 
 
+import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.converter.protobuf.ProtoConverterFactory
+import javax.net.ssl.SSLContext
+import javax.net.ssl.TrustManager
+import javax.net.ssl.X509TrustManager
 
 
 class ApiClient {
     private val yspUrl = "https://player-api.yangshipin.cn/"
     private val myUrl = "https://lyrics.run/"
-//    private val myUrl = "http://10.0.2.2:8081/"
+    private val protoUrl = "https://capi.yangshipin.cn/"
+    private val traceUrl = "https://btrace.yangshipin.cn/"
+
+    private var okHttpClient = getUnsafeOkHttpClient()
 
     val yspApiService: YSPApiService by lazy {
         Retrofit.Builder()
             .baseUrl(yspUrl)
+            .client(okHttpClient)
             .addConverterFactory(GsonConverterFactory.create())
             .build().create(YSPApiService::class.java)
     }
@@ -20,7 +29,60 @@ class ApiClient {
     val yspTokenService: YSPTokenService by lazy {
         Retrofit.Builder()
             .baseUrl(myUrl)
+            .client(okHttpClient)
             .addConverterFactory(GsonConverterFactory.create())
             .build().create(YSPTokenService::class.java)
     }
+
+    val yspProtoService: YSPProtoService by lazy {
+        Retrofit.Builder()
+            .baseUrl(protoUrl)
+            .client(okHttpClient)
+            .addConverterFactory(ProtoConverterFactory.create())
+            .build().create(YSPProtoService::class.java)
+    }
+
+    val yspBtraceService: YSPBtraceService by lazy {
+        Retrofit.Builder()
+            .baseUrl(traceUrl)
+            .client(okHttpClient)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build().create(YSPBtraceService::class.java)
+    }
+
+    private fun getUnsafeOkHttpClient(): OkHttpClient {
+        try {
+            val trustAllCerts: Array<TrustManager> = arrayOf(
+                object : X509TrustManager {
+                    override fun checkClientTrusted(
+                        chain: Array<out java.security.cert.X509Certificate>?,
+                        authType: String?
+                    ) {
+                    }
+
+                    override fun checkServerTrusted(
+                        chain: Array<out java.security.cert.X509Certificate>?,
+                        authType: String?
+                    ) {
+                    }
+
+                    override fun getAcceptedIssuers(): Array<java.security.cert.X509Certificate> {
+                        return emptyArray()
+                    }
+                }
+            )
+
+            val sslContext = SSLContext.getInstance("SSL")
+            sslContext.init(null, trustAllCerts, java.security.SecureRandom())
+
+            return OkHttpClient.Builder()
+                .sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)
+                .hostnameVerifier { _, _ -> true }
+                .dns(DnsCache())
+                .build()
+
+        } catch (e: Exception) {
+            throw RuntimeException(e)
+        }
+    }
 }

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

@@ -1,17 +0,0 @@
-package com.lizongying.mytv.api
-
-
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-
-class BtraceClient {
-    private val yspUrl = "https://btrace.yangshipin.cn/"
-
-    val yspBtraceService: YSPBtraceService by lazy {
-        Retrofit.Builder()
-            .baseUrl(yspUrl)
-            .addConverterFactory(GsonConverterFactory.create())
-            .build().create(YSPBtraceService::class.java)
-    }
-}

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

@@ -0,0 +1,23 @@
+package com.lizongying.mytv.api
+
+import okhttp3.Dns
+import java.net.InetAddress
+import java.util.concurrent.ConcurrentHashMap
+
+class DnsCache : Dns {
+    private val dnsCache: MutableMap<String, List<InetAddress>> = ConcurrentHashMap()
+
+    override fun lookup(hostname: String): List<InetAddress> {
+        dnsCache[hostname]?.let {
+            return it
+        }
+
+        val addresses = InetAddress.getAllByName(hostname).toList()
+
+        if (addresses.isNotEmpty()) {
+            dnsCache[hostname] = addresses
+        }
+
+        return addresses
+    }
+}

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

@@ -1,16 +0,0 @@
-package com.lizongying.mytv.api
-
-import retrofit2.Retrofit
-import retrofit2.converter.protobuf.ProtoConverterFactory
-
-
-class ProtoClient {
-    private val protoUrl = "https://capi.yangshipin.cn/"
-
-    val yspProtoService: YSPProtoService by lazy {
-        Retrofit.Builder()
-            .baseUrl(protoUrl)
-            .addConverterFactory(ProtoConverterFactory.create())
-            .build().create(YSPProtoService::class.java)
-    }
-}

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

@@ -70,6 +70,11 @@ class YSP(var context: Context) {
         defn = "fhd"
 
         randStr = getRand()
+
+        if (tvModel.retryTimes > 0) {
+            guid = newGuid()
+        }
+
         timeStr = getTimeStr()
 
 //        guid = "lq3oqitm_1e15dnzgjnb"
@@ -105,6 +110,15 @@ class YSP(var context: Context) {
         return guid
     }
 
+    private fun newGuid(): String {
+        guid = generateGuid()
+        with(sharedPref!!.edit()) {
+            putString("guid", guid)
+            apply()
+        }
+        return guid
+    }
+
     fun getRand(): String {
         var n = ""
         val e = "ABCDEFGHIJKlMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"

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

@@ -1,6 +1,5 @@
 package com.lizongying.mytv.models
 
-import android.content.SharedPreferences
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel

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

@@ -20,7 +20,7 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     private var itemPosition: Int = 0
 
     var retryTimes: Int = 0
-    var retryMaxTimes: Int = 3
+    var retryMaxTimes: Int = 5
     var programUpdateTime: Long = 0
 
     private val _errInfo = MutableLiveData<String>()
@@ -71,7 +71,7 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val ready: LiveData<Boolean>
         get() = _ready
 
-    private var mMinimumLoadableRetryCount = 3
+    private var mMinimumLoadableRetryCount = 5
 
     var seq = 0
 

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/channel_fragment"
+    android:layout_width="80dp"
+    android:layout_height="80dp"
+    android:layout_gravity="end|top"
+    android:layout_marginTop="20dp"
+    android:layout_marginEnd="50dp">
+
+    <TextView
+        android:id="@+id/channel_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_marginTop="0dp"
+        android:text="99"
+        android:textColor="#FFEEEEEE"
+        android:textStyle="bold"
+        android:textSize="50sp" />
+</FrameLayout>

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

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dialog"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    >
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:paddingTop="20dp"
+            android:paddingLeft="7dp"
+            android:paddingRight="7dp"
+            android:background="#FF263238"
+            >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/app_name"
+                android:textSize="16sp" />
+            <TextView
+                android:id="@+id/version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:text="当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/"
+                ></TextView>
+            <Switch
+                android:id="@+id/switch_channel_reversal"
+                android:text="@string/title_channel_reversal"
+                android:layout_marginTop="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <Switch
+                android:id="@+id/switch_channel_num"
+                android:text="@string/title_channel_num"
+                android:layout_marginTop="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+        <ImageView
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            android:src="@drawable/appreciate"
+            android:background="@color/white" />
+    </LinearLayout>
+</FrameLayout>

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

@@ -12,7 +12,6 @@
         android:layout_width="100dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:contentDescription="@string/logo"
         android:padding="10dp" />
 
     <LinearLayout

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

@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">我的电视</string>
-    <string name="logo">logo</string>
+    <string name="title_channel_reversal">换台反转</string>
+    <string name="title_channel_num">数字选台</string>
 </resources>

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

@@ -1,6 +1,5 @@
 <resources>
 
-
     <style name="CustomImageCardViewStyle" parent="Widget.Leanback.ImageCardViewStyle">
         <item name="lbImageCardViewType">Title|Content</item>
     </style>