修复部分文章不显示作者BUG

goweii · Sep 28, 2019 · 22c85d8 · 22c85d8
1 parent 6d85aa4
commit 22c85d8
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 369 deletions.
diff --git a/app/src/main/java/per/goweii/wanandroid/http/WanApi.java b/app/src/main/java/per/goweii/wanandroid/http/WanApi.java
@@ -13,7 +13,6 @@
 import per.goweii.wanandroid.module.knowledge.model.KnowledgeBean;
 import per.goweii.wanandroid.module.login.model.LoginBean;
 import per.goweii.wanandroid.module.main.model.ArticleBean;
-import per.goweii.wanandroid.module.main.model.CollectArticleBean;
 import per.goweii.wanandroid.module.main.model.CollectionLinkBean;
 import per.goweii.wanandroid.module.main.model.ConfigBean;
 import per.goweii.wanandroid.module.main.model.UpdateBean;
@@ -250,9 +249,9 @@ Observable<WanResponse<KnowledgeArticleBean>> getKnowledgeArticleList(@Path("pag
          */
         @FormUrlEncoded
         @POST("lg/collect/add/json")
-        Observable<WanResponse<CollectArticleBean>> collect(@Field("title") String title,
-                                                            @Field("author") String author,
-                                                            @Field("link") String link);
+        Observable<WanResponse<ArticleBean>> collect(@Field("title") String title,
+                                                     @Field("author") String author,
+                                                     @Field("link") String link);
 
         /**
          * 收藏网址

diff --git a/app/src/main/java/per/goweii/wanandroid/module/home/presenter/HomePresenter.java b/app/src/main/java/per/goweii/wanandroid/module/home/presenter/HomePresenter.java
@@ -203,10 +203,11 @@ public void onFinish() {
 
     public void getConfig() {
         ConfigBean configBean = ConfigUtils.getInstance().getConfig();
-        LogUtils.i("ConfigBean", configBean.toFormatJson());
+        LogUtils.i("ConfigBean", "getConfig" + configBean.toFormatJson());
         getBaseView().getConfigSuccess(configBean);
+        LogUtils.i("ConfigBean", ConfigUtils.getInstance().isTodayUpdate());
         if (ConfigUtils.getInstance().isTodayUpdate()) {
-//            return;
+            return;
         }
         MainRequest.getConfig(getRxLife(), new RequestListener<ConfigBean>() {
             @Override
@@ -215,7 +216,7 @@ public void onStart() {
 
             @Override
             public void onSuccess(int code, ConfigBean data) {
-                LogUtils.i("ConfigBean", data.toFormatJson());
+                LogUtils.i("ConfigBean", "onSuccess" + data.toFormatJson());
                 getBaseView().getConfigSuccess(data);
                 ConfigUtils.getInstance().setConfig(data);
             }

diff --git a/app/src/main/java/per/goweii/wanandroid/module/main/model/ArticleBean.java b/app/src/main/java/per/goweii/wanandroid/module/main/model/ArticleBean.java
@@ -1,5 +1,7 @@
 package per.goweii.wanandroid.module.main.model;
 
+import android.text.TextUtils;
+
 import java.util.List;
 
 import per.goweii.rxhttp.request.base.BaseBean;
@@ -41,6 +43,7 @@ public class ArticleBean extends BaseBean {
 
     private String apkLink;
     private String author;
+    private String shareUser;
     private int chapterId;
     private String chapterName;
     private boolean collect;
@@ -63,6 +66,7 @@ public class ArticleBean extends BaseBean {
     private int visible;
     private int zan;
     private List<TagsBean> tags;
+    private int originId;
 
     public String getApkLink() {
         return apkLink;
@@ -73,7 +77,29 @@ public void setApkLink(String apkLink) {
     }
 
     public String getAuthor() {
-        return author;
+        if (!TextUtils.isEmpty(author)) {
+            return author;
+        }
+        if (!TextUtils.isEmpty(shareUser)) {
+            return shareUser;
+        }
+        return "匿名";
+    }
+
+    public String getShareUser() {
+        return shareUser;
+    }
+
+    public void setShareUser(String shareUser) {
+        this.shareUser = shareUser;
+    }
+
+    public int getOriginId() {
+        return originId;
+    }
+
+    public void setOriginId(int originId) {
+        this.originId = originId;
     }
 
     public void setAuthor(String author) {

diff --git a/app/src/main/java/per/goweii/wanandroid/module/main/model/CollectArticleBean.java b/app/src/main/java/per/goweii/wanandroid/module/main/model/CollectArticleBean.java
diff --git a/app/src/main/java/per/goweii/wanandroid/module/main/model/MainRequest.java b/app/src/main/java/per/goweii/wanandroid/module/main/model/MainRequest.java
@@ -22,7 +22,7 @@ public static Disposable collect(int id, @NonNull RequestListener<BaseBean> list
         return request(WanApi.api().collect(id), listener);
     }
 
-    public static Disposable collect(String title, String author, String link, @NonNull RequestListener<CollectArticleBean> listener) {
+    public static Disposable collect(String title, String author, String link, @NonNull RequestListener<ArticleBean> listener) {
         return request(WanApi.api().collect(title, author, link), listener);
     }
 

diff --git a/app/src/main/java/per/goweii/wanandroid/module/main/presenter/WebPresenter.java b/app/src/main/java/per/goweii/wanandroid/module/main/presenter/WebPresenter.java
@@ -7,7 +7,7 @@
 import per.goweii.rxhttp.request.exception.ExceptionHandle;
 import per.goweii.wanandroid.event.CollectionEvent;
 import per.goweii.wanandroid.http.RequestListener;
-import per.goweii.wanandroid.module.main.model.CollectArticleBean;
+import per.goweii.wanandroid.module.main.model.ArticleBean;
 import per.goweii.wanandroid.module.main.model.CollectionLinkBean;
 import per.goweii.wanandroid.module.main.model.MainRequest;
 import per.goweii.wanandroid.module.main.view.WebView;
@@ -55,14 +55,14 @@ public void onFinish() {
     }
 
     public void collect(String title, String author, String link, PointF p) {
-        addToRxLife(MainRequest.collect(title, author, link, new RequestListener<CollectArticleBean>() {
+        addToRxLife(MainRequest.collect(title, author, link, new RequestListener<ArticleBean>() {
             @Override
             public void onStart() {
                 showLoadingBar();
             }
 
             @Override
-            public void onSuccess(int code, CollectArticleBean data) {
+            public void onSuccess(int code, ArticleBean data) {
                 CollectionEvent.postCollectWithCollectId(data.getId());
                 if (isAttach()) {
                     getBaseView().collectSuccess(p);

diff --git a/app/src/main/java/per/goweii/wanandroid/module/mine/adapter/CollectionArticleAdapter.java b/app/src/main/java/per/goweii/wanandroid/module/mine/adapter/CollectionArticleAdapter.java
@@ -12,7 +12,7 @@
 import com.chad.library.adapter.base.BaseViewHolder;
 
 import per.goweii.wanandroid.R;
-import per.goweii.wanandroid.module.mine.model.CollectionArticleBean;
+import per.goweii.wanandroid.module.main.model.ArticleBean;
 import per.goweii.wanandroid.utils.ImageLoader;
 import per.goweii.wanandroid.widget.CollectView;
 
@@ -23,7 +23,7 @@
  * E-mail: goweii@163.com
  * GitHub: https://github.com/goweii
  */
-public class CollectionArticleAdapter extends BaseQuickAdapter<CollectionArticleBean.DatasBean, BaseViewHolder> {
+public class CollectionArticleAdapter extends BaseQuickAdapter<ArticleBean, BaseViewHolder> {
 
     private OnCollectViewClickListener mOnCollectViewClickListener = null;
 
@@ -36,7 +36,7 @@ public void setOnCollectViewClickListener(OnCollectViewClickListener onCollectVi
     }
 
     @Override
-    protected void convert(BaseViewHolder helper, CollectionArticleBean.DatasBean item) {
+    protected void convert(BaseViewHolder helper, ArticleBean item) {
         TextView tv_title = helper.getView(R.id.tv_title);
         TextView tv_desc = helper.getView(R.id.tv_desc);
         if (TextUtils.isEmpty(item.getDesc())) {

diff --git a/app/src/main/java/per/goweii/wanandroid/module/mine/fragment/CollectionArticleFragment.java b/app/src/main/java/per/goweii/wanandroid/module/mine/fragment/CollectionArticleFragment.java
@@ -25,6 +25,7 @@
 import per.goweii.wanandroid.event.CollectionEvent;
 import per.goweii.wanandroid.event.SettingChangeEvent;
 import per.goweii.wanandroid.module.main.activity.WebActivity;
+import per.goweii.wanandroid.module.main.model.ArticleBean;
 import per.goweii.wanandroid.module.mine.adapter.CollectionArticleAdapter;
 import per.goweii.wanandroid.module.mine.model.CollectionArticleBean;
 import per.goweii.wanandroid.module.mine.presenter.CollectionArticlePresenter;
@@ -72,9 +73,9 @@ public void onCollectionEvent(CollectionEvent event) {
             presenter.getCollectArticleList(currPage, true);
         } else {
             if (event.getArticleId() != -1 || event.getCollectId() != -1) {
-                List<CollectionArticleBean.DatasBean> list = mAdapter.getData();
+                List<ArticleBean> list = mAdapter.getData();
                 for (int i = 0; i < list.size(); i++) {
-                    CollectionArticleBean.DatasBean item = list.get(i);
+                    ArticleBean item = list.get(i);
                     if (event.getArticleId() != -1) {
                         if (item.getOriginId() == event.getArticleId()) {
                             mAdapter.remove(i);
@@ -142,7 +143,7 @@ public void onLoadMoreRequested() {
         mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                CollectionArticleBean.DatasBean item = mAdapter.getItem(position);
+                ArticleBean item = mAdapter.getItem(position);
                 if (item != null) {
                     WebActivity.start(getContext(), item.getOriginId(), item.getTitle(), item.getLink());
                 }
@@ -151,7 +152,7 @@ public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
         mAdapter.setOnCollectViewClickListener(new CollectionArticleAdapter.OnCollectViewClickListener() {
             @Override
             public void onClick(BaseViewHolder helper, CollectView v, int position) {
-                CollectionArticleBean.DatasBean item = mAdapter.getItem(position);
+                ArticleBean item = mAdapter.getItem(position);
                 if (item != null) {
                     presenter.uncollect(item, v);
                 }