diff --git a/app/src/main/java/com/codeest/geeknews/app/Constants.java b/app/src/main/java/com/codeest/geeknews/app/Constants.java index 24f2b89..a886737 100755 --- a/app/src/main/java/com/codeest/geeknews/app/Constants.java +++ b/app/src/main/java/com/codeest/geeknews/app/Constants.java @@ -73,31 +73,53 @@ public class Constants { public static final String SP_MANAGER_POINT = "manager_point"; //================= INTENT ==================== - public static final String IT_GANK_TYPE = "type"; + public static final String IT_GANK_TYPE = "gank_type"; - public static final String IT_GANK_TYPE_CODE = "type_code"; + public static final String IT_GANK_TYPE_CODE = "gank_type_code"; - public static final String IT_DETAIL_TITLE = "title"; + public static final String IT_GANK_DETAIL_TITLE = "gank_detail_title"; - public static final String IT_DETAIL_URL = "url"; + public static final String IT_GANK_DETAIL_URL = "gank_detail_url"; - public static final String IT_DETAIL_IMG_URL = "img_url"; + public static final String IT_GANK_DETAIL_IMG_URL = "gank_detail_img_url"; - public static final String IT_DETAIL_ID = "id"; + public static final String IT_GANK_DETAIL_ID = "gank_detail_id"; - public static final String IT_DETAIL_TYPE = "type"; + public static final String IT_GANK_DETAIL_TYPE = "gank_detail_type"; - public static final String IT_GOLD_TYPE = "type"; + public static final String IT_GANK_GRIL_ID = "gank_girl_id"; - public static final String IT_GOLD_TYPE_STR = "type_str"; + public static final String IT_GANK_GRIL_URL = "gank_girl_url"; - public static final String IT_GOLD_MANAGER = "manager"; + public static final String IT_GOLD_TYPE = "gold_type"; - public static final String IT_VTEX_TYPE = "type"; + public static final String IT_GOLD_TYPE_STR = "gold_type_str"; - public static final String IT_VTEX_TOPIC_ID = "id"; + public static final String IT_GOLD_MANAGER = "gold_manager"; - public static final String IT_VTEX_REPLIES_TOP = "top_info"; + public static final String IT_VTEX_TYPE = "vtex_type"; - public static final String IT_VTEX_NODE_NAME = "node_name"; + public static final String IT_VTEX_TOPIC_ID = "vtex_id"; + + public static final String IT_VTEX_REPLIES_TOP = "vtex_replies_top"; + + public static final String IT_VTEX_NODE_NAME = "vtex_node_name"; + + public static final String IT_ZHIHU_DETAIL_ID = "zhihu_detail_id"; + + public static final String IT_ZHIHU_DETAIL_TRANSITION = "zhihu_detail_transition"; + + public static final String IT_ZHIHU_THEME_ID = "zhihu_theme_id"; + + public static final String IT_ZHIHU_SECTION_ID = "zhihu_section_id"; + + public static final String IT_ZHIHU_SECTION_TITLE = "zhihu_section_title"; + + public static final String IT_ZHIHU_COMMENT_ID = "zhihu_comment_id"; + + public static final String IT_ZHIHU_COMMENT_ALL_NUM = "zhihu_comment_all_num"; + + public static final String IT_ZHIHU_COMMENT_SHORT_NUM = "zhihu_comment_short_num"; + + public static final String IT_ZHIHU_COMMENT_LONG_NUM = "zhihu_comment_long_num"; } diff --git a/app/src/main/java/com/codeest/geeknews/base/BaseActivity.java b/app/src/main/java/com/codeest/geeknews/base/BaseActivity.java index 574f452..2bd94e9 100755 --- a/app/src/main/java/com/codeest/geeknews/base/BaseActivity.java +++ b/app/src/main/java/com/codeest/geeknews/base/BaseActivity.java @@ -65,14 +65,22 @@ public void useNightMode(boolean isNight) { @Override public void stateError() { + + } + + @Override + public void stateEmpty() { + } @Override public void stateLoading() { + } @Override public void stateMain() { + } protected abstract void initInject(); diff --git a/app/src/main/java/com/codeest/geeknews/base/BaseFragment.java b/app/src/main/java/com/codeest/geeknews/base/BaseFragment.java index 1e0fcc6..b9533b5 100755 --- a/app/src/main/java/com/codeest/geeknews/base/BaseFragment.java +++ b/app/src/main/java/com/codeest/geeknews/base/BaseFragment.java @@ -61,6 +61,11 @@ public void stateError() { } + @Override + public void stateEmpty() { + + } + @Override public void stateLoading() { diff --git a/app/src/main/java/com/codeest/geeknews/base/BaseView.java b/app/src/main/java/com/codeest/geeknews/base/BaseView.java index fb41e70..252d7c9 100755 --- a/app/src/main/java/com/codeest/geeknews/base/BaseView.java +++ b/app/src/main/java/com/codeest/geeknews/base/BaseView.java @@ -13,6 +13,8 @@ public interface BaseView { //======= State ======= void stateError(); + void stateEmpty(); + void stateLoading(); void stateMain(); diff --git a/app/src/main/java/com/codeest/geeknews/base/RootActivity.java b/app/src/main/java/com/codeest/geeknews/base/RootActivity.java index aa6b61b..fb5372e 100644 --- a/app/src/main/java/com/codeest/geeknews/base/RootActivity.java +++ b/app/src/main/java/com/codeest/geeknews/base/RootActivity.java @@ -24,7 +24,10 @@ public abstract class RootActivity extends BaseActivity private LinearLayout viewError; private FrameLayout viewLoading; private ViewGroup viewMain; + ViewGroup mParent; + private int currentState = STATE_MAIN; + private boolean isErrorViewAdded = false; @Override protected void initEventAndData() { @@ -35,15 +38,12 @@ protected void initEventAndData() { } if (!(viewMain.getParent() instanceof ViewGroup)) { throw new IllegalStateException( - "view_main's ParentView should be a ViewGroup"); + "view_main's ParentView should be a ViewGroup."); } - ViewGroup parent = (ViewGroup) viewMain.getParent(); - View.inflate(mContext, R.layout.view_error, parent); - View.inflate(mContext, R.layout.view_progress, parent); - viewError = (LinearLayout) parent.findViewById(R.id.view_error); - viewLoading = (FrameLayout) parent.findViewById(R.id.view_loading); + mParent = (ViewGroup) viewMain.getParent(); + View.inflate(mContext, R.layout.view_progress, mParent); + viewLoading = (FrameLayout) mParent.findViewById(R.id.view_loading); ivLoading = (ProgressImageView) viewLoading.findViewById(R.id.iv_progress); - viewError.setVisibility(View.GONE); viewLoading.setVisibility(View.GONE); viewMain.setVisibility(View.VISIBLE); } @@ -52,6 +52,11 @@ protected void initEventAndData() { public void stateError() { if (currentState == STATE_ERROR) return; + if (!isErrorViewAdded) { + isErrorViewAdded = true; + View.inflate(mContext, R.layout.view_error, mParent); + viewError = (LinearLayout) mParent.findViewById(R.id.view_error); + } hideCurrentView(); currentState = STATE_ERROR; viewError.setVisibility(View.VISIBLE); @@ -86,7 +91,9 @@ private void hideCurrentView() { viewLoading.setVisibility(View.GONE); break; case STATE_ERROR: - viewError.setVisibility(View.GONE); + if (viewError != null) { + viewError.setVisibility(View.GONE); + } break; } } diff --git a/app/src/main/java/com/codeest/geeknews/base/SimpleFragment.java b/app/src/main/java/com/codeest/geeknews/base/SimpleFragment.java index a784811..2d529c2 100644 --- a/app/src/main/java/com/codeest/geeknews/base/SimpleFragment.java +++ b/app/src/main/java/com/codeest/geeknews/base/SimpleFragment.java @@ -43,26 +43,13 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); mUnBinder = ButterKnife.bind(this, view); - if (savedInstanceState == null) { - if (!isHidden()) { - isInited = true; - initEventAndData(); - } - } else { - if (!isSupportHidden()) { - isInited = true; - initEventAndData(); - } - } } @Override - public void onHiddenChanged(boolean hidden) { - super.onHiddenChanged(hidden); - if (!isInited && !hidden) { - isInited = true; - initEventAndData(); - } + public void onLazyInitView(@Nullable Bundle savedInstanceState) { + super.onLazyInitView(savedInstanceState); + isInited = true; + initEventAndData(); } @Override diff --git a/app/src/main/java/com/codeest/geeknews/ui/gank/activity/GirlDetailActivity.java b/app/src/main/java/com/codeest/geeknews/ui/gank/activity/GirlDetailActivity.java index 8c89718..2ce04e3 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/gank/activity/GirlDetailActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/gank/activity/GirlDetailActivity.java @@ -53,8 +53,8 @@ protected void initEventAndData() { setToolBar(toolBar,""); mRealmHelper = App.getAppComponent().realmHelper(); Intent intent = getIntent(); - url = intent.getExtras().getString("url"); - id = intent.getExtras().getString("id"); + url = intent.getExtras().getString(Constants.IT_GANK_GRIL_URL); + id = intent.getExtras().getString(Constants.IT_GANK_GRIL_ID); if (url != null) { Glide.with(mContext).load(url).asBitmap().into(new SimpleTarget() { @Override diff --git a/app/src/main/java/com/codeest/geeknews/ui/gank/activity/TechDetailActivity.java b/app/src/main/java/com/codeest/geeknews/ui/gank/activity/TechDetailActivity.java index 1f6f174..72fb407 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/gank/activity/TechDetailActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/gank/activity/TechDetailActivity.java @@ -59,11 +59,11 @@ protected void initEventAndData() { mRealmHelper = App.getAppComponent().realmHelper(); mImplPreferencesHelper = App.getAppComponent().preferencesHelper(); Intent intent = getIntent(); - type = intent.getExtras().getInt(Constants.IT_DETAIL_TYPE); - title = intent.getExtras().getString(Constants.IT_DETAIL_TITLE); - url = intent.getExtras().getString(Constants.IT_DETAIL_URL); - imgUrl = intent.getExtras().getString(Constants.IT_DETAIL_IMG_URL); - id = intent.getExtras().getString(Constants.IT_DETAIL_ID); + type = intent.getExtras().getInt(Constants.IT_GANK_DETAIL_TYPE); + title = intent.getExtras().getString(Constants.IT_GANK_DETAIL_TITLE); + url = intent.getExtras().getString(Constants.IT_GANK_DETAIL_URL); + imgUrl = intent.getExtras().getString(Constants.IT_GANK_DETAIL_IMG_URL); + id = intent.getExtras().getString(Constants.IT_GANK_DETAIL_ID); setToolBar(toolBar,title); WebSettings settings = wvTechContent.getSettings(); if (mImplPreferencesHelper.getNoImageState()) { @@ -234,21 +234,21 @@ public static void launch(Builder builder) { if (builder.shareView != null) { Intent intent = new Intent(); intent.setClass(builder.mContext, TechDetailActivity.class); - intent.putExtra(Constants.IT_DETAIL_URL, builder.url); - intent.putExtra(Constants.IT_DETAIL_IMG_URL, builder.imgUrl); - intent.putExtra(Constants.IT_DETAIL_TITLE, builder.title); - intent.putExtra(Constants.IT_DETAIL_ID, builder.id); - intent.putExtra(Constants.IT_DETAIL_TYPE, builder.type); + intent.putExtra(Constants.IT_GANK_DETAIL_URL, builder.url); + intent.putExtra(Constants.IT_GANK_DETAIL_IMG_URL, builder.imgUrl); + intent.putExtra(Constants.IT_GANK_DETAIL_TITLE, builder.title); + intent.putExtra(Constants.IT_GANK_DETAIL_ID, builder.id); + intent.putExtra(Constants.IT_GANK_DETAIL_TYPE, builder.type); ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(builder.mActivity, builder.shareView, "shareView"); builder.mContext.startActivity(intent,options.toBundle()); } else { Intent intent = new Intent(); intent.setClass(builder.mContext, TechDetailActivity.class); - intent.putExtra(Constants.IT_DETAIL_URL, builder.url); - intent.putExtra(Constants.IT_DETAIL_IMG_URL, builder.imgUrl); - intent.putExtra(Constants.IT_DETAIL_TITLE, builder.title); - intent.putExtra(Constants.IT_DETAIL_ID, builder.id); - intent.putExtra(Constants.IT_DETAIL_TYPE, builder.type); + intent.putExtra(Constants.IT_GANK_DETAIL_URL, builder.url); + intent.putExtra(Constants.IT_GANK_DETAIL_IMG_URL, builder.imgUrl); + intent.putExtra(Constants.IT_GANK_DETAIL_TITLE, builder.title); + intent.putExtra(Constants.IT_GANK_DETAIL_ID, builder.id); + intent.putExtra(Constants.IT_GANK_DETAIL_TYPE, builder.type); builder.mContext.startActivity(intent); } } diff --git a/app/src/main/java/com/codeest/geeknews/ui/gank/fragment/GirlFragment.java b/app/src/main/java/com/codeest/geeknews/ui/gank/fragment/GirlFragment.java index 665c056..f9e48b0 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/gank/fragment/GirlFragment.java +++ b/app/src/main/java/com/codeest/geeknews/ui/gank/fragment/GirlFragment.java @@ -8,6 +8,7 @@ import android.view.View; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.Constants; import com.codeest.geeknews.base.BaseFragment; import com.codeest.geeknews.model.bean.GankItemBean; import com.codeest.geeknews.presenter.gank.GirlPresenter; @@ -82,8 +83,8 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) { public void onItemClickListener(int position, View shareView) { Intent intent = new Intent(); intent.setClass(mContext, GirlDetailActivity.class); - intent.putExtra("url",mList.get(position).getUrl()); - intent.putExtra("id",mList.get(position).get_id()); + intent.putExtra(Constants.IT_GANK_GRIL_URL, mList.get(position).getUrl()); + intent.putExtra(Constants.IT_GANK_GRIL_ID, mList.get(position).get_id()); ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(mActivity, shareView, "shareView"); mContext.startActivity(intent,options.toBundle()); } diff --git a/app/src/main/java/com/codeest/geeknews/ui/main/adapter/LikeAdapter.java b/app/src/main/java/com/codeest/geeknews/ui/main/adapter/LikeAdapter.java index 5501ea0..ab27d9b 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/main/adapter/LikeAdapter.java +++ b/app/src/main/java/com/codeest/geeknews/ui/main/adapter/LikeAdapter.java @@ -197,15 +197,15 @@ public GirlViewHolder(View itemView) { } } - public void gotoDailyDetail(int id) { + private void gotoDailyDetail(int id) { Intent intent = new Intent(); intent.setClass(mContext, ZhihuDetailActivity.class); - intent.putExtra("id",id); - intent.putExtra("isNotTransition",true); + intent.putExtra(Constants.IT_ZHIHU_DETAIL_ID, id); + intent.putExtra(Constants.IT_ZHIHU_DETAIL_TRANSITION, true); mContext.startActivity(intent); } - public void gotoTechDetail(String url,String imgUrl, String title,String id,int type) { + private void gotoTechDetail(String url, String imgUrl, String title, String id, int type) { TechDetailActivity.launch(new TechDetailActivity.Builder() .setContext(mContext) .setUrl(url) @@ -215,15 +215,15 @@ public void gotoTechDetail(String url,String imgUrl, String title,String id,int .setType(type)); } - public void gotoGirlDetail(String url,String id) { + private void gotoGirlDetail(String url,String id) { Intent intent = new Intent(); intent.setClass(mContext, GirlDetailActivity.class); - intent.putExtra("url",url); - intent.putExtra("id",id); + intent.putExtra(Constants.IT_GANK_GRIL_URL, url); + intent.putExtra(Constants.IT_GANK_GRIL_ID, id); mContext.startActivity(intent); } - public void gotoVtexDetail(String topicId) { + private void gotoVtexDetail(String topicId) { Intent intent = new Intent(); intent.setClass(mContext, RepliesActivity.class); intent.putExtra(Constants.IT_VTEX_TOPIC_ID,topicId); diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/CommentActivity.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/CommentActivity.java index fa7c97c..e261b33 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/CommentActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/CommentActivity.java @@ -7,6 +7,7 @@ import android.support.v7.widget.Toolbar; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.Constants; import com.codeest.geeknews.base.SimpleActivity; import com.codeest.geeknews.ui.zhihu.adapter.CommentMainAdapter; import com.codeest.geeknews.ui.zhihu.fragment.CommentFragment; @@ -40,11 +41,10 @@ protected int getLayout() { @Override protected void initEventAndData() { Intent intent = getIntent(); - int allNum = intent.getExtras().getInt("allNum"); - int shortNum = intent.getExtras().getInt("shortNum"); - int longNum = intent.getExtras().getInt("longNum"); - int id = intent.getExtras().getInt("id"); - intent.getExtras().getInt("shortNum"); + int allNum = intent.getExtras().getInt(Constants.IT_ZHIHU_COMMENT_ALL_NUM); + int shortNum = intent.getExtras().getInt(Constants.IT_ZHIHU_COMMENT_SHORT_NUM); + int longNum = intent.getExtras().getInt(Constants.IT_ZHIHU_COMMENT_LONG_NUM); + int id = intent.getExtras().getInt(Constants.IT_ZHIHU_COMMENT_ID); setToolBar(toolBar,String.format("%d条评论",allNum)); CommentFragment shortCommentFragment = new CommentFragment(); diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/SectionActivity.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/SectionActivity.java index b3c8584..c7f03b8 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/SectionActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/SectionActivity.java @@ -9,6 +9,7 @@ import android.view.View; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.Constants; import com.codeest.geeknews.base.RootActivity; import com.codeest.geeknews.model.bean.SectionChildListBean; import com.codeest.geeknews.presenter.zhihu.SectionChildPresenter; @@ -74,7 +75,7 @@ public void OnItemClick(int position, View shareView) { mAdapter.notifyItemChanged(position); Intent intent = new Intent(); intent.setClass(mContext, ZhihuDetailActivity.class); - intent.putExtra("id", mList.get(position).getId()); + intent.putExtra(Constants.IT_ZHIHU_DETAIL_ID, mList.get(position).getId()); if (shareView != null) { mContext.startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(mContext, shareView, "shareView").toBundle()); } else { diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ThemeActivity.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ThemeActivity.java index 10469c4..c40f66e 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ThemeActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ThemeActivity.java @@ -13,11 +13,12 @@ import com.bumptech.glide.Glide; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.Constants; import com.codeest.geeknews.base.RootActivity; +import com.codeest.geeknews.base.contract.zhihu.ThemeChildContract; import com.codeest.geeknews.component.ImageLoader; import com.codeest.geeknews.model.bean.ThemeChildListBean; import com.codeest.geeknews.presenter.zhihu.ThemeChildPresenter; -import com.codeest.geeknews.base.contract.zhihu.ThemeChildContract; import com.codeest.geeknews.ui.zhihu.adapter.ThemeChildAdapter; import com.codeest.geeknews.util.SystemUtil; @@ -65,7 +66,7 @@ protected int getLayout() { protected void initEventAndData() { super.initEventAndData(); Intent intent = getIntent(); - final int id = intent.getExtras().getInt("id"); + final int id = intent.getExtras().getInt(Constants.IT_ZHIHU_THEME_ID); mList = new ArrayList<>(); mAdapter = new ThemeChildAdapter(mContext, mList); rvThemeChildList.setLayoutManager(new LinearLayoutManager(mContext)); @@ -80,7 +81,7 @@ public void onItemClick(int position, View shareView) { mAdapter.notifyItemChanged(position); Intent intent = new Intent(); intent.setClass(mContext, ZhihuDetailActivity.class); - intent.putExtra("id", mList.get(position).getId()); + intent.putExtra(Constants.IT_ZHIHU_DETAIL_ID, mList.get(position).getId()); if (shareView != null) { mContext.startActivity(intent, ActivityOptions.makeSceneTransitionAnimation(mContext, shareView, "shareView").toBundle()); } else { diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ZhihuDetailActivity.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ZhihuDetailActivity.java index 451f97e..19c8ec3 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ZhihuDetailActivity.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/activity/ZhihuDetailActivity.java @@ -11,12 +11,13 @@ import android.widget.TextView; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.Constants; import com.codeest.geeknews.base.RootActivity; +import com.codeest.geeknews.base.contract.zhihu.ZhihuDetailContract; import com.codeest.geeknews.component.ImageLoader; import com.codeest.geeknews.model.bean.DetailExtraBean; import com.codeest.geeknews.model.bean.ZhihuDetailBean; import com.codeest.geeknews.presenter.zhihu.ZhihuDetailPresenter; -import com.codeest.geeknews.base.contract.zhihu.ZhihuDetailContract; import com.codeest.geeknews.util.HtmlUtil; import com.codeest.geeknews.util.ShareUtil; import com.codeest.geeknews.util.SystemUtil; @@ -84,7 +85,7 @@ protected void initEventAndData() { super.initEventAndData(); setToolBar(viewToolbar,""); Intent intent = getIntent(); - id = intent.getExtras().getInt("id"); + id = intent.getExtras().getInt(Constants.IT_ZHIHU_DETAIL_ID); isNotTransition = intent.getBooleanExtra("isNotTransition",false); mPresenter.queryLikeData(id); mPresenter.getDetailData(id); @@ -200,10 +201,10 @@ public boolean onKeyDown(int keyCode, KeyEvent event) { void gotoComment() { Intent intent = getIntent(); intent.setClass(this,CommentActivity.class); - intent.putExtra("id",id); - intent.putExtra("allNum",allNum); - intent.putExtra("shortNum",shortNum); - intent.putExtra("longNum",longNum); + intent.putExtra(Constants.IT_ZHIHU_COMMENT_ID, id); + intent.putExtra(Constants.IT_ZHIHU_COMMENT_ALL_NUM, allNum); + intent.putExtra(Constants.IT_ZHIHU_COMMENT_SHORT_NUM, shortNum); + intent.putExtra(Constants.IT_ZHIHU_COMMENT_LONG_NUM, longNum); startActivity(intent); } diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/SectionAdapter.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/SectionAdapter.java index ff74695..96774c9 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/SectionAdapter.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/SectionAdapter.java @@ -21,6 +21,9 @@ import butterknife.BindView; import butterknife.ButterKnife; +import static com.codeest.geeknews.app.Constants.IT_ZHIHU_SECTION_ID; +import static com.codeest.geeknews.app.Constants.IT_ZHIHU_SECTION_TITLE; + /** * Created by codeest on 16/8/21. */ @@ -57,8 +60,8 @@ public void onBindViewHolder(final ViewHolder holder, int position) { public void onClick(View view) { Intent intent = new Intent(); intent.setClass(mContext, SectionActivity.class); - intent.putExtra("id",mList.get(holder.getAdapterPosition()).getId()); - intent.putExtra("title",mList.get(holder.getAdapterPosition()).getName()); + intent.putExtra(IT_ZHIHU_SECTION_ID, mList.get(holder.getAdapterPosition()).getId()); + intent.putExtra(IT_ZHIHU_SECTION_TITLE, mList.get(holder.getAdapterPosition()).getName()); mContext.startActivity(intent); } }); diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/TopPagerAdapter.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/TopPagerAdapter.java index bd30d19..938a111 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/TopPagerAdapter.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/TopPagerAdapter.java @@ -10,6 +10,7 @@ import android.widget.TextView; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.Constants; import com.codeest.geeknews.component.ImageLoader; import com.codeest.geeknews.model.bean.DailyListBean; import com.codeest.geeknews.ui.zhihu.activity.ZhihuDetailActivity; @@ -56,8 +57,8 @@ public Object instantiateItem(ViewGroup container, final int position) public void onClick(View v) { Intent intent = new Intent(); intent.setClass(mContext, ZhihuDetailActivity.class); - intent.putExtra("id",id); - intent.putExtra("isNotTransition",true); + intent.putExtra(Constants.IT_ZHIHU_DETAIL_ID, id); + intent.putExtra(Constants.IT_ZHIHU_DETAIL_TRANSITION, true); mContext.startActivity(intent); } }); diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/DailyFragment.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/DailyFragment.java index f25a4d4..6eb211c 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/DailyFragment.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/DailyFragment.java @@ -9,12 +9,13 @@ import android.view.View; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.Constants; import com.codeest.geeknews.base.RootFragment; +import com.codeest.geeknews.base.contract.zhihu.DailyContract; import com.codeest.geeknews.component.RxBus; import com.codeest.geeknews.model.bean.DailyBeforeListBean; import com.codeest.geeknews.model.bean.DailyListBean; import com.codeest.geeknews.presenter.zhihu.DailyPresenter; -import com.codeest.geeknews.base.contract.zhihu.DailyContract; import com.codeest.geeknews.ui.zhihu.activity.CalendarActivity; import com.codeest.geeknews.ui.zhihu.activity.ZhihuDetailActivity; import com.codeest.geeknews.ui.zhihu.adapter.DailyAdapter; @@ -71,7 +72,7 @@ public void onItemClick(int position,View shareView) { } Intent intent = new Intent(); intent.setClass(mContext, ZhihuDetailActivity.class); - intent.putExtra("id", mList.get(position).getId()); + intent.putExtra(Constants.IT_ZHIHU_DETAIL_ID, mList.get(position).getId()); ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(mActivity, shareView, "shareView"); mContext.startActivity(intent,options.toBundle()); } diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/HotFragment.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/HotFragment.java index e564d6c..0ba91ce 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/HotFragment.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/HotFragment.java @@ -8,6 +8,7 @@ import android.view.View; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.Constants; import com.codeest.geeknews.base.RootFragment; import com.codeest.geeknews.model.bean.HotListBean; import com.codeest.geeknews.presenter.zhihu.HotPresenter; @@ -67,7 +68,7 @@ public void onItemClick(int position, View shareView) { mAdapter.notifyItemChanged(position); Intent intent = new Intent(); intent.setClass(mContext, ZhihuDetailActivity.class); - intent.putExtra("id", mList.get(position).getNews_id()); + intent.putExtra(Constants.IT_ZHIHU_DETAIL_ID, mList.get(position).getNews_id()); ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(mActivity, shareView, "shareView"); mContext.startActivity(intent,options.toBundle()); } diff --git a/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/ThemeFragment.java b/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/ThemeFragment.java index ac12159..06ea44a 100644 --- a/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/ThemeFragment.java +++ b/app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/ThemeFragment.java @@ -6,10 +6,11 @@ import android.support.v7.widget.RecyclerView; import com.codeest.geeknews.R; +import com.codeest.geeknews.app.Constants; import com.codeest.geeknews.base.RootFragment; +import com.codeest.geeknews.base.contract.zhihu.ThemeContract; import com.codeest.geeknews.model.bean.ThemeListBean; import com.codeest.geeknews.presenter.zhihu.ThemePresenter; -import com.codeest.geeknews.base.contract.zhihu.ThemeContract; import com.codeest.geeknews.ui.zhihu.activity.ThemeActivity; import com.codeest.geeknews.ui.zhihu.adapter.ThemeAdapter; @@ -52,7 +53,7 @@ protected void initEventAndData() { public void onItemClick(int id) { Intent intent = new Intent(); intent.setClass(mContext, ThemeActivity.class); - intent.putExtra("id", id); + intent.putExtra(Constants.IT_ZHIHU_THEME_ID, id); mContext.startActivity(intent); } }); diff --git a/config.gradle b/config.gradle index 162efc5..e74dff9 100644 --- a/config.gradle +++ b/config.gradle @@ -49,6 +49,7 @@ ext { "okhttp-logging-interceptor": "com.squareup.okhttp3:logging-interceptor:${dependVersion.okhttp}", "glide" : "com.github.bumptech.glide:glide:3.7.0", "glide-okhttp3-integration" : "com.github.bumptech.glide:okhttp3-integration:1.4.0@aar", + "jsoup" : "org.jsoup:jsoup:1.10.1", //di "dagger" : "com.google.dagger:dagger:${dependVersion.dagger2}", @@ -60,8 +61,7 @@ ext { //other "multidex" : "com.android.support:multidex:1.0.1", "logger" : "com.orhanobut:logger:1.15", - "fragmentation" : "me.yokeyword:fragmentation:0.7.9", - "jsoup" : "org.jsoup:jsoup:1.10.1", + "fragmentation" : "me.yokeyword:fragmentation:0.10.4", "crashreport" : "com.tencent.bugly:crashreport:latest.release", //canary