Skip to content

Commit 698de34

Browse files
with-mewith-me
committed
添加TakePhotoOptions支持指定照片选择工具
1 parent 957e698 commit 698de34

7 files changed

Lines changed: 171 additions & 56 deletions

File tree

‎simple/src/main/java/com/jph/simple/CustomHelper.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.jph.takephoto.app.TakePhoto;
1010
import com.jph.takephoto.compress.CompressConfig;
1111
import com.jph.takephoto.model.CropOptions;
12+
import com.jph.takephoto.model.TakePhotoOptions;
1213

1314
import java.io.File;
1415

@@ -35,7 +36,7 @@
3536
*/
3637
public class CustomHelper{
3738
private View rootView;
38-
private RadioGroup rgCrop,rgCompress,rgFrom,rgCropSize,rgCropTool,rgShowProgressBar;
39+
private RadioGroup rgCrop,rgCompress,rgFrom,rgCropSize,rgCropTool,rgShowProgressBar,rgPickTool;
3940
private EditText etCropHeight,etCropWidth,etLimit,etSize,etPx;
4041
public static CustomHelper of(View rootView){
4142
return new CustomHelper(rootView);
@@ -49,6 +50,7 @@ private void init(){
4950
rgCompress= (RadioGroup) rootView.findViewById(R.id.rgCompress);
5051
rgCropSize= (RadioGroup) rootView.findViewById(R.id.rgCropSize);
5152
rgFrom= (RadioGroup) rootView.findViewById(R.id.rgFrom);
53+
rgPickTool= (RadioGroup) rootView.findViewById(R.id.rgPickTool);
5254
rgShowProgressBar= (RadioGroup) rootView.findViewById(R.id.rgShowProgressBar);
5355
rgCropTool= (RadioGroup) rootView.findViewById(R.id.rgCropTool);
5456
etCropHeight= (EditText) rootView.findViewById(R.id.etCropHeight);
@@ -67,6 +69,7 @@ public void onClick(View view,TakePhoto takePhoto) {
6769
Uri imageUri = Uri.fromFile(file);
6870

6971
configCompress(takePhoto);
72+
configTakePhotoOpthion(takePhoto);
7073
switch (view.getId()){
7174
case R.id.btnPickBySelect:
7275
int limit= Integer.parseInt(etLimit.getText().toString());
@@ -104,6 +107,11 @@ public void onClick(View view,TakePhoto takePhoto) {
104107
break;
105108
}
106109
}
110+
private void configTakePhotoOpthion(TakePhoto takePhoto){
111+
if(rgPickTool.getCheckedRadioButtonId()==R.id.rbPickWithOwn){
112+
takePhoto.setTakePhotoOptions(new TakePhotoOptions.Builder().setWithOwnGallery(true).create());
113+
}
114+
}
107115
private void configCompress(TakePhoto takePhoto){
108116
if(rgCompress.getCheckedRadioButtonId()!=R.id.rbCompressYes){
109117
takePhoto.onEnableCompress(null,false);

‎simple/src/main/res/layout/common_layout.xml‎

Lines changed: 96 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@
125125
android:id="@+id/etCropWidth"
126126
android:layout_width="wrap_content"
127127
android:layout_height="wrap_content"
128-
android:minWidth="42dp"
129128
android:layout_marginLeft="10dp"
130129
android:inputType="number"
130+
android:minWidth="42dp"
131131
android:text="800" />
132132

133133
<TextView
@@ -137,9 +137,9 @@
137137

138138
<EditText
139139
android:id="@+id/etCropHeight"
140-
android:minWidth="42dp"
141140
android:layout_width="wrap_content"
142141
android:layout_height="wrap_content"
142+
android:minWidth="42dp"
143143
android:text="800" />
144144
</LinearLayout>
145145

@@ -246,8 +246,8 @@
246246
android:id="@+id/etSize"
247247
android:layout_width="wrap_content"
248248
android:layout_height="wrap_content"
249-
android:minWidth="42dp"
250249
android:inputType="number"
250+
android:minWidth="42dp"
251251
android:text="102400" />
252252

253253
<TextView
@@ -265,8 +265,8 @@
265265
android:id="@+id/etPx"
266266
android:layout_width="wrap_content"
267267
android:layout_height="wrap_content"
268-
android:minWidth="42dp"
269268
android:inputType="number"
269+
android:minWidth="42dp"
270270
android:text="800" />
271271

272272
<TextView
@@ -309,78 +309,123 @@
309309
<TextView
310310
android:layout_width="wrap_content"
311311
android:layout_height="wrap_content"
312-
android:text="最多选取：" />
312+
android:text="使用TakePhoto自带相册：" />
313313

314-
<EditText
315-
android:id="@+id/etLimit"
314+
<RadioGroup
315+
android:id="@+id/rgPickTool"
316316
android:layout_width="wrap_content"
317317
android:layout_height="wrap_content"
318-
android:minWidth="30dp"
319-
android:inputType="number"
320-
android:text="5" />
318+
android:orientation="horizontal">
321319

322-
<TextView
323-
android:layout_width="wrap_content"
324-
android:layout_height="wrap_content"
325-
android:text="张" />
320+
<RadioButton
321+
android:id="@+id/rbPickWithOwn"
322+
android:layout_width="wrap_content"
323+
android:layout_height="wrap_content"
324+
android:layout_gravity="center_horizontal"
325+
android:checked="true"
326+
android:text="是" />
327+
328+
<RadioButton
329+
android:id="@+id/rbPickWithOther"
330+
android:layout_width="wrap_content"
331+
android:layout_height="wrap_content"
332+
android:text="否" />
333+
</RadioGroup>
326334
</LinearLayout>
327335

336+
<TextView
337+
android:layout_width="match_parent"
338+
android:layout_height="match_parent"
339+
android:text="提示：选择多张图片时会自动切换到TakePhoto自带相册"
340+
android:textColor="#FF0000"
341+
android:textSize="12sp" />
342+
328343
<LinearLayout
329344
android:layout_width="match_parent"
330345
android:layout_height="wrap_content"
331-
android:gravity="center_vertical"
332-
android:orientation="horizontal">
346+
android:orientation="vertical">
333347

334-
<TextView
335-
android:layout_width="wrap_content"
348+
<LinearLayout
349+
android:layout_width="match_parent"
336350
android:layout_height="wrap_content"
337-
android:text="从哪选择：" />
351+
android:gravity="center_vertical"
352+
android:orientation="horizontal">
338353

339-
<RadioGroup
340-
android:id="@+id/rgFrom"
341-
android:layout_width="wrap_content"
354+
<TextView
355+
android:layout_width="wrap_content"
356+
android:layout_height="wrap_content"
357+
android:text="最多选择：" />
358+
359+
<EditText
360+
android:id="@+id/etLimit"
361+
android:layout_width="wrap_content"
362+
android:layout_height="wrap_content"
363+
android:inputType="number"
364+
android:minWidth="30dp"
365+
android:text="5" />
366+
367+
<TextView
368+
android:layout_width="wrap_content"
369+
android:layout_height="wrap_content"
370+
android:text="张" />
371+
</LinearLayout>
372+
373+
<LinearLayout
374+
android:layout_width="match_parent"
342375
android:layout_height="wrap_content"
376+
android:gravity="center_vertical"
343377
android:orientation="horizontal">
344378

345-
<RadioButton
346-
android:id="@+id/rbGallery"
379+
<TextView
347380
android:layout_width="wrap_content"
348381
android:layout_height="wrap_content"
349-
android:layout_gravity="center_horizontal"
350-
android:checked="true"
351-
android:text="从相册" />
382+
android:text="从哪选择：" />
352383

353-
<RadioButton
354-
android:id="@+id/rbFile"
384+
<RadioGroup
385+
android:id="@+id/rgFrom"
355386
android:layout_width="wrap_content"
356387
android:layout_height="wrap_content"
357-
android:text="从文件" />
358-
</RadioGroup>
388+
android:orientation="horizontal">
389+
390+
<RadioButton
391+
android:id="@+id/rbGallery"
392+
android:layout_width="wrap_content"
393+
android:layout_height="wrap_content"
394+
android:layout_gravity="center_horizontal"
395+
android:checked="true"
396+
android:text="从相册" />
397+
398+
<RadioButton
399+
android:id="@+id/rbFile"
400+
android:layout_width="wrap_content"
401+
android:layout_height="wrap_content"
402+
android:text="从文件" />
403+
</RadioGroup>
404+
</LinearLayout>
359405
</LinearLayout>
360406
</LinearLayout>
361-
</LinearLayout>
362407

363-
<LinearLayout
364-
android:layout_width="match_parent"
365-
android:layout_height="wrap_content"
366-
android:layout_marginTop="10dp"
367-
android:orientation="horizontal">
368-
369-
<Button
370-
android:id="@+id/btnPickByTake"
408+
<LinearLayout
371409
android:layout_width="match_parent"
372410
android:layout_height="wrap_content"
373-
android:layout_weight="1"
374-
android:onClick="onClick"
375-
android:text="拍照" />
411+
android:layout_marginTop="10dp"
412+
android:orientation="horizontal">
376413

377-
<Button
378-
android:id="@+id/btnPickBySelect"
379-
android:layout_width="match_parent"
380-
android:layout_height="wrap_content"
381-
android:layout_weight="1"
382-
android:onClick="onClick"
383-
android:text="选择照片" />
384-
</LinearLayout>
414+
<Button
415+
android:id="@+id/btnPickByTake"
416+
android:layout_width="match_parent"
417+
android:layout_height="wrap_content"
418+
android:layout_weight="1"
419+
android:onClick="onClick"
420+
android:text="拍照" />
385421

422+
<Button
423+
android:id="@+id/btnPickBySelect"
424+
android:layout_width="match_parent"
425+
android:layout_height="wrap_content"
426+
android:layout_weight="1"
427+
android:onClick="onClick"
428+
android:text="选择照片" />
429+
</LinearLayout>
430+
</LinearLayout>
386431
</LinearLayout>

‎takephoto_library/src/main/java/com/jph/takephoto/app/TakePhoto.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.jph.takephoto.model.MultipleCrop;
99
import com.jph.takephoto.model.TException;
1010
import com.jph.takephoto.model.TResult;
11+
import com.jph.takephoto.model.TakePhotoOptions;
1112
import com.jph.takephoto.permission.PermissionManager;
1213

1314

@@ -96,6 +97,12 @@ public interface TakePhoto {
9697
* @param showCompressDialog 压缩时是否显示进度对话框
9798
*/
9899
void onEnableCompress(CompressConfig config,boolean showCompressDialog);
100+
101+
/**
102+
* 设置TakePhoto相关配置
103+
* @param options
104+
*/
105+
void setTakePhotoOptions(TakePhotoOptions options);
99106
void onCreate(Bundle savedInstanceState);
100107
void onSaveInstanceState(Bundle outState);
101108
/**

‎takephoto_library/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.jph.takephoto.model.TImage;
2323
import com.jph.takephoto.model.TIntentWap;
2424
import com.jph.takephoto.model.TResult;
25+
import com.jph.takephoto.model.TakePhotoOptions;
2526
import com.jph.takephoto.permission.PermissionManager;
2627
import com.jph.takephoto.uitl.ImageRotateUtil;
2728
import com.jph.takephoto.uitl.IntentUtils;
@@ -62,6 +63,7 @@ public class TakePhotoImpl implements TakePhoto {
6263
private Uri outPutUri;
6364
private Uri tempUri;
6465
private CropOptions cropOptions;
66+
private TakePhotoOptions takePhotoOptions;
6567
private CompressConfig compressConfig;
6668
private MultipleCrop multipleCrop;
6769
private PermissionManager.TPermissionType permissionType;
@@ -85,6 +87,7 @@ public TakePhotoImpl(Fragment fragment, TakeResultListener listener) {
8587
public void onCreate(Bundle savedInstanceState) {
8688
if (savedInstanceState != null) {
8789
cropOptions = (CropOptions) savedInstanceState.getSerializable("cropOptions");
90+
takePhotoOptions = (TakePhotoOptions) savedInstanceState.getSerializable("takePhotoOptions");
8891
showCompressDialog = savedInstanceState.getBoolean("showCompressDialog");
8992
outPutUri = savedInstanceState.getParcelable("outPutUri");
9093
tempUri = savedInstanceState.getParcelable("tempUri");
@@ -95,6 +98,7 @@ public void onCreate(Bundle savedInstanceState) {
9598
@Override
9699
public void onSaveInstanceState(Bundle outState) {
97100
outState.putSerializable("cropOptions", cropOptions);
101+
outState.putSerializable("takePhotoOptions", takePhotoOptions);
98102
outState.putBoolean("showCompressDialog", showCompressDialog);
99103
outState.putParcelable("outPutUri", outPutUri);
100104
outState.putParcelable("tempUri", tempUri);
@@ -313,6 +317,10 @@ public void onPickFromGallery() {
313317
}
314318

315319
private void selectPicture(int defaultIndex, boolean isCrop) {
320+
if (takePhotoOptions!=null&&takePhotoOptions.isWithOwnGallery()){
321+
onPickMultiple(1);
322+
return;
323+
}
316324
if(PermissionManager.TPermissionType.WAIT.equals(permissionType))return;
317325
ArrayList<TIntentWap> intentWapList = new ArrayList<>();
318326
intentWapList.add(new TIntentWap(IntentUtils.getPickIntentWithDocuments(), isCrop ? TConstant.RC_PICK_PICTURE_FROM_DOCUMENTS_CROP : TConstant.RC_PICK_PICTURE_FROM_DOCUMENTS_ORIGINAL));
@@ -381,6 +389,11 @@ public void onEnableCompress(CompressConfig config, boolean showCompressDialog)
381389
this.showCompressDialog = showCompressDialog;
382390
}
383391

392+
@Override
393+
public void setTakePhotoOptions(TakePhotoOptions options) {
394+
this.takePhotoOptions=options;
395+
}
396+
384397
@Override
385398
public void permissionNotify(PermissionManager.TPermissionType type) {
386399
this.permissionType=type;
@@ -434,6 +447,7 @@ private void handleTakeCallBack(final TResult result,String...message){
434447
}
435448
private void clearParams(){
436449
compressConfig=null;
450+
takePhotoOptions=null;
437451
cropOptions=null;
438452
multipleCrop=null;
439453
}

‎takephoto_library/src/main/java/com/jph/takephoto/model/TakePhotoOptions.java‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package com.jph.takephoto.model;
2+
3+
import java.io.Serializable;
4+
5+
/**
6+
* Author: crazycodeboy
7+
* Date: 2016/11/5 0007 20:10
8+
* Version:4.0.0
9+
* 技术博文：http://www.devio.org/
10+
* GitHub:https://github.com/crazycodeboy
11+
* Eamil:crazycodeboy@gmail.com
12+
*/
13+
public class TakePhotoOptions implements Serializable {
14+
/**
15+
* 是否使用TakePhoto自带的相册进行图片选择，默认不使用，但选择多张图片会使用
16+
*/
17+
private boolean withOwnGallery;
18+
19+
private TakePhotoOptions() {
20+
}
21+
22+
public boolean isWithOwnGallery() {
23+
return withOwnGallery;
24+
}
25+
26+
public void setWithOwnGallery(boolean withOwnGallery) {
27+
this.withOwnGallery = withOwnGallery;
28+
}
29+
30+
public static class Builder {
31+
private TakePhotoOptions options;
32+
33+
public Builder() {
34+
this.options = new TakePhotoOptions();
35+
}
36+
37+
public Builder setWithOwnGallery(boolean withOwnGallery) {
38+
options.setWithOwnGallery(withOwnGallery);
39+
return this;
40+
}
41+
public TakePhotoOptions create(){
42+
return options;
43+
}
44+
}
45+
}

‎takephoto_library/src/main/res/values-en/strings.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<resources>
2-
<string name="action_settings">Settings</string>
3-
42
<!--TakePhoto-->
53
<string name="tip_type_not_image">Choose not pictures</string>
64
<string name="tip_no_camera">No camera</string>

0 commit comments

Comments
 (0)