SDK接口添加dex补丁包支持

Author: raedev

app/build.gradle

@@ -59,6 +59,7 @@ android {
     lintOptions {
         abortOnError false
     }
+
 }
 
 // 美团插件 - 渠道包

app/src/main/AndroidManifest.xml

@@ -11,5 +11,12 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="keyboard|keyboardHidden|orientation" />
+        <activity android:name=".TestActivity" >
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.MAIN" />-->
+
+                <!--<category android:name="android.intent.category.LAUNCHER" />-->
+            <!--</intent-filter>-->
+        </activity>
     </application>
 </manifest>

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

@@ -0,0 +1,24 @@
+package com.rae.cnblogs;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import com.rae.cnblogs.basic.BasicActivity;
+import com.rae.cnblogs.sdk.CnblogsApiFactory;
+
+import butterknife.OnClick;
+
+public class TestActivity extends BasicActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_test);
+    }
+
+    @OnClick(R.id.btn_test)
+    public void onClick() {
+        String text = CnblogsApiFactory.getInstance(this).toString();
+        Log.i("rae", text);
+    }
+}

app/src/main/res/layout/activity_test.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <Button
+        android:id="@+id/btn_test"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="测试" />
+
+</LinearLayout>

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

@@ -35,6 +35,9 @@ private static void checkPlaceHolder(Context context) {
         if (DEFAULT_PLACE_HOLDER_ERROR_ID == -1) {
             DEFAULT_PLACE_HOLDER_ERROR_ID = context.getResources().getIdentifier("default_placeholder_error", "drawable", context.getPackageName());
         }
+        if (DEFAULT_AVATAR_PLACE_HOLDER_ID == -1) {
+            DEFAULT_AVATAR_PLACE_HOLDER_ID = context.getResources().getIdentifier("default_avatar_placeholder", "drawable", context.getPackageName());
+        }
     }
 
     /**
@@ -48,24 +51,21 @@ public static void displayAvatar(@Nullable String url, @Nullable ImageView view,
         if (view == null)
             return;
 
-        Context context = view.getContext();
-        if (resId == -1) {
-            resId = context.getResources().getIdentifier("default_avatar_placeholder", "drawable", context.getPackageName());
-        }
-
         if (TextUtils.isEmpty(url)) {
             view.setImageResource(resId);
             return;
         }
 
+        checkPlaceHolder(view.getContext());
         GlideApp.with(view)
                 .load(url)
                 .placeholder(resId)
                 .error(resId)
                 .centerCrop()
-                .transition(DrawableTransitionOptions.withCrossFade(300)) // 渐变动画
                 .circleCrop()
+                .transition(DrawableTransitionOptions.withCrossFade(600)) // 渐变动画
                 .into(view);
+
     }
 
     /**
@@ -74,15 +74,9 @@ public static void displayAvatar(@Nullable String url, @Nullable ImageView view,
     public static void display(@Nullable String url, @Nullable ImageView view) {
         if (view == null)
             return;
-        if (TextUtils.isEmpty(url)) {
-            view.setImageResource(DEFAULT_PLACE_HOLDER_ID);
-            return;
-        }
-
         checkPlaceHolder(view.getContext());
         GlideApp.with(view)
                 .load(url)
-                .transition(DrawableTransitionOptions.withCrossFade(300))
                 .placeholder(DEFAULT_PLACE_HOLDER_ID)
                 .error(DEFAULT_PLACE_HOLDER_ERROR_ID)
                 .into(view);

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

@@ -10,11 +10,22 @@
 import com.rae.cnblogs.blog.job.BlogContentJob;
 import com.rae.cnblogs.blog.job.IJob;
 import com.rae.cnblogs.blog.job.JobEvent;
+import com.rae.cnblogs.sdk.CnblogsApiFactory;
 import com.rae.cnblogs.sdk.db.DbFactory;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import java.io.IOException;
+import java.io.InputStream;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
 /**
  * 博客园服务
  * 为博客园提供离线缓存服务，数据库自动清理服务
@@ -35,14 +46,42 @@ public IBinder onBind(Intent intent) {
     @Override
     public void onCreate() {
         super.onCreate();
+        Log.i("rae", "博客园服务启动了");
         EventBus.getDefault().register(this);
+        checkCacheSize(); // 检查缓存空间大小
+        // 下载补丁包
+        downloadSdkPatch();
     }
 
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.i("rae", "博客园服务启动了");
-        checkCacheSize(); // 检查缓存空间大小
-        return super.onStartCommand(intent, flags, startId);
+    private void downloadSdkPatch() {
+        OkHttpClient client = new OkHttpClient
+                .Builder()
+//                .connectTimeout(5, TimeUnit.MINUTES)
+//                .readTimeout(5, TimeUnit.MINUTES)
+//                .writeTimeout(5, TimeUnit.MINUTES)
+                .build();
+
+        // 默认补丁包下载地址
+        String downloadUrl = CnblogsApiFactory.getInstance(this).getDownloadUrl();
+        Request request = new Request.Builder().url(downloadUrl).build();
+        Log.d("CnblogsService", "下载SDK补丁包：" + downloadUrl);
+        client.newCall(request).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                Log.e("CnblogsService", "下载sdk补丁包失败", e);
+            }
+
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                ResponseBody body = response.body();
+                if (body == null) {
+                    Log.e("CnblogsService", "下载sdk补丁包失败，响应内容为空！");
+                    return;
+                }
+                InputStream inputStream = body.byteStream();
+                CnblogsApiFactory.savePatchFile(CnblogsService.this, inputStream);
+            }
+        });
     }
 
     @Override

module-blog/src/main/java/com/rae/cnblogs/blog/adapter/ContentItemAdapter.java

@@ -102,6 +102,9 @@ private void onBindContentItemViewHolder(ContentItemViewHolder holder, ContentEn
             // 显示头像
             AppImageLoader.displayAvatar(m.getAvatar(), holder.avatarView);
         }
+        if ("kb".equalsIgnoreCase(m.getType())) {
+            holder.setVisibility(holder.authorLayout, false);
+        }
 
         // 显示预览图
         showThumbImages(m.getThumbs(), holder);

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

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 

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

@@ -6,16 +6,15 @@
     android:layout_marginBottom="10dp"
     android:background="@drawable/bg_blog_item_selector"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/default_margin"
     android:paddingLeft="@dimen/default_margin"
+    android:paddingTop="@dimen/default_margin"
     android:paddingRight="@dimen/default_margin"
-    android:paddingTop="@dimen/default_margin">
+    android:paddingBottom="@dimen/default_margin">
 
     <LinearLayout
         android:id="@+id/ll_blog_author_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
         android:gravity="center_vertical">
 
         <com.makeramen.roundedimageview.RoundedImageView
@@ -43,6 +42,7 @@
         android:id="@+id/tv_blog_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
         android:layout_marginBottom="11dp"
         android:text="@string/title"
         android:textColor="@color/ph1"

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

@@ -22,7 +22,7 @@
             android:layout_alignParentEnd="true"
             android:layout_marginStart="24dp"
             android:background="@color/background_divider"
-            android:scaleType="centerInside"
+            android:scaleType="fitCenter"
             android:src="@drawable/default_placeholder_normal" />
 
         <TextView
@@ -36,7 +36,7 @@
             android:maxLines="2"
             android:text="TextView限制多行,超出内容时用省略号显示TextView限制多行,超出内容时用省略号显示"
             android:textColor="@color/black"
-            android:textSize="18sp"/>
+            android:textSize="18sp" />
 
         <LinearLayout
             android:layout_width="match_parent"

module-discover/src/main/java/com/rae/cnblogs/discover/ui/AntUserColumnDetailActivity.java

@@ -34,6 +34,7 @@
 import java.util.List;
 
 import butterknife.BindView;
+import butterknife.OnClick;
 import jp.wasabeef.glide.transformations.BlurTransformation;
 
 import static com.bumptech.glide.request.RequestOptions.bitmapTransform;
@@ -64,7 +65,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.activity_ant_user_column_detail);
         setTitle(" ");
         mPresenter = new AntUserColumnDetailPresenterImpl(this);
-        mAdapter = new AntUserColumnDetailAdapter(this,  null);
+        mAdapter = new AntUserColumnDetailAdapter(this, null);
         mAdapter.setEnableLoadMore(true);
         mRecyclerView.setAdapter(mAdapter);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
@@ -243,7 +244,7 @@ public void onClick(View v) {
             AppRoute.routeToAntColumnDetail(this, mColumnInfo.getId());
 
         if (v.getId() == R.id.btn_mode) {
-            onModeClick();
+            onModeClick((TextView) v);
         }
 
         // 取消订阅
@@ -255,11 +256,19 @@ public void onClick(View v) {
     /**
      * 模式切换
      */
