From 5719bac36515510b50ac1c3b40c1cee8ee573fb1 Mon Sep 17 00:00:00 2001 From: Zane Xu Date: Wed, 15 Jun 2016 12:36:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89load=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../zane/imageloader/MainActivity.java | 6 +- .../builder/EasyImageProvider_chang.java | 143 ------------------ .../builder/ImageLoadBuidler.java | 40 +++-- 4 files changed, 23 insertions(+), 168 deletions(-) delete mode 100644 easyimageprovider/src/main/java/com/example/zane/easyimageprovider/builder/EasyImageProvider_chang.java diff --git a/app/build.gradle b/app/build.gradle index e0ebe79..84bd3c2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.3" + buildToolsVersion '24.0.0 rc4' defaultConfig { applicationId "com.example.zane.imageloader" diff --git a/app/src/main/java/com/example/zane/imageloader/MainActivity.java b/app/src/main/java/com/example/zane/imageloader/MainActivity.java index caa4708..d437642 100644 --- a/app/src/main/java/com/example/zane/imageloader/MainActivity.java +++ b/app/src/main/java/com/example/zane/imageloader/MainActivity.java @@ -41,8 +41,10 @@ public void getDataBack(Bitmap bitmap) { ImageProviderBuilder builder = new ImageProviderBuilder() .with(this) .useCamera() - .setGetImageListener("uri", (uri) -> Toast.makeText(this, String.valueOf((Uri) uri), Toast.LENGTH_SHORT).show()) - .useCrop(200, 200); + //.setGetImageListener("uri", (uri) -> Toast.makeText(this, String.valueOf((Uri) uri), Toast.LENGTH_SHORT).show()) + .useCrop(200, 200) + //.setGetImageListener("bitmap", listener) + .setGetImageListener("bitmap", (bitmap) -> imageView.setImageBitmap((Bitmap)bitmap)); EasyImageFactory factory = new ProviderFactory(builder); easyImage = factory.init(); button.setOnClickListener((v) -> easyImage.execute()); diff --git a/easyimageprovider/src/main/java/com/example/zane/easyimageprovider/builder/EasyImageProvider_chang.java b/easyimageprovider/src/main/java/com/example/zane/easyimageprovider/builder/EasyImageProvider_chang.java deleted file mode 100644 index 885f64c..0000000 --- a/easyimageprovider/src/main/java/com/example/zane/easyimageprovider/builder/EasyImageProvider_chang.java +++ /dev/null @@ -1,143 +0,0 @@ -//package com.example.zane.easyimageprovider.builder; -// -//import android.app.Activity; -//import android.content.Context; -//import android.content.Intent; -//import android.support.v4.app.Fragment; -//import android.support.v4.app.FragmentActivity; -// -//import com.example.zane.easyimageprovider.ImageCache; -//import com.example.zane.easyimageprovider.ImageProvider; -//import com.example.zane.easyimageprovider.OnGetImageListener; -//import com.example.zane.easyimageprovider.provider.ProviderRequestCode; -// -///** -// * Created by Zane on 16/5/5. -// * 主体类 -// */ -//public class EasyImageProvider_chang { -// -// //provider -// private boolean isFromCrop; -// private boolean isFromAlbum; -// private boolean isFromCamera; -// private boolean isBitmapBack; -// private boolean isUriBack; -// int outputX; -// int outputY; -// //load -// private boolean isLruCache; -// private boolean isDiskCache; -// private boolean isDoubleCache; -// -// private boolean isProvider = false; -// private boolean isLoad = false; -// -// private ImageCache imageCache; -// private ImageProvider imageProvider; -// -// private ImageProviderBuilder imageProviderBuilder; -// private ImageLoadBuidler imageLoadBuidler; -// -// //开发者回调接口 -// private OnGetImageListener onGetImageListener; -// -// private static final int REQUEST_CAMERA = ProviderRequestCode.REQUEST_CAMERA; -// private static final int REQUEST_ALBUM = ProviderRequestCode.REQUEST_ALBUM; -// private static final int REQUEST_CROP = ProviderRequestCode.REQUEST_CORP; -// -// private Context context; -// private Activity activity; -// private Fragment fragment; -// -// public EasyImageProvider_chang(ImageProviderBuilder imageProviderBuilder){ -// this.imageProviderBuilder = imageProviderBuilder; -// initProvider(imageProviderBuilder); -// isProvider = true; -// } -// -// public EasyImageProvider_chang(ImageLoadBuidler imageLoadBuidler){ -// this.imageLoadBuidler = imageLoadBuidler; -// isLoad = true; -// } -// -// /**q -// * provider init -// * @param imageProviderBuilder -// */ -// private void initProvider(ImageProviderBuilder imageProviderBuilder){ -// -// isFromCamera = imageProviderBuilder.isCamera; -// isFromAlbum = imageProviderBuilder.isAlbum; -// imageProvider = imageProviderBuilder.imageProvider; -// -// if (imageProvider == null){ -// throw new IllegalArgumentException("ImageProvider interface cannot be null!"); -// } -// -// if (imageProviderBuilder.isCrop){ -// isFromCrop = imageProviderBuilder.isCrop; -// outputX = imageProviderBuilder.outputX; -// outputY = imageProviderBuilder.outputY; -// } -// -// if (!(isFromAlbum || isFromCrop || isFromCamera)){ -// throw new IllegalArgumentException("none of provide way be false!"); -// } -// -// if (!(outputX > 0) || !(outputY > 0)){ -// throw new IllegalArgumentException("both of outputx and outputy cannot be negative!"); -// } -// -// activity = imageProviderBuilder.activity; -// fragment = imageProviderBuilder.fragment; -// -// if (activity == null && fragment == null){ -// throw new IllegalArgumentException("neither of provider's context be null!"); -// } else if(activity != null && fragment != null){ -// throw new IllegalArgumentException("neither of provider's context not be null!"); -// } -// -// boolean isActivity = ((activity != null) && (fragment == null)); -// context = isActivity ? activity : fragment.getActivity(); -// -// onGetImageListener = imageProviderBuilder.listener; -// if (imageProviderBuilder.isBitmapBack){ -// isBitmapBack = true; -// } else { -// isUriBack = true; -// } -// -// } -// -// public void execute(){ -// if (isProvider){ -// if (activity != null){ -// activity.startActivityForResult(imageProvider.getIntent(), imageProvider.getRequestCode()); -// } else { -// activity = fragment.getActivity(); -// fragment.startActivityForResult(imageProvider.getIntent(), imageProvider.getRequestCode()); -// } -// } -// } -// -// //------------------------------------provider------------------------------------------ -// public void onActivityResult(int requestCode, int resultCode, Intent data){ -// if (resultCode == activity.RESULT_OK){ -// if (onGetImageListener != null){ -// switch (requestCode){ -// case REQUEST_CAMERA: -// -// break; -// case REQUEST_ALBUM: -// -// break; -// case REQUEST_CROP: -// -// break; -// } -// } -// } -// } -// -//} diff --git a/easyimageprovider/src/main/java/com/example/zane/easyimageprovider/builder/ImageLoadBuidler.java b/easyimageprovider/src/main/java/com/example/zane/easyimageprovider/builder/ImageLoadBuidler.java index 89ddc7d..bc7e9b7 100644 --- a/easyimageprovider/src/main/java/com/example/zane/easyimageprovider/builder/ImageLoadBuidler.java +++ b/easyimageprovider/src/main/java/com/example/zane/easyimageprovider/builder/ImageLoadBuidler.java @@ -48,17 +48,17 @@ public ImageLoadBuidler(){ * LruCache * @return */ - public ImageLoadBuidler useLruCache(){ - this.isLruCache = true; - imageCache = new BitmapLruCache(); - - return this; - } - - /** - * Lru+Disk - * @return - */ +// public ImageLoadBuidler useLruCache(){ +// this.isLruCache = true; +// imageCache = new BitmapLruCache(); +// +// return this; +// } +// +// /** +// * Lru+Disk +// * @return +// */ // public ImageLoadBuidler useDoubleCache(){ // this.isDoubleCache = true; // imageCache = new BitmapDoubleCache(); @@ -92,21 +92,17 @@ public ImageLoadBuidler useCustomCache(ImageCache imageCache){ return this; } -// public ImageLoadBuidler getBitmapBack(OnGetBitmapListener listener){ + +// /** +// * 网络图片默认是返回bitmap，就算是从内存中获得 +// * @param listener +// * @return +// */ +// public ImageLoadBuidler setGetImageListener(OnGetImageListener listener){ // this.listener = listener; // return this; // } - /** - * 网络图片默认是返回bitmap，就算是从内存中获得 - * @param listener - * @return - */ - public ImageLoadBuidler setGetImageListener(OnGetImageListener listener){ - this.listener = listener; - return this; - } - /** * * @param context