Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ImageLibrary/build.gradle

ImageLibrary/src/main/java/com/renyu/imagelibrary/commonutils/Utils.java

@@ -14,11 +14,13 @@
 import com.renyu.imagelibrary.camera.CameraActivity;
 import com.renyu.imagelibrary.crop.UCrop;
 import com.renyu.imagelibrary.photopicker.PhotoPickerActivity;
+import com.renyu.imagelibrary.preview.ImagePreviewActivity;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 
 /**
  * Created by renyu on 2017/1/3.
@@ -150,4 +152,23 @@ public static void displayToGallery(Context context, File photoFile) {
         // 最后通知图库更新
         context.sendBroadcast(new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, Uri.parse("file://" + photoPath)));
     }
+
+    /**
+     * 相册预览
+     * @param context
+     * @param canDownload
+     * @param position
+     * @param canEdit
+     * @param urls
+     */
+    public static void showPreiew(Context context, boolean canDownload, int position, boolean canEdit, ArrayList<String> urls) {
+        Intent intent=new Intent(context, ImagePreviewActivity.class);
+        Bundle bundle=new Bundle();
+        bundle.putBoolean("canDownload", canDownload);
+        bundle.putInt("position", position);
+        bundle.putBoolean("canEdit", canEdit);
+        bundle.putStringArrayList("urls", urls);
+        intent.putExtras(bundle);
+        context.startActivity(intent);
+    }
 }

ImageLibrary/src/main/java/com/renyu/imagelibrary/photopicker/PhotoPickerActivity.java

@@ -176,7 +176,6 @@ public void remove(String path) {
             public void show(String path) {
                 Intent intent=new Intent(PhotoPickerActivity.this, ImagePreviewActivity.class);
                 Bundle bundle=new Bundle();
-                bundle.putBoolean("canHead", false);
                 bundle.putBoolean("canDownload", false);
                 bundle.putInt("position", 0);
                 bundle.putBoolean("canEdit", false);
@@ -212,7 +211,6 @@ public void onClick(View v) {
                 if (imagePaths.size()>0) {
                     Intent intent=new Intent(PhotoPickerActivity.this, ImagePreviewActivity.class);
                     Bundle bundle=new Bundle();
-                    bundle.putBoolean("canHead", false);
                     bundle.putBoolean("canDownload", false);
                     bundle.putInt("position", 0);
                     bundle.putBoolean("canEdit", true);

ImageLibrary/src/main/java/com/renyu/imagelibrary/photopicker/PhotoPickerAdapter.java

@@ -17,6 +17,7 @@
 import com.facebook.imagepipeline.common.ResizeOptions;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
+import com.renyu.commonlibrary.commonutils.ResourceUtils;
 import com.renyu.imagelibrary.R;
 import com.renyu.imagelibrary.bean.Photo;
 
@@ -89,7 +90,7 @@ public void onClick(View v) {
                     return;
                 }
                 models.get(position).setSelect(!flag);
-                holder.photopicker_choice.setImageResource(!flag?R.mipmap.ic_choice_select:R.mipmap.ic_choice_normal);
+                holder.photopicker_choice.setImageResource(!flag? ResourceUtils.getMipmapId(context, "ic_choice_select"):ResourceUtils.getMipmapId(context, "ic_choice_normal"));
                 if (!flag) {
                     listener.add(models.get(position).getPath());
                 }
@@ -98,7 +99,7 @@ public void onClick(View v) {
                 }
             }
         });
-        holder.photopicker_choice.setImageResource(models.get(position).isSelect()?R.mipmap.ic_choice_select:R.mipmap.ic_choice_normal);
+        holder.photopicker_choice.setImageResource(models.get(position).isSelect()?ResourceUtils.getMipmapId(context, "ic_choice_select"):ResourceUtils.getMipmapId(context, "ic_choice_normal"));
     }
 
     @Override

ImageLibrary/src/main/res/layout/adapter_photopicker.xml

@@ -37,6 +37,5 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_margin="5dip"
-        android:src="@mipmap/ic_choice_normal"/>
+        android:layout_margin="5dip"/>
 </RelativeLayout>

app/src/main/java/com/renyu/androidimagelibrary/MainActivity.java

@@ -3,6 +3,7 @@
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
+import com.facebook.drawee.backends.pipeline.Fresco;
 import com.renyu.imagelibrary.commonutils.Utils;
 
 public class MainActivity extends AppCompatActivity {
@@ -13,7 +14,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         com.blankj.utilcode.util.Utils.init(this);
+        Fresco.initialize(this);
 
-        Utils.takePicture(this, 1000);
+        Utils.choicePic(this, 2, 100);
     }
 }