fix ysp

lizongying · Jun 20, 2024 · 5d43532 · 5d43532
1 parent a8944e7
commit 5d43532
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 35 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,6 @@
 ## 更新日誌
 
-### v2.1.6
+### v2.1.7
 
 *
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -100,9 +100,6 @@ static def VersionName() {
 
 dependencies {
     implementation(libs.media3.ui)
-    implementation(libs.failureaccess)
-    implementation(libs.guava)
-    implementation(libs.media3.common)
     implementation(libs.media3.exoplayer)
     implementation(libs.media3.exoplayer.hls)
     implementation(libs.protobuf.kotlin)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,10 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
--keep class com.google.gson.** { *; }
--dontwarn com.google.gson.**
-
--keep class com.google.guava.** { *; }
--dontwarn com.google.guava.**
+#-renamesourcefileattribute SourceFile
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />

diff --git a/app/src/main/cpp/arm64-v8a/libnative.so b/app/src/main/cpp/arm64-v8a/libnative.so
diff --git a/app/src/main/cpp/armeabi-v7a/libnative.so b/app/src/main/cpp/armeabi-v7a/libnative.so
diff --git a/app/src/main/java/com/lizongying/mytv/Utils.kt b/app/src/main/java/com/lizongying/mytv/Utils.kt
@@ -67,13 +67,13 @@ object Utils {
             }
         }
 
-        if (x != "") {
-            try {
-                getNothing3(x)
-            } catch (e: Exception) {
-                println("b ${e.message}")
-            }
-        }
+//        if (x != "") {
+//            try {
+//                getNothing3(x)
+//            } catch (e: Exception) {
+//                println("b ${e.message}")
+//            }
+//        }
 
         withContext(Dispatchers.Main) {
             listener?.onRequestFinished(null)

diff --git a/app/src/main/java/com/lizongying/mytv/requests/Request.kt b/app/src/main/java/com/lizongying/mytv/requests/Request.kt
@@ -334,21 +334,8 @@ object Request {
                     val liveInfo = response.body()
 
                     if (liveInfo?.data?.playurl != null) {
-                        val chanll = liveInfo.data.chanll
-                        val decodedBytes = Base64.decode(
-                            chanll.substring(9, chanll.length - 3),
-                            Base64.DEFAULT
-                        )
-                        val decodedString = String(decodedBytes)
-                        val matchResult = regex.find(decodedString)
-                        if (matchResult != null) {
-                            val (key, iv) = matchResult.destructured
-                            val keyBytes = Base64.decode(key, Base64.DEFAULT)
-                            val ivBytes = Base64.decode(iv, Base64.DEFAULT)
-                            val url = liveInfo.data.playurl + "&revoi=" + encryptTripleDES(
-                                keyBytes + byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
-                                ivBytes
-                            ).uppercase() + liveInfo.data.extended_param
+                        if (liveInfo.data.extended_param != null) {
+                            val url = liveInfo.data.playurl + "&revoi=" + liveInfo.data.extended_param
                             Log.d(TAG, "$title url $url")
                             tvModel.addVideoUrl(url)
                             tvModel.allReady()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Dec 01 13:53:24 HKT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/version.json b/version.json
@@ -1 +1 @@
-{"version_code": 33621504, "version_name": "v2.1.6"}
+{"version_code": 33621760, "version_name": "v2.1.7"}