diff --git a/app/src/main/java/com/gh/gamecenter/MessageActivity.java b/app/src/main/java/com/gh/gamecenter/MessageActivity.java index b15f94f475..d2f18d78fc 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageActivity.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.os.Bundle; import com.gh.common.util.EntranceUtils; -import com.gh.gamecenter.message.NewMessageFragment; +import com.gh.gamecenter.message.MessageFragment; /** * Created by khy on 21/07/17. @@ -19,7 +19,7 @@ public class MessageActivity extends NormalActivity { // .setFragment(MessageCenterFragment.class).build(); Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); - return getIntent(context, NewMessageFragment.class, bundle); + return getIntent(context, MessageFragment.class, bundle); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java index 856956b951..b5a6dfef37 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java @@ -103,13 +103,13 @@ public class AskSelectGameAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.ask_selectgame_item, parent, false); - return new AskSelectGameItemViewHolder(view, mEntityList, mListClickListener); + return new AskSelectGameItemViewHolder(view, mListClickListener); case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_TOP: view = mLayoutInflater.inflate(R.layout.ask_selectgame_title_item, parent, false); - return new ReuseViewHolder(view, null, mListClickListener); + return new ReuseViewHolder(view, mListClickListener); } return null; } @@ -123,7 +123,7 @@ public class AskSelectGameAdapter extends ListAdapter { entity = mEntityList.get(position); CommunitiesGameEntity game = entity.getGame(); ImageUtils.Companion.display(bodyHolder.mIcon, game.getIcon()); - + bodyHolder.setClickData(entity); if ("opened".equals(entity.getStatus())) { bodyHolder.mName.setText(entity.getName()); bodyHolder.mVoteRl.setVisibility(View.GONE); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskSelectGameItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskSelectGameItemViewHolder.java index 978f1f36c1..83a034fae6 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskSelectGameItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/AskSelectGameItemViewHolder.java @@ -8,6 +8,7 @@ import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.gamecenter.R; +import com.gh.gamecenter.ask.entity.AskGameSelectEntity; import butterknife.BindView; @@ -15,7 +16,7 @@ import butterknife.BindView; * Created by khy on 6/12/17. */ -public class AskSelectGameItemViewHolder extends BaseRecyclerViewHolder { +public class AskSelectGameItemViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.ask_selectgame_item_icon) public SimpleDraweeView mIcon; @BindView(R.id.ask_selectgame_item_votebtn) @@ -29,12 +30,9 @@ public class AskSelectGameItemViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.ask_selectgame_item_name) public TextView mName; - public AskSelectGameItemViewHolder(View itemView) { - super(itemView); - } - public AskSelectGameItemViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public AskSelectGameItemViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); itemView.setOnClickListener(this); mVoteBtn.setOnClickListener(this); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java index 7712c270c5..0947d39c19 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/FooterViewHolder.java @@ -37,11 +37,6 @@ public class FooterViewHolder extends BaseRecyclerViewHolder { super(itemView); } - public FooterViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); - itemView.setOnClickListener(this); - } - public FooterViewHolder(View itemView, OnListClickListener listClickListener) { super(itemView, listClickListener); itemView.setOnClickListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailFuLiViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailFuLiViewHolder.java index 68ad492b3a..d0e0b17bfe 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailFuLiViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailFuLiViewHolder.java @@ -9,13 +9,14 @@ import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.common.view.MarqueeView; import com.gh.gamecenter.R; +import com.gh.gamecenter.entity.GameDetailEntity; import butterknife.BindView; /** * Created by khy on 2017/3/27. */ -public class GameDetailFuLiViewHolder extends BaseRecyclerViewHolder { +public class GameDetailFuLiViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_item_fuli_des) public TextView fuliDes; @@ -36,8 +37,8 @@ public class GameDetailFuLiViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_item_notice_ll) public LinearLayout filiNoticeLl; - public GameDetailFuLiViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public GameDetailFuLiViewHolder(View itemView,OnListClickListener listClickListener) { + super(itemView, listClickListener); fuliQqBtn.setOnClickListener(this); fuliQqunBtn.setOnClickListener(this); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java index 978936b6ac..214f7fec1a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailKaiFuViewHolder.java @@ -10,13 +10,14 @@ import android.widget.TextView; import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.gamecenter.R; +import com.gh.gamecenter.entity.GameDetailEntity; import butterknife.BindView; /** * Created by khy on 2017/3/28. */ -public class GameDetailKaiFuViewHolder extends BaseRecyclerViewHolder { +public class GameDetailKaiFuViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_kaifu_rv) public RecyclerView kaifuRv; @@ -43,7 +44,7 @@ public class GameDetailKaiFuViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_calender_hint) public RelativeLayout calenderHint; - public GameDetailKaiFuViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public GameDetailKaiFuViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetaiLibaoViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailLibaoViewHolder.java similarity index 79% rename from app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetaiLibaoViewHolder.java rename to app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailLibaoViewHolder.java index 4abce9871f..6ca69a6c76 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetaiLibaoViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailLibaoViewHolder.java @@ -12,14 +12,14 @@ import butterknife.BindView; /** * Created by khy on 2016/12/14. */ -public class GameDetaiLibaoViewHolder extends BaseRecyclerViewHolder { +public class GameDetailLibaoViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_item_libao_gallery) public RecyclerView libaoRv; @BindView(R.id.gamedetail_item_open_list) public RelativeLayout openList; - public GameDetaiLibaoViewHolder(View itemView) { + public GameDetailLibaoViewHolder(View itemView) { super(itemView); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java index 5f17e4b598..9bf59762cd 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNewsViewHolder.java @@ -7,13 +7,14 @@ import android.widget.TextView; import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.gamecenter.R; +import com.gh.gamecenter.entity.GameDetailEntity; import butterknife.BindView; /** * Created by LGT on 2016/9/8. */ -public class GameDetailNewsViewHolder extends BaseRecyclerViewHolder { +public class GameDetailNewsViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_item_news_more) public LinearLayout newsMore; @@ -48,8 +49,8 @@ public class GameDetailNewsViewHolder extends BaseRecyclerViewHolder { super(itemView); } - public GameDetailNewsViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public GameDetailNewsViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); newsMore.setOnClickListener(this); newsItem1.setOnClickListener(this); newsItem2.setOnClickListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java index c0f7b8a7e5..5f7a9f0616 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailNoticeViewHolder.java @@ -6,13 +6,14 @@ import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.common.view.MarqueeView; import com.gh.gamecenter.R; +import com.gh.gamecenter.entity.GameDetailEntity; import butterknife.BindView; /** * Created by khy on 2017/3/30. */ -public class GameDetailNoticeViewHolder extends BaseRecyclerViewHolder { +public class GameDetailNoticeViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_item_notice) public MarqueeView mvNotice; @@ -23,8 +24,8 @@ public class GameDetailNoticeViewHolder extends BaseRecyclerViewHolder { super(itemView); } - public GameDetailNoticeViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public GameDetailNoticeViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); mvNotice.setOnClickListener(this); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameLibaoGalleryViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameLibaoGalleryViewHolder.java index ed4a597fff..ccee93ca91 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameLibaoGalleryViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameLibaoGalleryViewHolder.java @@ -6,13 +6,14 @@ import android.widget.TextView; import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.gamecenter.R; +import com.gh.gamecenter.entity.LibaoEntity; import butterknife.BindView; /** * Created by khy on 2016/12/14. */ -public class GameLibaoGalleryViewHolder extends BaseRecyclerViewHolder { +public class GameLibaoGalleryViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_libao_name) public TextView libaoName; @@ -23,12 +24,8 @@ public class GameLibaoGalleryViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.gamedetail_libao_item) public View libaoItem; - public GameLibaoGalleryViewHolder(View itemView) { - super(itemView); - } - - public GameLibaoGalleryViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public GameLibaoGalleryViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); libaoItem.setOnClickListener(this); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java index 78ade3ee0c..63be19f404 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoNormalViewHolder.java @@ -7,13 +7,14 @@ import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.gamecenter.R; +import com.gh.gamecenter.entity.LibaoEntity; import butterknife.BindView; /** * Created by khy on 2016/12/12. */ -public class LibaoNormalViewHolder extends BaseRecyclerViewHolder { +public class LibaoNormalViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.libao_name) public TextView libaoName; @@ -30,8 +31,8 @@ public class LibaoNormalViewHolder extends BaseRecyclerViewHolder { super(itemView); } - public LibaoNormalViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public LibaoNormalViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); itemView.setOnClickListener(this); libaoBtnStatus.setOnClickListener(this); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java index 5fb5235508..780f2ab003 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java @@ -9,8 +9,7 @@ import com.facebook.drawee.view.SimpleDraweeView; import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.gamecenter.R; - -import java.util.List; +import com.gh.gamecenter.entity.ConcernEntity; import butterknife.BindView; @@ -18,7 +17,7 @@ import butterknife.BindView; * Created by Administrator on 2016/9/8. * viewholder */ -public class NewsDigestViewHolder extends BaseRecyclerViewHolder { +public class NewsDigestViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.news_digest_thumb) public SimpleDraweeView thumb; @@ -45,8 +44,8 @@ public class NewsDigestViewHolder extends BaseRecyclerViewHolder { super(itemView); } - public NewsDigestViewHolder(View itemView, List data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public NewsDigestViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); itemView.setOnClickListener(this); share.setOnClickListener(this); comment.setOnClickListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsTextViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsTextViewHolder.java index d7d6238cfa..03576e9b75 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsTextViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsTextViewHolder.java @@ -6,8 +6,7 @@ import android.widget.TextView; import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.gamecenter.R; - -import java.util.List; +import com.gh.gamecenter.entity.NewsEntity; import butterknife.BindView; @@ -15,7 +14,7 @@ import butterknife.BindView; * Created by LGT on 2016/8/17. * viewholder */ -public class NewsTextViewHolder extends BaseRecyclerViewHolder { +public class NewsTextViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.news_text_line) public View line; @@ -28,8 +27,8 @@ public class NewsTextViewHolder extends BaseRecyclerViewHolder { super(itemView); } - public NewsTextViewHolder(View itemView, List data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public NewsTextViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); itemView.setOnClickListener(this); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ReuseViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ReuseViewHolder.java index b6500dc4ee..e370ca6a9d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ReuseViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ReuseViewHolder.java @@ -14,8 +14,8 @@ public class ReuseViewHolder extends BaseRecyclerViewHolder { super(itemView); } - public ReuseViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public ReuseViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); itemView.setOnClickListener(this); } } diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyAdapter.java index 1b6bba586f..dbdbf19636 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyAdapter.java @@ -38,10 +38,10 @@ public class AskQuestionsNewBodyAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.ask_questions_new_item, parent, false); - return new AskQuestionsNewViewHolder(view, mEntityList, mListClickListener); + return new AskQuestionsNewViewHolder(view, mListClickListener); default: return null; } diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java index 1fc44cfe30..e70840a307 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyFragment.java @@ -95,8 +95,7 @@ public class AskQuestionsNewBodyFragment extends ListFragment questionsList = (List) data; - Questions questions = questionsList.get(position); + Questions questions = (Questions) data; Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, questions.getId()); bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewViewHolder.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewViewHolder.java index bb5ad51afc..5df11d75ef 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewViewHolder.java @@ -14,7 +14,7 @@ import butterknife.BindView; * Created by khy on 6/12/17. */ -public class AskQuestionsNewViewHolder extends BaseRecyclerViewHolder { +public class AskQuestionsNewViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.ask_questions_item_title) TextView mTitle; @@ -24,17 +24,19 @@ public class AskQuestionsNewViewHolder extends BaseRecyclerViewHolder { TextView mCommunitName; - public AskQuestionsNewViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public AskQuestionsNewViewHolder(View itemView,OnListClickListener listClickListener) { + super(itemView, listClickListener); itemView.setOnClickListener(this); } public void initAskQuestionsNewViewHolder(Questions questions) { + setClickData(questions); mAnswerCount.setText(itemView.getContext().getString(R.string.ask_answer_count, questions.getAnswerCount())); mTitle.setText(questions.getTitle()); } public void initMyQuestionsViewHolder(Questions questions) { + setClickData(questions); mAnswerCount.setText(itemView.getContext().getString(R.string.ask_answer_count, questions.getAnswerCount())); mTitle.setText(questions.getTitle()); mCommunitName.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java index 9cc58c10f6..ce9e463884 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsAdapter.java @@ -24,7 +24,7 @@ import java.util.List; public class AskQuestionsRecommendsAdapter extends ListAdapter { - public static final int MAX_PROGRESS = 300; + public static final int MAX_PROGRESS = 200; private OnListClickListener mListClickListener; private OnSubjectProgressListener mProgressListener; diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java index 7e01798c29..411bd84d16 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java @@ -34,8 +34,6 @@ public class AskQuestionsRecommendsFragment extends ListFragment { @Override public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { View view = mLayoutInflater.inflate(R.layout.suggest_pic_item, parent, false); - return new SuggestPicViewHolder(view, picList, mListListener); + return new SuggestPicViewHolder(view, mListListener); } @Override public void onBindViewHolder(final ViewHolder holder, int position) { if (holder instanceof SuggestPicViewHolder) { SuggestPicViewHolder viewHolder = (SuggestPicViewHolder) holder; + viewHolder.setClickData(picList); if (position == getItemCount() - 1 && picList.size() < 3) { viewHolder.delate.setVisibility(View.GONE); ImageUtils.Companion.display(viewHolder.icon, R.drawable.suggest_add_pic_icon); diff --git a/app/src/main/java/com/gh/gamecenter/ask/SelectGameFragment.java b/app/src/main/java/com/gh/gamecenter/ask/SelectGameFragment.java index 8921eb992a..18d03ac7a1 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/SelectGameFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/SelectGameFragment.java @@ -115,16 +115,13 @@ public class SelectGameFragment extends ListFragment list = (List) data; - if (position < list.size()) { - AskGameSelectEntity entity = list.get(position); - if ("opened".equals(entity.getStatus())) { - UserManager.getInstance().setCommunityId(getContext(), entity.getId(), entity.getName()); - mAdapter.resetCommunityId(entity.getId()); - if (getActivity() != null) { - getActivity().setResult(Activity.RESULT_OK); - getActivity().finish(); - } + AskGameSelectEntity entity = (AskGameSelectEntity) data; + if ("opened".equals(entity.getStatus())) { + UserManager.getInstance().setCommunityId(getContext(), entity.getId(), entity.getName()); + mAdapter.resetCommunityId(entity.getId()); + if (getActivity() != null) { + getActivity().setResult(Activity.RESULT_OK); + getActivity().finish(); } } break; diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsAdapter.java index 078687950a..d1df7d3718 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsAdapter.java @@ -39,10 +39,10 @@ class ConcernQuestionsAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.ask_questions_new_item, parent, false); - return new AskQuestionsNewViewHolder(view, mEntityList, mListClickListener); + return new AskQuestionsNewViewHolder(view, mListClickListener); default: return null; } diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsFragment.java b/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsFragment.java index e227d7183e..8c78f0f289 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsFragment.java @@ -57,8 +57,7 @@ public class ConcernQuestionsFragment extends ListFragment questionsList = (List) data; - Questions questions = questionsList.get(position); + Questions questions = (Questions) data; Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, questions.getId()); bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/MyAnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/myask/MyAnswerAdapter.java index d899edda50..b53292bf04 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/MyAnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/MyAnswerAdapter.java @@ -38,7 +38,7 @@ class MyAnswerAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.ask_answer_item, parent, false); return new AnswerViewHolder(view, mListClickListener); diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftAdapter.java index 0b389fe367..cb12d0ec33 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftAdapter.java @@ -38,7 +38,7 @@ class MyDraftAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.ask_answer_item, parent, false); return new AnswerViewHolder(view, mListClickListener); diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsAdapter.java index f8c720d152..d1d9560bcf 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsAdapter.java @@ -39,10 +39,10 @@ public class MyQuestionsAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.ask_questions_new_item, parent, false); - return new AskQuestionsNewViewHolder(view, mEntityList, mListClickListener); + return new AskQuestionsNewViewHolder(view, mListClickListener); default: return null; } diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsFragment.java b/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsFragment.java index 744bfadc0d..4ca1adf8e2 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsFragment.java @@ -56,8 +56,7 @@ public class MyQuestionsFragment extends ListFragment questionsList = (List) data; - Questions questions = questionsList.get(position); + Questions questions = (Questions) data; Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, questions.getId()); diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldAdapter.java index f0f9eb9395..68130bac08 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldAdapter.java @@ -38,7 +38,7 @@ public class AnswerFoldAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.ask_answer_item, parent, false); return new AnswerViewHolder(view, mListClickListener); diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java index 74c11847ea..3a80743048 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java @@ -117,10 +117,10 @@ public class QuestionsDetailAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_TOP: view = mLayoutInflater.inflate(R.layout.questionsdetail_item, parent, false); - return new QuestionsDetailItemViewHolder(view, null, mListClickListener); + return new QuestionsDetailItemViewHolder(view, mListClickListener); case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.ask_answer_item, parent, false); return new AnswerViewHolder(view, mListClickListener); diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailItemViewHolder.java index d74990a78b..34c8960970 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailItemViewHolder.java @@ -45,8 +45,8 @@ public class QuestionsDetailItemViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.questionsdetail_invite) View inviteBtn; - public QuestionsDetailItemViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public QuestionsDetailItemViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); mPic1.setOnClickListener(this); mPic2.setOnClickListener(this); mPic3.setOnClickListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteAdapter.java index a3ce7dac67..a04d3c262c 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteAdapter.java @@ -52,7 +52,7 @@ public class QuestionsInviteAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.questionsinvite_item, parent, false); return new QuestionsInviteViewHolder(view, mListClickListener); diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteTopItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteTopItemViewHolder.java deleted file mode 100644 index c52cc9e62b..0000000000 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/invite/QuestionsInviteTopItemViewHolder.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gh.gamecenter.ask.questionsdetail.invite; - -import android.view.View; -import android.widget.TextView; - -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; -import com.gh.gamecenter.R; - -import butterknife.BindView; - -/** - * Created by khy on 7/12/17. - */ - -public class QuestionsInviteTopItemViewHolder extends BaseRecyclerViewHolder { - @BindView(R.id.questionsinvite_top_item_invite) - public TextView mInvite; - - public QuestionsInviteTopItemViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); - mInvite.setOnClickListener(this); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java index 69127c4137..2602950693 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java @@ -84,10 +84,10 @@ public class AskSearchAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.ask_search_item, parent, false); - return new AskSearchItemViewHolder(view, mEntityList, mListClickListener); + return new AskSearchItemViewHolder(view, mListClickListener); default: return null; } @@ -100,6 +100,7 @@ public class AskSearchAdapter extends ListAdapter { AskSearchEntity searchEntity = mEntityList.get(position); AskSearchItemViewHolder askHolder = (AskSearchItemViewHolder) holder; Questions questions = searchEntity.getQuestions(); + askHolder.setClickData(searchEntity); askHolder.mAnswercount.setText(mContext.getString(R.string.ask_answer_count, questions.getAnswerCount())); askHolder.mTitle.setText(Html.fromHtml(questions.getTitle())); askHolder.mContent.setText(Html.fromHtml(searchEntity.getBrief())); diff --git a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchItemViewHolder.java index e23a99ef6d..4304cb7eb4 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchItemViewHolder.java @@ -6,6 +6,7 @@ import android.widget.TextView; import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.gamecenter.R; +import com.gh.gamecenter.ask.entity.AskSearchEntity; import butterknife.BindView; @@ -13,7 +14,7 @@ import butterknife.BindView; * Created by khy on 8/12/17. */ -public class AskSearchItemViewHolder extends BaseRecyclerViewHolder { +public class AskSearchItemViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.ask_search_item_title) public TextView mTitle; @@ -22,8 +23,8 @@ public class AskSearchItemViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.ask_search_item_answercount) public TextView mAnswercount; - public AskSearchItemViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public AskSearchItemViewHolder(View itemView,OnListClickListener listClickListener) { + super(itemView, listClickListener); itemView.setOnClickListener(this); mContent.setOnClickListener(this); } diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java index de075c630e..fafad3cf07 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java @@ -38,7 +38,7 @@ public class AnswerAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListClickListener); + return new FooterViewHolder(view, mListClickListener); case ItemViewType.ITEM_BODY: view = mLayoutInflater.inflate(R.layout.ask_answer_item, parent, false); return new AnswerViewHolder(view, mListClickListener); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java index 819ed4ee79..68883c9e98 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -23,7 +23,7 @@ import com.gh.common.view.MarqueeView; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; -import com.gh.gamecenter.adapter.viewholder.GameDetaiLibaoViewHolder; +import com.gh.gamecenter.adapter.viewholder.GameDetailLibaoViewHolder; import com.gh.gamecenter.adapter.viewholder.GameDetailFuLiViewHolder; import com.gh.gamecenter.adapter.viewholder.GameDetailKaiFuViewHolder; import com.gh.gamecenter.adapter.viewholder.GameDetailNewsViewHolder; @@ -328,19 +328,19 @@ public class FuLiAdapter extends BaseRecyclerAdapter { switch (viewType) { case 1: view = mLayoutInflater.inflate(R.layout.gamedetail_item_notice, parent, false); - return new GameDetailNoticeViewHolder(view, mGameDetailEntity, mListListener); + return new GameDetailNoticeViewHolder(view, mListListener); case 2: view = mLayoutInflater.inflate(R.layout.gamedetail_item_news, parent, false); - return new GameDetailNewsViewHolder(view, mGameDetailEntity, mListListener); + return new GameDetailNewsViewHolder(view, mListListener); case 3: view = mLayoutInflater.inflate(R.layout.gamedetail_item_fuli, parent, false); - return new GameDetailFuLiViewHolder(view, mGameDetailEntity, mListListener); + return new GameDetailFuLiViewHolder(view, mListListener); case 4: view = mLayoutInflater.inflate(R.layout.gamedetail_item_libao_rv, parent, false); - return new GameDetaiLibaoViewHolder(view); + return new GameDetailLibaoViewHolder(view); case 5: view = mLayoutInflater.inflate(R.layout.gamedetail_item_kaifu, parent, false); - return new GameDetailKaiFuViewHolder(view, mGameDetailEntity, mListListener); + return new GameDetailKaiFuViewHolder(view, mListListener); case 6: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); return new FooterViewHolder(view); @@ -360,14 +360,15 @@ public class FuLiAdapter extends BaseRecyclerAdapter { public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) { if (holder instanceof GameDetailNoticeViewHolder) { GameDetailNoticeViewHolder viewHolder = (GameDetailNoticeViewHolder) holder; + viewHolder.setClickData(mGameDetailEntity); initNoticeViewHolder(viewHolder.mvNotice); } else if (holder instanceof GameDetailNewsViewHolder) { initNewsViewHolder((GameDetailNewsViewHolder) holder); } else if (holder instanceof GameDetailPluginViewHolder) { // 工具item GameDetailPluginViewHolder viewHolder = (GameDetailPluginViewHolder) holder; initToolsViewHolder(viewHolder, position); - } else if (holder instanceof GameDetaiLibaoViewHolder) { - GameDetaiLibaoViewHolder viewHolder = (GameDetaiLibaoViewHolder) holder; + } else if (holder instanceof GameDetailLibaoViewHolder) { + GameDetailLibaoViewHolder viewHolder = (GameDetailLibaoViewHolder) holder; initLibaoViewHolder(viewHolder); } else if (holder instanceof GameDetailFuLiViewHolder) { GameDetailFuLiViewHolder viewHolder = (GameDetailFuLiViewHolder) holder; @@ -476,6 +477,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { } private void initNewsViewHolder(GameDetailNewsViewHolder viewHolder) { + viewHolder.setClickData(mGameDetailEntity); if (mGameDetailEntity.getNews().size() < 3) { viewHolder.newsMore.setVisibility(View.GONE); @@ -508,7 +510,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { } } - private void initLibaoViewHolder(GameDetaiLibaoViewHolder viewHolder) { + private void initLibaoViewHolder(GameDetailLibaoViewHolder viewHolder) { viewHolder.libaoRv.setNestedScrollingEnabled(false); if (mLibaoList != null && (mLibaoList.size() <= 3 || isOpenLiBaoList)) { viewHolder.openList.setVisibility(View.GONE); @@ -529,6 +531,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { } private void initFuLiViewHolder(final GameDetailFuLiViewHolder viewHolder) { + viewHolder.setClickData(mGameDetailEntity); final GameDetailContact contact = mGameDetailEntity.getContact(); if (contact != null && contact.getService() != null && !TextUtils.isEmpty(contact.getService().getDes())) { @@ -556,6 +559,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { } private void initKaiFuViewHolder(GameDetailKaiFuViewHolder viewHolder) { + viewHolder.setClickData(mGameDetailEntity); GameDetailServer serverEntity = mGameDetailEntity.getServerEntity(); if (!TextUtils.isEmpty(serverEntity.getDes())) { viewHolder.kaifuDes.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java index 592e971da4..f345cf8e3c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuliFragment.java @@ -185,8 +185,8 @@ public class FuliFragment extends BaseFragment { QQUtils.startQQSession(getContext(), detailEntity.getContact().getService().getQq()); break; case R.id.gamedetail_libao_item: - List libaoList = (List) data; - Intent intent = LibaoDetailActivity.getIntent(getContext(), libaoList.get(position), + LibaoEntity libaoEntity = (LibaoEntity) data; + Intent intent = LibaoDetailActivity.getIntent(getContext(), libaoEntity, mEntrance + "[" + position + "]"); startActivityForResult(intent, GAME_DETAIL_LIBAO_REQUEST); break; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java index 436bcc2de7..a32a1461ec 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java @@ -32,12 +32,13 @@ class GameLibaoGalleryAdapter extends BaseRecyclerAdapter")) { diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java index 608eb284b2..06e5095870 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java @@ -318,7 +318,7 @@ class ConcernAdapter extends BaseRecyclerAdapter { public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { if (viewType == ItemViewType.NEWS_DIGEST) { View view =mLayoutInflater.inflate(R.layout.news_digest_item, parent, false); - return new NewsDigestViewHolder(view, concernList, mListListener); + return new NewsDigestViewHolder(view, mListListener); } else if (viewType == ItemViewType.LOADING) { View view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); return new FooterViewHolder(view); @@ -355,6 +355,7 @@ class ConcernAdapter extends BaseRecyclerAdapter { private void initNewsDigestViewHolder(final NewsDigestViewHolder viewHolder, int position) { final ConcernEntity concernEntity = concernList.get(position); + viewHolder.setClickData(concernEntity); ImageUtils.Companion.display(viewHolder.thumb, concernEntity.getGameIcon()); viewHolder.title.setText(concernEntity.getGameName()); diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java index 54db7a0388..b7651af34b 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -531,8 +531,7 @@ public class ConcernFragment extends NormalFragment implements SwipeRefreshLayou @Override public void onListClick(View view, int position, Object data) { super.onListClick(view, position, data); - List concernList = (List) data; - ConcernEntity concernEntity = concernList.get(position); + ConcernEntity concernEntity = (ConcernEntity) data; final String entrance = StringUtils.buildString("(资讯:关注[" + position + "])"); diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java b/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java index 6b4c5cddd3..8c5ff81553 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java @@ -71,7 +71,7 @@ class InfoAdapter extends ListAdapter { return new NewsImage3ViewHolder(view, mListListener); case ItemViewType.LOADING: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mListListener); + return new FooterViewHolder(view, mListListener); default: return null; } 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 8d10ff0a2f..8d940bb54a 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java @@ -60,7 +60,7 @@ class StrategyAdapter extends BaseRecyclerAdapter { public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { if (viewType == 1) { View view = mLayoutInflater.inflate(R.layout.news_text_item, parent, false); - return new NewsTextViewHolder(view, mNewsList, mListListener); + return new NewsTextViewHolder(view, mListListener); } else { View view = mLayoutInflater.inflate(R.layout.news_footer_item, parent, false); return new NewsFooterViewHolder(view); @@ -72,7 +72,7 @@ class StrategyAdapter extends BaseRecyclerAdapter { if (holder instanceof NewsTextViewHolder) { final NewsTextViewHolder viewHolder = (NewsTextViewHolder) holder; final NewsEntity newsEntity = mNewsList.get(position); - + viewHolder.setClickData(newsEntity); if (!TextUtils.isEmpty(newsEntity.getType())) { if (position == 0 && newsEntity.getPriority() != 0) { viewHolder.type.setText(R.string.article_top); diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java index 78d83a85a7..8ed5815973 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java @@ -269,8 +269,7 @@ public class StrategyFragment extends BaseFragment implements SwipeRefreshLayout @Override public void onListClick(View view, int position, Object data) { super.onListClick(view, position, data); - List newsList = (List) data; - NewsEntity newsEntity = newsList.get(position); + NewsEntity newsEntity = (NewsEntity) data; Map kv = new HashMap<>(); kv.put("名字", newsEntity.getTitle()); kv.put("位置", String.valueOf(position + 1)); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index 9fd1d1171c..7ea0533ae5 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -26,12 +26,9 @@ import com.gh.gamecenter.eventbus.EBUISwitch; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import java.util.List; - import butterknife.BindView; import butterknife.OnClick; -import static com.gh.common.constant.Constants.LIST_HEAD_ITEM; import static com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG; /** @@ -212,8 +209,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O startActivityForResult(intent, CONCERN_CHANGE_REQUEST); break; default: - List libaoList = (List) data; - LibaoEntity libaoEntity = libaoList.get(position - LIST_HEAD_ITEM); + LibaoEntity libaoEntity = (LibaoEntity) data; adapter.setSkipPosition(position); intent = LibaoDetailActivity.getIntent(getContext(), libaoEntity, mEntrance + "+(礼包中心:关注)"); startActivityForResult(intent, LIBAO_CONCERN_REQUEST); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index 942919697f..b4f254b0bd 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -167,13 +167,13 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { switch (viewType) { case ItemViewType.LIBAO_SKIP_CONCERN: view = mLayoutInflater.inflate(R.layout.newsdetail_item_comment, parent, false); - return new NewsDetailCommentViewHolder(view, null, mListListener); + return new NewsDetailCommentViewHolder(view, mListListener); case ItemViewType.LOADING: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); return new FooterViewHolder(view); default: view = mLayoutInflater.inflate(R.layout.libao_item, parent, false); - return new LibaoNormalViewHolder(view, mLibaoList, mListListener); + return new LibaoNormalViewHolder(view, mListListener); } } @@ -210,6 +210,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { private void initLibaoViewHolder(final LibaoNormalViewHolder holder, final int position) { LibaoEntity libaoEntity = mLibaoList.get(position - 1); + holder.setClickData(libaoEntity); holder.libaoName.setText(libaoEntity.getName()); ImageUtils.Companion.display(holder.libaoGameIcon, libaoEntity.getIcon()); if (TextUtils.isEmpty(libaoEntity.getPlatform())) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt index 8be5e09203..fa4fc492fd 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -149,7 +149,7 @@ class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListe } else -> { view = mLayoutInflater.inflate(R.layout.libao_item, parent, false) - return LibaoNormalViewHolder(view, mLibaoList, mListListener) + return LibaoNormalViewHolder(view, mListListener) } } } @@ -193,6 +193,7 @@ class LibaoNewAdapter(context: Context, callBackListener: OnRequestCallBackListe private fun initLibaoViewHolder(holder: LibaoNormalViewHolder, position: Int) { val libaoEntity = mLibaoList[position] + holder.setClickData(libaoEntity) holder.libaoName.text = libaoEntity.name if (TextUtils.isEmpty(libaoEntity.platform)) { holder.libaoGameName.text = libaoEntity.game?.name diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java index d2febe90a9..8d06ac4fce 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java @@ -22,8 +22,6 @@ import com.gh.gamecenter.eventbus.EBReuse; import org.greenrobot.eventbus.EventBus; -import java.util.List; - import butterknife.BindView; import butterknife.OnClick; @@ -259,8 +257,7 @@ public class LibaoNewFragment extends BaseFragment implements SwipeRefreshLayout @Override public void onListClick(View view, int position, Object data) { super.onListClick(view, position, data); - List libaoList = (List) data; - LibaoEntity libaoEntity = libaoList.get(position); + LibaoEntity libaoEntity = (LibaoEntity) data; mAdapter.setSkipPosition(position); Intent intent = LibaoDetailActivity.getIntent(getContext(), libaoEntity, mEntrance + "+(礼包中心:最新)"); startActivityForResult(intent, LIBAO_NEW_REQUEST); diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt index 48df69f43a..52f204b00d 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -154,7 +154,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, } else -> { view = mLayoutInflater.inflate(R.layout.libao_item, parent, false) - return LibaoNormalViewHolder(view, mLibaoList, mListListener) + return LibaoNormalViewHolder(view, mListListener) } } } @@ -198,6 +198,7 @@ class LibaoSearchAdapter(fragment: LibaoSearchFragment, private fun initLibaoViewHolder(holder: LibaoNormalViewHolder, position: Int) { val libaoEntity = mLibaoList[position] + holder.setClickData(libaoEntity) holder.libaoName.text = libaoEntity.name if (TextUtils.isEmpty(libaoEntity.platform)) { holder.libaoGameName.text = libaoEntity.game?.name diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java index 3ba9e35cb7..5f706b1878 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java @@ -18,8 +18,6 @@ import com.gh.gamecenter.eventbus.EBReuse; import org.greenrobot.eventbus.EventBus; -import java.util.List; - import butterknife.BindView; import butterknife.OnClick; @@ -160,8 +158,7 @@ public class LibaoSearchFragment extends BaseFragment implements SwipeRefreshLay @Override public void onListClick(View view, int position, Object data) { super.onListClick(view, position, data); - List libaoList = (List) data; - LibaoEntity libaoEntity = libaoList.get(position); + LibaoEntity libaoEntity = (LibaoEntity) data; mAdapter.setSkipPosition(position); Intent intent = LibaoDetailActivity.getIntent(getContext(), libaoEntity, mEntrance + "+(礼包中心:最新)"); startActivityForResult(intent, LIBAO_SEARCH_REQUEST); diff --git a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java index d997466104..67c999e5fb 100644 --- a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java @@ -442,6 +442,7 @@ class UserRepository { private void userInfoHandle(final UserInfoEntity userInfo, boolean isEditUserInfo) { + if (userInfo == null || TextUtils.isEmpty(userInfo.getId())) return; // 未知原因 为防止闪退先不处理 SINGLE_EXECUTOR.execute(new Runnable() { @Override public void run() { diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentNormalViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/CommentNormalViewHolder.java deleted file mode 100644 index de8601ae74..0000000000 --- a/app/src/main/java/com/gh/gamecenter/message/CommentNormalViewHolder.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.gh.gamecenter.message; - -import android.view.View; -import android.widget.TextView; - -import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.gamecenter.R; - -import butterknife.BindView; - -/** - * Created by khy on 2017/4/6. - * 消息-评论实体 - */ -public class CommentNormalViewHolder extends BaseRecyclerViewHolder { - - @BindView(R.id.message_comment_user_icon) - public SimpleDraweeView userIcon; - @BindView(R.id.message_comment_user_name) - public TextView userName; - @BindView(R.id.message_comment_request_control) - public TextView requestControl; - @BindView(R.id.message_comment_content) - public TextView commentContent; - @BindView(R.id.message_comment_answer) - public TextView commentAnswer; - @BindView(R.id.message_comment_time) - public TextView commentTime; - - public CommentNormalViewHolder(View itemView) { - super(itemView); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentVoteViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/CommentVoteViewHolder.java deleted file mode 100644 index c65a94fee6..0000000000 --- a/app/src/main/java/com/gh/gamecenter/message/CommentVoteViewHolder.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gh.gamecenter.message; - -import android.view.View; -import android.widget.TextView; - -import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.gamecenter.R; - -import butterknife.BindView; - -/** - * Created by khy on 2017/4/6. - * 消息-评论实体 - */ -public class CommentVoteViewHolder extends BaseRecyclerViewHolder { - - @BindView(R.id.message_comment_user_icon) - public SimpleDraweeView userIcon; - @BindView(R.id.comment_like_count) - public TextView likeCountTv; - @BindView(R.id.message_comment_time) - public TextView commentTime; - @BindView(R.id.message_comment_content) - public TextView commentContent; - - public CommentVoteViewHolder(View itemView) { - super(itemView); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/message/NewMessageAdapter.java b/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java similarity index 85% rename from app/src/main/java/com/gh/gamecenter/message/NewMessageAdapter.java rename to app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java index a570863b9e..3de08184f7 100644 --- a/app/src/main/java/com/gh/gamecenter/message/NewMessageAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageAdapter.java @@ -23,13 +23,13 @@ import java.util.List; * Created by khy on 23/03/18. */ -public class NewMessageAdapter extends ListAdapter { +public class MessageAdapter extends ListAdapter { private OnListClickListener mClickListener; private MessageUnreadEntity mUnreadEntity; - public NewMessageAdapter(Context context, OnListClickListener clickListener) { + public MessageAdapter(Context context, OnListClickListener clickListener) { super(context); mClickListener = clickListener; } @@ -55,13 +55,13 @@ public class NewMessageAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_TOP: MessageItemTopBinding topBinding = DataBindingUtil.inflate(mLayoutInflater, R.layout.message_item_top, parent, false); - return new NewMessageTopViewHolder(topBinding, mClickListener); + return new MessageTopViewHolder(topBinding, mClickListener); case ItemViewType.ITEM_FOOTER: View view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mClickListener); + return new FooterViewHolder(view, mClickListener); case ItemViewType.ITEM_BODY: MessageItemBinding binding = DataBindingUtil.inflate(mLayoutInflater, R.layout.message_item, parent, false); - return new NewMessageItemViewHolder(binding, mClickListener); + return new MessageItemViewHolder(binding, mClickListener); default: return null; } @@ -72,11 +72,11 @@ public class NewMessageAdapter extends ListAdapter { public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { switch (getItemViewType(position)) { case ItemViewType.ITEM_TOP: - NewMessageTopViewHolder topViewHolder = (NewMessageTopViewHolder) holder; + MessageTopViewHolder topViewHolder = (MessageTopViewHolder) holder; topViewHolder.mBinding.setUnreadEntity(mUnreadEntity); break; case ItemViewType.ITEM_BODY: - NewMessageItemViewHolder viewHolder = (NewMessageItemViewHolder) holder; + MessageItemViewHolder viewHolder = (MessageItemViewHolder) holder; viewHolder.setMessageItem(mEntityList.get(position - TOP_ITEM_COUNT)); break; case ItemViewType.ITEM_FOOTER: diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java index 7d537fdad6..13a2df9e65 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -1,107 +1,177 @@ package com.gh.gamecenter.message; +import android.arch.lifecycle.ViewModelProviders; +import android.content.Intent; import android.os.Bundle; +import android.support.annotation.Nullable; import android.view.View; +import com.gh.common.util.AskLogUtils; import com.gh.common.util.EntranceUtils; +import com.gh.gamecenter.CommentDetailActivity; +import com.gh.gamecenter.MessageDetailActivity; +import com.gh.gamecenter.NewsDetailActivity; +import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.baselist.ListAdapter; +import com.gh.gamecenter.ask.AnswerDetailFragment; +import com.gh.gamecenter.ask.entity.Questions; +import com.gh.gamecenter.ask.questionsdetail.QuestionsDetailFragment; import com.gh.gamecenter.baselist.ListFragment; -import com.gh.gamecenter.baselist.LoadType; import com.gh.gamecenter.baselist.NormalListViewModel; import com.gh.gamecenter.entity.MessageEntity; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.halo.assistant.HaloApp; import java.util.List; import rx.Observable; /** - * Created by khy on 2017/4/5. - * 消息-评论 + * Created by khy on 23/03/18. */ -public class MessageFragment extends ListFragment { +public class MessageFragment extends ListFragment { - MessageFragmentAdapter mAdapter; + private MessageAdapter mAdapter; - private boolean mIsMarkRead; + private MessageUnreadViewModel mUnreadViewModel; - public static MessageFragment getInstance(String entrance) { - MessageFragment fragment = new MessageFragment(); - Bundle args = new Bundle(); - args.putString(EntranceUtils.KEY_ENTRANCE, entrance); - fragment.setArguments(args); - return fragment; + @Override + public void onActivityCreated(@Nullable Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + setNavigationTitle(getString(R.string.title_message_center)); } @Override - protected ListAdapter provideListAdapter() { - return mAdapter == null ? mAdapter = new MessageFragmentAdapter(getContext(), this) : mAdapter; + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + mUnreadViewModel = ViewModelProviders.of(this, new MessageUnreadViewModel.Factory(HaloApp.getInstance().getApplication())) + .get(MessageUnreadViewModel.class); + mUnreadViewModel.getLiveData().observe(this + , messageUnread -> provideListAdapter().setMessageUnreadData(messageUnread)); } @Override public Observable> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getMessageData(page); + return RetrofitManager.getInstance(getContext()).getApi().getMessage("default", page); + } + + @Override + protected MessageAdapter provideListAdapter() { + return mAdapter == null ? mAdapter = new MessageAdapter(getContext(), this) : mAdapter; } @Override public void onListClick(View view, int position, Object data) { - if (view.getId() == R.id.footerview_item) { - if (mAdapter.isNetworkError()) { - mListViewModel.load(LoadType.RETRY); - } - } else { -// MessageEntity entity = ((List) data).get(position); -// Bundle bundle; -// switch (entity.getType()) { -// case "comment_vote": -// if (view.getId() == R.id.message_item_title || view.getId() == R.id.message_item) { -// Intent intent = NewsDetailActivity.getIntentById(getContext(), entity.getArticle().getId(), "消息中心-消息"); -// startActivity(intent); -// } -// break; -// case "reply": -// if (view.getId() == R.id.message_item_title) { -// Intent intent = MessageDetailActivity.getIntentById(getContext(), entity.getArticle().getId(), -1, false, "消息中心-消息"); -// startActivity(intent); -// } else if (view.getId() == R.id.message_item) { -// Intent intent = CommentDetailActivity.getIntent(getContext(), entity.getDialogue().getTo().getId()); -// startActivity(intent); -// } -// break; -// case "invited": -// if (view.getId() == R.id.message_item_title || view.getId() == R.id.message_item) { -// String tracers = mEntrance + "+(消息)"; -// MessageEntity.Question question = entity.getQuestion(); -// bundle = new Bundle(); -// bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, question.getId()); -// bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); -// NormalActivity.startFragment(getContext(), QuestionsDetailFragment.class, bundle); -// -// AskLogUtils.uploadQuestions(getContext(), tracers, question); -// } -// break; -// case "answer": -// case "answer_vote": -// case "follow_question": -// String tracers = mEntrance + "+(消息)"; -// if (view.getId() == R.id.message_item_title) { -// MessageEntity.Question question = entity.getQuestion(); -// bundle = new Bundle(); -// bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, question.getId()); -// bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); -// NormalActivity.startFragment(getContext(), QuestionsDetailFragment.class, bundle); -// -// AskLogUtils.uploadQuestions(getContext(), tracers, question); -// } else if (view.getId() == R.id.message_item) { -// bundle = new Bundle(); -// bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); -// bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); -// NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); -// } -// break; -// } + switch (view.getId()) { + case R.id.message_vote: + NormalActivity.startFragment(getContext(), MessageNormalFragment.class + , MessageNormalFragment.getMessageBundle(MessageNormalFragment.MESSAGE_TYPE_VOTE)); + return; + case R.id.message_invite: + NormalActivity.startFragment(getContext(), MessageNormalFragment.class + , MessageNormalFragment.getMessageBundle(MessageNormalFragment.MESSAGE_TYPE_INVITE)); + return; + case R.id.message_service: + NormalActivity.startFragment(getContext(), KeFuFragment.class); + return; + case R.id.message_item: + break; + case R.id.message_original: + break; + } + + MessageEntity entity = (MessageEntity) data; + Bundle bundle; + String tracers = mEntrance + "+(消息)"; + switch (entity.getType()) { + case "comment_vote": + if (view.getId() == R.id.message_original) { + Intent intent = NewsDetailActivity.getIntentById(getContext(), entity.getArticle().getId(), tracers); + startActivity(intent); + } else if (view.getId() == R.id.message_item) { + Intent intent = MessageDetailActivity.getIntentById(getContext(), + entity.getArticle().getId(), -1, false, tracers); + startActivity(intent); + } + break; + case "reply": + if (view.getId() == R.id.message_original) { + Intent intent = NewsDetailActivity.getIntentById(getContext(), entity.getArticle().getId(), tracers); + startActivity(intent); + } else if (view.getId() == R.id.message_item) { + Intent intent = CommentDetailActivity.getIntent(getContext(), entity.getDialogue().getFrom().getId()); + startActivity(intent); + } + break; + case "invited": + if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { + MessageEntity.Question question = entity.getQuestion(); + bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, question.getId()); + bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); + NormalActivity.startFragment(getContext(), QuestionsDetailFragment.class, bundle); + + Questions questions = new Questions(); + questions.setId(question.getId()); + questions.setTitle(question.getTitle()); + AskLogUtils.uploadQuestions(getContext(), tracers, questions); + } + break; + case "answer": + case "follow_question": + if (view.getId() == R.id.message_original) { + MessageEntity.Question question = entity.getQuestion(); + bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, question.getId()); + bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); + NormalActivity.startFragment(getContext(), QuestionsDetailFragment.class, bundle); + + Questions questions = new Questions(); + questions.setId(question.getId()); + questions.setTitle(question.getTitle()); + AskLogUtils.uploadQuestions(getContext(), tracers, questions); + } else if (view.getId() == R.id.message_item) { + bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); + bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); + NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); + } + break; + case "answer_vote": + if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { + bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); + bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); + NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); + } + break; + case "reply_answer_comment": + if (view.getId() == R.id.message_original) { + bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); + bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); + NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); + } else if (view.getId() == R.id.message_item) { + Intent intent = CommentDetailActivity.getAnswerCommentIntent(getContext(), entity.getDialogue().getFrom().getId(), entity.getAnswer().getId()); + startActivity(intent); + } + break; + case "answer_comment_vote": + case "answer_comment": + if (view.getId() == R.id.message_original) { + bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); + bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); + NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); + } else if (view.getId() == R.id.message_item) { + bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); + bundle.putBoolean(EntranceUtils.KEY_SHOW_ANSWER_COMMENT, true); + bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); + NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); // 打开评论管理 + } + break; } } diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragmentAdapter.java deleted file mode 100644 index 3a3b21de07..0000000000 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragmentAdapter.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.gh.gamecenter.message; - -import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.view.ViewGroup; - -import com.gh.base.OnListClickListener; -import com.gh.common.constant.ItemViewType; -import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; -import com.gh.gamecenter.baselist.ListAdapter; -import com.gh.gamecenter.entity.MessageEntity; - -/** - * Created by khy on 2017/4/10. - * 消息-评论适配器 - */ -public class MessageFragmentAdapter extends ListAdapter { - - private OnListClickListener mClickListener; - - - public MessageFragmentAdapter(Context context, OnListClickListener clickListener) { - super(context); - - mClickListener = clickListener; - } - - @Override - public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View view; - switch (viewType) { - case ItemViewType.ITEM_FOOTER: - view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mClickListener); - case ItemViewType.ITEM_BODY: - view = mLayoutInflater.inflate(R.layout.message_item_answer, parent, false); - return new MessageItemVieHolder(view, mEntityList, mClickListener); - default: - return null; - } - } - - @Override - public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { - - switch (getItemViewType(position)) { - case ItemViewType.ITEM_BODY: - ((MessageItemVieHolder) holder).initMessageItemVieHolder(mEntityList.get(position)); - break; - case ItemViewType.ITEM_FOOTER: - ((FooterViewHolder) holder).initFooterViewHolder(mIsNetworkError, mIsOver, R.string.ask_loadover_hint); - ((FooterViewHolder) holder).initItemPadding(); - break; - } - } - - @Override - public int getItemViewType(int position) { - if (position == getItemCount() - 1) { - return ItemViewType.ITEM_FOOTER; - } else { - return ItemViewType.ITEM_BODY; - } - } - - @Override - public int getItemCount() { - return mEntityList == null || mEntityList.isEmpty() ? 0 : mEntityList.size() + FOOTER_ITEM_COUNT; - } -} diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageItemVieHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemVieHolder.java deleted file mode 100644 index b203471c72..0000000000 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemVieHolder.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.gh.gamecenter.message; - -import android.text.Html; -import android.text.TextUtils; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import com.facebook.drawee.view.SimpleDraweeView; -import com.gh.base.BaseRecyclerViewHolder; -import com.gh.base.OnListClickListener; -import com.gh.common.util.ImageUtils; -import com.gh.common.util.NewsUtils; -import com.gh.gamecenter.R; -import com.gh.gamecenter.entity.MessageEntity; - -import butterknife.BindView; - -/** - * Created by khy on 28/12/17. - */ - -public class MessageItemVieHolder extends BaseRecyclerViewHolder { - @BindView(R.id.message_item_user_icon) - SimpleDraweeView mUserIcon; - @BindView(R.id.message_item_user_name) - TextView mUserName; - @BindView(R.id.message_item_user_status) - TextView mUserStatus; - @BindView(R.id.message_item_vote) - ImageView mVoteIcon; - @BindView(R.id.message_item_title) - TextView mTitle; - @BindView(R.id.message_item_content) - TextView mContent; - @BindView(R.id.message_item_time) - TextView mTime; - - MessageItemVieHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); - itemView.setOnClickListener(this); - mTitle.setOnClickListener(this); - } - - void initMessageItemVieHolder(MessageEntity entity) { - String title = null; - String content = ""; - switch (entity.getType()) { - case "comment_vote": - title = itemView.getContext().getString(R.string.message_article_title, entity.getArticle().getTitle()); - content = itemView.getContext().getString(R.string.message_comment_content, entity.getComment().getContent()); - mContent.setMaxLines(1); - mUserStatus.setVisibility(View.GONE); - mVoteIcon.setVisibility(View.VISIBLE); - break; - case "reply": - mUserStatus.setText(entity.getDialogue().getTo().getContent()); - title = itemView.getContext().getString(R.string.message_article_title, entity.getArticle().getTitle()); - content = itemView.getContext().getString(R.string.message_comment_content, entity.getDialogue().getFrom().getContent()); - mContent.setMaxLines(1); - mUserStatus.setVisibility(View.VISIBLE); - mVoteIcon.setVisibility(View.GONE); - break; - case "invited": - title = itemView.getContext().getString(R.string.message_questions_title, entity.getQuestion().getTitle()); - content = null; - mUserStatus.setText(R.string.invite_answer); - mUserStatus.setVisibility(View.VISIBLE); - mVoteIcon.setVisibility(View.GONE); - break; - case "answer": - title = itemView.getContext().getString(R.string.message_questions_title, entity.getQuestion().getTitle()); - content = itemView.getContext().getString(R.string.message_answer_content, - entity.getUserEntity().getName(), - entity.getAnswer().getContent()); - mUserStatus.setText(R.string.answer_myquestions); - mContent.setMaxLines(2); - mUserStatus.setVisibility(View.VISIBLE); - mVoteIcon.setVisibility(View.GONE); - break; - case "answer_vote": - title = itemView.getContext().getString(R.string.message_questions_title, entity.getQuestion().getTitle()); - content = itemView.getContext().getString(R.string.message_myanswer_content, entity.getAnswer().getContent()); - mUserStatus.setText(R.string.vote_myanswer); - mContent.setMaxLines(2); - mUserStatus.setVisibility(View.VISIBLE); - mVoteIcon.setVisibility(View.GONE); - break; - case "follow_question": - title = itemView.getContext().getString(R.string.message_questions_title, entity.getQuestion().getTitle()); - content = itemView.getContext().getString(R.string.message_answer_content, - entity.getUserEntity().getName(), - entity.getAnswer().getContent()); - mUserStatus.setText(R.string.answer_myconcern_questions); - mContent.setMaxLines(2); - mUserStatus.setVisibility(View.VISIBLE); - mVoteIcon.setVisibility(View.GONE); - break; - default: - - break; - } - - ImageUtils.Companion.display(mUserIcon, entity.getUserEntity().getIcon()); - mUserName.setText(entity.getUserEntity().getName()); - mTitle.setText(title); - mTitle.setEllipsize(TextUtils.TruncateAt.END); - mContent.setEllipsize(TextUtils.TruncateAt.END); - NewsUtils.setNewsDetailTime(mTime, entity.getTime()); - - if (content == null) { - mContent.setVisibility(View.GONE); - } else { - mContent.setText(Html.fromHtml(content)); - mContent.setVisibility(View.VISIBLE); - } - } -} diff --git a/app/src/main/java/com/gh/gamecenter/message/NewMessageItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java similarity index 96% rename from app/src/main/java/com/gh/gamecenter/message/NewMessageItemViewHolder.java rename to app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java index 2c843f0603..5b3acbccdd 100644 --- a/app/src/main/java/com/gh/gamecenter/message/NewMessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -14,10 +14,10 @@ import java.util.List; * Created by khy on 23/03/18. */ -public class NewMessageItemViewHolder extends BaseRecyclerViewHolder { +public class MessageItemViewHolder extends BaseRecyclerViewHolder { MessageItemBinding mBinding; - public NewMessageItemViewHolder(MessageItemBinding binding, OnListClickListener listClickListener) { + public MessageItemViewHolder(MessageItemBinding binding, OnListClickListener listClickListener) { super(binding.getRoot(), listClickListener); mBinding = binding; mBinding.messageOriginal.setOnClickListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java b/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java index d6fa0902f6..0abb509269 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalAdapter.java @@ -33,10 +33,10 @@ public class MessageNormalAdapter extends ListAdapter { switch (viewType) { case ItemViewType.ITEM_FOOTER: view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); - return new FooterViewHolder(view, null, mClickListener); + return new FooterViewHolder(view, mClickListener); case ItemViewType.ITEM_BODY: MessageItemBinding binding = DataBindingUtil.inflate(mLayoutInflater, R.layout.message_item, parent, false); - return new NewMessageItemViewHolder(binding, mClickListener); + return new MessageItemViewHolder(binding, mClickListener); default: return null; } @@ -47,7 +47,7 @@ public class MessageNormalAdapter extends ListAdapter { public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { switch (getItemViewType(position)) { case ItemViewType.ITEM_BODY: - NewMessageItemViewHolder viewHolder = (NewMessageItemViewHolder) holder; + MessageItemViewHolder viewHolder = (MessageItemViewHolder) holder; viewHolder.setMessageItem(mEntityList.get(position)); break; case ItemViewType.ITEM_FOOTER: diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java index e27f84ba8e..050ac1d224 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageNormalFragment.java @@ -50,7 +50,7 @@ public class MessageNormalFragment extends ListFragment { - - private NewMessageAdapter mAdapter; - - private MessageUnreadViewModel mUnreadViewModel; - - @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - setNavigationTitle(getString(R.string.title_message_center)); - } - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mUnreadViewModel = ViewModelProviders.of(this, new MessageUnreadViewModel.Factory(HaloApp.getInstance().getApplication())) - .get(MessageUnreadViewModel.class); - mUnreadViewModel.getLiveData().observe(this - , messageUnread -> provideListAdapter().setMessageUnreadData(messageUnread)); - } - - @Override - public Observable> provideDataObservable(int page) { - return RetrofitManager.getInstance(getContext()).getApi().getMessage("default", page); - } - - @Override - protected NewMessageAdapter provideListAdapter() { - return mAdapter == null ? mAdapter = new NewMessageAdapter(getContext(), this) : mAdapter; - } - - @Override - public void onListClick(View view, int position, Object data) { - switch (view.getId()) { - case R.id.message_vote: - NormalActivity.startFragment(getContext(), MessageNormalFragment.class - , MessageNormalFragment.getMessageBundle(MessageNormalFragment.MESSAGE_TYPE_VOTE)); - return; - case R.id.message_invite: - NormalActivity.startFragment(getContext(), MessageNormalFragment.class - , MessageNormalFragment.getMessageBundle(MessageNormalFragment.MESSAGE_TYPE_INVITE)); - return; - case R.id.message_service: - NormalActivity.startFragment(getContext(), KeFuFragment.class); - return; - case R.id.message_item: - break; - case R.id.message_original: - break; - } - - MessageEntity entity = (MessageEntity) data; - Bundle bundle; - String tracers = mEntrance + "+(消息)"; - switch (entity.getType()) { - case "comment_vote": - if (view.getId() == R.id.message_original) { - Intent intent = NewsDetailActivity.getIntentById(getContext(), entity.getArticle().getId(), tracers); - startActivity(intent); - } else if (view.getId() == R.id.message_item) { - Intent intent = MessageDetailActivity.getIntentById(getContext(), - entity.getArticle().getId(), -1, false, tracers); - startActivity(intent); - } - break; - case "reply": - if (view.getId() == R.id.message_original) { - Intent intent = NewsDetailActivity.getIntentById(getContext(), entity.getArticle().getId(), tracers); - startActivity(intent); - } else if (view.getId() == R.id.message_item) { - Intent intent = CommentDetailActivity.getIntent(getContext(), entity.getDialogue().getFrom().getId()); - startActivity(intent); - } - break; - case "invited": - if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { - MessageEntity.Question question = entity.getQuestion(); - bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, question.getId()); - bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); - NormalActivity.startFragment(getContext(), QuestionsDetailFragment.class, bundle); - - Questions questions = new Questions(); - questions.setId(question.getId()); - questions.setTitle(question.getTitle()); - AskLogUtils.uploadQuestions(getContext(), tracers, questions); - } - break; - case "answer": - case "follow_question": - if (view.getId() == R.id.message_original) { - MessageEntity.Question question = entity.getQuestion(); - bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, question.getId()); - bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); - NormalActivity.startFragment(getContext(), QuestionsDetailFragment.class, bundle); - - Questions questions = new Questions(); - questions.setId(question.getId()); - questions.setTitle(question.getTitle()); - AskLogUtils.uploadQuestions(getContext(), tracers, questions); - } else if (view.getId() == R.id.message_item) { - bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); - bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); - NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); - } - break; - case "answer_vote": - if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) { - bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); - bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); - NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); - } - break; - case "reply_answer_comment": - if (view.getId() == R.id.message_original) { - bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); - bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); - NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); - } else if (view.getId() == R.id.message_item) { - Intent intent = CommentDetailActivity.getAnswerCommentIntent(getContext(), entity.getDialogue().getFrom().getId(), entity.getAnswer().getId()); - startActivity(intent); - } - break; - case "answer_comment_vote": - case "answer_comment": - if (view.getId() == R.id.message_original) { - bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); - bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); - NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); - } else if (view.getId() == R.id.message_item) { - bundle = new Bundle(); - bundle.putString(EntranceUtils.KEY_ANSWER_ID, entity.getAnswer().getId()); - bundle.putBoolean(EntranceUtils.KEY_SHOW_ANSWER_COMMENT, true); - bundle.putString(EntranceUtils.KEY_ENTRANCE, tracers); - NormalActivity.startFragment(getContext(), AnswerDetailFragment.class, bundle); // 打开评论管理 - } - break; - } - - } -} diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailCommentViewHolder.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailCommentViewHolder.java index 71708b7247..bcf263aeec 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailCommentViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailCommentViewHolder.java @@ -17,12 +17,9 @@ public class NewsDetailCommentViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.newsdetail_item_comment) public TextView commentTv; - public NewsDetailCommentViewHolder(View itemView) { - super(itemView); - } - public NewsDetailCommentViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public NewsDetailCommentViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); commentTv.setOnClickListener(this); } } diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java index cba9a9c1cb..0a08f88a7f 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java @@ -32,13 +32,14 @@ public class SuggestPicAdapter extends BaseRecyclerAdapter { @Override public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { View view = mLayoutInflater.inflate(R.layout.suggest_pic_item, parent, false); - return new SuggestPicViewHolder(view, picList, mListListener); + return new SuggestPicViewHolder(view, mListListener); } @Override public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) { if (holder instanceof SuggestPicViewHolder) { SuggestPicViewHolder viewHolder = (SuggestPicViewHolder) holder; + viewHolder.setClickData(picList); if (position == getItemCount() - 1 && picList.size() < 5) { viewHolder.delate.setVisibility(View.GONE); ImageUtils.Companion.display(viewHolder.icon, R.drawable.suggest_add_pic_icon); diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicViewHolder.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicViewHolder.java index 1f48fb4ef0..8877feb832 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicViewHolder.java @@ -8,24 +8,22 @@ import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; import com.gh.gamecenter.R; +import java.util.List; + import butterknife.BindView; /** * Created by khy on 2017/3/31. */ -public class SuggestPicViewHolder extends BaseRecyclerViewHolder { +public class SuggestPicViewHolder extends BaseRecyclerViewHolder> { @BindView(R.id.pic_item_icon) public SimpleDraweeView icon; @BindView(R.id.pic_item_delate) public ImageView delate; - public SuggestPicViewHolder(View itemView) { - super(itemView); - } - - public SuggestPicViewHolder(View itemView, Object data, OnListClickListener listClickListener) { - super(itemView, data, listClickListener); + public SuggestPicViewHolder(View itemView, OnListClickListener listClickListener) { + super(itemView, listClickListener); itemView.setOnClickListener(this); } } diff --git a/app/src/main/res/drawable-hdpi/ic_edit.png b/app/src/main/res/drawable-hdpi/ic_edit.png deleted file mode 100644 index b0a9f368db..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_edit.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_edit.png b/app/src/main/res/drawable-xhdpi/ic_edit.png new file mode 100644 index 0000000000..5d5df072f0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_edit.png differ diff --git a/app/src/main/res/layout/activity_news_detail.xml b/app/src/main/res/layout/activity_news_detail.xml index 9cc9c0ac9d..0b01307b39 100644 --- a/app/src/main/res/layout/activity_news_detail.xml +++ b/app/src/main/res/layout/activity_news_detail.xml @@ -24,7 +24,7 @@ android:layout_alignParentBottom = "true" android:layout_marginTop = "-7dp" android:orientation = "vertical" - android:visibility = "gone" > + android:visibility = "visible" >