diff --git a/app/build.gradle b/app/build.gradle index 0f9dede84..27ce03c78 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { minSdk 24 //noinspection ExpiredTargetSdkVersion targetSdk 28 - versionCode 412 - versionName "4.1.2" + versionCode 413 + versionName "4.1.3" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString(), "eventBusIndex": "com.fongmi.android.tv.event.EventIndex"] @@ -98,14 +98,14 @@ dependencies { implementation project(':chaquo') implementation project(':quickjs') implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'androidx.media:media:1.7.0' + implementation 'androidx.media:media:1.7.1' implementation 'androidx.room:room-runtime:2.7.2' implementation 'cat.ereza:customactivityoncrash:2.4.0' implementation 'com.github.bassaer:materialdesigncolors:1.0.0' - implementation 'com.github.bumptech.glide:glide:4.16.0' - implementation 'com.github.bumptech.glide:annotations:4.16.0' - implementation('com.github.bumptech.glide:avif-integration:4.16.0') { exclude group: 'org.aomedia.avif.android', module: 'avif' } - implementation 'com.github.bumptech.glide:okhttp3-integration:4.16.0' + implementation 'com.github.bumptech.glide:glide:' + glideVersion + implementation 'com.github.bumptech.glide:annotations:' + glideVersion + implementation 'com.github.bumptech.glide:avif-integration:' + glideVersion + implementation 'com.github.bumptech.glide:okhttp3-integration:' + glideVersion implementation 'com.github.jahirfiquitiva:TextDrawable:1.0.3' implementation 'com.github.thegrizzlylabs:sardine-android:0.9' implementation 'com.github.teamnewpipe:NewPipeExtractor:v0.24.8' @@ -115,7 +115,6 @@ dependencies { implementation 'com.hierynomus:smbj:0.14.0' implementation 'io.antmedia:rtmp-client:3.2.0' implementation 'javax.servlet:javax.servlet-api:3.1.0' - implementation 'org.aomedia.avif.android:avif:1.1.1.14d8e3c4' implementation 'org.eclipse.jetty:jetty-client:8.1.21.v20160908' implementation('org.eclipse.jetty:jetty-server:8.1.21.v20160908') { exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet' } implementation('org.eclipse.jetty:jetty-servlet:8.1.21.v20160908') { exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet' } diff --git a/app/src/main/java/com/fongmi/android/tv/utils/OkGlideModule.java b/app/src/main/java/com/fongmi/android/tv/utils/OkGlideModule.java index 5d819c7b4..cd3ffb9d3 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/OkGlideModule.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/OkGlideModule.java @@ -1,7 +1,6 @@ package com.fongmi.android.tv.utils; import android.content.Context; -import android.graphics.Bitmap; import android.util.Log; import androidx.annotation.NonNull; @@ -9,21 +8,15 @@ import androidx.annotation.NonNull; import com.bumptech.glide.Glide; import com.bumptech.glide.GlideBuilder; import com.bumptech.glide.Registry; -import com.bumptech.glide.annotation.Excludes; import com.bumptech.glide.annotation.GlideModule; -import com.bumptech.glide.integration.avif.AvifByteBufferBitmapDecoder; -import com.bumptech.glide.integration.avif.AvifGlideModule; -import com.bumptech.glide.integration.avif.AvifStreamBitmapDecoder; import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader; import com.bumptech.glide.load.model.GlideUrl; import com.bumptech.glide.module.AppGlideModule; import com.github.catvod.net.OkHttp; import java.io.InputStream; -import java.nio.ByteBuffer; @GlideModule -@Excludes(AvifGlideModule.class) public class OkGlideModule extends AppGlideModule { @Override @@ -33,10 +26,6 @@ public class OkGlideModule extends AppGlideModule { @Override public void registerComponents(@NonNull Context context, @NonNull Glide glide, Registry registry) { - AvifByteBufferBitmapDecoder byteBufferBitmapDecoder = new AvifByteBufferBitmapDecoder(glide.getBitmapPool()); - AvifStreamBitmapDecoder streamBitmapDecoder = new AvifStreamBitmapDecoder(registry.getImageHeaderParsers(), byteBufferBitmapDecoder, glide.getArrayPool()); registry.replace(GlideUrl.class, InputStream.class, new OkHttpUrlLoader.Factory(OkHttp.client())); - registry.append(ByteBuffer.class, Bitmap.class, byteBufferBitmapDecoder); - registry.append(InputStream.class, Bitmap.class, streamBitmapDecoder); } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1c227b08f..299ce2e8c 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,7 @@ tasks.register('clean', Delete) { project.ext { gsonVersion = '2.13.1' + glideVersion = "5.0.0-rc01" media3Version = '1.8.0' okhttpVersion = '5.1.0' }