action sign

.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: "30.0.2"
 
       - name: Create Release
         id: create_release

README.md

@@ -14,6 +14,11 @@
 
 ## 更新日志
 
+### v1.3.3
+
+* 部分错误会提示用户
+* 菜单3秒钟后自动关闭
+
 ### v1.3.2
 
 * 增加重试，减少因网络问题导致的播放失败

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

@@ -35,6 +35,9 @@ class MainActivity : FragmentActivity() {
 
     private lateinit var gestureDetector: GestureDetector
 
+    private val handler = Handler()
+    private val delay: Long = 3000
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -86,6 +89,7 @@ class MainActivity : FragmentActivity() {
 
         if (mainFragment.isHidden) {
             transaction.show(mainFragment)
+            keepRunnable()
         } else {
             transaction.hide(mainFragment)
         }
@@ -93,6 +97,15 @@ class MainActivity : FragmentActivity() {
         transaction.commit()
     }
 
+    fun keepRunnable() {
+        handler.removeCallbacks(hideRunnable)
+        handler.postDelayed(hideRunnable, delay)
+    }
+
+    private val hideRunnable = Runnable {
+        supportFragmentManager.beginTransaction().hide(mainFragment).commit()
+    }
+
     private fun mainFragmentIsHidden(): Boolean {
         return mainFragment.isHidden
     }

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

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import android.widget.Toast
 import androidx.leanback.app.BrowseSupportFragment
 import androidx.leanback.widget.ArrayObjectAdapter
 import androidx.leanback.widget.HeaderItem
@@ -63,6 +64,13 @@ class MainFragment : BrowseSupportFragment() {
         handler.post(mUpdateProgramRunnable)
 
         tvListViewModel.getTVListViewModel().value?.forEach { tvViewModel ->
+            tvViewModel.errInfo.observe(viewLifecycleOwner) { _ ->
+                if (tvViewModel.errInfo.value != null
+                    && tvViewModel.id.value == itemPosition
+                ) {
+                    Toast.makeText(context, tvViewModel.errInfo.value, Toast.LENGTH_SHORT).show()
+                }
+            }
             tvViewModel.ready.observe(viewLifecycleOwner) { _ ->
 
                 // not first time && channel not change
@@ -305,6 +313,7 @@ class MainFragment : BrowseSupportFragment() {
         ) {
             if (item is TVViewModel) {
                 tvListViewModel.setItemPositionCurrent(item.id.value!!)
+                (activity as MainActivity).keepRunnable()
             }
         }
     }

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 "湖北卫视",
@@ -86,8 +83,6 @@ class Request {
         "海南卫视" to "海南卫视",
     )
 
-    private var token: String? = null
-
     fun initYSP(context: Context) {
         ysp = YSP(context)
     }
@@ -135,21 +130,26 @@ class Request {
                                 Log.e(TAG, "$title key error")
                                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                     tvModel.retryTimes++
-                                    fetchData(tvModel)
+                                    fetchVideo(tvModel, cookie)
                                 }
                             }
                         } else {
-                            Log.e(TAG, "$title url error $request")
+                            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)
-                                fetchData(tvModel)
+                            } 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")
                         if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                             tvModel.retryTimes++
-                            fetchData(tvModel)
+                            fetchVideo(tvModel, cookie)
                         }
                     }
                 }
