gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-09-01 09:34:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
gedoor 2021-12-19 21:13:36 +08:00
parent b3c1277567
commit 45e664d4d0
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -189,11 +189,7 @@ dependencies {
//网络 //网络
implementation('com.squareup.okhttp3:okhttp:4.9.2') implementation('com.squareup.okhttp3:okhttp:4.9.2')
compileOnly('com.google.android.gms:play-services-cronet:17.0.1') { implementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar']))
exclude(group: "org.chromium.net")
}
googleImplementation('com.google.android.gms:play-services-cronet:17.0.1')
appImplementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar']))
//Glide //Glide
implementation('com.github.bumptech.glide:glide:4.12.0') implementation('com.github.bumptech.glide:glide:4.12.0')

2
app/src/main/java/io/legado/app/help/http/HttpHelper.kt
View File

@ -43,7 +43,7 @@ val okHttpClient: OkHttpClient by lazy {
.build() .build()
chain.proceed(request) chain.proceed(request)
}) })
if (AppConfig.isCronet && CronetLoader.install() && !AppConfig.isGooglePlay) { if (!AppConfig.isGooglePlay && AppConfig.isCronet && CronetLoader.install()) {
builder.addInterceptor(CronetInterceptor(null)) builder.addInterceptor(CronetInterceptor(null))
} }
builder.build() builder.build()

5
app/src/main/java/io/legado/app/help/http/cronet/CronetHelper.kt
View File

@ -1,6 +1,5 @@
package io.legado.app.help.http.cronet package io.legado.app.help.http.cronet
import com.google.android.gms.net.CronetProviderInstaller
import io.legado.app.constant.AppLog import io.legado.app.constant.AppLog
import io.legado.app.help.AppConfig import io.legado.app.help.AppConfig
import okhttp3.Headers import okhttp3.Headers
@ -20,9 +19,7 @@ import java.util.concurrent.Executors
val executor: ExecutorService by lazy { Executors.newCachedThreadPool() } val executor: ExecutorService by lazy { Executors.newCachedThreadPool() }
val cronetEngine: ExperimentalCronetEngine? by lazy { val cronetEngine: ExperimentalCronetEngine? by lazy {
if (AppConfig.isGooglePlay) { if (!AppConfig.isGooglePlay) {
CronetProviderInstaller.installProvider(appCtx)
} else {
CronetLoader.preDownload() CronetLoader.preDownload()
} }
val builder = ExperimentalCronetEngine.Builder(appCtx).apply { val builder = ExperimentalCronetEngine.Builder(appCtx).apply {

6
app/src/main/java/io/legado/app/help/http/cronet/CronetLoader.kt
View File

@ -5,7 +5,6 @@ import android.content.Context
import android.content.pm.ApplicationInfo import android.content.pm.ApplicationInfo
import android.os.Build import android.os.Build
import android.text.TextUtils import android.text.TextUtils
import com.google.android.gms.net.CronetProviderInstaller
import io.legado.app.BuildConfig import io.legado.app.BuildConfig
import io.legado.app.help.AppConfig import io.legado.app.help.AppConfig
import io.legado.app.help.coroutine.Coroutine import io.legado.app.help.coroutine.Coroutine
@ -57,9 +56,7 @@ object CronetLoader : CronetEngine.Builder.LibraryLoader() {
return true return true
} }
if (AppConfig.isGooglePlay) { if (AppConfig.isGooglePlay) {
//检查GMS的Cronet服务是否安装 return false
cacheInstall = CronetProviderInstaller.isInstalled()
return cacheInstall
} }
if (md5.length != 32 || !soFile.exists() || md5 != getFileMD5(soFile)) { if (md5.length != 32 || !soFile.exists() || md5 != getFileMD5(soFile)) {
cacheInstall = false cacheInstall = false
@ -75,7 +72,6 @@ object CronetLoader : CronetEngine.Builder.LibraryLoader() {
*/ */
fun preDownload() { fun preDownload() {
if (AppConfig.isGooglePlay) { if (AppConfig.isGooglePlay) {
CronetProviderInstaller.installProvider(appCtx)
return return
} }
Coroutine.async { Coroutine.async {