diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java index 57e5179137..6d908ca463 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -311,7 +311,7 @@ public class Config { @SuppressLint("CheckResult") public static void refreshVSettingEntity() { RetrofitManager.getInstance() - .getVApi().getSettings(BuildConfig.VERSION_NAME) + .getVApi().getSettings(BuildConfig.VERSION_NAME, Build.VERSION.SDK_INT) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new BiResponse() { diff --git a/app/src/main/java/com/gh/download/simple/DownloadMessageHandler.kt b/app/src/main/java/com/gh/download/simple/DownloadMessageHandler.kt index 5e37bfb2e9..af942d3b0f 100644 --- a/app/src/main/java/com/gh/download/simple/DownloadMessageHandler.kt +++ b/app/src/main/java/com/gh/download/simple/DownloadMessageHandler.kt @@ -165,7 +165,7 @@ object DownloadMessageHandler : InnerDownloadListener { * @param error 错误类型 * @param exception 包裹错误的 Exception */ - override fun onError(id: String, error: DownloadError?, exception: Exception) { + override fun onError(id: String, error: DownloadError?, exception: Exception?) { error ?: return when (error) { diff --git a/app/src/main/java/com/gh/gamecenter/entity/VSetting.kt b/app/src/main/java/com/gh/gamecenter/entity/VSetting.kt index 7726ff50b7..3ca595c077 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/VSetting.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/VSetting.kt @@ -3,8 +3,8 @@ package com.gh.gamecenter.entity import com.google.gson.annotations.SerializedName class VSetting { - @SerializedName("va") var va: Va? = null + var gsf: GApp? = null class Va( @SerializedName("32-bit") @@ -23,4 +23,9 @@ class VSetting { val versionCode: Int, val url: String ) + + class GApp( + val url: String? = null, + var md5: String? = null + ) } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/VApiService.kt b/app/src/main/java/com/gh/gamecenter/retrofit/service/VApiService.kt index f0693ff570..29f6998d4c 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/VApiService.kt +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/VApiService.kt @@ -22,6 +22,6 @@ interface VApiService { * 获取设置 */ @GET("setting") - fun getSettings(@Query("version") version: String?): Single + fun getSettings(@Query("version") version: String?, @Query("android") androidSdkVersion: Int): Single } \ No newline at end of file diff --git a/app/src/main/java/com/gh/vspace/VHelper.kt b/app/src/main/java/com/gh/vspace/VHelper.kt index b83e4373a8..60d6a26adf 100644 --- a/app/src/main/java/com/gh/vspace/VHelper.kt +++ b/app/src/main/java/com/gh/vspace/VHelper.kt @@ -23,7 +23,6 @@ import com.gh.download.DownloadManager import com.gh.download.PackageObserver import com.gh.gamecenter.R import com.gh.gamecenter.SplashScreenActivity -import com.gh.gamecenter.common.BuildConfig import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.common.exposure.meta.MetaUtil @@ -73,9 +72,7 @@ object VHelper { const val KEY_REQUIRED_G_APPS = "required_g_apps" const val G_APPS_DOWNLOAD_ID = "d673761a1dc031d40afc90d0a6efd25a" - const val G_APPS_DOWNLOAD_DEV_URL = - "https://dev-and-static.ghzs.com/game/apk/smooth_google/google_play_services.zip" - const val G_APPS_DOWNLOAD_URL = "https://and-static.ghzs.com/game/apk/smooth_google/google_play_services.zip" + const val G_APPS_INSTALLED_MD5 = "g_apps_installed_md5" // 畅玩游戏位数 const val KEY_BIT = "bit" diff --git a/app/src/main/java/com/gh/vspace/gapps/GAppsDownloadDialogFragment.kt b/app/src/main/java/com/gh/vspace/gapps/GAppsDownloadDialogFragment.kt index a6b626db9e..4175eb64e8 100644 --- a/app/src/main/java/com/gh/vspace/gapps/GAppsDownloadDialogFragment.kt +++ b/app/src/main/java/com/gh/vspace/gapps/GAppsDownloadDialogFragment.kt @@ -9,15 +9,16 @@ import android.view.View import android.view.animation.DecelerateInterpolator import androidx.core.text.bold import androidx.core.text.color +import com.gh.common.constant.Config import com.gh.common.util.NewFlatLogUtils import com.gh.download.simple.* import com.gh.gamecenter.R import com.gh.gamecenter.common.base.fragment.BaseBottomDialogFragment -import com.gh.gamecenter.common.utils.EnvHelper import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.core.runOnIoThread import com.gh.gamecenter.core.runOnUiThread +import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.core.utils.UnZipUtils import com.gh.gamecenter.databinding.DialogGappsDownloadBinding @@ -69,6 +70,8 @@ class GAppsDownloadDialogFragment : BaseBottomDialogFragment= Build.VERSION_CODES.KITKAT) { @@ -158,7 +164,20 @@ class GAppsDownloadDialogFragment : BaseBottomDialogFragment