Skip to content

Commit 2b1e9c4

Browse files
ValuesFengValuesFeng
committed
backup
1 parent 5f96cbd commit 2b1e9c4

7 files changed

Lines changed: 26 additions & 122 deletions

File tree

‎app/src/main/java/io/valuesfeng/demo/MainActivity.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import android.support.v4.app.FragmentActivity;
88
import android.util.Log;
99
import android.view.View;
10-
import android.view.ViewConfiguration;
1110
import android.widget.GridView;
1211
import android.widget.ImageView;
1312

@@ -16,9 +15,7 @@
1615
import io.valuesfeng.picker.MimeType;
1716
import io.valuesfeng.picker.Picker;
1817
import io.valuesfeng.picker.engine.LoadEngine;
19-
import io.valuesfeng.picker.engine.glide.GlideEngine;
20-
import io.valuesfeng.picker.engine.imageloader.ImageLoaderEngine;
21-
import io.valuesfeng.picker.engine.picasso.PicassoEngine;
18+
import io.valuesfeng.picker.engine.GlideEngine;
2219
import io.valuesfeng.picker.utils.PicturePickerUtils;
2320

2421
public class MainActivity extends FragmentActivity {
@@ -43,13 +40,15 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
4340
}
4441

4542
public void onClickButton(View view) {
46-
Picker.from(this,MimeType.of(MimeType.JPEG,MimeType.PNG)).count(0, 3)
47-
.setEnableCamera(true)
43+
Picker.from(this,MimeType.of(MimeType.JPEG,MimeType.PNG))
44+
.count(3)
45+
.enableCamera(true)
46+
.setEngine(new GlideEngine())
47+
.quality(30000, Integer.MAX_VALUE) // minimum = 30000px, max = Integer.MAX_VALUEpx, so 30000px <= count <= Integer.MAX_VALUEpx;
4848
// .setEngine(new PicassoEngine())
4949
// .setEngine(new ImageLoaderEngine())
50-
.setEngine(new GlideEngine())
5150
// .setEngine(new CustomEngine())
52-
.forResult(1);
51+
.forResult(REQUEST_CODE_CHOOSE);
5352
}
5453

