From b3d63c5698cbd1cc9e940587ae981eaac0835fa6 Mon Sep 17 00:00:00 2001 From: CsHeng Date: Fri, 16 Jun 2017 15:39:45 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A4=84=E7=90=86viewholder=202?= =?UTF-8?q?=E3=80=81=E5=A4=84=E7=90=86adapter=203=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/base/BaseActivity.java | 5 +- .../java/com/gh/base/BaseDetailActivity.java | 4 - .../main/java/com/gh/base/BaseFragment.java | 3 +- .../OnRequestCallBackListener.java} | 4 +- .../main/java/com/gh/base/SuggestionType.java | 96 +++++++-------- .../{ => adapter}/BaseRecyclerAdapter.java | 2 +- .../adapter/FragmentAdapter.java | 2 +- .../java/com/gh/common/util/CommentUtils.java | 40 +++---- .../java/com/gh/common/util/LibaoUtils.java | 113 +++++++++--------- .../com/gh/common/view/DownloadDialog.java | 2 +- .../java/com/gh/gamecenter/AboutActivity.java | 2 +- .../gh/gamecenter/ChooseReceiverActivity.java | 2 +- .../com/gh/gamecenter/CleanApkActivity.java | 4 +- .../gh/gamecenter/CommentDetailActivity.java | 2 +- .../com/gh/gamecenter/ConcernActivity.java | 2 +- .../com/gh/gamecenter/CropImageActivity.java | 2 +- .../gamecenter/DownloadManagerActivity.java | 4 +- .../gh/gamecenter/FileReceiverActivity.java | 2 +- .../com/gh/gamecenter/FileSenderActivity.java | 2 +- .../com/gh/gamecenter/GameDetailActivity.java | 4 +- .../com/gh/gamecenter/GameNewsActivity.java | 2 +- .../java/com/gh/gamecenter/KaiFuActivity.java | 2 +- .../gh/gamecenter/KcSelectGameActivity.java | 2 +- .../java/com/gh/gamecenter/LibaoActivity.java | 4 +- .../gh/gamecenter/LibaoDetailActivity.java | 20 ++-- .../gh/gamecenter/MessageDetailActivity.java | 9 +- .../com/gh/gamecenter/NewsDetailActivity.java | 2 +- .../com/gh/gamecenter/NewsSearchActivity.java | 2 +- .../com/gh/gamecenter/PluginActivity.java | 2 +- .../gamecenter/ReceiverWaitingActivity.java | 2 +- .../gh/gamecenter/SelectUserIconActivity.java | 2 +- .../com/gh/gamecenter/SettingActivity.java | 2 +- .../com/gh/gamecenter/ShareCardActivity.java | 2 +- .../gh/gamecenter/ShareCardPicActivity.java | 32 ++++- .../com/gh/gamecenter/ShareGhActivity.java | 3 +- .../gh/gamecenter/ShareGhWfifActivity.java | 2 +- .../com/gh/gamecenter/SubjectActivity.java | 2 +- .../gh/gamecenter/SuggestSelectActivity.java | 2 +- .../com/gh/gamecenter/SuggestionActivity.java | 2 +- .../com/gh/gamecenter/ToolBoxActivity.java | 2 +- .../java/com/gh/gamecenter/VoteActivity.java | 2 +- .../java/com/gh/gamecenter/WebActivity.java | 2 +- .../gamecenter/adapter/CleanApkAdapter.java | 23 ++-- .../adapter/CommentDetailAdapter.java | 2 +- .../gh/gamecenter/adapter/ConcernAdapter.java | 8 +- .../adapter/ConcernRecommendAdapter.java | 8 +- .../adapter/FileReceiverAdapter.java | 2 +- .../gamecenter/adapter/FileSenderAdapter.java | 2 +- .../gamecenter/adapter/GameNewsAdapter.java | 2 +- .../adapter/GameNewsTypeListAdapter.java | 9 +- .../gh/gamecenter/adapter/KaiFuAdapter.java | 28 ++--- .../adapter/KaiFuDialogAdapter.java | 11 +- .../adapter/KcSelectGameAdapter.java | 11 +- .../gamecenter/adapter/LiBaoCodeAdapter.java | 2 +- .../adapter/LibaoDetailAdapter.java | 33 +++-- .../adapter/MessageDetailAdapter.java | 70 +++-------- .../OnCollectionCallBackListener.java | 2 +- .../adapter/OnCommentCallBackListener.java | 7 ++ .../gamecenter/adapter/PlatformAdapter.java | 3 +- .../adapter/PlatformPagerAdapter.java | 1 - .../gh/gamecenter/adapter/PluginAdapter.java | 8 +- .../adapter/SubjectTypeAdapter.java | 2 +- .../gamecenter/adapter/ToolBoxRvAdapter.java | 8 +- .../gh/gamecenter/adapter/VoteAdapter.java | 10 +- .../viewholder/GameDetailGameViewHolder.java | 16 --- .../viewholder/GameNewsSearchViewHolder.java | 11 +- .../GameNewsTypeListViewHolder.java | 9 +- .../viewholder/GameNewsTypeViewHolder.java | 9 +- .../viewholder/GameTestViewHolder.java | 9 ++ .../viewholder/GameUpdateViewHolder.java | 22 ++-- .../adapter/viewholder/GameViewHolder.java | 4 +- .../viewholder/GameViewPagerViewHolder.java | 7 +- .../viewholder/KcSelectGameViewHolder.java | 6 +- .../viewholder/LiBaoCodeViewHolder.java | 11 +- .../viewholder/LibaoDetailTopViewHolder.java | 5 +- .../viewholder/LibaoNormalViewHolder.java | 6 +- .../viewholder/LibaoSearchViewHolder.java | 6 +- .../NewsDetailCommentListViewHolder.java | 7 +- .../viewholder/NewsDigestViewHolder.java | 6 +- .../viewholder/NewsFooterViewHolder.java | 6 +- .../viewholder/NewsHeadViewHolder.java | 6 +- .../viewholder/NewsImage1ViewHolder.java | 6 +- .../viewholder/NewsImage2ViewHolder.java | 6 +- .../viewholder/NewsImage3ViewHolder.java | 6 +- .../viewholder/NewsImageViewHolder.java | 6 +- .../viewholder/NewsTextViewHolder.java | 6 +- .../viewholder/NoDataSkipViewHolder.java | 24 ---- .../viewholder/PlatformViewHolder.java | 28 ++--- .../adapter/viewholder/ReuseViewHolder.java | 5 +- .../viewholder/SearchHistoryViewHolder.java | 12 +- .../viewholder/StrategyDialogViewHolder.java | 7 +- .../adapter/viewholder/ToolBoxViewHolder.java | 6 +- .../adapter/viewholder/VoteViewHolder.java | 7 +- .../download/GameDownloadFragmentAdapter.java | 2 +- .../download/GameUpdateFragmentAdapter.java | 2 +- .../com/gh/gamecenter/entity/LibaoEntity.java | 61 +++++++++- .../gh/gamecenter/entity/LibaoGameEntity.java | 33 ++++- .../gh/gamecenter/fragment/GameFragment.java | 4 +- .../gamecenter/game/GameFragmentAdapter.java | 6 +- .../gh/gamecenter/gamedetail/FuLiAdapter.java | 2 +- .../gamedetail/GameDetaiLibaoViewHolder.java | 26 ---- .../GameDetailCalenderViewHolder.java | 26 ---- .../gamedetail/GameDetailFuLiViewHolder.java | 45 ------- .../gamedetail/GameDetailGameTagAdapter.java | 2 +- .../GameDetailGameTagViewHolder.java | 23 ---- .../gamedetail/GameDetailGameViewHolder.java | 17 --- .../gamedetail/GameDetailIntroViewHolder.java | 24 ---- .../gamedetail/GameDetailKaiFuAdapter.java | 2 +- .../gamedetail/GameDetailKaiFuViewHolder.java | 47 -------- .../GameDetailNewsServerAdapter.java | 2 +- .../GameDetailNewsServerItemViewHolder.java | 29 ----- .../gamedetail/GameDetailNewsViewHolder.java | 31 ----- .../GameDetailNoticeViewHolder.java | 26 ---- .../gamedetail/GameDetailPluginAdapter.java | 2 +- .../gamedetail/GameDetailSkinViewHolder.java | 33 ----- .../gamedetail/GameDetailToolsAdapter.java | 2 +- .../gamedetail/GameGalleryAdapter.java | 2 +- .../gamedetail/GameLibaoGalleryAdapter.java | 18 ++- .../gamecenter/gamedetail/XinXiAdapter.java | 16 +-- .../gh/gamecenter/geetest/GeetestUtils.java | 3 +- .../gh/gamecenter/libao/Libao1Fragment.java | 6 +- .../libao/Libao1FragmentAdapter.java | 54 ++++----- .../libao/Libao2FragmentAdapter.java | 46 ++++--- .../gh/gamecenter/libao/Libao3Fragment.java | 4 +- .../libao/Libao3FragmentAdapter.java | 25 ++-- .../gamecenter/libao/LibaoHistoryAdapter.java | 6 +- .../message/CommentFragmentAdapter.java | 6 +- .../message/KeFuFragmentAdapter.java | 6 +- .../gamecenter/message/MessageFragment.java | 2 +- .../message/NoticeFragmentAdapter.java | 6 +- .../gamecenter/news/News1FragmentAdapter.java | 6 +- .../gamecenter/news/News2FragmentAdapter.java | 13 +- .../gamecenter/news/News3FragmentAdapter.java | 8 +- .../news/News3FragmentDialogAdapter.java | 2 +- .../gamecenter/news/News4FragmentAdapter.java | 6 +- .../com/gh/gamecenter/news/NewsFragment.java | 2 +- .../newsdetail/NewsDetailAdapter.java | 8 +- .../NewsDetailCommentViewHolder.java | 6 +- .../personal/ConcernFragmentAdapter.java | 2 +- .../personal/InstallFragmentAdapter.java | 2 +- .../search/SearchGameDetailFragment.java | 4 +- .../SearchGameDetailFragmentAdapter.java | 6 +- .../search/SearchGameListFragment.java | 4 +- .../search/SearchGameListFragmentAdapter.java | 6 +- .../search/SearchHistoryFragmentAdapter.java | 2 +- .../gh/gamecenter/subject/SubjectAdapter.java | 20 ++-- .../suggest/SelectGameViewHolder.java | 6 +- .../gamecenter/suggest/SuggestPicAdapter.java | 2 +- .../suggest/SuggestPicViewHolder.java | 6 +- .../suggest/SuggestSelectGameAdapter.java | 6 +- .../suggest/SuggestTypeAdapter.java | 2 +- .../suggest/SuggestTypeViewHolder.java | 6 +- 152 files changed, 666 insertions(+), 1022 deletions(-) rename app/src/main/java/com/gh/{listener/OnCallBackListener.java => base/OnRequestCallBackListener.java} (69%) rename app/src/main/java/com/gh/base/{ => adapter}/BaseRecyclerAdapter.java (96%) rename app/src/main/java/com/gh/{gamecenter => base}/adapter/FragmentAdapter.java (95%) rename app/src/main/java/com/gh/{listener => gamecenter/adapter}/OnCollectionCallBackListener.java (87%) create mode 100644 app/src/main/java/com/gh/gamecenter/adapter/OnCommentCallBackListener.java delete mode 100644 app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/adapter/viewholder/NoDataSkipViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetaiLibaoViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailCalenderViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFuLiViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailIntroViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerItemViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNoticeViewHolder.java delete mode 100644 app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 7c271d0677..345955aaea 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -22,7 +22,6 @@ import com.gh.common.util.ShareUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.R; import com.gh.gamecenter.eventbus.EBShowDialog; -import com.gh.listener.OnCallBackListener; import com.readystatesoftware.systembartint.SystemBarTintManager.SystemBarConfig; import org.greenrobot.eventbus.EventBus; @@ -36,7 +35,7 @@ import butterknife.ButterKnife; import static com.gh.common.util.EntranceUtils.KEY_DATA; import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE; -public abstract class BaseActivity extends BaseAppCompatToolBarActivity implements OnCallBackListener { +public abstract class BaseActivity extends BaseAppCompatToolBarActivity implements OnRequestCallBackListener { protected String mEntrance; private boolean mIsPause; @@ -84,7 +83,7 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen } } - protected void init(String title) { + protected void initTitle(String title) { TextView actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title); actionbar_tv_title.setText(title); // setNavigationTitle(title); diff --git a/app/src/main/java/com/gh/base/BaseDetailActivity.java b/app/src/main/java/com/gh/base/BaseDetailActivity.java index 64c42cf1b8..baf0e32e93 100644 --- a/app/src/main/java/com/gh/base/BaseDetailActivity.java +++ b/app/src/main/java/com/gh/base/BaseDetailActivity.java @@ -100,8 +100,6 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); -// View contentView = View.inflate(this, R.layout.activity_detail, null); - // 添加分享图标 iv_share = new ImageView(this); iv_share.setImageResource(R.drawable.ic_share); @@ -117,8 +115,6 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On R.id.reuse_actionbar); reuse_actionbar.addView(iv_share, params); -// init(contentView); - actionbar_tv_title = (TextView) findViewById(R.id.actionbar_tv_title); detail_rv_show = (RecyclerView) findViewById(R.id.detail_rv_show); detail_ll_bottom = (LinearLayout) findViewById(R.id.detail_ll_bottom); diff --git a/app/src/main/java/com/gh/base/BaseFragment.java b/app/src/main/java/com/gh/base/BaseFragment.java index de613b0a89..99d1f5f07b 100644 --- a/app/src/main/java/com/gh/base/BaseFragment.java +++ b/app/src/main/java/com/gh/base/BaseFragment.java @@ -11,7 +11,6 @@ import android.widget.Toast; import com.gh.common.util.EntranceUtils; import com.gh.common.util.RuntimeUtils; import com.gh.gamecenter.eventbus.EBMiPush; -import com.gh.listener.OnCallBackListener; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -23,7 +22,7 @@ import butterknife.ButterKnife; * Created by LGT on 2016/9/4. * Fragment 基类 */ -public abstract class BaseFragment extends Fragment implements OnCallBackListener { +public abstract class BaseFragment extends Fragment implements OnRequestCallBackListener { // TODO private view protected View view; diff --git a/app/src/main/java/com/gh/listener/OnCallBackListener.java b/app/src/main/java/com/gh/base/OnRequestCallBackListener.java similarity index 69% rename from app/src/main/java/com/gh/listener/OnCallBackListener.java rename to app/src/main/java/com/gh/base/OnRequestCallBackListener.java index 5ff6adeef5..3845b16a0e 100644 --- a/app/src/main/java/com/gh/listener/OnCallBackListener.java +++ b/app/src/main/java/com/gh/base/OnRequestCallBackListener.java @@ -1,9 +1,9 @@ -package com.gh.listener; +package com.gh.base; /** * Created by Administrator on 2016/9/8. */ -public interface OnCallBackListener { +public interface OnRequestCallBackListener { void loadDone(); diff --git a/app/src/main/java/com/gh/base/SuggestionType.java b/app/src/main/java/com/gh/base/SuggestionType.java index dc2a5bea63..73e3da0151 100644 --- a/app/src/main/java/com/gh/base/SuggestionType.java +++ b/app/src/main/java/com/gh/base/SuggestionType.java @@ -1,48 +1,48 @@ -package com.gh.base; - -import java.io.Serializable; - -public enum SuggestionType implements Serializable { - - FEEDBACK("普通反馈", 1), - SUGGESTION("功能建议", 2), - CRASH("发生闪退", 3), - GAME("游戏问题", 4), - COLLECT("游戏收录", 5), - POST("文章投稿", 6); - - private String mName; - private int mIndex; - - private SuggestionType(String name, int index) { - mName = name; - mIndex = index; - } - - public static String getName(int index) { - for (SuggestionType c : SuggestionType.values()) { - if (c.mIndex == index) { - return c.mName; - } - } - return ""; - } - - public static int getIndex(String name) { - for (SuggestionType c : SuggestionType.values()) { - if (c.mName == name) { - return c.mIndex; - } - } - return -1; - } - - public int getIndex() { - return mIndex; - } - - public String getName() { - return mName; - } - -} +//package com.gh.base; +// +//import java.io.Serializable; +// +//public enum SuggestionType implements Serializable { +// +// FEEDBACK("普通反馈", 1), +// SUGGESTION("功能建议", 2), +// CRASH("发生闪退", 3), +// GAME("游戏问题", 4), +// COLLECT("游戏收录", 5), +// POST("文章投稿", 6); +// +// private String mName; +// private int mIndex; +// +// private SuggestionType(String name, int index) { +// mName = name; +// mIndex = index; +// } +// +// public static String getName(int index) { +// for (SuggestionType c : SuggestionType.values()) { +// if (c.mIndex == index) { +// return c.mName; +// } +// } +// return ""; +// } +// +// public static int getIndex(String name) { +// for (SuggestionType c : SuggestionType.values()) { +// if (c.mName == name) { +// return c.mIndex; +// } +// } +// return -1; +// } +// +// public int getIndex() { +// return mIndex; +// } +// +// public String getName() { +// return mName; +// } +// +//} diff --git a/app/src/main/java/com/gh/base/BaseRecyclerAdapter.java b/app/src/main/java/com/gh/base/adapter/BaseRecyclerAdapter.java similarity index 96% rename from app/src/main/java/com/gh/base/BaseRecyclerAdapter.java rename to app/src/main/java/com/gh/base/adapter/BaseRecyclerAdapter.java index 7053e2722a..0014dcd1ce 100644 --- a/app/src/main/java/com/gh/base/BaseRecyclerAdapter.java +++ b/app/src/main/java/com/gh/base/adapter/BaseRecyclerAdapter.java @@ -1,4 +1,4 @@ -package com.gh.base; +package com.gh.base.adapter; import android.content.Context; import android.support.v7.widget.RecyclerView; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/FragmentAdapter.java b/app/src/main/java/com/gh/base/adapter/FragmentAdapter.java similarity index 95% rename from app/src/main/java/com/gh/gamecenter/adapter/FragmentAdapter.java rename to app/src/main/java/com/gh/base/adapter/FragmentAdapter.java index 1d42ceafe7..36faadf66e 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/FragmentAdapter.java +++ b/app/src/main/java/com/gh/base/adapter/FragmentAdapter.java @@ -1,4 +1,4 @@ -package com.gh.gamecenter.adapter; +package com.gh.base.adapter; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; diff --git a/app/src/main/java/com/gh/common/util/CommentUtils.java b/app/src/main/java/com/gh/common/util/CommentUtils.java index 451fd5aa34..a89b2e3275 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -5,9 +5,7 @@ import android.content.Context; import android.graphics.Color; import android.support.v4.content.ContextCompat; import android.text.TextUtils; -import android.view.Gravity; import android.view.View; -import android.view.ViewGroup; import android.view.Window; import android.widget.LinearLayout; import android.widget.TextView; @@ -15,7 +13,7 @@ import android.widget.TextView; import com.gh.gamecenter.CommentDetailActivity; import com.gh.gamecenter.MessageDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.MessageDetailAdapter; +import com.gh.gamecenter.adapter.OnCommentCallBackListener; import com.gh.gamecenter.db.CommentDao; import com.gh.gamecenter.entity.CommentEntity; @@ -65,17 +63,17 @@ public class CommentUtils { } } - public static void showReportDialog(final CommentEntity commentEntity, final Context mContext - , final MessageDetailAdapter.OnCommentCallBackListener mCallBackListener, final String newsId) { + public static void showReportDialog(final CommentEntity commentEntity, final Context context, + final OnCommentCallBackListener listener, final String newsId) { - CommentDao commentDao = new CommentDao(mContext); + CommentDao commentDao = new CommentDao(context); - final Dialog dialog = new Dialog(mContext); + final Dialog dialog = new Dialog(context); - LinearLayout container = new LinearLayout(mContext); + LinearLayout container = new LinearLayout(context); container.setOrientation(LinearLayout.VERTICAL); container.setBackgroundColor(Color.WHITE); - container.setPadding(0, DisplayUtils.dip2px(mContext, 12), 0, DisplayUtils.dip2px(mContext, 12)); + container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12)); List dialogType = new ArrayList<>(); @@ -91,16 +89,16 @@ public class CommentUtils { } for (String s : dialogType) { - final TextView reportTv = new TextView(mContext); + final TextView reportTv = new TextView(context); reportTv.setText(s); reportTv.setTextSize(17); - reportTv.setTextColor(ContextCompat.getColor(mContext, R.color.title)); + reportTv.setTextColor(ContextCompat.getColor(context, R.color.title)); reportTv.setBackgroundResource(R.drawable.textview_white_style); - int widthPixels = mContext.getResources().getDisplayMetrics().widthPixels; + int widthPixels = context.getResources().getDisplayMetrics().widthPixels; reportTv.setLayoutParams(new LinearLayout.LayoutParams((widthPixels * 9) / 10, LinearLayout.LayoutParams.WRAP_CONTENT)); - reportTv.setPadding(DisplayUtils.dip2px(mContext, 20), DisplayUtils.dip2px(mContext, 12), - 0, DisplayUtils.dip2px(mContext, 12)); + reportTv.setPadding(DisplayUtils.dip2px(context, 20), DisplayUtils.dip2px(context, 12), + 0, DisplayUtils.dip2px(context, 12)); container.addView(reportTv); reportTv.setOnClickListener(new View.OnClickListener() { @@ -109,23 +107,23 @@ public class CommentUtils { dialog.cancel(); switch (reportTv.getText().toString()) { case "回复": - if (mCallBackListener != null) { - mCallBackListener.showSoftInput(commentEntity); + if (listener != null) { + listener.onCommentCallback(commentEntity); } else if (!TextUtils.isEmpty(newsId)) { - mContext.startActivity(MessageDetailActivity.getMessageDetailIntent(mContext, commentEntity, newsId)); + context.startActivity(MessageDetailActivity.getMessageDetailIntent(context, commentEntity, newsId)); } else { - Utils.toast(mContext, "缺少关键属性"); + Utils.toast(context, "缺少关键属性"); } break; case "复制": - LibaoUtils.copyLink(commentEntity.getContent(), mContext); + LibaoUtils.copyLink(commentEntity.getContent(), context); break; case "举报": - showReportTypeDialog(commentEntity, mContext); + showReportTypeDialog(commentEntity, context); break; case "查看对话": - mContext.startActivity(CommentDetailActivity.getCommentDetailIntent(mContext, commentEntity.getId())); + context.startActivity(CommentDetailActivity.getCommentDetailIntent(context, commentEntity.getId())); break; } } diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java index 0bd9011558..24784bf6d7 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -1,6 +1,5 @@ package com.gh.common.util; -import android.app.Activity; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; @@ -215,7 +214,7 @@ public class LibaoUtils { }); } - public static void initLibaoBtn(final Activity activity, final TextView libaoBtn, final LibaoEntity libaoEntity, final LibaoDao libaoDao, + public static void initLibaoBtn(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity, final LibaoDao libaoDao, final boolean isInstallRequired, final LibaoDetailAdapter adapter, final String entrance) { libaoBtn.setTextColor(Color.WHITE); @@ -257,8 +256,7 @@ public class LibaoUtils { int[][] states2 = new int[2][]; states2[0] = new int[]{android.R.attr.state_pressed}; states2[1] = new int[]{}; - int[] colors2 = new int[]{Color.WHITE, - Color.parseColor("#ffb13c")}; + int[] colors2 = new int[]{Color.WHITE, Color.parseColor("#ffb13c")}; ColorStateList sl2 = new ColorStateList(states2, colors2); libaoBtn.setText("已淘号"); libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style); @@ -278,16 +276,16 @@ public class LibaoUtils { public void onClick(View v) { // 领取限制 if ("领取".equals(libaoBtn.getText().toString()) || "淘号".equals(libaoBtn.getText().toString())) { - if (isInstallRequired && !isAppInstalled(libaoBtn.getContext(), libaoEntity.getPackageName())) { + if (isInstallRequired && !isAppInstalled(context, libaoEntity.getPackageName())) { String platform; if (TextUtils.isEmpty(libaoEntity.getPlatform())) { platform = ""; } else { - platform = PlatformUtils.getInstance(libaoBtn.getContext()) + platform = PlatformUtils.getInstance(context) .getPlatformName(libaoEntity.getPlatform()) + "版"; } - DialogUtils.showWarningDialog(libaoBtn.getContext(), "条件不符", + DialogUtils.showWarningDialog(context, "条件不符", Html.fromHtml("请先" + "" + "安装《" + libaoEntity.getGame().getName() + "》 " + platform + ""), "关闭", "立即安装" @@ -303,17 +301,17 @@ public class LibaoUtils { switch (libaoBtn.getText().toString()) { case "未开始": - Utils.toast(libaoBtn.getContext(), "还没到开始领取时间"); + Utils.toast(context, "还没到开始领取时间"); break; case "查看": - Intent intent = LibaoDetailActivity.getLibaoDetailIntent(libaoEntity, libaoBtn, entrance); - libaoBtn.getContext().startActivity(intent); + Intent intent = LibaoDetailActivity.getIntent(context, libaoEntity, entrance); + context.startActivity(intent); break; case "领取": - libaoLing(activity, libaoBtn, libaoEntity, adapter, isInstallRequired, libaoDao, null, entrance); + libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, libaoDao, null, entrance); break; case "淘号": - postLibaoTao(libaoBtn.getContext(), libaoEntity.getId(), true, new PostLibaoListener() { + postLibaoTao(context, libaoEntity.getId(), true, new PostLibaoListener() { @Override public void postSucced(Object response) { @@ -330,11 +328,11 @@ public class LibaoUtils { try { String detail = responseBody.getString("detail"); if ("maintaining".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "网络状态异常，请稍后再试"); + Utils.toast(context, "网络状态异常，请稍后再试"); } else if ("fail to compete".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "淘号失败，稍后重试"); + Utils.toast(context, "淘号失败，稍后重试"); } else { - Utils.toast(libaoBtn.getContext(), "淘号异常"); + Utils.toast(context, "淘号异常"); } } catch (JSONException e) { e.printStackTrace(); @@ -342,13 +340,13 @@ public class LibaoUtils { return; } - Utils.toast(libaoBtn.getContext(), "淘号成功"); + Utils.toast(context, "淘号成功"); libaoEntity.setStatus("taoed"); LibaoInfo libaoInfo = LibaoInfo.createLibaoInfo(libaoEntity); libaoInfo.setCode(libaoCode); - libaoInfo.setTime(Utils.getTime(libaoBtn.getContext())); + libaoInfo.setTime(Utils.getTime(context)); libaoDao.add(libaoInfo); EventBus.getDefault().post(new EBReuse("libaoChanged")); @@ -357,20 +355,20 @@ public class LibaoUtils { adapter.notifyDataSetChanged(); final String finalLibaoCode = libaoCode; - DialogUtils.showWarningDialog(libaoBtn.getContext(), "淘号成功", Html.fromHtml("礼包码：" + DialogUtils.showWarningDialog(context, "淘号成功", Html.fromHtml("礼包码：" + "" + libaoCode + "" + "
淘号礼包不保证可用，请尽快进入游戏尝试兑换") , "关闭", " 复制礼包码" , new DialogUtils.ConfirmListener() { @Override public void onConfirm() { - copyLink(finalLibaoCode, libaoBtn.getContext()); + copyLink(finalLibaoCode, context); if (isInstallRequired) { libaoBtn.postDelayed(new Runnable() { @Override public void run() { - lunningAppDialog(libaoBtn.getContext() + lunningAppDialog(context , Html.fromHtml("礼包码：" + "" + finalLibaoCode + "" + " 复制成功" @@ -392,14 +390,14 @@ public class LibaoUtils { try { JSONObject errorJson = new JSONObject(exception.response().errorBody().string()); String detail = errorJson.getString("detail"); - Utils.toast(libaoBtn.getContext(), "返回::" + detail); + Utils.toast(context, "返回::" + detail); if ("coming".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "礼包领取时间未开始"); + Utils.toast(context, "礼包领取时间未开始"); } else if ("finish".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "礼包领取时间已结束"); + Utils.toast(context, "礼包领取时间已结束"); } else if ("fetched".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "你已领过这个礼包了"); - getCunHaoXiang(libaoBtn.getContext(), true); + Utils.toast(context, "你已领过这个礼包了"); + getCunHaoXiang(context, true); int[][] states2 = new int[2][]; states2[0] = new int[]{android.R.attr.state_pressed}; @@ -412,23 +410,23 @@ public class LibaoUtils { libaoBtn.setTextColor(sl2); libaoEntity.setStatus("taoed"); } else if ("try tao".equals(detail) || "used up".equals(detail)) { - DialogUtils.showHintDialog(libaoBtn.getContext(), "礼包已领光" + DialogUtils.showHintDialog(context, "礼包已领光" , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了"); } else if ("maintaining".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "网络状态异常，请稍后再试"); + Utils.toast(context, "网络状态异常，请稍后再试"); } else if ("fail to compete".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "淘号失败，稍后重试"); + Utils.toast(context, "淘号失败，稍后重试"); } else { - Utils.toast(libaoBtn.getContext(), "操作失败"); + Utils.toast(context, "操作失败"); } } catch (Exception ex) { ex.printStackTrace(); - Utils.toast(libaoBtn.getContext(), "礼包处理异常" + ex.toString()); + Utils.toast(context, "礼包处理异常" + ex.toString()); } return; } } - Utils.toast(libaoBtn.getContext(), "发生异常"); + Utils.toast(context, "发生异常"); } }); break; @@ -437,10 +435,14 @@ public class LibaoUtils { }); } - private static void libaoLing(final Activity activity, final TextView libaoBtn, final LibaoEntity libaoEntity, final LibaoDetailAdapter adapter, + private static void libaoLing(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity, final LibaoDetailAdapter adapter, final boolean isInstallRequired, final LibaoDao libaoDao, String captchaCode, final String entrance) { - postLibaoLing(libaoBtn.getContext(), libaoEntity.getId(), true, new PostLibaoListener() { + if (BuildConfig.DEBUG) { + Log.e("LIBAO", "context? " + context + libaoBtn.getContext()); + } + + postLibaoLing(context, libaoEntity.getId(), true, new PostLibaoListener() { @Override public void postSucced(Object response) { @@ -454,7 +456,7 @@ public class LibaoUtils { } if (TextUtils.isEmpty(libaoCode)) { - Utils.toast(libaoBtn.getContext(), "领取异常"); + Utils.toast(context, "领取异常"); return; } libaoEntity.setAvailable(libaoEntity.getAvailable() - 1); @@ -462,7 +464,7 @@ public class LibaoUtils { libaoEntity.setStatus("linged"); LibaoInfo libaoInfo = LibaoInfo.createLibaoInfo(libaoEntity); - libaoInfo.setTime(Utils.getTime(libaoBtn.getContext())); + libaoInfo.setTime(Utils.getTime(context)); libaoInfo.setCode(libaoCode); libaoDao.add(libaoInfo); @@ -472,19 +474,19 @@ public class LibaoUtils { adapter.notifyDataSetChanged(); final String finalLibaoCode = libaoCode; - DialogUtils.showWarningDialog(libaoBtn.getContext(), "领取成功", Html.fromHtml("礼包码：" + DialogUtils.showWarningDialog(context, "领取成功", Html.fromHtml("礼包码：" + "" + libaoCode + "" + "
请尽快使用，礼包码将于60分钟后进入淘号池") , "关闭", " 复制礼包码" , new DialogUtils.ConfirmListener() { @Override public void onConfirm() { - copyLink(finalLibaoCode, libaoBtn.getContext()); + copyLink(finalLibaoCode, context); if (isInstallRequired) { libaoBtn.postDelayed(new Runnable() { @Override public void run() { - lunningAppDialog(libaoBtn.getContext() + lunningAppDialog(context , Html.fromHtml("礼包码：" + "" + finalLibaoCode + "" + " 复制成功" + "
请尽快进入游戏兑换"), libaoEntity); @@ -508,11 +510,11 @@ public class LibaoUtils { String detail = errorJson.getString("detail"); if ("coming".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "礼包领取时间未开始"); + Utils.toast(context, "礼包领取时间未开始"); } else if ("finish".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "礼包领取时间已结束"); + Utils.toast(context, "礼包领取时间已结束"); } else if ("fetched".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "你已领过这个礼包了"); + Utils.toast(context, "你已领过这个礼包了"); int countdown = 0; if (errorJson.toString().contains("countdown")) { countdown = errorJson.getInt("countdown"); @@ -520,7 +522,7 @@ public class LibaoUtils { if (countdown > 0 && countdown < 60 * 10) { EventBus.getDefault().post(new EBUISwitch(REFRESH_LIBAO_TIME, countdown)); } else { - getCunHaoXiang(libaoBtn.getContext(), true); + getCunHaoXiang(context, true); } int[][] states = new int[2][]; @@ -535,38 +537,33 @@ public class LibaoUtils { libaoEntity.setStatus("linged"); } else if ("try tao".equals(detail) || "used up".equals(detail)) { - DialogUtils.showHintDialog(libaoBtn.getContext(), "礼包已领光" + DialogUtils.showHintDialog(context, "礼包已领光" , "手速不够快，礼包已经被抢光了，十分抱歉", "知道了"); libaoEntity.setStatus("used_up"); - initLibaoBtn(activity, libaoBtn, libaoEntity, libaoDao, isInstallRequired, adapter, entrance); + initLibaoBtn(context, libaoBtn, libaoEntity, libaoDao, isInstallRequired, adapter, entrance); } else if ("maintaining".equals(detail)) { - Utils.toast(libaoBtn.getContext(), "网络状态异常，请稍后再试"); + Utils.toast(context, "网络状态异常，请稍后再试"); } else { - Utils.toast(libaoBtn.getContext(), "操作失败"); + Utils.toast(context, "操作失败"); } } catch (Exception ex) { ex.printStackTrace(); - Utils.toast(libaoBtn.getContext(), "礼包处理异常"); + Utils.toast(context, "礼包处理异常"); } return; } else if (exception.code() == 412) { // 需要验证 - - if (BuildConfig.DEBUG) { - Log.e("LIBAO", "context? " + libaoBtn.getContext() + activity); - } - - GeetestUtils.getInstance().showDialog(activity, new GeetestListener() { + GeetestUtils.getInstance().showDialog(context, new GeetestListener() { @Override public void onVerified(String captcha) { - libaoLing(activity, libaoBtn, libaoEntity, adapter, isInstallRequired, libaoDao, captcha, entrance); + libaoLing(context, libaoBtn, libaoEntity, adapter, isInstallRequired, libaoDao, captcha, entrance); } }); return; } } - Utils.toast(libaoBtn.getContext(), "发生异常"); + Utils.toast(context, "发生异常"); } }, captchaCode); } @@ -612,8 +609,8 @@ public class LibaoUtils { // 合并List 和 List 并检查重复领取的礼包 - public static void initLiBaoEntity(LibaoDao libaoDao, List statusList - , List mLibaoList, Context mContext) { + public static void initLiBaoEntity(LibaoDao libaoDao, List statusList, + List libaoEntities, Context mContext) { for (LibaoInfo libaoInfo : libaoDao.getAll()) { for (LibaoStatusEntity libaoStatusEntity : statusList) { @@ -635,7 +632,7 @@ public class LibaoUtils { } } - for (LibaoEntity libaoEntity : mLibaoList) { + for (LibaoEntity libaoEntity : libaoEntities) { for (LibaoStatusEntity libaoStatusEntity : statusList) { if (libaoEntity.getId().equals(libaoStatusEntity.getId())) { libaoEntity.setAvailable(libaoStatusEntity.getAvailable()); diff --git a/app/src/main/java/com/gh/common/view/DownloadDialog.java b/app/src/main/java/com/gh/common/view/DownloadDialog.java index 6dcedf45fa..d8212b0b82 100644 --- a/app/src/main/java/com/gh/common/view/DownloadDialog.java +++ b/app/src/main/java/com/gh/common/view/DownloadDialog.java @@ -32,7 +32,7 @@ import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; -import com.gh.listener.OnCollectionCallBackListener; +import com.gh.gamecenter.adapter.OnCollectionCallBackListener; import com.gh.gamecenter.manager.PackageManager; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index ccde701edd..24e7ab5d53 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -38,7 +38,7 @@ public class AboutActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_about)); + initTitle(getString(R.string.title_about)); ((TextView) findViewById(R.id.about_tv_version)).setText("V" + PackageUtils.getVersionName(this)); diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java index b4545c33bb..b40fc36006 100644 --- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java @@ -147,7 +147,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_choose_activity)); + initTitle(getString(R.string.title_choose_activity)); mTitleTv.setTextColor(Color.WHITE); mBackIv.setImageResource(R.drawable.reuse_kc_back); diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java index 7e58482310..dabbf5270c 100644 --- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java @@ -68,11 +68,11 @@ public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.On @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_clean_apk)); + initTitle(getString(R.string.title_clean_apk)); mNodataSkipLl.setVisibility(View.GONE); - mAdapter = new CleanApkAdapter(this, mApkDeleteBtn, mApkSelectAll); + mAdapter = new CleanApkAdapter(this, this, mApkDeleteBtn, mApkSelectAll); mApkRv.setLayoutManager(new LinearLayoutManager(this)); mApkRv.addItemDecoration(new VerticalItemDecoration(this, 8, true)); mApkRv.setAdapter(mAdapter); diff --git a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java index 7a97fcc007..ae9a5c039e 100644 --- a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java @@ -37,7 +37,7 @@ public class CommentDetailActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_comment_detail)); + initTitle(getString(R.string.title_comment_detail)); String commentId = getIntent().getExtras().getString("commentId"); diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index e31a6c4439..a2c0e35f7c 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -52,7 +52,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_concern)); + initTitle(getString(R.string.title_concern)); concernManager = new ConcernManager(getApplicationContext()); diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index 0ab0e0efc9..10c2c4e984 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -73,7 +73,7 @@ public class CropImageActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_crop_image)); + initTitle(getString(R.string.title_crop_image)); sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index 5f0be0ed36..99119f8a98 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -17,7 +17,7 @@ import com.gh.base.BaseActivity; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.download.DownloadManager; -import com.gh.gamecenter.adapter.FragmentAdapter; +import com.gh.base.adapter.FragmentAdapter; import com.gh.gamecenter.download.FileSendFragment; import com.gh.gamecenter.download.GameDownLoadFragment; import com.gh.gamecenter.download.GameUpdateFragment; @@ -108,7 +108,7 @@ public class DownloadManagerActivity extends BaseActivity implements OnClickList protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_downloadmanager)); + initTitle(getString(R.string.title_downloadmanager)); downloadmanager_ll_download.setOnClickListener(this); downloadmanager_ll_update.setOnClickListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java index 58c18a4335..049c9d906f 100644 --- a/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileReceiverActivity.java @@ -252,7 +252,7 @@ public class FileReceiverActivity extends BaseActivity implements OnReceiverCanc @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_file_receive)); + initTitle(getString(R.string.title_file_receive)); isDestroy = false; diff --git a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java index ff515125d3..48c2d1bccf 100644 --- a/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java +++ b/app/src/main/java/com/gh/gamecenter/FileSenderActivity.java @@ -161,7 +161,7 @@ public class FileSenderActivity extends BaseActivity implements FileSenderAdapte @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_file_sender)); + initTitle(getString(R.string.title_file_sender)); mFileInfos = (List) AppController.get("FileInfo", false); diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index b1aba40f95..d935c354cc 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -39,7 +39,7 @@ import com.gh.common.view.NoScrollableViewPager; import com.gh.download.DataWatcher; import com.gh.download.DownloadEntity; import com.gh.download.DownloadManager; -import com.gh.gamecenter.adapter.FragmentAdapter; +import com.gh.base.adapter.FragmentAdapter; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameDetailEntity; import com.gh.gamecenter.entity.GameEntity; @@ -186,7 +186,7 @@ public class GameDetailActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(""); + initTitle(""); mViewPager.setScrollable(true); diff --git a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java index 77aa27739c..a8f2545060 100644 --- a/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameNewsActivity.java @@ -85,7 +85,7 @@ public class GameNewsActivity extends BaseActivity implements View.OnClickListen ivSearch.setVisibility(View.GONE); String gameName = getIntent().getStringExtra("gameName"); - init(gameName); + initTitle(gameName); mNoDataTv.setText("暂无内容"); diff --git a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java index 599679c686..0dca49b2fc 100644 --- a/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KaiFuActivity.java @@ -109,7 +109,7 @@ public class KaiFuActivity extends BaseActivity implements KaiFuDialogAdapter.On @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_kaifu)); + initTitle(getString(R.string.title_kaifu)); kaifuType = "全部"; diff --git a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java index 92a729564d..6910e59311 100644 --- a/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java +++ b/app/src/main/java/com/gh/gamecenter/KcSelectGameActivity.java @@ -69,7 +69,7 @@ public class KcSelectGameActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_select_game)); + initTitle(getString(R.string.title_select_game)); if (getIntent() != null && getIntent().getExtras() != null) { mIsConn = getIntent().getExtras().getBoolean("isConn"); diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index 56186e41a6..8392e676ef 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.gh.base.BaseActivity; import com.gh.common.util.DisplayUtils; import com.gh.common.view.NoScrollableViewPager; -import com.gh.gamecenter.adapter.FragmentAdapter; +import com.gh.base.adapter.FragmentAdapter; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.libao.Libao1Fragment; @@ -64,7 +64,7 @@ public class LibaoActivity extends BaseActivity implements View.OnClickListener, @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init("礼包中心"); + initTitle("礼包中心"); mZuixinTv.setSelected(true); diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 9deb94a8d8..c672968cfa 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -1,5 +1,6 @@ package com.gh.gamecenter; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; @@ -8,9 +9,7 @@ import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; import android.text.TextUtils; import android.view.View; -import android.widget.TextView; -import com.gh.base.AppController; import com.gh.base.BaseDetailActivity; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.EntranceUtils; @@ -76,17 +75,17 @@ public class LibaoDetailActivity extends BaseDetailActivity implements LibaoDeta }; @NonNull - public static Intent getLibaoDetailIntent(LibaoEntity libaoEntity, TextView libaoBtn, String entrance) { - AppController.put("libaoEntity", libaoEntity); - Intent intent = new Intent(libaoBtn.getContext(), LibaoDetailActivity.class); + public static Intent getIntent(Context context, LibaoEntity libaoEntity, String entrance) { + Intent intent = new Intent(context, LibaoDetailActivity.class); intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); + intent.putExtra(LibaoDetailActivity.class.getSimpleName(), libaoEntity); return intent; } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - AppController.put("libaoEntity", mAdapter.getLibaoEntity()); + outState.putParcelable(LibaoDetailActivity.class.getSimpleName(), mAdapter.getLibaoEntity()); } @Override @@ -94,15 +93,18 @@ public class LibaoDetailActivity extends BaseDetailActivity implements LibaoDeta super.onCreate(savedInstanceState); actionbar_tv_title.setText("礼包详情"); - mLibaoEntity = (LibaoEntity) AppController.get("libaoEntity", true); + if (savedInstanceState != null) { + mLibaoEntity = savedInstanceState.getParcelable(LibaoDetailActivity.class.getSimpleName()); + } else { + mLibaoEntity = getIntent().getParcelableExtra(LibaoDetailActivity.class.getSimpleName()); + } name = "礼包详情"; iv_share.setVisibility(View.GONE); mIsScroll = true; - mAdapter = new LibaoDetailAdapter(this, this, this, - mLibaoEntity, detail_tv_download, mEntrance); + mAdapter = new LibaoDetailAdapter(this, this, this, mLibaoEntity, detail_tv_download, mEntrance); detail_rv_show.setLayoutManager(new LinearLayoutManager(this) { @Override public boolean canScrollVertically() { diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index a862856424..dcaaf4d836 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -34,6 +34,7 @@ import com.gh.common.util.TimestampUtils; import com.gh.common.util.TokenUtils; import com.gh.common.util.Utils; import com.gh.gamecenter.adapter.MessageDetailAdapter; +import com.gh.gamecenter.adapter.OnCommentCallBackListener; import com.gh.gamecenter.db.CommentDao; import com.gh.gamecenter.db.info.CommentInfo; import com.gh.gamecenter.entity.CommentEntity; @@ -63,7 +64,7 @@ import rx.schedulers.Schedulers; * Created by khy on 2016/11/8. * 消息详情界面 */ -public class MessageDetailActivity extends BaseActivity implements MessageDetailAdapter.OnCommentCallBackListener { +public class MessageDetailActivity extends BaseActivity implements OnCommentCallBackListener { @BindView(R.id.message_detail_rv) RecyclerView mMessageDetailRv; @@ -169,13 +170,13 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail mConcernEntity = null; } - init(getString(R.string.title_message_detail)); + initTitle(getString(R.string.title_message_detail)); sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); mCommentDao = new CommentDao(this); - adapter = new MessageDetailAdapter(this, mCommentDao, mMessageDetailRv, mConcernEntity, mEntrance); + adapter = new MessageDetailAdapter(this, this, mCommentDao, mMessageDetailRv, mConcernEntity, mEntrance); mLayoutManager = new LinearLayoutManager(this); mMessageDetailRv.setLayoutManager(mLayoutManager); mMessageDetailRv.setAdapter(adapter); @@ -538,7 +539,7 @@ public class MessageDetailActivity extends BaseActivity implements MessageDetail } @Override - public void showSoftInput(CommentEntity entity) { + public void onCommentCallback(CommentEntity entity) { mCommentEntity = entity; setSoftInput(true); } diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index d05b1c4b06..2f87698189 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -207,7 +207,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(""); + initTitle(""); // 添加分享图标 iv_share = new ImageView(this); diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index e3ce0863cf..da10a1a96b 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -88,7 +88,7 @@ public class NewsSearchActivity extends BaseActivity { searchKey = intent.getExtras().getString("searchKey"); gameId = intent.getExtras().getString("gameId"); - init(gameName); + initTitle(gameName); DisplayMetrics outMetrics = new DisplayMetrics(); getWindowManager().getDefaultDisplay().getMetrics(outMetrics); diff --git a/app/src/main/java/com/gh/gamecenter/PluginActivity.java b/app/src/main/java/com/gh/gamecenter/PluginActivity.java index 439b10a4e1..ec582e4b7e 100644 --- a/app/src/main/java/com/gh/gamecenter/PluginActivity.java +++ b/app/src/main/java/com/gh/gamecenter/PluginActivity.java @@ -72,7 +72,7 @@ public class PluginActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_plugin)); + initTitle(getString(R.string.title_plugin)); reuse_no_connection.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java index 2254bfadf8..0f809433b0 100644 --- a/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ReceiverWaitingActivity.java @@ -119,7 +119,7 @@ public class ReceiverWaitingActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_receive_waiting)); + initTitle(getString(R.string.title_receive_waiting)); mTitleTv.setTextColor(Color.WHITE); mBackIv.setImageResource(R.drawable.reuse_kc_back); diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java index a1d328b4ce..e1c4cb78be 100644 --- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java @@ -80,7 +80,7 @@ public class SelectUserIconActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_select_user_icon)); + initTitle(getString(R.string.title_select_user_icon)); sp = getSharedPreferences(Config.PREFERENCE, Context.MODE_PRIVATE); diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.java b/app/src/main/java/com/gh/gamecenter/SettingActivity.java index 68a08e89a9..9b24c26396 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.java @@ -80,7 +80,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_settings)); + initTitle(getString(R.string.title_settings)); setting_tv_cache.setText(getCacheSize()); diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java index 74965fd743..cd0063db77 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardActivity.java @@ -78,7 +78,7 @@ public class ShareCardActivity extends BaseActivity { picName = "shareImg.jpg"; - init(getString(R.string.title_share_card)); + initTitle(getString(R.string.title_share_card)); //修改沉浸栏以及ActionBar 颜色 mActionbar.setBackgroundColor(ContextCompat.getColor(getApplicationContext(), android.R.color.black)); diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index af6df1b05c..d41a24b9e5 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -1,5 +1,6 @@ package com.gh.gamecenter; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -22,9 +23,12 @@ import com.facebook.drawee.interfaces.DraweeController; import com.facebook.drawee.view.SimpleDraweeView; import com.facebook.imagepipeline.image.ImageInfo; import com.gh.base.BaseActivity; +import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.MessageShareUtils; import com.gh.common.util.QRCodeUtils; +import com.gh.common.util.StringUtils; +import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.retrofit.ObservableUtil; import com.readystatesoftware.systembartint.SystemBarTintManager; import com.tencent.tauth.Tencent; @@ -33,6 +37,7 @@ import java.io.File; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; +import java.util.ArrayList; import java.util.List; import java.util.Vector; import java.util.concurrent.CountDownLatch; @@ -81,6 +86,31 @@ public class ShareCardPicActivity extends BaseActivity { private String newsId; + public static void startShareCardPicActivity(Context context, ConcernEntity concernEntity, String entrance) { + + final String shareContent; + if (concernEntity.getBrief() != null) { + shareContent = concernEntity.getBrief(); + } else { + shareContent = concernEntity.getContent(); + } + + Intent intent = new Intent(context, ShareCardPicActivity.class); + Bundle bundle = new Bundle(); + bundle.putString("gameName", concernEntity.getGameName()); + bundle.putString("gameIconUrl", concernEntity.getGameIcon()); + bundle.putString("shareContent", shareContent); + if (concernEntity.getLink() == null) { + bundle.putString("newsId", concernEntity.getId()); + } + if (concernEntity.getImg() != null && concernEntity.getImg().size() > 0) { + bundle.putStringArrayList("shareArrImg", (ArrayList) concernEntity.getImg()); + } + intent.putExtras(bundle); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(entrance, "+(消息详情[", concernEntity.getGameName(), "])")); + context.startActivity(intent); + } + @Override protected int getLayoutId() { return R.layout.activity_sharecard_pic; @@ -110,7 +140,7 @@ public class ShareCardPicActivity extends BaseActivity { picName = "shareImgPic.jpg"; currentImgPosition = 0; - init(getString(R.string.title_share_card_pic)); + initTitle(getString(R.string.title_share_card_pic)); shareArrImg = new Vector<>(); shareArrImg.addAll(arrImg); diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index fb88647426..7f4605d819 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -3,7 +3,6 @@ package com.gh.gamecenter; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; -import android.graphics.BitmapFactory; import android.os.Bundle; import android.text.Html; import android.widget.Button; @@ -56,7 +55,7 @@ public class ShareGhActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_share_gh)); + initTitle(getString(R.string.title_share_gh)); ButterKnife.bind(this); mGhAddress.setText(Html.fromHtml("" + "www.ghzhushou.com" + "")); diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java index 94853d51aa..395f4bac36 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java @@ -135,7 +135,7 @@ public class ShareGhWfifActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_share_via_wifi)); + initTitle(getString(R.string.title_share_via_wifi)); ButterKnife.bind(this); mUriHandlers = new ArrayList<>(); diff --git a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java index fceaacbd08..d8ba806841 100644 --- a/app/src/main/java/com/gh/gamecenter/SubjectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SubjectActivity.java @@ -86,7 +86,7 @@ public class SubjectActivity extends BaseActivity { mId = mBundle.getString("id"); mName = mBundle.getString("name"); - init(mName); + initTitle(mName); if (TextUtils.isEmpty(mName) && !TextUtils.isEmpty(mId)) { getSubjectName(mId); diff --git a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java index 184fad0fb8..72461b69a7 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java @@ -30,7 +30,7 @@ public class SuggestSelectActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_suggest_select)); + initTitle(getString(R.string.title_suggest_select)); } @OnClick({R.id.suggest_type1, R.id.suggest_type2, R.id.suggest_type3, R.id.suggest_type4, diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 7f1bd70f05..ea045d89a0 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -167,7 +167,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init(getString(R.string.title_suggestion)); + initTitle(getString(R.string.title_suggestion)); curType = getIntent().getExtras().getInt("suggestType"); String suggestContent = getIntent().getExtras().getString("content"); diff --git a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java index 607ddd043c..f80fac7dec 100644 --- a/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ToolBoxActivity.java @@ -60,7 +60,7 @@ public class ToolBoxActivity extends BaseActivity implements SwipeRefreshLayout. @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - init("光环工具箱"); + initTitle("光环工具箱"); mRefresh.setColorSchemeResources(R.color.theme); mRefresh.setOnRefreshListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 3c4cf950ac..96083d778f 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -90,7 +90,7 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR mVoteDao = new VersionVoteDao(this); - init(getString(R.string.title_vote_formatable, gameName)); + initTitle(getString(R.string.title_vote_formatable, gameName)); layoutManager = new LinearLayoutManager(this); mVoteRv.setLayoutManager(layoutManager); diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java index 63c0a7a8a7..41697461cd 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -121,7 +121,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{ } - init(webTitle); + initTitle(webTitle); webView.loadUrl(webUrl); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java index ee94d376c3..191f3d0c06 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -1,12 +1,12 @@ package com.gh.gamecenter.adapter; +import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Environment; -import android.os.Handler; import android.support.v4.content.ContextCompat; import android.support.v4.util.ArrayMap; import android.view.View; @@ -14,14 +14,15 @@ import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.TextView; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.BitmapUtils; import com.gh.common.util.PackageUtils; +import com.gh.common.util.RuntimeUtils; import com.gh.common.util.StringUtils; -import com.gh.gamecenter.CleanApkActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.KcSelectGameViewHolder; import com.gh.gamecenter.entity.InstallGameEntity; +import com.gh.gamecenter.retrofit.Response; import java.io.File; import java.text.DecimalFormat; @@ -29,7 +30,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; -import com.gh.gamecenter.retrofit.Response; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; @@ -52,15 +52,12 @@ public class CleanApkAdapter extends BaseRecyclerAdapter private boolean mIsScanOver; - private Handler mHandler = new Handler(); + public CleanApkAdapter(Context context, OnScanListener listener, TextView apkDeleteBtn, CheckBox apkSelectAll) { + super(context); + mApkDeleteBtn = apkDeleteBtn; + mApkSelectAll = apkSelectAll; - public CleanApkAdapter(CleanApkActivity activity, TextView apkDeleteBtn, CheckBox apkSelectAll) { - super(activity); - this.mContext = activity; - this.mApkDeleteBtn = apkDeleteBtn; - this.mApkSelectAll = apkSelectAll; - - mScanListener = activity; + mScanListener = listener; mApkList = new ArrayList<>(); mSelectPosition = new ArrayMap<>(); @@ -137,7 +134,7 @@ public class CleanApkAdapter extends BaseRecyclerAdapter mApkList.add(apkEntity); mSelectPosition.put((mApkList.size() - 1), false); - mHandler.post(new Runnable() { + RuntimeUtils.getInstance().runOnUiThread(new Runnable() { @Override public void run() { notifyItemChanged((mApkList.size() - 1)); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java index 51ba305969..1afee4c8ca 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -9,7 +9,7 @@ import android.support.v7.widget.RecyclerView.ViewHolder; import android.view.View; import android.view.ViewGroup; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.constant.Config; import com.gh.common.constant.ItemViewType; import com.gh.common.util.CommentUtils; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java index 8b783e6ca2..591ecdd559 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -4,7 +4,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; @@ -17,7 +17,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.GameEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -38,7 +38,7 @@ import rx.schedulers.Schedulers; */ public class ConcernAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mListener; + private OnRequestCallBackListener mListener; private List mConcernList; private List mConcernGameList; @@ -47,7 +47,7 @@ public class ConcernAdapter extends BaseRecyclerAdapter { private String mEntrance; - public ConcernAdapter(ConcernActivity context, OnCallBackListener listener, String entrance) { + public ConcernAdapter(ConcernActivity context, OnRequestCallBackListener listener, String entrance) { super(context); mListener = listener; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java index a82a839895..78ea0537be 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java @@ -5,7 +5,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.ApkActiveUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; @@ -16,7 +16,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.ConcernViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.GameEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -35,7 +35,7 @@ import rx.schedulers.Schedulers; */ public class ConcernRecommendAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mListener; + private OnRequestCallBackListener mListener; private List mGameList; private List mRecommendGameList; @@ -46,7 +46,7 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter { private List mTypeList; - private String mNewsType; - private int mCurrentPosition; - public GameNewsTypeListAdapter(Context context, List tList, String type) { super(context); - mTypeList = tList; - mNewsType = type; - mCurrentPosition = 0; } @Override @@ -79,7 +73,6 @@ public class GameNewsTypeListAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mOnCallBackListener; + private OnRequestCallBackListener mOnRequestCallBackListener; private OnScrollToKaiFuIndexListener mOnScrollToKaiFuIndexListener; private List mSubjectList; @@ -76,10 +76,10 @@ public class KaiFuAdapter extends BaseRecyclerAdapter { private boolean mIsLoadedBottom; private boolean mIsLoadedTop; - public KaiFuAdapter(KaiFuActivity context, OnCallBackListener callBackListener, + public KaiFuAdapter(KaiFuActivity context, OnRequestCallBackListener callBackListener, OnScrollToKaiFuIndexListener scrollToKaiFuIndexListener, String kaifuType) { super(context); - mOnCallBackListener = callBackListener; + mOnRequestCallBackListener = callBackListener; mKaifuType = kaifuType; mOnScrollToKaiFuIndexListener = scrollToKaiFuIndexListener; @@ -118,14 +118,14 @@ public class KaiFuAdapter extends BaseRecyclerAdapter { e.printStackTrace(); } mInitOffset = offset; - mOnCallBackListener.loadDone(offset); + mOnRequestCallBackListener.loadDone(offset); initListBottom(offset); } @Override public void onFailure(HttpException e) { super.onFailure(e); - mOnCallBackListener.loadError(); + mOnRequestCallBackListener.loadError(); } }); @@ -196,8 +196,8 @@ public class KaiFuAdapter extends BaseRecyclerAdapter { @Override public void onFailure(HttpException e) { if (offset == mInitOffset) { - if (mOnCallBackListener != null) { - mOnCallBackListener.loadError(); + if (mOnRequestCallBackListener != null) { + mOnRequestCallBackListener.loadError(); } } else { Toast.makeText(mContext, "加载失败，请检查网络状态", Toast.LENGTH_SHORT).show(); @@ -336,11 +336,11 @@ public class KaiFuAdapter extends BaseRecyclerAdapter { initLocationMap(); - if (mOnCallBackListener != null) { + if (mOnRequestCallBackListener != null) { if (mSubjectList.size() == 0) { - mOnCallBackListener.loadEmpty(); + mOnRequestCallBackListener.loadEmpty(); } else { - mOnCallBackListener.loadDone(); + mOnRequestCallBackListener.loadDone(); } } @@ -354,8 +354,8 @@ public class KaiFuAdapter extends BaseRecyclerAdapter { @Override public void onFailure(HttpException e) { if (offset == mInitOffset) { - if (mOnCallBackListener != null) { - mOnCallBackListener.loadError(); + if (mOnRequestCallBackListener != null) { + mOnRequestCallBackListener.loadError(); } } else { Toast.makeText(mContext, "加载失败，请检查网络状态", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KaiFuDialogAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KaiFuDialogAdapter.java index 84806012cb..001556bad9 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KaiFuDialogAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KaiFuDialogAdapter.java @@ -11,9 +11,10 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; +import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; import com.gh.gamecenter.adapter.viewholder.StrategyDialogViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.manager.ConcernManager; @@ -57,7 +58,7 @@ public class KaiFuDialogAdapter extends BaseRecyclerAdapter { textView.setText("以下是已关注的游戏"); textView.setBackgroundColor(Color.parseColor("#ededed")); textView.setGravity(Gravity.CENTER); - return new TitleViewHolder(textView); + return new ReuseViewHolder(textView); } else { View view = mLayoutInflater.inflate(R.layout.dialog_strategy_item, parent, false); return new StrategyDialogViewHolder(view); @@ -119,10 +120,4 @@ public class KaiFuDialogAdapter extends BaseRecyclerAdapter { void selectPosition(int position, String tag, String gameName); } - public class TitleViewHolder extends RecyclerView.ViewHolder { - - public TitleViewHolder(View itemView) { - super(itemView); - } - } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java index be33cb6b56..6c3fb98c0f 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java @@ -19,7 +19,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.gh.base.AppController; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.constant.ItemViewType; import com.gh.common.util.BitmapUtils; import com.gh.common.util.DisplayUtils; @@ -28,6 +28,7 @@ import com.gh.common.util.Utils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.KcSelectGameViewHolder; +import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.InstallGameEntity; import com.gh.gamecenter.kuaichuan.FileInfo; @@ -184,7 +185,7 @@ public class KcSelectGameAdapter extends BaseRecyclerAdapter { textView.setTextColor(ContextCompat.getColor(mContext, R.color.title)); textView.setBackgroundColor(Color.WHITE); textView.setText("已安装的应用（" + mApkList.size() + "）"); - return new TitleViewHolder(textView); + return new ReuseViewHolder(textView); } return null; } @@ -399,10 +400,4 @@ public class KcSelectGameAdapter extends BaseRecyclerAdapter { return mApkList.size(); } - public class TitleViewHolder extends RecyclerView.ViewHolder { - - public TitleViewHolder(View itemView) { - super(itemView); - } - } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java index 3bee5eed88..5574c8d111 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java @@ -6,7 +6,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.LibaoUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.R; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index 729e4c7a15..4bf90b7d15 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -1,6 +1,5 @@ package com.gh.gamecenter.adapter; -import android.app.Activity; import android.content.Context; import android.graphics.Color; import android.support.v7.widget.LinearLayoutManager; @@ -15,7 +14,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.OnRequestCallBackListener; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.DisplayUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; @@ -24,14 +24,13 @@ import com.gh.common.util.StringUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; +import com.gh.gamecenter.adapter.viewholder.GameDetailNewsViewHolder; import com.gh.gamecenter.adapter.viewholder.LibaoDetailTopViewHolder; import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.db.info.LibaoInfo; import com.gh.gamecenter.entity.LibaoDetailEntity; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; -import com.gh.gamecenter.adapter.viewholder.GameDetailNewsViewHolder; -import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -47,7 +46,7 @@ import rx.schedulers.Schedulers; */ public class LibaoDetailAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mOnCallBackListener; + private OnRequestCallBackListener mOnRequestCallBackListener; private OnCodeScrollListener mOnCodeScrollListener; private TextView mDownloadTv; @@ -61,11 +60,11 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { private String mEntrance; - public LibaoDetailAdapter(Context context, OnCallBackListener onCallBackListener, + public LibaoDetailAdapter(Context context, OnRequestCallBackListener onRequestCallBackListener, OnCodeScrollListener onCodeScrollListener, LibaoEntity libaoEntity, TextView tvDownload, String entrance) { super(context); - mOnCallBackListener = onCallBackListener; + mOnRequestCallBackListener = onRequestCallBackListener; mOnCodeScrollListener = onCodeScrollListener; mLibaoEntity = libaoEntity; mDownloadTv = tvDownload; @@ -84,13 +83,13 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { @Override public void onResponse(LibaoDetailEntity response) { mLibaoDetailEntity = response; - mOnCallBackListener.loadDone(); + mOnRequestCallBackListener.loadDone(); notifyDataSetChanged(); } @Override public void onFailure(HttpException e) { - mOnCallBackListener.loadEmpty(); + mOnRequestCallBackListener.loadEmpty(); } }); } @@ -194,11 +193,9 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { } if (libaoInfo.getLibaoId().equals(mLibaoEntity.getId())) { - if (mContext instanceof Activity) { - LibaoUtils.initLibaoBtn((Activity) mContext, holder.libaoCopyBtn, mLibaoEntity, mLibaoDao, - mLibaoDetailEntity.getInstallRequired(), this, - StringUtils.buildString(mEntrance, "+(礼包详情[", mLibaoEntity.getName(), "])")); - } + LibaoUtils.initLibaoBtn(mContext, holder.libaoCopyBtn, mLibaoEntity, mLibaoDao, + mLibaoDetailEntity.getInstallRequired(), this, + StringUtils.buildString(mEntrance, "+(礼包详情[", mLibaoEntity.getName(), "])")); // holder.libaoCopyBtn.setBackgroundResource(R.drawable.textview_blue_style); // holder.libaoCopyBtn.setTextColor(Color.WHITE); @@ -271,11 +268,9 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { holder.libaoDes.setText(content); if (mLibaoEntity.getStatus() != null && mLibaoDetailEntity != null) { - if (mContext instanceof Activity) { - LibaoUtils.initLibaoBtn((Activity) mContext, holder.libaoCopyBtn, mLibaoEntity, mLibaoDao, - mLibaoDetailEntity.getInstallRequired(), this, - StringUtils.buildString(mEntrance, "+(礼包详情[", mLibaoEntity.getName(), "])")); - } + LibaoUtils.initLibaoBtn(mContext, holder.libaoCopyBtn, mLibaoEntity, mLibaoDao, + mLibaoDetailEntity.getInstallRequired(), this, + StringUtils.buildString(mEntrance, "+(礼包详情[", mLibaoEntity.getName(), "])")); } // 判断按钮状态是否为空(礼包详情进入)，重新获取 diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index da3be2d99d..491646d0cd 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; -import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; @@ -14,7 +13,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.constant.Config; import com.gh.common.util.CommentUtils; import com.gh.common.util.ConcernContentUtils; @@ -31,7 +30,6 @@ import com.gh.common.util.Utils; import com.gh.gamecenter.MessageDetailActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.ShareCardActivity; import com.gh.gamecenter.ShareCardPicActivity; import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.adapter.viewholder.CommentHeadViewHolder; @@ -78,7 +76,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { boolean isGetRvHeight = true; // 防止评论时弹出软键盘 影响RecyclerView高度 int rvHeight; private ConcernEntity mConcernEntity; - private OnCommentCallBackListener mCallBackListener; + private OnCommentCallBackListener mOnCommentCallBackListener; private RecyclerView mRecyclerView; private List mHotCommentList; private List mNormalCommentList; @@ -87,18 +85,18 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { private SharedPreferences sp; private String userName; //用户名 private String userIcon; //用户icon - private String entrance; + private String mEntrance; private boolean isOver; private boolean isLoading; private boolean isNetworkError; private boolean isRefreshPosition; - public MessageDetailAdapter(MessageDetailActivity context, CommentDao commentDao, RecyclerView messageDetailRv, - ConcernEntity concernEntity, String entrance) { + public MessageDetailAdapter(MessageDetailActivity context, OnCommentCallBackListener listener, CommentDao commentDao, + RecyclerView messageDetailRv, ConcernEntity concernEntity, String entrance) { super(context); - this.mRecyclerView = messageDetailRv; - this.entrance = entrance; - mCallBackListener = context; + mRecyclerView = messageDetailRv; + mEntrance = entrance; + mOnCommentCallBackListener = listener; mVoteDao = new VoteDao(context); mCommentDao = commentDao; @@ -123,7 +121,9 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { } else if (mConcernEntity != null) { isOver = true; notifyItemChanged(getItemCount() - 1); - mCallBackListener.showSoftInput(null); + if (mOnCommentCallBackListener != null) { + mOnCommentCallBackListener.onCommentCallback(null); + } } } @@ -291,7 +291,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { viewHolder.imgLayout.setVisibility(View.VISIBLE); viewHolder.imgLayout.removeAllViews(); ConcernContentUtils.addContentPic(mContext, viewHolder.imgLayout, mConcernEntity.getImg(), - StringUtils.buildString(entrance, "+(消息详情[", mConcernEntity.getGameName(), "])"), + StringUtils.buildString(mEntrance, "+(消息详情[", mConcernEntity.getGameName(), "])"), mContext.getResources().getDisplayMetrics().widthPixels - DisplayUtils.dip2px(mContext, 34)); } @@ -303,38 +303,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { viewHolder.share.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - String shareContent; - if (mConcernEntity.getBrief() != null) { - shareContent = mConcernEntity.getBrief(); - } else { - shareContent = mConcernEntity.getContent(); - } - if (mConcernEntity.getImg() != null && mConcernEntity.getImg().size() > 0) { - Intent intent = new Intent(mContext, ShareCardPicActivity.class); - Bundle bundle = new Bundle(); - bundle.putString("gameName", mConcernEntity.getGameName()); - bundle.putString("gameIconUrl", mConcernEntity.getGameIcon()); - bundle.putString("shareContent", shareContent); - if (mConcernEntity.getLink() == null) { - bundle.putString("newsId", mConcernEntity.getId()); - } - bundle.putStringArrayList("shareArrImg", (ArrayList) mConcernEntity.getImg()); - intent.putExtras(bundle); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(entrance, "+(消息详情[", mConcernEntity.getGameName(), "])")); - mContext.startActivity(intent); - } else { - Intent intent = new Intent(mContext, ShareCardActivity.class); - Bundle bundle = new Bundle(); - bundle.putString("gameName", mConcernEntity.getGameName()); - bundle.putString("gameIconUrl", mConcernEntity.getGameIcon()); - bundle.putString("shareContent", shareContent); - if (mConcernEntity.getLink() == null) { - bundle.putString("newsId", mConcernEntity.getId()); - } - intent.putExtras(bundle); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(entrance, "+(消息详情[", mConcernEntity.getGameName(), "])")); - mContext.startActivity(intent); - } + ShareCardPicActivity.startShareCardPicActivity(mContext, mConcernEntity, mEntrance); } }); @@ -355,12 +324,12 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { intent.putExtra("url", mConcernEntity.getLink()); intent.putExtra("gameName", mConcernEntity.getGameName()); intent.putExtra("newsId", mConcernEntity.getId()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(entrance, "+(消息详情[", mConcernEntity.getGameName(), "])")); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(消息详情[", mConcernEntity.getGameName(), "])")); mContext.startActivity(intent); } else { Intent intent = new Intent(mContext, NewsDetailActivity.class); intent.putExtra("newsId", mConcernEntity.getId()); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(entrance, "+(消息详情[", mConcernEntity.getGameName(), "])")); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, StringUtils.buildString(mEntrance, "+(消息详情[", mConcernEntity.getGameName(), "])")); mContext.startActivity(intent); } } @@ -369,7 +338,9 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { viewHolder.comment.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - mCallBackListener.showSoftInput(null); + if (mOnCommentCallBackListener != null) { + mOnCommentCallBackListener.onCommentCallback(null); + } } }); @@ -533,7 +504,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - CommentUtils.showReportDialog(finalCommentEntity, mContext, mCallBackListener, null); + CommentUtils.showReportDialog(finalCommentEntity, mContext, mOnCommentCallBackListener, null); } }); } @@ -677,7 +648,4 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { return isOver; } - public interface OnCommentCallBackListener { - void showSoftInput(CommentEntity entity); - } } diff --git a/app/src/main/java/com/gh/listener/OnCollectionCallBackListener.java b/app/src/main/java/com/gh/gamecenter/adapter/OnCollectionCallBackListener.java similarity index 87% rename from app/src/main/java/com/gh/listener/OnCollectionCallBackListener.java rename to app/src/main/java/com/gh/gamecenter/adapter/OnCollectionCallBackListener.java index fbaeb11690..3d550b0de7 100644 --- a/app/src/main/java/com/gh/listener/OnCollectionCallBackListener.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/OnCollectionCallBackListener.java @@ -1,4 +1,4 @@ -package com.gh.listener; +package com.gh.gamecenter.adapter; import com.gh.gamecenter.entity.GameCollectionEntity; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/OnCommentCallBackListener.java b/app/src/main/java/com/gh/gamecenter/adapter/OnCommentCallBackListener.java new file mode 100644 index 0000000000..1a5b5e2f3c --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/adapter/OnCommentCallBackListener.java @@ -0,0 +1,7 @@ +package com.gh.gamecenter.adapter; + +import com.gh.gamecenter.entity.CommentEntity; + +public interface OnCommentCallBackListener { + void onCommentCallback(CommentEntity entity); +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java index a41e185762..fd8eee1c4a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -19,7 +19,7 @@ import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.constant.Config; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; @@ -39,7 +39,6 @@ import com.gh.gamecenter.adapter.viewholder.PlatformViewHolder; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.CollectionColseEntity; import com.gh.gamecenter.entity.GameEntity; -import com.gh.listener.OnCollectionCallBackListener; import com.gh.gamecenter.manager.PackageManager; import java.io.File; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformPagerAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformPagerAdapter.java index e7ed6806cc..fc19466560 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformPagerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformPagerAdapter.java @@ -18,7 +18,6 @@ import com.gh.download.DownloadManager; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.CollectionColseEntity; import com.gh.gamecenter.entity.GameEntity; -import com.gh.listener.OnCollectionCallBackListener; import java.util.List; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java index 2dc9e0efbf..8a0c1720d8 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PluginAdapter.java @@ -4,7 +4,7 @@ import android.support.v4.util.ArrayMap; import android.view.View; import android.view.ViewGroup; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DownloadItemUtils; @@ -20,7 +20,7 @@ import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.GameUpdateEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.manager.PackageManager; @@ -34,14 +34,14 @@ import java.util.Map; */ public class PluginAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mListener; + private OnRequestCallBackListener mListener; private List mPluginList; private ArrayMap> mLocationMap; private String mEntrance; - public PluginAdapter(PluginActivity context, OnCallBackListener listener, String entrance) { + public PluginAdapter(PluginActivity context, OnRequestCallBackListener listener, String entrance) { super(context); mListener = listener; mEntrance = entrance; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java index a4693fb0fa..9984753955 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/SubjectTypeAdapter.java @@ -12,7 +12,7 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.SubjectTypeAdapter.GameTypeViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java index a3757900a5..0eca027305 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java @@ -10,7 +10,7 @@ import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; import com.gh.base.AppController; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.MD5Utils; @@ -24,7 +24,7 @@ import com.gh.gamecenter.adapter.viewholder.LibaoSearchViewHolder; import com.gh.gamecenter.adapter.viewholder.ToolBoxViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.ToolBoxEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.ObservableUtil; import com.gh.gamecenter.retrofit.Response; @@ -50,7 +50,7 @@ import static com.gh.gamecenter.R.string.loading; public class ToolBoxRvAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mCallBackListener; + private OnRequestCallBackListener mCallBackListener; private OnSearchCallBackListener mSearchListener; private List mEntityList; @@ -67,7 +67,7 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { private boolean mLoadKeyOver; private boolean mIsRequestError; // key请求返回409 - public ToolBoxRvAdapter(Context context, OnCallBackListener listener, OnSearchCallBackListener searchListener, + public ToolBoxRvAdapter(Context context, OnRequestCallBackListener listener, OnSearchCallBackListener searchListener, boolean isSearch, String key) { super(context); this.mIsSearch = isSearch; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java index d9a0e7e9ae..dcc9bd0e64 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java @@ -9,14 +9,14 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.VoteViewHolder; import com.gh.gamecenter.db.VersionVoteDao; import com.gh.gamecenter.entity.VersionVoteEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -33,7 +33,7 @@ import rx.schedulers.Schedulers; */ public class VoteAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mCallBackListener; + private OnRequestCallBackListener mCallBackListener; private OnAddVoteListener mAddVoteListener; @@ -49,11 +49,11 @@ public class VoteAdapter extends BaseRecyclerAdapter { private String mGameId; - public VoteAdapter(Context context, OnCallBackListener onCallBackListener + public VoteAdapter(Context context, OnRequestCallBackListener onRequestCallBackListener , OnAddVoteListener addVoteListener, String gameId, VersionVoteDao voteDao) { super(context); - this.mCallBackListener = onCallBackListener; + this.mCallBackListener = onRequestCallBackListener; this.mAddVoteListener = addVoteListener; this.mGameId = gameId; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameViewHolder.java deleted file mode 100644 index 60b9fd48f0..0000000000 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameDetailGameViewHolder.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.gh.gamecenter.adapter.viewholder; - -import android.view.View; - -import com.gh.base.BaseRecyclerViewHolder; - -/** - * Created by khy on 2017/3/29. - */ -public class GameDetailGameViewHolder extends BaseRecyclerViewHolder { - - public GameDetailGameViewHolder(View itemView) { - super(itemView); - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java index 6853e6ca95..4e110b8598 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsSearchViewHolder.java @@ -1,26 +1,27 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.EditText; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by LGT on 2016/8/29. */ -public class GameNewsSearchViewHolder extends RecyclerView.ViewHolder { +public class GameNewsSearchViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.game_news_et_search) public EditText game_news_et_search; + @BindView(R.id.game_news_tv_search) public TextView game_news_tv_search; public GameNewsSearchViewHolder(View itemView) { super(itemView); - game_news_et_search = (EditText) itemView.findViewById(R.id.game_news_et_search); - game_news_tv_search = (TextView) itemView.findViewById(R.id.game_news_tv_search); - } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java index a73ba2653d..39af1b764b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeListViewHolder.java @@ -3,20 +3,21 @@ package com.gh.gamecenter.adapter.viewholder; import android.support.v7.widget.RecyclerView; import android.view.View; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by LGT on 2016/8/29. */ -public class GameNewsTypeListViewHolder extends RecyclerView.ViewHolder { +public class GameNewsTypeListViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.game_news_type_list) public RecyclerView game_news_type_list; public GameNewsTypeListViewHolder(View itemView) { super(itemView); - - game_news_type_list = (RecyclerView) itemView.findViewById(R.id.game_news_type_list); - } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java index fb83d3a94c..471d3a1604 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameNewsTypeViewHolder.java @@ -1,22 +1,23 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by LGT on 2016/8/29. */ -public class GameNewsTypeViewHolder extends RecyclerView.ViewHolder { +public class GameNewsTypeViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.game_news_type_list_tv_type) public TextView game_news_type_list_tv_type; public GameNewsTypeViewHolder(View itemView) { super(itemView); - - game_news_type_list_tv_type = (TextView) itemView.findViewById(R.id.game_news_type_list_tv_type); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java index 5b8c3e3f99..7474127536 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameTestViewHolder.java @@ -23,12 +23,21 @@ import com.gh.gamecenter.game.GameFragmentAdapter; import java.util.Date; import java.util.List; +import butterknife.BindView; + public class GameTestViewHolder extends GameViewHolder { + @BindView(R.id.home2_test_type) public TextView gameTestType; + + @BindView(R.id.home2_test_time) public TextView gameTestTime; + + @BindView(R.id.home2_game_kaifu_top) public TextView kaifuTop; + + @BindView(R.id.home2_game_kaifu_bottom) public TextView kaifuBottom; public GameTestViewHolder(View itemView) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java index d9ae064dff..53c3f0e2f4 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameUpdateViewHolder.java @@ -1,32 +1,36 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; 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 LGT on 2016/8/16. */ -public class GameUpdateViewHolder extends RecyclerView.ViewHolder { +public class GameUpdateViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.gu_item_iv_icon) public SimpleDraweeView gu_item_iv_icon; + + @BindView(R.id.gu_item_tv_name) public TextView gu_item_tv_name; + + @BindView(R.id.gu_item_tv_current) public TextView gu_item_tv_current; + + @BindView(R.id.gu_item_tv_new) public TextView gu_item_tv_new; + + @BindView(R.id.gu_item_btv_update) public TextView gu_item_btv_update; public GameUpdateViewHolder(View itemView) { super(itemView); - - gu_item_iv_icon = (SimpleDraweeView) itemView.findViewById(R.id.gu_item_iv_icon); - gu_item_tv_name = (TextView) itemView.findViewById(R.id.gu_item_tv_name); - gu_item_tv_current = (TextView) itemView.findViewById(R.id.gu_item_tv_current); - gu_item_tv_new = (TextView) itemView.findViewById(R.id.gu_item_tv_new); - gu_item_btv_update = (TextView) itemView.findViewById(R.id.gu_item_btv_update); - } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java index bb4b7b4fae..3d44c025f1 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java @@ -1,6 +1,5 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; @@ -8,9 +7,10 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; -public class GameViewHolder extends RecyclerView.ViewHolder { +public class GameViewHolder extends BaseRecyclerViewHolder { public ImageView gameLibaoIcon; public TextView gameOrder; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java index c8287f40bf..027209efb0 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewPagerViewHolder.java @@ -1,22 +1,21 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; import cn.trinea.android.view.autoscrollviewpager.AutoScrollViewPager; /** * Created by LGT on 2016/11/14. * viewHolder */ -public class GameViewPagerViewHolder extends RecyclerView.ViewHolder { +public class GameViewPagerViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.view_pager) public AutoScrollViewPager viewPager; @@ -33,8 +32,6 @@ public class GameViewPagerViewHolder extends RecyclerView.ViewHolder { public GameViewPagerViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); - } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/KcSelectGameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/KcSelectGameViewHolder.java index abc117c8f7..19ae0901e9 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/KcSelectGameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/KcSelectGameViewHolder.java @@ -1,6 +1,5 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.CheckBox; import android.widget.ImageView; @@ -9,15 +8,15 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2017/1/20. */ -public class KcSelectGameViewHolder extends RecyclerView.ViewHolder { +public class KcSelectGameViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.select_game_order) public TextView gameOrder; @@ -50,6 +49,5 @@ public class KcSelectGameViewHolder extends RecyclerView.ViewHolder { public KcSelectGameViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LiBaoCodeViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LiBaoCodeViewHolder.java index 9d3cd080f4..b471987dd6 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LiBaoCodeViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LiBaoCodeViewHolder.java @@ -1,22 +1,25 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by khy on 2017/3/23. */ -public class LiBaoCodeViewHolder extends RecyclerView.ViewHolder { +public class LiBaoCodeViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.libao_code_tv) public TextView code; + + @BindView(R.id.libao_copy_btn) public TextView copy; public LiBaoCodeViewHolder(View itemView) { super(itemView); - code = (TextView) itemView.findViewById(R.id.libao_code_tv); - copy = (TextView) itemView.findViewById(R.id.libao_copy_btn); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailTopViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailTopViewHolder.java index 80b566eb5e..3fb5ce8eac 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailTopViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoDetailTopViewHolder.java @@ -5,15 +5,15 @@ 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; -import butterknife.ButterKnife; /** * Created by khy on 2016/12/14. */ -public class LibaoDetailTopViewHolder extends RecyclerView.ViewHolder { +public class LibaoDetailTopViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.libaodetail_name) public TextView libaoName; @@ -30,6 +30,5 @@ public class LibaoDetailTopViewHolder extends RecyclerView.ViewHolder { public LibaoDetailTopViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } 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 9b808ad9a5..9b4dad7124 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 @@ -1,19 +1,18 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; 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; -import butterknife.ButterKnife; /** * Created by khy on 2016/12/12. */ -public class LibaoNormalViewHolder extends RecyclerView.ViewHolder { +public class LibaoNormalViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.libao_name) public TextView libaoName; @@ -28,6 +27,5 @@ public class LibaoNormalViewHolder extends RecyclerView.ViewHolder { public LibaoNormalViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoSearchViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoSearchViewHolder.java index 3fb65f3dcf..f82d748a2e 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoSearchViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/LibaoSearchViewHolder.java @@ -1,19 +1,18 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.EditText; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2016/12/26. */ -public class LibaoSearchViewHolder extends RecyclerView.ViewHolder { +public class LibaoSearchViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.libao_et_search) public EditText searchEt; @@ -24,6 +23,5 @@ public class LibaoSearchViewHolder extends RecyclerView.ViewHolder { public LibaoSearchViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailCommentListViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailCommentListViewHolder.java index 3fdf69b4fa..de76740ed7 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailCommentListViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDetailCommentListViewHolder.java @@ -1,19 +1,18 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2016/12/28. */ -public class NewsDetailCommentListViewHolder extends RecyclerView.ViewHolder { +public class NewsDetailCommentListViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.newsdetail_comment_title) public TextView title; @@ -22,6 +21,6 @@ public class NewsDetailCommentListViewHolder extends RecyclerView.ViewHolder { public NewsDetailCommentListViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } + } 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 b6a1804705..c6c83ba4cc 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 @@ -1,22 +1,21 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by Administrator on 2016/9/8. * viewholder */ -public class NewsDigestViewHolder extends RecyclerView.ViewHolder { +public class NewsDigestViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.news_digest_thumb) public SimpleDraweeView thumb; @@ -41,7 +40,6 @@ public class NewsDigestViewHolder extends RecyclerView.ViewHolder { public NewsDigestViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsFooterViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsFooterViewHolder.java index 833a8b6ffa..093c95b2ea 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsFooterViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsFooterViewHolder.java @@ -1,20 +1,19 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by LGT on 2016/8/18. * viewholder */ -public class NewsFooterViewHolder extends RecyclerView.ViewHolder { +public class NewsFooterViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.news_footer_loading) public ProgressBar loading; @@ -23,7 +22,6 @@ public class NewsFooterViewHolder extends RecyclerView.ViewHolder { public NewsFooterViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsHeadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsHeadViewHolder.java index f0f1e4c332..4bbba72a32 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsHeadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsHeadViewHolder.java @@ -1,26 +1,24 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by LGT on 2016/8/18. * viewholder */ -public class NewsHeadViewHolder extends RecyclerView.ViewHolder { +public class NewsHeadViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.news_head_label) public TextView label; public NewsHeadViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage1ViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage1ViewHolder.java index 0aeec12a6a..3c02ef0e05 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage1ViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage1ViewHolder.java @@ -1,20 +1,19 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; 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; -import butterknife.ButterKnife; /** * Created by LGT on 2016/6/6. * viewholder */ -public class NewsImage1ViewHolder extends RecyclerView.ViewHolder { +public class NewsImage1ViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.news_image1_thumb) public SimpleDraweeView thumb; @@ -27,7 +26,6 @@ public class NewsImage1ViewHolder extends RecyclerView.ViewHolder { public NewsImage1ViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage2ViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage2ViewHolder.java index c982d2e262..d173fd50c1 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage2ViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage2ViewHolder.java @@ -1,20 +1,19 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; 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; -import butterknife.ButterKnife; /** * Created by LGT on 2016/7/5. * viewholder */ -public class NewsImage2ViewHolder extends RecyclerView.ViewHolder { +public class NewsImage2ViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.news_image2_title) public TextView title; @@ -31,7 +30,6 @@ public class NewsImage2ViewHolder extends RecyclerView.ViewHolder { public NewsImage2ViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage3ViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage3ViewHolder.java index 8bb04c2b05..fb0b5399bf 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage3ViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImage3ViewHolder.java @@ -1,20 +1,19 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; 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; -import butterknife.ButterKnife; /** * Created by LGT on 2016/7/5. * viewholder */ -public class NewsImage3ViewHolder extends RecyclerView.ViewHolder { +public class NewsImage3ViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.news_image3_title) public TextView title; @@ -27,7 +26,6 @@ public class NewsImage3ViewHolder extends RecyclerView.ViewHolder { public NewsImage3ViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImageViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImageViewHolder.java index 4247d0381e..f96961d267 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImageViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsImageViewHolder.java @@ -1,20 +1,19 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; 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; -import butterknife.ButterKnife; /** * Created by LGT on 2016/8/17. * viewholder */ -public class NewsImageViewHolder extends RecyclerView.ViewHolder { +public class NewsImageViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.news_image_thumb) public SimpleDraweeView thumb; @@ -25,7 +24,6 @@ public class NewsImageViewHolder extends RecyclerView.ViewHolder { public NewsImageViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } 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 bbb7c5f762..f106702f3c 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 @@ -1,19 +1,18 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by LGT on 2016/8/17. * viewholder */ -public class NewsTextViewHolder extends RecyclerView.ViewHolder { +public class NewsTextViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.news_text_line) public View line; @@ -24,7 +23,6 @@ public class NewsTextViewHolder extends RecyclerView.ViewHolder { public NewsTextViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NoDataSkipViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NoDataSkipViewHolder.java deleted file mode 100644 index 3155d26081..0000000000 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NoDataSkipViewHolder.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gh.gamecenter.adapter.viewholder; - -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.TextView; - -import com.gh.gamecenter.R; - -/** - * Created by LGT on 2016/9/6. - */ -public class NoDataSkipViewHolder extends RecyclerView.ViewHolder { - - public TextView reuse_nodata_skip_tv_hint; - public TextView reuse_nodata_skip_tv_btn; - - public NoDataSkipViewHolder(View itemView) { - super(itemView); - - reuse_nodata_skip_tv_hint = (TextView) itemView.findViewById(R.id.reuse_nodata_skip_tv_hint); - reuse_nodata_skip_tv_btn = (TextView) itemView.findViewById(R.id.reuse_nodata_skip_tv_btn); - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/PlatformViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/PlatformViewHolder.java index 3a23a92c34..dff07887f1 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/PlatformViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/PlatformViewHolder.java @@ -1,44 +1,38 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.ProgressBar; 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 LGT on 2016/9/27. */ -public class PlatformViewHolder extends RecyclerView.ViewHolder { +public class PlatformViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.download_item_tv_name) public TextView download_item_tv_name; + @BindView(R.id.download_item_tv_status) public TextView download_item_tv_status; + @BindView(R.id.download_item_progressbar) public TextView download_item_tv_hint; + @BindView(R.id.download_item_iv_pic) public ImageView download_item_open_collection; + @BindView(R.id.download_item_tv_hint) public ImageView download_item_colse_collection; + @BindView(R.id.download_item_open_collection) public SimpleDraweeView download_item_iv_pic; + @BindView(R.id.download_item_colse_collection) public ProgressBar download_item_progressbar; public PlatformViewHolder(View itemView) { super(itemView); - - download_item_tv_name = (TextView) itemView - .findViewById(R.id.download_item_tv_name); - download_item_tv_status = (TextView) itemView - .findViewById(R.id.download_item_tv_status); - download_item_progressbar = (ProgressBar) itemView - .findViewById(R.id.download_item_progressbar); - download_item_iv_pic = (SimpleDraweeView) itemView - .findViewById(R.id.download_item_iv_pic); - download_item_tv_hint = (TextView) itemView - .findViewById(R.id.download_item_tv_hint); - download_item_open_collection = (ImageView) itemView - .findViewById(R.id.download_item_open_collection); - download_item_colse_collection = (ImageView) itemView - .findViewById(R.id.download_item_colse_collection); } } 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 20fbcc9f7c..c3b60a2e0e 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 @@ -1,12 +1,13 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; +import com.gh.base.BaseRecyclerViewHolder; + /** * Created by LGT on 2016/8/12. */ -public class ReuseViewHolder extends RecyclerView.ViewHolder { +public class ReuseViewHolder extends BaseRecyclerViewHolder { public ReuseViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java index d4114c0990..d8dd7c4c62 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/SearchHistoryViewHolder.java @@ -1,25 +1,25 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; +import butterknife.BindView; + /** * Created by LGT on 2016/8/17. */ -public class SearchHistoryViewHolder extends RecyclerView.ViewHolder { +public class SearchHistoryViewHolder extends BaseRecyclerViewHolder { + @BindView(R.id.search_history_line) public View search_history_line; + @BindView(R.id.search_history_name) public TextView search_history_name; public SearchHistoryViewHolder(View itemView) { super(itemView); - - search_history_line = itemView.findViewById(R.id.search_history_line); - search_history_name = (TextView) itemView.findViewById(R.id.search_history_name); - } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java index e2442344bc..1a25e597cd 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/StrategyDialogViewHolder.java @@ -1,19 +1,18 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2016/12/5. */ -public class StrategyDialogViewHolder extends RecyclerView.ViewHolder { +public class StrategyDialogViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.dialog_strategy_item_icon) public ImageView selectIcon; @@ -22,6 +21,6 @@ public class StrategyDialogViewHolder extends RecyclerView.ViewHolder { public StrategyDialogViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } + } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ToolBoxViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ToolBoxViewHolder.java index 73e886e6be..0f8f27cc69 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ToolBoxViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/ToolBoxViewHolder.java @@ -1,20 +1,19 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; 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; -import butterknife.ButterKnife; /** * Created by khy on 24/05/17. */ -public class ToolBoxViewHolder extends RecyclerView.ViewHolder { +public class ToolBoxViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.toolbox_item_game_thumb) public SimpleDraweeView mGameThumb; @BindView(R.id.toolbox_item_title) @@ -24,6 +23,5 @@ public class ToolBoxViewHolder extends RecyclerView.ViewHolder { public ToolBoxViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/VoteViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/VoteViewHolder.java index b6f43500db..5d7c552fab 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/VoteViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/VoteViewHolder.java @@ -1,19 +1,18 @@ package com.gh.gamecenter.adapter.viewholder; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2017/4/11. * 投票ITEM */ -public class VoteViewHolder extends RecyclerView.ViewHolder { +public class VoteViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.vote_item_name) public TextView name; @@ -26,6 +25,6 @@ public class VoteViewHolder extends RecyclerView.ViewHolder { public VoteViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } + } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index aaba97ba11..2fb0f57382 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -32,7 +32,7 @@ import com.gh.download.DownloadEntity; import com.gh.download.DownloadManager; import com.gh.download.DownloadStatus; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.DownloadHeadViewHolder; import com.gh.gamecenter.adapter.viewholder.GameDownloadViewHolder; import com.gh.gamecenter.eventbus.EBDownloadChanged; diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index 38d18770cf..90f9fa0159 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -28,7 +28,7 @@ import com.gh.download.DownloadManager; import com.gh.download.DownloadStatus; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.DownloadHeadViewHolder; import com.gh.gamecenter.adapter.viewholder.GameUpdateViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; diff --git a/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.java b/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.java index 711d578850..198f06314a 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/LibaoEntity.java @@ -1,12 +1,15 @@ package com.gh.gamecenter.entity; +import android.os.Parcel; +import android.os.Parcelable; + import com.gh.gamecenter.db.info.LibaoInfo; import com.google.gson.annotations.SerializedName; /** * Created by khy on 2016/12/13. */ -public class LibaoEntity { +public class LibaoEntity implements Parcelable { @SerializedName("_id") private String id; @@ -212,4 +215,60 @@ public class LibaoEntity { this.repeat = repeat; } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(this.id); + dest.writeString(this.libaoId); + dest.writeString(this.content); + dest.writeParcelable(this.game, flags); + dest.writeString(this.icon); + dest.writeString(this.name); + dest.writeString(this.platform); + dest.writeString(this.status); + dest.writeString(this.beforeStatus); + dest.writeString(this.code); + dest.writeInt(this.available); + dest.writeInt(this.total); + dest.writeString(this.packageName); + dest.writeByte(this.active ? (byte) 1 : (byte) 0); + dest.writeLong(this.time); + dest.writeInt(this.repeat); + } + + protected LibaoEntity(Parcel in) { + this.id = in.readString(); + this.libaoId = in.readString(); + this.content = in.readString(); + this.game = in.readParcelable(LibaoGameEntity.class.getClassLoader()); + this.icon = in.readString(); + this.name = in.readString(); + this.platform = in.readString(); + this.status = in.readString(); + this.beforeStatus = in.readString(); + this.code = in.readString(); + this.available = in.readInt(); + this.total = in.readInt(); + this.packageName = in.readString(); + this.active = in.readByte() != 0; + this.time = in.readLong(); + this.repeat = in.readInt(); + } + + public static final Creator CREATOR = new Creator() { + @Override + public LibaoEntity createFromParcel(Parcel source) { + return new LibaoEntity(source); + } + + @Override + public LibaoEntity[] newArray(int size) { + return new LibaoEntity[size]; + } + }; } diff --git a/app/src/main/java/com/gh/gamecenter/entity/LibaoGameEntity.java b/app/src/main/java/com/gh/gamecenter/entity/LibaoGameEntity.java index ede192ecb9..86a49ca685 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/LibaoGameEntity.java +++ b/app/src/main/java/com/gh/gamecenter/entity/LibaoGameEntity.java @@ -1,11 +1,14 @@ package com.gh.gamecenter.entity; +import android.os.Parcel; +import android.os.Parcelable; + import com.google.gson.annotations.SerializedName; /** * Created by khy on 2016/12/14. */ -public class LibaoGameEntity { +public class LibaoGameEntity implements Parcelable { @SerializedName("_id") private String id; @@ -37,4 +40,32 @@ public class LibaoGameEntity { this.name = name; } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(this.id); + dest.writeString(this.name); + } + + protected LibaoGameEntity(Parcel in) { + this.id = in.readString(); + this.name = in.readString(); + } + + public static final Creator CREATOR = new Creator() { + @Override + public LibaoGameEntity createFromParcel(Parcel source) { + return new LibaoGameEntity(source); + } + + @Override + public LibaoGameEntity[] newArray(int size) { + return new LibaoGameEntity[size]; + } + }; } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java index f72c93f004..5ce40754a5 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java @@ -25,7 +25,7 @@ import com.gh.gamecenter.eventbus.EBPackage; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.game.GameFragmentAdapter; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -37,7 +37,7 @@ import java.util.List; * Created by khy on 2016/12/6. * 新主界面 */ -public class GameFragment extends HomeFragment implements SwipeRefreshLayout.OnRefreshListener, OnCallBackListener { +public class GameFragment extends HomeFragment implements SwipeRefreshLayout.OnRefreshListener, OnRequestCallBackListener { private SwipeRefreshLayout fm_game_swipe_refresh; private RecyclerView fm_game_rv_list; diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index 8872be504f..3e2472a771 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -46,7 +46,7 @@ import com.gh.gamecenter.PluginActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; import com.gh.gamecenter.ToolBoxActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.ImagePagerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameHeadViewHolder; @@ -62,7 +62,7 @@ import com.gh.gamecenter.entity.SlideEntity; import com.gh.gamecenter.entity.SubjectDigestEntity; import com.gh.gamecenter.entity.SubjectEntity; import com.gh.gamecenter.fragment.GameFragment; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.manager.PackageManager; import com.gh.gamecenter.retrofit.Response; @@ -86,7 +86,7 @@ import rx.schedulers.Schedulers; public class GameFragmentAdapter extends BaseRecyclerAdapter { private GameFragment mGameFragment; - private OnCallBackListener mCallBackListener; + private OnRequestCallBackListener mCallBackListener; private SwipeRefreshLayout mSwipeRefreshLayout; 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 4c114713a8..35cb11fb9b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -32,7 +32,7 @@ import com.gh.gamecenter.GameNewsActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.entity.GameDetailEntity; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetaiLibaoViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetaiLibaoViewHolder.java deleted file mode 100644 index e90361e591..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetaiLibaoViewHolder.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.RelativeLayout; - -import com.gh.gamecenter.R; - -import butterknife.BindView; -import butterknife.ButterKnife; - -/** - * Created by khy on 2016/12/14. - */ -public class GameDetaiLibaoViewHolder extends RecyclerView.ViewHolder { - - @BindView(R.id.gamedetail_item_libao_gallery) - public RecyclerView libaoRv; - @BindView(R.id.gamedetail_item_open_list) - public RelativeLayout openList; - - public GameDetaiLibaoViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailCalenderViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailCalenderViewHolder.java deleted file mode 100644 index dcea8ad138..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailCalenderViewHolder.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.TextView; - -import com.gh.gamecenter.R; - -import butterknife.BindView; -import butterknife.ButterKnife; - -/** - * Created by khy on 2017/3/28. - */ -public class GameDetailCalenderViewHolder extends RecyclerView.ViewHolder { - - @BindView(R.id.calendar_day) - public TextView calendarDay; - @BindView(R.id.calendar_kaifu) - public TextView calendarKaifu; - - public GameDetailCalenderViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFuLiViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFuLiViewHolder.java deleted file mode 100644 index bb8f1587f5..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFuLiViewHolder.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.LinearLayout; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import com.gh.common.view.MarqueeView; -import com.gh.gamecenter.R; - -import butterknife.BindView; -import butterknife.ButterKnife; - -/** - * Created by khy on 2017/3/27. - */ -public class GameDetailFuLiViewHolder extends RecyclerView.ViewHolder { - - @BindView(R.id.gamedetail_item_fuli_des) - public TextView fuliDes; - @BindView(R.id.gamedetail_qq_rl) - public RelativeLayout fuliQqRl; - @BindView(R.id.gamedetail_qq_des) - public TextView fuliQqDes; - @BindView(R.id.gamedetail_qq_btn) - public TextView fuliQqBtn; - @BindView(R.id.gamedetail_qqun_rl) - public RelativeLayout fuliQqunRl; - @BindView(R.id.gamedetail_qqun_btn) - public TextView fuliQqunBtn; - @BindView(R.id.gamedetail_qqun_des) - public TextView fuliQqunDes; - @BindView(R.id.gamedetail_item_notice) - public MarqueeView filiNotice; - @BindView(R.id.gamedetail_item_notice_ll) - public LinearLayout filiNoticeLl; - - - public GameDetailFuLiViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); - - } -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagAdapter.java index fe04497e72..8ccf42e86a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagAdapter.java @@ -7,7 +7,7 @@ import android.widget.TextView; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.GameDetailGameTagTypeViewHolder; import java.util.List; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagViewHolder.java deleted file mode 100644 index 3beb7e7f14..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameTagViewHolder.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; - -import com.gh.gamecenter.R; - -import butterknife.BindView; -import butterknife.ButterKnife; - -/** - * Created by khy on 2017/3/28. - */ -public class GameDetailGameTagViewHolder extends RecyclerView.ViewHolder { - - @BindView(R.id.gamedetail_gametag_rv) - public RecyclerView gametagRv; - - public GameDetailGameTagViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameViewHolder.java deleted file mode 100644 index e41eb8c7da..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailGameViewHolder.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; - -import butterknife.ButterKnife; - -/** - * Created by khy on 2017/3/29. - */ -public class GameDetailGameViewHolder extends RecyclerView.ViewHolder { - - public GameDetailGameViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailIntroViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailIntroViewHolder.java deleted file mode 100644 index dc5b4857d0..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailIntroViewHolder.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.TextView; - -import com.gh.gamecenter.R; - -/** - * Created by LGT on 2016/9/8. - */ -public class GameDetailIntroViewHolder extends RecyclerView.ViewHolder { - - public RecyclerView gamedetail_item_intro_gallery; - public TextView gamedetail_item_intro_content; - - public GameDetailIntroViewHolder(View itemView) { - super(itemView); - - gamedetail_item_intro_gallery = (RecyclerView) itemView.findViewById(R.id.gamedetail_item_intro_gallery); - gamedetail_item_intro_content = (TextView) itemView.findViewById(R.id.gamedetail_item_intro_content); - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java index 3a8db79237..d633ffbf3e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java @@ -17,7 +17,7 @@ import com.gh.common.util.DisplayUtils; import com.gh.common.util.StringUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.entity.CalendarEntity; import com.gh.gamecenter.entity.KaiFuServerEntity; import com.gh.gamecenter.eventbus.EBReuse; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuViewHolder.java deleted file mode 100644 index 6e2558f6ae..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuViewHolder.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.LinearLayout; -import android.widget.RelativeLayout; -import android.widget.ScrollView; -import android.widget.TextView; - -import com.gh.gamecenter.R; - -import butterknife.BindView; -import butterknife.ButterKnife; - -/** - * Created by khy on 2017/3/28. - */ -public class GameDetailKaiFuViewHolder extends RecyclerView.ViewHolder { - - @BindView(R.id.gamedetail_kaifu_rv) - RecyclerView kaifuRv; - @BindView(R.id.gamedetail_kaifu_cur_month) - TextView curMonth; - @BindView(R.id.gamedetail_kaifu_next_month) - TextView nextMonth; - @BindView(R.id.gamedetail_kaifu_rl) - RelativeLayout kaifuRl; - @BindView(R.id.gamedetail_kaifu_detail) - RelativeLayout kaifuDetailRl; - @BindView(R.id.gamedetail_kaifu_colse_detail) - TextView colseDetail; - @BindView(R.id.gamedetail_kaifu_suggest) - TextView kaifuSuggest; - @BindView(R.id.gamedetail_kaifu_detail_time) - TextView detailTime; - @BindView(R.id.gamedetail_kaifu_detail_list) - LinearLayout detailList; - @BindView(R.id.gamedetail_kaifu_detail_sv) - ScrollView detailSv; - @BindView(R.id.gamedetail_kaifu_des) - TextView kaifuDes; - - public GameDetailKaiFuViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerAdapter.java index 2fc4c4f5c1..c533ff3680 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerAdapter.java @@ -8,7 +8,7 @@ import android.widget.RelativeLayout; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.entity.ServerEntity; import com.gh.gamecenter.adapter.viewholder.GameDetailNewsServerItemViewHolder; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerItemViewHolder.java deleted file mode 100644 index c9caa170e0..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsServerItemViewHolder.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import com.gh.gamecenter.R; - -/** - * Created by LGT on 2016/9/18. - */ -public class GameDetailNewsServerItemViewHolder extends RecyclerView.ViewHolder { - - public TextView newsserver_item_name; - public View newsserver_item_line; - public ImageView newsserver_item_point; - public TextView newsserver_item_time; - - public GameDetailNewsServerItemViewHolder(View itemView) { - super(itemView); - - newsserver_item_name = (TextView) itemView.findViewById(R.id.newsserver_item_name); - newsserver_item_line = itemView.findViewById(R.id.newsserver_item_line); - newsserver_item_point = (ImageView) itemView.findViewById(R.id.newsserver_item_point); - newsserver_item_time = (TextView) itemView.findViewById(R.id.newsserver_item_time); - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsViewHolder.java deleted file mode 100644 index 3249a38c26..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNewsViewHolder.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.gh.gamecenter.R; - -/** - * Created by LGT on 2016/9/8. - */ -public class GameDetailNewsViewHolder extends RecyclerView.ViewHolder { - - public LinearLayout gamedetail_item_news_more; - public LinearLayout gamedetail_item_news_list; - public TextView gamedetail_item_news_title; - public View gamedetail_item_line; - public View gamedetail_item_news_line_top; - - public GameDetailNewsViewHolder(View itemView) { - super(itemView); - - gamedetail_item_news_more = (LinearLayout) itemView.findViewById(R.id.gamedetail_item_news_more); - gamedetail_item_news_list = (LinearLayout) itemView.findViewById(R.id.gamedetail_item_news_list); - gamedetail_item_news_title = (TextView) itemView.findViewById(R.id.gamedetail_item_news_title); - gamedetail_item_line = itemView.findViewById(R.id.gamedetail_item_line); - gamedetail_item_news_line_top = itemView.findViewById(R.id.gamedetail_item_news_line_top); - } - -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNoticeViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNoticeViewHolder.java deleted file mode 100644 index 74c472455e..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailNoticeViewHolder.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; - -import com.gh.common.view.MarqueeView; -import com.gh.gamecenter.R; - -import butterknife.BindView; -import butterknife.ButterKnife; - -/** - * Created by khy on 2017/3/30. - */ -public class GameDetailNoticeViewHolder extends RecyclerView.ViewHolder { - - @BindView(R.id.gamedetail_item_notice) - public MarqueeView mvNotice; - @BindView(R.id.gamedetail_item_notice_line) - public View noticeLine; - - public GameDetailNoticeViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailPluginAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailPluginAdapter.java index 4a65cd52f1..c5e0ea0f11 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailPluginAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailPluginAdapter.java @@ -11,7 +11,7 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.entity.TagEntity; import com.gh.gamecenter.entity.TipsEntity; import com.gh.gamecenter.entity.TitleEntity; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java deleted file mode 100644 index 73109770f0..0000000000 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailSkinViewHolder.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.gh.gamecenter.gamedetail; - -import android.support.v7.widget.RecyclerView; -import android.view.View; -import android.widget.ProgressBar; -import android.widget.TextView; - -import com.gh.gamecenter.R; - -import butterknife.BindView; -import butterknife.ButterKnife; - -/** - * Created by khy on 2016/11/16. - */ -public class GameDetailSkinViewHolder extends RecyclerView.ViewHolder { - - @BindView(R.id.skin_tv_download) - public TextView skinDownloadTv; - @BindView(R.id.skin_pb_progressbar) - public ProgressBar skinDownloadPb; - @BindView(R.id.skin_tv_per) - public TextView skinDownloadPerTv; - @BindView(R.id.skin_tv_des) - public TextView skinDownloadDes; - @BindView(R.id.skin_tv_name) - public TextView skinDownloadName; - - public GameDetailSkinViewHolder(View itemView) { - super(itemView); - ButterKnife.bind(this, itemView); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java index c9b6d2eb14..f715fb5402 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailToolsAdapter.java @@ -14,7 +14,7 @@ import com.gh.common.util.ImageUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.ToolBoxViewHolder; import com.gh.gamecenter.entity.ToolBoxEntity; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java index 0cea0fd864..2b0a9df15f 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameGalleryAdapter.java @@ -11,7 +11,7 @@ import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.ViewImageActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.GameGalleryViewHolder; import java.util.ArrayList; 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 c348808f33..5343c03b9d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java @@ -7,13 +7,11 @@ import android.graphics.Color; import android.view.View; import android.view.ViewGroup; -import com.gh.base.AppController; -import com.gh.common.util.EntranceUtils; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; -import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.adapter.viewholder.GameLibaoGalleryViewHolder; +import com.gh.gamecenter.entity.LibaoEntity; import java.util.List; @@ -23,12 +21,12 @@ import java.util.List; class GameLibaoGalleryAdapter extends BaseRecyclerAdapter { private List mLibaoList; - private String entrance; + private String mEntrance; GameLibaoGalleryAdapter(Context context, List libaoList, String entrance) { super(context); - this.mLibaoList = libaoList; - this.entrance = entrance; + mLibaoList = libaoList; + mEntrance = entrance; } @Override @@ -39,7 +37,7 @@ class GameLibaoGalleryAdapter extends BaseRecyclerAdapter { private List mGameList; - private String entrance; + private String mEntrance; private String name; private int position_plugin = -1; @@ -81,7 +81,7 @@ public class XinXiAdapter extends BaseRecyclerAdapter { public XinXiAdapter(Context context, String entrance) { super(context); - this.entrance = entrance; + mEntrance = entrance; mGameList = new ArrayList<>(); mGameDetailEntity = (GameDetailEntity) AppController.get("GameDetailEntity", false); @@ -295,7 +295,7 @@ public class XinXiAdapter extends BaseRecyclerAdapter { return new GameDetailGameTagViewHolder(view); case 6: view = mLayoutInflater.inflate(R.layout.gamedetail_item_game, parent, false); - return new GameDetailGameViewHolder(view); + return new ReuseViewHolder(view); case 100: view = mLayoutInflater.inflate(R.layout.game_normal_item, parent, false); return new GameNormalViewHolder(view); @@ -458,7 +458,7 @@ public class XinXiAdapter extends BaseRecyclerAdapter { new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false)); viewHolder.gamedetail_item_intro_gallery.setAdapter( new GameGalleryAdapter(mContext, mGameDetailEntity.getGallery(), - StringUtils.buildString(entrance, "+(游戏详情[", mGameEntity.getName(), "]:游戏介绍)"))); + StringUtils.buildString(mEntrance, "+(游戏详情[", mGameEntity.getName(), "]:游戏介绍)"))); viewHolder.gamedetail_item_intro_gallery.addItemDecoration( new HorizontalItemDecoration(mContext, 1, mGameDetailEntity.getGallery().size())); } @@ -504,12 +504,12 @@ public class XinXiAdapter extends BaseRecyclerAdapter { DataCollectionUtils.uploadClick(mContext, "列表", name, gameEntity.getName()); GameDetailActivity.startGameDetailActivity(mContext, gameEntity, - StringUtils.buildString(entrance, "+(", name, "[", String.valueOf(position + 1), "])")); + StringUtils.buildString(mEntrance, "+(", name, "[", String.valueOf(position + 1), "])")); } }); DownloadItemUtils.setOnClickListener(mContext, holder.gameDownloadBtn, gameEntity, position, this, - StringUtils.buildString(entrance, "+(", name, "[", String.valueOf(position + 1), "])"), + StringUtils.buildString(mEntrance, "+(", name, "[", String.valueOf(position + 1), "])"), StringUtils.buildString(name, ":", gameEntity.getName())); DownloadItemUtils.updateItem(mContext, gameEntity, holder, true); diff --git a/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java b/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java index b1fe6b97b0..caca4441db 100644 --- a/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java +++ b/app/src/main/java/com/gh/gamecenter/geetest/GeetestUtils.java @@ -1,6 +1,5 @@ package com.gh.gamecenter.geetest; -import android.app.Activity; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; @@ -53,7 +52,7 @@ public class GeetestUtils { * @param context * @param listener */ - public void showDialog(Activity context, GeetestListener listener) { + public void showDialog(Context context, GeetestListener listener) { mProgressDialog = ProgressDialog.show(context, null, "Loading", true, true); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java index 885dd412f7..2339f6d070 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java @@ -87,7 +87,7 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O mLayoutManager = new LinearLayoutManager(getActivity()); mRecyclerView.setLayoutManager(mLayoutManager); - adapter = new Libao1FragmentAdapter(Libao1Fragment.this, mIsSearch, mSearckKey, mEntrance); + adapter = new Libao1FragmentAdapter(this, this, this, mIsSearch, mSearckKey, mEntrance); mNormalAdapter = adapter; mRecyclerView.addItemDecoration(new VerticalItemDecoration(getContext(), 8, false)); mRecyclerView.setAdapter(adapter); @@ -286,13 +286,13 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O private void changeAdapter(boolean isRefresh) { String entrance = getActivity().getIntent().getStringExtra(EntranceUtils.KEY_ENTRANCE); if (mIsSearch) { - adapter = new Libao1FragmentAdapter(Libao1Fragment.this, mIsSearch, mSearckKey, entrance); + adapter = new Libao1FragmentAdapter(this, this, this, mIsSearch, mSearckKey, entrance); } else { if (mNormalAdapter != null && !isRefresh) { adapter = mNormalAdapter; // adapter.setSearchKey(mSearckKey); } else { - adapter = new Libao1FragmentAdapter(Libao1Fragment.this, mIsSearch, null, entrance); + adapter = new Libao1FragmentAdapter(this, this, this, mIsSearch, null, entrance); mNormalAdapter = adapter; adapter.addLibaoList(false, 0); } diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java index 2d002a96c6..828446badb 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java @@ -1,6 +1,5 @@ package com.gh.gamecenter.libao; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.support.v7.widget.RecyclerView; @@ -10,23 +9,21 @@ import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; -import com.gh.base.AppController; +import com.gh.base.OnRequestCallBackListener; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.constant.ItemViewType; -import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.PlatformUtils; import com.gh.common.util.Utils; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder; import com.gh.gamecenter.adapter.viewholder.LibaoSearchViewHolder; import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; -import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -46,28 +43,29 @@ class Libao1FragmentAdapter extends BaseRecyclerAdapter { private final static int ITEM_SEARCH = 1; private final static int ITEM_FOOTER = 1; - private Libao1Fragment libao1Fragment; - private OnCallBackListener mCallBackListener; + private Libao1Fragment mLibao1Fragment; + private OnRequestCallBackListener mCallBackListener; private OnSearchCallBackListener mSearchListener; private List mLibaoList; private LibaoDao mLibaoDao; private String mSerchKey; - private String entrance; + private String mEntrance; private int skipPosition; private boolean mIsSearch; private boolean isLoading; private boolean isOver; private boolean isNetworkError; - Libao1FragmentAdapter(Libao1Fragment libao1Fragment, boolean isSearch, String key, String entrance) { - super(libao1Fragment.getContext()); - this.libao1Fragment = libao1Fragment; - this.mCallBackListener = libao1Fragment; - this.mSearchListener = libao1Fragment; - this.mIsSearch = isSearch; - this.mSerchKey = key; + Libao1FragmentAdapter(Libao1Fragment libao1Fragment,OnRequestCallBackListener requestCallBackListener, + OnSearchCallBackListener searchListener, boolean isSearch, String key, String entrance) { + super(libao1Fragment.getActivity()); + mLibao1Fragment = libao1Fragment; + mCallBackListener = requestCallBackListener; + mSearchListener = searchListener; + mIsSearch = isSearch; + mSerchKey = key; - this.entrance = entrance; + mEntrance = entrance; mLibaoList = new ArrayList<>(); @@ -240,9 +238,7 @@ class Libao1FragmentAdapter extends BaseRecyclerAdapter { holder.libaoDes.setText(content); if (libaoEntity.getStatus() != null) { - if (mContext instanceof Activity) { - LibaoUtils.initLibaoBtn((Activity) mContext, holder.libaoBtnStatus, libaoEntity, mLibaoDao, false, null, "(礼包中心-最新)"); - } + LibaoUtils.initLibaoBtn(mContext, holder.libaoBtnStatus, libaoEntity, mLibaoDao, false, null, "(礼包中心-最新)"); // holder.libaoBtnStatus.setClickable(false); String tv = holder.libaoBtnStatus.getText().toString(); if ("已结束".equals(tv) || "已领光".equals(tv)) { @@ -251,11 +247,7 @@ class Libao1FragmentAdapter extends BaseRecyclerAdapter { holder.libaoBtnStatus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - skipPosition = position; - AppController.put("libaoEntity", libaoEntity); - Intent intent = new Intent(mContext, LibaoDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance + "+(礼包中心-最新)"); - libao1Fragment.startActivityForResult(intent, 0x123); + startLibaoDetailActivity(position, libaoEntity); } }); } @@ -264,15 +256,17 @@ class Libao1FragmentAdapter extends BaseRecyclerAdapter { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - skipPosition = position; - AppController.put("libaoEntity", libaoEntity); - Intent intent = new Intent(mContext, LibaoDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance + "+(礼包中心-最新)"); - libao1Fragment.startActivityForResult(intent, 0x123); + startLibaoDetailActivity(position, libaoEntity); } }); } + public void startLibaoDetailActivity(int position, LibaoEntity libaoEntity) { + skipPosition = position; + Intent intent = LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心-最新)"); + mLibao1Fragment.startActivityForResult(intent, 0x123); + } + private void initSearchViewHolder(final LibaoSearchViewHolder holder) { if (mSerchKey != null) { holder.searchEt.setText(mSerchKey); @@ -309,7 +303,7 @@ class Libao1FragmentAdapter extends BaseRecyclerAdapter { public void onFocusChange(View v, boolean hasFocus) { if (!hasFocus) { InputMethodManager imm = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(libao1Fragment.getActivity().getWindow().getDecorView().getWindowToken(), 0); + imm.hideSoftInputFromWindow(mLibao1Fragment.getActivity().getWindow().getDecorView().getWindowToken(), 0); } } }); 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 225d41959c..6fa966ac3e 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -1,6 +1,5 @@ package com.gh.gamecenter.libao; -import android.app.Activity; import android.content.Intent; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; @@ -10,7 +9,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; -import com.gh.base.AppController; +import com.gh.base.OnRequestCallBackListener; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ConcernUtils; import com.gh.common.util.DisplayUtils; @@ -22,14 +22,12 @@ import com.gh.common.util.PlatformUtils; import com.gh.gamecenter.ConcernActivity; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder; import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; -import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.newsdetail.NewsDetailCommentViewHolder; import com.gh.gamecenter.retrofit.ObservableUtil; @@ -56,9 +54,9 @@ import rx.schedulers.Schedulers; */ class Libao2FragmentAdapter extends BaseRecyclerAdapter { - private Libao2Fragment libao2Fragment; + private Libao2Fragment mLibao2Fragment; - private OnCallBackListener mCallBackListener; + private OnRequestCallBackListener mCallBackListener; private List mLibaoList; private List gameIdList; @@ -70,7 +68,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { private String key; private String ids; - private String entrance; + private String mEntrance; private int skipPosition; @@ -78,11 +76,11 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { Libao2FragmentAdapter(Libao2Fragment libao2Fragment, String entrance) { - super(libao2Fragment.getContext()); - this.libao2Fragment = libao2Fragment; - this.mCallBackListener = libao2Fragment; + super(libao2Fragment.getActivity()); + mLibao2Fragment = libao2Fragment; + mCallBackListener = libao2Fragment; - this.entrance = entrance; + mEntrance = entrance; mLibaoList = new ArrayList<>(); gameIdList = new ArrayList<>(); @@ -343,9 +341,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { holder.libaoDes.setText(content); if (libaoEntity.getStatus() != null) { - if (mContext instanceof Activity) { - LibaoUtils.initLibaoBtn((Activity) mContext, holder.libaoBtnStatus, libaoEntity, mLibaoDao, false, null, "(礼包中心-关注)"); - } + LibaoUtils.initLibaoBtn(mContext, holder.libaoBtnStatus, libaoEntity, mLibaoDao, false, null, "(礼包中心-关注)"); holder.libaoBtnStatus.setClickable(false); String tv = holder.libaoBtnStatus.getText().toString(); if ("已结束".equals(tv) || "已领光".equals(tv)) { @@ -354,11 +350,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { holder.libaoBtnStatus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - skipPosition = position; - AppController.put("libaoEntity", libaoEntity); - Intent intent = new Intent(mContext, LibaoDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance + "+(礼包中心-关注)"); - libao2Fragment.startActivityForResult(intent, 0x123); + startLibaoDetailActivity(position, libaoEntity); } }); } @@ -367,15 +359,17 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - skipPosition = position; - AppController.put("libaoEntity", libaoEntity); - Intent intent = new Intent(mContext, LibaoDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance + "+(礼包中心-关注)"); - libao2Fragment.startActivityForResult(intent, 0x123); + startLibaoDetailActivity(position, libaoEntity); } }); } + public void startLibaoDetailActivity(int position, LibaoEntity libaoEntity) { + skipPosition = position; + Intent intent = LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心-关注)"); + mLibao2Fragment.startActivityForResult(intent, 0x123); + } + private void initSkipCommentViewHolder(NewsDetailCommentViewHolder holder) { LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT , ViewGroup.LayoutParams.WRAP_CONTENT); @@ -387,8 +381,8 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { @Override public void onClick(View v) { Intent intent = new Intent(mContext, ConcernActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance + "+(礼包中心-关注)"); - libao2Fragment.startActivityForResult(intent, 0x223); + intent.putExtra(EntranceUtils.KEY_ENTRANCE, mEntrance + "+(礼包中心-关注)"); + mLibao2Fragment.startActivityForResult(intent, 0x223); } }); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index 7d964c17ef..cf1e8802a4 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -39,7 +39,7 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O Runnable runnable = new Runnable() { @Override public void run() { - adapter = new Libao3FragmentAdapter(Libao3Fragment.this, mEntrance); + adapter = new Libao3FragmentAdapter(getActivity(), Libao3Fragment.this, mEntrance); mRecyclerView.setAdapter(adapter); mRefreshLayout.setRefreshing(false); } @@ -60,7 +60,7 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O mRecyclerView.setHasFixedSize(true); mLayoutManager = new LinearLayoutManager(getActivity()); mRecyclerView.setLayoutManager(mLayoutManager); - adapter = new Libao3FragmentAdapter(Libao3Fragment.this, mEntrance); + adapter = new Libao3FragmentAdapter(getActivity(), this, mEntrance); mRecyclerView.addItemDecoration(new VerticalItemDecoration(getContext(), 8, true)); mRecyclerView.setAdapter(adapter); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index 9279610377..594579259d 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -1,15 +1,15 @@ package com.gh.gamecenter.libao; -import android.content.Intent; +import android.content.Context; import android.text.Html; import android.text.Spanned; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; -import com.gh.base.AppController; +import com.gh.base.OnRequestCallBackListener; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.util.DialogUtils; -import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.LibaoUtils; import com.gh.common.util.PlatformUtils; @@ -17,12 +17,10 @@ import com.gh.common.util.StringUtils; import com.gh.common.util.Utils; import com.gh.gamecenter.LibaoDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder; import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.db.info.LibaoInfo; import com.gh.gamecenter.entity.LibaoEntity; -import com.gh.listener.OnCallBackListener; import java.util.ArrayList; import java.util.List; @@ -34,20 +32,20 @@ import retrofit2.HttpException; */ class Libao3FragmentAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mCallBackListener; + private OnRequestCallBackListener mCallBackListener; private List mLibaoList; private List mLibaoInfos; private LibaoDao mLibaoDao; - private String entrance; + private String mEntrance; - Libao3FragmentAdapter(Libao3Fragment libao3Fragment, String entrance) { - super(libao3Fragment.getContext()); - this.mCallBackListener = libao3Fragment; + Libao3FragmentAdapter(Context context, OnRequestCallBackListener listener, String entrance) { + super(context); + mCallBackListener = listener; - this.entrance = entrance; + mEntrance = entrance; mLibaoList = new ArrayList<>(); @@ -135,10 +133,7 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter { holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - AppController.put("libaoEntity", libaoEntity); - Intent intent = new Intent(mContext, LibaoDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance + "+(礼包中心-存号箱)"); - mContext.startActivity(intent); + mContext.startActivity(LibaoDetailActivity.getIntent(mContext, libaoEntity, mEntrance + "+(礼包中心-存号箱)")); } }); diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index 4c6dd1250e..d53958363b 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -13,13 +13,13 @@ import com.gh.common.constant.ItemViewType; import com.gh.common.util.DisplayUtils; import com.gh.common.util.LibaoUtils; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.LibaoNormalViewHolder; import com.gh.gamecenter.db.LibaoDao; import com.gh.gamecenter.db.info.LibaoInfo; import com.gh.gamecenter.entity.LibaoEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -36,7 +36,7 @@ import rx.schedulers.Schedulers; */ public class LibaoHistoryAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mCallBackListener; + private OnRequestCallBackListener mCallBackListener; private List mLibaoList; private LibaoDao mLibaoDao; diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java index d9639e3154..826ddccf0d 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java @@ -12,12 +12,12 @@ import com.gh.common.util.TokenUtils; import com.gh.gamecenter.CommentDetailActivity; import com.gh.gamecenter.MessageDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.entity.MessageCommentEntity; import com.gh.gamecenter.entity.UserEntity; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -38,7 +38,7 @@ import rx.schedulers.Schedulers; */ public class CommentFragmentAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mCallBackListener; + private OnRequestCallBackListener mCallBackListener; private CommentFragment fragment; diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index 4ef7ffc1b4..b7b57087a1 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -18,7 +18,7 @@ import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; import com.gh.gamecenter.WebActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.db.KeFuMarkReadDao; import com.gh.gamecenter.db.MessageMarkReadDao; @@ -26,7 +26,7 @@ import com.gh.gamecenter.db.info.KeFuMarkReadInfo; import com.gh.gamecenter.db.info.MessageMarkReadInfo; import com.gh.gamecenter.entity.MessageKeFuEntity; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.google.gson.Gson; @@ -54,7 +54,7 @@ public class KeFuFragmentAdapter extends BaseRecyclerAdapter { private KeFuFragment fragment; - private OnCallBackListener mCallBackListener; + private OnRequestCallBackListener mCallBackListener; private MessageMarkReadDao mReadDao; private KeFuMarkReadDao mKeFuReadDao; 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 53f0235ae5..5ff6c3a6bc 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -15,7 +15,7 @@ import com.gh.common.util.DisplayUtils; import com.gh.common.util.TokenUtils; import com.gh.common.util.Utils; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.FragmentAdapter; +import com.gh.base.adapter.FragmentAdapter; import com.gh.gamecenter.db.KeFuMarkReadDao; import com.gh.gamecenter.entity.MessageUnreadEntity; import com.gh.gamecenter.eventbus.EBReuse; diff --git a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java index dc3d7bd159..8b2396d1ba 100644 --- a/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/NoticeFragmentAdapter.java @@ -18,7 +18,7 @@ import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; import com.gh.gamecenter.WebActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.db.MessageMarkReadDao; import com.gh.gamecenter.db.NoticeMarkReadDao; @@ -26,7 +26,7 @@ import com.gh.gamecenter.db.info.MessageMarkReadInfo; import com.gh.gamecenter.db.info.NoticeMarkReadInfo; import com.gh.gamecenter.entity.MessageNoticeEntity; import com.gh.gamecenter.eventbus.EBUISwitch; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.google.gson.Gson; @@ -53,7 +53,7 @@ import rx.schedulers.Schedulers; public class NoticeFragmentAdapter extends BaseRecyclerAdapter { private NoticeFragment fragment; - private OnCallBackListener mCallBackListener; + private OnRequestCallBackListener mCallBackListener; private MessageMarkReadDao mReadDao; private NoticeMarkReadDao mNoticReadDao; diff --git a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java index e858856ce4..a408484b67 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java @@ -17,14 +17,14 @@ import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage1ViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage2ViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage3ViewHolder; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.ViewsEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.VisitManager; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.ObservableUtil; @@ -55,7 +55,7 @@ import rx.schedulers.Schedulers; public class News1FragmentAdapter extends BaseRecyclerAdapter { private News1Fragment fragment; - private OnCallBackListener listener; + private OnRequestCallBackListener listener; private List newsList; diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java index cafb51daf4..916bee2924 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -12,6 +12,8 @@ import android.view.ViewGroup; import android.widget.Toast; import com.gh.base.AppController; +import com.gh.base.OnRequestCallBackListener; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.common.constant.ItemViewType; import com.gh.common.util.ConcernContentUtils; import com.gh.common.util.ConcernUtils; @@ -32,7 +34,6 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.ShareCardActivity; import com.gh.gamecenter.ShareCardPicActivity; import com.gh.gamecenter.WebActivity; -import com.gh.base.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsDigestViewHolder; import com.gh.gamecenter.db.LibaoDao; @@ -43,7 +44,6 @@ import com.gh.gamecenter.entity.ConcernEntity; import com.gh.gamecenter.entity.LibaoEntity; import com.gh.gamecenter.entity.LibaoStatusEntity; import com.gh.gamecenter.entity.ViewsEntity; -import com.gh.listener.OnCallBackListener; import com.gh.gamecenter.manager.CommentManager; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.manager.VisitManager; @@ -80,7 +80,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { private News2Fragment fragment; - private OnCallBackListener listener; + private OnRequestCallBackListener listener; private List concernList; private List gameIdList; @@ -563,15 +563,14 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + LibaoEntity entity = null; for (LibaoStatusEntity libaoStatusEntity : libaoStatusList) { if (concernEntity.getId().equals(libaoStatusEntity.getId())) { - AppController.put("libaoEntity", LibaoEntity.createLibaoEntity( - concernEntity, libaoStatusEntity, finalLibaoCode)); + entity = LibaoEntity.createLibaoEntity(concernEntity, libaoStatusEntity, finalLibaoCode); } } skipPosition = viewHolder.getPosition(); - Intent intent = new Intent(mContext, LibaoDetailActivity.class); - intent.putExtra(EntranceUtils.KEY_ENTRANCE, "(资讯:关注[2-4])"); + Intent intent = LibaoDetailActivity.getIntent(mContext, entity, "(资讯:关注[2-4])"); fragment.startActivityForResult(intent, 0x122); } }); diff --git a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java index 3c83552da9..af23821f23 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java @@ -11,11 +11,11 @@ import com.gh.common.util.DataUtils; import com.gh.common.util.NewsUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.NewsFooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsTextViewHolder; import com.gh.gamecenter.entity.NewsEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.DataCollectionManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -36,7 +36,7 @@ import rx.schedulers.Schedulers; */ public class News3FragmentAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mCallBackListener; + private OnRequestCallBackListener mCallBackListener; private List mNewsList; @@ -44,7 +44,7 @@ public class News3FragmentAdapter extends BaseRecyclerAdapter { private boolean isLoading; private boolean isNetworkError; - public News3FragmentAdapter(Context context, OnCallBackListener callBackListener) { + public News3FragmentAdapter(Context context, OnRequestCallBackListener callBackListener) { super(context); this.mCallBackListener = callBackListener; mNewsList = new ArrayList<>(); diff --git a/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java index 4898e3a964..2d86d7628e 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java @@ -7,7 +7,7 @@ import android.widget.LinearLayout; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.StrategyDialogViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.manager.ConcernManager; diff --git a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java index 0712cd2262..f8e7df5ea9 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News4FragmentAdapter.java @@ -17,14 +17,14 @@ import com.gh.common.util.ImageUtils; import com.gh.common.util.NewsUtils; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage1ViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage2ViewHolder; import com.gh.gamecenter.adapter.viewholder.NewsImage3ViewHolder; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.ViewsEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.VisitManager; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.ObservableUtil; @@ -55,7 +55,7 @@ import rx.schedulers.Schedulers; public class News4FragmentAdapter extends BaseRecyclerAdapter { private News4Fragment fragment; - private OnCallBackListener listener; + private OnRequestCallBackListener listener; private List newsList; diff --git a/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java b/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java index cc4688b376..80d5c41aea 100644 --- a/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/NewsFragment.java @@ -14,7 +14,7 @@ import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.FragmentAdapter; +import com.gh.base.adapter.FragmentAdapter; import com.gh.gamecenter.eventbus.EBUISwitch; import com.gh.gamecenter.fragment.HomeFragment; diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index b3d2038e14..4f3544d2b5 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -45,7 +45,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; import com.gh.gamecenter.ViewImageActivity; import com.gh.gamecenter.WebActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.NewsDetailCommentListViewHolder; import com.gh.gamecenter.db.VoteDao; import com.gh.gamecenter.db.info.VoteInfo; @@ -55,7 +55,7 @@ import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.NewsDetailEntity; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.adapter.viewholder.GameDetailTopViewHolder; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.ConcernManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -83,7 +83,7 @@ import rx.schedulers.Schedulers; */ public class NewsDetailAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mListener; + private OnRequestCallBackListener mListener; private List mCommentEntityList; private GameEntity mGameEntity; @@ -103,7 +103,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { private VoteDao mVoteDao; private int defaultTextZoom = 85; - public NewsDetailAdapter(Context context, OnCallBackListener listener, String entrance) { + public NewsDetailAdapter(Context context, OnRequestCallBackListener listener, String entrance) { super(context); mListener = listener; mEntrance = entrance; 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 b5ac44d713..59a668e88f 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailCommentViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailCommentViewHolder.java @@ -1,24 +1,22 @@ package com.gh.gamecenter.newsdetail; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2016/11/28. */ -public class NewsDetailCommentViewHolder extends RecyclerView.ViewHolder { +public class NewsDetailCommentViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.newsdetail_item_comment) public TextView commentTv; public NewsDetailCommentViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java index cc44668b1c..bbc7e293ce 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/ConcernFragmentAdapter.java @@ -19,7 +19,7 @@ import com.gh.common.util.ImageUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; diff --git a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java index cd54ed2ca9..c63412218a 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/personal/InstallFragmentAdapter.java @@ -34,7 +34,7 @@ import com.gh.download.DownloadManager; import com.gh.gamecenter.ChooseReceiverActivity; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalSwipeViewHolder; import com.gh.gamecenter.db.info.ConcernInfo; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java index d847451af7..e79cc8a236 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java @@ -24,7 +24,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -33,7 +33,7 @@ import java.util.ArrayList; import butterknife.BindView; -public class SearchGameDetailFragment extends BaseFragment implements OnCallBackListener { +public class SearchGameDetailFragment extends BaseFragment implements OnRequestCallBackListener { @BindView(R.id.search_detail) RecyclerView search_detail; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index 088114df8f..faebe9ab18 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -19,12 +19,12 @@ import com.gh.common.util.StringUtils; import com.gh.common.view.DownloadDialog; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBSearch; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -39,7 +39,7 @@ import rx.schedulers.Schedulers; class SearchGameDetailFragmentAdapter extends BaseRecyclerAdapter { - private OnCallBackListener listener; + private OnRequestCallBackListener listener; private List gameList; private ArrayMap> locationMap; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java index f7265849a6..f9f1de6d34 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragment.java @@ -24,7 +24,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -33,7 +33,7 @@ import java.util.ArrayList; import butterknife.BindView; -public class SearchGameListFragment extends BaseFragment implements OnCallBackListener { +public class SearchGameListFragment extends BaseFragment implements OnRequestCallBackListener { @BindView(R.id.search_detail) RecyclerView search_detail; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java index 50e98f80b9..4e1a30daf5 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameListFragmentAdapter.java @@ -19,14 +19,14 @@ import com.gh.common.util.StringUtils; import com.gh.common.view.DownloadDialog; import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.adapter.viewholder.SearchHistoryViewHolder; import com.gh.gamecenter.db.SearchHistoryDao; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.eventbus.EBSearch; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -41,7 +41,7 @@ import rx.schedulers.Schedulers; class SearchGameListFragmentAdapter extends BaseRecyclerAdapter { - private OnCallBackListener listener; + private OnRequestCallBackListener listener; private SearchHistoryDao dao; diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java index ab25a0712e..893d5b8024 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java @@ -15,7 +15,7 @@ import android.widget.TextView; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.db.SearchHistoryDao; import com.gh.gamecenter.eventbus.EBSearch; diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java index 0056a4e3e7..776c198df2 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java @@ -26,14 +26,14 @@ import com.gh.gamecenter.GameDetailActivity; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.SubjectActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.adapter.viewholder.GameImageViewHolder; import com.gh.gamecenter.adapter.viewholder.GameNormalViewHolder; import com.gh.gamecenter.adapter.viewholder.GameTestViewHolder; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.manager.GameManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -54,7 +54,7 @@ import static android.R.attr.name; public class SubjectAdapter extends BaseRecyclerAdapter { - private OnCallBackListener mOnCallBackListener; + private OnRequestCallBackListener mOnRequestCallBackListener; private List mSubjectList; @@ -72,10 +72,10 @@ public class SubjectAdapter extends BaseRecyclerAdapter { private boolean mIsOrder; private boolean mIsLoaded; - public SubjectAdapter(Context context, OnCallBackListener listener, String type, String id + public SubjectAdapter(Context context, OnRequestCallBackListener listener, String type, String id , String name, String entrance, String order, String tagType, boolean isOrder) { super(context); - this.mOnCallBackListener = listener; + this.mOnRequestCallBackListener = listener; this.mType = type; this.mId = id; this.mName = name; @@ -133,11 +133,11 @@ public class SubjectAdapter extends BaseRecyclerAdapter { initLocationMap(); - if (mOnCallBackListener != null) { + if (mOnRequestCallBackListener != null) { if (mSubjectList.size() == 0) { - mOnCallBackListener.loadEmpty(); + mOnRequestCallBackListener.loadEmpty(); } else { - mOnCallBackListener.loadDone(); + mOnRequestCallBackListener.loadDone(); } } @@ -149,8 +149,8 @@ public class SubjectAdapter extends BaseRecyclerAdapter { mIsLoaded = true; if (page == 1) { - if (mOnCallBackListener != null) { - mOnCallBackListener.loadError(); + if (mOnRequestCallBackListener != null) { + mOnRequestCallBackListener.loadError(); } } else { Toast.makeText(mContext, "加载失败，请检查网络状态", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SelectGameViewHolder.java b/app/src/main/java/com/gh/gamecenter/suggest/SelectGameViewHolder.java index 74b9c5f0a5..ac4389097a 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SelectGameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SelectGameViewHolder.java @@ -1,19 +1,18 @@ package com.gh.gamecenter.suggest; -import android.support.v7.widget.RecyclerView; 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; -import butterknife.ButterKnife; /** * Created by khy on 2017/4/1. */ -public class SelectGameViewHolder extends RecyclerView.ViewHolder { +public class SelectGameViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.game_icon) public SimpleDraweeView gameIcon; @@ -22,6 +21,5 @@ public class SelectGameViewHolder extends RecyclerView.ViewHolder { public SelectGameViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } 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 66103bbdac..233a0e9541 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java @@ -11,7 +11,7 @@ import android.view.ViewGroup; import com.gh.common.util.Utils; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import java.util.ArrayList; import java.util.List; 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 47f58bde11..0a2666036f 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicViewHolder.java @@ -1,19 +1,18 @@ package com.gh.gamecenter.suggest; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import com.facebook.drawee.view.SimpleDraweeView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2017/3/31. */ -public class SuggestPicViewHolder extends RecyclerView.ViewHolder { +public class SuggestPicViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.pic_item_icon) public SimpleDraweeView icon; @@ -22,6 +21,5 @@ public class SuggestPicViewHolder extends RecyclerView.ViewHolder { public SuggestPicViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } } diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java index 52ff5805f2..b64fe24293 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectGameAdapter.java @@ -11,9 +11,9 @@ import android.widget.ProgressBar; import com.gh.common.util.BitmapUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.entity.InstallGameEntity; -import com.gh.listener.OnCallBackListener; +import com.gh.base.OnRequestCallBackListener; import com.gh.gamecenter.retrofit.*; import java.io.File; @@ -29,7 +29,7 @@ import rx.android.schedulers.*; */ public class SuggestSelectGameAdapter extends BaseRecyclerAdapter { - private OnCallBackListener listener; + private OnRequestCallBackListener listener; private List apkList; diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeAdapter.java index 2e5617cdf3..8589fedab7 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeAdapter.java @@ -9,7 +9,7 @@ import android.view.ViewGroup; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; -import com.gh.base.BaseRecyclerAdapter; +import com.gh.base.adapter.BaseRecyclerAdapter; /** * Created by khy on 2017/3/31. diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeViewHolder.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeViewHolder.java index 0dd0f5204f..0a3cbd7870 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestTypeViewHolder.java @@ -1,19 +1,18 @@ package com.gh.gamecenter.suggest; -import android.support.v7.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import com.gh.base.BaseRecyclerViewHolder; import com.gh.gamecenter.R; import butterknife.BindView; -import butterknife.ButterKnife; /** * Created by khy on 2017/3/31. */ -public class SuggestTypeViewHolder extends RecyclerView.ViewHolder { +public class SuggestTypeViewHolder extends BaseRecyclerViewHolder { @BindView(R.id.suggest_type_icon) public ImageView icon; @@ -22,6 +21,5 @@ public class SuggestTypeViewHolder extends RecyclerView.ViewHolder { public SuggestTypeViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); } }