升级工程编译工具；新增仅缓存\仅网络策略

Author: imkarl

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24"
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "com.im4j.kakacache.rxjava.test"
@@ -28,7 +28,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
 
-    compile 'com.android.support:appcompat-v7:24.0.0'
+    compile 'com.android.support:appcompat-v7:24.2.0'
     compile 'com.squareup.retrofit2:converter-gson:2.1.0'
     compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
 }

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.1.3'
         classpath 'me.tatarka:gradle-retrolambda:3.2.5'
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sun Aug 28 19:04:30 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

library/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24"
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         minSdkVersion 11
@@ -26,10 +26,9 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:24.0.0'
+    compile 'com.android.support:appcompat-v7:24.2.0'
     compile 'com.google.code.gson:gson:2.7'
     compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.squareup.okhttp3:okhttp:3.3.1'
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
     compile 'com.squareup.retrofit2:converter-gson:2.1.0'

library/src/main/java/com/im4j/kakacache/rxjava/core/BasicCache.java

@@ -102,11 +102,11 @@ public final <T> boolean save(String key, T value, int maxAge, CacheTarget targe
      * @return
      */
     public final boolean containsKey(String key) {
-        mLock.writeLock().lock();
+        mLock.readLock().lock();
         try {
             return doContainsKey(key);
         } finally {
-            mLock.writeLock().unlock();
+            mLock.readLock().unlock();
         }
     }
 

library/src/main/java/com/im4j/kakacache/rxjava/netcache/retrofit/KakaRxCallAdapterFactory.java

@@ -108,7 +108,7 @@ public <R> Observable<?> adapt(Call<R> call) {
                     LogUtils.debug("fileName="+info.getKey());
 
                     if (info.getStrategy() == null) {
-                        info.setStrategy(CacheStrategy.FirstCache);
+                        info.setStrategy(CacheStrategy.OnlyRemote);
                     }
 
                     return callAdapter.doAdaptUnwrap(call)

library/src/main/java/com/im4j/kakacache/rxjava/netcache/strategy/CacheStrategy.java

@@ -13,17 +13,21 @@
  * @version alafighting 2016-07
  */
 public enum CacheStrategy {
-    /** 优先缓存 */
-    FirstCache{
+    /** 仅缓存 */
+    OnlyCache{
         @Override
         public <T> Observable<ResultData<T>> execute(String key, Observable<T> source) {
-            Observable<ResultData<T>> cache = loadCache(key);
-            Observable<ResultData<T>> remote = loadRemote(key, source);
-            return Observable.concat(cache, remote)
-                    .firstOrDefault(null, it -> it.data != null)
-                    .subscribeOn(Schedulers.io());
+            return loadCache(key);
         }
     },
+    /** 仅网络 */
+    OnlyRemote{
+        @Override
+        public <T> Observable<ResultData<T>> execute(String key, Observable<T> source) {
+            return loadRemote(key, source);
+        }
+    },
+
     /** 优先服务器 */
     FirstRemote{
         @Override