diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0f06adfb..5e5bd0bb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -93,9 +93,6 @@
android:screenOrientation="portrait" />
-
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/AttentionBangumiAdapter.java b/app/src/main/java/com/hotbitmapgg/bilibili/adapter/AttentionBangumiAdapter.java
deleted file mode 100644
index fc527687..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/AttentionBangumiAdapter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.hotbitmapgg.bilibili.adapter;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.hotbitmapgg.bilibili.adapter.helper.AbsRecyclerViewAdapter;
-import com.hotbitmapgg.bilibili.entity.user.UserChaseBangumiInfo;
-import com.hotbitmapgg.ohmybilibili.R;
-
-import java.util.List;
-
-/**
- * Created by hcc on 2016/9/28 20:26
- * 100332338@qq.com
- *
- * 关注界面番剧Adapter
- */
-
-public class AttentionBangumiAdapter extends AbsRecyclerViewAdapter {
- private List chaseBangumis;
-
- public AttentionBangumiAdapter(RecyclerView recyclerView, List chaseBangumis) {
- super(recyclerView);
- this.chaseBangumis = chaseBangumis;
- }
-
-
- @Override
- public ClickableViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- bindContext(parent.getContext());
- return new ItemViewHolder(
- LayoutInflater.from(getContext()).inflate(R.layout.item_attention_bangumi, parent, false));
- }
-
-
- @Override
- public void onBindViewHolder(ClickableViewHolder holder, int position) {
- if (holder instanceof ItemViewHolder) {
- ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
- UserChaseBangumiInfo.DataBean.ResultBean resultBean = chaseBangumis.get(position);
-
- Glide.with(getContext())
- .load(resultBean.getCover())
- .centerCrop()
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .placeholder(R.drawable.bili_default_image_tv)
- .dontAnimate()
- .into(itemViewHolder.mImage);
-
- itemViewHolder.mTitle.setText(resultBean.getTitle());
- itemViewHolder.mDesc.setText("更新至第" + resultBean.getNewest_ep_index() + "话");
- }
-
- super.onBindViewHolder(holder, position);
- }
-
-
- @Override
- public int getItemCount() {
- return 3;
- }
-
-
- private class ItemViewHolder extends AbsRecyclerViewAdapter.ClickableViewHolder {
-
- ImageView mImage;
- TextView mTitle;
- TextView mDesc;
-
-
- public ItemViewHolder(View itemView) {
- super(itemView);
- mImage = $(R.id.item_img);
- mTitle = $(R.id.item_title);
- mDesc = $(R.id.item_desc);
- }
- }
-}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/ChaseBangumiAdapter.java b/app/src/main/java/com/hotbitmapgg/bilibili/adapter/ChaseBangumiAdapter.java
deleted file mode 100644
index e9d69920..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/ChaseBangumiAdapter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.hotbitmapgg.bilibili.adapter;
-
-import android.annotation.SuppressLint;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.hotbitmapgg.bilibili.adapter.helper.AbsRecyclerViewAdapter;
-import com.hotbitmapgg.bilibili.entity.user.UserChaseBangumiInfo;
-import com.hotbitmapgg.ohmybilibili.R;
-
-import java.util.List;
-
-/**
- * Created by hcc on 2016/10/13 19:08
- * 100332338@qq.com
- *
- * 追番adapter
- */
-
-public class ChaseBangumiAdapter extends AbsRecyclerViewAdapter {
- private List userChaseBangumis;
-
- public ChaseBangumiAdapter(RecyclerView recyclerView, List userChaseBangumis) {
- super(recyclerView);
- this.userChaseBangumis = userChaseBangumis;
- }
-
-
- @Override
- public ClickableViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- bindContext(parent.getContext());
- return new ItemViewHolder(
- LayoutInflater.from(getContext()).inflate(R.layout.item_chase_bangumi, parent, false));
- }
-
-
- @SuppressLint("SetTextI18n")
- @Override
- public void onBindViewHolder(ClickableViewHolder holder, int position) {
- if (holder instanceof ItemViewHolder) {
- ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
- UserChaseBangumiInfo.DataBean.ResultBean resultBean = userChaseBangumis.get(position);
-
- Glide.with(getContext())
- .load(resultBean.getCover())
- .centerCrop()
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .placeholder(R.drawable.bili_default_image_tv)
- .into(itemViewHolder.mImage);
-
- if (resultBean.getIs_finish() == 1) {
- itemViewHolder.mUpdate.setText(resultBean.getTotal_count() + "话全");
- itemViewHolder.mUpdate.setTextColor(
- getContext().getResources().getColor(R.color.black_alpha_45));
- } else {
- itemViewHolder.mUpdate.setText("更新至第" + resultBean.getTotal_count() + "话");
- itemViewHolder.mUpdate.setTextColor(
- getContext().getResources().getColor(R.color.colorPrimary));
- }
-
- itemViewHolder.mTitle.setText(resultBean.getTitle());
- itemViewHolder.mSubscribe.setText(resultBean.getFavorites() + "人订阅");
- }
- super.onBindViewHolder(holder, position);
- }
-
-
- @Override
- public int getItemCount() {
- return userChaseBangumis.size();
- }
-
-
- private class ItemViewHolder extends ClickableViewHolder {
-
- ImageView mImage;
- TextView mTitle;
- TextView mUpdate;
- TextView mSubscribe;
-
- public ItemViewHolder(View itemView) {
- super(itemView);
- mImage = $(R.id.item_img);
- mTitle = $(R.id.item_title);
- mUpdate = $(R.id.item_update);
- mSubscribe = $(R.id.item_subscribe);
- }
- }
-}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/UserChaseBangumiAdapter.java b/app/src/main/java/com/hotbitmapgg/bilibili/adapter/UserChaseBangumiAdapter.java
deleted file mode 100644
index a979253c..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/UserChaseBangumiAdapter.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.hotbitmapgg.bilibili.adapter;
-
-import android.annotation.SuppressLint;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.hotbitmapgg.bilibili.adapter.helper.AbsRecyclerViewAdapter;
-import com.hotbitmapgg.bilibili.entity.user.UserChaseBangumiInfo;
-import com.hotbitmapgg.ohmybilibili.R;
-
-import java.util.List;
-
-/**
- * Created by hcc on 2016/10/12 19:08
- * 100332338@qq.com
- *
- * 用户详情追番adapter
- */
-
-public class UserChaseBangumiAdapter extends AbsRecyclerViewAdapter {
- private List userChaseBangumis;
-
- public UserChaseBangumiAdapter(RecyclerView recyclerView, List userChaseBangumis) {
- super(recyclerView);
- this.userChaseBangumis = userChaseBangumis;
- }
-
-
- @Override
- public ClickableViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- bindContext(parent.getContext());
- return new ItemViewHolder(
- LayoutInflater.from(getContext()).inflate(R.layout.item_user_chase_bangumi, parent, false));
- }
-
-
- @SuppressLint("SetTextI18n")
- @Override
- public void onBindViewHolder(ClickableViewHolder holder, int position) {
- if (holder instanceof ItemViewHolder) {
- ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
- UserChaseBangumiInfo.DataBean.ResultBean resultBean = userChaseBangumis.get(position);
-
- Glide.with(getContext())
- .load(resultBean.getCover())
- .centerCrop()
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .placeholder(R.drawable.bili_default_image_tv)
- .into(itemViewHolder.mImage);
-
- if (resultBean.getIs_finish() == 1) {
- itemViewHolder.mUpdate.setText(resultBean.getTotal_count() + "话全");
- } else {
- itemViewHolder.mUpdate.setText("更新至第" + resultBean.getTotal_count() + "话");
- }
- itemViewHolder.mTitle.setText(resultBean.getTitle());
- }
- super.onBindViewHolder(holder, position);
- }
-
-
- @Override
- public int getItemCount() {
- return userChaseBangumis.size();
- }
-
-
- private class ItemViewHolder extends AbsRecyclerViewAdapter.ClickableViewHolder {
-
- ImageView mImage;
- TextView mTitle;
- TextView mUpdate;
-
- public ItemViewHolder(View itemView) {
- super(itemView);
- mImage = $(R.id.item_img);
- mTitle = $(R.id.item_title);
- mUpdate = $(R.id.item_update);
- }
- }
-}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/UserFavoritesAdapter.java b/app/src/main/java/com/hotbitmapgg/bilibili/adapter/UserFavoritesAdapter.java
deleted file mode 100644
index b2e8f0c5..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/UserFavoritesAdapter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.hotbitmapgg.bilibili.adapter;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.hotbitmapgg.bilibili.adapter.helper.AbsRecyclerViewAdapter;
-import com.hotbitmapgg.bilibili.entity.user.UserFavoritesInfo;
-import com.hotbitmapgg.bilibili.widget.FavoritesItemLayout;
-import com.hotbitmapgg.ohmybilibili.R;
-
-import java.util.List;
-
-/**
- * Created by hcc on 2016/10/13 16:18
- * 100332338@qq.com
- *
- * 用户收藏夹adapter
- */
-
-public class UserFavoritesAdapter extends AbsRecyclerViewAdapter {
- private List userFavorites;
-
- public UserFavoritesAdapter(RecyclerView recyclerView, List userFavorites) {
- super(recyclerView);
- this.userFavorites = userFavorites;
- }
-
-
- @Override
- public ClickableViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- bindContext(parent.getContext());
- return new ItemViewHolder(
- LayoutInflater.from(getContext()).inflate(R.layout.item_user_favorites, parent, false));
- }
-
-
- @Override
- public void onBindViewHolder(ClickableViewHolder holder, int position) {
- if (holder instanceof ItemViewHolder) {
- ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
- UserFavoritesInfo.DataBean dataBean = userFavorites.get(position);
- itemViewHolder.mFavoritesCount.setText(String.valueOf(dataBean.getCur_count()));
- itemViewHolder.mTitle.setText(dataBean.getName());
- itemViewHolder.mFavoritesItemLayout.setImages(dataBean.getVideos());
- }
- super.onBindViewHolder(holder, position);
- }
-
-
- @Override
- public int getItemCount() {
- return userFavorites.size();
- }
-
-
- private class ItemViewHolder extends AbsRecyclerViewAdapter.ClickableViewHolder {
-
- FavoritesItemLayout mFavoritesItemLayout;
- TextView mFavoritesCount;
- TextView mTitle;
-
- public ItemViewHolder(View itemView) {
- super(itemView);
- mFavoritesItemLayout = $(R.id.item_favorites);
- mFavoritesCount = $(R.id.item_favorites_count);
- mTitle = $(R.id.item_title);
- }
- }
-}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/UserHomePagerChaseBangumiAdapter.java b/app/src/main/java/com/hotbitmapgg/bilibili/adapter/UserHomePagerChaseBangumiAdapter.java
deleted file mode 100644
index 0664f96d..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/UserHomePagerChaseBangumiAdapter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.hotbitmapgg.bilibili.adapter;
-
-import android.annotation.SuppressLint;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.hotbitmapgg.bilibili.adapter.helper.AbsRecyclerViewAdapter;
-import com.hotbitmapgg.bilibili.entity.user.UserChaseBangumiInfo;
-import com.hotbitmapgg.ohmybilibili.R;
-
-import java.util.List;
-
-/**
- * Created by hcc on 2016/10/12 19:08
- * 100332338@qq.com
- *
- * 用户详情主页追番adapter
- */
-
-public class UserHomePagerChaseBangumiAdapter extends AbsRecyclerViewAdapter {
- private List userChaseBangumis;
-
- public UserHomePagerChaseBangumiAdapter(RecyclerView recyclerView, List userChaseBangumis) {
- super(recyclerView);
- this.userChaseBangumis = userChaseBangumis;
- }
-
-
- @Override
- public ClickableViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- bindContext(parent.getContext());
- return new ItemViewHolder(
- LayoutInflater.from(getContext()).inflate(R.layout.item_user_chase_bangumi, parent, false));
- }
-
-
- @SuppressLint("SetTextI18n")
- @Override
- public void onBindViewHolder(ClickableViewHolder holder, int position) {
- if (holder instanceof ItemViewHolder) {
- ItemViewHolder itemViewHolder = (ItemViewHolder) holder;
- UserChaseBangumiInfo.DataBean.ResultBean resultBean = userChaseBangumis.get(position);
-
- Glide.with(getContext())
- .load(resultBean.getCover())
- .centerCrop()
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .placeholder(R.drawable.bili_default_image_tv)
- .into(itemViewHolder.mImage);
-
- if (resultBean.getIs_finish() == 1) {
- itemViewHolder.mUpdate.setText(resultBean.getTotal_count() + "话全");
- } else {
- itemViewHolder.mUpdate.setText("更新至第" + resultBean.getTotal_count() + "话");
- }
-
- itemViewHolder.mTitle.setText(resultBean.getTitle());
- }
- super.onBindViewHolder(holder, position);
- }
-
-
- @Override
- public int getItemCount() {
- if (userChaseBangumis.size() == 0) {
- return 0;
- } else if (userChaseBangumis.size() == 1) {
- return 1;
- } else if (userChaseBangumis.size() == 2) {
- return 2;
- } else if (userChaseBangumis.size() == 3) {
- return 3;
- } else {
- return 3;
- }
- }
-
-
- private class ItemViewHolder extends ClickableViewHolder {
-
- ImageView mImage;
- TextView mTitle;
- TextView mUpdate;
-
- public ItemViewHolder(View itemView) {
- super(itemView);
- mImage = $(R.id.item_img);
- mTitle = $(R.id.item_title);
- mUpdate = $(R.id.item_update);
- }
- }
-}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/section/HomeBangumiItemSection.java b/app/src/main/java/com/hotbitmapgg/bilibili/adapter/section/HomeBangumiItemSection.java
index 44137ed0..06fb481d 100644
--- a/app/src/main/java/com/hotbitmapgg/bilibili/adapter/section/HomeBangumiItemSection.java
+++ b/app/src/main/java/com/hotbitmapgg/bilibili/adapter/section/HomeBangumiItemSection.java
@@ -8,7 +8,6 @@
import com.hotbitmapgg.bilibili.module.home.bangumi.BangumiIndexActivity;
import com.hotbitmapgg.bilibili.module.home.bangumi.BangumiScheduleActivity;
-import com.hotbitmapgg.bilibili.module.home.bangumi.ChaseBangumiActivity;
import com.hotbitmapgg.bilibili.widget.sectioned.StatelessSection;
import com.hotbitmapgg.ohmybilibili.R;
@@ -59,8 +58,8 @@ public void onBindHeaderViewHolder(RecyclerView.ViewHolder holder) {
HomeBangumiItemSection.TopItemViewHolder topItemViewHolder
= (HomeBangumiItemSection.TopItemViewHolder) holder;
//前往追番
- topItemViewHolder.mChaseBangumi.setOnClickListener(v -> mContext.startActivity(
- new Intent(mContext, ChaseBangumiActivity.class)));
+ topItemViewHolder.mChaseBangumi.setOnClickListener(v -> {
+ });
//前往番剧放送表
topItemViewHolder.mBangumiSchedule.setOnClickListener(v -> mContext.startActivity(
new Intent(mContext, BangumiScheduleActivity.class)));
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/entity/user/UserChaseBangumiInfo.java b/app/src/main/java/com/hotbitmapgg/bilibili/entity/user/UserChaseBangumiInfo.java
deleted file mode 100644
index 07db83d6..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/entity/user/UserChaseBangumiInfo.java
+++ /dev/null
@@ -1,297 +0,0 @@
-package com.hotbitmapgg.bilibili.entity.user;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by hcc on 2016/10/12 18:43
- * 100332338@qq.com
- *
- * 用户详情追番模型类
- */
-
-public class UserChaseBangumiInfo implements Parcelable {
- private boolean status;
- private DataBean data;
-
- public boolean isStatus() {
- return status;
- }
-
- public void setStatus(boolean status) {
- this.status = status;
- }
-
- public DataBean getData() {
- return data;
- }
-
- public void setData(DataBean data) {
- this.data = data;
- }
-
- public static class DataBean implements Parcelable {
- private int count;
- private int pages;
- private List result;
-
- public int getCount() {
- return count;
- }
-
- public void setCount(int count) {
- this.count = count;
- }
-
- public int getPages() {
- return pages;
- }
-
- public void setPages(int pages) {
- this.pages = pages;
- }
-
- public List getResult() {
- return result;
- }
-
- public void setResult(List result) {
- this.result = result;
- }
-
- public static class ResultBean implements Parcelable {
- private String season_id;
- private String share_url;
- private String title;
- private int is_finish;
- private int favorites;
- private int newest_ep_index;
- private int last_ep_index;
- private int total_count;
- private String cover;
- private String evaluate;
- private String brief;
-
- public String getSeason_id() {
- return season_id;
- }
-
- public void setSeason_id(String season_id) {
- this.season_id = season_id;
- }
-
- public String getShare_url() {
- return share_url;
- }
-
- public void setShare_url(String share_url) {
- this.share_url = share_url;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public int getIs_finish() {
- return is_finish;
- }
-
- public void setIs_finish(int is_finish) {
- this.is_finish = is_finish;
- }
-
- public int getFavorites() {
- return favorites;
- }
-
- public void setFavorites(int favorites) {
- this.favorites = favorites;
- }
-
- public int getNewest_ep_index() {
- return newest_ep_index;
- }
-
- public void setNewest_ep_index(int newest_ep_index) {
- this.newest_ep_index = newest_ep_index;
- }
-
- public int getLast_ep_index() {
- return last_ep_index;
- }
-
- public void setLast_ep_index(int last_ep_index) {
- this.last_ep_index = last_ep_index;
- }
-
- public int getTotal_count() {
- return total_count;
- }
-
- public void setTotal_count(int total_count) {
- this.total_count = total_count;
- }
-
- public String getCover() {
- return cover;
- }
-
- public void setCover(String cover) {
- this.cover = cover;
- }
-
- public String getEvaluate() {
- return evaluate;
- }
-
- public void setEvaluate(String evaluate) {
- this.evaluate = evaluate;
- }
-
- public String getBrief() {
- return brief;
- }
-
- public void setBrief(String brief) {
- this.brief = brief;
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(this.season_id);
- dest.writeString(this.share_url);
- dest.writeString(this.title);
- dest.writeInt(this.is_finish);
- dest.writeInt(this.favorites);
- dest.writeInt(this.newest_ep_index);
- dest.writeInt(this.last_ep_index);
- dest.writeInt(this.total_count);
- dest.writeString(this.cover);
- dest.writeString(this.evaluate);
- dest.writeString(this.brief);
- }
-
- public ResultBean() {
- }
-
-
- protected ResultBean(Parcel in) {
- this.season_id = in.readString();
- this.share_url = in.readString();
- this.title = in.readString();
- this.is_finish = in.readInt();
- this.favorites = in.readInt();
- this.newest_ep_index = in.readInt();
- this.last_ep_index = in.readInt();
- this.total_count = in.readInt();
- this.cover = in.readString();
- this.evaluate = in.readString();
- this.brief = in.readString();
- }
-
- public static final Creator CREATOR = new Creator() {
- @Override
- public ResultBean createFromParcel(Parcel source) {
- return new ResultBean(source);
- }
-
- @Override
- public ResultBean[] newArray(int size) {
- return new ResultBean[size];
- }
- };
- }
-
-
- @Override
- public int describeContents() {
- return 0;
- }
-
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(this.count);
- dest.writeInt(this.pages);
- dest.writeList(this.result);
- }
-
-
- public DataBean() {
- }
-
-
- protected DataBean(Parcel in) {
- this.count = in.readInt();
- this.pages = in.readInt();
- this.result = new ArrayList();
- in.readList(this.result, ResultBean.class.getClassLoader());
- }
-
-
- public static final Creator CREATOR = new Creator() {
- @Override
- public DataBean createFromParcel(Parcel source) {
- return new DataBean(source);
- }
-
-
- @Override
- public DataBean[] newArray(int size) {
- return new DataBean[size];
- }
- };
- }
-
-
- @Override
- public int describeContents() {
- return 0;
- }
-
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeByte(this.status ? (byte) 1 : (byte) 0);
- dest.writeParcelable(this.data, flags);
- }
-
-
- public UserChaseBangumiInfo() {
- }
-
-
- protected UserChaseBangumiInfo(Parcel in) {
- this.status = in.readByte() != 0;
- this.data = in.readParcelable(DataBean.class.getClassLoader());
- }
-
-
- public static final Parcelable.Creator CREATOR
- = new Parcelable.Creator() {
-
- @Override
- public UserChaseBangumiInfo createFromParcel(Parcel source) {
- return new UserChaseBangumiInfo(source);
- }
-
-
- @Override
- public UserChaseBangumiInfo[] newArray(int size) {
- return new UserChaseBangumiInfo[size];
- }
- };
-}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/entity/user/UserFavoritesInfo.java b/app/src/main/java/com/hotbitmapgg/bilibili/entity/user/UserFavoritesInfo.java
deleted file mode 100644
index 7d00a172..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/entity/user/UserFavoritesInfo.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package com.hotbitmapgg.bilibili.entity.user;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by hcc on 2016/10/13 15:39
- * 100332338@qq.com
- *
- * 用户收藏夹模型类
- */
-
-public class UserFavoritesInfo implements Parcelable {
- private int code;
- private List data;
-
- public int getCode() {
- return code;
- }
-
- public void setCode(int code) {
- this.code = code;
- }
-
- public List getData() {
- return data;
- }
-
- public void setData(List data) {
- this.data = data;
- }
-
-
- public static class DataBean implements Parcelable {
- private int fid;
- private int mid;
- private String name;
- private int max_count;
- private int cur_count;
- private int atten_count;
- private int state;
- private int ctime;
- private List videos;
-
- public int getFid() {
- return fid;
- }
-
- public void setFid(int fid) {
- this.fid = fid;
- }
-
- public int getMid() {
- return mid;
- }
-
- public void setMid(int mid) {
- this.mid = mid;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getMax_count() {
- return max_count;
- }
-
- public void setMax_count(int max_count) {
- this.max_count = max_count;
- }
-
- public int getCur_count() {
- return cur_count;
- }
-
- public void setCur_count(int cur_count) {
- this.cur_count = cur_count;
- }
-
- public int getAtten_count() {
- return atten_count;
- }
-
- public void setAtten_count(int atten_count) {
- this.atten_count = atten_count;
- }
-
- public int getState() {
- return state;
- }
-
- public void setState(int state) {
- this.state = state;
- }
-
- public int getCtime() {
- return ctime;
- }
-
- public void setCtime(int ctime) {
- this.ctime = ctime;
- }
-
- public List getVideos() {
- return videos;
- }
-
- public void setVideos(List videos) {
- this.videos = videos;
- }
-
- public static class VideosBean implements Parcelable {
- private int aid;
- private String pic;
-
- public int getAid() {
- return aid;
- }
-
- public void setAid(int aid) {
- this.aid = aid;
- }
-
- public String getPic() {
- return pic;
- }
-
- public void setPic(String pic) {
- this.pic = pic;
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(this.aid);
- dest.writeString(this.pic);
- }
-
- public VideosBean() {
- }
-
-
- protected VideosBean(Parcel in) {
- this.aid = in.readInt();
- this.pic = in.readString();
- }
-
- public static final Creator CREATOR = new Creator() {
- @Override
- public VideosBean createFromParcel(Parcel source) {
- return new VideosBean(source);
- }
-
- @Override
- public VideosBean[] newArray(int size) {
- return new VideosBean[size];
- }
- };
- }
-
-
- @Override
- public int describeContents() {
- return 0;
- }
-
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(this.fid);
- dest.writeInt(this.mid);
- dest.writeString(this.name);
- dest.writeInt(this.max_count);
- dest.writeInt(this.cur_count);
- dest.writeInt(this.atten_count);
- dest.writeInt(this.state);
- dest.writeInt(this.ctime);
- dest.writeList(this.videos);
- }
-
-
- public DataBean() {
- }
-
-
- protected DataBean(Parcel in) {
- this.fid = in.readInt();
- this.mid = in.readInt();
- this.name = in.readString();
- this.max_count = in.readInt();
- this.cur_count = in.readInt();
- this.atten_count = in.readInt();
- this.state = in.readInt();
- this.ctime = in.readInt();
- this.videos = new ArrayList();
- in.readList(this.videos, VideosBean.class.getClassLoader());
- }
-
-
- public static final Creator CREATOR = new Creator() {
- @Override
- public DataBean createFromParcel(Parcel source) {
- return new DataBean(source);
- }
-
-
- @Override
- public DataBean[] newArray(int size) {
- return new DataBean[size];
- }
- };
- }
-
-
- @Override
- public int describeContents() {
- return 0;
- }
-
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(this.code);
- dest.writeList(this.data);
- }
-
- public UserFavoritesInfo() {
- }
-
-
- protected UserFavoritesInfo(Parcel in) {
- this.code = in.readInt();
- this.data = new ArrayList();
- in.readList(this.data, DataBean.class.getClassLoader());
- }
-
-
- public static final Parcelable.Creator CREATOR
- = new Parcelable.Creator() {
-
- @Override
- public UserFavoritesInfo createFromParcel(Parcel source) {
- return new UserFavoritesInfo(source);
- }
-
-
- @Override
- public UserFavoritesInfo[] newArray(int size) {
- return new UserFavoritesInfo[size];
- }
- };
-}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/module/home/attention/HomeAttentionFragment.java b/app/src/main/java/com/hotbitmapgg/bilibili/module/home/attention/HomeAttentionFragment.java
index c5c1e583..86e3ae0b 100644
--- a/app/src/main/java/com/hotbitmapgg/bilibili/module/home/attention/HomeAttentionFragment.java
+++ b/app/src/main/java/com/hotbitmapgg/bilibili/module/home/attention/HomeAttentionFragment.java
@@ -2,18 +2,13 @@
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
import android.view.View;
-import com.hotbitmapgg.bilibili.adapter.AttentionBangumiAdapter;
import com.hotbitmapgg.bilibili.adapter.AttentionDynamicAdapter;
-import com.hotbitmapgg.bilibili.adapter.helper.HeaderViewRecyclerAdapter;
import com.hotbitmapgg.bilibili.base.RxLazyFragment;
import com.hotbitmapgg.bilibili.entity.attention.AttentionDynamicInfo;
-import com.hotbitmapgg.bilibili.entity.user.UserChaseBangumiInfo;
import com.hotbitmapgg.bilibili.network.RetrofitHelper;
import com.hotbitmapgg.bilibili.utils.SnackbarUtil;
import com.hotbitmapgg.bilibili.widget.CustomEmptyView;
@@ -23,9 +18,7 @@
import java.util.List;
import butterknife.BindView;
-import rx.Observable;
import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Func1;
import rx.schedulers.Schedulers;
/**
@@ -44,8 +37,6 @@ public class HomeAttentionFragment extends RxLazyFragment {
private static final int MID = 9467159;
private boolean mIsRefreshing = false;
- private HeaderViewRecyclerAdapter mHeaderViewRecyclerAdapter;
- private List chaseBangumis = new ArrayList<>();
private List dynamics = new ArrayList<>();
public static HomeAttentionFragment newIntance() {
@@ -88,17 +79,9 @@ protected void initRefreshLayout() {
@Override
protected void loadData() {
- RetrofitHelper.getUserAPI()
- .getUserChaseBangumis(MID)
+ RetrofitHelper.getBiliAPI()
+ .getAttentionDynamic()
.compose(bindToLifecycle())
- .map(userChaseBangumiInfo -> userChaseBangumiInfo.getData().getResult())
- .flatMap(new Func1, Observable>() {
- @Override
- public Observable call(List resultBeans) {
- chaseBangumis.addAll(resultBeans);
- return RetrofitHelper.getBiliAPI().getAttentionDynamic();
- }
- })
.map(attentionDynamicInfo -> attentionDynamicInfo.getData().getFeeds())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -122,9 +105,7 @@ protected void initRecyclerView() {
mRecyclerView.setHasFixedSize(true);
mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
AttentionDynamicAdapter mAdapter = new AttentionDynamicAdapter(mRecyclerView, dynamics);
- mHeaderViewRecyclerAdapter = new HeaderViewRecyclerAdapter(mAdapter);
- createHeadView();
- mRecyclerView.setAdapter(mHeaderViewRecyclerAdapter);
+ mRecyclerView.setAdapter(mAdapter);
setRecycleNoScroll();
}
@@ -145,20 +126,9 @@ public void hideEmptyView() {
private void clearData() {
mIsRefreshing = true;
- chaseBangumis.clear();
dynamics.clear();
}
- private void createHeadView() {
- View headView = LayoutInflater.from(getActivity()).inflate(R.layout.layout_attention_head_view, mRecyclerView, false);
- RecyclerView mBangumiRecycler = (RecyclerView) headView.findViewById(R.id.focus_head_recycler);
- mBangumiRecycler.setHasFixedSize(false);
- mBangumiRecycler.setNestedScrollingEnabled(false);
- mBangumiRecycler.setLayoutManager(new GridLayoutManager(getActivity(), 3));
- mBangumiRecycler.setAdapter(new AttentionBangumiAdapter(mBangumiRecycler, chaseBangumis));
- mHeaderViewRecyclerAdapter.addHeaderView(headView);
- }
-
private void setRecycleNoScroll() {
mRecyclerView.setOnTouchListener((v, event) -> mIsRefreshing);
}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/module/home/bangumi/ChaseBangumiActivity.java b/app/src/main/java/com/hotbitmapgg/bilibili/module/home/bangumi/ChaseBangumiActivity.java
deleted file mode 100644
index a7785c34..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/module/home/bangumi/ChaseBangumiActivity.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.hotbitmapgg.bilibili.module.home.bangumi;
-
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-import com.hotbitmapgg.bilibili.adapter.ChaseBangumiAdapter;
-import com.hotbitmapgg.bilibili.base.RxBaseActivity;
-import com.hotbitmapgg.bilibili.entity.user.UserChaseBangumiInfo;
-import com.hotbitmapgg.bilibili.network.RetrofitHelper;
-import com.hotbitmapgg.bilibili.widget.CircleProgressView;
-import com.hotbitmapgg.ohmybilibili.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * Created by hcc on 2016/10/14 13:21
- * 100332338@qq.com
- *
- * 追番界面
- */
-
-public class ChaseBangumiActivity extends RxBaseActivity {
- @BindView(R.id.toolbar)
- Toolbar mToolbar;
- @BindView(R.id.recycle)
- RecyclerView mRecyclerView;
- @BindView(R.id.circle_progress)
- CircleProgressView mCircleProgressView;
-
- private static final int MID = 9467159;
- private ChaseBangumiAdapter mAdapter;
- private List chaseBangumis = new ArrayList<>();
-
-
- @Override
- public int getLayoutId() {
- return R.layout.activity_chase_bangumi;
- }
-
- @Override
- public void initViews(Bundle savedInstanceState) {
- initRecyclerView();
- loadData();
- }
-
- @Override
- public void loadData() {
- RetrofitHelper.getUserAPI()
- .getUserChaseBangumis(MID)
- .compose(bindToLifecycle())
- .doOnSubscribe(this::showProgressBar)
- .map(userChaseBangumiInfo -> userChaseBangumiInfo.getData().getResult())
- .subscribeOn(Schedulers.io())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(resultBeans -> {
- chaseBangumis.addAll(resultBeans);
- finishTask();
- }, throwable -> {
- hideProgressBar();
- });
- }
-
-
- @Override
- public void initRecyclerView() {
- mRecyclerView.setHasFixedSize(true);
- mRecyclerView.setLayoutManager(new LinearLayoutManager(ChaseBangumiActivity.this));
- mAdapter = new ChaseBangumiAdapter(mRecyclerView, chaseBangumis);
- mRecyclerView.setAdapter(mAdapter);
- }
-
-
- @Override
- public void finishTask() {
- hideProgressBar();
- mAdapter.notifyDataSetChanged();
- }
-
-
- @Override
- public void initToolBar() {
- mToolbar.setTitle("追番");
- setSupportActionBar(mToolbar);
- ActionBar mActionBar = getSupportActionBar();
- if (mActionBar != null) {
- mActionBar.setDisplayHomeAsUpEnabled(true);
- }
- }
-
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.menu_chase_bangumi, menu);
- return true;
- }
-
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- if (item.getItemId() == android.R.id.home) {
- onBackPressed();
- }
- return super.onOptionsItemSelected(item);
- }
-
-
- @Override
- public void showProgressBar() {
- mCircleProgressView.setVisibility(View.VISIBLE);
- mCircleProgressView.spin();
- }
-
-
- @Override
- public void hideProgressBar() {
- mCircleProgressView.setVisibility(View.GONE);
- mCircleProgressView.stopSpinning();
- }
-}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/module/user/UserChaseBangumiFragment.java b/app/src/main/java/com/hotbitmapgg/bilibili/module/user/UserChaseBangumiFragment.java
deleted file mode 100644
index 6e600c0d..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/module/user/UserChaseBangumiFragment.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.hotbitmapgg.bilibili.module.user;
-
-import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-
-import com.hotbitmapgg.bilibili.adapter.UserChaseBangumiAdapter;
-import com.hotbitmapgg.bilibili.base.RxLazyFragment;
-import com.hotbitmapgg.bilibili.entity.user.UserChaseBangumiInfo;
-import com.hotbitmapgg.bilibili.utils.ConstantUtil;
-import com.hotbitmapgg.bilibili.widget.CustomEmptyView;
-import com.hotbitmapgg.ohmybilibili.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-
-import static com.hotbitmapgg.bilibili.utils.ConstantUtil.EXTRA_DATA;
-
-/**
- * Created by hcc on 2016/10/12 18:16
- * 100332338@qq.com
- *
- * 用户详情界面的追番
- */
-
-public class UserChaseBangumiFragment extends RxLazyFragment {
- @BindView(R.id.recycle)
- RecyclerView mRecyclerView;
- @BindView(R.id.empty_view)
- CustomEmptyView mCustomEmptyView;
-
- private List userChaseBangumis = new ArrayList<>();
- private UserChaseBangumiInfo userChaseBangumiInfo;
-
-
- public static UserChaseBangumiFragment newInstance(UserChaseBangumiInfo userChaseBangumiInfo) {
- UserChaseBangumiFragment mFragment = new UserChaseBangumiFragment();
- Bundle bundle = new Bundle();
- bundle.putParcelable(ConstantUtil.EXTRA_DATA, userChaseBangumiInfo);
- mFragment.setArguments(bundle);
- return mFragment;
- }
-
- @Override
- public int getLayoutResId() {
- return R.layout.fragment_user_chase_bangumi;
- }
-
- @Override
- public void finishCreateView(Bundle state) {
- userChaseBangumiInfo = getArguments().getParcelable(EXTRA_DATA);
- initRecyclerView();
- }
-
- @Override
- protected void initRecyclerView() {
- userChaseBangumis.addAll(userChaseBangumiInfo.getData().getResult());
- mRecyclerView.setHasFixedSize(true);
- mRecyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 3));
- UserChaseBangumiAdapter mAdapter = new UserChaseBangumiAdapter(mRecyclerView, userChaseBangumis);
- mRecyclerView.setAdapter(mAdapter);
- mAdapter.setOnItemClickListener((position, holder) -> {
- });
- if (userChaseBangumis.isEmpty()) {
- initEmptyLayout();
- }
- }
-
- private void initEmptyLayout() {
- mCustomEmptyView.setEmptyImage(R.drawable.img_tips_error_space_no_data);
- mCustomEmptyView.setEmptyText("ㄟ( ▔, ▔ )ㄏ 再怎么找也没有啦");
- }
-}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/module/user/UserFavoritesFragment.java b/app/src/main/java/com/hotbitmapgg/bilibili/module/user/UserFavoritesFragment.java
deleted file mode 100644
index 8f2e0dc7..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/module/user/UserFavoritesFragment.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.hotbitmapgg.bilibili.module.user;
-
-import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-
-import com.hotbitmapgg.bilibili.adapter.UserFavoritesAdapter;
-import com.hotbitmapgg.bilibili.base.RxLazyFragment;
-import com.hotbitmapgg.bilibili.entity.user.UserFavoritesInfo;
-import com.hotbitmapgg.bilibili.utils.ConstantUtil;
-import com.hotbitmapgg.bilibili.widget.CustomEmptyView;
-import com.hotbitmapgg.ohmybilibili.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-
-/**
- * Created by hcc on 2016/10/12 18:13
- * 100332338@qq.com
- *
- * 用户详情界面的收藏夹
- */
-
-public class UserFavoritesFragment extends RxLazyFragment {
- @BindView(R.id.recycle)
- RecyclerView mRecyclerView;
- @BindView(R.id.empty_view)
- CustomEmptyView mCustomEmptyView;
-
- private UserFavoritesInfo userFavoritesInfo;
- private List userFavorites = new ArrayList<>();
-
-
- public static UserFavoritesFragment newInstance(UserFavoritesInfo userFavoritesInfo) {
- UserFavoritesFragment mFragment = new UserFavoritesFragment();
- Bundle bundle = new Bundle();
- bundle.putParcelable(ConstantUtil.EXTRA_DATA, userFavoritesInfo);
- mFragment.setArguments(bundle);
- return mFragment;
- }
-
- @Override
- public int getLayoutResId() {
- return R.layout.fragment_user_favorites;
- }
-
-
- @Override
- public void finishCreateView(Bundle state) {
- userFavoritesInfo = getArguments().getParcelable(ConstantUtil.EXTRA_DATA);
- initRecyclerView();
- }
-
- @Override
- protected void initRecyclerView() {
- userFavorites.addAll(userFavoritesInfo.getData());
- mRecyclerView.setHasFixedSize(true);
- mRecyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 2));
- UserFavoritesAdapter mAdapter = new UserFavoritesAdapter(mRecyclerView, userFavorites);
- mRecyclerView.setAdapter(mAdapter);
- if (userFavorites.isEmpty()) {
- initEmptyLayout();
- }
- }
-
- private void initEmptyLayout() {
- mCustomEmptyView.setEmptyImage(R.drawable.img_tips_error_space_no_data);
- mCustomEmptyView.setEmptyText("ㄟ( ▔, ▔ )ㄏ 再怎么找也没有啦");
- }
-}
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/network/api/UserService.java b/app/src/main/java/com/hotbitmapgg/bilibili/network/api/UserService.java
index 0fb1cf6c..2042948c 100644
--- a/app/src/main/java/com/hotbitmapgg/bilibili/network/api/UserService.java
+++ b/app/src/main/java/com/hotbitmapgg/bilibili/network/api/UserService.java
@@ -1,6 +1,5 @@
package com.hotbitmapgg.bilibili.network.api;
-import com.hotbitmapgg.bilibili.entity.user.UserChaseBangumiInfo;
import com.hotbitmapgg.bilibili.entity.user.UserCoinsInfo;
import com.hotbitmapgg.bilibili.entity.user.UserContributeInfo;
import com.hotbitmapgg.bilibili.entity.user.UserPlayGameInfo;
@@ -30,11 +29,6 @@ public interface UserService {
@GET("ajax/member/getCoinVideos")
Observable getUserCoinVideos(@Query("mid") int mid);
- /**
- * 用户追番
- */
- @GET("ajax/Bangumi/getList")
- Observable getUserChaseBangumis(@Query("mid") int mid);
/**
* 用户投稿视频
diff --git a/app/src/main/java/com/hotbitmapgg/bilibili/widget/FavoritesItemLayout.java b/app/src/main/java/com/hotbitmapgg/bilibili/widget/FavoritesItemLayout.java
deleted file mode 100644
index b0f6a44b..00000000
--- a/app/src/main/java/com/hotbitmapgg/bilibili/widget/FavoritesItemLayout.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.hotbitmapgg.bilibili.widget;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.hotbitmapgg.bilibili.entity.user.UserFavoritesInfo;
-import com.hotbitmapgg.ohmybilibili.R;
-
-import java.util.List;
-
-/**
- * Created by hcc on 2016/10/13 15:54
- * 100332338@qq.com
- *
- * 自定义收藏夹布局控件
- */
-
-public class FavoritesItemLayout extends FrameLayout {
- private ImageView mFillImage;
- private ImageView mTopImage;
- private ImageView mBottomImage;
- private LinearLayout mBottomImageLayout;
- private ImageView mLeftImage;
- private ImageView mRightImage;
- private List videos;
-
- public FavoritesItemLayout(Context context) {
- this(context, null);
- }
-
- public FavoritesItemLayout(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public FavoritesItemLayout(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- @SuppressLint("InflateParams")
- RelativeLayout layout = (RelativeLayout) LayoutInflater.from(context)
- .inflate(R.layout.layout_favorites_view, null);
- mFillImage = (ImageView) layout.findViewById(R.id.image_fill);
- mTopImage = (ImageView) layout.findViewById(R.id.image_top);
- mBottomImage = (ImageView) layout.findViewById(R.id.image_bottom);
- mBottomImageLayout = (LinearLayout) layout.findViewById(R.id.image_bottom_layout);
- mLeftImage = (ImageView) layout.findViewById(R.id.image_left);
- mRightImage = (ImageView) layout.findViewById(R.id.image_right);
- addView(layout);
- }
-
-
- /**
- * 设置收藏夹为空时候的占位图
- */
- public void setEmptyImage() {
- mFillImage.setVisibility(VISIBLE);
- mTopImage.setVisibility(GONE);
- mBottomImage.setVisibility(GONE);
- mBottomImageLayout.setVisibility(GONE);
- mLeftImage.setVisibility(GONE);
- mRightImage.setVisibility(GONE);
- mFillImage.setImageResource(R.drawable.ic_favorite_box_default_large);
- }
-
-
- /**
- * 设置收藏夹一张图片时
- *
- * 只显示最上边铺满整个layout的imageView
- */
- public void setOneImage() {
- mFillImage.setVisibility(VISIBLE);
- mTopImage.setVisibility(GONE);
- mBottomImage.setVisibility(GONE);
- mBottomImageLayout.setVisibility(GONE);
- mLeftImage.setVisibility(GONE);
- mRightImage.setVisibility(GONE);
- Glide.with(getContext())
- .load(videos.get(0).getPic())
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .into(mFillImage);
- }
-
-
- /**
- * 设置收藏夹两张图片时
- *
- * 只显示最上边和最下边的两张图片
- */
- public void setTwoImage() {
- mTopImage.setVisibility(VISIBLE);
- mBottomImage.setVisibility(VISIBLE);
- mFillImage.setVisibility(GONE);
- mBottomImageLayout.setVisibility(GONE);
- mLeftImage.setVisibility(GONE);
- mRightImage.setVisibility(GONE);
- Glide.with(getContext())
- .load(videos.get(0).getPic())
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .into(mTopImage);
- Glide.with(getContext())
- .load(videos.get(1).getPic())
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .into(mBottomImage);
- }
-
-
- /**
- * 设置收藏夹三张图片时
- *
- * 只显示最上边的图片和下边的两张图片布局
- */
- public void setThreeImage() {
- mTopImage.setVisibility(VISIBLE);
- mBottomImageLayout.setVisibility(VISIBLE);
- mLeftImage.setVisibility(VISIBLE);
- mRightImage.setVisibility(VISIBLE);
- mBottomImage.setVisibility(GONE);
- mFillImage.setVisibility(GONE);
- Glide.with(getContext())
- .load(videos.get(0).getPic())
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .into(mTopImage);
- Glide.with(getContext())
- .load(videos.get(1).getPic())
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .into(mLeftImage);
- Glide.with(getContext())
- .load(videos.get(2).getPic())
- .diskCacheStrategy(DiskCacheStrategy.ALL)
- .into(mRightImage);
- }
-
-
- public void setImages(List videos) {
- this.videos = videos;
- if (videos != null && videos.size() > 0) {
- switch (videos.size()) {
- case 1:
- setOneImage();
- break;
- case 2:
- setTwoImage();
- break;
- case 3:
- setThreeImage();
- break;
- }
- } else {
- setEmptyImage();
- }
- }
-}
diff --git a/app/src/main/res/layout/activity_chase_bangumi.xml b/app/src/main/res/layout/activity_chase_bangumi.xml
deleted file mode 100644
index df85f208..00000000
--- a/app/src/main/res/layout/activity_chase_bangumi.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_attention.xml b/app/src/main/res/layout/fragment_attention.xml
index 51c32bb7..2dba3d71 100644
--- a/app/src/main/res/layout/fragment_attention.xml
+++ b/app/src/main/res/layout/fragment_attention.xml
@@ -1,6 +1,6 @@
-
@@ -8,13 +8,56 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_user_favorites.xml b/app/src/main/res/layout/fragment_user_favorites.xml
deleted file mode 100644
index 5322816b..00000000
--- a/app/src/main/res/layout/fragment_user_favorites.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_attention_bangumi.xml b/app/src/main/res/layout/item_attention_bangumi.xml
deleted file mode 100644
index 3773b014..00000000
--- a/app/src/main/res/layout/item_attention_bangumi.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_chase_bangumi.xml b/app/src/main/res/layout/item_chase_bangumi.xml
deleted file mode 100644
index 4984d866..00000000
--- a/app/src/main/res/layout/item_chase_bangumi.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/item_user_chase_bangumi.xml b/app/src/main/res/layout/item_user_chase_bangumi.xml
deleted file mode 100644
index 6aa6b781..00000000
--- a/app/src/main/res/layout/item_user_chase_bangumi.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/item_user_favorites.xml b/app/src/main/res/layout/item_user_favorites.xml
deleted file mode 100644
index 18b49743..00000000
--- a/app/src/main/res/layout/item_user_favorites.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_attention_head_view.xml b/app/src/main/res/layout/layout_attention_head_view.xml
deleted file mode 100644
index c7b6a062..00000000
--- a/app/src/main/res/layout/layout_attention_head_view.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_favorites_view.xml b/app/src/main/res/layout/layout_favorites_view.xml
deleted file mode 100644
index 4c06e02f..00000000
--- a/app/src/main/res/layout/layout_favorites_view.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file