Merge remote-tracking branch 'origin/master'

EvilBT · EvilBT · commit 82fd859af0b4 · 2017-08-02T15:57:40.000+08:00
# Conflicts:
#	library/build.gradle
#	library/src/main/java/xyz/zpayh/hdimage/core/HDImageViewConfig.java
#	support-glide/src/main/java/xyz/zpayh/hdimage/datasource/interceptor/GlideInterceptor.java
diff --git a/library/build.gradle b/library/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 25
-        versionCode 2
-        versionName "1.0.3"
+        versionCode 6
+        versionName "1.0.6"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -39,7 +39,7 @@ publish {
     userOrg = 'sherlock'      //bintray注册的用户名
     groupId = 'xyz.zpayh'         //compile引用时的第1部分groupId
     artifactId = 'hdimageview'     //compile引用时的第2部分项目名
-    publishVersion = '1.0.5'    //compile引用时的第3部分版本号
+    publishVersion = '1.0.6'    //compile引用时的第3部分版本号
     desc = 'This is a high-definition picture control that supports zooming'
     website = 'https://github.com/EvilBT/HDImageView'
 }
diff --git a/library/src/main/java/xyz/zpayh/hdimage/core/HDImageViewConfig.java b/library/src/main/java/xyz/zpayh/hdimage/core/HDImageViewConfig.java
@@ -19,7 +19,7 @@
 package xyz.zpayh.hdimage.core;
 
 import android.content.Context;