5554
static class CustomEngine implements LoadEngine {

‎gallery/src/main/java/io/valuesfeng/picker/ConfirmationDialogFragment.java‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎gallery/src/main/java/io/valuesfeng/picker/ImageSelectActivity.java‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import io.valuesfeng.picker.utils.MediaStoreCompat;
3333

3434

35-
public class ImageSelectActivity extends FragmentActivity implements ConfirmationDialogFragment.ConfirmationSelectionListener,AlbumCollection.OnDirectorySelectListener {
35+
public class ImageSelectActivity extends FragmentActivity implements AlbumCollection.OnDirectorySelectListener {
3636

3737
public static final String EXTRA_RESULT_SELECTION = BundleUtils.buildKey(ImageSelectActivity.class, "EXTRA_RESULT_SELECTION");
3838
public static final String EXTRA_SELECTION_SPEC = BundleUtils.buildKey(ImageSelectActivity.class, "EXTRA_SELECTION_SPEC");
@@ -219,8 +219,6 @@ public void onBackPressed() {
219219
setResult(Activity.RESULT_CANCELED);
220220
super.onBackPressed();
221221
}
222-
// ConfirmationDialogFragment dialog = ConfirmationDialogFragment.newInstance(R.string.l_confirm_dialog_title, R.string.l_confirm_dialog_message);
223-
// dialog.show(getSupportFragmentManager(), ConfirmationDialogFragment.TAG);
224222
}
225223
/**
226224
* 选择相机
@@ -229,17 +227,6 @@ public void showCameraAction() {
229227
mCapturePhotoUriHolder = mMediaStoreCompat.invokeCameraCapture(this, ImageSelectActivity.REQUEST_CODE_CAPTURE);
230228
}
231229

232-
@Override
233-
public void onPositive() {
234-
setResult(Activity.RESULT_CANCELED);
235-
finish();
236-
}
237-
238-
@Override
239-
public void onNegative() {
240-
241-
}
242-
243230
@Override
244231
public void onSelect(Album album) {
245232
hideFolderList();
@@ -249,7 +236,6 @@ public void onSelect(Album album) {
249236

250237
@Override
251238
public void onReset(Album album) {
252-
Log.i("aaaaa","reset");
253-
// mPhotoCollection.load(album);
239+
mPhotoCollection.load(album);
254240
}
255241
}

‎gallery/src/main/java/io/valuesfeng/picker/Picker.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public Picker setEngine(LoadEngine engine) {
8686
* @param mEnableCamera
8787
* @return
8888
*/
89-
public Picker setEnableCamera(boolean mEnableCamera) {
89+
public Picker enableCamera(boolean mEnableCamera) {
9090
mSelectionSpec.setmEnableCamera(mEnableCamera);
9191
return this;
9292
}
@@ -104,11 +104,24 @@ public Picker count(int min, int max) {
104104
return this;
105105
}
106106

107+
/**
108+
* Sets the limitation of a selectable count within the specified range.
109+
*
110+
* @param max maximum value to select.
111+
* @return the specification builder context.
112+
*/
113+
public Picker count(int max) {
114+
mSelectionSpec.setMinSelectable(0);
115+
mSelectionSpec.setMaxSelectable(max);
116+
return this;
117+
}
118+
107119
public Picker singleChoice() {
108120
count(0, 1);
109121
return this;
110122
}
111123

124+
//TODO : Wait achieve
112125
/**
113126
* Sets the limitation of a selectable image quality by pixel count within the specified range.
114127
*

gallery/src/main/java/io/valuesfeng/picker/engine/glide/GlideEngine.java renamed to gallery/src/main/java/io/valuesfeng/picker/engine/GlideEngine.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
package io.valuesfeng.picker.engine.glide;
1+
package io.valuesfeng.picker.engine;
22

33
import android.content.Context;
4-
import android.graphics.Bitmap;
54
import android.os.Parcel;
6-
import android.util.Log;
75
import android.widget.GridView;
86
import android.widget.ImageView;
97

108
import com.bumptech.glide.Glide;
119

1210
import io.valuesfeng.picker.R;
13-
import io.valuesfeng.picker.engine.LoadEngine;
1411

1512
/**
1613
* Author: valuesfeng

gallery/src/main/java/io/valuesfeng/picker/engine/imageloader/ImageLoaderEngine.java renamed to gallery/src/main/java/io/valuesfeng/picker/engine/ImageLoaderEngine.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.valuesfeng.picker.engine.imageloader;
1+
package io.valuesfeng.picker.engine;
22

33
import android.graphics.Bitmap;
44
import android.os.Parcel;
@@ -11,7 +11,6 @@
1111
import com.nostra13.universalimageloader.core.listener.PauseOnScrollListener;
1212

1313
import io.valuesfeng.picker.R;
14-
import io.valuesfeng.picker.engine.LoadEngine;
1514

1615
/**
1716
* Author: valuesfeng

gallery/src/main/java/io/valuesfeng/picker/engine/picasso/PicassoEngine.java renamed to gallery/src/main/java/io/valuesfeng/picker/engine/PicassoEngine.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
package io.valuesfeng.picker.engine.picasso;
1+
package io.valuesfeng.picker.engine;
22

33
import android.content.Context;
4-
import android.graphics.Bitmap;
54
import android.os.Parcel;
6-
import android.os.Parcelable;
75
import android.widget.AbsListView;
86
import android.widget.GridView;
97
import android.widget.ImageView;
108

119
import com.squareup.picasso.Picasso;
1210

1311
import io.valuesfeng.picker.R;
14-
import io.valuesfeng.picker.engine.LoadEngine;
1512

1613
/**
1714
* Author: valuesfeng

0 commit comments

Comments
 (0)