Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into dev

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/adapter/ImagePagerAdapter.java
#	app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt
#	app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
#	app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
#	app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt
#	app/src/main/java/com/gh/gamecenter/video/detail/VideoAdapter.kt
#	app/src/main/res/layout/game_horizontal_simple_item.xml
#	app/src/main/res/layout/game_test_item.xml
#	app/src/main/res/layout/layout_video_detail_surface.xml
#	vspace-bridge
This commit is contained in:
chenjuntao
2023-01-03 17:32:11 +08:00
parent aceb49eaa9 92b658c304
commit 4ecd007f07
30 changed files with 553 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/gh/common/util/GameUtils.java
View File

@ -180,7 +180,17 @@ public class GameUtils {
if (gameEntity.isVGame()) {
return context.getString(R.string.smooth);
} else {
return context.getString(R.string.download);
if ("smooth".equals(gameEntity.getDownloadStatus())) {
GameEntity.GameCategory gameCategory = gameEntity.getGameCategory();
if (gameCategory.equals(GameEntity.GameCategory.ONLINE_GAME)
|| gameCategory.equals(GameEntity.GameCategory.INTERNATIONAL_ONLINE_GAME)) {
return context.getString(R.string.download);
} else {
return context.getString(R.string.attempt);
}
} else {
return context.getString(R.string.download);
}
}
}
}