From 9683d7d16ffe39edc9770a91be1e8b10ed63f217 Mon Sep 17 00:00:00 2001 From: ag2s20150909 Date: Wed, 25 Aug 2021 21:28:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DGoogle=E7=89=88=E7=9A=84crone?= =?UTF-8?q?t=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 5 ++-- .../app/help/http/cronet/CronetHelper.kt | 8 +++++- .../app/help/http/cronet/CronetLoader.kt | 26 +++++++++++-------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 58a908646..7ba7112af 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -182,8 +182,9 @@ dependencies { //网络 implementation('com.squareup.okhttp3:okhttp:4.9.1') - implementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar'])) - googleImplementation 'com.google.android.gms:play-services-cronet:17.0.0' + compileOnly("com.google.android.gms:play-services-cronet:17.0.1"){ exclude(group: "org.chromium.net") } + googleImplementation("com.google.android.gms:play-services-cronet:17.0.1") + appImplementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar'])) //Glide implementation('com.github.bumptech.glide:glide:4.12.0') diff --git a/app/src/main/java/io/legado/app/help/http/cronet/CronetHelper.kt b/app/src/main/java/io/legado/app/help/http/cronet/CronetHelper.kt index ca5abca0d..b4a8d7720 100644 --- a/app/src/main/java/io/legado/app/help/http/cronet/CronetHelper.kt +++ b/app/src/main/java/io/legado/app/help/http/cronet/CronetHelper.kt @@ -1,6 +1,7 @@ package io.legado.app.help.http.cronet import android.util.Log +import com.google.android.gms.net.CronetProviderInstaller import io.legado.app.help.AppConfig import okhttp3.Headers import okhttp3.MediaType @@ -18,7 +19,12 @@ import java.util.concurrent.Executors val executor: Executor by lazy { Executors.newCachedThreadPool() } val cronetEngine: ExperimentalCronetEngine by lazy { - CronetLoader.preDownload() + if (AppConfig.isGooglePlay) { + CronetProviderInstaller.installProvider(appCtx) + } else { + CronetLoader.preDownload() + } + val builder = ExperimentalCronetEngine.Builder(appCtx).apply { if (!AppConfig.isGooglePlay) { diff --git a/app/src/main/java/io/legado/app/help/http/cronet/CronetLoader.kt b/app/src/main/java/io/legado/app/help/http/cronet/CronetLoader.kt index 0625a2311..2402c08bd 100644 --- a/app/src/main/java/io/legado/app/help/http/cronet/CronetLoader.kt +++ b/app/src/main/java/io/legado/app/help/http/cronet/CronetLoader.kt @@ -6,12 +6,12 @@ import android.content.pm.ApplicationInfo import android.os.Build import android.text.TextUtils import android.util.Log +import com.google.android.gms.net.CronetProviderInstaller import io.legado.app.help.AppConfig import io.legado.app.help.coroutine.Coroutine import io.legado.app.utils.getPrefString import io.legado.app.utils.putPrefString import org.chromium.net.CronetEngine -import org.chromium.net.impl.ImplVersion import splitties.init.appCtx import java.io.* import java.math.BigInteger @@ -21,25 +21,26 @@ import java.security.MessageDigest import java.util.* object CronetLoader : CronetEngine.Builder.LibraryLoader() { - //https://storage.googleapis.com/chromium-cronet/android/92.0.4515.127/Release/cronet/libs/arm64-v8a/libcronet.92.0.4515.127.so - //https://cdn.jsdelivr.net/gh/ag2s20150909/cronet-repo@92.0.4515.127/cronet/92.0.4515.127/arm64-v8a/libcronet.92.0.4515.127.so.js + //https://storage.googleapis.com/chromium-cronet/android/92.0.4515.127/Release/cronet/libs/arm64-v8a/libcronet.92.0.4515.159.so + //https://cdn.jsdelivr.net/gh/ag2s20150909/cronet-repo@92.0.4515.127/cronet/92.0.4515.127/arm64-v8a/libcronet.92.0.4515.159.so.js private const val TAG = "CronetLoader" - private val soName = "libcronet." + ImplVersion.getCronetVersion() + ".so" + private const val soVersion: String = "92.0.4515.159" + private const val soName = "libcronet.$soVersion.so" private val soUrl: String private val md5Url: String private val soFile: File private val downloadFile: File private var cpuAbi: String? = null private var md5: String? = appCtx.getPrefString("soMd5") - private val version: String? = appCtx.getPrefString("soVersion", ImplVersion.getCronetVersion()) + private val version: String? = appCtx.getPrefString("soVersion", soVersion) var download = false init { soUrl = ("https://storage.googleapis.com/chromium-cronet/android/" - + ImplVersion.getCronetVersion() + "/Release/cronet/libs/" + + soVersion + "/Release/cronet/libs/" + getCpuAbi(appCtx) + "/" + soName) md5Url = ("https://cdn.jsdelivr.net/gh/ag2s20150909/cronet-repo@" + - ImplVersion.getCronetVersion() + "/cronet/" + ImplVersion.getCronetVersion() + "/" + soVersion + "/cronet/" + soVersion + "/" + getCpuAbi(appCtx) + "/" + soName + ".js") val dir = appCtx.getDir("cronet", Context.MODE_PRIVATE) soFile = File(dir.toString() + "/" + getCpuAbi(appCtx), soName) @@ -58,7 +59,10 @@ object CronetLoader : CronetEngine.Builder.LibraryLoader() { } fun preDownload() { - if (AppConfig.isGooglePlay) return + if (AppConfig.isGooglePlay) { + CronetProviderInstaller.installProvider(appCtx) + return + } Coroutine.async { md5 = getUrlMd5(md5Url) if (soFile.exists() && md5 == getFileMD5(soFile)) { @@ -147,9 +151,9 @@ object CronetLoader : CronetEngine.Builder.LibraryLoader() { @Suppress("SameParameterValue") private fun getUrlMd5(url: String): String? { //这样在下载成功后，遇到无网条件下，只要版本未发生变化也能获取md5 - if (md5 != null && md5!!.length == 32 && version == ImplVersion.getCronetVersion()) { + if (md5 != null && md5!!.length == 32 && version == soVersion) { appCtx.putPrefString("soMd5", md5) - appCtx.putPrefString("soVersion", ImplVersion.getCronetVersion()) + appCtx.putPrefString("soVersion", soVersion) return md5 } val inputStream: InputStream @@ -168,7 +172,7 @@ object CronetLoader : CronetEngine.Builder.LibraryLoader() { //成功获取到md5后保存md5和版本 if (tmd5.length == 32) { appCtx.putPrefString("soMd5", tmd5) - appCtx.putPrefString("soVersion", ImplVersion.getCronetVersion()) + appCtx.putPrefString("soVersion", soVersion) } return tmd5