diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 516285e..e217157 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 8210e22..f384db7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'android-aspectjx'
 
 android {
     compileSdkVersion 26
@@ -26,5 +27,6 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
 
-    compile project(path: ':imageset')
+    implementation project(':imageset')
+    //implementation 'com.github.JuHonggang:PermissionManager:0.16'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7349b36..5e7d368 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.sxu.imageset">
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/sxu/imageset/AlbumActivity.java b/app/src/main/java/com/sxu/imageset/AlbumActivity.java
index 9c1d2fb..17f5b75 100644
--- a/app/src/main/java/com/sxu/imageset/AlbumActivity.java
+++ b/app/src/main/java/com/sxu/imageset/AlbumActivity.java
@@ -1,16 +1,24 @@
 package com.sxu.imageset;
 
+import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.GridView;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 
+import com.sxu.smartpicture.album.listener.OnSelectPhotoListener;
 import com.sxu.smartpicture.album.PhotoPicker;
+import com.sxu.smartpicture.imageloader.ImageLoaderManager;
+import com.sxu.smartpicture.imageloader.WrapImageView;
+import com.sxu.smartpicture.imageloader.instance.FrescoInstance;
+import com.sxu.smartpicture.imageloader.instance.GlideInstance;
+import com.sxu.smartpicture.imageloader.instance.UILInstance;
 import com.sxu.smartpicture.utils.DisplayUtil;
 
 import java.util.ArrayList;
@@ -23,46 +31,98 @@
 
 public class AlbumActivity extends AppCompatActivity {
 
-	private LinearLayout photoLayout;
-	private ArrayList<String> selectedPhotos;
+	private GridView photoGrid;
+	private BaseAdapter photoAdapter;
+	private ArrayList<String> selectedPhotos = new ArrayList<>();
 
 	@Override
 	protected void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_album_layout);
 		Button chooseButton = (Button)findViewById(R.id.choose_button);
-		photoLayout = (LinearLayout) findViewById(R.id.photo_layout);
+		photoGrid = (GridView) findViewById(R.id.photo_grid);
+
+		int type = getIntent().getIntExtra("type", 0);
+		if (!ImageLoaderManager.getInstance().isInit()) {
+			if (type == 0) {
+				ImageLoaderManager.getInstance().init(getApplicationContext(), new FrescoInstance());
+			} else if (type == 1) {
+				ImageLoaderManager.getInstance().init(getApplicationContext(), new UILInstance());
+			} else if (type == 2) {
+				ImageLoaderManager.getInstance().init(getApplicationContext(), new GlideInstance());
+			} else {
+				/**
+				 * Nothing
+				 */
+			}
+		}
 
 		chooseButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				new PhotoPicker.Builder()
+				PhotoPicker picker = new PhotoPicker.Builder()
 						.setIsDialog(false)
 						.setIsShowCamera(false)
-						.setMaxPhotoCount(3)
+						.setMaxPhotoCount(9)
 						.setSelectedPhotos(selectedPhotos)
-						.builder().chooseImage(AlbumActivity.this);
+						.builder();
+				picker.chooseImage(AlbumActivity.this, new OnSelectPhotoListener() {
+					@Override
+					public void onSelected(ArrayList<String> selectedPhotoList) {
+						selectedPhotos.clear();
+						selectedPhotos.addAll(selectedPhotoList);
+						setPhotoAdapter();
+					}
+				});
 			}
 		});
 	}
 
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if (requestCode == PhotoPicker.REQUEST_CODE_CHOOSE_PHOTO && data != null) {
-			selectedPhotos = data.getStringArrayListExtra(PhotoPicker.SELECTED_PHOTOS);
-			if (selectedPhotos != null && selectedPhotos.size() > 0) {
-				photoLayout.removeAllViews();
-				int size =(DisplayUtil.getScreenWidth() - DisplayUtil.dpToPx(48)) / 3;
-				LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(size, size);
-				params.leftMargin = DisplayUtil.dpToPx(8);
-				for (String photo : selectedPhotos) {
-					ImageView imageView = new ImageView(AlbumActivity.this);
-					imageView.setImageURI(Uri.parse("file://" + photo));
+	public static void enter(Context context, int imageLoaderType) {
+		Intent intent = new Intent(context, AlbumActivity.class);
+		intent.putExtra("type", imageLoaderType);
+		context.startActivity(intent);
+	}
+
+	private void setPhotoAdapter() {
+		if (photoAdapter == null) {
+			final int itemSize = (DisplayUtil.getScreenWidth() - DisplayUtil.dpToPx(72)) / 3;
+			final ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, itemSize);
+			photoAdapter = new BaseAdapter() {
+				@Override
+				public int getCount() {
+					return selectedPhotos.size();
+				}
+
+				@Override
+				public Object getItem(int position) {
+					return selectedPhotos.get(position);
+				}
+
+				@Override
+				public long getItemId(int position) {
+					return position;
+				}
+
+				@Override
+				public View getView(int position, View convertView, ViewGroup parent) {
+					WrapImageView imageView = new WrapImageView(AlbumActivity.this);
 					imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
-					photoLayout.addView(imageView, params);
+					ImageLoaderManager.getInstance().displayImage("file://" + getItem(position), imageView, itemSize, itemSize);
+					imageView.setLayoutParams(params);
+					return imageView;
 				}
-			}
+			};
+
+			photoGrid.setAdapter(photoAdapter);
+		} else {
+			photoAdapter.notifyDataSetChanged();
 		}
 	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		ImageLoaderManager.getInstance().onDestroy();
+	}
 }
diff --git a/app/src/main/java/com/sxu/imageset/ChooseAndCropImageActivity.java b/app/src/main/java/com/sxu/imageset/ChooseAndCropImageActivity.java
index 6a10d97..7895430 100644
--- a/app/src/main/java/com/sxu/imageset/ChooseAndCropImageActivity.java
+++ b/app/src/main/java/com/sxu/imageset/ChooseAndCropImageActivity.java
@@ -3,7 +3,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
@@ -14,10 +13,9 @@
 import android.widget.Toast;
 
 import com.qiniu.android.http.ResponseInfo;
-import com.sxu.smartpicture.choosePicture.ChoosePhotoDialog;
-import com.sxu.smartpicture.choosePicture.ChoosePhotoManager;
-import com.sxu.smartpicture.choosePicture.OnChoosePhotoListener;
-import com.sxu.smartpicture.utils.PermissionUtil;
+import com.sxu.smartpicture.choosepicture.ChoosePhotoDialog;
+import com.sxu.smartpicture.choosepicture.ChoosePhotoManager;
+import com.sxu.smartpicture.choosepicture.OnSimpleChoosePhotoListener;
 import com.sxu.smartpicture.utils.UploadUtils;
 
 import org.json.JSONObject;
