fix ysp err

lizongying · Feb 4, 2024 · 8137515 · 8137515
1 parent 6c16408
commit 8137515
Show file tree

Hide file tree

Showing 10 changed files with 1,075 additions and 410 deletions.
diff --git a/README.md b/README.md
@@ -108,6 +108,7 @@ adb install my-tv.apk
 * 1.5.0 无法安装，1.5.1 可以安装
 * 获取系统时间
 * 选中的图标比例能否相差更大
+* 自动重连
 
 ## 赞赏
 

diff --git a/app/src/main/java/com/lizongying/mytv/MainFragment.kt b/app/src/main/java/com/lizongying/mytv/MainFragment.kt
@@ -62,6 +62,7 @@ class MainFragment : Fragment(), CardAdapter.ItemListener {
             val content = binding.content
 
             var idx: Long = 0
+            context?.let { TVList.init(it) }
             for ((k, v) in TVList.list) {
                 val itemBinding: RowBinding =
                     RowBinding.inflate(layoutInflater, content, false)

diff --git a/app/src/main/java/com/lizongying/mytv/Request.kt b/app/src/main/java/com/lizongying/mytv/Request.kt
@@ -144,9 +144,9 @@ class Request {
                             Log.e(TAG, "$title key error")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                if (tvModel.needToken) {
+                                if (tvModel.getTV().needToken) {
                                     if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
-                                        if (!tvModel.mustToken) {
+                                        if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
                                         }
                                     } else {
@@ -166,9 +166,9 @@ class Request {
                             Log.e(TAG, "$title url error $request $liveInfo")
                             if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                                 tvModel.retryTimes++
-                                if (tvModel.needToken) {
+                                if (tvModel.getTV().needToken) {
                                     if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
-                                        if (!tvModel.mustToken) {
+                                        if (!tvModel.getTV().mustToken) {
                                             fetchVideo(tvModel, cookie)
                                         }
                                     } else {
@@ -185,9 +185,9 @@ class Request {
                     Log.e(TAG, "$title status error")
                     if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                         tvModel.retryTimes++
-                        if (tvModel.needToken) {
+                        if (tvModel.getTV().needToken) {
                             if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
-                                if (!tvModel.mustToken) {
+                                if (!tvModel.getTV().mustToken) {
                                     fetchVideo(tvModel, cookie)
                                 }
                             } else {
@@ -205,9 +205,9 @@ class Request {
                 Log.e(TAG, "$title request error")
                 if (tvModel.retryTimes < tvModel.retryMaxTimes) {
                     tvModel.retryTimes++
-                    if (tvModel.needToken) {
+                    if (tvModel.getTV().needToken) {
                         if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
-                            if (!tvModel.mustToken) {
+                            if (!tvModel.getTV().mustToken) {
                                 fetchVideo(tvModel, cookie)
                             }
                         } else {
@@ -231,16 +231,17 @@ class Request {
                             token = response.body()?.data?.token!!
                             Log.i(TAG, "info success $token")
                             val cookie =
-                                "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
                             fetchVideo(tvModel, cookie)
                         } else {
                             Log.e(TAG, "info status error")
                             if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
                                 tvModel.tokenRetryTimes++
                                 fetchVideo(tvModel)
                             } else {
-                                if (!tvModel.mustToken) {
-                                    val cookie = "vplatform=109"
+                                if (!tvModel.getTV().mustToken) {
+                                    val cookie =
+                                        "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; yspappid=519748109"
                                     fetchVideo(tvModel, cookie)
                                 }
                             }
@@ -253,25 +254,27 @@ class Request {
                             tvModel.tokenRetryTimes++
                             fetchVideo(tvModel)
                         } else {
-                            if (!tvModel.mustToken) {
-                                val cookie = "vplatform=109"
+                            if (!tvModel.getTV().mustToken) {
+                                val cookie =
+                                    "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; yspappid=519748109"
                                 fetchVideo(tvModel, cookie)
                             }
                         }
                     }
                 })
         } else {
             val cookie =
-                "vplatform=109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
             fetchVideo(tvModel, cookie)
         }
     }
 
     fun fetchData(tvModel: TVViewModel) {
-        if (tvModel.needToken) {
+        if (tvModel.getTV().needToken) {
             fetchVideo(tvModel)
         } else {
-            val cookie = "vplatform=109"
+            val cookie =
+                "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; yspappid=519748109"
             fetchVideo(tvModel, cookie)
         }
     }

diff --git a/app/src/main/java/com/lizongying/mytv/TV.kt b/app/src/main/java/com/lizongying/mytv/TV.kt
@@ -7,10 +7,14 @@ data class TV(
     var title: String,
     var videoUrl: List<String>,
     var videoIndex: Int = 0,
+    var channel: String = "",
     var logo: String = "",
     var pid: String = "",
     var sid: String = "",
     var programId: String = "",
+    var needToken:Boolean=false,
+    var mustToken:Boolean=false,
+
 ) : Serializable {
 
     override fun toString(): String {