Balanced sounds

HISTORY.md

@@ -1,5 +1,9 @@
 ## 更新日誌
 
+### v2.1.1
+
+* 平衡聲音
+
 ### v2.1.0
 
 * 恢復播放

app/.gitignore

@@ -4,3 +4,4 @@
 /CMakeFiles/
 /Makefile
 /src/main/cpp/native.c
+/src/main/cpp/aes.c

app/CMakeLists.txt

@@ -21,7 +21,9 @@ if (IS_SO_BUILD)
             SHARED
 
             # Provides a relative path to your source file(s).
-            src/main/cpp/native.c)
+            src/main/cpp/native.c
+            src/main/cpp/aes.c
+    )
 
     # 设置编译输出路径
     set_target_properties(

app/build.gradle

@@ -98,6 +98,10 @@ static def VersionName() {
     }
 }
 
+def gson_version = "2.10.1"
+def failureaccess_version = "1.0.2"
+def guava_version = "33.2.1-android"
+
 dependencies {
 
 //    minSdk17
@@ -106,11 +110,13 @@ dependencies {
     implementation "androidx.media3:media3-ui:$media3_version"
 
     // For media playback using ExoPlayer
-    implementation ("com.google.guava:guava:31.1-android")
-    implementation ("androidx.media3:media3-common:$media3_version") {
-        exclude group: 'com.google.common', module: 'guava'
+    implementation("com.google.guava:failureaccess:$failureaccess_version")
+    implementation("com.google.guava:guava:$guava_version")
+    implementation("androidx.media3:media3-common:$media3_version") {
+        exclude group: 'com.google.guava', module: 'guava'
+        exclude group: 'com.google.guava', module: 'failureaccess'
     }
-    implementation ("androidx.media3:media3-exoplayer:$media3_version")
+    implementation("androidx.media3:media3-exoplayer:$media3_version")
 
     // For HLS playback support with ExoPlayer
     implementation "androidx.media3:media3-exoplayer-hls:$media3_version"
@@ -120,7 +126,7 @@ dependencies {
 
     implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
     // Gson 2.10.1 and older: API level 19
-    implementation("com.google.code.gson:gson:2.10.1")
+    implementation("com.google.code.gson:gson:$gson_version")
     implementation("com.squareup.retrofit2:converter-gson:$retrofit2_version") {
         exclude group: 'com.google.code.gson', module: 'gson'
     }
@@ -144,7 +150,19 @@ dependencies {
 
 configurations.configureEach {
     resolutionStrategy {
-        force 'com.google.code.gson:gson:2.10.1'
-        force 'com.google.guava:guava:31.1-android'
+        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/proguard-rules.pro

@@ -18,4 +18,10 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class com.google.gson.** { *; }
+-dontwarn com.google.gson.**
+
+-keep class com.google.guava.** { *; }
+-dontwarn com.google.guava.**

app/src/main/cpp/include/aes.h

@@ -0,0 +1,9 @@
+#ifndef AES_H
+#define AES_H
+
+#include <stddef.h>
+
+void init();
+void encode(const char *in, size_t size, char *out);
+
+#endif

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

@@ -93,6 +93,7 @@ class PlayerFragment : Fragment() {
         playerView?.player?.run {
             setMediaItem(MediaItem.fromUri(tvViewModel.getVideoUrlCurrent()))
             prepare()
+            volume = tvViewModel.getTV().volume
         }
     }
 

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

@@ -7,6 +7,8 @@ class Encryptor {
 
     external fun encrypt(t: String, e: String, r: String, n: String, i: String): String
 
+    external fun encrypt2(t: String): String
+
     external fun hash(data: ByteArray): ByteArray?
 
     external fun hash2(data: ByteArray): ByteArray?

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

@@ -1,6 +1,7 @@
 package com.lizongying.mytv.api
 
 import android.content.Context
+import android.util.Log
 import com.lizongying.mytv.SP
 import com.lizongying.mytv.Utils.getDateTimestamp
 import com.lizongying.mytv.models.TVViewModel
@@ -57,6 +58,7 @@ object YSP {
 
     var yspsdkinput = ""
     var openapi_signature = ""
+    var yspticket = ""
 
     var nseqId = 1
     var nrequest_id = ""
@@ -85,6 +87,8 @@ object YSP {
             encryptor.encrypt(cnlid, timeStr, appVer, guid, platform)
         randStr = getRand()
         signature = getSignature()
+        yspticket = encryptor.encrypt2("$livepid&$timeStr&$guid&519748109").lowercase()
+
         return """{"cnlid":"$cnlid","livepid":"$livepid","stream":"$stream","guid":"$guid","cKey":"$cKey","adjust":$adjust,"sphttps":"$sphttps","platform":"$platform","cmd":"$cmd","encryptVer":"$encryptVer","dtype":"$dtype","devid":"$devid","otype":"$otype","appVer":"$appVer","app_version":"$appVersion","rand_str":"$randStr","channel":"$channel","defn":"$defn","signature":"$signature"}"""
     }
 

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

@@ -22,6 +22,7 @@ interface YSPApiService {
         @Header("Yspplayertoken") token: String,
         @Header("Yspsdkinput") Yspsdkinput: String,
         @Header("yspsdksign") yspsdksign: String,
+        @Header("Yspticket") Yspticket: String,
         @Header("Seqid") Seqid: String,
         @Header("Request-Id") RequestId: String,
         @Header("Yspappid") Yspappid: String="519748109",

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

@@ -15,6 +15,7 @@ data class TV(
     var programType: ProgramType,
     var needToken: Boolean = false,
     var mustToken: Boolean = false,
+    var volume: Float = 0.1F,
 ) : Serializable {
 
     override fun toString(): String {