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

Merge branch '2.1' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.1

Browse Source 
Conflicts:
	app/src/main/java/com/gh/gamecenter/CropImageActivity.java
	app/src/main/java/com/gh/gamecenter/MainActivity.java
	app/src/main/java/com/gh/gamecenter/news/News4Fragment.java
	app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
This commit is contained in:
huangzhuanghua
2016-10-21 18:03:01 +08:00
parent 2c6fd5d0d8 385d9155f7
commit bcc58481ed
91 changed files with 662 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java
View File

@ -14,7 +14,6 @@ import com.gh.common.constant.Config;
import com.gh.common.util.DataUtils;
import com.gh.common.util.DialogUtils;
import com.gh.common.util.GameUtils;
import com.gh.common.util.ImageUtils;
import com.gh.gamecenter.ConcernActivity;
import com.gh.gamecenter.R;
import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder;
@ -125,7 +124,8 @@ public class ConcernAdapter extends RecyclerView.Adapter<ConcernViewHolder> {
@Override
public void onBindViewHolder(final ConcernViewHolder holder, int position) {
ConcernInfo concernInfo = concernList.get(position);
ImageUtils.getInstance(context).display(concernInfo.getIcon(), holder.concern_item_icon);
// ImageUtils.getInstance(context).display(concernInfo.getIcon(), holder.concern_item_icon);
holder.concern_item_icon.setImageURI(concernInfo.getIcon());
holder.concern_item_name.setText(concernInfo.getGameName());
holder.concern_item_concern.setText("取消关注");
holder.concern_item_concern.setBackgroundResource(R.drawable.textview_cancel_style);