@@ -158,61 +158,47 @@ class Request {
                     Log.e(TAG, "$title request error")
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
-                        fetchData(tvModel)
+                        fetchVideo(tvModel, cookie)
+                    }
+                }
+            })
+    }
+
+    fun fetchVideo(tvModel: TVViewModel) {
+        yspTokenService.getInfo()
+            .enqueue(object : Callback<Info> {
+                override fun onResponse(call: Call<Info>, response: Response<Info>) {
+                    if (response.isSuccessful) {
+                        val info = response.body()
+                        val token = info?.data?.token
+                        Log.i(TAG, "info success $token")
+                        val cookie =
+                            "guid=1; vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                        fetchVideo(tvModel, cookie)
+                    } else {
+                        Log.e(TAG, "info status error")
+                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                            tvModel.retryTimes++
+                            fetchVideo(tvModel)
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call<Info>, t: Throwable) {
+                    Log.e(TAG, "info request error $t")
+                    if (tvModel.retryTimes < tvModel.retryMaxTimes) {
+                        tvModel.retryTimes++
+                        fetchVideo(tvModel)
                     }
                 }
             })
     }
 
     fun fetchData(tvModel: TVViewModel) {
-        var cookie = "guid=1; vplatform=109"
+        if (tvModel.needToken) {
-        val channels = arrayOf(
+            fetchVideo(tvModel)
-            "CCTV3 综艺",
-            "CCTV6 电影",
-            "CCTV8 电视剧",
-            "风云剧场",
-            "第一剧场",
-            "怀旧剧场",
-            "世界地理",
-            "风云音乐",
-            "兵器科技",
-            "风云足球",
-            "高尔夫网球",
-            "女性时尚",
-            "央视文化精品",
-            "央视台球",
-            "电视指南",
-            "卫生健康",
-        )
-        if (tvModel.title.value in channels) {
-            yspTokenService.getInfo()
-                .enqueue(object : Callback<Info> {
-                    override fun onResponse(call: Call<Info>, response: Response<Info>) {
-                        if (response.isSuccessful) {
-                            val info = response.body()
-                            token = info?.data?.token
-                            Log.i(TAG, "info success $token")
-                            cookie =
-                                "guid=1; vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
-                            fetchVideo(tvModel, cookie)
-                        } else {
-                            Log.e(TAG, "info status error")
-                            if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                                tvModel.retryTimes++
-                                fetchData(tvModel)
-                            }
-                        }
-                    }
-
-                    override fun onFailure(call: Call<Info>, t: Throwable) {
-                        Log.e(TAG, "info request error $t")
-                        if (tvModel.retryTimes < tvModel.retryMaxTimes) {
-                            tvModel.retryTimes++
-                            fetchData(tvModel)
-                        }
-                    }
-                })
         } else {
+            val cookie = "guid=1; vplatform=109"
             fetchVideo(tvModel, cookie)
         }
     }

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

@@ -1,18 +1,26 @@
 package com.lizongying.mytv.api
 
 
+import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.converter.protobuf.ProtoConverterFactory
 
 
 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 = OkHttpClient.Builder()
+        .dns(DnsCache())
+        .build()
 
     val yspApiService: YSPApiService by lazy {
         Retrofit.Builder()
             .baseUrl(yspUrl)
+            .client(okHttpClient)
             .addConverterFactory(GsonConverterFactory.create())
             .build().create(YSPApiService::class.java)
     }
@@ -20,7 +28,24 @@ 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)
+    }
 }

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

@@ -15,6 +15,7 @@ data class LiveInfo(
 data class LiveInfoData(
     val chanll: String,
     val playurl: String,
+    val errinfo: String,
 )
 
 data class LiveInfoRequest(

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,8 @@ class YSP(var context: Context) {
         defn = "fhd"
 
         randStr = getRand()
+
+        guid = newGuid()
         timeStr = getTimeStr()
 
 //        guid = "lq3oqitm_1e15dnzgjnb"
@@ -105,6 +107,15 @@ class YSP(var context: Context) {
         return guid
     }
 
+    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/TVViewModel.kt

@@ -20,9 +20,13 @@ 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>()
+    val errInfo: LiveData<String>
+        get() = _errInfo
+
     private val _programId = MutableLiveData<String>()
     val programId: LiveData<String>
         get() = _programId
@@ -67,10 +71,31 @@ class TVViewModel(private var tv: TV) : ViewModel() {
     val ready: LiveData<Boolean>
         get() = _ready
 
-    private var mMinimumLoadableRetryCount = 3
+    private var mMinimumLoadableRetryCount = 5
 
     var seq = 0
 
+    var needToken = false
+
+    private val channelsNeedToken = arrayOf(
+        "CCTV3 综艺",
+        "CCTV6 电影",
+        "CCTV8 电视剧",
+        "风云剧场",
+        "第一剧场",
+        "怀旧剧场",
+        "世界地理",
+        "风云音乐",
+        "兵器科技",
+        "风云足球",
+        "高尔夫网球",
+        "女性时尚",
+        "央视文化精品",
+        "央视台球",
+        "电视指南",
+        "卫生健康",
+    )
+
     fun addVideoUrl(url: String) {
         if (_videoUrl.value?.isNotEmpty() == true) {
             if (_videoUrl.value!!.last().contains("cctv.cn")) {
@@ -121,6 +146,10 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         _pid.value = tv.pid
         _sid.value = tv.sid
         _program.value = mutableListOf()
+
+        if (tv.title in channelsNeedToken) {
+            needToken = true
+        }
     }
 
     fun getRowPosition(): Int {
@@ -139,6 +168,10 @@ class TVViewModel(private var tv: TV) : ViewModel() {
         itemPosition = position
     }
 
+    fun setErrInfo(info: String) {
+        _errInfo.value = info
+    }
+
     fun update(t: TV) {
         tv = t
     }