CNLive Android Team / NewMediaPicker · Commits

Commit 42532049fcda77a7c2c29674b2ce3786a1363f03

Authored by 吴奎庆
1 parent 224ada73

优化

Inline Side-by-side
Showing 2 changed files with 36 additions and 26 deletions
app/src/main/java/com/cnlive/strike/debug/MainActivity.java
  View file @4253204
@@ -49,15 +49,40 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe @@ -49,15 +49,40 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
49 @Override 49 @Override
50 public void onClick(View view) { 50 public void onClick(View view) {
51 switch (view.getId()) { 51 switch (view.getId()) {
  52 +
  53 + case R.id.tv_media:
  54 + //打开相册
  55 + new ImagePicker.Builder()
  56 + .maxNum(9)
  57 + .setSelectGif(true)
  58 +// .isSinglePick(true)
  59 + .maxImageSize(25 * 1024 * 1024)
  60 + .maxVideoSize(100 * 1024 * 1024)
  61 + .isReturnUri(AndroidQUtil.isAndroidQ())
  62 + .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)
  63 + .defaultSelectList(new ArrayList<Media>())
  64 + .doCrop(1, 1, 40, 40)
  65 + .needCamera(true)
  66 + .builder()
  67 + .start(this, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
  68 + break;
  69 +
52 case R.id.tv_camera: 70 case R.id.tv_camera:
53 //打开相机 71 //打开相机
54 72
55 -  
56 - new ImagePicker  
57 - .Builder()  
58 - .setJumpCameraMode(3) // 1 图片 3 视频 73 + new ImagePicker.Builder()
  74 + .maxNum(9)
  75 + .setSelectGif(true)
  76 +// .isSinglePick(true)
  77 + .maxImageSize(25 * 1024 * 1024)
  78 + .maxVideoSize(100 * 1024 * 1024)
  79 + .isReturnUri(AndroidQUtil.isAndroidQ())
  80 + .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)
  81 + .defaultSelectList(new ArrayList<Media>())
  82 + .doCrop(1, 1, 500, 500)
  83 + .needCamera(true)
59 .builder() 84 .builder()
60 - .startCamera(this, select, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE); 85 + .start(this, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
61 86
62 // new ImagePicker 87 // new ImagePicker
63 // .Builder() 88 // .Builder()
@@ -71,22 +96,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe @@ -71,22 +96,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
71 .builder() 96 .builder()
72 .startPreview(this, 0, select, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE); 97 .startPreview(this, 0, select, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
73 break; 98 break;
74 - case R.id.tv_media:  
75 - //打开相册  
76 - new ImagePicker.Builder()  
77 - .maxNum(9)  
78 - .setSelectGif(true)  
79 -// .isSinglePick(true)  
80 - .maxImageSize(25 * 1024 * 1024)  
81 - .maxVideoSize(100*1024*1024)  
82 - .isReturnUri(AndroidQUtil.isAndroidQ())  
83 - .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)  
84 - .defaultSelectList(new ArrayList<Media>())  
85 -// .doCrop(1, 1, 900, 900)  
86 - .needCamera(true)  
87 - .builder()  
88 - .start(this, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);  
89 - break; 99 +
90 } 100 }
91 } 101 }
92 102
app/src/main/res/layout/activity_main.xml
  View file @4253204
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<layout> 2 +<layout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + xmlns:app="http://schemas.android.com/apk/res-auto"
  4 + xmlns:tools="http://schemas.android.com/tools">
3 5
4 <data> 6 <data>
5 7
@@ -10,9 +12,7 @@ @@ -10,9 +12,7 @@
10 type="OnClickListener" /> 12 type="OnClickListener" />
11 </data> 13 </data>
12 14
13 - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"  
14 - xmlns:app="http://schemas.android.com/apk/res-auto"  
15 - xmlns:tools="http://schemas.android.com/tools" 15 + <LinearLayout
16 android:layout_width="match_parent" 16 android:layout_width="match_parent"
17 android:layout_height="match_parent" 17 android:layout_height="match_parent"
18 android:orientation="vertical"> 18 android:orientation="vertical">
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <Button 28 <Button
29 android:id="@+id/tv_camera" 29 android:id="@+id/tv_camera"
30 android:layout_width="wrap_content" 30 android:layout_width="wrap_content"
31 - android:layout_height="wrap_content" 31 + android:layout_height="35dp"
32 android:layout_marginTop="30dp" 32 android:layout_marginTop="30dp"
33 android:onClick="@{onClick}" 33 android:onClick="@{onClick}"
34 android:text="打开相机" /> 34 android:text="打开相机" />