Merge branch 'master' of https://github.com/brian512/CodeBlog

Author: brian512

app/build.gradle

@@ -96,7 +96,6 @@ android {
     dexOptions {
         javaMaxHeapSize "2g"
         preDexLibraries = false
-        incremental true
     }
 
     aaptOptions {

app/src/main/java/com/brian/csdnblog/activity/BlogListFrag.java

@@ -451,7 +451,7 @@ public void onEventMainThread(TypeChangeEvent event) {
     }
 
     private void startRefresh() {
-        if (mRefreshable && checkUpdateTime()) {
+        if (mRefreshable && (checkUpdateTime()||Config.isDebug)) {
             mRefreshLayout.setRefreshing(true);
             loadData(true);
         }

app/src/main/java/com/brian/csdnblog/parser/CSDNHtmlParser.java

@@ -109,6 +109,9 @@ private List<BlogInfo> doGetHotBlogItemList(int type, String str) {
             String nickName = blogItem.getElementsByClass("nickname").get(0).text();
             item.extraMsg = nickName + "  " + blogItem.getElementsByClass("blog_list_b_r").get(0).select("label").text();
             item.link = blogItem.select("h3").select("a").attr("href");
+            if (item.link.startsWith("/")) {
+                item.link = getBlogBaseUrl() + item.link;
+            }
             item.blogId = Md5.getMD5ofStr(item.link);
             item.type = type;
             item.dateStamp = String.valueOf(System.currentTimeMillis());

app/src/main/java/com/brian/csdnblog/parser/ITEyeHtmlParser.java

@@ -12,8 +12,10 @@
 
 import com.brian.csdnblog.Env;
 import com.brian.csdnblog.manager.Constants;
+import com.brian.csdnblog.manager.TypeManager;
 import com.brian.csdnblog.model.BlogInfo;
 import com.brian.csdnblog.datacenter.preference.CommonPreference;
+import com.brian.csdnblog.model.Bloger;
 import com.brian.csdnblog.util.JsoupUtil;
 import com.brian.csdnblog.util.LogUtil;
 import com.brian.csdnblog.util.Md5;
@@ -62,13 +64,54 @@ public static ITEyeHtmlParser getInstance() {
     @Override
     public List<BlogInfo> getBlogList(int type, String strHtml) {
         try {
-            return doGetBlogList(type, strHtml);
+            if (TypeManager.getCateType(type) == TypeManager.TYPE_CAT_BLOGER) {
+                return doGetBlogerItemList(type, strHtml);
+            } else {
+                return doGetBlogList(type, strHtml);
+            }
         } catch (Exception e) {
-            e.printStackTrace();
+            LogUtil.printError(e);
             MobclickAgent.reportError(Env.getContext(), e);
             return null;
         }
     }
+
+
+    private List<BlogInfo> doGetBlogerItemList(int type, String str) {
+        List<BlogInfo> list = new ArrayList<>();
+        if (TextUtils.isEmpty(str)) {
+            return list;
+        }
+//        LogUtil.d("str=" + str);
+        // 获取文档对象
+        Document doc = Jsoup.parse(str);
+        // 获取class="article_item"的所有元素
+        Elements blogList = doc.getElementsByClass("blog_main");
+        if (blogList == null) {
+            return list;
+        }
+
+        for (Element blogItem : blogList) {
+            BlogInfo item = new BlogInfo();
+            item.title = blogItem.select("h3").select("a").text(); // 得到标题
+            item.link = blogItem.select("h3").select("a").attr("href");
+            if (item.link.startsWith("/")) {
+                item.link = getBlogBaseUrl() + item.link;
+            }
+            item.summary = blogItem.getElementsByClass("blog_content").first().text();
+            item.blogId = Md5.getMD5ofStr(item.link);
+
+            Element msgElement = blogItem.getElementsByClass("blog_bottom").get(0);
+            msgElement.getElementsByClass("comment").remove();
+            msgElement.getElementsByClass("view").remove();
+            msgElement.getElementsByClass("digged").remove();
+            item.extraMsg = msgElement.text();
+            item.type = type;
+
+            list.add(item);
+        }
+        return list;
+    }
 
     private List<BlogInfo> doGetBlogList(int type, String str) {
         List<BlogInfo> list = new ArrayList<>();
@@ -89,6 +132,9 @@ private List<BlogInfo> doGetBlogList(int type, String str) {
             BlogInfo item = new BlogInfo();
             item.title = blogItem.select("h3").select("a").text(); // 得到标题
             item.link = blogItem.select("h3").select("a").attr("href");
+            if (item.link.startsWith("/")) {
+                item.link = getBlogBaseUrl() + item.link;
+            }
             item.summary = blogItem.getElementsByIndexEquals(1).text();
             item.blogId = Md5.getMD5ofStr(item.link);
 
@@ -99,6 +145,20 @@ private List<BlogInfo> doGetBlogList(int type, String str) {
             item.extraMsg = msgElement.text();
             item.type = type;
 
+            String homePageUrl = blogItem.getElementsByClass("blog_info").get(0).select("a").attr("href");
+            if (!TextUtils.isEmpty(homePageUrl)) {
+                Bloger bloger = new Bloger();
+                bloger.blogerType = type;
+                bloger.nickName = blogItem.getElementsByClass("blog_info").get(0).select("a").text();
+                bloger.headUrl = blogItem.getElementsByClass("logo").get(0).select("img").attr("src");
+                bloger.homePageUrl = homePageUrl;
+                bloger.blogerID = Bloger.getBlogerId(bloger.homePageUrl);
+
+//                BlogerTable.getInstance().insert(bloger);//保存用户信息
+                item.blogerJson = bloger.toJson();
+                item.blogerID = bloger.blogerID;
+            }
+
             list.add(item);
         }
         return list;