Skip to content

Commit

Permalink
删除过时代码
Browse files Browse the repository at this point in the history
  • Loading branch information
iMeiji committed Jul 7, 2017
1 parent 180a0c3 commit a71d7bd
Show file tree
Hide file tree
Showing 59 changed files with 131 additions and 2,649 deletions.
76 changes: 38 additions & 38 deletions app/src/main/java/com/meiji/toutiao/Register.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@
import com.meiji.toutiao.bean.media.MediaWendaBean;
import com.meiji.toutiao.bean.media.MultiMediaArticleBean;
import com.meiji.toutiao.bean.news.MultiNewsArticleDataBean;
import com.meiji.toutiao.bean.news.NewsCommentMobileBean;
import com.meiji.toutiao.bean.news.NewsCommentBean;
import com.meiji.toutiao.bean.photo.PhotoArticleBean;
import com.meiji.toutiao.bean.wenda.WendaArticleDataBean;
import com.meiji.toutiao.bean.wenda.WendaContentBean;
import com.meiji.toutiao.binder.FooterViewBinder;
import com.meiji.toutiao.binder.joke.JokeCommentHeaderViewBinder;
import com.meiji.toutiao.binder.joke.JokeCommentViewBinder;
import com.meiji.toutiao.binder.joke.JokeContentViewBinder;
import com.meiji.toutiao.binder.media.MediaArticleHasVideoViewBinder;
import com.meiji.toutiao.binder.media.MediaArticleHeaderViewBinder;
import com.meiji.toutiao.binder.media.MediaArticleNoPicViewBinder;
import com.meiji.toutiao.binder.media.MediaArticleViewBinder;
import com.meiji.toutiao.binder.media.MediaArticleImgViewBinder;
import com.meiji.toutiao.binder.media.MediaArticleTextViewBinder;
import com.meiji.toutiao.binder.media.MediaArticleVideoViewBinder;
import com.meiji.toutiao.binder.media.MediaChannelViewBinder;
import com.meiji.toutiao.binder.media.MediaWendaViewBinder;
import com.meiji.toutiao.binder.news.NewsArticleHasVideoViewBinder;
import com.meiji.toutiao.binder.news.NewsArticleNoPicViewBinder;
import com.meiji.toutiao.binder.news.NewsArticleViewBinder;
import com.meiji.toutiao.binder.news.NewsArticleImgViewBinder;
import com.meiji.toutiao.binder.news.NewsArticleTextViewBinder;
import com.meiji.toutiao.binder.news.NewsArticleVideoViewBinder;
import com.meiji.toutiao.binder.news.NewsCommentViewBinder;
import com.meiji.toutiao.binder.photo.PhotoArticleViewBinder;
import com.meiji.toutiao.binder.search.SearchArticleHasVideoViewBinder;
import com.meiji.toutiao.binder.search.SearchArticleVideoViewBinder;
import com.meiji.toutiao.binder.video.VideoContentHeaderViewBinder;
import com.meiji.toutiao.binder.wenda.WendaArticleNoPicViewBinder;
import com.meiji.toutiao.binder.wenda.WendaArticleOnePicViewBinder;
import com.meiji.toutiao.binder.wenda.WendaArticleThreePicViewBinder;
import com.meiji.toutiao.binder.wenda.WendaArticleOneImgViewBinder;
import com.meiji.toutiao.binder.wenda.WendaArticleTextViewBinder;
import com.meiji.toutiao.binder.wenda.WendaArticleThreeImgViewBinder;
import com.meiji.toutiao.binder.wenda.WendaContentHeaderViewBinder;
import com.meiji.toutiao.binder.wenda.WendaContentViewBinder;
import com.meiji.toutiao.interfaces.IOnItemLongClickListener;
Expand All @@ -51,38 +51,38 @@ public class Register {
public static void registerNewsArticleItem(MultiTypeAdapter adapter) {
// 一个类型对应多个 ItemViewBinder
adapter.register(MultiNewsArticleDataBean.class)
.to(new NewsArticleViewBinder(),
new NewsArticleHasVideoViewBinder(),
new NewsArticleNoPicViewBinder())
.to(new NewsArticleImgViewBinder(),
new NewsArticleVideoViewBinder(),
new NewsArticleTextViewBinder())
.withClassLinker(new ClassLinker<MultiNewsArticleDataBean>() {
@NonNull
@Override
public Class<? extends ItemViewBinder<MultiNewsArticleDataBean, ?>> index(@NonNull MultiNewsArticleDataBean item) {
if (item.isHas_video()) {
return NewsArticleHasVideoViewBinder.class;
return NewsArticleVideoViewBinder.class;
}
if (null != item.getImage_list() && item.getImage_list().size() > 0) {
return NewsArticleViewBinder.class;
return NewsArticleImgViewBinder.class;
}
return NewsArticleNoPicViewBinder.class;
return NewsArticleTextViewBinder.class;
}
});
adapter.register(FooterBean.class, new FooterViewBinder());
}

public static void registerNewsCommentItem(MultiTypeAdapter adapter) {
adapter.register(NewsCommentMobileBean.DataBean.CommentBean.class, new NewsCommentViewBinder());
adapter.register(NewsCommentBean.DataBean.CommentBean.class, new NewsCommentViewBinder());
adapter.register(FooterBean.class, new FooterViewBinder());
}

public static void registerVideoContentItem(MultiTypeAdapter adapter) {
adapter.register(MultiNewsArticleDataBean.class, new VideoContentHeaderViewBinder());
adapter.register(NewsCommentMobileBean.DataBean.CommentBean.class, new NewsCommentViewBinder());
adapter.register(NewsCommentBean.DataBean.CommentBean.class, new NewsCommentViewBinder());
adapter.register(FooterBean.class, new FooterViewBinder());
}

public static void registerVideoArticleItem(MultiTypeAdapter adapter) {
adapter.register(MultiNewsArticleDataBean.class, new NewsArticleHasVideoViewBinder());
adapter.register(MultiNewsArticleDataBean.class, new NewsArticleVideoViewBinder());
adapter.register(FooterBean.class, new FooterViewBinder());
}

Expand All @@ -105,24 +105,24 @@ public static void registerPhotoArticleItem(MultiTypeAdapter adapter) {
public static void registerWendaArticleItem(MultiTypeAdapter adapter) {
// 一个类型对应多个 ItemViewBinder
adapter.register(WendaArticleDataBean.class)
.to(new WendaArticleNoPicViewBinder(),
new WendaArticleOnePicViewBinder(),
new WendaArticleThreePicViewBinder())
.to(new WendaArticleTextViewBinder(),
new WendaArticleOneImgViewBinder(),
new WendaArticleThreeImgViewBinder())
.withClassLinker(new ClassLinker<WendaArticleDataBean>() {
@NonNull
@Override
public Class<? extends ItemViewBinder<WendaArticleDataBean, ?>> index(@NonNull WendaArticleDataBean item) {
if (null != item.getExtraBean().getWenda_image() &&
null != item.getExtraBean().getWenda_image().getThree_image_list() &&
item.getExtraBean().getWenda_image().getThree_image_list().size() > 0) {
return WendaArticleThreePicViewBinder.class;
return WendaArticleThreeImgViewBinder.class;
}
if (null != item.getExtraBean().getWenda_image() &&
null != item.getExtraBean().getWenda_image().getLarge_image_list() &&
item.getExtraBean().getWenda_image().getLarge_image_list().size() > 0) {
return WendaArticleOnePicViewBinder.class;
return WendaArticleOneImgViewBinder.class;
}
return WendaArticleNoPicViewBinder.class;
return WendaArticleTextViewBinder.class;
}
});
adapter.register(FooterBean.class, new FooterViewBinder());
Expand All @@ -140,41 +140,41 @@ public static void registerMediaChannelItem(MultiTypeAdapter adapter, IOnItemLon

public static void registerSearchItem(MultiTypeAdapter adapter) {
adapter.register(MultiNewsArticleDataBean.class)
.to(new NewsArticleViewBinder(),
new SearchArticleHasVideoViewBinder(),
new NewsArticleNoPicViewBinder())
.to(new NewsArticleImgViewBinder(),
new SearchArticleVideoViewBinder(),
new NewsArticleTextViewBinder())
.withClassLinker(new ClassLinker<MultiNewsArticleDataBean>() {
@NonNull
@Override
public Class<? extends ItemViewBinder<MultiNewsArticleDataBean, ?>> index(@NonNull MultiNewsArticleDataBean item) {
if (item.isHas_video()) {
return SearchArticleHasVideoViewBinder.class;
return SearchArticleVideoViewBinder.class;
}
if (null != item.getImage_list() && item.getImage_list().size() > 0) {
return NewsArticleViewBinder.class;
return NewsArticleImgViewBinder.class;
}
return NewsArticleNoPicViewBinder.class;
return NewsArticleTextViewBinder.class;
}
});
adapter.register(FooterBean.class, new FooterViewBinder());
}

public static void registerMediaArticleItem(MultiTypeAdapter adapter) {
adapter.register(MultiMediaArticleBean.DataBean.class)
.to(new MediaArticleViewBinder(),
new MediaArticleHasVideoViewBinder(),
new MediaArticleNoPicViewBinder())
.to(new MediaArticleImgViewBinder(),
new MediaArticleVideoViewBinder(),
new MediaArticleTextViewBinder())
.withClassLinker(new ClassLinker<MultiMediaArticleBean.DataBean>() {
@NonNull
@Override
public Class<? extends ItemViewBinder<MultiMediaArticleBean.DataBean, ?>> index(@NonNull MultiMediaArticleBean.DataBean item) {
if (item.isHas_video()) {
return MediaArticleHasVideoViewBinder.class;
return MediaArticleVideoViewBinder.class;
}
if (null != item.getImage_list() && item.getImage_list().size() > 0) {
return MediaArticleViewBinder.class;
return MediaArticleImgViewBinder.class;
}
return MediaArticleNoPicViewBinder.class;
return MediaArticleTextViewBinder.class;
}
});
adapter.register(MediaProfileBean.DataBean.class, new MediaArticleHeaderViewBinder());
Expand Down
25 changes: 5 additions & 20 deletions app/src/main/java/com/meiji/toutiao/adapter/DiffCallback.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@

import com.meiji.toutiao.bean.joke.JokeCommentBean;
import com.meiji.toutiao.bean.joke.JokeContentBean;
import com.meiji.toutiao.bean.media.MediaArticleBean;
import com.meiji.toutiao.bean.media.MediaWendaBean;
import com.meiji.toutiao.bean.media.MultiMediaArticleBean;
import com.meiji.toutiao.bean.news.MultiNewsArticleDataBean;
import com.meiji.toutiao.bean.news.NewsCommentMobileBean;
import com.meiji.toutiao.bean.news.NewsCommentBean;
import com.meiji.toutiao.bean.photo.PhotoArticleBean;
import com.meiji.toutiao.bean.search.SearchResultBean;
import com.meiji.toutiao.bean.wenda.WendaArticleDataBean;
Expand All @@ -25,8 +24,6 @@ public class DiffCallback extends DiffUtil.Callback {

public static final int JOKE = 1;
public static final int PHOTO = 2;
// public static final int VIDEO = 3;
public static final int MEDIA = 4;
public static final int NEWS_COMMENT = 5;
public static final int JOKE_COMMENT = 6;
public static final int MUlTI_NEWS = 7;
Expand Down Expand Up @@ -70,15 +67,9 @@ public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
case PHOTO:
return ((PhotoArticleBean.DataBean) oldList.get(oldItemPosition)).getTitle().equals(
((PhotoArticleBean.DataBean) newList.get(newItemPosition)).getTitle());
// case VIDEO:
// return ((VideoArticleBean.DataBean) oldList.get(oldItemPosition)).getTitle().equals(
// ((VideoArticleBean.DataBean) newList.get(newItemPosition)).getTitle());
case MEDIA:
return ((MediaArticleBean.DataBean) oldList.get(oldItemPosition)).getTitle().equals(
((MediaArticleBean.DataBean) newList.get(newItemPosition)).getTitle());
case NEWS_COMMENT:
return ((NewsCommentMobileBean.DataBean.CommentBean) oldList.get(oldItemPosition)).getText().equals(
((NewsCommentMobileBean.DataBean.CommentBean) newList.get(newItemPosition)).getText());
return ((NewsCommentBean.DataBean.CommentBean) oldList.get(oldItemPosition)).getText().equals(
((NewsCommentBean.DataBean.CommentBean) newList.get(newItemPosition)).getText());
case JOKE_COMMENT:
return ((JokeCommentBean.DataBean.RecentCommentsBean) oldList.get(oldItemPosition)).getText().equals(
((JokeCommentBean.DataBean.RecentCommentsBean) newList.get(newItemPosition)).getText());
Expand Down Expand Up @@ -117,15 +108,9 @@ public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
case PHOTO:
return ((PhotoArticleBean.DataBean) oldList.get(oldItemPosition)).getSource_url().equals(
((PhotoArticleBean.DataBean) newList.get(newItemPosition)).getSource_url());
// case VIDEO:
// return ((VideoArticleBean.DataBean) oldList.get(oldItemPosition)).getShare_url().equals(
// ((VideoArticleBean.DataBean) newList.get(newItemPosition)).getShare_url());
case MEDIA:
return ((MediaArticleBean.DataBean) oldList.get(oldItemPosition)).getSource_url().equals(
((MediaArticleBean.DataBean) newList.get(newItemPosition)).getSource_url());
case NEWS_COMMENT:
return ((NewsCommentMobileBean.DataBean.CommentBean) oldList.get(oldItemPosition)).getUser_name().equals(
((NewsCommentMobileBean.DataBean.CommentBean) newList.get(newItemPosition)).getUser_name());
return ((NewsCommentBean.DataBean.CommentBean) oldList.get(oldItemPosition)).getUser_name().equals(
((NewsCommentBean.DataBean.CommentBean) newList.get(newItemPosition)).getUser_name());
case JOKE_COMMENT:
return ((JokeCommentBean.DataBean.RecentCommentsBean) oldList.get(oldItemPosition)).getId() ==
((JokeCommentBean.DataBean.RecentCommentsBean) newList.get(newItemPosition)).getId();
Expand Down
Loading

0 comments on commit a71d7bd

Please sign in to comment.