升级到rxjava2

README.md

@@ -4,7 +4,7 @@
 ## 如何使用
 
 ### 准备Retrofit
-```java
+```
 retrofit = new Retrofit.Builder()
     .baseUrl("https://api.github.com/")
     .addConverterFactory(KakaCache.gsonConverter())
@@ -13,14 +13,14 @@ retrofit = new Retrofit.Builder()
 ```
 
 ### 定义接口
-```java
+```
 @GET("users/{user}/repos")
 @CACHE(value = "custom_key_listRepos", strategy = CacheAndRemoteStrategy.class)
 rx.Observable<ResultData<List<GithubRepoEntity>>> listReposForKaka(@Path("user") String user);
 ```
 
 ### 调用接口
-```java
+```
 service.listReposForKaka("alafighting")
     .subscribeOn(Schedulers.io())
     .observeOn(AndroidSchedulers.mainThread())
@@ -34,7 +34,7 @@ service.listReposForKaka("alafighting")
 ### or 太麻烦？给你`一步到位`！！
 
 在原有代码的基础上，仅需一行代码搞定
-```java
+```
 .compose(KakaCache.transformer(KEY_CACHE, new FirstCacheStrategy()))
 ```
 

app/src/main/java/com/im4j/kakacache/rxjava/demo/GitHubService.java

@@ -1,11 +1,8 @@
 package com.im4j.kakacache.rxjava.demo;
 
-import com.im4j.kakacache.rxjava.CACHE;
-import com.im4j.kakacache.rxjava.netcache.ResultData;
-import com.im4j.kakacache.rxjava.netcache.strategy.CacheStrategy;
-
 import java.util.List;
 
+import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Path;
 
@@ -15,10 +12,6 @@
 public interface GitHubService {
 
     @GET("users/{user}/repos")
-    rx.Observable<List<GithubRepoEntity>> listReposForNormal(@Path("user") String user);
-
-    @GET("users/{user}/repos")
-    @CACHE(value = "custom_key_listRepos", strategy = CacheStrategy.CacheAndRemote)
-    rx.Observable<ResultData<List<GithubRepoEntity>>> listReposForKaka(@Path("user") String user);
+    Observable<List<GithubRepoEntity>> listReposForNormal(@Path("user") String user);
 
 }

app/src/main/java/com/im4j/kakacache/rxjava/demo/MainActivity.java

@@ -6,12 +6,16 @@
 import android.widget.Button;
 
 import com.im4j.kakacache.rxjava.KakaCache;
-import com.im4j.kakacache.rxjava.common.utils.LogUtils;
+import com.im4j.kakacache.rxjava.common.utils.L;
+import com.im4j.kakacache.rxjava.common.utils.Utils;
+import com.im4j.kakacache.rxjava.netcache.ResultData;
 import com.im4j.kakacache.rxjava.netcache.strategy.CacheStrategy;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import retrofit2.Retrofit;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
  * Demo主界面
@@ -24,20 +28,19 @@ public class MainActivity extends AppCompatActivity {
     private GitHubService service;
 
     private Button btnTestCache;
-    private Button btnTestRetrofit;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.actiity_main);
 
-        LogUtils.DEBUG = false;
-        KakaCache.init(this);
+        L.isDebug = false;
+        KakaCache.init(this, Utils.getUsableCacheDir(this));
 
         retrofit = new Retrofit.Builder()
                 .baseUrl("https://api.github.com/")
-                .addConverterFactory(KakaCache.gsonConverter())
-                .addCallAdapterFactory(KakaCache.rxCallAdapter())
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
                 .build();
 
         service = retrofit.create(GitHubService.class);
@@ -46,41 +49,23 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         btnTestCache.setOnClickListener(view -> {
             demoForNormal();
         });
-
-        btnTestRetrofit = (Button) findViewById(R.id.btn_test_retrofit);
-        btnTestRetrofit.setOnClickListener(view -> {
-            demoForKaka();
-        });
     }
 
     /**
      * 案例一：不修改原有代码，增加对Cache的支持
      */
     void demoForNormal() {
-        service.listReposForNormal("alafighting")
+        service.listReposForNormal("imkarl")
                 .compose(KakaCache.transformer(KEY_CACHE, CacheStrategy.FirstCache))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(data -> {
-                    LogUtils.log("next  data=" + data);
+                    L.log("next  data=" + data);
                 }, error -> {
-                    LogUtils.log("error", error);
+                    L.log("error");
+                    L.log(error);
                 }, () -> {
-                    LogUtils.log("completed");
-                });
-    }
-
-    /**
-     * 案例二：通过注解，自动支持Cache
-     */
-    void demoForKaka() {
-        service.listReposForKaka("alafighting")
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(data -> {
-                    LogUtils.log("listReposForKaka => "+data);
-                }, error -> {
-                    LogUtils.log(error);
+                    L.log("completed");
                 });
     }
 

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

@@ -10,13 +10,6 @@
         android:id="@+id/btn_test_cache"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="测试普通缓存"/>
-
-    <Button
-        android:id="@+id/btn_test_retrofit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAllCaps="false"
-        android:text="测试Retrofit缓存"/>
+        android:text="测试缓存"/>
 
 </LinearLayout>

build.gradle

@@ -5,14 +5,16 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
+        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'me.tatarka:gradle-retrolambda:3.6.1'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        maven { url 'http://repo1.maven.org/maven2' }
+        maven { url "https://jitpack.io" }
     }
 }
 

config.gradle

@@ -4,7 +4,7 @@ ext {
     build_tools_version = "25.0.2"
     // 支持的最小版本、目标版本
     min_sdk_version = 11
-    target_sdk_version = 24
+    target_sdk_version = 22
 
     app_version_code = 1
     app_version_name = "1.0"

library/build.gradle

@@ -36,5 +36,9 @@ dependencies {
     provided 'com.squareup.retrofit2:converter-gson:2.2.0'
     provided 'com.squareup.retrofit2:adapter-rxjava2:2.2.0'
 
+    // storage
     provided 'com.esotericsoftware:kryo:4.0.0'
+
+    // support
+    provided 'com.android.support:support-annotations:25.3.1'
 }