修复线上BUG，修复个人博客搜索不出来问题

raedev · raedev · commit c70aae339b22 · 2018-03-02T16:46:04.000+08:00
diff --git a/app/src/main/java/com/rae/cnblogs/activity/BloggerActivity.java b/app/src/main/java/com/rae/cnblogs/activity/BloggerActivity.java
@@ -113,6 +113,7 @@ public class BloggerActivity extends SwipeBackBaseActivity implements IBloggerPr
 
     String mBlogApp;
 
+    @Nullable
     private FriendsInfoBean mUserInfo;
     private IBloggerPresenter mBloggerPresenter;
     private FeedListFragment mFeedListFragment;
@@ -234,7 +235,7 @@ public void onLoadBloggerInfo(final FriendsInfoBean userInfo) {
 
         // 如果是自己，则隐藏关注按钮
         if (UserProvider.getInstance().isLogin() && TextUtils.equals(mBlogApp, UserProvider.getInstance().getLoginUserInfo().getBlogApp())) {
-            mFollowView.setVisibility(View.INVISIBLE);
+            mFollowView.setVisibility(View.GONE);
         } else {
             mFollowView.setVisibility(View.VISIBLE);
         }
@@ -346,6 +347,9 @@ protected void onStatusBarColorChanged() {
      */
     @OnClick(R.id.img_search)
     public void onSearchClick() {
+        if (mUserInfo == null) {
+            return;
+        }
         AppRoute.jumpToSearchBlogger(this, mBlogApp, mUserInfo.getDisplayName());
     }
 
diff --git a/app/src/main/java/com/rae/cnblogs/activity/LauncherActivity.java b/app/src/main/java/com/rae/cnblogs/activity/LauncherActivity.java
@@ -102,7 +102,7 @@ public void onJumpToBlog(String id) {
     @Override
     public void onNormalImage() {
         // 加载默认
-        if (!ThemeCompat.isNight()) {
+        if (!ThemeCompat.isNight() && mDisplayView != null) {
             mDisplayView.setImageResource(R.drawable.launcher_background);
         }
     }
diff --git a/app/src/main/java/com/rae/cnblogs/presenter/impl/blog/BlogContentPresenterImpl.java b/app/src/main/java/com/rae/cnblogs/presenter/impl/blog/BlogContentPresenterImpl.java
@@ -183,6 +183,7 @@ protected void createObservable(final boolean isCancel, Observable<Empty> observ
         createObservable(observable).subscribe(new ApiDefaultObserver<Empty>() {
             @Override
             protected void onError(String msg) {
+                if (mView == null) return;
                 if (!TextUtils.isEmpty(msg) && (msg.contains("登录") || msg.contains("Authorization"))) {
                     mView.onNeedLogin();
                     return;
@@ -213,11 +214,10 @@ protected void onError(String msg) {
 
             @Override
             protected void accept(Empty empty) {
-
+                if (mView == null) return;
                 if (isLike) {
                     mView.onLikeSuccess(isCancel);
                     mBlogInfo.setLiked(!isCancel);
-
                 } else {
                     mView.onBookmarksSuccess(isCancel);
                     mBlogInfo.setBookmarks(!isCancel);
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/api/ApiUrls.java b/sdk/src/main/java/com/rae/cnblogs/sdk/api/ApiUrls.java
@@ -102,7 +102,7 @@ final class ApiUrls {
     static final String API_SEARCH_BLOG_LIST = "http://zzk.cnblogs.com/s/blogpost";
 
     // 搜索-个人博客
-    static final String API_SEARCH_BLOG_APP = "http://zzk.cnblogs.com/s";
+    static final String API_SEARCH_BLOG_APP = "http://zzk.cnblogs.com/s/blogpost";
 
     // 搜索-知识库-列表
     static final String API_SEARCH_KB_LIST = "http://zzk.cnblogs.com/s/kb";
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/api/ISearchApi.java b/sdk/src/main/java/com/rae/cnblogs/sdk/api/ISearchApi.java
@@ -74,7 +74,7 @@ public interface ISearchApi {
             "Cookie: AspxAutoDetectCookieSupport=1"
     })
     @Parser(SearchBlogListParser.class)
-    Observable<List<BlogBean>> searchBlogAppList(@Query("w") String keyword, @Query("pageindex") int page);
+    Observable<List<BlogBean>> searchBlogAppList(@Query("Keywords") String keyword, @Query("pageindex") int page);
 
     /**
      * 搜索知识库
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/parser/SearchBlogListParser.java b/sdk/src/main/java/com/rae/cnblogs/sdk/parser/SearchBlogListParser.java
@@ -1,9 +1,12 @@
 package com.rae.cnblogs.sdk.parser;
 
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
+import com.rae.cnblogs.sdk.UserProvider;
 import com.rae.cnblogs.sdk.bean.BlogBean;
 import com.rae.cnblogs.sdk.bean.BlogType;
+import com.rae.cnblogs.sdk.bean.UserInfoBean;
 import com.rae.cnblogs.sdk.utils.ApiUtils;
 
 import org.jsoup.nodes.Document;
@@ -36,12 +39,20 @@ public List<BlogBean> parse(Document document, String html) {
         // 解析HTML
         List<BlogBean> result = new ArrayList<>();
         Elements elements = document.select(".searchItem");
+
+
+        // 可能是个人搜索
+        if (elements.size() <= 0) {
+            return parsePersonal(document, result);
+        }
+
+
         for (Element element : elements) {
 
             String id = getId(element.select(".searchURL").text());
 
             String title = element.select(".searchItemTitle a").html(); // 标题
-            if (TextUtils.isEmpty(title)){
+            if (TextUtils.isEmpty(title)) {
                 title = element.select(".searchItemTitle").html(); // 标题
             }
             String url = element.select(".searchURL").text(); // 原文链接
@@ -98,4 +109,54 @@ private String getId(String text) {
 
         return null;
     }
+
+
+    /**
+     * 个人搜索
+     */
+    private List<BlogBean> parsePersonal(Document document, List<BlogBean> result) {
+
+        @Nullable UserInfoBean user = UserProvider.getInstance().getLoginUserInfo();
+
+        Elements elements = document.select(".result-item");
+        for (Element element : elements) {
+            String url = element.select(".result-url").text();
+            String id = getId(url);
+            String title = element.select(".result-title a").html(); // 标题
+            String summary = element.select(".result-content").html(); // 摘要
+//            String author = element.select(".searchItemInfo-userName").text(); // 作者
+//            String authorUrl = element.select(".searchItemInfo-userName a").attr("href"); // 作者博客地址
+//            String blogApp = ApiUtils.getBlogApp(authorUrl);
+            String comment = ApiUtils.getCount(ApiUtils.getNumber(element.select(".icon-pinglun").text())); // 评论
+            String views = ApiUtils.getCount(ApiUtils.getNumber(element.select(".icon-liulan").text())); // 阅读
+            String likes = ApiUtils.getCount(ApiUtils.getNumber(element.select(".icon-dianzan").text())); // 点赞或者是推荐
+            String date = ApiUtils.getDate(element.select(".icon-shijiane").text()); // 发布时间
+
+            // 博客ID为空不添加
+            if (TextUtils.isEmpty(id)) {
+                continue;
+            }
+
+            BlogBean m = new BlogBean();
+            if (user != null) {
+                m.setAuthor(user.getDisplayName());
+                m.setAvatar(user.getAvatar());
+                m.setBlogApp(user.getBlogApp());
+            }
+            m.setBlogId(id);
+            m.setTitle(title);
+            m.setUrl(url);
+            m.setSummary(summary);
+            m.setComment(comment);
+            m.setViews(views);
+            m.setPostDate(date);
+            m.setLikes(likes);
+            m.setBlogType(mBlogType.getTypeName());
+
+            cacheThumbUrls(m);
+            result.add(m);
+        }
+
+        return result;
+    }
 }
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/parser/UserTimelineParser.java b/sdk/src/main/java/com/rae/cnblogs/sdk/parser/UserTimelineParser.java
@@ -24,6 +24,7 @@ public class UserTimelineParser implements IHtmlParser<List<UserFeedBean>> {
     public List<UserFeedBean> parse(Document document, String html) {
         List<UserFeedBean> result = new ArrayList<>();
         Elements elements = document.select(".feed_item");
+
         for (Element element : elements) {
             UserFeedBean m = new UserFeedBean();
             m.setAvatar(ApiUtils.getUrl(element.select(".feed_avatar a img").attr("src")));
@@ -39,13 +40,14 @@ public List<UserFeedBean> parse(Document document, String html) {
                 // 只读取标题内容
                 Elements titleElement = element.select(".feed_title").clone();
                 titleElement.select("a").remove();
-                m.setContent(titleElement.text());
+                m.setContent(titleElement.text().replace("：", ""));
             }
             result.add(m);
         }
         return result;
     }
 
+
     private String getAction(String text) {
         Pattern regx = Pattern.compile(">\\s.+\\n");
         Matcher matcher = regx.matcher(text);

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public void onJumpToBlog(String id) {`
`102`	`102`	`@Override`
`103`	`103`	`public void onNormalImage() {`
`104`	`104`	`// 加载默认`
`105`		`- if (!ThemeCompat.isNight()) {`
	`105`	`+ if (!ThemeCompat.isNight() && mDisplayView != null) {`
`106`	`106`	`mDisplayView.setImageResource(R.drawable.launcher_background);`
`107`	`107`	`}`
`108`	`108`	`}`