修复一些BUG

raee · raee · commit 3b62b413d2f1 · 2017-08-18T18:33:55.000+08:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -79,7 +79,7 @@ android {
 
     // 批量渠道包值替换
     productFlavors.all { flavor ->
-        flavor.manifestPlaceholders = [UMENG_CHANNEL: name]
+        flavor.manifestPlaceholders = [UMENG_CHANNEL: name,BUGLY_CHANNEL:name]
     }
 }
 
diff --git a/app/src/main/java/com/rae/cnblogs/adapter/FeedItemAdapter.java b/app/src/main/java/com/rae/cnblogs/adapter/FeedItemAdapter.java
@@ -2,6 +2,7 @@
 
 import android.text.TextUtils;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 
 import com.rae.cnblogs.R;
@@ -28,6 +29,12 @@ public void onBindViewHolder(FeedViewHolder holder, int position, UserFeedBean m
 //        holder.feedActionView.setText(m.getAction());
         holder.feedActionTitleView.setText(String.format("#%s# %s", m.getAction(), m.getTitle()));
         holder.itemView.setTag(m);
+        if ("发表评论".equals(m.getAction())) {
+            holder.feedLayout.setVisibility(View.GONE);
+            holder.contentView.setText(String.format("#%s# %s", m.getAction(), m.getContent()));
+        } else {
+            holder.feedLayout.setVisibility(View.VISIBLE);
+        }
 
         if (!TextUtils.isEmpty(m.getAvatar())) {
             RaeImageLoader.displayImage(m.getAvatar(), holder.avatarView);
diff --git a/app/src/main/java/com/rae/cnblogs/dialog/impl/VersionUpdateDialog.java b/app/src/main/java/com/rae/cnblogs/dialog/impl/VersionUpdateDialog.java
@@ -27,6 +27,12 @@ protected int getLayoutId() {
         return R.layout.dialog_version_card;
     }
 
+    @Override
+    public void show() {
+        super.show();
+        mContentLayout.setEnabled(false);
+    }
+
     public void setVersionInfo(final VersionInfo versionInfo) {
         setTitle(versionInfo.getVersionName());
         setMessage(Html.fromHtml(versionInfo.getAppDesc()).toString());
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/BlogListFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/BlogListFragment.java
@@ -103,12 +103,11 @@ public void onResume() {
 
     @Override
     public void onDestroy() {
-        super.onDestroy();
         mItemAdapter.destroy();
         mAppLayout.removeAllViews();
-        mAppLayout.refreshComplete();
         mRecyclerView.removeAllViews();
         EventBus.getDefault().unregister(this);
+        super.onDestroy();
     }
 
 
diff --git a/app/src/main/java/com/rae/cnblogs/model/FeedListFragment.java b/app/src/main/java/com/rae/cnblogs/model/FeedListFragment.java
@@ -70,6 +70,9 @@ protected void onLoadData() {
         mAdapter.setOnItemClickListener(new BaseItemAdapter.onItemClickListener<UserFeedBean>() {
             @Override
             public void onItemClick(UserFeedBean item) {
+                if ("发表评论".equals(item.getAction())) {
+                    return;
+                }
                 AppRoute.jumpToWeb(getContext(), item.getUrl());
             }
         });
diff --git a/app/src/main/java/com/rae/cnblogs/model/FeedViewHolder.java b/app/src/main/java/com/rae/cnblogs/model/FeedViewHolder.java
@@ -17,6 +17,9 @@ public class FeedViewHolder extends BlogCommentViewHolder {
     @BindView(R.id.img_blog_action)
     public ImageView feedActionView;
 
+    @BindView(R.id.ll_feed)
+    public View feedLayout;
+
     @BindView(R.id.tv_blog_action_title)
     public TextView feedActionTitleView;
 
diff --git a/app/src/main/java/com/rae/cnblogs/service/job/BlogContentJob.java b/app/src/main/java/com/rae/cnblogs/service/job/BlogContentJob.java
@@ -59,6 +59,7 @@ public void run() {
     public void cancel() {
         super.cancel();
         mHandler.removeMessages(0);
+        mHandler.removeCallbacksAndMessages(null);
         mHandler = null;
     }
 
diff --git a/app/src/main/java/com/rae/cnblogs/widget/AppLayout.java b/app/src/main/java/com/rae/cnblogs/widget/AppLayout.java
@@ -6,6 +6,7 @@
 import in.srain.cube.views.ptr.PtrClassicFrameLayout;
 
 /**
+ * 下拉刷新
  * Created by ChenRui on 2016/12/2 01:03.
  */
 public class AppLayout extends PtrClassicFrameLayout {
diff --git a/app/src/main/java/com/rae/cnblogs/widget/HintCardLayout.java b/app/src/main/java/com/rae/cnblogs/widget/HintCardLayout.java
@@ -53,20 +53,26 @@ protected void onFinishInflate() {
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
-        mCardDragCompat.dispatchTouchEvent(ev);
+        if (isEnabled())
+            mCardDragCompat.dispatchTouchEvent(ev);
 
         return this.dispatchTouchEventSupport(ev);
     }
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        return mCardDragCompat.shouldInterceptTouchEvent(ev);
+        if (isEnabled())
+            return mCardDragCompat.shouldInterceptTouchEvent(ev);
+        return super.onInterceptTouchEvent(ev);
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        mCardDragCompat.processTouchEvent(event);
-        return true;
+        if (isEnabled()) {
+            mCardDragCompat.processTouchEvent(event);
+            return true;
+        }
+        return super.onTouchEvent(event);
     }
 
     public void setOnDismissListener(DialogInterface.OnDismissListener listener) {
diff --git a/app/src/main/res/drawable/bg_dialog_hint_card.xml b/app/src/main/res/drawable/bg_dialog_hint_card.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FFFFFF"/>
-    <corners android:radius="2dp"/>
-</shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="4dp">
+        <shape>
+            <solid android:color="#FFFFFF"/>
+            <corners android:radius="2dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/layout/item_blogger_feed.xml b/app/src/main/res/layout/item_blogger_feed.xml
@@ -90,6 +90,7 @@
         android:textSize="@dimen/summary"/>
 
     <LinearLayout
+        android:id="@+id/ll_feed"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
diff --git a/app/src/main/res/layout/item_news_list.xml b/app/src/main/res/layout/item_news_list.xml
@@ -58,7 +58,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="12dp"
         android:gravity="bottom">
 
         <LinearLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -31,8 +31,8 @@
     <string name="no_more_tips">全部加载完毕</string>
     <string name="register">注册</string>
     <string name="login_tips">登录即表示同意</string>
-    <string name="login_contract">博客园APP隐私协议</string>
-    <string name="login_contract_content">博客园APP已经开源，我们不会收集您的帐号信息，请放心登录。\n您在登录过程如有任何问题请联系博客园官方团\n对于博客园APP您有任何意见或者想法都可以随时联系作者raedev@qq.com</string>
+    <string name="login_contract">博客园APP隐私说明</string>
+    <string name="login_contract_content">博客园APP已经开源，登录过程我们会收集您遇到的错误信息以及博客名称，但我们不会收集您的帐号密码信息，请放心登录。\n您在登录过程如有任何问题请联系博客园官方团\n对于博客园APP您有任何意见或者想法都可以随时联系作者raedev@qq.com</string>
     <string name="login_user_name_hint">用户名</string>
     <string name="login_password_hint">密码</string>
     <string name="login">登录</string>
diff --git a/app/tinker-support.gradle b/app/tinker-support.gradle
@@ -36,7 +36,7 @@ tinkerSupport {
 
     // 构建基准包和补丁包都要指定不同的tinkerId，并且必须保证唯一性
     // 补丁版本1.0.1
-    tinkerId = "${apkName}-patch-1.0.0"
+    tinkerId = "cnblogs-basic-1.0.0"
 
     // 构建多渠道补丁时使用
     // buildAllFlavorsDir = "${bakPath}/${baseApkDir}"
diff --git a/gradle.properties b/gradle.properties
@@ -11,5 +11,5 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# �Ƿ����ȸ���
-enableHotfix=false
+# �Ƿ����ȸ���
+enableHotfix=true
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/CnblogsApiProvider.java b/sdk/src/main/java/com/rae/cnblogs/sdk/CnblogsApiProvider.java
@@ -34,9 +34,9 @@ protected CnblogsApiProvider(Context context) {
         mContext = context;
         OkHttpExtBuilder builder = new OkHttpExtBuilder();
 
-        if (BuildConfig.LOG_DEBUG) {
+//        if (BuildConfig.LOG_DEBUG) {
             builder.debug("CNBLOGS-API");
-        }
+//        }
 
         OkHttpClient client = builder
                 .cache(context, 5)
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
@@ -1,5 +1,7 @@
 package com.rae.cnblogs.sdk.parser;
 
+import android.text.TextUtils;
+
 import com.rae.cnblogs.sdk.bean.UserFeedBean;
 import com.rae.cnblogs.sdk.utils.ApiUtils;
 
@@ -32,6 +34,13 @@ public List<UserFeedBean> parse(Document document, String html) {
             m.setUrl(element.select(".feed_title a").eq(1).attr("href"));
             m.setFeedDate(ApiUtils.getDate(element.select(".feed_date").text()));
             m.setContent(element.select(".feed_desc").text());
+            // 内容为空
+            if (TextUtils.isEmpty(m.getContent())) {
+                // 只读取标题内容
+                Elements titleElement = element.select(".feed_title").clone();
+                titleElement.select("a").remove();
+                m.setContent(titleElement.text());
+            }
             result.add(m);
         }
         return result;
@@ -43,6 +52,9 @@ private String getAction(String text) {
         if (matcher.find()) {
             return matcher.group().replace(">", "").replace("：", "").trim();
         }
+        if (text.contains("ing_reply")) {
+            return "发表评论";
+        }
         return "未知类型";
     }
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ android {`
`79`	`79`
`80`	`80`	`// 批量渠道包值替换`
`81`	`81`	`productFlavors.all { flavor ->`
`82`		`- flavor.manifestPlaceholders = [UMENG_CHANNEL: name]`
	`82`	`+ flavor.manifestPlaceholders = [UMENG_CHANNEL: name,BUGLY_CHANNEL:name]`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public void run() {`
`59`	`59`	`public void cancel() {`
`60`	`60`	`super.cancel();`
`61`	`61`	`mHandler.removeMessages(0);`
	`62`	`+ mHandler.removeCallbacksAndMessages(null);`
`62`	`63`	`mHandler = null;`
`63`	`64`	`}`
`64`	`65`