From 02dd1158862c841c8cd379edfc05d44e8243a641 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Fri, 12 Jun 2020 10:54:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=B8=B8=E6=88=8F=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=A4=BC=E5=8C=85=E5=9B=BE=E6=A0=87=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E4=BF=AE=E5=A4=8D=E5=BC=80=E6=9C=8D?= =?UTF-8?q?=E8=A1=A8=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/DownloadItemUtils.java | 11 ++++++----- .../adapter/viewholder/GameTestViewHolder.java | 1 - .../gamecenter/adapter/viewholder/GameViewHolder.java | 7 ++++--- .../com/gh/gamecenter/entity/SubjectSettingEntity.kt | 5 ++++- .../com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt | 1 - app/src/main/res/layout/game_item.xml | 9 --------- app/src/main/res/layout/game_test_item.xml | 9 --------- 7 files changed, 14 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java index 64fdb50c4e..5c2870fe0b 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -236,9 +236,9 @@ public class DownloadItemUtils { holder.gameProgressbar.setVisibility(View.GONE); holder.gameInfo.setVisibility(View.GONE); if (briefStyle != null && briefStyle.contains("star")) { - holder.gameRating.setVisibility(View.VISIBLE); + if (holder.gameRating != null) holder.gameRating.setVisibility(View.VISIBLE); } else { - holder.gameRating.setVisibility(View.GONE); + if (holder.gameRating != null) holder.gameRating.setVisibility(View.GONE); } if (TextUtils.isEmpty(briefStyle) || briefStyle.contains("brief")) { @@ -273,9 +273,9 @@ public class DownloadItemUtils { holder.gameProgressbar.setVisibility(View.GONE); holder.gameInfo.setVisibility(View.GONE); if (briefStyle != null && briefStyle.contains("star")) { - holder.gameRating.setVisibility(View.VISIBLE); + if (holder.gameRating != null) holder.gameRating.setVisibility(View.VISIBLE); } else { - holder.gameRating.setVisibility(View.GONE); + if (holder.gameRating != null) holder.gameRating.setVisibility(View.GONE); } if (TextUtils.isEmpty(briefStyle) || briefStyle.contains("brief")) { @@ -288,8 +288,9 @@ public class DownloadItemUtils { // 更改进度条和提示文本的状态 public static void changeStatus(Context context, GameViewHolder holder, DownloadEntity downloadEntity, boolean isShowPlatform, boolean isNormal) { + + if (holder.gameRating != null) holder.gameRating.setVisibility(View.GONE); holder.gameDes.setVisibility(View.GONE); - holder.gameRating.setVisibility(View.GONE); holder.gameProgressbar.setVisibility(View.VISIBLE); holder.gameInfo.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java index deae303f1e..137e57cebc 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java @@ -29,7 +29,6 @@ public class GameTestViewHolder extends GameViewHolder { public GameTestViewHolder(View itemView) { super(itemView); - gameLibaoIcon = itemView.findViewById(R.id.home2_game_libao); gameThumb = itemView.findViewById(R.id.home2_game_thumb); gameName = itemView.findViewById(R.id.home2_game_nameAndsize); gameDownloadBtn = itemView.findViewById(R.id.home2_download_btn); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java index f872b5d53b..032c869921 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java @@ -1,11 +1,12 @@ package com.gh.gamecenter.adapter.viewholder; import android.view.View; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.BaseRecyclerViewHolder; import com.gh.common.view.DrawableView; @@ -16,7 +17,6 @@ import com.gh.gamecenter.entity.GameEntity; public class GameViewHolder extends BaseRecyclerViewHolder { - public ImageView gameLibaoIcon; public SimpleDraweeView gameThumb; public TextView gameName; public TextView gameDownloadBtn; @@ -27,6 +27,8 @@ public class GameViewHolder extends BaseRecyclerViewHolder { public TextView gameDownloadSpeed; public TextView gameDownloadPercentage; public TextView gameServerType; + + @Nullable public TextView gameRating; public GameViewHolder(View itemView) { @@ -38,7 +40,6 @@ public class GameViewHolder extends BaseRecyclerViewHolder { gameDownloadBtn = binding.downloadBtn; gameProgressbar = binding.gameProgressbar; gameInfo = binding.gameInfo; - gameLibaoIcon = binding.gameLibaoIcon; gameDownloadPercentage = binding.downloadPercentage; gameDes = binding.gameDes; gameDownloadSpeed = binding.downloadSpeed; diff --git a/app/src/main/java/com/gh/gamecenter/entity/SubjectSettingEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/SubjectSettingEntity.kt index bc13ae987d..dedc8e9818 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/SubjectSettingEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/SubjectSettingEntity.kt @@ -19,7 +19,10 @@ data class SubjectSettingEntity( @SerializedName("show_suffix") var showSuffix: Boolean = true, @SerializedName("brief_style") - var briefStyle: String = "" + var briefStyle: String = "", + + @SerializedName("filter_options") + var filterOptions: List = ArrayList() // 过滤选项，推荐、最新、评分 ) : Parcelable { @Parcelize data class TypeEntity( diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt index 1d8bdba4da..2858df3004 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt @@ -52,7 +52,6 @@ class MyFollowedGameAdapter(context: Context, var mViewModel: MyFollowedGameView holder.binding.gameItemIncluded.game = gameEntity holder.binding.gameItemIncluded.hideSize = true - holder.binding.gameItemIncluded.gameLibaoIcon.goneIf(!gameEntity.isLibaoExists) holder.initServerType(gameEntity) holder.initShortcut(gameEntity, mEntrance, path,newPath) holder.updateConcernButton(gameEntity, mViewModel) diff --git a/app/src/main/res/layout/game_item.xml b/app/src/main/res/layout/game_item.xml index d99e9c1fe8..afeb9e27ab 100644 --- a/app/src/main/res/layout/game_item.xml +++ b/app/src/main/res/layout/game_item.xml @@ -65,15 +65,6 @@ android:layout_centerInParent="true" fresco:roundedCornerRadius="10dp" /> - - - -