网络模块支持根据最新设置的config刷新管理者。

图片模块支持根据最新设置的config来加载图片。

Author: LJYcoder

VERSION.md

@@ -1,4 +1,9 @@
 ## 版本信息
+ - v1.0.10、1.0.11  （2018/6/6）
+   - 图片加载模块的LoadOption新增边框颜色、边框粗细选项(目前仅适用于圆形模式)
+   - 网络模块支持根据最新设置的config刷新管理者(DevRing.httpManager().refreshInstance();)
+   - 图片模块支持根据最新设置的config来加载图片
+
  - v1.0.8、1.0.9  （2018/5/20）
    - ActivityStackManager改为ActivityListManager
    - 修复CacheManager中SpCache的小问题

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'org.greenrobot.greendao'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.dev.base"
         minSdkVersion 14
@@ -58,11 +58,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
     api 'com.android.support:appcompat-v7:27.0.2'
     api 'com.android.support:design:27.0.2'
     api 'com.android.support:recyclerview-v7:27.0.2'

app/src/main/java/com/dev/base/mvp/model/imageload/FrescoManager.java

@@ -42,6 +42,7 @@
 import com.facebook.imagepipeline.listener.RequestLoggingListener;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
+import com.ljy.devring.DevRing;
 import com.ljy.devring.image.support.IImageManager;
 import com.ljy.devring.image.support.ImageConfig;
 import com.ljy.devring.image.support.ImageListener;
@@ -372,6 +373,7 @@ private void load(Uri uri, ImageView imageView, LoadOption loadOption) {
 
     //对Hierarchy进行设置，如各种状态下显示的图片
     private void setHierarchay(GenericDraweeHierarchy hierarchy, LoadOption loadOption) {
+        mImageConfig = DevRing.ringComponent().imageConfig();
         if (loadOption == null) {
             if (mImageConfig.isShowTransition()) {
                 hierarchy.setFadeDuration(600);     //设置由进度条和占位符图片渐变过渡到加载完成的图片所使用的时间间隔

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         //用于greendao
         classpath 'org.greenrobot:greendao-gradle-plugin:3.2.0'
         //用于上传至Jcenter

devring/bintray.gradle

@@ -43,6 +43,10 @@ task javadoc(type: Javadoc){
     options.encoding = "UTF-8"
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    options.charSet 'UTF-8'
+    options.author true
+    options.version true
+    failOnError false
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc){

devring/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 11
-        versionName "1.0.10"
+        versionCode 12
+        versionName "1.0.11"
 
     }
 

devring/src/main/java/com/ljy/devring/di/module/RingModule.java

@@ -76,7 +76,7 @@ SimpleArrayMap<Object, ITableManger> mapTableManager() {
 
 
     //══════════════════════网络模块开始══════════════════════
-    @Singleton
+//    @Singleton
     @Provides
     Retrofit retrofit(Retrofit.Builder builder, OkHttpClient okHttpClient, HttpConfig httpConfig) {
         if (!TextUtils.isEmpty(httpConfig.getBaseUrl())) {
@@ -92,13 +92,13 @@ Retrofit retrofit(Retrofit.Builder builder, OkHttpClient okHttpClient, HttpConfi
         return builder.build();
     }
 
-    @Singleton
+//    @Singleton
     @Provides
     Retrofit.Builder retrofitBuilder() {
         return new Retrofit.Builder();
     }
 
-    @Singleton
+//    @Singleton
     @Provides
     OkHttpClient okHttpClient(Application application, OkHttpClient.Builder builder, HttpConfig httpConfig, HttpProgressInterceptor progressInterceptor) {
         if (httpConfig.getConnectTimeout() > 0) {
@@ -130,7 +130,7 @@ OkHttpClient okHttpClient(Application application, OkHttpClient.Builder builder,
         return builder.build();
     }
 
-    @Singleton
+//    @Singleton
     @Provides
     OkHttpClient.Builder okClientBuilder() {
         return new OkHttpClient.Builder();

devring/src/main/java/com/ljy/devring/http/HttpManager.java

@@ -14,13 +14,15 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 import javax.inject.Inject;
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import io.reactivex.Observable;
@@ -45,14 +47,18 @@ public class HttpManager {
     @Inject
     HttpProgressInterceptor mProgressInterceptor;
     @Inject
-    Retrofit mRetrofit;
+    Provider<Retrofit> mProviderRetrofit;
     @Inject
     MemoryCache mMemoryCache;
     @Inject
     HttpConfig mHttpConfig;
 
+    Retrofit mRetrofit;
+    List<String> mListCacheKey;
+
     @Inject
     public HttpManager() {
+        mListCacheKey = new ArrayList<>();
     }
 
     /**
@@ -61,10 +67,18 @@ public HttpManager() {
      * @return 相应的ApiService
      */
     public <T> T getService(Class<T> serviceClass) {
-        T service = (T) mMemoryCache.get(serviceClass.getCanonicalName());
+        if (mRetrofit == null) {
+            mRetrofit = mProviderRetrofit.get();
+        }
+
+        String cacheKey = serviceClass.getCanonicalName();
+        T service = (T) mMemoryCache.get(cacheKey);
         if (service == null) {
             service = mRetrofit.create(serviceClass);
-            mMemoryCache.put(serviceClass.getCanonicalName(), service);
+            mMemoryCache.put(cacheKey, service);
+            if (!mListCacheKey.contains(cacheKey)) {
+                mListCacheKey.add(cacheKey);
+            }
         }
         return service;
     }
@@ -242,4 +256,13 @@ public Map<String, RequestBody> getRequestBodyMap(Map<String, File> map, MediaTy
         }
         return bodyMap;
     }
+
+    public void refreshInstance() {
+        mRetrofit = null;
+        mRetrofit = mProviderRetrofit.get();
+        for (String key : mListCacheKey) {
+            mMemoryCache.remove(key);
+        }
+        mListCacheKey.clear();
+    }
 }

devring/src/main/java/com/ljy/devring/image/GlideManager.java

@@ -18,6 +18,7 @@
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
+import com.ljy.devring.DevRing;
 import com.ljy.devring.image.support.CircleBorderTransformation;
 import com.ljy.devring.image.support.IImageManager;
 import com.ljy.devring.image.support.ImageConfig;
@@ -178,6 +179,7 @@ private RequestBuilder load(RequestBuilder requestBuilder, LoadOption loadOption
 
         RequestOptions requestOptions = new RequestOptions();
 
+        mImageConfig = DevRing.ringComponent().imageConfig();
         //使用全局的配置进行设置
         if (loadOption == null) {
             if (mImageConfig.isShowTransition()) {
@@ -194,7 +196,6 @@ private RequestBuilder load(RequestBuilder requestBuilder, LoadOption loadOption
         }
         //使用临时的配置进行设置
         else {
-
             if (loadOption.isShowTransition()) {
                 requestBuilder.transition(DrawableTransitionOptions.withCrossFade(600));
             }

gradle.properties

@@ -20,7 +20,7 @@ KEY_ALIAS=dev_base_test
 KEY_PASSWORD=123456
 STORE_PASSWORD=123456
 
-VERSION=1.0.10
+VERSION=1.0.11
 GROUP=com.ljy.ring
 
 SITE_URL=https://github.com/LJYcoder/DevRing

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Feb 26 16:13:46 CST 2018
+#Wed Jun 06 17:28:47 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip