优化小细节

Author: raedev

.idea/modules.xml

@@ -7,8 +7,8 @@ android {
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
         applicationId "com.rae.cnblogs"
-        versionCode 12
-        versionName "2.0.0"
+        versionCode 13
+        versionName "2.0.1"
         multiDexEnabled true
         ndk {
             // 兼容webView问题

app/build.gradle

@@ -116,7 +116,6 @@ protected void onStart() {
 
     private void initTab() {
         mAdapter = new AppFragmentAdapter(getSupportFragmentManager());
-
         // 初始化TAB
         addTab(mAdapter, R.string.tab_home, R.drawable.tab_home, AppRoute.newHomeFragment());
         addTab(mAdapter, R.string.tab_sns, R.drawable.tab_news, AppRoute.newMomentFragment());

app/src/main/java/com/rae/cnblogs/MainActivity.java

@@ -15,22 +15,33 @@
  */
 public abstract class BasicActivity extends RaeUIActivity implements IPresenterView {
 
+    private boolean mDisabeMobclickAgent; // 是否禁止统计
+
+
     @NonNull
     @Override
     public Context getContext() {
         return this;
     }
 
+    public void setDisabeMobclickAgent(boolean disabeMobclickAgent) {
+        mDisabeMobclickAgent = disabeMobclickAgent;
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
-        MobclickAgent.onResume(this);
+        if (!mDisabeMobclickAgent) {
+            MobclickAgent.onResume(this);
+        }
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        MobclickAgent.onPause(this);
+        if (!mDisabeMobclickAgent) {
+            MobclickAgent.onPause(this);
+        }
     }
 
     @Override

module-basic/src/main/java/com/rae/cnblogs/basic/BasicActivity.java

@@ -19,12 +19,9 @@ public abstract class BasicFragment extends Fragment implements IPresenterView {
     @Nullable
     private Unbinder mUnBinder;
 
-    private String mPageName = "Fragment";
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mPageName = getClass().getSimpleName();
         Bundle arguments = getArguments();
         if (arguments != null) {
             onReceiveArguments(arguments);
@@ -80,7 +77,6 @@ protected void onLoadData() {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         List<Fragment> fragments = getChildFragmentManager().getFragments();
-        if (fragments == null) return;
         for (Fragment fragment : fragments) {
             fragment.onActivityResult(requestCode, resultCode, data);
         }

module-basic/src/main/java/com/rae/cnblogs/basic/BasicFragment.java

@@ -48,6 +48,7 @@ public void accept(Disposable disposable) {
      * 释放所有，生命周期会自动释放
      */
     public void dispose() {
+        mCompositeDisposable.dispose();
         mCompositeDisposable.clear();
     }
 }

module-basic/src/main/java/com/rae/cnblogs/basic/rx/LifecycleProvider.java

@@ -16,7 +16,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_fragment);
         getSupportFragmentManager().beginTransaction()
-                .replace(R.id.content, BlogHomeFragment.newInstance())
+                .replace(R.id.content, new BlogHomeFragment())
                 .commit();
     }
 }

module-blog/src/debug/java/com/rae/cnblogs/blog/BlogTestActivity.java

@@ -18,16 +18,14 @@
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 import com.jcodecraeer.xrecyclerview.AppBarStateChangeListener;
 import com.rae.cnblogs.AppRoute;
 import com.rae.cnblogs.UICompat;
 import com.rae.cnblogs.activity.SwipeBackBasicActivity;
-import com.rae.cnblogs.basic.AppMobclickAgent;
 import com.rae.cnblogs.basic.GlideApp;
-import com.rae.cnblogs.basic.GlideRequest;
 import com.rae.cnblogs.blog.blogger.BloggerContract;
 import com.rae.cnblogs.blog.blogger.BloggerPresenterImpl;
 import com.rae.cnblogs.blog.fragment.BloggerListFragment;
@@ -49,6 +47,7 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import jp.wasabeef.glide.transformations.ColorFilterTransformation;
 
 /**
  * blogger info
@@ -248,43 +247,30 @@ private void showAvatar(String blogApp, final String url) {
         if (TextUtils.isEmpty(url) || url.endsWith("simple_avatar.gif")) return;
         // 封面图
         final String coverUrl = String.format("https://files.cnblogs.com/files/%s/app-cover.bmp", blogApp);
-
-        createAvatarGlide(coverUrl)
+        int alphaColor = ContextCompat.getColor(getContext(), R.color.blogger_image_alpha_color);
+        // 自定义头像
+        GlideApp.with(this)
+                .load(coverUrl)
                 .listener(new RequestListener<Drawable>() {
                     @Override
-                    public boolean onLoadFailed(@Nullable GlideException e, Object o, Target<Drawable> target, boolean b) {
+                    public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
                         return true;
                     }
 
                     @Override
-                    public boolean onResourceReady(Drawable drawable, Object o, Target<Drawable> target, DataSource dataSource, boolean b) {
-                        // 如果有封面图，则设置进去
+                    public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
                         mBackgroundView.setContentDescription(coverUrl);
-                        // 统计
-                        AppMobclickAgent.onClickEvent(getContext(), "BloggerCover");
                         return false;
                     }
                 })
-                // 如果没有这张封面图就展示默认的
-//                .error(createAvatarGlide(url))
+                .error(GlideApp
+                        .with(this)
+                        .load(url)
+                        .apply(RequestOptions.bitmapTransform(new ColorFilterTransformation(alphaColor)))
+                )
+                .apply(RequestOptions.bitmapTransform(new ColorFilterTransformation(alphaColor)))
                 .into(mBackgroundView);
-    }
 
-    /**
-     * 创建头像显示的Glide
-     *
-     * @param url 头像地址
-     */
-    private GlideRequest<Drawable> createAvatarGlide(String url) {
-        int alphaColor = ContextCompat.getColor(getContext(), R.color.blogger_image_alpha_color);
-        return GlideApp.with(this)
-                .load(url)
-                .centerCrop()
-//                .apply(RequestOptions.bitmapTransform(new MultiTransformation<>(
-//                        new BlurTransformation(20),    // 高斯模糊
-//                        new ColorFilterTransformation(alphaColor)) // 遮罩层
-//                ))
-                .transition(DrawableTransitionOptions.withCrossFade());
     }
 
     //    @Override
@@ -332,12 +318,10 @@ public void onFollowButtonClick() {
     public void onAvatarClick(View view) {
         if (mUserInfo == null) return;
         ArrayList<String> images = new ArrayList<>();
-
         if (view.getId() == R.id.img_background && !TextUtils.isEmpty(view.getContentDescription())) {
             images.add(view.getContentDescription().toString());
-        } else {
-            images.add(mUserInfo.getAvatar());
         }
+        images.add(mUserInfo.getAvatar());
         AppRoute.routeToImagePreview(this, images, 0);
     }
 

module-blog/src/main/java/com/rae/cnblogs/blog/BloggerActivity.java

@@ -6,6 +6,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.widget.TextView;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.google.gson.Gson;
@@ -35,6 +36,9 @@ public class ContentDetailActivity extends SwipeBackBasicActivity {
     @BindView(R2.id.pb_loading)
     View mProgressBar;
 
+    @BindView(R2.id.tv_loading)
+    TextView mLoadingTextView;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -60,6 +64,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     private void loadBlogDetail(final String url) {
         IBlogApi blogApi = CnblogsApiFactory.getInstance(this).getBlogApi();
         mProgressBar.setVisibility(View.VISIBLE);
+        mLoadingTextView.setText(R.string.loading_blog_url);
         AndroidObservable.create(blogApi.getBlogDetail(url))
                 .with(this)
                 .subscribe(new ApiDefaultObserver<BlogBean>() {
@@ -73,7 +78,6 @@ protected void onError(String message) {
 
                     @Override
                     protected void accept(BlogBean blogBean) {
-                        mProgressBar.setVisibility(View.GONE);
                         ContentEntity entity = ContentEntityConverter.convert(blogBean);
                         initBlogFragment(entity);
                     }
@@ -85,6 +89,7 @@ private void initBlogFragment(ContentEntity entity) {
             UICompat.failed(this, "博客实体为空");
             return;
         }
+        mProgressBar.setVisibility(View.GONE);
         BlogDetailFragment fragment = BlogDetailFragment.newInstance(entity);
         getSupportFragmentManager()
                 .beginTransaction()

module-blog/src/main/java/com/rae/cnblogs/blog/ContentDetailActivity.java

@@ -40,9 +40,9 @@
 @Route(path = AppRoute.PATH_FRAGMENT_HOME)
 public class BlogHomeFragment extends BasicFragment implements BlogHomeContract.View, RaeTabLayout.OnTabSelectedListener, ITopScrollable {
 
-    public static BlogHomeFragment newInstance() {
-        return new BlogHomeFragment();
-    }
+//    public static BlogHomeFragment newInstance() {
+//        return new BlogHomeFragment();
+//    }
 
 
     private BlogHomeFragmentAdapter mAdapter;

module-blog/src/main/java/com/rae/cnblogs/blog/fragment/BlogHomeFragment.java

@@ -79,6 +79,7 @@ private void performJob() {
                     @Override
                     public void onNext(BlogBean blog) {
                         // 开始执行任务
+                        if ("BLOGGER".equalsIgnoreCase(blog.getBlogType())) return;
                         execute(new BlogContentTask(mConnectivityManager, mBlogApi, mNewsApi, mDbBlog, blog.getBlogId()));
                     }
 

module-blog/src/main/java/com/rae/cnblogs/blog/job/BlogContentJob.java

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/relativeLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -16,19 +15,19 @@
         android:layout_height="match_parent" />
 
     <!--<RelativeLayout-->
-        <!--android:id="@+id/ll_toolbar"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content">-->
+    <!--android:id="@+id/ll_toolbar"-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="wrap_content">-->
 
 
-        <!--<com.rae.cnblogs.widget.RaeSkinImageView-->
-            <!--android:id="@+id/img_action_bar_more"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_alignParentEnd="true"-->
-            <!--android:layout_margin="10dp"-->
-            <!--android:scaleType="center"-->
-            <!--android:src="@drawable/ic_action_bar_more" />-->
+    <!--<com.rae.cnblogs.widget.RaeSkinImageView-->
+    <!--android:id="@+id/img_action_bar_more"-->
+    <!--android:layout_width="wrap_content"-->
+    <!--android:layout_height="wrap_content"-->
+    <!--android:layout_alignParentEnd="true"-->
+    <!--android:layout_margin="10dp"-->
+    <!--android:scaleType="center"-->
+    <!--android:src="@drawable/ic_action_bar_more" />-->
 
     <!--</RelativeLayout>-->
 
@@ -38,7 +37,7 @@
         android:layout_height="match_parent"
         android:background="@color/white"
         android:fitsSystemWindows="true"
-        android:visibility="gone">
+        android:visibility="visible">
 
         <FrameLayout
             android:id="@+id/layout_blog_detail"
@@ -51,17 +50,30 @@
             <include layout="@layout/fm_blog_detail" />
         </FrameLayout>
 
+
         <ProgressBar
             android:id="@+id/loading"
             style="@style/ProgressBar"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_alignStart="@id/tv_loading"
-            app:layout_constraintBottom_toTopOf="@+id/layout_blog_detail"
+            android:layout_marginBottom="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_chainStyle="spread"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <TextView
+            android:id="@+id/tv_loading"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/loading"
+            android:textColor="@color/dividerPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/loading" />
+
     </android.support.constraint.ConstraintLayout>
 </RelativeLayout>

module-blog/src/main/res/layout/activity_blog_detail.xml

@@ -127,7 +127,7 @@
                     android:layout_width="32dp"
                     android:layout_height="32dp"
                     android:scaleType="center"
-                    android:src="@drawable/icon_share_small" />
+                    android:src="@drawable/icon_blog_share" />
 
             </LinearLayout>
 

module-blog/src/main/res/layout/fm_blog_detail.xml

@@ -70,6 +70,7 @@
                         android:layout_width="62dp"
                         android:layout_height="62dp"
                         android:src="@color/white"
+                        android:visibility="gone"
                         app:riv_corner_radius="74dp" />
 
                     <com.makeramen.roundedimageview.RoundedImageView
@@ -78,6 +79,7 @@
                         android:layout_height="60dp"
                         android:scaleType="centerCrop"
                         android:src="@drawable/default_avatar_placeholder"
+                        android:visibility="gone"
                         app:riv_corner_radius="70dp" />
 
                     <TextView
@@ -268,7 +270,7 @@
         <!--TAB-->
         <com.rae.cnblogs.widget.RaeSkinDesignTabLayout
             android:id="@+id/tab_category"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="45dp"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
@@ -278,9 +280,11 @@
             app:layout_collapseParallaxMultiplier="0.75"
             app:layout_scrollFlags="scroll"
             app:tabBackground="@android:color/transparent"
-            app:tabIndicatorColor="@color/blogger_indicator_color"
-            app:tabIndicatorHeight="2dp"
-            app:tabIndicatorWidth="12dp"
+            app:tabGravity="center"
+            app:tabIndicatorColor="@color/black"
+            app:tabIndicatorHeight="4dp"
+            app:tabIndicatorRadius="4dp"
+            app:tabIndicatorWidth="14dp"
             app:tabMode="fixed"
             app:tabSelectedTextColor="@color/homeTabSelectedTextColor"
             app:tabTextAppearance="@style/TabTextAppearance"