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

Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
kehaoyuan
2019-03-19 14:40:20 +08:00
parent 4a37401dc2 8cf90193fc
commit 4d87f86fcd
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailBasicInfoAdapter.java
View File

@ -106,7 +106,12 @@ public class GameDetailBasicInfoAdapter extends BaseRecyclerAdapter<RecyclerView
viewHolder.hintDv.setVisibility(View.GONE);
}
viewHolder.hintTv.setText(tagEntity.getName());
viewHolder.hintTv.setTextColor(Color.parseColor(tagEntity.getColor()));
try {
// 有可能给的颜色有问题
viewHolder.hintTv.setTextColor(Color.parseColor(tagEntity.getColor()));
} catch (Exception ignore) {
}
if (isOpen) {
viewHolder.hintContentTv.setVisibility(View.VISIBLE);
viewHolder.hintContentTv.setText(tagEntity.getDes());
@ -124,6 +129,8 @@ public class GameDetailBasicInfoAdapter extends BaseRecyclerAdapter<RecyclerView
@Override
public int getItemCount() {
if (tags == null) return 0;
if (tips.getTitle() != null) {
return tags.size() + 1;
}

2
app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTypeListAdapter.kt
View File

@ -50,6 +50,8 @@ class SubjectTypeListAdapter(context: Context,
}
holder.type.setOnClickListener {
if (holder.adapterPosition == -1) return@setOnClickListener
holder.type.isSelected = true
mCurType = mGameType[holder.adapterPosition]
mItemClickListener.invoke(mGameType[holder.adapterPosition])