diff --git a/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java b/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java index d6ed6e400a..3c88b5a4d1 100644 --- a/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java +++ b/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java @@ -1,7 +1,6 @@ package com.gh.common.view; import android.content.Context; -import android.graphics.Color; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextPaint; @@ -78,9 +77,8 @@ public class MessageSpannableTextView extends android.support.v7.widget.AppCompa @Override public void updateDrawState(TextPaint ds) { super.updateDrawState(ds); - ds.bgColor = getContext().getResources().getColor(R.color.tag_orange); - ds.setColor(Color.WHITE); - ds.setUnderlineText(false); + ds.setColor( getContext().getResources().getColor(R.color.tag_orange)); + ds.setUnderlineText(true); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java index c04a329315..7ca74b9301 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/InstallFragmentAdapter.java @@ -14,6 +14,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.gh.common.constant.Config; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.BitmapUtils; @@ -36,6 +37,7 @@ import com.gh.gamecenter.adapter.viewholder.GameNormalSwipeViewHolder; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.GameInstall; +import com.gh.gamecenter.entity.SettingsEntity; import com.gh.gamecenter.kuaichuan.FileInfo; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -99,6 +101,18 @@ public class InstallFragmentAdapter extends BaseRecyclerAdapter { } public void initData(List list) { + SettingsEntity settings = Config.getSettings(); + if (settings != null) { + for (String pkgName : settings.getGameDownloadBlackList()) { + for (int i = 0; i < list.size(); i++) { + GameInstall gameInstall = list.get(i); + if (gameInstall.getPackageName().equals(pkgName)) { + list.remove(gameInstall); + } + } + } + } + for (GameInstall gameInstall : list) { Object gh_id = PackageUtils.getMetaData(mContext, gameInstall.getPackageName(), "gh_id"); if (gh_id != null && !gh_id.equals(gameInstall.getId())) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java index 3a939a4ccd..5a7ce6c65e 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -17,6 +17,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.gh.common.constant.Config; import com.gh.common.exposure.ExposureEvent; import com.gh.common.exposure.ExposureUtils; import com.gh.common.util.DataUtils; @@ -40,6 +41,7 @@ import com.gh.gamecenter.entity.CollectionCloseEntity; import com.gh.gamecenter.entity.GameCollectionEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.PluginLocation; +import com.gh.gamecenter.entity.SettingsEntity; import com.gh.gamecenter.manager.PackagesManager; import com.halo.assistant.HaloApp; import com.lightgame.adapter.BaseRecyclerAdapter; @@ -153,6 +155,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { , mEntrance + "(" + mLocation.split(":")[0] + ")")); break; case "已安装": + break; case "启动": Map kv = new HashMap<>(); kv.put("版本", apkEntity.getPlatform()); @@ -228,7 +231,16 @@ public class PlatformAdapter extends BaseRecyclerAdapter { } else if (PackagesManager.INSTANCE.isCanUpdate(mGameEntity.getId(), apkEntity.getPackageName())) { viewHolder.mDownloadItemTvStatus.setText(R.string.update); } else { - if (mOnCollectionCallBackListener == null) { + boolean isFilter = false; + SettingsEntity settings = Config.getSettings(); + if (settings != null) { + for (String pkgName : settings.getGameDownloadBlackList()) { + if (pkgName.equals(apkEntity.getPackageName())) { + isFilter = true; + } + } + } + if (isFilter) { viewHolder.mDownloadItemTvStatus.setText("已安装"); } else { viewHolder.mDownloadItemTvStatus.setText(R.string.launch); diff --git a/app/src/main/res/layout/activity_suggest_select.xml b/app/src/main/res/layout/activity_suggest_select.xml index 66e9ecfc31..be4b7e0965 100644 --- a/app/src/main/res/layout/activity_suggest_select.xml +++ b/app/src/main/res/layout/activity_suggest_select.xml @@ -16,8 +16,8 @@