博文界面UI优化

raee · raee · commit f10b6882b46d · 2017-10-11T02:05:59.000+08:00
解决收藏Https问题
搜索进去的博客标题去HTML化
diff --git a/app/src/main/assets/css/blog-common.css b/app/src/main/assets/css/blog-common.css
diff --git a/app/src/main/assets/css/rae.css b/app/src/main/assets/css/rae.css
@@ -2,6 +2,24 @@
 *{
     word-wrap: break-word;
 }
+h1{
+    font-size: 24px !important;
+}
+h2{
+    font-size: 20px;
+}
+h3{
+    font-size: 18px;
+}
+h4{
+    font-size: 16px;
+}
+h5{
+    font-size: 15px;
+}
+h6{
+    font-size: 14px;
+}
 #header{
     padding-bottom:20px;
 }
diff --git a/app/src/main/assets/view.html b/app/src/main/assets/view.html
diff --git a/app/src/main/java/com/rae/cnblogs/activity/BaseActivity.java b/app/src/main/java/com/rae/cnblogs/activity/BaseActivity.java
@@ -12,6 +12,7 @@
 import android.view.View;
 import android.widget.TextView;
 
+import com.rae.cnblogs.AppStatusBar;
 import com.rae.cnblogs.CnblogsApplication;
 import com.rae.cnblogs.R;
 import com.rae.cnblogs.sdk.config.CnblogSdkConfig;
@@ -46,8 +47,12 @@ public void onClick(View v) {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        onStatusBarColorChanged();
         super.onCreate(savedInstanceState);
+    }
 
+    protected void onStatusBarColorChanged() {
+        AppStatusBar.setStatusbarToDark(this);
     }
 
     @Override
diff --git a/app/src/main/java/com/rae/cnblogs/activity/BlogContentActivity.java b/app/src/main/java/com/rae/cnblogs/activity/BlogContentActivity.java
@@ -9,7 +9,6 @@
 import android.widget.TextView;
 
 import com.rae.cnblogs.AppRoute;
-import com.rae.cnblogs.AppStatusBar;
 import com.rae.cnblogs.AppUI;
 import com.rae.cnblogs.R;
 import com.rae.cnblogs.RxObservable;
@@ -28,6 +27,7 @@
 import com.rae.cnblogs.widget.RaeDrawerLayout;
 
 import org.greenrobot.eventbus.EventBus;
+import org.jsoup.Jsoup;
 
 import java.util.List;
 
@@ -85,7 +85,6 @@ public class BlogContentActivity extends SwipeBackBaseActivity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-        AppStatusBar.setStatusbarToDark(this);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_blog_content);
 //        setSupportActionBar(mToolbar);
@@ -188,6 +187,11 @@ public ObservableSource<BlogBean> apply(@NonNull Integer integer) throws Excepti
     private void onLoadData(BlogBean blog) {
         mBlog = blog;
 
+        // 从搜索进来的标题处理
+        String text = Jsoup.parse(blog.getTitle()).text();
+        mBlog.setTitle(text);
+
+
         // 评论角标
         if (!TextUtils.equals(mBlog.getComment(), "0")) {
             mCommentBadgeView.setText(mBlog.getComment());
diff --git a/app/src/main/java/com/rae/cnblogs/activity/BloggerActivity.java b/app/src/main/java/com/rae/cnblogs/activity/BloggerActivity.java
@@ -22,6 +22,7 @@
 import com.rae.cnblogs.GlideApp;
 import com.rae.cnblogs.R;
 import com.rae.cnblogs.fragment.BlogListFragment;
+import com.rae.cnblogs.message.UserInfoEvent;
 import com.rae.cnblogs.model.FeedListFragment;
 import com.rae.cnblogs.presenter.CnblogsPresenterFactory;
 import com.rae.cnblogs.presenter.IBloggerPresenter;
@@ -32,6 +33,8 @@
 import com.rae.cnblogs.widget.BloggerLayout;
 import com.rae.swift.app.RaeFragmentAdapter;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.ArrayList;
 
 import butterknife.BindView;
@@ -240,6 +243,9 @@ public void onFollowSuccess() {
         AppUI.dismiss();
         mFollowView.setText(mBloggerPresenter.isFollowed() ? R.string.cancel_follow : R.string.following);
         setResult(RESULT_OK);
+
+        // 发送通知
+        EventBus.getDefault().post(new UserInfoEvent());
     }
 
     @Override
@@ -249,6 +255,9 @@ public void onNotLogin() {
         finish();
     }
 
+    @Override
+    protected void onStatusBarColorChanged() {
+    }
 
     /**
      * 粉丝
diff --git a/app/src/main/java/com/rae/cnblogs/activity/BookmarkActivity.java b/app/src/main/java/com/rae/cnblogs/activity/BookmarkActivity.java
@@ -1,19 +1,19 @@
-package com.rae.cnblogs.activity;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-
-import com.rae.cnblogs.R;
-
-/**
- * 我的收藏
- * Created by ChenRui on 2017/3/16 23:33.
- */
-public class BookmarkActivity extends BaseActivity {
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_bookmark);
-    }
-}
+//package com.rae.cnblogs.activity;
+//
+//import android.os.Bundle;
+//import android.support.annotation.Nullable;
+//
+//import com.rae.cnblogs.R;
+//
+///**
+// * 我的收藏
+// * Created by ChenRui on 2017/3/16 23:33.
+// */
+//public class BookmarkActivity extends BaseActivity {
+//
+//    @Override
+//    protected void onCreate(@Nullable Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        setContentView(R.layout.activity_bookmark);
+//    }
+//}
diff --git a/app/src/main/java/com/rae/cnblogs/activity/SearchActivity.java b/app/src/main/java/com/rae/cnblogs/activity/SearchActivity.java
@@ -1,5 +1,6 @@
 package com.rae.cnblogs.activity;
 
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -23,8 +24,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         overridePendingTransition(com.rae.cnblogs.R.anim.slide_in_bottom, 0);
         super.onCreate(savedInstanceState);
         mToolBar.setVisibility(View.GONE);
