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 394a1117b6..bf8ca41e55 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -145,6 +145,7 @@ public class Config { for (SettingsEntity.Download entity : getSettings().getDownload()) { if ("all".equals(entity.getGame())) { if (entity.getPluginfy() && filterTime(entity.getTime())) { + preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply(); return true; } } diff --git a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt index b60ac58dc5..717da6e434 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt @@ -1,6 +1,8 @@ package com.gh.gamecenter.entity import android.os.Parcelable +import android.text.TextUtils +import com.gh.common.constant.Config import com.google.gson.annotations.SerializedName import kotlinx.android.parcel.Parcelize @@ -21,4 +23,12 @@ data class SubjectEntity(@SerializedName("_id") var type: String? = null, var des: String? = null, @SerializedName("relation_column_id") - var relatedColumnId: String ?= null) : Parcelable \ No newline at end of file + var relatedColumnId: String? = null) : Parcelable { + + fun getFilterName(): String { + if (!TextUtils.isEmpty(name) && !Config.isShowPlugin()) { + name = name?.replace("插件", "游戏") + } + return if (name == null) "" else name!! + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index 2dbfcf9b04..f64ee50ed5 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -417,7 +417,7 @@ class GameFragmentAdapter(context: Context, model: GameViewModel, var blockName: holder.binding.headMore.setOnClickListener { if ("all" == column?.home) { DataUtils.onMtaEvent(mContext, "游戏专题", "全部", column.name) - SubjectActivity.startSubjectActivity(mContext, column.id, column.name, column.isOrder, "(游戏-专题:" + column.name + "-全部)") + SubjectActivity.startSubjectActivity(mContext, column.id, column.getFilterName(), column.isOrder, "(游戏-专题:" + column.name + "-全部)") } else { DataUtils.onMtaEvent(mContext, "游戏专题", "换一批", column?.name) holder.binding.headPb.visibility = View.VISIBLE diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt index d33fa4bf53..ac848c135c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt @@ -3,6 +3,7 @@ package com.gh.gamecenter.gamedetail.rating import android.support.v4.content.ContextCompat import android.view.View import com.gh.base.BaseRecyclerViewHolder +import com.gh.common.util.fromHtml import com.gh.common.view.DrawableView import com.gh.gamecenter.PersonalHomeActivity import com.gh.gamecenter.R @@ -15,6 +16,14 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR binding.run { val context = itemView.context data = commentData + + if (commentData.replyData != null) { + replyContent.text = context.getString( + R.string.game_comment_reply_content, + commentData.replyData?.user?.name, + commentData.replyData?.content).fromHtml() + } + if (commentData.me.isCommented) { badge.visibility = View.VISIBLE badge.text = "你的评论" @@ -30,12 +39,6 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR } else { badge.visibility = View.GONE } - replyUserIconContainer.setOnClickListener { - PersonalHomeActivity.startTargetActivity(context, commentData.replyData?.user?.id, entrance, path) - } - replyUserName.setOnClickListener { - PersonalHomeActivity.startTargetActivity(context, commentData.replyData?.user?.id, entrance, path) - } userIcon.setOnClickListener { PersonalHomeActivity.startTargetActivity(context, commentData.user.id, entrance, path) } diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java index ed6884f14f..efa2ee523c 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java @@ -4,6 +4,7 @@ import android.app.Application; import android.arch.lifecycle.LiveData; import android.support.annotation.NonNull; +import com.gh.common.constant.Config; import com.gh.common.util.UrlFilterUtils; import com.gh.gamecenter.baselist.ListViewModel; import com.gh.gamecenter.entity.NewsEntity; @@ -66,4 +67,10 @@ public class InfoViewModel extends ListViewModel { return RetrofitManager.getInstance(getApplication()).getApi() .getArticleList(UrlFilterUtils.getFilterQuery("type_group", "资讯"), offset); } + + @Override + protected List filterData(@NonNull List list) { + Config.filterPluginArticle(list); + return list; + } } diff --git a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java index 7d34e665cd..1ad62b05ac 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java @@ -4,6 +4,7 @@ import android.app.Application; import android.arch.lifecycle.LiveData; import android.support.annotation.NonNull; +import com.gh.common.constant.Config; import com.gh.common.util.UrlFilterUtils; import com.gh.gamecenter.baselist.ListViewModel; import com.gh.gamecenter.entity.NewsEntity; @@ -68,4 +69,9 @@ public class OriginalViewModel extends ListViewModel { .getArticleList(UrlFilterUtils.getFilterQuery("type_group", "原创"), offset); } + @Override + protected List filterData(@NonNull List list) { + Config.filterPluginArticle(list); + return list; + } } diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java index 074935a442..c8d981e3d7 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Function; import io.reactivex.schedulers.Schedulers; import retrofit2.HttpException; @@ -123,12 +122,9 @@ class StrategyAdapter extends BaseRecyclerAdapter { RetrofitManager.getInstance(mContext) .getApi() .getArticleList(UrlFilterUtils.getFilterQuery("type_group", "攻略"), mPage) - .map(new Function, List>() { - @Override - public List apply(List newsEntities) { - Config.filterPluginArticle(newsEntities); - return NewsUtils.removeDuplicateData(mNewsList, newsEntities); - } + .map(newsEntities -> { + Config.filterPluginArticle(newsEntities); + return NewsUtils.removeDuplicateData(mNewsList, newsEntities); }) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/res/layout/game_head_item.xml b/app/src/main/res/layout/game_head_item.xml index beffc61475..1a5656c42a 100644 --- a/app/src/main/res/layout/game_head_item.xml +++ b/app/src/main/res/layout/game_head_item.xml @@ -47,7 +47,7 @@ android:layout_height = "match_parent" android:layout_weight = "1" android:gravity = "center_vertical" - android:text = "@{subject.name}" + android:text = "@{subject.filterName}" android:textColor = "@color/black" android:textSize = "15sp" /> diff --git a/app/src/main/res/layout/rating_comment_item.xml b/app/src/main/res/layout/rating_comment_item.xml index a6947cb2a7..c60b20726b 100644 --- a/app/src/main/res/layout/rating_comment_item.xml +++ b/app/src/main/res/layout/rating_comment_item.xml @@ -90,13 +90,13 @@ android:id = "@+id/badge" android:layout_width = "wrap_content" android:layout_height = "12dp" - android:paddingRight="4dp" - android:paddingLeft="4dp" android:layout_alignParentRight = "true" android:layout_centerVertical = "true" android:layout_marginLeft = "8dp" android:background = "@color/tag_orange" android:gravity = "center" + android:paddingLeft = "4dp" + android:paddingRight = "4dp" android:text = "精彩评论" android:textColor = "@android:color/white" android:textSize = "8sp" /> @@ -203,44 +203,12 @@ android:layout_height = "wrap_content" android:layout_marginTop = "6dp" android:background = "@color/background" - android:padding = "10dp" + android:paddingLeft = "12dp" + android:paddingTop = "12dp" + android:paddingRight = "12dp" + android:paddingBottom = "10dp" app:layout_constraintTop_toBottomOf = "@id/device" > - - - - - - - - - - + app:layout_constraintLeft_toLeftOf = "parent" /> %1$s 回复 ]]>%2$s + %1$s:]]>%2$s