add entrance of blogerbloglist in iteye and oschina

Author: brian512

app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.brian.csdnblog"
         minSdkVersion 15
         targetSdkVersion 24
-        versionCode 76
-        versionName "1.3.76"
+        versionCode 78
+        versionName "1.3.78"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
 
@@ -65,7 +65,7 @@ android {
             // 签名
             signingConfig signingConfigs.release
 
-            // 修改包名
+            // 修改文件名
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
                     def outputFile = output.outputFile

app/src/main/AndroidManifest.xml

@@ -37,9 +37,6 @@
 
         <meta-data android:name="DEBUG_ENABLE" android:value="${DEBUG_ENABLE}" />
 
-        <!--腾讯X5内核-->
-        <meta-data android:name="QBSDKAppKey" android:value="OExstf3r76Yf79YF/kJrUb+Q"/>
-
         <activity
             android:name="com.brian.csdnblog.activity.SplashActivity"
             android:screenOrientation="portrait">

app/src/main/java/com/brian/csdnblog/manager/BlogerManager.java

@@ -3,6 +3,7 @@
 import com.brian.csdnblog.datacenter.preference.CommonPreference;
 import com.brian.csdnblog.model.Bloger;
 import com.brian.csdnblog.model.event.CurrBlogerEvent;
+import com.brian.csdnblog.util.LogUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -42,6 +43,8 @@ public void setCurrBloger(Bloger bloger) {
             CurrBlogerEvent event = new CurrBlogerEvent();
             event.bloger = mCurrBloger;
             EventBus.getDefault().post(event);
+
+            LogUtil.log("mCurrBloger=" + mCurrBloger.toJson());
         }
     }
 }

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

@@ -11,6 +11,7 @@
 import android.text.TextUtils;
 
 import com.brian.csdnblog.Env;
+import com.brian.csdnblog.manager.BlogerManager;
 import com.brian.csdnblog.manager.Constants;
 import com.brian.csdnblog.manager.TypeManager;
 import com.brian.csdnblog.model.BlogInfo;
@@ -21,6 +22,8 @@
 import com.brian.csdnblog.util.Md5;
 import com.umeng.analytics.MobclickAgent;
 
+import static com.brian.csdnblog.manager.BlogerManager.getsInstance;
+
 /**
  * 博客园网页解析类
  * @author huamm
@@ -90,13 +93,18 @@ private List<BlogInfo> doGetBlogerItemList(int type, String str) {
         if (blogList == null) {
             return list;
         }
+        Bloger bloger = BlogerManager.getsInstance().getCurrBloger();
+        String host = getBlogBaseUrl();
+        if (!TextUtils.isEmpty(bloger.homePageUrl)) {
+            host = bloger.homePageUrl.substring(0, bloger.homePageUrl.indexOf(".com")+4);
+        }
 
         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.link = host + item.link;
             }
             item.summary = blogItem.getElementsByClass("blog_content").first().text();
             item.blogId = Md5.getMD5ofStr(item.link);

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

@@ -4,7 +4,9 @@
 
 import com.brian.csdnblog.Env;
 import com.brian.csdnblog.datacenter.preference.CommonPreference;
+import com.brian.csdnblog.manager.TypeManager;
 import com.brian.csdnblog.model.BlogInfo;
+import com.brian.csdnblog.model.Bloger;
 import com.brian.csdnblog.util.JsoupUtil;
 import com.brian.csdnblog.util.LogUtil;
 import com.brian.csdnblog.util.Md5;
@@ -59,14 +61,48 @@ public static OsChinaHtmlParser 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();
             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"的所有元素
+        Element blogs = doc.getElementById("list");
+        if (blogs == null) {
+            return list;
+        }
+        Elements blogList = blogs.getElementsByClass("list-item");
+
+        for (Element blogItem : blogList) {
+            BlogInfo item = new BlogInfo();
+            item.title = blogItem.getElementsByClass("title").get(0).select("a").text(); // 得到标题
+            item.link = blogItem.getElementsByClass("title").get(0).select("a").attr("href");
+            item.summary = "";
+            item.extraMsg = blogItem.getElementsByClass("time").get(0).text();
+            item.blogId = Md5.getMD5ofStr(item.link);
+
+            item.type = type;
+
+            list.add(item);
+        }
+        return list;
+    }
+
     private List<BlogInfo> doGetBlogList(int type, String str) {
         List<BlogInfo> list = new ArrayList<>();
         if (TextUtils.isEmpty(str)) {
@@ -92,6 +128,20 @@ private List<BlogInfo> doGetBlogList(int type, String str) {
 
             item.type = type;
 
+            String homePageUrl = blogItem.select("a").get(0).attr("href");
+            if (!TextUtils.isEmpty(homePageUrl)) {
+                Bloger bloger = new Bloger();
+                bloger.blogerType = type;
+                bloger.nickName = blogItem.select("a").get(0).select("img").attr("title");
+                bloger.headUrl = blogItem.select("a").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;
@@ -101,6 +151,7 @@ public String getBlogContent(int type, String contentSrc) {
         try {
             return doGetBlogContent(contentSrc);
         } catch (Exception e) {
+            LogUtil.printError(e);
             MobclickAgent.reportError(Env.getContext(), e);
             return "";
         }

app/src/main/java/com/brian/csdnblog/util/DeviceUtil.java

@@ -48,8 +48,17 @@ public static String getUUID() {
         } catch (Exception e) {
             deviceId = "";
         }
-        tmSerial = "" + tm.getSimSerialNumber();
-        androidId = "" + Settings.Secure.getString(Env.getContext().getContentResolver(), Settings.Secure.ANDROID_ID);
+        try {
+            tmSerial = "" + tm.getSimSerialNumber();
+        } catch (Exception e) {
+            tmSerial = "";
+        }
+        try {
+            androidId = "" + Settings.Secure.getString(Env.getContext().getContentResolver(), Settings.Secure.ANDROID_ID);
+        } catch (Exception e) {
+            androidId = "";
+        }
+
         UUID deviceUuid = new UUID(androidId.hashCode(), ((long) deviceId.hashCode() << 32) | tmSerial.hashCode());
         uniqueId = Md5.getMD5ofStr(deviceUuid.toString());
         LogUtil.d("uuid=" + uniqueId);

settings.gradle

@@ -1 +1 @@
-include ':app'
+include ':app'