Skip to content

Commit 7aaf7e8

Browse files
code-boycode-boy
committed
压缩工具添加对鲁班的支持
1 parent 698de34 commit 7aaf7e8

File tree

10 files changed

+374
-72
lines changed

10 files changed

+374
-72
lines changed

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

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
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.LubanOptions;
1213
import com.jph.takephoto.model.TakePhotoOptions;
1314

1415
import java.io.File;
1516

17+
import me.shaohui.advancedluban.Luban;
18+
1619

1720
/**
1821
* - 支持通过相机拍照获取图片
@@ -36,8 +39,8 @@
3639
*/
3740
public class CustomHelper{
3841
private View rootView;
39-
private RadioGroup rgCrop,rgCompress,rgFrom,rgCropSize,rgCropTool,rgShowProgressBar,rgPickTool;
40-
private EditText etCropHeight,etCropWidth,etLimit,etSize,etPx;
42+
private RadioGroup rgCrop,rgCompress,rgFrom,rgCropSize,rgCropTool,rgShowProgressBar,rgPickTool,rgCompressTool;
43+
private EditText etCropHeight,etCropWidth,etLimit,etSize,etHeightPx,etWidthPx;
4144
public static CustomHelper of(View rootView){
4245
return new CustomHelper(rootView);
4346
}
@@ -48,6 +51,7 @@ private CustomHelper(View rootView) {
4851
private void init(){
4952
rgCrop= (RadioGroup) rootView.findViewById(R.id.rgCrop);
5053
rgCompress= (RadioGroup) rootView.findViewById(R.id.rgCompress);
54+
rgCompressTool= (RadioGroup) rootView.findViewById(R.id.rgCompressTool);
5155
rgCropSize= (RadioGroup) rootView.findViewById(R.id.rgCropSize);
5256
rgFrom= (RadioGroup) rootView.findViewById(R.id.rgFrom);
5357
rgPickTool= (RadioGroup) rootView.findViewById(R.id.rgPickTool);
@@ -57,7 +61,8 @@ private void init(){
5761
etCropWidth= (EditText) rootView.findViewById(R.id.etCropWidth);
5862
etLimit= (EditText) rootView.findViewById(R.id.etLimit);
5963
etSize= (EditText) rootView.findViewById(R.id.etSize);
60-
etPx= (EditText) rootView.findViewById(R.id.etPx);
64+
etHeightPx= (EditText) rootView.findViewById(R.id.etHeightPx);
65+
etWidthPx= (EditText) rootView.findViewById(R.id.etWidthPx);
6166

6267

6368

@@ -118,10 +123,26 @@ private void configCompress(TakePhoto takePhoto){
118123
return ;
119124
}
120125
int maxSize= Integer.parseInt(etSize.getText().toString());
121-
int maxPixel= Integer.parseInt(etPx.getText().toString());
126+
int width= Integer.parseInt(etCropWidth.getText().toString());
127+
int height= Integer.parseInt(etHeightPx.getText().toString());
122128
boolean showProgressBar=rgShowProgressBar.getCheckedRadioButtonId()==R.id.rbShowYes? true:false;
123-
CompressConfig config= new CompressConfig.Builder().setMaxSize(maxSize).setMaxPixel(maxPixel).create();
129+
CompressConfig config;
130+
if(rgCompressTool.getCheckedRadioButtonId()==R.id.rbCompressWithOwn){
131+
config=new CompressConfig.Builder()
132+
.setMaxSize(maxSize)
133+
.setMaxPixel(width>=height? width:height)
134+
.create();
135+
}else {
136+
LubanOptions option=new LubanOptions.Builder()
137+
.setGear(Luban.CUSTOM_GEAR)
138+
.setMaxHeight(height)
139+
.setMaxWidth(width)
140+
.setMaxSize(maxSize)
141+
.create();
142+
config=CompressConfig.ofLuban(option);
143+
}
124144
takePhoto.onEnableCompress(config,showProgressBar);
145+
125146
}
126147
private CropOptions getCropOptions(){
127148
if(rgCrop.getCheckedRadioButtonId()!=R.id.rbCropYes)return null;

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

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,38 @@
163163
android:layout_width="match_parent"
164164
android:layout_height="1px"
165165
android:background="@android:color/darker_gray" />
166+
<LinearLayout
167+
android:layout_width="match_parent"
168+
android:layout_height="wrap_content"
169+
android:gravity="center_vertical"
170+
android:orientation="horizontal">
171+
172+
<TextView
173+
android:layout_width="wrap_content"
174+
android:layout_height="wrap_content"
175+
android:text="压缩工具：" />
176+
177+
<RadioGroup
178+
android:id="@+id/rgCompressTool"
179+
android:layout_width="wrap_content"
180+
android:layout_height="wrap_content"
181+
android:orientation="horizontal">
182+
183+
<RadioButton
184+
android:id="@+id/rbCompressWithOwn"
185+
android:layout_width="wrap_content"
186+
android:layout_height="wrap_content"
187+
android:layout_gravity="center_horizontal"
188+
android:checked="true"
189+
android:text="自带" />
166190

191+
<RadioButton
192+
android:id="@+id/rbCompressWithLuban"
193+
android:layout_width="wrap_content"
194+
android:layout_height="wrap_content"
195+
android:text="Luban" />
196+
</RadioGroup>
197+
</LinearLayout>
167198

168199
<LinearLayout
169200
android:layout_width="wrap_content"
@@ -259,10 +290,23 @@
259290
android:layout_width="wrap_content"
260291
android:layout_height="wrap_content"
261292
android:layout_marginLeft="20dp"
262-
android:text="长或宽不超过：" />
293+
android:text="宽：" />
294+
295+
<EditText
296+
android:id="@+id/etWidthPx"
297+
android:layout_width="wrap_content"
298+
android:layout_height="wrap_content"
299+
android:inputType="number"
300+
android:minWidth="42dp"
301+
android:text="800" />
302+
<TextView
303+
android:layout_width="wrap_content"
304+
android:layout_height="wrap_content"
305+
android:layout_marginLeft="20dp"
306+
android:text="高：" />
263307

264308
<EditText
265-
android:id="@+id/etPx"
309+
android:id="@+id/etHeightPx"
266310
android:layout_width="wrap_content"
267311
android:layout_height="wrap_content"
268312
android:inputType="number"

‎takephoto_library/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ dependencies {
2323
compile 'com.android.support:support-v4:25.0.0'
2424
compile 'com.soundcloud.android.crop:lib_crop:1.0.0'
2525
compile 'com.darsh.multipleimageselect:multipleimageselect:1.0.4'
26+
compile 'me.shaohui.advancedluban:library:1.2.8'
2627
}
2728
//apply from: "bintrayUpload.gradle"

0 commit comments

Comments
 (0)