@@ -50,29 +48,12 @@ public void onClick(View v) {
 				dialog.setOnItemListener(new AdapterView.OnItemClickListener() {
 					@Override
 					public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-						ChoosePhotoManager.getInstance().setAutoCrop(true);
 						if (i == 0) {
-							ChoosePhotoManager.getInstance().choosePhotoFromCamera(ChooseAndCropImageActivity.this);
+							ChoosePhotoManager.getInstance().takePicture(ChooseAndCropImageActivity.this, true);
 						} else {
-							ChoosePhotoManager.getInstance().choosePhotoFromAlbum(ChooseAndCropImageActivity.this);
+							ChoosePhotoManager.getInstance().choosePhotoFromAlbum(ChooseAndCropImageActivity.this, true);
 						}
-						ChoosePhotoManager.getInstance().setChoosePhotoListener(new OnChoosePhotoListener() {
-							@Override
-							public void choosePhotoFromAlbum(Uri uri) {
-								if (uri != null) {
-									filePath = uri.getPath();
-									imageView.setImageURI(uri);
-								}
-							}
-
-							@Override
-							public void choosePhotoFromCamera(Uri uri) {
-								if (uri != null) {
-									filePath = uri.getPath();
-									imageView.setImageURI(uri);
-								}
-							}
-
+						ChoosePhotoManager.getInstance().setChoosePhotoListener(new OnSimpleChoosePhotoListener() {
 							@Override
 							public void cropPhoto(Uri uri) {
 								if (uri != null) {
@@ -131,10 +112,4 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		ChoosePhotoManager.getInstance().onActivityResult(this, requestCode, data);
 	}
-
-	@Override
-	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-		PermissionUtil.requestCallback(this, requestCode, permissions, grantResults);
-	}
 }
diff --git a/app/src/main/java/com/sxu/imageset/ImageLoaderActivity.java b/app/src/main/java/com/sxu/imageset/ImageLoaderActivity.java
index 167a56b..180c38a 100644
--- a/app/src/main/java/com/sxu/imageset/ImageLoaderActivity.java
+++ b/app/src/main/java/com/sxu/imageset/ImageLoaderActivity.java
@@ -1,28 +1,23 @@
 package com.sxu.imageset;
 
-import android.app.SharedElementCallback;
-import android.content.Intent;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.sxu.imageloader.ImageLoaderManager;
-import com.sxu.imageloader.WrapImageView;
-import com.sxu.imageloader.instance.FrescoInstance;
-import com.sxu.imageloader.instance.GlideInstance;
-import com.sxu.imageloader.instance.UILInstance;
-import com.sxu.imageloader.listener.ImageLoaderListener;
-import com.sxu.smartpicture.album.PhotoPreviewActivity;
+import com.sxu.smartpicture.album.activity.PhotoPreviewActivity;
+import com.sxu.smartpicture.imageloader.ImageLoaderManager;
+import com.sxu.smartpicture.imageloader.WrapImageView;
+import com.sxu.smartpicture.imageloader.instance.FrescoInstance;
+import com.sxu.smartpicture.imageloader.instance.GlideInstance;
+import com.sxu.smartpicture.imageloader.instance.UILInstance;
+import com.sxu.smartpicture.imageloader.listener.ImageLoaderListener;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -65,7 +60,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		ViewCompat.setTransitionName(blurImage, PhotoPreviewActivity.TRANSITION_NAME_PREFIX + "1");
 		ViewCompat.setTransitionName(rectangleImage, PhotoPreviewActivity.TRANSITION_NAME_PREFIX + "2");
 		ImageLoaderManager.getInstance().displayImage("http://t.cn/RTRKzUt", image);
-		ImageLoaderManager.getInstance().displayImage("http://img.tuku.cn/file_thumb/201602/m2016021513470744.jpg", blurImage);
+		ImageLoaderManager.getInstance().displayImage("http://t.cn/RTRKzUt", blurImage);
 		ImageLoaderManager.getInstance().displayImage("http://t.cn/RTRKzUt", rectangleImage);
 		ImageLoaderManager.getInstance().displayImage("http://t.cn/RTRKJvS", circleImage);
 
diff --git a/app/src/main/java/com/sxu/imageset/MainActivity.java b/app/src/main/java/com/sxu/imageset/MainActivity.java
index c911ca6..61add8f 100644
--- a/app/src/main/java/com/sxu/imageset/MainActivity.java
+++ b/app/src/main/java/com/sxu/imageset/MainActivity.java
@@ -1,11 +1,12 @@
 package com.sxu.imageset;
 
+import android.Manifest;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.RadioGroup;
-
+import android.widget.Toast;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
@@ -53,9 +54,10 @@ public void onClick(View v) {
 				startActivity(intent);
 				break;
 			case R.id.album_button:
-				startActivity(new Intent(this, AlbumActivity.class));
+				AlbumActivity.enter(this, imageLoaderType);
 				break;
 			case R.id.choose_image_button:
+				//test();
 				startActivity(new Intent(this, ChooseAndCropImageActivity.class));
 				break;
 			default:
diff --git a/app/src/main/res/layout/activity_album_layout.xml b/app/src/main/res/layout/activity_album_layout.xml
index 15bfe6a..251f431 100644
--- a/app/src/main/res/layout/activity_album_layout.xml
+++ b/app/src/main/res/layout/activity_album_layout.xml
@@ -12,12 +12,15 @@
         android:text="选择图片"
         android:textColor="@android:color/white"
         android:background="#4db6ac"/>
-    <LinearLayout
-        android:id="@+id/photo_layout"
+    <GridView
+        android:id="@+id/photo_grid"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
-        android:paddingLeft="8dp"
-        android:paddingRight="16dp"
-        android:orientation="horizontal"/>
+        android:paddingLeft="24dp"
+        android:paddingRight="24dp"
+        android:horizontalSpacing="12dp"
+        android:verticalSpacing="12dp"
+        android:numColumns="3"
+        android:scrollbars="none"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_choose_and_crop_image_layout.xml b/app/src/main/res/layout/activity_choose_and_crop_image_layout.xml
index 9e2e94d..ec079d3 100644
--- a/app/src/main/res/layout/activity_choose_and_crop_image_layout.xml
+++ b/app/src/main/res/layout/activity_choose_and_crop_image_layout.xml
@@ -39,4 +39,13 @@
         android:text="上传图片到七牛"
         android:textColor="@android:color/white"
         android:background="#7986cb"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginRight="24dp"
+        android:text="说明：\n1. 上传到服务器需要设置服务器的URL；\n2. 上传到七牛云需要到token，具体参考七牛云开发者中心；"
+        android:lineSpacingMultiplier="1.25"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_image_loader_layout.xml b/app/src/main/res/layout/activity_image_loader_layout.xml
index f2b0961..66912bc 100644
--- a/app/src/main/res/layout/activity_image_loader_layout.xml
+++ b/app/src/main/res/layout/activity_image_loader_layout.xml
@@ -4,7 +4,7 @@
               android:layout_height="match_parent"
               xmlns:app="http://schemas.android.com/apk/res-auto"
               android:orientation="vertical">
-    <com.sxu.imageloader.WrapImageView
+    <com.sxu.smartpicture.imageloader.WrapImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="150dp"
@@ -14,7 +14,7 @@
         android:scaleType="centerCrop"
         app:placeHolder="@drawable/default_placeholder_image"
         app:failureHolder="@drawable/default_placeholder_image"/>
-    <com.sxu.imageloader.WrapImageView
+    <com.sxu.smartpicture.imageloader.WrapImageView
         android:id="@+id/blur_image"
         android:layout_width="match_parent"
         android:layout_height="180dp"
@@ -33,7 +33,7 @@
         android:layout_marginLeft="18dp"
         android:layout_marginRight="18dp"
         android:orientation="horizontal">
-        <com.sxu.imageloader.WrapImageView
+        <com.sxu.smartpicture.imageloader.WrapImageView
             android:id="@+id/rectangle_image"
             android:layout_width="0dp"
             android:layout_height="match_parent"
@@ -44,7 +44,7 @@
             app:radius="10dp"
             app:borderColor="#e1f5fe"
             app:shapeBorderWidth="5dp"/>
-        <com.sxu.imageloader.WrapImageView
+        <com.sxu.smartpicture.imageloader.WrapImageView
             android:id="@+id/circle_image"
             android:layout_width="0dp"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930..0eb88fe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/build.gradle b/build.gradle
index ab4ca9e..b939d58 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..400c334 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,3 +15,4 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.enableD8=false
diff --git a/imageset/build.gradle b/imageset/build.gradle
index 81c842f..1b300ae 100644
--- a/imageset/build.gradle
+++ b/imageset/build.gradle
@@ -1,5 +1,7 @@
 apply plugin: 'com.android.library'
+apply plugin: 'android-aspectjx'
 apply plugin: 'com.github.dcendents.android-maven'
+
 group='com.github.juhonggang'
 
 android {
@@ -39,6 +41,10 @@ dependencies {
 
     compile 'top.zibin:Luban:1.1.3'
     compile 'com.qiniu:qiniu-android-sdk:7.3.+'
-    compile 'com.github.JuHonggang:ImageloaderManager:0.16'
+    compile 'com.facebook.fresco:fresco:1.1.0'
+    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    compile 'com.github.bumptech.glide:glide:4.4.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.4.0'
     compile 'com.github.JuHonggang:PhotoView:2.1.4.1'
+    implementation 'com.github.JuHonggang:PermissionManager:0.16'
 }
diff --git a/imageset/src/androidTest/java/com/sxu/smartpicture/ExampleInstrumentedTest.java b/imageset/src/androidTest/java/com/sxu/smartpicture/ExampleInstrumentedTest.java
index cbed639..1f1d999 100644
--- a/imageset/src/androidTest/java/com/sxu/smartpicture/ExampleInstrumentedTest.java
+++ b/imageset/src/androidTest/java/com/sxu/smartpicture/ExampleInstrumentedTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/imageset/src/main/AndroidManifest.xml b/imageset/src/main/AndroidManifest.xml
index 3711408..359a76e 100644
--- a/imageset/src/main/AndroidManifest.xml
+++ b/imageset/src/main/AndroidManifest.xml
@@ -8,10 +8,10 @@
     <uses-permission android:name="android.permission.CAMERA"/>
 
     <application>
-        <activity android:name=".album.ChoosePhotoActivity"
+        <activity android:name=".album.activity.ChoosePhotoActivity"
                   android:hardwareAccelerated="true"
             android:theme="@style/Theme.AppCompat.NoActionBar"/>
-        <activity android:name=".album.PhotoPreviewActivity"
+        <activity android:name=".album.activity.PhotoPreviewActivity"
                   android:theme="@style/PreviewPhotoTheme"/>
     </application>
 </manifest>
diff --git a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoManager.java b/imageset/src/main/java/com/sxu/smartpicture/album/PhotoManager.java
index 64daa41..7d8f12a 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoManager.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/album/PhotoManager.java
@@ -11,10 +11,10 @@
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.text.TextUtils;
-import android.widget.Toast;
 
+import com.sxu.permission.CheckPermission;
 import com.sxu.smartpicture.R;
-import com.sxu.smartpicture.utils.PermissionUtil;
+import com.sxu.smartpicture.album.activity.ChoosePhotoActivity;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -49,7 +49,9 @@ public static PhotoManager getInstance() {
 	 * @param context
 	 * @param listener
 	 */
-	private void loadAllDirectory(final FragmentActivity context, final OnPhotoDirectoryLoadListener listener) {
+	@CheckPermission(permissions = {Manifest.permission.READ_EXTERNAL_STORAGE},
+			permissionDesc = "此功能需要读取存储卡才可使用")
+	public void loadAllDirectory(final FragmentActivity context, final OnPhotoDirectoryLoadListener listener) {
 		context.getSupportLoaderManager().initLoader(0, null, new LoaderManager.LoaderCallbacks<Cursor>() {
 			@Override
 			public Loader<Cursor> onCreateLoader(int id, Bundle args) {
@@ -97,34 +99,15 @@ public void onLoaderReset(Loader<Cursor> loader) {
 		});
 	}
 
-	/**
-	 * 获取所有的相册信息
-	 * @param context
-	 * @param listener
-	 */
-	public void getAllDirectory(final FragmentActivity context, final OnPhotoDirectoryLoadListener listener ) {
-		if (!PermissionUtil.checkPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) {
-			PermissionUtil.setPermissionRequestListener(
-					context.getString(R.string.read_storage_permission_desc),
-					context.getString(R.string.read_storage_permission_setting_desc),
-					new PermissionUtil.OnPermissionRequestListener() {
-						@Override
-						public void onGranted() {
-							loadAllDirectory(context, listener);
-						}
-					});
-		} else {
-			loadAllDirectory(context, listener);
-		}
-	}
-
 	/**
 	 * 载入指定相册下的所有照片
 	 * @param context
 	 * @param bucketId
 	 * @param listener
 	 */
-	private static void loadPhotos(final FragmentActivity context, final String bucketId, final OnPhotoLoadListener listener ) {
+	@CheckPermission(permissions = {Manifest.permission.READ_EXTERNAL_STORAGE},
+			permissionDesc = "此功能需要读取存储卡才可使用")
+	public static void loadPhotos(final FragmentActivity context, final String bucketId, final OnPhotoLoadListener listener ) {
 		context.getSupportLoaderManager().initLoader(0, null, new LoaderManager.LoaderCallbacks<Cursor>() {
 			@Override
 			public Loader<Cursor> onCreateLoader(int id, Bundle args) {
@@ -167,34 +150,14 @@ public void onLoaderReset(Loader<Cursor> loader) {
 		});
 	}
 
-	/**
-	 * 根据相册ID获取指定相册的照片
-	 * @param context
-	 * @param bucketId
-	 * @param listener
-	 */
-	public static void getPhotos(final FragmentActivity context, final String bucketId, final OnPhotoLoadListener listener ) {
-		if (!PermissionUtil.checkPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) {
-			PermissionUtil.setPermissionRequestListener(
-					context.getString(R.string.read_storage_permission_desc),
-					context.getString(R.string.read_storage_permission_setting_desc),
-					new PermissionUtil.OnPermissionRequestListener() {
-						@Override
-						public void onGranted() {
-							loadPhotos(context, bucketId, listener);
-						}
-					});
-		} else {
-			loadPhotos(context, bucketId, listener);
-		}
-	}
-
 	/**
 	 * 载入手机中的所有照片
 	 * @param context
 	 * @param listener
 	 */
-	private void loadAllPhotos(final FragmentActivity context, final OnPhotoDirectoryLoadListener listener) {
+	@CheckPermission(permissions = {Manifest.permission.READ_EXTERNAL_STORAGE},
+			permissionDesc = "此功能需要读取存储卡才可使用")
+	public void loadAllPhotos(final FragmentActivity context, final OnPhotoDirectoryLoadListener listener) {
 		if (directoryMap != null) {
 			if (listener != null) {
 				listener.onCompleted(new ArrayList<>(directoryMap.values()));
@@ -260,28 +223,6 @@ public void onLoaderReset(Loader<Cursor> loader) {
 		}
 	}
 
-
-	/**
-	 * 获取所有的照片
-	 * @param context
-	 * @param listener
-	 */
-	public void getAllPhotos(final FragmentActivity context, final OnPhotoDirectoryLoadListener listener) {
-		if (!PermissionUtil.checkPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) {
-			PermissionUtil.setPermissionRequestListener(
-					context.getString(R.string.read_storage_permission_desc),
-					context.getString(R.string.read_storage_permission_setting_desc),
-					new PermissionUtil.OnPermissionRequestListener() {
-						@Override
-						public void onGranted() {
-							loadAllPhotos(context, listener);
-						}
-					});
-		} else {
-			loadAllPhotos(context, listener);
-		}
-	}
-
 	public List<String> getAllPhotosPath() {
 		if (allPhotoPath == null) {
 			allPhotoPath = new ArrayList<>();
diff --git a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoPicker.java b/imageset/src/main/java/com/sxu/smartpicture/album/PhotoPicker.java
index 3bcaca8..05abde1 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoPicker.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/album/PhotoPicker.java
@@ -1,8 +1,13 @@
 package com.sxu.smartpicture.album;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 
+import com.sxu.permission.CheckPermission;
+import com.sxu.smartpicture.album.activity.ChoosePhotoActivity;
+import com.sxu.smartpicture.album.listener.OnSelectPhotoListener;
+
 import java.util.ArrayList;
 
 /**
@@ -29,21 +34,25 @@ public class PhotoPicker {
 	private ArrayList<String> mSelectedPhotos;
 	private boolean mIsShowCamera;
 	private boolean mIsDialog;
+	private OnSelectPhotoListener listener;
 
 	private PhotoPicker(Builder builder) {
 		this.mMaxPhotoCount = builder.mMaxPhotoCount;
 		this.mSelectedPhotos = builder.mSelectedPhotos;
 		this.mIsShowCamera = builder.mIsShowCamera;
 		this.mIsDialog = builder.mIsDialog;
+		this.listener = builder.listener;
 	}
 
-	public void chooseImage(Activity context) {
+	@CheckPermission(permissions = {Manifest.permission.READ_EXTERNAL_STORAGE})
+	public void chooseImage(Activity context, OnSelectPhotoListener listener) {
 		Intent intent = new Intent(context, ChoosePhotoActivity.class);
 		intent.putExtra(MAX_PHOTO_COUNT, mMaxPhotoCount != 0 ? mMaxPhotoCount : DEFAULT_MAX_PHOTO_COUNT);
 		intent.putExtra(SELECTED_PHOTOS, mSelectedPhotos);
 		intent.putExtra(SHOW_CAMERA, mIsShowCamera);
 		intent.putExtra(PHOTO_LIST_STYLE_DIALOG, mIsDialog);
-		context.startActivityForResult(intent, REQUEST_CODE_CHOOSE_PHOTO);
+		context.startActivity(intent);
+		ChoosePhotoActivity.setSelectListener(listener);
 	}
 
 	public static class Builder{
@@ -51,6 +60,7 @@ public static class Builder{
 		private ArrayList<String> mSelectedPhotos;
 		private boolean mIsShowCamera;
 		private boolean mIsDialog;
+		private OnSelectPhotoListener listener;
 
 		public Builder setMaxPhotoCount(int maxCount) {
 			this.mMaxPhotoCount = maxCount;
@@ -67,8 +77,13 @@ public Builder setIsShowCamera(boolean showCamera) {
 			return this;
 		}
 
-		public Builder setIsDialog(boolean isDalog) {
-			this.mIsDialog = isDalog;
+		public Builder setIsDialog(boolean isDialog) {
+			this.mIsDialog = isDialog;
+			return this;
+		}
+
+		public Builder setOnSelectPhotoListener(OnSelectPhotoListener listener) {
+			this.listener = listener;
 			return this;
 		}
 
diff --git a/imageset/src/main/java/com/sxu/smartpicture/album/ChoosePhotoActivity.java b/imageset/src/main/java/com/sxu/smartpicture/album/activity/ChoosePhotoActivity.java
similarity index 60%
rename from imageset/src/main/java/com/sxu/smartpicture/album/ChoosePhotoActivity.java
rename to imageset/src/main/java/com/sxu/smartpicture/album/activity/ChoosePhotoActivity.java
index 915e40a..a668f9d 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/album/ChoosePhotoActivity.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/album/activity/ChoosePhotoActivity.java
@@ -1,14 +1,14 @@
-package com.sxu.smartpicture.album;
+package com.sxu.smartpicture.album.activity;
 
-import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
 import android.transition.Transition;
 import android.transition.TransitionInflater;
 import android.view.View;
@@ -17,10 +17,15 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.sxu.imageloader.ImageLoaderManager;
-import com.sxu.imageloader.instance.GlideInstance;
 import com.sxu.smartpicture.R;
-import com.sxu.smartpicture.utils.PermissionUtil;
+import com.sxu.smartpicture.album.listener.OnItemPhotoCheckedListener;
+import com.sxu.smartpicture.album.listener.OnSelectPhotoListener;
+import com.sxu.smartpicture.album.PhotoPicker;
+import com.sxu.smartpicture.album.fragment.PhotoGridFragment;
+import com.sxu.smartpicture.album.fragment.PhotoListFragment;
+import com.sxu.smartpicture.album.fragment.PhotoPreviewFragment;
+import com.sxu.smartpicture.imageloader.ImageLoaderManager;
+import com.sxu.smartpicture.imageloader.instance.GlideInstance;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,6 +45,11 @@ public class ChoosePhotoActivity extends AppCompatActivity {
     private TextView completeText;
 
     private int maxCount = 0;
+    private String currentPhoto;
+    private Fragment currentFragment;
+    private FragmentManager fm;
+    private FragmentTransaction transaction;
+    private static OnSelectPhotoListener selectListener;
     public ArrayList<String> selectedPhotos = new ArrayList<>();
 
     public final String FRAGMENT_TAG_GRID = "grid";
@@ -50,11 +60,17 @@ public class ChoosePhotoActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_choose_photo_layout);
-        ImageLoaderManager.getInstance().init(this, new GlideInstance());
+        if (!ImageLoaderManager.getInstance().isInit()) {
+            ImageLoaderManager.getInstance().init(this, new GlideInstance());
+        }
         getViews();
         initActivity();
     }
 
+    public static void setSelectListener(OnSelectPhotoListener listener) {
+        selectListener = listener;
+    }
+
     protected void getViews() {
         returnIcon = findViewById(R.id.return_icon);
         titleText = findViewById(R.id.title_text);
@@ -65,20 +81,22 @@ protected void getViews() {
     }
 
     protected void initActivity() {
+        fm = getSupportFragmentManager();
+        transaction = fm.beginTransaction();
         maxCount = getIntent().getIntExtra(PhotoPicker.MAX_PHOTO_COUNT, 0);
-        List<String> photoList = getIntent().getStringArrayListExtra(PhotoPicker.SELECTED_PHOTOS);
+        final List<String> photoList = getIntent().getStringArrayListExtra(PhotoPicker.SELECTED_PHOTOS);
         if (photoList != null && photoList.size() > 0) {
             selectedPhotos.addAll(photoList);
             completeText.setText(getString(R.string.complete_text, photoList.size()));
         }
-        updateFragment(PhotoGridFragment.newInstance(0), FRAGMENT_TAG_GRID, true, false);
+        updateFragment(PhotoGridFragment.newInstance(0, selectedPhotos), FRAGMENT_TAG_GRID, true, false);
 
         completeText.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent intent = new Intent();
-                intent.putExtra(PhotoPicker.SELECTED_PHOTOS, selectedPhotos);
-                setResult(RESULT_OK, intent);
+                if (selectListener != null) {
+                    selectListener.onSelected(selectedPhotos);
+                }
                 finish();
             }
         });
@@ -94,6 +112,34 @@ public void onClick(View view) {
                 onBackPressed();
             }
         });
+        checkIcon.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setCheckIconStatus(true, currentPhoto);
+            }
+        });
+        fm.registerFragmentLifecycleCallbacks(new FragmentManager.FragmentLifecycleCallbacks() {
+            @Override
+            public void onFragmentViewCreated(FragmentManager fm, Fragment f, View v, Bundle savedInstanceState) {
+                super.onFragmentViewCreated(fm, f, v, savedInstanceState);
+                updateViewVisible(f.getTag());
+            }
+
+            @Override
+            public void onFragmentResumed(FragmentManager fm, Fragment f) {
+                super.onFragmentResumed(fm, f);
+                currentFragment = f;
+                if (currentFragment instanceof PhotoPreviewFragment) {
+                    ((PhotoPreviewFragment) currentFragment).setOnPagerChangeListener(new PhotoPreviewFragment.OnPagerChangedListener() {
+                        @Override
+                        public void onChanged(int position, String photoPath) {
+                            currentPhoto = photoPath;
+                            setCheckIconStatus(false, photoPath);
+                        }
+                    });
+                }
+            }
+        }, true);
     }
 
     /**
@@ -104,7 +150,6 @@ public void onClick(View view) {
      * @param addToStack 是否需要添加到回退栈中
      */
     public void updateFragment(final Fragment fragment, String fragmentTag, final boolean isAdd, final boolean addToStack) {
-        final FragmentManager fm = getSupportFragmentManager();
         final FragmentTransaction transaction = fm.beginTransaction();
         if (isAdd) {
             transaction.add(R.id.container_layout, fragment, fragmentTag);
@@ -114,7 +159,7 @@ public void updateFragment(final Fragment fragment, String fragmentTag, final bo
         if (addToStack) {
             transaction.addToBackStack(null);
         }
-        transaction.commit();
+        transaction.commitAllowingStateLoss();
 
         if (fragment instanceof PhotoGridFragment) {
             ((PhotoGridFragment)fragment).setOnItemPhotoCheckedListener(
@@ -128,35 +173,35 @@ public void onItemChecked(ImageView checkIcon, boolean isSelected, String photoP
                 @Override
                 public void onItemPreview(int currentItem, View itemView, ArrayList<String> allPhotos) {
                     PhotoPreviewFragment previewFragment = PhotoPreviewFragment.getInstance(currentItem, allPhotos);
-                    previewFragment.setAllowEnterTransitionOverlap(true);
+                    //previewFragment.setAllowEnterTransitionOverlap(true);
                     if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
                         Transition transition = TransitionInflater.from(getBaseContext())
                                 .inflateTransition(android.R.transition.move);
-                        transition.setDuration(450);
+                        transition.setDuration(400);
                         previewFragment.setSharedElementEnterTransition(transition);
                     }
 
                     FragmentTransaction transaction = fm.beginTransaction();
-                    transaction.replace(R.id.container_layout, previewFragment);
-                    transaction.addSharedElement(itemView, "Preview" + currentItem);
+                    transaction.add(R.id.container_layout, previewFragment, FRAGMENT_TAG_PREVIEW);
+                    transaction.addSharedElement(itemView, "Preview_" + currentItem);
                     transaction.addToBackStack(null);
                     transaction.commit();
                     updateViewVisible(FRAGMENT_TAG_PREVIEW);
 
-                    previewFragment.setOnItemPhotoCheckedListener(
-                            new OnItemPhotoCheckedListener() {
-                                @Override
-                                public void onItemChecked(ImageView checkIcon, boolean isSelected, String photoPath) {
-                                    updateSelectedPhotos(checkIcon, isSelected, photoPath);
-                                }
-                            });
+//                    previewFragment.setOnItemPhotoCheckedListener(
+//                            new OnItemPhotoCheckedListener() {
+//                                @Override
+//                                public void onItemChecked(ImageView checkIcon, boolean isSelected, String photoPath) {
+//                                    updateSelectedPhotos(checkIcon, isSelected, photoPath);
+//                                }
+//                            });
                 }
             });
         } else if (fragment instanceof PhotoListFragment) {
             ((PhotoListFragment)fragment).setOnItemPhotoListClickListener(new PhotoListFragment.OnItemPhotoListClickListener() {
                 @Override
                 public void onItemPhotoListClick(int directoryIndex) {
-                    updateFragment(PhotoGridFragment.newInstance(directoryIndex), FRAGMENT_TAG_GRID, false, true);
+                    updateFragment(PhotoGridFragment.newInstance(directoryIndex, selectedPhotos), FRAGMENT_TAG_GRID, false, true);
                 }
             });
         } else {
@@ -164,8 +209,14 @@ public void onItemPhotoListClick(int directoryIndex) {
         }
     }
 
-    public void setCheckIconStatus(String photoPath) {
-        checkIcon.setSelected(selectedPhotos.contains(photoPath));
+    public void setCheckIconStatus(boolean isClick, String currentPhoto) {
+        if (currentFragment instanceof PhotoPreviewFragment) {
+            if (isClick) {
+                updateSelectedPhotos(checkIcon, !checkIcon.isSelected(), currentPhoto);
+            } else {
+                checkIcon.setSelected(selectedPhotos.contains(currentPhoto));
+            }
+        }
     }
 
     private void updateSelectedPhotos(ImageView checkIcon,
@@ -211,23 +262,34 @@ public void updateViewVisible(String tag) {
         }
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        PermissionUtil.requestCallback(this, requestCode, permissions, grantResults);
-    }
-
     @Override
     public void onBackPressed() {
         FragmentManager fm = getSupportFragmentManager();
-        if (fm.getBackStackEntryCount() == 0 && fm.findFragmentByTag(FRAGMENT_TAG_GRID) != null) {
-            updateFragment(new PhotoListFragment(), FRAGMENT_TAG_LIST, false, false);
+        int backStackCount = fm.getBackStackEntryCount();
+        if (fm.findFragmentByTag(FRAGMENT_TAG_GRID) != null) {
+            if (backStackCount == 0) {
+                updateFragment(new PhotoListFragment(), FRAGMENT_TAG_LIST, false, false);
+            } else if (fm.findFragmentByTag(FRAGMENT_TAG_PREVIEW) != null) { // 从预览页面返回时更新View
+                super.onBackPressed();
+                updateViewVisible(FRAGMENT_TAG_GRID);
+            } else {
+                super.onBackPressed();
+            }
         } else {
             super.onBackPressed();
         }
+
+        List<Fragment> fragmentList = fm.getFragments();
+        if (fragmentList != null && fragmentList.size() > 0) {
+            String tag = fragmentList.get(fragmentList.size() - 1).getTag();
+            updateViewVisible(tag);
+        }
+
     }
 
-    public interface OnItemPhotoCheckedListener {
-        void onItemChecked(ImageView checkIcon, boolean isSelected, String photoPath);
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        selectListener = null;
     }
 }
diff --git a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoPreviewActivity.java b/imageset/src/main/java/com/sxu/smartpicture/album/activity/PhotoPreviewActivity.java
similarity index 94%
rename from imageset/src/main/java/com/sxu/smartpicture/album/PhotoPreviewActivity.java
rename to imageset/src/main/java/com/sxu/smartpicture/album/activity/PhotoPreviewActivity.java
index 8497b4a..9e142aa 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoPreviewActivity.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/album/activity/PhotoPreviewActivity.java
@@ -1,9 +1,7 @@
-package com.sxu.smartpicture.album;
+package com.sxu.smartpicture.album.activity;
 
 import android.app.Activity;
-import android.app.SharedElementCallback;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -14,21 +12,17 @@
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.github.chrisbanes.photoview.PhotoView;
-import com.sxu.imageloader.ImageLoaderManager;
 import com.sxu.smartpicture.R;
+import com.sxu.smartpicture.imageloader.ImageLoaderManager;
 import com.sxu.smartpicture.zoomimage.ZoomImageView;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Freeman
diff --git a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoGridFragment.java b/imageset/src/main/java/com/sxu/smartpicture/album/fragment/PhotoGridFragment.java
similarity index 74%
rename from imageset/src/main/java/com/sxu/smartpicture/album/PhotoGridFragment.java
rename to imageset/src/main/java/com/sxu/smartpicture/album/fragment/PhotoGridFragment.java
index ee26ad3..c667c4d 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoGridFragment.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/album/fragment/PhotoGridFragment.java
@@ -1,11 +1,10 @@
-package com.sxu.smartpicture.album;
+package com.sxu.smartpicture.album.fragment;
 
 import android.animation.LayoutTransition;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewCompat;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,10 +13,14 @@
 import android.widget.GridView;
 import android.widget.ImageView;
 
-import com.sxu.imageloader.ImageLoaderManager;
-import com.sxu.imageloader.WrapImageView;
-import com.sxu.smartpicture.utils.DisplayUtil;
 import com.sxu.smartpicture.R;
+import com.sxu.smartpicture.album.CommonAdapter;
+import com.sxu.smartpicture.album.PhotoDirectoryBean;
+import com.sxu.smartpicture.album.PhotoManager;
+import com.sxu.smartpicture.album.listener.OnItemPhotoCheckedListener;
+import com.sxu.smartpicture.imageloader.ImageLoaderManager;
+import com.sxu.smartpicture.imageloader.WrapImageView;
+import com.sxu.smartpicture.utils.DisplayUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,23 +33,25 @@
 public class PhotoGridFragment extends Fragment {
 
     private GridView photoGrid;
+    private View loadingLayout;
     private View mContentView;
 
-    private int scrollState = AbsListView.OnScrollListener.SCROLL_STATE_IDLE;
     private int imageSize;
-    //private int directionIndex;
+    private int directionIndex;
     private CommonAdapter<String> gridAdapter;
-    private List<PhotoDirectoryBean> photoDirectories = new ArrayList<>();
+    private ArrayList<String> selectedPhotos;
     private ArrayList<String> allPhotoPaths = new ArrayList<>();
 
-    private ChoosePhotoActivity.OnItemPhotoCheckedListener checkedListener;
+    private OnItemPhotoCheckedListener checkedListener;
     private OnItemPhotoPreviewListener previewListener;
 
     private static final String TAG_DIRECTION_INDEX = "directionIndex";
+    private static final String TAG_SELECTED_PHOTO = "selectedPhotos";
 
-    public static PhotoGridFragment newInstance(int directionIndex) {
+    public static PhotoGridFragment newInstance(int directionIndex, ArrayList<String> selectedPhotos) {
         Bundle bundle = new Bundle();
         bundle.putInt(TAG_DIRECTION_INDEX, directionIndex);
+        bundle.putStringArrayList(TAG_SELECTED_PHOTO, selectedPhotos);
         PhotoGridFragment fragment = new PhotoGridFragment();
         fragment.setArguments(bundle);
         return fragment;
@@ -55,10 +60,6 @@ public static PhotoGridFragment newInstance(int directionIndex) {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        if (getActivity() instanceof ChoosePhotoActivity) {
-            ChoosePhotoActivity context = ((ChoosePhotoActivity) getActivity());
-            context.updateViewVisible(context.FRAGMENT_TAG_GRID);
-        }
         mContentView = inflater.inflate(R.layout.fragment_photo_grid_layout, null);
         return mContentView;
     }
@@ -72,12 +73,17 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
     protected void getViews() {
         photoGrid = mContentView.findViewById(R.id.photo_grid);
+        loadingLayout = mContentView.findViewById(R.id.loading_layout);
     }
 
     protected void initFragment() {
-        final int directionIndex = getArguments().getInt(TAG_DIRECTION_INDEX, 0);
+        Bundle bundle = getArguments();
+        if (bundle != null) {
+            directionIndex = bundle.getInt(TAG_DIRECTION_INDEX, 0);
+            selectedPhotos = bundle.getStringArrayList(TAG_SELECTED_PHOTO);
+        }
 
-        PhotoManager.getInstance().getAllPhotos(getActivity(), new PhotoManager.OnPhotoDirectoryLoadListener() {
+        PhotoManager.getInstance().loadAllPhotos(getActivity(), new PhotoManager.OnPhotoDirectoryLoadListener() {
             @Override
             public void onCompleted(List<PhotoDirectoryBean> directoryList) {
                 if (directoryList != null && directionIndex < directoryList.size()) {
@@ -89,43 +95,32 @@ public void onCompleted(List<PhotoDirectoryBean> directoryList) {
         });
 
         photoGrid.setLayoutTransition(new LayoutTransition());
-        photoGrid.setOnScrollListener(new AbsListView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(AbsListView absListView, int state) {
-                scrollState = state;
-            }
-
-            @Override
-            public void onScroll(AbsListView absListView, int i, int i1, int i2) {
-
-            }
-        });
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        //startPostponedEnterTransition();
+        startPostponedEnterTransition();
     }
 
     private void setPhotoAdapter() {
+        loadingLayout.setVisibility(View.GONE);
         if (gridAdapter == null) {
             imageSize = (DisplayUtil.getScreenWidth() - DisplayUtil.dpToPx(32)) / 3;
             final FrameLayout.LayoutParams itemParams = new FrameLayout.LayoutParams(imageSize, imageSize);
             gridAdapter = new CommonAdapter<String>(getActivity(), allPhotoPaths, R.layout.item_photo_grid_layout) {
                 @Override
                 public void convert(final ViewHolder holder, final String params) {
-                    //if (scrollState == AbsListView.OnScrollListener.SCROLL_STATE_IDLE) {
                     final WrapImageView photoIcon = (WrapImageView) holder.getView(R.id.photo);
                     final ImageView checkIcon = (ImageView) holder.getView(R.id.check_box);
-                    ImageLoaderManager.getInstance().displayImage("file://" + params, photoIcon);
+                    ImageLoaderManager.getInstance().displayImage("file://" + params, photoIcon, imageSize, imageSize);
                     photoIcon.setLayoutParams(itemParams);
-                    if (((ChoosePhotoActivity)getActivity()).selectedPhotos.contains(params)) {
+                    if (selectedPhotos != null && selectedPhotos.contains(params)) {
                         checkIcon.setSelected(true);
                     } else {
                         checkIcon.setSelected(false);
                     }
-                    ViewCompat.setTransitionName(photoIcon, "Preview00" + holder.getPosition());
+                    ViewCompat.setTransitionName(photoIcon, "Preview_" + holder.getPosition());
                     photoIcon.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
@@ -144,11 +139,13 @@ public void onClick(View v) {
                     });
                 }
             };
+            photoGrid.setAdapter(gridAdapter);
+        } else {
+            gridAdapter.notifyDataSetChanged();
         }
-        photoGrid.setAdapter(gridAdapter);
     }
 
-    public void setOnItemPhotoCheckedListener(ChoosePhotoActivity.OnItemPhotoCheckedListener listener) {
+    public void setOnItemPhotoCheckedListener(OnItemPhotoCheckedListener listener) {
         this.checkedListener = listener;
     }
 
diff --git a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoListFragment.java b/imageset/src/main/java/com/sxu/smartpicture/album/fragment/PhotoListFragment.java
similarity index 89%
rename from imageset/src/main/java/com/sxu/smartpicture/album/PhotoListFragment.java
rename to imageset/src/main/java/com/sxu/smartpicture/album/fragment/PhotoListFragment.java
index 34fb43b..ee4c788 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoListFragment.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/album/fragment/PhotoListFragment.java
@@ -1,4 +1,4 @@
-package com.sxu.smartpicture.album;
+package com.sxu.smartpicture.album.fragment;
 
 import android.net.Uri;
 import android.os.Bundle;
@@ -11,9 +11,12 @@
 import android.widget.AdapterView;
 import android.widget.ListView;
 
-import com.sxu.imageloader.ImageLoaderManager;
-import com.sxu.imageloader.WrapImageView;
 import com.sxu.smartpicture.R;
+import com.sxu.smartpicture.album.CommonAdapter;
+import com.sxu.smartpicture.album.PhotoDirectoryBean;
+import com.sxu.smartpicture.album.PhotoManager;
+import com.sxu.smartpicture.imageloader.ImageLoaderManager;
+import com.sxu.smartpicture.imageloader.WrapImageView;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -45,10 +48,6 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if (getActivity() instanceof ChoosePhotoActivity) {
-            ChoosePhotoActivity context = ((ChoosePhotoActivity) getActivity());
-            context.updateViewVisible(context.FRAGMENT_TAG_LIST);
-        }
         getViews();
         initFragment();
     }
@@ -58,7 +57,7 @@ protected void getViews() {
     }
 
     protected void initFragment() {
-        PhotoManager.getInstance().getAllPhotos(getActivity(), new PhotoManager.OnPhotoDirectoryLoadListener() {
+        PhotoManager.getInstance().loadAllPhotos(getActivity(), new PhotoManager.OnPhotoDirectoryLoadListener() {
             @Override
             public void onCompleted(List<PhotoDirectoryBean> directoryList) {
                 photoDirectories.clear();
diff --git a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoPreviewFragment.java b/imageset/src/main/java/com/sxu/smartpicture/album/fragment/PhotoPreviewFragment.java
similarity index 59%
rename from imageset/src/main/java/com/sxu/smartpicture/album/PhotoPreviewFragment.java
rename to imageset/src/main/java/com/sxu/smartpicture/album/fragment/PhotoPreviewFragment.java
index 2c7c655..5f99c39 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/album/PhotoPreviewFragment.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/album/fragment/PhotoPreviewFragment.java
@@ -1,4 +1,4 @@
-package com.sxu.smartpicture.album;
+package com.sxu.smartpicture.album.fragment;
 
 
 import android.os.Build;
@@ -11,26 +11,29 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 
-import com.sxu.imageloader.ImageLoaderManager;
-import com.sxu.imageloader.WrapImageView;
-import com.sxu.smartpicture.utils.DisplayUtil;
 import com.sxu.smartpicture.R;
+import com.sxu.smartpicture.album.listener.OnItemPhotoCheckedListener;
+import com.sxu.smartpicture.imageloader.ImageLoaderManager;
 import com.sxu.smartpicture.zoomimage.ZoomImageView;
 
 import java.util.ArrayList;
 
-/**
- * Created by Freeman on 17/3/31.
- */
-
+/*******************************************************************************
+ * Description: 图片预览
+ *
+ * Author: Freeman
+ *
+ * Date: 2018/03/31
+ *
+ * Copyright: all rights reserved by Freeman.
+ *******************************************************************************/
 public class PhotoPreviewFragment extends Fragment {
 
 	private ViewPager mViewPager;
 
+	private OnPagerChangedListener listener;
 	private ArrayList<String> allPhotoPath;
-	private ChoosePhotoActivity.OnItemPhotoCheckedListener checkedListener;
 
 	public static PhotoPreviewFragment getInstance(int currentIndex, ArrayList<String> allPhotoPath) {
 		PhotoPreviewFragment fragment = new PhotoPreviewFragment();
@@ -52,30 +55,17 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
 		super.onViewCreated(view, savedInstanceState);
 		Bundle bundle = getArguments();
-		final ChoosePhotoActivity context = (ChoosePhotoActivity) getActivity();
-		if (bundle != null) {
-			allPhotoPath = bundle.getStringArrayList("allPhotoPath");
-			if (allPhotoPath != null && allPhotoPath.size() > 0) {
-				mViewPager.setAdapter(new PhotoAdapter());
-				int currentIndex = bundle.getInt("currentIndex");
-				mViewPager.setCurrentItem(currentIndex);
-				context.setCheckIconStatus(allPhotoPath.get(currentIndex));
-			}
+		if (bundle == null) {
+			return;
 		}
-
-		if (getActivity() instanceof ChoosePhotoActivity) {
-			((ChoosePhotoActivity) getActivity()).checkIcon.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					if (checkedListener != null) {
-						checkedListener.onItemChecked(context.checkIcon, !v.isSelected(),
-								allPhotoPath.get(mViewPager.getCurrentItem()));
-					}
-				}
-			});
+		allPhotoPath = bundle.getStringArrayList("allPhotoPath");
+		if (allPhotoPath != null && allPhotoPath.size() > 0) {
+			mViewPager.setAdapter(new PhotoAdapter());
+			int currentIndex = bundle.getInt("currentIndex");
+			mViewPager.setCurrentItem(currentIndex);
 		}
 
-		mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+		final ViewPager.OnPageChangeListener pagerListener = new ViewPager.OnPageChangeListener() {
 			@Override
 			public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
 
@@ -83,18 +73,27 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
 
 			@Override
 			public void onPageSelected(int position) {
-				context.setCheckIconStatus(allPhotoPath.get(position));
+				if (listener != null) {
+					listener.onChanged(position, allPhotoPath.get(position));
+				}
 			}
 
 			@Override
 			public void onPageScrollStateChanged(int state) {
 
 			}
+		};
+		mViewPager.addOnPageChangeListener(pagerListener);
+		mViewPager.post(new Runnable() {
+			@Override
+			public void run() {
+				pagerListener.onPageSelected(mViewPager.getCurrentItem());
+			}
 		});
 	}
 
-	public void setOnItemPhotoCheckedListener(ChoosePhotoActivity.OnItemPhotoCheckedListener listener) {
-		this.checkedListener = listener;
+	public void setOnPagerChangeListener(OnPagerChangedListener listener) {
+		this.listener = listener;
 	}
 
 	private class PhotoAdapter extends PagerAdapter {
@@ -114,9 +113,9 @@ public int getCount() {
 		public Object instantiateItem(@NonNull ViewGroup container, int position) {
 			ZoomImageView imageView = new ZoomImageView(getActivity());
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-				imageView.setTransitionName("Preview" + position);
+				imageView.setTransitionName("Preview_" + position);
 			}
-			ImageLoaderManager.getInstance().displayImage(allPhotoPath.get(position), imageView);
+			ImageLoaderManager.getInstance().displayImage("file://" + allPhotoPath.get(position), imageView);
 			container.addView(imageView);
 
 			return imageView;
@@ -124,7 +123,11 @@ public Object instantiateItem(@NonNull ViewGroup container, int position) {
 
 		@Override
 		public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+			container.removeView((View) object);
 		}
+	}
 
+	public interface OnPagerChangedListener {
+		void onChanged(int position, String currentPhoto);
 	}
 }
diff --git a/imageset/src/main/java/com/sxu/smartpicture/album/listener/OnItemPhotoCheckedListener.java b/imageset/src/main/java/com/sxu/smartpicture/album/listener/OnItemPhotoCheckedListener.java
new file mode 100644
index 0000000..ee1064e
--- /dev/null
+++ b/imageset/src/main/java/com/sxu/smartpicture/album/listener/OnItemPhotoCheckedListener.java
@@ -0,0 +1,17 @@
+package com.sxu.smartpicture.album.listener;
+
+import android.widget.ImageView;
+
+/*******************************************************************************
+ * Description: 图片被选择的监听
+ *
+ * Author: Freeman
+ *
+ * Date: 2018/12/19
+ *
+ * Copyright: all rights reserved by Freeman.
+ *******************************************************************************/
+public interface OnItemPhotoCheckedListener {
+
+	void onItemChecked(ImageView checkIcon, boolean isSelected, String photoPath);
+}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/album/listener/OnSelectPhotoListener.java b/imageset/src/main/java/com/sxu/smartpicture/album/listener/OnSelectPhotoListener.java
new file mode 100644
index 0000000..82f38fa
--- /dev/null
+++ b/imageset/src/main/java/com/sxu/smartpicture/album/listener/OnSelectPhotoListener.java
@@ -0,0 +1,19 @@
+package com.sxu.smartpicture.album.listener;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/*******************************************************************************
+ * Description: 选择图片监听器
+ *
+ * Author: Freeman
+ *
+ * Date: 2018/12/17
+ *
+ * Copyright: all rights reserved by Freeman.
+ *******************************************************************************/
+public interface OnSelectPhotoListener {
+
+	void onSelected(ArrayList<String> selectedPhotoList);
+}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/choosePicture/ChoosePhotoDialog.java b/imageset/src/main/java/com/sxu/smartpicture/choosepicture/ChoosePhotoDialog.java
similarity index 98%
rename from imageset/src/main/java/com/sxu/smartpicture/choosePicture/ChoosePhotoDialog.java
rename to imageset/src/main/java/com/sxu/smartpicture/choosepicture/ChoosePhotoDialog.java
index 3e5ffa5..dfc6036 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/choosePicture/ChoosePhotoDialog.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/choosepicture/ChoosePhotoDialog.java
@@ -1,4 +1,4 @@
-package com.sxu.smartpicture.choosePicture;
+package com.sxu.smartpicture.choosepicture;
 
 import android.app.AlertDialog;
 import android.content.Context;
diff --git a/imageset/src/main/java/com/sxu/smartpicture/choosePicture/ChoosePhotoManager.java b/imageset/src/main/java/com/sxu/smartpicture/choosepicture/ChoosePhotoManager.java
similarity index 84%
rename from imageset/src/main/java/com/sxu/smartpicture/choosePicture/ChoosePhotoManager.java
rename to imageset/src/main/java/com/sxu/smartpicture/choosepicture/ChoosePhotoManager.java
index 07ba0c2..0f7d326 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/choosePicture/ChoosePhotoManager.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/choosepicture/ChoosePhotoManager.java
@@ -1,4 +1,4 @@
-package com.sxu.smartpicture.choosePicture;
+package com.sxu.smartpicture.choosepicture;
 
 import android.Manifest;
 import android.app.Activity;
@@ -8,12 +8,9 @@
 import android.os.Environment;
 import android.os.StrictMode;
 import android.provider.MediaStore;
-import android.support.v4.content.ContextCompat;
 import android.util.Log;
-import android.widget.Toast;
 
-import com.sxu.smartpicture.R;
-import com.sxu.smartpicture.utils.PermissionUtil;
+import com.sxu.permission.CheckPermission;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -51,6 +48,11 @@ public static ChoosePhotoManager getInstance() {
 	}
 
 	public void choosePhotoFromAlbum(Activity activity) {
+		choosePhotoFromAlbum(activity, false);
+	}
+
+	public void choosePhotoFromAlbum(Activity activity, boolean autoCrop) {
+		this.autoCrop = autoCrop;
 		Intent intent = new Intent(Intent.ACTION_PICK, null);
 		intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*");
 		if (intent.resolveActivity(activity.getPackageManager()) != null) {
@@ -58,23 +60,13 @@ public void choosePhotoFromAlbum(Activity activity) {
 		}
 	}
 
-	public void choosePhotoFromCamera(final Activity activity) {
-		if (!PermissionUtil.checkPermission(activity, Manifest.permission.CAMERA)) {
-			PermissionUtil.setPermissionRequestListener(
-					activity.getResources().getString(R.string.camera_permission_desc),
-					activity.getResources().getString(R.string.camera_permission_setting_desc),
-					new PermissionUtil.OnPermissionRequestListener() {
-				@Override
-				public void onGranted() {
-					takePicture(activity);
-				}
-			});
-		} else {
-			takePicture(activity);
-		}
+	public void takePicture(Activity activity) {
+		takePicture(activity, false);
 	}
 
-	private void takePicture(Activity activity) {
+	@CheckPermission(permissions = {Manifest.permission.CAMERA}, permissionDesc = "此功能需要相机权限才可使用")
+	public void takePicture(Activity activity, boolean autoCrop) {
+		this.autoCrop = autoCrop;
 		Date date = new Date();
 		String fileName = "IMG_" + new SimpleDateFormat("yyyyMMddHHmmss").format(date);
 		Log.i("out", "rootPath=" + Environment.getExternalStorageDirectory() + " cahce==" + activity.getCacheDir());
@@ -152,6 +144,10 @@ public void onActivityResult(Activity activity, int requestCode, Intent intent)
 		}
 	}
 
+	/**
+	 * 选择照片或者拍照后是否需要裁剪
+	 * @param autoCrop
+	 */
 	public void setAutoCrop(boolean autoCrop) {
 		this.autoCrop = autoCrop;
 	}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/choosePicture/OnChoosePhotoListener.java b/imageset/src/main/java/com/sxu/smartpicture/choosepicture/OnChoosePhotoListener.java
similarity index 89%
rename from imageset/src/main/java/com/sxu/smartpicture/choosePicture/OnChoosePhotoListener.java
rename to imageset/src/main/java/com/sxu/smartpicture/choosepicture/OnChoosePhotoListener.java
index 5402e32..47a4ea5 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/choosePicture/OnChoosePhotoListener.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/choosepicture/OnChoosePhotoListener.java
@@ -1,4 +1,4 @@
-package com.sxu.smartpicture.choosePicture;
+package com.sxu.smartpicture.choosepicture;
 
 import android.net.Uri;
 
diff --git a/imageset/src/main/java/com/sxu/smartpicture/choosepicture/OnSimpleChoosePhotoListener.java b/imageset/src/main/java/com/sxu/smartpicture/choosepicture/OnSimpleChoosePhotoListener.java
new file mode 100644
index 0000000..9a398d1
--- /dev/null
+++ b/imageset/src/main/java/com/sxu/smartpicture/choosepicture/OnSimpleChoosePhotoListener.java
@@ -0,0 +1,30 @@
+package com.sxu.smartpicture.choosepicture;
+
+import android.net.Uri;
+
+/*******************************************************************************
+ * Description: 
+ *
+ * Author: Freeman
+ *
+ * Date: 2018/12/17
+ *
+ * Copyright: all rights reserved by Freeman.
+ *******************************************************************************/
+public abstract class OnSimpleChoosePhotoListener implements OnChoosePhotoListener {
+
+	@Override
+	public void choosePhotoFromAlbum(Uri uri) {
+
+	}
+
+	@Override
+	public void choosePhotoFromCamera(Uri uri) {
+
+	}
+
+	@Override
+	public void cropPhoto(Uri uri) {
+
+	}
+}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/imageloader/transform/GlideBlurTransform.java b/imageset/src/main/java/com/sxu/smartpicture/imageloader/transform/GlideBlurTransform.java
new file mode 100644
index 0000000..9e9e459
--- /dev/null
+++ b/imageset/src/main/java/com/sxu/smartpicture/imageloader/transform/GlideBlurTransform.java
@@ -0,0 +1,47 @@
+package com.sxu.smartpicture.imageloader.transform;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.support.annotation.NonNull;
+
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+import com.sxu.smartpicture.imageloader.utils.DiskLruCacheManager;
+import com.sxu.smartpicture.imageloader.utils.FastBlurUtil;
+
+import java.security.MessageDigest;
+
+/**
+
+ * 类或接口的描述信息
+ *
+ * @author Freeman
+ * @date 2017/12/19
+ */
+
+
+public class GlideBlurTransform extends BitmapTransformation {
+
+	private String key;
+	private Context context;
+	private int blurRadius;
+
+	public GlideBlurTransform(Context context, String key, int blurRadius) {
+		this.context = context;
+		this.key = key;
+		this.blurRadius = blurRadius;
+	}
+
+	@Override
+	protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) {
+		Bitmap bitmap =  FastBlurUtil.doBlur(toTransform, 8, blurRadius);
+		// 缓存高斯模糊图片
+		DiskLruCacheManager.getInstance(context).put(key, bitmap);
+		return bitmap;
+	}
+
+	@Override
+	public void updateDiskCacheKey(MessageDigest messageDigest) {
+
+	}
+}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/utils/GlideCircleBitmapTransform.java b/imageset/src/main/java/com/sxu/smartpicture/imageloader/transform/GlideCircleBitmapTransform.java
similarity index 73%
rename from imageset/src/main/java/com/sxu/smartpicture/utils/GlideCircleBitmapTransform.java
rename to imageset/src/main/java/com/sxu/smartpicture/imageloader/transform/GlideCircleBitmapTransform.java
index fcc6e5a..e3ee486 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/utils/GlideCircleBitmapTransform.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/imageloader/transform/GlideCircleBitmapTransform.java
@@ -1,19 +1,22 @@
-package com.sxu.smartpicture.utils;
+package com.sxu.smartpicture.imageloader.transform;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Shader;
 import android.support.annotation.NonNull;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+import com.sxu.smartpicture.imageloader.utils.DiskLruCacheManager;
 
 import java.security.MessageDigest;
 
 /**
+
+ * 类或接口的描述信息
+ *
  * @author Freeman
  * @date 2017/12/19
  */
@@ -23,12 +26,12 @@ public class GlideCircleBitmapTransform extends BitmapTransformation {
 
 	private int mBorderWidth;
 	private int mBorderColor;
+	private String mKey;
+	private Context mContext;
 
-	public GlideCircleBitmapTransform() {
-
-	}
-
-	public GlideCircleBitmapTransform(int borderWidth, int borderColor) {
+	public GlideCircleBitmapTransform(Context context, String key, int borderWidth, int borderColor) {
+		this.mContext = context;
+		this.mKey = key;
 		this.mBorderWidth = borderWidth;
 		this.mBorderColor = borderColor;
 	}
@@ -41,9 +44,9 @@ protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform
 		int newSize = size - mBorderWidth * 2;
 		int radius = newSize / 2;
 		Bitmap bitmap = Bitmap.createBitmap(toTransform, x, y, newSize, newSize);
-		Bitmap result = pool.get(newSize, newSize, Bitmap.Config.ARGB_8888);
+		Bitmap result = pool.get(newSize, newSize, toTransform.getConfig());
 		if (result == null) {
-			result = Bitmap.createBitmap(newSize, newSize, Bitmap.Config.ARGB_8888);
+			result = Bitmap.createBitmap(newSize, newSize, toTransform.getConfig());
 		}
 
 		Canvas canvas = new Canvas(result);
@@ -56,10 +59,12 @@ protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform
 			canvas.drawCircle(radius, radius, radius - mBorderWidth/2, borderPaint);
 		}
 		Paint paint = new Paint();
-		paint.setShader(new BitmapShader(bitmap, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP ));
+		paint.setShader(new BitmapShader(bitmap, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
 		paint.setAntiAlias(true);
 		canvas.drawCircle(radius, radius, radius - mBorderWidth, paint);
 
+		DiskLruCacheManager.getInstance(mContext).put(mKey, result);
+
 		return result;
 	}
 
diff --git a/imageset/src/main/java/com/sxu/smartpicture/utils/GlideRoundBitmapTransform.java b/imageset/src/main/java/com/sxu/smartpicture/imageloader/transform/GlideRoundBitmapTransform.java
similarity index 74%
rename from imageset/src/main/java/com/sxu/smartpicture/utils/GlideRoundBitmapTransform.java
rename to imageset/src/main/java/com/sxu/smartpicture/imageloader/transform/GlideRoundBitmapTransform.java
index abf8f8d..aea65b9 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/utils/GlideRoundBitmapTransform.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/imageloader/transform/GlideRoundBitmapTransform.java
@@ -1,19 +1,23 @@
-package com.sxu.smartpicture.utils;
+package com.sxu.smartpicture.imageloader.transform;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+import com.sxu.smartpicture.imageloader.utils.DiskLruCacheManager;
 
 import java.security.MessageDigest;
 
 /**
+
+ * 类或接口的描述信息
+ *
  * @author Freeman
  * @date 2017/12/19
  */
@@ -24,12 +28,12 @@ public class GlideRoundBitmapTransform extends BitmapTransformation {
 	private int mRadius;
 	private int mBorderWidth;
 	private int mBorderColor;
+	private String mKey;
+	private Context mContext;
 
-	public GlideRoundBitmapTransform() {
-
-	}
-
-	public GlideRoundBitmapTransform(int radius, int borderWidth, int borderColor) {
+	public GlideRoundBitmapTransform(Context context, String key, int radius, int borderWidth, int borderColor) {
+		this.mContext = context;
+		this.mKey = key;
 		this.mRadius = radius;
 		this.mBorderWidth = borderWidth;
 		this.mBorderColor = borderColor;
@@ -43,9 +47,9 @@ protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform
 		int width = toTransform.getWidth();
 		int height = toTransform.getHeight();
 		RectF rectF = new RectF(mBorderWidth, mBorderWidth, width - mBorderWidth, height - mBorderWidth);
-		Bitmap result = pool.get(width, height, Bitmap.Config.ARGB_8888);
+		Bitmap result = pool.get(width, height, toTransform.getConfig());
 		if (result == null) {
-			result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+			result = toTransform.copy(toTransform.getConfig(), true);
 		}
 		Canvas canvas = new Canvas(result);
 		Paint paint = new Paint();
@@ -60,6 +64,7 @@ protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform
 			borderPaint.setAntiAlias(true);
 			canvas.drawRoundRect(rectF, mRadius, mRadius, borderPaint);
 		}
+		DiskLruCacheManager.getInstance(mContext).put(mKey, result);
 
 		return result;
 	}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/DiskLruCache.java b/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/DiskLruCache.java
new file mode 100644
index 0000000..942b64f
--- /dev/null
+++ b/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/DiskLruCache.java
@@ -0,0 +1,974 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.sxu.smartpicture.imageloader.utils;
+
+import java.io.BufferedWriter;
+import java.io.Closeable;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * A cache that uses a bounded amount of space on a filesystem. Each cache
+ * entry has a string key and a fixed number of values. Each key must match
+ * the regex <strong>[a-z0-9_-]{1,64}</strong>. Values are byte sequences,
+ * accessible as streams or files. Each value must be between {@code 0} and
+ * {@code Integer.MAX_VALUE} bytes in length.
+ *
+ * <p>The cache stores its data in a directory on the filesystem. This
+ * directory must be exclusive to the cache; the cache may delete or overwrite
+ * files from its directory. It is an error for multiple processes to use the
+ * same cache directory at the same time.
+ *
+ * <p>This cache limits the number of bytes that it will store on the
+ * filesystem. When the number of stored bytes exceeds the limit, the cache will
+ * remove entries in the background until the limit is satisfied. The limit is
+ * not strict: the cache may temporarily exceed it while waiting for files to be
+ * deleted. The limit does not include filesystem overhead or the cache
+ * journal so space-sensitive applications should set a conservative limit.
+ *
+ * <p>Clients call {@link #edit} to create or update the values of an entry. An
+ * entry may have only one editor at one time; if a value is not available to be
+ * edited then {@link #edit} will return null.
+ * <ul>
+ * <li>When an entry is being <strong>created</strong> it is necessary to
+ * supply a full set of values; the empty value should be used as a
+ * placeholder if necessary.
+ * <li>When an entry is being <strong>edited</strong>, it is not necessary
+ * to supply data for every value; values default to their previous
+ * value.
+ * </ul>
+ * Every {@link #edit} call must be matched by a call to {@link Editor#commit}
+ * or {@link Editor#abort}. Committing is atomic: a read observes the full set
+ * of values as they were before or after the commit, but never a mix of values.
+ *
+ * <p>Clients call {@link #get} to read a snapshot of an entry. The read will
+ * observe the value at the time that {@link #get} was called. Updates and
+ * removals after the call do not impact ongoing reads.
+ *
+ * <p>This class is tolerant of some I/O errors. If files are missing from the
+ * filesystem, the corresponding entries will be dropped from the cache. If
+ * an error occurs while writing a cache value, the edit will fail silently.
+ * Callers should handle other problems by catching {@code IOException} and
+ * responding appropriately.
+ */
+final class DiskLruCache implements Closeable {
+	static final String JOURNAL_FILE = "journal";
+	static final String JOURNAL_FILE_TEMP = "journal.tmp";
+	static final String JOURNAL_FILE_BACKUP = "journal.bkp";
+	static final String MAGIC = "libcore.io.DiskLruCache";
+	static final String VERSION_1 = "1";
+	static final long ANY_SEQUENCE_NUMBER = -1;
+	static final Pattern LEGAL_KEY_PATTERN = Pattern.compile("[a-z0-9_-]{1,64}");
+	private static final String CLEAN = "CLEAN";
+	private static final String DIRTY = "DIRTY";
+	private static final String REMOVE = "REMOVE";
+	private static final String READ = "READ";
+
+    /*
+     * This cache uses a journal file named "journal". A typical journal file
+     * looks like this:
+     *     libcore.io.DiskLruCache
+     *     1
+     *     100
+     *     2
+     *
+     *     CLEAN 3400330d1dfc7f3f7f4b8d4d803dfcf6 832 21054
+     *     DIRTY 335c4c6028171cfddfbaae1a9c313c52
+     *     CLEAN 335c4c6028171cfddfbaae1a9c313c52 3934 2342
+     *     REMOVE 335c4c6028171cfddfbaae1a9c313c52
+     *     DIRTY 1ab96a171faeeee38496d8b330771a7a
+     *     CLEAN 1ab96a171faeeee38496d8b330771a7a 1600 234
+     *     READ 335c4c6028171cfddfbaae1a9c313c52
+     *     READ 3400330d1dfc7f3f7f4b8d4d803dfcf6
+     *
+     * The first five lines of the journal form its header. They are the
+     * constant string "libcore.io.DiskLruCache", the disk cache's version,
+     * the application's version, the value count, and a blank line.
+     *
+     * Each of the subsequent lines in the file is a record of the state of a
+     * cache entry. Each line contains space-separated values: a state, a key,
+     * and optional state-specific values.
+     *   o DIRTY lines track that an entry is actively being created or updated.
+     *     Every successful DIRTY action should be followed by a CLEAN or REMOVE
+     *     action. DIRTY lines without a matching CLEAN or REMOVE indicate that
+     *     temporary files may need to be deleted.
+     *   o CLEAN lines track a cache entry that has been successfully published
+     *     and may be read. A publish line is followed by the lengths of each of
+     *     its values.
+     *   o READ lines track accesses for LRU.
+     *   o REMOVE lines track entries that have been deleted.
+     *
+     * The journal file is appended to as cache operations occur. The journal may
+     * occasionally be compacted by dropping redundant lines. A temporary file named
+     * "journal.tmp" will be used during compaction; that file should be deleted if
+     * it exists when the cache is opened.
+     */
+
+	private final File directory;
+	private final File journalFile;
+	private final File journalFileTmp;
+	private final File journalFileBackup;
+	private final int appVersion;
+	private long maxSize;
+	private int maxFileCount;
+	private final int valueCount;
+	private long size = 0;
+	private int fileCount = 0;
+	private Writer journalWriter;
+	private final LinkedHashMap<String, Entry> lruEntries =
+			new LinkedHashMap<String, Entry>(0, 0.75f, true);
+	private int redundantOpCount;
+
+	/**
+	 * To differentiate between old and current snapshots, each entry is given
+	 * a sequence number each time an edit is committed. A snapshot is stale if
+	 * its sequence number is not equal to its entry's sequence number.
+	 */
+	private long nextSequenceNumber = 0;
+
+	/** This cache uses a single background thread to evict entries. */
+	final ThreadPoolExecutor executorService =
+			new ThreadPoolExecutor(0, 1, 60L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
+	private final Callable<Void> cleanupCallable = new Callable<Void>() {
+		public Void call() throws Exception {
+			synchronized (DiskLruCache.this) {
+				if (journalWriter == null) {
+					return null; // Closed.
+				}
+				trimToSize();
+				trimToFileCount();
+				if (journalRebuildRequired()) {
+					rebuildJournal();
+					redundantOpCount = 0;
+				}
+			}
+			return null;
+		}
+	};
+
+	private DiskLruCache(File directory, int appVersion, int valueCount, long maxSize, int maxFileCount) {
+		this.directory = directory;
+		this.appVersion = appVersion;
+		this.journalFile = new File(directory, JOURNAL_FILE);
+		this.journalFileTmp = new File(directory, JOURNAL_FILE_TEMP);
+		this.journalFileBackup = new File(directory, JOURNAL_FILE_BACKUP);
+		this.valueCount = valueCount;
+		this.maxSize = maxSize;
+		this.maxFileCount = maxFileCount;
+	}
+
+	/**
+	 * Opens the cache in {@code directory}, creating a cache if none exists
+	 * there.
+	 *
+	 * @param directory a writable directory
+	 * @param valueCount the number of values per cache entry. Must be positive.
+	 * @param maxSize the maximum number of bytes this cache should use to store
+	 * @param maxFileCount the maximum file count this cache should store
+	 * @throws IOException if reading or writing the cache directory fails
+	 */
+	public static DiskLruCache open(File directory, int appVersion, int valueCount, long maxSize, int maxFileCount)
+			throws IOException {
+		if (maxSize <= 0) {
+			throw new IllegalArgumentException("maxSize <= 0");
+		}
+		if (maxFileCount <= 0) {
+			throw new IllegalArgumentException("maxFileCount <= 0");
+		}
+		if (valueCount <= 0) {
+			throw new IllegalArgumentException("valueCount <= 0");
+		}
+
+		// If a bkp file exists, use it instead.
+		File backupFile = new File(directory, JOURNAL_FILE_BACKUP);
+		if (backupFile.exists()) {
+			File journalFile = new File(directory, JOURNAL_FILE);
+			// If journal file also exists just delete backup file.
+			if (journalFile.exists()) {
+				backupFile.delete();
+			} else {
+				renameTo(backupFile, journalFile, false);
+			}
+		}
+
+		// Prefer to pick up where we left off.
+		DiskLruCache cache = new DiskLruCache(directory, appVersion, valueCount, maxSize, maxFileCount);
+		if (cache.journalFile.exists()) {
+			try {
+				cache.readJournal();
+				cache.processJournal();
+				cache.journalWriter = new BufferedWriter(
+						new OutputStreamWriter(new FileOutputStream(cache.journalFile, true), Util.US_ASCII));
+				return cache;
+			} catch (IOException journalIsCorrupt) {
+				System.out
+						.println("DiskLruCache "
+								+ directory
+								+ " is corrupt: "
+								+ journalIsCorrupt.getMessage()
+								+ ", removing");
+				cache.delete();
+			}
+		}
+
+		// Create a new empty cache.
+		directory.mkdirs();
+		cache = new DiskLruCache(directory, appVersion, valueCount, maxSize, maxFileCount);
+		cache.rebuildJournal();
+		return cache;
+	}
+
+	private void readJournal() throws IOException {
+		StrictLineReader reader = new StrictLineReader(new FileInputStream(journalFile), Util.US_ASCII);
+		try {
+			String magic = reader.readLine();
+			String version = reader.readLine();
+			String appVersionString = reader.readLine();
+			String valueCountString = reader.readLine();
+			String blank = reader.readLine();
+			if (!MAGIC.equals(magic)
+					|| !VERSION_1.equals(version)
+					|| !Integer.toString(appVersion).equals(appVersionString)
+					|| !Integer.toString(valueCount).equals(valueCountString)
+					|| !"".equals(blank)) {
+				throw new IOException("unexpected journal header: [" + magic + ", " + version + ", "
+						+ valueCountString + ", " + blank + "]");
+			}
+
+			int lineCount = 0;
+			while (true) {
+				try {
+					readJournalLine(reader.readLine());
+					lineCount++;
+				} catch (EOFException endOfJournal) {
+					break;
+				}
+			}
+			redundantOpCount = lineCount - lruEntries.size();
+		} finally {
+			Util.closeQuietly(reader);
+		}
+	}
+
+	private void readJournalLine(String line) throws IOException {
+		int firstSpace = line.indexOf(' ');
+		if (firstSpace == -1) {
+			throw new IOException("unexpected journal line: " + line);
+		}
+
+		int keyBegin = firstSpace + 1;
+		int secondSpace = line.indexOf(' ', keyBegin);
+		final String key;
+		if (secondSpace == -1) {
+			key = line.substring(keyBegin);
+			if (firstSpace == REMOVE.length() && line.startsWith(REMOVE)) {
+				lruEntries.remove(key);
+				return;
+			}
+		} else {
+			key = line.substring(keyBegin, secondSpace);
+		}
+
+		Entry entry = lruEntries.get(key);
+		if (entry == null) {
+			entry = new Entry(key);
+			lruEntries.put(key, entry);
+		}
+
+		if (secondSpace != -1 && firstSpace == CLEAN.length() && line.startsWith(CLEAN)) {
+			String[] parts = line.substring(secondSpace + 1).split(" ");
+			entry.readable = true;
+			entry.currentEditor = null;
+			entry.setLengths(parts);
+		} else if (secondSpace == -1 && firstSpace == DIRTY.length() && line.startsWith(DIRTY)) {
+			entry.currentEditor = new Editor(entry);
+		} else if (secondSpace == -1 && firstSpace == READ.length() && line.startsWith(READ)) {
+			// This work was already done by calling lruEntries.get().
+		} else {
+			throw new IOException("unexpected journal line: " + line);
+		}
+	}
+
+	/**
+	 * Computes the initial size and collects garbage as a part of opening the
+	 * cache. Dirty entries are assumed to be inconsistent and will be deleted.
+	 */
+	private void processJournal() throws IOException {
+		deleteIfExists(journalFileTmp);
+		for (Iterator<Entry> i = lruEntries.values().iterator(); i.hasNext(); ) {
+			Entry entry = i.next();
+			if (entry.currentEditor == null) {
+				for (int t = 0; t < valueCount; t++) {
+					size += entry.lengths[t];
+					fileCount++;
+				}
+			} else {
+				entry.currentEditor = null;
+				for (int t = 0; t < valueCount; t++) {
+					deleteIfExists(entry.getCleanFile(t));
+					deleteIfExists(entry.getDirtyFile(t));
+				}
+				i.remove();
+			}
+		}
+	}
+
+	/**
+	 * Creates a new journal that omits redundant information. This replaces the
+	 * current journal if it exists.
+	 */
+	private synchronized void rebuildJournal() throws IOException {
+		if (journalWriter != null) {
+			journalWriter.close();
+		}
+
+		Writer writer = new BufferedWriter(
+				new OutputStreamWriter(new FileOutputStream(journalFileTmp), Util.US_ASCII));
+		try {
+			writer.write(MAGIC);
+			writer.write("\n");
+			writer.write(VERSION_1);
+			writer.write("\n");
+			writer.write(Integer.toString(appVersion));
+			writer.write("\n");
+			writer.write(Integer.toString(valueCount));
+			writer.write("\n");
+			writer.write("\n");
+
+			for (Entry entry : lruEntries.values()) {
+				if (entry.currentEditor != null) {
+					writer.write(DIRTY + ' ' + entry.key + '\n');
+				} else {
+					writer.write(CLEAN + ' ' + entry.key + entry.getLengths() + '\n');
+				}
+			}
+		} finally {
+			writer.close();
+		}
+
+		if (journalFile.exists()) {
+			renameTo(journalFile, journalFileBackup, true);
+		}
+		renameTo(journalFileTmp, journalFile, false);
+		journalFileBackup.delete();
+
+		journalWriter = new BufferedWriter(
+				new OutputStreamWriter(new FileOutputStream(journalFile, true), Util.US_ASCII));
+	}
+
+	private static void deleteIfExists(File file) throws IOException {
+		if (file.exists() && !file.delete()) {
+			throw new IOException();
+		}
+	}
+
+	private static void renameTo(File from, File to, boolean deleteDestination) throws IOException {
+		if (deleteDestination) {
+			deleteIfExists(to);
+		}
+		if (!from.renameTo(to)) {
+			throw new IOException();
+		}
+	}
+
+	/**
+	 * Returns a snapshot of the entry named {@code key}, or null if it doesn't
+	 * exist is not currently readable. If a value is returned, it is moved to
+	 * the head of the LRU queue.
+	 */
+	public synchronized Snapshot get(String key) throws IOException {
+		checkNotClosed();
+		validateKey(key);
+		Entry entry = lruEntries.get(key);
+		if (entry == null) {
+			return null;
+		}
+
+		if (!entry.readable) {
+			return null;
+		}
+
+		// Open all streams eagerly to guarantee that we see a single published
+		// snapshot. If we opened streams lazily then the streams could come
+		// from different edits.
+		File[] files = new File[valueCount];
+		InputStream[] ins = new InputStream[valueCount];
+		try {
+			File file;
+			for (int i = 0; i < valueCount; i++) {
+				file = entry.getCleanFile(i);
+				files[i] = file;
+				ins[i] = new FileInputStream(file);
+			}
+		} catch (FileNotFoundException e) {
+			// A file must have been deleted manually!
+			for (int i = 0; i < valueCount; i++) {
+				if (ins[i] != null) {
+					Util.closeQuietly(ins[i]);
+				} else {
+					break;
+				}
+			}
+			return null;
+		}
+
+		redundantOpCount++;
+		journalWriter.append(READ + ' ' + key + '\n');
+		if (journalRebuildRequired()) {
+			executorService.submit(cleanupCallable);
+		}
+
+		return new Snapshot(key, entry.sequenceNumber, files, ins, entry.lengths);
+	}
+
+	/**
+	 * Returns an editor for the entry named {@code key}, or null if another
+	 * edit is in progress.
+	 */
+	public Editor edit(String key) throws IOException {
+		return edit(key, ANY_SEQUENCE_NUMBER);
+	}
+
+	private synchronized Editor edit(String key, long expectedSequenceNumber) throws IOException {
+		checkNotClosed();
+		validateKey(key);
+		Entry entry = lruEntries.get(key);
+		if (expectedSequenceNumber != ANY_SEQUENCE_NUMBER && (entry == null
+				|| entry.sequenceNumber != expectedSequenceNumber)) {
+			return null; // Snapshot is stale.
+		}
+		if (entry == null) {
+			entry = new Entry(key);
+			lruEntries.put(key, entry);
+		} else if (entry.currentEditor != null) {
+			return null; // Another edit is in progress.
+		}
+
+		Editor editor = new Editor(entry);
+		entry.currentEditor = editor;
+
+		// Flush the journal before creating files to prevent file leaks.
+		journalWriter.write(DIRTY + ' ' + key + '\n');
+		journalWriter.flush();
+		return editor;
+	}
+
+	/** Returns the directory where this cache stores its data. */
+	public File getDirectory() {
+		return directory;
+	}
+
+	/**
+	 * Returns the maximum number of bytes that this cache should use to store
+	 * its data.
+	 */
+	public synchronized long getMaxSize() {
+		return maxSize;
+	}
+
+	/** Returns the maximum number of files that this cache should store */
+	public synchronized int getMaxFileCount() {
+		return maxFileCount;
+	}
+
+	/**
+	 * Changes the maximum number of bytes the cache can store and queues a job
+	 * to trim the existing store, if necessary.
+	 */
+	public synchronized void setMaxSize(long maxSize) {
+		this.maxSize = maxSize;
+		executorService.submit(cleanupCallable);
+	}
+
+	/**
+	 * Returns the number of bytes currently being used to store the values in
+	 * this cache. This may be greater than the max size if a background
+	 * deletion is pending.
+	 */
+	public synchronized long size() {
+		return size;
+	}
+
+	/**
+	 * Returns the number of files currently being used to store the values in
+	 * this cache. This may be greater than the max file count if a background
+	 * deletion is pending.
+	 */
+	public synchronized long fileCount() {
+		return fileCount;
+	}
+
+	private synchronized void completeEdit(Editor editor, boolean success) throws IOException {
+		Entry entry = editor.entry;
+		if (entry.currentEditor != editor) {
+			throw new IllegalStateException();
+		}
+
+		// If this edit is creating the entry for the first time, every index must have a value.
+		if (success && !entry.readable) {
+			for (int i = 0; i < valueCount; i++) {
+				if (!editor.written[i]) {
+					editor.abort();
+					throw new IllegalStateException("Newly created entry didn't create value for index " + i);
+				}
+				if (!entry.getDirtyFile(i).exists()) {
+					editor.abort();
+					return;
+				}
+			}
+		}
+
+		for (int i = 0; i < valueCount; i++) {
+			File dirty = entry.getDirtyFile(i);
+			if (success) {
+				if (dirty.exists()) {
+					File clean = entry.getCleanFile(i);
+					dirty.renameTo(clean);
+					long oldLength = entry.lengths[i];
+					long newLength = clean.length();
+					entry.lengths[i] = newLength;
+					size = size - oldLength + newLength;
+					fileCount++;
+				}
+			} else {
+				deleteIfExists(dirty);
+			}
+		}
+
+		redundantOpCount++;
+		entry.currentEditor = null;
+		if (entry.readable | success) {
+			entry.readable = true;
+			journalWriter.write(CLEAN + ' ' + entry.key + entry.getLengths() + '\n');
+			if (success) {
+				entry.sequenceNumber = nextSequenceNumber++;
+			}
+		} else {
+			lruEntries.remove(entry.key);
+			journalWriter.write(REMOVE + ' ' + entry.key + '\n');
+		}
+		journalWriter.flush();
+
+		if (size > maxSize || fileCount > maxFileCount || journalRebuildRequired()) {
+			executorService.submit(cleanupCallable);
+		}
+	}
+
+	/**
+	 * We only rebuild the journal when it will halve the size of the journal
+	 * and eliminate at least 2000 ops.
+	 */
+	private boolean journalRebuildRequired() {
+		final int redundantOpCompactThreshold = 2000;
+		return redundantOpCount >= redundantOpCompactThreshold //
+				&& redundantOpCount >= lruEntries.size();
+	}
+
+	/**
+	 * Drops the entry for {@code key} if it exists and can be removed. Entries
+	 * actively being edited cannot be removed.
+	 *
+	 * @return true if an entry was removed.
+	 */
+	public synchronized boolean remove(String key) throws IOException {
+		checkNotClosed();
+		validateKey(key);
+		Entry entry = lruEntries.get(key);
+		if (entry == null || entry.currentEditor != null) {
+			return false;
+		}
+
+		for (int i = 0; i < valueCount; i++) {
+			File file = entry.getCleanFile(i);
+			if (file.exists() && !file.delete()) {
+				throw new IOException("failed to delete " + file);
+			}
+			size -= entry.lengths[i];
+			fileCount--;
+			entry.lengths[i] = 0;
+		}
+
+		redundantOpCount++;
+		journalWriter.append(REMOVE + ' ' + key + '\n');
+		lruEntries.remove(key);
+
+		if (journalRebuildRequired()) {
+			executorService.submit(cleanupCallable);
+		}
+
+		return true;
+	}
+
+	/** Returns true if this cache has been closed. */
+	public synchronized boolean isClosed() {
+		return journalWriter == null;
+	}
+
+	private void checkNotClosed() {
+		if (journalWriter == null) {
+			throw new IllegalStateException("cache is closed");
+		}
+	}
+
+	/** Force buffered operations to the filesystem. */
+	public synchronized void flush() throws IOException {
+		checkNotClosed();
+		trimToSize();
+		trimToFileCount();
+		journalWriter.flush();
+	}
+
+	/** Closes this cache. Stored values will remain on the filesystem. */
+	public synchronized void close() throws IOException {
+		if (journalWriter == null) {
+			return; // Already closed.
+		}
+		for (Entry entry : new ArrayList<Entry>(lruEntries.values())) {
+			if (entry.currentEditor != null) {
+				entry.currentEditor.abort();
+			}
+		}
+		trimToSize();
+		trimToFileCount();
+		journalWriter.close();
+		journalWriter = null;
+	}
+
+	private void trimToSize() throws IOException {
+		while (size > maxSize) {
+			Map.Entry<String, Entry> toEvict = lruEntries.entrySet().iterator().next();
+			remove(toEvict.getKey());
+		}
+	}
+
+	private void trimToFileCount() throws IOException {
+		while (fileCount > maxFileCount) {
+			Map.Entry<String, Entry> toEvict = lruEntries.entrySet().iterator().next();
+			remove(toEvict.getKey());
+		}
+	}
+
+	/**
+	 * Closes the cache and deletes all of its stored values. This will delete
+	 * all files in the cache directory including files that weren't created by
+	 * the cache.
+	 */
+	public void delete() throws IOException {
+		close();
+		Util.deleteContents(directory);
+	}
+
+	private void validateKey(String key) {
+		Matcher matcher = LEGAL_KEY_PATTERN.matcher(key);
+		if (!matcher.matches()) {
+			throw new IllegalArgumentException("keys must match regex [a-z0-9_-]{1,64}: \"" + key + "\"");
+		}
+	}
+
+	private static String inputStreamToString(InputStream in) throws IOException {
+		return Util.readFully(new InputStreamReader(in, Util.UTF_8));
+	}
+
+	/** A snapshot of the values for an entry. */
+	public final class Snapshot implements Closeable {
+		private final String key;
+		private final long sequenceNumber;
+		private File[] files;
+		private final InputStream[] ins;
+		private final long[] lengths;
+
+		private Snapshot(String key, long sequenceNumber, File[] files, InputStream[] ins, long[] lengths) {
+			this.key = key;
+			this.sequenceNumber = sequenceNumber;
+			this.files = files;
+			this.ins = ins;
+			this.lengths = lengths;
+		}
+
+		/**
+		 * Returns an editor for this snapshot's entry, or null if either the
+		 * entry has changed since this snapshot was created or if another edit
+		 * is in progress.
+		 */
+		public Editor edit() throws IOException {
+			return DiskLruCache.this.edit(key, sequenceNumber);
+		}
+
+		/** Returns file with the value for {@code index}. */
+		public File getFile(int index) {
+			return files[index];
+		}
+
+		/** Returns the unbuffered stream with the value for {@code index}. */
+		public InputStream getInputStream(int index) {
+			return ins[index];
+		}
+
+		/** Returns the string value for {@code index}. */
+		public String getString(int index) throws IOException {
+			return inputStreamToString(getInputStream(index));
+		}
+
+		/** Returns the byte length of the value for {@code index}. */
+		public long getLength(int index) {
+			return lengths[index];
+		}
+
+		public void close() {
+			for (InputStream in : ins) {
+				Util.closeQuietly(in);
+			}
+		}
+	}
+
+	private static final OutputStream NULL_OUTPUT_STREAM = new OutputStream() {
+		@Override
+		public void write(int b) throws IOException {
+			// Eat all writes silently. Nom nom.
+		}
+	};
+
+	/** Edits the values for an entry. */
+	public final class Editor {
+		private final Entry entry;
+		private final boolean[] written;
+		private boolean hasErrors;
+		private boolean committed;
+
+		private Editor(Entry entry) {
+			this.entry = entry;
+			this.written = (entry.readable) ? null : new boolean[valueCount];
+		}
+
+		/**
+		 * Returns an unbuffered input stream to read the last committed value,
+		 * or null if no value has been committed.
+		 */
+		public InputStream newInputStream(int index) throws IOException {
+			synchronized (DiskLruCache.this) {
+				if (entry.currentEditor != this) {
+					throw new IllegalStateException();
+				}
+				if (!entry.readable) {
+					return null;
+				}
+				try {
+					return new FileInputStream(entry.getCleanFile(index));
+				} catch (FileNotFoundException e) {
+					return null;
+				}
+			}
+		}
+
+		/**
+		 * Returns the last committed value as a string, or null if no value
+		 * has been committed.
+		 */
+		public String getString(int index) throws IOException {
+			InputStream in = newInputStream(index);
+			return in != null ? inputStreamToString(in) : null;
+		}
+
+		/**
+		 * Returns a new unbuffered output stream to write the value at
+		 * {@code index}. If the underlying output stream encounters errors
+		 * when writing to the filesystem, this edit will be aborted when
+		 * {@link #commit} is called. The returned output stream does not throw
+		 * IOExceptions.
+		 */
+		public OutputStream newOutputStream(int index) throws IOException {
+			synchronized (DiskLruCache.this) {
+				if (entry.currentEditor != this) {
+					throw new IllegalStateException();
+				}
+				if (!entry.readable) {
+					written[index] = true;
+				}
+				File dirtyFile = entry.getDirtyFile(index);
+				FileOutputStream outputStream;
+				try {
+					outputStream = new FileOutputStream(dirtyFile);
+				} catch (FileNotFoundException e) {
+					// Attempt to recreate the cache directory.
+					directory.mkdirs();
+					try {
+						outputStream = new FileOutputStream(dirtyFile);
+					} catch (FileNotFoundException e2) {
+						// We are unable to recover. Silently eat the writes.
+						return NULL_OUTPUT_STREAM;
+					}
+				}
+				return new FaultHidingOutputStream(outputStream);
+			}
+		}
+
+		/** Sets the value at {@code index} to {@code value}. */
+		public void set(int index, String value) throws IOException {
+			Writer writer = null;
+			try {
+				writer = new OutputStreamWriter(newOutputStream(index), Util.UTF_8);
+				writer.write(value);
+			} finally {
+				Util.closeQuietly(writer);
+			}
+		}
+
+		/**
+		 * Commits this edit so it is visible to readers.  This releases the
+		 * edit lock so another edit may be started on the same key.
+		 */
+		public void commit() throws IOException {
+			if (hasErrors) {
+				completeEdit(this, false);
+				remove(entry.key); // The previous entry is stale.
+			} else {
+				completeEdit(this, true);
+			}
+			committed = true;
+		}
+
+		/**
+		 * Aborts this edit. This releases the edit lock so another edit may be
+		 * started on the same key.
+		 */
+		public void abort() throws IOException {
+			completeEdit(this, false);
+		}
+
+		public void abortUnlessCommitted() {
+			if (!committed) {
+				try {
+					abort();
+				} catch (IOException ignored) {
+				}
+			}
+		}
+
+		private class FaultHidingOutputStream extends FilterOutputStream {
+			private FaultHidingOutputStream(OutputStream out) {
+				super(out);
+			}
+
+			@Override public void write(int oneByte) {
+				try {
+					out.write(oneByte);
+				} catch (IOException e) {
+					hasErrors = true;
+				}
+			}
+
+			@Override public void write(byte[] buffer, int offset, int length) {
+				try {
+					out.write(buffer, offset, length);
+				} catch (IOException e) {
+					hasErrors = true;
+				}
+			}
+
+			@Override public void close() {
+				try {
+					out.close();
+				} catch (IOException e) {
+					hasErrors = true;
+				}
+			}
+
+			@Override public void flush() {
+				try {
+					out.flush();
+				} catch (IOException e) {
+					hasErrors = true;
+				}
+			}
+		}
+	}
+
+	private final class Entry {
+		private final String key;
+
+		/** Lengths of this entry's files. */
+		private final long[] lengths;
+
+		/** True if this entry has ever been published. */
+		private boolean readable;
+
+		/** The ongoing edit or null if this entry is not being edited. */
+		private Editor currentEditor;
+
+		/** The sequence number of the most recently committed edit to this entry. */
+		private long sequenceNumber;
+
+		private Entry(String key) {
+			this.key = key;
+			this.lengths = new long[valueCount];
+		}
+
+		public String getLengths() throws IOException {
+			StringBuilder result = new StringBuilder();
+			for (long size : lengths) {
+				result.append(' ').append(size);
+			}
+			return result.toString();
+		}
+
+		/** Set lengths using decimal numbers like "10123". */
+		private void setLengths(String[] strings) throws IOException {
+			if (strings.length != valueCount) {
+				throw invalidLengths(strings);
+			}
+
+			try {
+				for (int i = 0; i < strings.length; i++) {
+					lengths[i] = Long.parseLong(strings[i]);
+				}
+			} catch (NumberFormatException e) {
+				throw invalidLengths(strings);
+			}
+		}
+
+		private IOException invalidLengths(String[] strings) throws IOException {
+			throw new IOException("unexpected journal line: " + java.util.Arrays.toString(strings));
+		}
+
+		public File getCleanFile(int i) {
+			return new File(directory, key + "" + i);
+		}
+
+		public File getDirtyFile(int i) {
+			return new File(directory, key + "" + i + ".tmp");
+		}
+	}
+}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/DiskLruCacheManager.java b/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/DiskLruCacheManager.java
new file mode 100644
index 0000000..1b8c1d7
--- /dev/null
+++ b/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/DiskLruCacheManager.java
@@ -0,0 +1,101 @@
+package com.sxu.smartpicture.imageloader.utils;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.text.TextUtils;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+
+/*******************************************************************************
+ * Description: 用于缓存经过高斯模糊的图片
+ *
+ * Author: Freeman
+ *
+ * Date: 2018/9/4
+ *
+ * Copyright: all rights reserved by Freeman.
+ *******************************************************************************/
+public class DiskLruCacheManager {
+
+	private DiskLruCache diskLruCache;
+	private static DiskLruCacheManager instance;
+
+	private final int MAX_CACHE_SIZE = 64 * 1024 * 1024;
+
+	private DiskLruCacheManager(Context context) {
+		try {
+			diskLruCache = DiskLruCache.open(context.getCacheDir(), 1, 1,
+					MAX_CACHE_SIZE, Integer.MAX_VALUE);
+		} catch (Exception e) {
+			e.printStackTrace(System.err);
+		}
+	}
+
+	public static DiskLruCacheManager getInstance(Context context) {
+		if (instance == null) {
+			synchronized (DiskLruCacheManager.class) {
+				if (instance == null) {
+					instance = new DiskLruCacheManager(context.getApplicationContext());
+				}
+			}
+		}
+
+		return instance;
+	}
+
+	public void put(String url, Bitmap bitmap) {
+		if (TextUtils.isEmpty(url) || bitmap == null || bitmap.isRecycled()) {
+			return;
+		}
+
+		try {
+			DiskLruCache.Editor editor = diskLruCache.edit(getKey(url));
+			OutputStream outputStream = editor.newOutputStream(0);
+			if (bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream)) {
+				editor.commit();
+			}
+			diskLruCache.flush();
+		} catch (Exception e) {
+			e.printStackTrace(System.err);
+		}
+	}
+
+	public Bitmap get(String url) {
+		try {
+			DiskLruCache.Snapshot snapshot = diskLruCache.get(getKey(url));
+			if (snapshot != null) {
+				InputStream inputStream = snapshot.getInputStream(0);
+				return BitmapFactory.decodeStream(inputStream);
+			}
+		} catch (Exception e) {
+			e.printStackTrace(System.err);
+		}
+
+		return null;
+	}
+
+	public static String getKey(String url) {
+		try {
+			MessageDigest digest = MessageDigest.getInstance("MD5");
+			byte[] md5 = digest.digest(url.getBytes());
+			BigInteger bigInteger = new BigInteger(1, md5);
+			return bigInteger.toString(16);
+		} catch (Exception e) {
+			e.printStackTrace(System.err);
+		}
+
+		return null;
+	}
+
+	public void close() {
+		try {
+			diskLruCache.close();
+		} catch (Exception e) {
+			e.printStackTrace(System.err);
+		}
+	}
+}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/FastBlurUtil.java b/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/FastBlurUtil.java
new file mode 100755
index 0000000..59e6e9c
--- /dev/null
+++ b/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/FastBlurUtil.java
@@ -0,0 +1,241 @@
+package com.sxu.smartpicture.imageloader.utils;
+
+import android.graphics.Bitmap;
+
+/**
+ * Created by jay on 11/7/15.
+ */
+public class FastBlurUtil {
+
+    public static Bitmap doBlur(Bitmap sentBitmap, int scaleRadius, int radius) {
+
+        // Stack Blur v1.0 from
+        // http://www.quasimondo.com/StackBlurForCanvas/StackBlurDemo.html
+        //
+        // Java Author: Mario Klingemann <mario at quasimondo.com>
+        // http://incubator.quasimondo.com
+        // created Feburary 29, 2004
+        // Android port : Yahel Bouaziz <yahel at kayenko.com>
+        // http://www.kayenko.com
+        // ported april 5th, 2012
+
+        // This is a compromise between Gaussian Blur and Box blur
+        // It creates much better looking blurs than Box Blur, but is
+        // 7x faster than my Gaussian Blur implementation.
+        //
+        // I called it Stack Blur because this describes best how this
+        // filter works internally: it creates a kind of moving stack
+        // of colors whilst scanning through the image. Thereby it
+        // just has to add one new block of color to the right side
+        // of the stack and remove the leftmost color. The remaining
+        // colors on the topmost layer of the stack are either added on
+        // or reduced by one, depending on if they are on the right or
+        // on the left side of the stack.
+        //
+        // If you are using this algorithm in your code please add
+        // the following line:
+        //
+        // Stack Blur Algorithm by Mario Klingemann <mario@quasimondo.com>
+        if (scaleRadius > 0) {
+            sentBitmap = Bitmap.createScaledBitmap(sentBitmap, sentBitmap.getWidth() / scaleRadius,
+                    sentBitmap.getHeight() / scaleRadius, false);
+        }
+        Bitmap bitmap = sentBitmap.copy(sentBitmap.getConfig(), true);
+
+        if (radius < 1) {
+            return (null);
+        }
+        int w = bitmap.getWidth();
+        int h = bitmap.getHeight();
+
+        int[] pix = new int[w * h];
+        bitmap.getPixels(pix, 0, w, 0, 0, w, h);
+
+        int wm = w - 1;
+        int hm = h - 1;
+        int wh = w * h;
+        int div = radius + radius + 1;
+
+        int r[] = new int[wh];
+        int g[] = new int[wh];
+        int b[] = new int[wh];
+        int rsum, gsum, bsum, x, y, i, p, yp, yi, yw;
+        int vmin[] = new int[Math.max(w, h)];
+
+        int divsum = (div + 1) >> 1;
+        divsum *= divsum;
+        int dv[] = new int[256 * divsum];
+        for (i = 0; i < 256 * divsum; i++) {
+            dv[i] = (i / divsum);
+        }
+
+        yw = yi = 0;
+
+        int[][] stack = new int[div][3];
+        int stackpointer;
+        int stackstart;
+        int[] sir;
+        int rbs;
+        int r1 = radius + 1;
+        int routsum, goutsum, boutsum;
+        int rinsum, ginsum, binsum;
+
+        for (y = 0; y < h; y++) {
+            rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
+            for (i = -radius; i <= radius; i++) {
+                p = pix[yi + Math.min(wm, Math.max(i, 0))];
+                sir = stack[i + radius];
+                sir[0] = (p & 0xff0000) >> 16;
+                sir[1] = (p & 0x00ff00) >> 8;
+                sir[2] = (p & 0x0000ff);
+                rbs = r1 - Math.abs(i);
+                rsum += sir[0] * rbs;
+                gsum += sir[1] * rbs;
+                bsum += sir[2] * rbs;
+                if (i > 0) {
+                    rinsum += sir[0];
+                    ginsum += sir[1];
+                    binsum += sir[2];
+                } else {
+                    routsum += sir[0];
+                    goutsum += sir[1];
+                    boutsum += sir[2];
+                }
+            }
+            stackpointer = radius;
+
+            for (x = 0; x < w; x++) {
+
+                r[yi] = dv[rsum];
+                g[yi] = dv[gsum];
+                b[yi] = dv[bsum];
+
+                rsum -= routsum;
+                gsum -= goutsum;
+                bsum -= boutsum;
+
+                stackstart = stackpointer - radius + div;
+                sir = stack[stackstart % div];
+
+                routsum -= sir[0];
+                goutsum -= sir[1];
+                boutsum -= sir[2];
+
+                if (y == 0) {
+                    vmin[x] = Math.min(x + radius + 1, wm);
+                }
+                p = pix[yw + vmin[x]];
+
+                sir[0] = (p & 0xff0000) >> 16;
+                sir[1] = (p & 0x00ff00) >> 8;
+                sir[2] = (p & 0x0000ff);
+
+                rinsum += sir[0];
+                ginsum += sir[1];
+                binsum += sir[2];
+
+                rsum += rinsum;
+                gsum += ginsum;
+                bsum += binsum;
+
+                stackpointer = (stackpointer + 1) % div;
+                sir = stack[(stackpointer) % div];
+
+                routsum += sir[0];
+                goutsum += sir[1];
+                boutsum += sir[2];
+
+                rinsum -= sir[0];
+                ginsum -= sir[1];
+                binsum -= sir[2];
+
+                yi++;
+            }
+            yw += w;
+        }
+        for (x = 0; x < w; x++) {
+            rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
+            yp = -radius * w;
+            for (i = -radius; i <= radius; i++) {
+                yi = Math.max(0, yp) + x;
+
+                sir = stack[i + radius];
+
+                sir[0] = r[yi];
+                sir[1] = g[yi];
+                sir[2] = b[yi];
+
+                rbs = r1 - Math.abs(i);
+
+                rsum += r[yi] * rbs;
+                gsum += g[yi] * rbs;
+                bsum += b[yi] * rbs;
+
+                if (i > 0) {
+                    rinsum += sir[0];
+                    ginsum += sir[1];
+                    binsum += sir[2];
+                } else {
+                    routsum += sir[0];
+                    goutsum += sir[1];
+                    boutsum += sir[2];
+                }
+
+                if (i < hm) {
+                    yp += w;
+                }
+            }
+            yi = x;
+            stackpointer = radius;
+            for (y = 0; y < h; y++) {
+                // Preserve alpha channel: ( 0xff000000 & pix[yi] )
+                pix[yi] = (0xff000000 & pix[yi]) | (dv[rsum] << 16) | (dv[gsum] << 8) | dv[bsum];
+
+                rsum -= routsum;
+                gsum -= goutsum;
+                bsum -= boutsum;
+
+                stackstart = stackpointer - radius + div;
+                sir = stack[stackstart % div];
+
+                routsum -= sir[0];
+                goutsum -= sir[1];
+                boutsum -= sir[2];
+
+                if (x == 0) {
+                    vmin[y] = Math.min(y + r1, hm) * w;
+                }
+                p = x + vmin[y];
+
+                sir[0] = r[p];
+                sir[1] = g[p];
+                sir[2] = b[p];
+
+                rinsum += sir[0];
+                ginsum += sir[1];
+                binsum += sir[2];
+
+                rsum += rinsum;
+                gsum += ginsum;
+                bsum += binsum;
+
+                stackpointer = (stackpointer + 1) % div;
+                sir = stack[stackpointer];
+
+                routsum += sir[0];
+                goutsum += sir[1];
+                boutsum += sir[2];
+
+                rinsum -= sir[0];
+                ginsum -= sir[1];
+                binsum -= sir[2];
+
+                yi += w;
+            }
+        }
+
+        bitmap.setPixels(pix, 0, w, 0, 0, w, h);
+
+        return (bitmap);
+    }
+}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/StrictLineReader.java b/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/StrictLineReader.java
new file mode 100644
index 0000000..2ca2c6b
--- /dev/null
+++ b/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/StrictLineReader.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.sxu.smartpicture.imageloader.utils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+
+/**
+ * Buffers input from an {@link InputStream} for reading lines.
+ *
+ * <p>This class is used for buffered reading of lines. For purposes of this class, a line ends
+ * with "\n" or "\r\n". End of input is reported by throwing {@code EOFException}. Unterminated
+ * line at end of input is invalid and will be ignored, the caller may use {@code
+ * hasUnterminatedLine()} to detect it after catching the {@code EOFException}.
+ *
+ * <p>This class is intended for reading input that strictly consists of lines, such as line-based
+ * cache entries or cache journal. Unlike the {@link java.io.BufferedReader} which in conjunction
+ * with {@link java.io.InputStreamReader} provides similar functionality, this class uses different
+ * end-of-input reporting and a more restrictive definition of a line.
+ *
+ * <p>This class supports only charsets that encode '\r' and '\n' as a single byte with value 13
+ * and 10, respectively, and the representation of no other character contains these values.
+ * We currently check in constructor that the charset is one of US-ASCII, UTF-8 and ISO-8859-1.
+ * The default charset is US_ASCII.
+ */
+class StrictLineReader implements Closeable {
+	private static final byte CR = (byte) '\r';
+	private static final byte LF = (byte) '\n';
+
+	private final InputStream in;
+	private final Charset charset;
+
+	/*
+	   * Buffered data is stored in {@code buf}. As long as no exception occurs, 0 <= pos <= end
+	   * and the data in the range [pos, end) is buffered for reading. At end of input, if there is
+	   * an unterminated line, we set end == -1, otherwise end == pos. If the underlying
+	   * {@code InputStream} throws an {@code IOException}, end may remain as either pos or -1.
+	   */
+	private byte[] buf;
+	private int pos;
+	private int end;
+
+	/**
+	 * Constructs a new {@code LineReader} with the specified charset and the default capacity.
+	 *
+	 * @param in the {@code InputStream} to read data from.
+	 * @param charset the charset used to decode data. Only US-ASCII, UTF-8 and ISO-8859-1 are
+	 * supported.
+	 * @throws NullPointerException if {@code in} or {@code charset} is null.
+	 * @throws IllegalArgumentException if the specified charset is not supported.
+	 */
+	public StrictLineReader(InputStream in, Charset charset) {
+		this(in, 8192, charset);
+	}
+
+	/**
+	 * Constructs a new {@code LineReader} with the specified capacity and charset.
+	 *
+	 * @param in the {@code InputStream} to read data from.
+	 * @param capacity the capacity of the buffer.
+	 * @param charset the charset used to decode data. Only US-ASCII, UTF-8 and ISO-8859-1 are
+	 * supported.
+	 * @throws NullPointerException if {@code in} or {@code charset} is null.
+	 * @throws IllegalArgumentException if {@code capacity} is negative or zero
+	 * or the specified charset is not supported.
+	 */
+	public StrictLineReader(InputStream in, int capacity, Charset charset) {
+		if (in == null || charset == null) {
+			throw new NullPointerException();
+		}
+		if (capacity < 0) {
+			throw new IllegalArgumentException("capacity <= 0");
+		}
+		if (!(charset.equals(Util.US_ASCII))) {
+			throw new IllegalArgumentException("Unsupported encoding");
+		}
+
+		this.in = in;
+		this.charset = charset;
+		buf = new byte[capacity];
+	}
+
+	/**
+	 * Closes the reader by closing the underlying {@code InputStream} and
+	 * marking this reader as closed.
+	 *
+	 * @throws IOException for errors when closing the underlying {@code InputStream}.
+	 */
+	public void close() throws IOException {
+		synchronized (in) {
+			if (buf != null) {
+				buf = null;
+				in.close();
+			}
+		}
+	}
+
+	/**
+	 * Reads the next line. A line ends with {@code "\n"} or {@code "\r\n"},
+	 * this end of line marker is not included in the result.
+	 *
+	 * @return the next line from the input.
+	 * @throws IOException for underlying {@code InputStream} errors.
+	 * @throws EOFException for the end of source stream.
+	 */
+	public String readLine() throws IOException {
+		synchronized (in) {
+			if (buf == null) {
+				throw new IOException("LineReader is closed");
+			}
+
+			// Read more data if we are at the end of the buffered data.
+			// Though it's an error to read after an exception, we will let {@code fillBuf()}
+			// throw again if that happens; thus we need to handle end == -1 as well as end == pos.
+			if (pos >= end) {
+				fillBuf();
+			}
+			// Try to find LF in the buffered data and return the line if successful.
+			for (int i = pos; i != end; ++i) {
+				if (buf[i] == LF) {
+					int lineEnd = (i != pos && buf[i - 1] == CR) ? i - 1 : i;
+					String res = new String(buf, pos, lineEnd - pos, charset.name());
+					pos = i + 1;
+					return res;
+				}
+			}
+
+			// Let's anticipate up to 80 characters on top of those already read.
+			ByteArrayOutputStream out = new ByteArrayOutputStream(end - pos + 80) {
+				@Override
+				public String toString() {
+					int length = (count > 0 && buf[count - 1] == CR) ? count - 1 : count;
+					try {
+						return new String(buf, 0, length, charset.name());
+					} catch (UnsupportedEncodingException e) {
+						throw new AssertionError(e); // Since we control the charset this will never happen.
+					}
+				}
+			};
+
+			while (true) {
+				out.write(buf, pos, end - pos);
+				// Mark unterminated line in case fillBuf throws EOFException or IOException.
+				end = -1;
+				fillBuf();
+				// Try to find LF in the buffered data and return the line if successful.
+				for (int i = pos; i != end; ++i) {
+					if (buf[i] == LF) {
+						if (i != pos) {
+							out.write(buf, pos, i - pos);
+						}
+						pos = i + 1;
+						return out.toString();
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Reads new input data into the buffer. Call only with pos == end or end == -1,
+	 * depending on the desired outcome if the function throws.
+	 */
+	private void fillBuf() throws IOException {
+		int result = in.read(buf, 0, buf.length);
+		if (result == -1) {
+			throw new EOFException();
+		}
+		pos = 0;
+		end = result;
+	}
+}
+
diff --git a/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/Util.java b/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/Util.java
new file mode 100644
index 0000000..3e567c9
--- /dev/null
+++ b/imageset/src/main/java/com/sxu/smartpicture/imageloader/utils/Util.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.sxu.smartpicture.imageloader.utils;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
+
+/** Junk drawer of utility methods. */
+final class Util {
+	static final Charset US_ASCII = Charset.forName("US-ASCII");
+	static final Charset UTF_8 = Charset.forName("UTF-8");
+
+	private Util() {
+	}
+
+	static String readFully(Reader reader) throws IOException {
+		try {
+			StringWriter writer = new StringWriter();
+			char[] buffer = new char[1024];
+			int count;
+			while ((count = reader.read(buffer)) != -1) {
+				writer.write(buffer, 0, count);
+			}
+			return writer.toString();
+		} finally {
+			reader.close();
+		}
+	}
+
+	/**
+	 * Deletes the contents of {@code dir}. Throws an IOException if any file
+	 * could not be deleted, or if {@code dir} is not a readable directory.
+	 */
+	static void deleteContents(File dir) throws IOException {
+		File[] files = dir.listFiles();
+		if (files == null) {
+			throw new IOException("not a readable directory: " + dir);
+		}
+		for (File file : files) {
+			if (file.isDirectory()) {
+				deleteContents(file);
+			}
+			if (!file.delete()) {
+				throw new IOException("failed to delete file: " + file);
+			}
+		}
+	}
+
+	static void closeQuietly(/*Auto*/Closeable closeable) {
+		if (closeable != null) {
+			try {
+				closeable.close();
+			} catch (RuntimeException rethrown) {
+				throw rethrown;
+			} catch (Exception ignored) {
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/imageset/src/main/java/com/sxu/smartpicture/manager/ThreadPoolManager.java b/imageset/src/main/java/com/sxu/smartpicture/manager/ThreadPoolManager.java
index 134603c..6af0646 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/manager/ThreadPoolManager.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/manager/ThreadPoolManager.java
@@ -10,16 +10,12 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 /*******************************************************************************
- * FileName: ThreadPoolManager
- * <p>
- * Description:
- * <p>
+ * Description: 自定义线程池
+ *
  * Author: Freeman
- * <p>
- * Version: v1.0
- * <p>
- * Date: 16/11/8
- * <p>
+ *
+ * Date: 2017/11/08
+ *
  * Copyright: all rights reserved by Freeman.
  *******************************************************************************/
 public class ThreadPoolManager {
diff --git a/imageset/src/main/java/com/sxu/smartpicture/utils/DisplayUtil.java b/imageset/src/main/java/com/sxu/smartpicture/utils/DisplayUtil.java
index 9b18f47..ce33d09 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/utils/DisplayUtil.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/utils/DisplayUtil.java
@@ -5,17 +5,15 @@
 import android.content.res.Resources;
 import android.graphics.Rect;
 
-/**
- * Copyright (c) 2017. Freeman Inc. All rights reserved.
+/*******************************************************************************
+ * Description: 屏幕相关的工具类
  *
- * 屏幕相关的工具类
+ * Author: Freeman
  *
- * @author Freeman
+ * Date: 2017/06/20
  *
- * @date 17/6/20
- */
-
-
+ * Copyright: all rights reserved by Freeman.
+ *******************************************************************************/
 public class DisplayUtil {
 
 	public static int getScreenWidth() {
diff --git a/imageset/src/main/java/com/sxu/smartpicture/utils/GlideBlurTransform.java b/imageset/src/main/java/com/sxu/smartpicture/utils/GlideBlurTransform.java
deleted file mode 100644
index 88b37b7..0000000
--- a/imageset/src/main/java/com/sxu/smartpicture/utils/GlideBlurTransform.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.sxu.smartpicture.utils;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
-
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
-import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
-import com.sxu.utils.FastBlurUtil;
-
-import java.security.MessageDigest;
-
-/**
- * @author Freeman
- * @date 2017/12/19
- */
-
-
-public class GlideBlurTransform extends BitmapTransformation {
-
-	private Context mContext;
-	private int mScaleRadius;
-	private int mBlurRadius;
-
-	public GlideBlurTransform(Context context, int scaleRadius, int blurRadius) {
-		this.mContext = context;
-		this.mScaleRadius = scaleRadius;
-		this.mBlurRadius = blurRadius;
-	}
-
-	@Override
-	protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) {
-		//return FastBlurUtil.setBlur(mContext, toTransform, 8, mBlurRadius);
-		return FastBlurUtil.doBlur(toTransform, mScaleRadius, mBlurRadius);
-	}
-
-	@Override
-	public void updateDiskCacheKey(MessageDigest messageDigest) {
-
-	}
-}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/utils/PermissionUtil.java b/imageset/src/main/java/com/sxu/smartpicture/utils/PermissionUtil.java
deleted file mode 100644
index f3ff582..0000000
--- a/imageset/src/main/java/com/sxu/smartpicture/utils/PermissionUtil.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.sxu.smartpicture.utils;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.widget.Toast;
-
-import com.sxu.smartpicture.R;
-
-/*******************************************************************************
- * Description: 动态申请权限
- *
- * Author: Freeman
- *
- * Date: 2018/6/8
- *
- * Copyright: all rights reserved by Freeman.
- *******************************************************************************/
-
-public class PermissionUtil {
-
-	private final static int PERMISSION_REQUEST_CODE = 1000;
-	private static String permissionDesc;
-	private static String permissionSettingDesc;
-	private static OnPermissionRequestListener requestListener;
-
-	public static boolean checkPermission(Activity context, String permission) {
-		if (ContextCompat.checkSelfPermission(context, permission)
-				!= PackageManager.PERMISSION_GRANTED) {
-			ActivityCompat.requestPermissions(context, new String[] {permission}, PERMISSION_REQUEST_CODE);
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean checkPermission(Activity context, String[] permission) {
-		if (permission == null || permission.length == 0) {
-			return true;
-		}
-
-		for (int i = 0; i < permission.length; i++) {
-			if (!checkPermission(context, permission[i])) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public static void requestCallback(final Activity context, int requestCode, String permissions[], int[] grantResults) {
-		if (requestCode != PERMISSION_REQUEST_CODE) {
-			return;
-		}
-
-		if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-			if (requestListener != null) {
-				requestListener.onGranted();
-				requestListener = null;
-			}
-		} else {
-			if (ActivityCompat.shouldShowRequestPermissionRationale(context,
-					permissions != null && permissions.length > 0 ? permissions[0] : "")) {
-				Toast.makeText(context, permissionDesc, Toast.LENGTH_LONG).show();
-			} else {
-				showSettingPermissionDialog(context);
-			}
-		}
-	}
-
-	private static void showSettingPermissionDialog(final Context context) {
-		new AlertDialog.Builder(context, android.R.style.Theme_Holo_Light_Dialog)
-				.setMessage(permissionSettingDesc)
-				.setNegativeButton(context.getString(R.string.go_to_setting),
-						new DialogInterface.OnClickListener() {
-							@Override
-							public void onClick(DialogInterface dialog, int which) {
-								Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-								intent.setData(Uri.fromParts("package", context.getPackageName(), null));
-								if (intent.resolveActivity(context.getPackageManager()) != null) {
-									context.startActivity(intent);
-								} else {
-									Toast.makeText(context, context.getString(R.string.permission_setting), Toast.LENGTH_LONG).show();
-								}
-							}
-						})
-				.show();
-	}
-
-	public static void setPermissionRequestListener(String desc, String settingDesc, OnPermissionRequestListener listener) {
-		permissionDesc = desc;
-		permissionSettingDesc = settingDesc;
-		requestListener = listener;
-	}
-
-	public interface OnPermissionRequestListener {
-		void onGranted();
-	}
-}
diff --git a/imageset/src/main/java/com/sxu/smartpicture/utils/UploadUtils.java b/imageset/src/main/java/com/sxu/smartpicture/utils/UploadUtils.java
index 8b854f8..c6526c3 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/utils/UploadUtils.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/utils/UploadUtils.java
@@ -13,10 +13,8 @@
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -26,11 +24,15 @@
 import top.zibin.luban.Luban;
 import top.zibin.luban.OnCompressListener;
 
-/**
- * @author Freeman
- * @date 2017/11/14
- */
-
+/*******************************************************************************
+ * Description: 上传图片的工具类
+ *
+ * Author: Freeman
+ *
+ * Date: 2017/11/14
+ *
+ * Copyright: all rights reserved by Freeman.
+ *******************************************************************************/
 public class UploadUtils {
 
 	public static void uploadToInnerServer(Activity context, String serverAddress, String filePath,
@@ -40,41 +42,37 @@ public static void uploadToInnerServer(Activity context, String serverAddress, S
 
 	public static void uploadToInnerServer(final Activity context, final String serverAddress, final String filePath,
 	                                       final boolean needCompress, final OnUploadListener listener) {
-		if (needCompress) {
-			compressImage(context, filePath, new OnCompressListener() {
-				@Override
-				public void onStart() {
+		if (!needCompress) {
+			realUploadToInnerServer(context, serverAddress, filePath, listener);
+			return;
+		}
 
-				}
+		compressImage(context, filePath, new OnCompressListener() {
+			@Override
+			public void onStart() {
 
-				@Override
-				public void onSuccess(final File file) {
-					ThreadPoolManager.executeTask(new Runnable() {
-						@Override
-						public void run() {
-							uploadImage(context, serverAddress, file.getPath(), listener);
-						}
-					});
-				}
+			}
 
-				@Override
-				public void onError(Throwable e) {
-					ThreadPoolManager.executeTask(new Runnable() {
-						@Override
-						public void run() {
-							uploadImage(context, serverAddress, filePath, listener);
-						}
-					});
-				}
-			});
-		} else {
-			ThreadPoolManager.executeTask(new Runnable() {
-				@Override
-				public void run() {
-					uploadImage(context, serverAddress, filePath, listener);
-				}
-			});
-		}
+			@Override
+			public void onSuccess(final File file) {
+				realUploadToInnerServer(context, serverAddress, filePath, listener);
+			}
+
+			@Override
+			public void onError(Throwable e) {
+				realUploadToInnerServer(context, serverAddress, filePath, listener);
+			}
+		});
+	}
+
+	private static void realUploadToInnerServer(final Activity context, final String serverAddress,
+	                                            final String filePath, final OnUploadListener listener) {
+		ThreadPoolManager.executeTask(new Runnable() {
+			@Override
+			public void run() {
+				uploadImage(context, serverAddress, filePath, listener);
+			}
+		});
 	}
 
 	private static void uploadImage(final Activity context, final String serverAddress, final String filePath,
@@ -172,26 +170,27 @@ public static void uploadToQiNiu(Activity context, String token, String filePath
 	 */
 	public static void uploadToQiNiu(Activity context, final String token, final String filePath, boolean needCompress,
 	                                 final OnUploadToQiNiuListener listener) {
-		if (needCompress) {
-			compressImage(context, filePath, new OnCompressListener() {
-				@Override
-				public void onStart() {
+		if (!needCompress) {
+			uploadImageToQiNiu(token, filePath, listener);
+			return;
+		}
 
-				}
+		compressImage(context, filePath, new OnCompressListener() {
+			@Override
+			public void onStart() {
 
-				@Override
-				public void onSuccess(File file) {
-					uploadImageToQiNiu(token, filePath, listener);
-				}
+			}
 
-				@Override
-				public void onError(Throwable e) {
-					uploadImageToQiNiu(token, filePath, listener);
-				}
-			});
-		} else {
-			uploadImageToQiNiu(token, filePath, listener);
-		}
+			@Override
+			public void onSuccess(File file) {
+				uploadImageToQiNiu(token, filePath, listener);
+			}
+
+			@Override
+			public void onError(Throwable e) {
+				uploadImageToQiNiu(token, filePath, listener);
+			}
+		});
 	}
 
 	private static void uploadImageToQiNiu(String token, String filePath, final OnUploadToQiNiuListener listener) {
diff --git a/imageset/src/main/java/com/sxu/smartpicture/zoomimage/ZoomImageView.java b/imageset/src/main/java/com/sxu/smartpicture/zoomimage/ZoomImageView.java
index c098946..3f51455 100644
--- a/imageset/src/main/java/com/sxu/smartpicture/zoomimage/ZoomImageView.java
+++ b/imageset/src/main/java/com/sxu/smartpicture/zoomimage/ZoomImageView.java
@@ -20,7 +20,10 @@
 import com.github.chrisbanes.photoview.OnViewDragListener;
 import com.github.chrisbanes.photoview.OnViewTapListener;
 import com.github.chrisbanes.photoview.PhotoViewAttacher;
-import com.sxu.imageloader.WrapImageView;
+import com.sxu.smartpicture.imageloader.ImageLoaderManager;
+import com.sxu.smartpicture.imageloader.WrapImageView;
+import com.sxu.smartpicture.imageloader.instance.FrescoInstance;
+
 
 /*******************************************************************************
  * Description: 可缩放的图片组件
@@ -33,6 +36,7 @@
  *******************************************************************************/
 public class ZoomImageView extends WrapImageView {
 
+	private boolean isFresco;
 	private PhotoViewAttacher attacher;
 	private ScaleType pendingScaleType;
 
@@ -50,18 +54,13 @@ public ZoomImageView(Context context, AttributeSet attr, int defStyle) {
 	}
 
 	private void init() {
-		if (this instanceof GenericDraweeView) {
+		isFresco = ImageLoaderManager.getInstance().getImageLoaderInstance() instanceof FrescoInstance;
+		if (isFresco) {
 			attacher = new FrescoAttacher(this);
 		} else {
 			attacher = new PhotoViewAttacher(this);
+			super.setScaleType(ScaleType.MATRIX);
 		}
-
-		getHierarchy().setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER);
-
-		//We always pose as a Matrix scale type, though we can change to another scale type
-		//via the attacher
-		//apply the previously applied scale type
-		super.setScaleType(ScaleType.MATRIX);
 		if (pendingScaleType != null) {
 			setScaleType(pendingScaleType);
 			pendingScaleType = null;
@@ -69,7 +68,7 @@ private void init() {
 	}
 
 	@Override protected void onDraw(@NonNull Canvas canvas) {
-		if (this instanceof GenericDraweeView) {
+		if (isFresco) {
 			canvas.concat(attacher.getImageMatrix());
 			super.onDraw(canvas);
 		} else {
diff --git a/imageset/src/main/res/layout/fragment_photo_grid_layout.xml b/imageset/src/main/res/layout/fragment_photo_grid_layout.xml
index be1f003..8a6e21c 100644
--- a/imageset/src/main/res/layout/fragment_photo_grid_layout.xml
+++ b/imageset/src/main/res/layout/fragment_photo_grid_layout.xml
@@ -15,4 +15,20 @@
         android:numColumns="3"
         android:listSelector="@color/transparent"
         android:scrollbars="none"/>
+    <LinearLayout
+        android:id="@+id/loading_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@android:style/Widget.Holo.ProgressBar.Small"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="请稍后..."/>
+    </LinearLayout>
 </FrameLayout>
diff --git a/imageset/src/main/res/layout/item_photo_grid_layout.xml b/imageset/src/main/res/layout/item_photo_grid_layout.xml
index bd43cf2..3c552a7 100644
--- a/imageset/src/main/res/layout/item_photo_grid_layout.xml
+++ b/imageset/src/main/res/layout/item_photo_grid_layout.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <com.sxu.imageloader.WrapImageView
+    <com.sxu.smartpicture.imageloader.WrapImageView
         android:id="@+id/photo"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/imageset/src/main/res/layout/item_photo_list_layout.xml b/imageset/src/main/res/layout/item_photo_list_layout.xml
index 3d76601..295d614 100644
--- a/imageset/src/main/res/layout/item_photo_list_layout.xml
+++ b/imageset/src/main/res/layout/item_photo_list_layout.xml
@@ -6,7 +6,7 @@
     android:paddingLeft="24dp"
     android:paddingTop="12dp"
     android:paddingBottom="12dp">
-    <com.sxu.imageloader.WrapImageView
+    <com.sxu.smartpicture.imageloader.WrapImageView
         android:id="@+id/directory_icon"
         android:layout_width="60dp"
         android:layout_height="60dp"
diff --git a/imageset/src/test/java/com/sxu/smartpicture/ExampleUnitTest.java b/imageset/src/test/java/com/sxu/smartpicture/ExampleUnitTest.java
index 2ee3f37..079dd64 100644
--- a/imageset/src/test/java/com/sxu/smartpicture/ExampleUnitTest.java
+++ b/imageset/src/test/java/com/sxu/smartpicture/ExampleUnitTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Example local unit test, which will execute on the development machine (host).