From bd4eb76ad15ffff44cf4e1c91efec4f582007d39 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Fri, 23 Feb 2024 10:35:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BA=E5=85=89=E7=8E=AF=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=89=E5=8D=93=E7=89=88=E6=9C=AC=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E4=B8=BA=E6=8E=A5=E5=8F=A3=E5=8C=BA=E5=88=86=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8E=A8=E9=80=81=E6=9B=B4=E6=96=B0=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E5=89=8D=E7=BD=AE=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/gamecenter/manager/UpdateManager.java | 7 ++++++- .../com/gh/gamecenter/packagehelper/PackageRepository.kt | 7 ++++++- .../com/gh/gamecenter/personal/HaloPersonalViewModel.kt | 4 +++- .../com/gh/gamecenter/retrofit/service/ApiService.java | 3 ++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java index b2dce6d6cd..adfc5db9df 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.content.SharedPreferences; +import android.os.Build; import android.os.Handler; import android.os.Message; import android.preference.PreferenceManager; @@ -221,7 +222,11 @@ public class UpdateManager { loadingDialog = DialogUtils.showWaitDialog(mContext, "检查更新中..."); } String channel = HaloApp.getInstance().getChannel(); - RetrofitManager.getInstance().getApi().getUpdate(PackageUtils.getGhVersionName(), PackageUtils.getGhVersionCode(), channel) + RetrofitManager.getInstance().getApi().getUpdate( + PackageUtils.getGhVersionName(), + PackageUtils.getGhVersionCode(), + channel, + Build.VERSION.SDK_INT) .map(appEntity -> { boolean isShowUpdateDialog = false; diff --git a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt index d9ba8df42b..39993bb367 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt @@ -1,6 +1,7 @@ package com.gh.gamecenter.packagehelper import android.annotation.SuppressLint +import android.os.Build import android.text.TextUtils import androidx.lifecycle.MutableLiveData import com.gh.common.filter.RegionSettingHelper @@ -121,7 +122,11 @@ object PackageRepository { * 把助手更新数据添加到下载管理(为了不改变原有的更新逻辑只能在这里多请求一次接口) */ private fun loadGhzsUpdate() { - mApi.getUpdate(PackageUtils.getGhVersionName(), PackageUtils.getGhVersionCode(), HaloApp.getInstance().channel) + mApi.getUpdate( + PackageUtils.getGhVersionName(), + PackageUtils.getGhVersionCode(), + HaloApp.getInstance().channel, + Build.VERSION.SDK_INT) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : Response() { diff --git a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalViewModel.kt b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalViewModel.kt index ec5d745452..b297a3ca30 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalViewModel.kt @@ -3,6 +3,7 @@ package com.gh.gamecenter.personal import android.annotation.SuppressLint import android.app.Application import android.content.Context +import android.os.Build import android.text.TextUtils import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData @@ -91,7 +92,8 @@ class HaloPersonalViewModel(application: Application) : AndroidViewModel(applica .getUpdate( PackageUtils.getGhVersionName(), PackageUtils.getGhVersionCode(), - HaloApp.getInstance().channel + HaloApp.getInstance().channel, + Build.VERSION.SDK_INT ) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 4c33017fc0..4725007540 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -241,7 +241,8 @@ public interface ApiService { @GET("upgrade") Observable getUpdate(@Query("version") String version, @Query("version_code") int code, - @Query("channel") String channel); + @Query("channel") String channel, + @Query("android_sdk_version") int androidSdkVersion); /** * 获取实名认证