+        ((View) mToolBar.getParent()).setBackgroundColor(Color.TRANSPARENT);
+
         findViewById(android.R.id.content).setFitsSystemWindows(true);
-        AppMobclickAgent.onClickEvent(getContext(),"Search");
+        AppMobclickAgent.onClickEvent(getContext(), "Search");
     }
 
     @Override
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/BlogContentFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/BlogContentFragment.java
@@ -29,7 +29,6 @@
 import com.rae.cnblogs.sdk.bean.BlogBean;
 import com.rae.cnblogs.sdk.bean.BlogType;
 import com.rae.cnblogs.sdk.db.model.UserBlogInfo;
-import com.rae.cnblogs.utils.ViewCaptureUtils;
 import com.rae.cnblogs.widget.ImageLoadingView;
 import com.rae.cnblogs.widget.PlaceholderView;
 import com.rae.cnblogs.widget.RaeWebView;
@@ -39,10 +38,7 @@
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.io.File;
-
 import butterknife.BindView;
-import io.reactivex.functions.Consumer;
 
 
 /**
@@ -166,21 +162,21 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         mBackView = getActivity().findViewById(R.id.back);
         mMoreView = getActivity().findViewById(R.id.img_action_bar_more);
 
-        // 测试一下
-        final ViewCaptureUtils viewCaptureUtils = new ViewCaptureUtils(getContext());
-        mBackView.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                viewCaptureUtils.capture(mWebView, "/sdcard/test.jpg")
-                        .subscribe(new Consumer<File>() {
-                            @Override
-                            public void accept(File file) throws Exception {
-                                AppUI.toast(getContext(), "保存成功！");
-                            }
-                        });
-            }
-        });
+//        // 测试一下
+//        final ViewCaptureUtils viewCaptureUtils = new ViewCaptureUtils(getContext());
+//        mBackView.setOnClickListener(new View.OnClickListener() {
+//
+//            @Override
+//            public void onClick(View view) {
+//                viewCaptureUtils.capture(mWebView, "/sdcard/test.jpg")
+//                        .subscribe(new Consumer<File>() {
+//                            @Override
+//                            public void accept(File file) throws Exception {
+//                                AppUI.toast(getContext(), "保存成功！");
+//                            }
+//                        });
+//            }
+//        });
     }
 
     @Override
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/MineFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/MineFragment.java
@@ -19,6 +19,7 @@
 import com.rae.cnblogs.RaeImageLoader;
 import com.rae.cnblogs.RxObservable;
 import com.rae.cnblogs.ThemeCompat;
+import com.rae.cnblogs.message.UserInfoEvent;
 import com.rae.cnblogs.sdk.ApiDefaultObserver;
 import com.rae.cnblogs.sdk.CnblogsApiFactory;
 import com.rae.cnblogs.sdk.CnblogsReportException;
@@ -28,6 +29,9 @@
 import com.rae.cnblogs.sdk.bean.UserInfoBean;
 import com.tencent.bugly.crashreport.CrashReport;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.List;
 
 import butterknife.BindView;
@@ -73,6 +77,12 @@ protected int getLayoutId() {
         return R.layout.fm_mine;
     }
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        EventBus.getDefault().register(this);
+    }
+
     @Override
     protected void onCreateView(View view) {
         super.onCreateView(view);
@@ -88,6 +98,9 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
+        // 加载用户信息
+        loadUserInfo();
+
         // 意见反馈的回复
         checkFeedbackMessage();
 
@@ -110,7 +123,6 @@ protected void accept(Integer integer) {
     @Override
     public void onResume() {
         super.onResume();
-        loadUserInfo();
         // 夜间模式处理
         mNightModeButton.setCheckedNoEvent(ThemeCompat.isNight());
     }
@@ -189,6 +201,7 @@ private void onLoadUserInfo(UserInfoBean user) {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        EventBus.getDefault().unregister(this);
         RxObservable.dispose("MineFragment");
     }
 
@@ -296,4 +309,9 @@ public void onCommentsFetch(List<Comment> list, AVException e) {
             CrashReport.postCatchedException(new CnblogsReportException("意见反馈发生异常！", e));
         }
     }
+
+    @Subscribe
+    public void onEvent(UserInfoEvent event) {
+        loadUserInfo();
+    }
 }
diff --git a/app/src/main/java/com/rae/cnblogs/widget/PlaceholderView.java b/app/src/main/java/com/rae/cnblogs/widget/PlaceholderView.java
@@ -100,6 +100,7 @@ private void initAttr(AttributeSet attrs) {
                     break;
                 case R.styleable.PlaceholderView_loading_message:
                     mLoadingText = a.getString(index);
+                    mLoadingTextView.setText(mLoadingText);
                     break;
             }
         }
diff --git a/app/src/main/res/drawable/bg_dialog_default.xml b/app/src/main/res/drawable/bg_dialog_default.xml
@@ -2,5 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/white"/>
     <corners android:radius="@dimen/default_radius"/>
-    <padding android:bottom="@dimen/default_radius"/>
+    <padding
+        android:bottom="@dimen/default_radius"
+        android:top="@dimen/default_radius"/>
 </shape>
diff --git a/app/src/main/res/drawable/progress_web_view.xml b/app/src/main/res/drawable/progress_web_view.xml
@@ -2,12 +2,12 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:id="@android:id/background">
-        <!--  <color android:color="@android:color/transparent"/>-->
-        <shape>
-            <gradient
-                android:endColor="@color/colorPrimary"
-                android:startColor="#9bd7ff"/>
-        </shape>
+        <color android:color="@android:color/transparent"/>
+        <!--    <shape>
+                <gradient
+                    android:endColor="@color/colorPrimary"
+                    android:startColor="#9bd7ff"/>
+            </shape>-->
     </item>
 
     <!-- 第二条进度条颜色 -->
@@ -26,8 +26,8 @@
         <clip>
             <shape>
                 <gradient
-                    android:endColor="#FFFFFF"
-                    android:startColor="#C8FFFFFF"/>
+                    android:endColor="@color/colorPrimary"
+                    android:startColor="#9bd7ff"/>
             </shape>
         </clip>
     </item>
diff --git a/app/src/main/res/layout/activity_category.xml b/app/src/main/res/layout/activity_category.xml
@@ -3,6 +3,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/white"
+              android:fitsSystemWindows="true"
               android:orientation="vertical"
               android:paddingTop="@dimen/default_padding_top">
 
diff --git a/app/src/main/res/layout/dialog_blog_menu.xml b/app/src/main/res/layout/dialog_blog_menu.xml
@@ -3,8 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/bg_dialog_default"
-    android:paddingTop="@dimen/default_radius">
+    android:background="@drawable/bg_dialog_default">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/rec_dialog_menu"
diff --git a/app/src/main/res/layout/item_system_message.xml b/app/src/main/res/layout/item_system_message.xml
@@ -3,16 +3,16 @@
               xmlns:app="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:layout_marginTop="12dp"
               android:orientation="vertical"
               android:paddingLeft="10dp"
               android:paddingRight="10dp">
 
     <android.support.v7.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@drawable/bg_message_card"
         app:cardCornerRadius="4dp"
-        app:cardElevation="4dp"
+        app:cardElevation="10dp"
         app:cardPreventCornerOverlap="false"
         app:cardUseCompatPadding="true"
         app:contentPadding="5dp">
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
@@ -63,7 +63,7 @@ final class ApiUrls {
     static final String API_BOOK_MARKS_DELETE = "http://wz.cnblogs.com/ajax/wz/DeleteWzlink";
 
     // 收藏-列表
-    static final String API_BOOK_MARKS_LIST = "http://wz.cnblogs.com/my/{page}.html";
+    static final String API_BOOK_MARKS_LIST = "https://wz.cnblogs.com/my/{page}.html";
 
     // 知识库-内容
     static final String API_KB_CONTENT = "https://kb.cnblogs.com/page/{id}/";
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/api/IBookmarksApi.java b/sdk/src/main/java/com/rae/cnblogs/sdk/api/IBookmarksApi.java
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/interceptor/RequestInterceptor.java b/sdk/src/main/java/com/rae/cnblogs/sdk/interceptor/RequestInterceptor.java
