ysp

HISTORY.md

@@ -1,9 +1,13 @@
 ## 更新日誌
 
-### v2.1.2
+### v2.1.5
 
 *
 
+### v2.1.4
+
+* 解決切換頻道時黑屏問題
+
 ### v2.1.1
 
 * 平衡聲音

app/build.gradle

@@ -98,71 +98,26 @@ static def VersionName() {
     }
 }
 
-def gson_version = "2.10.1"
-def failureaccess_version = "1.0.2"
-def guava_version = "33.2.1-android"
-
 dependencies {
-
+    implementation(libs.media3.ui)
-//    minSdk17
+    implementation(libs.failureaccess)
-    def media3_version = "1.2.1"
+    implementation(libs.guava)
-
+    implementation(libs.media3.common)
-    implementation "androidx.media3:media3-ui:$media3_version"
+    implementation(libs.media3.exoplayer)
-
+    implementation(libs.media3.exoplayer.hls)
-    // For media playback using ExoPlayer
+    implementation(libs.protobuf.kotlin)
-    implementation("com.google.guava:failureaccess:$failureaccess_version")
+    implementation(libs.gson)
-    implementation("com.google.guava:guava:$guava_version")
+    implementation(libs.converter.gson)
-    implementation("androidx.media3:media3-common:$media3_version") {
+    implementation(libs.converter.protobuf)
-        exclude group: 'com.google.guava', module: 'guava'
+    implementation(libs.retrofit)
-        exclude group: 'com.google.guava', module: 'failureaccess'
+    implementation(libs.glide)
-    }
+    implementation(libs.work.runtime.ktx)
-    implementation("androidx.media3:media3-exoplayer:$media3_version")
+    implementation(libs.core.ktx)
-
+    implementation(libs.multidex)
-    // For HLS playback support with ExoPlayer
+    implementation(libs.leanback)
-    implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
+    implementation(libs.lifecycle.runtime.ktx)
-
+    implementation(libs.constraintlayout)
-    // 21:2.9.0 17:2.6.4
+    implementation(libs.serialization.json)
-    def retrofit2_version = "2.6.4"
+    implementation(libs.coroutines.android)
-
+    implementation(libs.javax.annotation.api)
-    implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
-    // Gson 2.10.1 and older: API level 19
-    implementation("com.google.code.gson:gson:$gson_version")
-    implementation("com.squareup.retrofit2:converter-gson:$retrofit2_version") {
-        exclude group: 'com.google.code.gson', module: 'gson'
-    }
-    implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version"
-    implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
-
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
-
-    implementation("androidx.work:work-runtime-ktx:2.9.0")
-    implementation 'androidx.core:core-ktx:1.11.0-beta02'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.leanback:leanback:1.2.0-alpha02'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2"
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0-RC")
-
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
-}
-
-configurations.configureEach {
-    resolutionStrategy {
-        force("com.google.code.gson:gson:$gson_version")
-        force "com.google.guava:failureaccess:$failureaccess_version"
-        force "com.google.guava:guava:$guava_version"
-        eachDependency { details ->
-            if (details.requested.group == 'com.google.code.gson') {
-                details.useVersion "$gson_version"
-            }
-            if (details.requested.group == 'com.google.guava' && details.requested.name == 'failureaccess') {
-                details.useVersion "$failureaccess_version"
-            }
-            if (details.requested.group == 'com.google.guava' && details.requested.name == 'guava') {
-                details.useVersion "$guava_version"
-            }
-        }
-    }
 }

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

@@ -2,6 +2,7 @@ package com.lizongying.mytv
 
 import android.content.res.Resources
 import android.os.Build
+import android.util.Log
 import android.util.TypedValue
 import com.google.gson.Gson
 import com.lizongying.mytv.api.TimeResponse
