Compare commits

...

5 Commits

7 changed files with 14 additions and 10 deletions

View File

@ -71,7 +71,7 @@ android_build:
exit_codes: 137
only:
- dev
- dev-5.33.0
- fix/CWZS-146
# 代码检查
sonarqube_analysis:
@ -152,4 +152,4 @@ oss-upload&send-email:
- /usr/local/bin/python /ci-android-mail-jira-comment.py
only:
- dev
- dev-5.33.0
- fix/CWZS-146

View File

@ -127,7 +127,7 @@ class MyArchiveViewModel(
override fun provideDataSingle(page: Int): Single<MutableList<ArchiveEntity>>? {
return if (mType == MyArchiveFragment.Type.MY_DOWNLOAD_ARCHIVE) {
mNewApi.getArchivesDownloadHistories(gameId, page, 20)
mNewApi.getArchivesDownloadHistories(gameId, page, 20, System.currentTimeMillis().toString())
} else {
null
}

View File

@ -3065,7 +3065,11 @@ public interface ApiService {
* 获取存档下载记录
*/
@GET("/users/games/{game_id}/archives/download/histories")
Single<List<ArchiveEntity>> getArchivesDownloadHistories(@Path("game_id") String gameId, @Query("page") int page, @Query("page_size") int pageSize);
Single<List<ArchiveEntity>> getArchivesDownloadHistories(
@Path("game_id") String gameId,
@Query("page") int page,
@Query("page_size") int pageSize,
@Query("timestamp") String timestamp);
/**
* 获取偏好设置(分类标签)的配置数据及用户状态

View File

@ -75,7 +75,7 @@ import com.gh.gamecenter.receiver.NetworkStateReceiver;
import com.gh.vspace.VHelper;
import com.github.piasy.biv.BigImageViewer;
import com.github.piasy.biv.loader.fresco.FrescoImageLoader;
import com.lg.ndownload.DownloadDbManager;
import com.lg.ndownload.DownloadCore;
import com.lightgame.utils.Utils;
import com.llew.huawei.verifier.LoadedApkHuaWei;
import com.shuyu.gsyvideoplayer.cache.CacheFactory;
@ -238,7 +238,7 @@ public class HaloApp extends MultiDexApplication {
initDataHelper();
ExtensionsKt.doOnMainProcessOnly(this, () -> {
Tracker.init(this);
DownloadDbManager.init(this);
DownloadCore.init(this);
});
deviceRamSize = DeviceUtils.getTotalRamSizeOfDevice(this);

View File

@ -7,8 +7,8 @@ ext {
targetSdkVersion = 28
// application info (每个大版本之间的 versionCode 增加 20)
versionCode = 1012
versionName = "5.33.2"
versionCode = 1030
versionName = "5.34.0"
applicationId = "com.gh.gamecenter"
applicationIdGat = "com.gh.gamecenter.intl"

View File

@ -80,7 +80,7 @@
<color name="background_alpha_0">#00F5F5F5</color>
<!--默认进度条颜色-->
<color name="defaultProgressBarBackgroundColor">@color/primary_theme</color>
<color name="defaultProgressBarBackgroundColor">#1A2469FF</color>
<color name="defaultProgressBarBackgroundBorderColor">#0D000000</color>
<color name="defaultProgressBarProgressStartColor">@color/primary_theme</color>
<color name="defaultProgressBarProgressEndColor">@color/text_4BC7FF</color>