-import android.util.Log;
+import android.support.annotation.Nullable;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 
@@ -47,7 +47,6 @@
 
 public class HDImageViewConfig {
     private static final String TAG = "HDImageViewConfig";
-    //private final BitmapDataSource mBitmapDataSource;
     private final Interpolator mScaleAnimationInterpolator;
     private final Interpolator mTranslationAnimationInterpolator;
 
@@ -70,64 +69,54 @@ private HDImageViewConfig(Builder builder){
         mInterceptors.add(new AssetInterceptor(builder.mContext.getAssets()));
         mInterceptors.add(new ContentInterceptor(builder.mContext));
         mInterceptors.add(new FileInterceptor());
-       
 
-        Interceptor interceptor = getInterceptor(builder.mContext);
-        if (interceptor != null){
-            mInterceptors.add(interceptor);
+        Interceptor glideInterceptor = addGlideInterceptor(builder.mContext);
+        if (glideInterceptor != null){
+            mInterceptors.add(glideInterceptor);
         }
-        interceptor = getInterceptor();
-        if (interceptor != null){
-            mInterceptors.add(interceptor);
-        }else{
-            mInterceptors.add(new NetworkInterceptor(builder.mContext));
+
+        Interceptor frescoInterceptor = addFrescoInterceptor();
+        if (frescoInterceptor != null){
+            mInterceptors.add(frescoInterceptor);
         }
 
+        if (glideInterceptor == null && frescoInterceptor == null) {
+            mInterceptors.add(new NetworkInterceptor(builder.mContext));
+        }
         mInterceptors.addAll(builder.mInterceptors);
     }
 
-    @SuppressWarnings({"unchecked", "deprecation"})
-    private Interceptor getInterceptor(Context context) {
+    @Nullable
+    @SuppressWarnings("unchecked")
+    private Interceptor addGlideInterceptor(Context context){
         Interceptor interceptor = null;
-
         try {
             Class<Interceptor> clazz =
                     (Class<Interceptor>) Class.forName("xyz.zpayh.hdimage.datasource.interceptor.GlideInterceptor");
             Constructor<Interceptor> constructor = clazz.getConstructor(Context.class);
             interceptor = constructor.newInstance(context);
-            Log.d(TAG, "自动配置GlideInterceptor");
         } catch (ClassNotFoundException e) {
-            e.printStackTrace();
         } catch (NoSuchMethodException e) {
-            e.printStackTrace();
         } catch (InstantiationException e) {
-            e.printStackTrace();
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
         } catch (InvocationTargetException e) {
-            e.printStackTrace();
         }
-
         return interceptor;
     }
 
-    @SuppressWarnings({"unchecked", "deprecation"})
-    private Interceptor getInterceptor() {
+    @Nullable
+    @SuppressWarnings("unchecked")
+    private Interceptor addFrescoInterceptor(){
         Interceptor interceptor = null;
 
         try {
             Class<Interceptor> clazz =
                     (Class<Interceptor>) Class.forName("xyz.zpayh.hdimage.datasource.interceptor.FrescoInterceptor");
             interceptor = clazz.newInstance();
-            Log.d(TAG, "自动配置FrescoInterceptor");
         } catch (ClassNotFoundException e) {
-            e.printStackTrace();
         } catch (InstantiationException e) {
-            e.printStackTrace();
         } catch (IllegalAccessException e) {
-            e.printStackTrace();
         }
-
         return interceptor;
     }
 
diff --git a/support-fresco/build.gradle b/support-fresco/build.gradle
@@ -17,7 +17,7 @@
  */
 
 apply plugin: 'com.android.library'
-//apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.novoda.bintray-release'
 
 android {
     compileSdkVersion 25
@@ -26,8 +26,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -51,16 +51,16 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.3.1'
     testCompile 'junit:junit:4.12'
     provided 'com.facebook.fresco:imagepipeline:1.4.0'
-    provided 'xyz.zpayh:hdimageview:1.0.4'
+    provided 'xyz.zpayh:hdimageview:1.0.6'
 }
 
 // jcenter configuration for novoda's bintray-release
 // $ ./gradlew clean build bintrayUpload -PbintrayUser=BINTRAY_USERNAME -PbintrayKey=BINTRAY_KEY -PdryRun=false
-/*publish {
+publish {
     userOrg = 'sherlock'      //bintray注册的用户名
     groupId = 'xyz.zpayh'         //compile引用时的第1部分groupId
     artifactId = 'hdimageview-fresco'     //compile引用时的第2部分项目名
-    publishVersion = '1.0.0'    //compile引用时的第3部分版本号
+    publishVersion = '1.0.1'    //compile引用时的第3部分版本号
     desc = 'This is a high-definition picture control that supports zooming'
     website = 'https://github.com/EvilBT/HDImageView'
-}*/
+}
diff --git a/support-fresco/src/main/java/xyz/zpayh/hdimage/datasource/interceptor/FrescoInterceptor.java b/support-fresco/src/main/java/xyz/zpayh/hdimage/datasource/interceptor/FrescoInterceptor.java
@@ -44,7 +44,7 @@
  * 创建日期: 2017/7/30 16:07
  * 邮   箱: ch_zh_p@qq.com
  * 修改时间:
- * 修改备注:
+ * 修改备注: 只加载网络图片
  */
 
 public class FrescoInterceptor implements Interceptor {
@@ -56,7 +56,7 @@ public BitmapRegionDecoder intercept(Chain chain) throws IOException {
             return decoder;
         }
 
-        if (UriUtil.isNetworkUri(uri) || UriUtil.isLocalFileUri(uri)){
+        if (UriUtil.isNetworkUri(uri)){
             ImagePipeline imagePipeline = ImagePipelineFactory.getInstance().getImagePipeline();
 
             ImageRequest request = ImageRequest.fromUri(uri);
diff --git a/support-glide/build.gradle b/support-glide/build.gradle
@@ -26,8 +26,8 @@ android {
     defaultConfig {
         minSdkVersion 10
         targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -50,7 +50,7 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:25.3.1'
     testCompile 'junit:junit:4.12'
-    provided 'xyz.zpayh:hdimageview:1.0.4'
+    provided 'xyz.zpayh:hdimageview:1.0.6'
     provided 'com.github.bumptech.glide:glide:4.0.0-RC1'
 }
 
@@ -60,7 +60,7 @@ dependencies {
     userOrg = 'sherlock'      //bintray注册的用户名
     groupId = 'xyz.zpayh'         //compile引用时的第1部分groupId
     artifactId = 'hdimageview-glide'     //compile引用时的第2部分项目名
-    publishVersion = '1.0.1'    //compile引用时的第3部分版本号
+    publishVersion = '1.0.2'    //compile引用时的第3部分版本号
     desc = 'This is a high-definition picture control that supports zooming'
     website = 'https://github.com/EvilBT/HDImageView'
 }*/
diff --git a/support-glide/src/main/java/xyz/zpayh/hdimage/datasource/interceptor/GlideInterceptor.java b/support-glide/src/main/java/xyz/zpayh/hdimage/datasource/interceptor/GlideInterceptor.java
@@ -26,7 +26,6 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestManager;
 import com.bumptech.glide.request.FutureTarget;
-import com.bumptech.glide.request.target.Target;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -43,7 +42,7 @@
  * 创建日期: 2017/7/30 17:48
  * 邮   箱: ch_zh_p@qq.com
  * 修改时间:
- * 修改备注:
+ * 修改备注: 只加载网络图片
  */
 
 public class GlideInterceptor implements Interceptor{
@@ -64,18 +63,18 @@ public BitmapRegionDecoder intercept(Chain chain) throws IOException {
             return decoder;
         }
 
-        if (UriUtil.isNetworkUri(uri)){
-            FutureTarget<File> target = mRequestManager.downloadOnly().load(uri).submit(Target.SIZE_ORIGINAL,Target.SIZE_ORIGINAL);
-            try {
-                File file = target.get();
-                Log.d("GlideInterceptor", "用GlideInterceptor加载回来"+file.getAbsolutePath());
-                decoder = BitmapRegionDecoder.newInstance(new FileInputStream(file),false);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            } catch (ExecutionException e) {
-                e.printStackTrace();
-            }
-            mRequestManager.clear(target);
+       if (UriUtil.isNetworkUri(uri)){
+           FutureTarget<File> target = mRequestManager.downloadOnly().load(uri).submit();
+           try {
+               File file = target.get();
+               Log.d("GlideInterceptor", "用GlideInterceptor加载回来"+file.getAbsolutePath());
+               decoder = BitmapRegionDecoder.newInstance(new FileInputStream(file),false);
+           } catch (InterruptedException e) {
+               e.printStackTrace();
+           } catch (ExecutionException e) {
+               e.printStackTrace();
+           }
+           mRequestManager.clear(target);
         }
         return decoder;
     }