@@ -18,6 +19,10 @@ import java.util.Locale
 object Utils {
     private var between: Long = 0
 
+    private var a: String = ""
+    var b: String = ""
+    private var c: String = ""
+
     private var listener: Request.RequestListener? = null
 
     fun getDateFormat(format: String): String {
@@ -45,6 +50,31 @@ object Utils {
             println("Failed to retrieve timestamp from server: ${e.message}")
         }
 
+        var x = ""
+        try {
+            x = getNothing()
+        } catch (e: Exception) {
+            x = ""
+            println("a ${e.message}")
+        }
+
+        if (x != "") {
+            try {
+                x = getNothing2(x)
+            } catch (e: Exception) {
+                x = ""
+                println("b ${e.message}")
+            }
+        }
+
+        if (x != "") {
+            try {
+                getNothing3(x)
+            } catch (e: Exception) {
+                println("b ${e.message}")
+            }
+        }
+
         withContext(Dispatchers.Main) {
             listener?.onRequestFinished(null)
         }
@@ -88,6 +118,115 @@ object Utils {
         }
     }
 
+    private val regex = Regex("""chunk-vendors\.([^.]+)\.js""")
+
+    private suspend fun getNothing(): String {
+        return withContext(Dispatchers.IO) {
+            val client = okhttp3.OkHttpClient.Builder()
+                .addInterceptor(RetryInterceptor(3))
+                .build()
+            val request = okhttp3.Request.Builder()
+                .url("https://www.yangshipin.cn")
+                .build()
+            try {
+                client.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful) throw IOException("Unexpected code $response")
+                    val string = response.body()?.string()
+
+                    val matchResult = string?.let { regex.find(it) }
+                    var x = ""
+                    if (matchResult != null) {
+                        x = matchResult.groupValues[1]
+                    }
+                    x
+                }
+            } catch (e: IOException) {
+                throw IOException("Error during network request", e)
+            }
+        }
+    }
+
+    private val regex2 = Regex(""""ysp_tx"[^:]+:"([^"]+)[^:]+:"([^"]+)""")
+
+    private val regex3 = Regex(""""(https[^"]+wasm([^"]+))""")
+
+    private suspend fun getNothing2(x: String): String {
+        return withContext(Dispatchers.IO) {
+            val client = okhttp3.OkHttpClient.Builder()
+                .addInterceptor(RetryInterceptor(3))
+                .build()
+
+            val request = okhttp3.Request.Builder()
+                .url("https://www.yangshipin.cn/js/chunk-vendors.$x.js")
+                .build()
+            try {
+                client.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful) throw IOException("Unexpected code $response")
+                    val string = response.body()?.string()
+
+                    val matches = string?.let { regex2.findAll(it) }
+
+                    var matchResult = matches?.lastOrNull()
+
+                    if (matchResult != null) {
+                        val (aa, bb) = matchResult.destructured
+                        a = aa
+                        b = bb
+                    }
+
+                    matchResult = string?.let { regex3.find(it) }
+
+                    if (matchResult != null) {
+                        val (cc) = matchResult.destructured
+                        c = cc
+                        Log.i("", "ccccc $c")
+                    }
+                    c
+                }
+            } catch (e: IOException) {
+                throw IOException("Error during network request", e)
+            }
+        }
+    }
+
+    private suspend fun getNothing3(x: String): String {
+        return withContext(Dispatchers.IO) {
+            val client = okhttp3.OkHttpClient.Builder()
+                .addInterceptor(RetryInterceptor(3))
+                .build()
+
+            val request = okhttp3.Request.Builder()
+                .url("https://www.yangshipin.cn/js/chunk-vendors.$x.js")
+                .build()
+            try {
+                client.newCall(request).execute().use { response ->
+                    if (!response.isSuccessful) throw IOException("Unexpected code $response")
+                    val string = response.body()?.string()
+
+                    val matches = string?.let { regex2.findAll(it) }
+
+                    var matchResult = matches?.lastOrNull()
+
+                    if (matchResult != null) {
+                        val (aa, bb) = matchResult.destructured
+                        a = aa
+                        b = bb
+                    }
+
+                    matchResult = string?.let { regex3.find(it) }
+
+                    if (matchResult != null) {
+                        val (cc) = matchResult.destructured
+                        c = cc
+                    }
+                    c
+                }
+            } catch (e: IOException) {
+                throw IOException("Error during network request", e)
+            }
+        }
+    }
+
     fun dpToPx(dp: Float): Int {
         return TypedValue.applyDimension(
             TypedValue.COMPLEX_UNIT_DIP, dp, Resources.getSystem().displayMetrics

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

@@ -13,6 +13,8 @@ class Encryptor {
 
     external fun hash2(data: ByteArray): ByteArray?
 
+    external fun hash3(data: ByteArray): ByteArray?
+
     companion object {
         init {
             System.loadLibrary("native")

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

@@ -3,6 +3,7 @@ package com.lizongying.mytv.api
 import android.content.Context
 import android.util.Log
 import com.lizongying.mytv.SP
+import com.lizongying.mytv.Utils
 import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.models.TVViewModel
 import java.security.MessageDigest
@@ -182,13 +183,13 @@ object YSP {
 
     private fun getAuthSignature(): String {
         val e =
-            "appid=${appid}&guid=${guid}&pid=${livepid}&rand_str=${randStr}".toByteArray()
+            "appid=${appid}&guid=${guid}&pid=${livepid}&rand_str=${randStr}${Utils.b}".toByteArray()
-        val hashedData = encryptor.hash2(e) ?: return ""
+        val hashedData = encryptor.hash3(e) ?: return ""
         return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
     }
 
     fun getAuthSignature(e: String): String {
-        val hashedData = encryptor.hash2(e.toByteArray()) ?: return ""
+        val hashedData = encryptor.hash3("$e${Utils.b}".toByteArray()) ?: return ""
         return hashedData.let { it -> it.joinToString("") { "%02x".format(it) } }
     }
 }

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

@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
+        app:shutter_background_color="@android:color/transparent"
         app:resize_mode="fill"
         app:use_controller="false" />
 </FrameLayout>

gradle/libs.versions.toml

@@ -0,0 +1,40 @@
+[versions]
+media3 = "1.2.1" # minSdk17
+gson = "2.10.1" # 2.10.1 and older: API level 19
+failureaccess = "1.0.2"
+guava = "33.2.1-android"
+retrofit = "2.6.4" # 21:2.9.0 17:2.6.4
+protobuf = "3.25.1"
+glide = "4.11.0"
+work = "2.9.0"
+core_ktx = "1.11.0-beta02"
+multidex = "2.0.1"
+leanback = "1.2.0-alpha02"
+lifecycle = "2.6.2"
+constraintlayout = "2.1.4"
+serialization = "1.6.2"
+coroutines = "1.8.0-RC"
+javax_annotation = "1.3.2"
+
+[libraries]
+media3-ui = { module = "androidx.media3:media3-ui", version.ref = "media3" }
+media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" }
+media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" }
+media3-exoplayer-hls = { module = "androidx.media3:media3-exoplayer-hls", version.ref = "media3" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+failureaccess = { module = "com.google.guava:failureaccess", version.ref = "failureaccess" }
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
+retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
+converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+converter-protobuf = { module = "com.squareup.retrofit2:converter-protobuf", version.ref = "retrofit" }
+protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
+glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
+work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work" }
+core-ktx = { module = "androidx.core:core-ktx", version.ref = "core_ktx" }
+multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
+leanback = { module = "androidx.leanback:leanback", version.ref = "leanback" }
+lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
+constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
+coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
+javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax_annotation" }

version.json

@@ -1 +1 @@
-{"version_code": 33620480, "version_name": "v2.1.2"}
+{"version_code": 33621248, "version_name": "v2.1.5"}