-    private void onModeClick() {
-//        int viewType = mAdapter.getViewType();
-//        viewType = viewType == 1 ? 0 : 1;
-//        mAdapter.setViewType(viewType);
-//        mAdapter.notifyDataSetChanged();
+    private void onModeClick(TextView view) {
+        int viewType = mAdapter.getViewType();
+        viewType = viewType == 1 ? 0 : 1;
+        mAdapter.setViewType(viewType);
+        mAdapter.notifyDataSetChanged();
+        mRecyclerView.setAdapter(mAdapter);
+        view.setText(viewType == 0 ? R.string.detail_mode : R.string.title_mode);
+    }
+
+
+    @OnClick(R2.id.tool_bar)
+    public void onToolbarClick() {
+        UICompat.scrollToTop(mRecyclerView);
     }
 
     /**

module-discover/src/main/res/layout/item_user_column_detail_header.xml

@@ -179,9 +179,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/fl_header"
-        android:background="@drawable/public_divider_while_primary"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp">
+        android:background="@drawable/public_divider_while_primary">
 
         <Button
             android:id="@+id/btn_mode"

module-discover/src/main/res/values/strings.xml

@@ -13,4 +13,6 @@
     <string name="format_article_updated">已更新%d篇文章</string>
     <string name="unsubscribe_success">取消订阅成功</string>
     <string name="url_antcode_about">http://app.mayizhuanlan.com/about</string>
+    <string name="detail_mode">详细模式</string>
+    <string name="title_mode">标题模式</string>
 </resources>

module-home/src/main/AndroidManifest.xml

@@ -40,5 +40,8 @@
         <activity
             android:name=".AboutMeActivity"
             android:label="@string/about_me" />
+        <activity
+            android:name=".ToolActivity"
+            android:label="@string/label_tool" />
     </application>
 </manifest>

module-home/src/main/java/com/rae/cnblogs/home/SettingActivity.java

@@ -1,6 +1,7 @@
 package com.rae.cnblogs.home;
 
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
@@ -251,6 +252,16 @@ public void onAboutMeClick() {
         AppRoute.routeToAboutMe(this);
     }
 
+
+    /**
+     * 长按进入开发工具
+     */
+    @OnLongClick(R2.id.ll_about_me)
+    public boolean onAboutMeLongClick() {
+        startActivity(new Intent(this, ToolActivity.class));
+        return true;
+    }
+
     @OnLongClick(R2.id.tv_check_update)
     public boolean onVersionLongClick() {
         String newTinkerId = TinkerManager.getNewTinkerId();

module-home/src/main/java/com/rae/cnblogs/home/ToolActivity.java

@@ -0,0 +1,38 @@
+package com.rae.cnblogs.home;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.widget.TextView;
+
+import com.rae.cnblogs.activity.SwipeBackBasicActivity;
+import com.rae.cnblogs.sdk.CnblogsApiFactory;
+import com.rae.cnblogs.sdk.CnblogsApiProvider;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+public class ToolActivity extends SwipeBackBasicActivity {
+
+    @BindView(R2.id.tv_sdk_version)
+    TextView mSdkVersionView;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_tool);
+        initData();
+    }
+
+    private void initData() {
+        CnblogsApiProvider apiProvider = CnblogsApiFactory.getInstance(this);
+        String sdkVersion = String.format("%s-%s", apiProvider.getClass().getSimpleName(), apiProvider.getApiVersion());
+        mSdkVersionView.setText(sdkVersion);
+    }
+
+
+    @OnClick(R2.id.btn_reset_sdk)
+    public void onResetSdkClick() {
+        CnblogsApiFactory.reset(this);
+        initData();
+    }
+}