CNLive Android Team / NewMediaPicker · Commits

Commit 8206d709edf777646e0cb23af330ff7fa08fa369

Authored by 吴奎庆
2 parents 23cbe5de cf29623d

Merge remote-tracking branch 'origin/master' into wu_处理效率问题

Inline Side-by-side
Showing 4 changed files with 31 additions and 5 deletions
app/src/main/java/com/cnlive/strike/debug/MainActivity.java
  View file @8206d70
... ... @@ -71,7 +71,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
71 71 .maxImageSize(25 * 1024 * 1024)
72 72 .maxVideoSize(100*1024*1024)
73 73 .isReturnUri(AndroidQUtil.isAndroidQ())
74   - .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)
  74 + .selectMode(PickerConfig.PICKER_ONLY_ONE_TYPE)
75 75 .defaultSelectList(new ArrayList<Media>())
76 76 .needCamera(true)
77 77 .builder()
... ...
config.gradle
  View file @8206d70
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "1.0.3.8",
  24 + version: "1.0.3.9",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.media",
27 27 //Lib库名称
... ...
gradle.properties 0 → 100644
  View file @8206d70
  1 +## Project-wide Gradle settings.
  2 +#
  3 +# For more details on how to configure your build environment visit
  4 +# http://www.gradle.org/docs/current/userguide/build_environment.html
  5 +#
  6 +# Specifies the JVM arguments used for the daemon process.
  7 +# The setting is particularly useful for tweaking memory settings.
  8 +# Default value: -Xmx1024m -XX:MaxPermSize=256m
  9 +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
  10 +#
  11 +# When configured, Gradle will run in incubating parallel mode.
  12 +# This option should only be used with decoupled projects. More details, visit
  13 +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
  14 +# org.gradle.parallel=true
  15 +#Tue May 08 13:09:12 CST 2018
  16 +org.gradle.jvmargs=-Xms5120m -Xmx7168m
  17 +android.injected.testOnly=false
  18 +org.gradle.daemon=true
  19 +org.gradle.parallel=true
  20 +org.gradle.configureondemand=true
  21 +android.useAndroidX=true
  22 +android.enableJetifier=true
0 23 \ No newline at end of file
... ...
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
  View file @8206d70
... ... @@ -87,7 +87,9 @@ public class MediaPickerFragmentView implements MvpView {
87 87 if (mActivity.selects.size() > 0) {
88 88 showMessage(mFragment.getResources().getString(R.string.msg_type_limit));
89 89 } else {
90   - MeidaResultObservable.getInstance().finishMedia(true, media);
  90 + if (isCheckMediaSupport(mActivity, media)) {
  91 + MeidaResultObservable.getInstance().finishMedia(true, media);
  92 + }
91 93 }
92 94  
93 95 } else if (mActivity.mOptions.isSinglePick() || mActivity.mOptions.maxNum == 1) {
... ... @@ -99,7 +101,9 @@ public class MediaPickerFragmentView implements MvpView {
99 101 MediaOpenActivityObservable.getInstance().openActivity(new MediaOpenInfo(2, media));
100 102 }
101 103 } else {
102   - MeidaResultObservable.getInstance().finishMedia(true, media);
  104 + if (isCheckMediaSupport(mActivity, media)) {
  105 + MeidaResultObservable.getInstance().finishMedia(true, media);
  106 + }
103 107 }
104 108 } else {
105 109 if (isCheckMediaSupport(mActivity, media)) {
... ... @@ -196,7 +200,7 @@ public class MediaPickerFragmentView implements MvpView {
196 200 }
197 201  
198 202 public void initMediaData(MediaActivity mediaActivity, ArrayList<Folder> medias) {
199   - if (medias == null || medias.size() == 0 ||medias.get(0)==null||medias.get(0).getMedias()==null||medias.get(0).getMedias().size()==0|| medias.get(0).getMedias().get(0) == null) {
  203 + if (medias == null || medias.size() == 0 || medias.get(0) == null || medias.get(0).getMedias() == null || medias.get(0).getMedias().size() == 0 || medias.get(0).getMedias().get(0) == null) {
200 204 return;
201 205 }
202 206 mediaActivity.allMedias.addAll(medias.get(0).getMedias());
... ...