Merge branch 'FongMi:release' into main

.gitignore

@@ -3,5 +3,4 @@
 *build
 *.jks
 /local.properties
-/media
-*ser*
+/media

README.md

@@ -9,7 +9,7 @@ https://github.com/CatVodTVOfficial/CatVodTVJarLoader
 電視版  
 [Jar+Js](https://github.com/FongMi/TV/raw/release/release/leanback-java.apk "TV")  
 [Jar+Js+Py](https://github.com/FongMi/TV/raw/release/release/leanback-python.apk "TV")  
-[Android 4.4](https://github.com/FongMi/TV/raw/kitkat/release/leanback.apk "TV")
+[Android 4.1](https://github.com/FongMi/TV/raw/kitkat/release/leanback.apk "TV")
 
 手機版  
 [Jar+Js](https://github.com/FongMi/TV/raw/release/release/mobile-java.apk "TV")  

app/build.gradle

@@ -11,18 +11,23 @@ android {
         minSdk 21
         targetSdk 29
         ndk { abiFilters "armeabi-v7a" }
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+            }
+        }
     }
 
     productFlavors {
         leanback {
             dimension "mode"
-            versionCode 72
-            versionName "1.7.2"
+            versionCode 73
+            versionName "1.7.3"
         }
         mobile {
             dimension "mode"
-            versionCode 10
-            versionName "1.1.0"
+            versionCode 11
+            versionName "1.1.1"
         }
         java {
             dimension "api"
@@ -45,6 +50,10 @@ android {
         }
     }
 
+    packagingOptions {
+        exclude 'META-INF/beans.xml'
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
@@ -70,29 +79,29 @@ dependencies {
     implementation project(':forcetech')
     implementation project(':ijkplayer')
     pythonImplementation project(':pyramid')
-    implementation 'androidx.media3:media3-database:1.0.0'
-    implementation 'androidx.media3:media3-datasource:1.0.0'
-    implementation 'androidx.media3:media3-datasource-rtmp:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer-dash:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer-hls:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer-rtsp:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.0.0'
-    implementation 'androidx.media3:media3-extractor:1.0.0'
-    implementation 'androidx.media3:media3-session:1.0.0'
-    implementation 'androidx.media3:media3-ui:1.0.0'
+    implementation 'androidx.media3:media3-database:1.0.1'
+    implementation 'androidx.media3:media3-datasource:1.0.1'
+    implementation 'androidx.media3:media3-datasource-rtmp:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-rtsp:1.0.1'
+    implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.0.1'
+    implementation 'androidx.media3:media3-extractor:1.0.1'
+    implementation 'androidx.media3:media3-session:1.0.1'
+    implementation 'androidx.media3:media3-ui:1.0.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
     implementation 'androidx.preference:preference:1.2.0'
     implementation 'androidx.room:room-runtime:2.5.1'
     implementation 'cat.ereza:customactivityoncrash:2.4.0'
     implementation 'com.github.bassaer:materialdesigncolors:1.0.0'
     implementation 'com.github.bumptech.glide:glide:4.14.2'
-    implementation 'com.google.android.exoplayer:exoplayer:2.18.5'
+    implementation('com.github.thegrizzlylabs:sardine-android:0.8') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' }
     implementation 'com.google.android.material:material:1.9.0-beta01'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.google.net.cronet:cronet-okhttp:0.1.0'
-    implementation 'com.google.zxing:core:3.3.0'
+    implementation 'com.google.zxing:core:3.4.1'
     implementation 'com.guolindev.permissionx:permissionx:1.7.1'
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.10'
     implementation 'net.java.dev.jna:jna:5.12.1'
@@ -104,6 +113,8 @@ dependencies {
     leanbackImplementation 'androidx.leanback:leanback:1.2.0-alpha02'
     leanbackImplementation 'me.jessyan:autosize:1.2.1'
     mobileImplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    mobileImplementation 'com.github.devin1014.DLNA-Cast:dlna-dmc:V1.0.0'
+    mobileImplementation('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false }
     annotationProcessor 'androidx.room:room-compiler:2.5.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2'
 }

app/proguard-rules.pro

@@ -2,7 +2,7 @@
 -keepattributes Signature
 -keepattributes *Annotation*
 -dontwarn sun.misc.**
--keep class com.google.gson.**{*;}
+-keep class com.google.gson.** { *; }
 -keep class * extends com.google.gson.TypeAdapter
 -keep class * implements com.google.gson.TypeAdapterFactory
 -keep class * implements com.google.gson.JsonSerializer
@@ -24,21 +24,28 @@
 
 # OkHttp
 -dontwarn okhttp3.**
+-keep class okio.** { *; }
 -keep class okhttp3.** { *; }
 
 # Cronet
--keep class org.chromium.net.**{*;}
--keep class com.google.net.cronet.**{*;}
+-keep class org.chromium.net.** { *; }
+-keep class com.google.net.cronet.** { *; }
 
 # CatVod
 -keep class com.github.catvod.crawler.** { *; }
 -keep class * extends com.github.catvod.crawler.Spider
 
+# Cling
+-keep class org.fourthline.cling.** { *; }
+
 # IJK
 -keep class tv.danmaku.ijk.media.player.** { *; }
 -keep class tv.danmaku.ijk.media.player.IjkMediaPlayer { *; }
 -keep class tv.danmaku.ijk.media.player.ffmpeg.FFmpegApi { *; }
 
+# Sardine
+-keep class com.thegrizzlylabs.sardineandroid.** { *; }
+
 # TVBus
 -keep class com.tvbus.engine.** { *; }