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

吴奎庆
2 parents 23cbe5de cf29623d
Showing 4 changed files with 31 additions and 5 deletions
app/src/main/java/com/cnlive/strike/debug/MainActivity.java
config.gradle
gradle.properties
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
@@ -71,7 +71,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                         .maxImageSize(25 * 1024 * 1024)
                         .maxVideoSize(100*1024*1024)
                         .isReturnUri(AndroidQUtil.isAndroidQ())
-                        .selectMode(PickerConfig.PICKER_IMAGE_VIDEO)
+                        .selectMode(PickerConfig.PICKER_ONLY_ONE_TYPE)
                         .defaultSelectList(new ArrayList<Media>())
                         .needCamera(true)
                         .builder()
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.3.8",
+            version: "1.0.3.9",
             //Lib库前缀
             packeg : "com.cnlive.media",
             //Lib库名称
+## Project-wide Gradle settings.
+#
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Tue May 08 13:09:12 CST 2018
+org.gradle.jvmargs=-Xms5120m -Xmx7168m 
+android.injected.testOnly=false
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.configureondemand=true
+android.useAndroidX=true
+android.enableJetifier=true
 \ No newline at end of file
@@ -87,7 +87,9 @@ public class MediaPickerFragmentView implements MvpView {
                     if (mActivity.selects.size() > 0) {
                         showMessage(mFragment.getResources().getString(R.string.msg_type_limit));
                     } else {
-                        MeidaResultObservable.getInstance().finishMedia(true, media);
+                        if (isCheckMediaSupport(mActivity, media)) {
+                            MeidaResultObservable.getInstance().finishMedia(true, media);
+                        }
                     }
                 } else if (mActivity.mOptions.isSinglePick() || mActivity.mOptions.maxNum == 1) {
@@ -99,7 +101,9 @@ public class MediaPickerFragmentView implements MvpView {
                             MediaOpenActivityObservable.getInstance().openActivity(new MediaOpenInfo(2, media));
                         }
                     } else {
-                        MeidaResultObservable.getInstance().finishMedia(true, media);
+                        if (isCheckMediaSupport(mActivity, media)) {
+                            MeidaResultObservable.getInstance().finishMedia(true, media);
+                        }
                     }
                 } else {
                     if (isCheckMediaSupport(mActivity, media)) {
@@ -196,7 +200,7 @@ public class MediaPickerFragmentView implements MvpView {
     }
     public void initMediaData(MediaActivity mediaActivity, ArrayList<Folder> medias) {
-        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) {
+        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) {
             return;
         }
         mediaActivity.allMedias.addAll(medias.get(0).getMedias());