处理默认

吴奎庆
1 parent 5412eba4
Showing 7 changed files with 9 additions and 6 deletions
config.gradle
lib_media/src/main/java/com/cnlive/media/PickerConfig.java
lib_media/src/main/java/com/cnlive/media/frame/presenter/MediaPresenter.java
lib_media/src/main/java/com/cnlive/media/frame/view/RecordFragmentView.java
lib_media/src/main/java/com/cnlive/media/model/ImagePickerOptions.java
lib_media/src/main/java/com/cnlive/media/ui/activity/MediaActivity.java
lib_media/src/main/java/com/cnlive/media/ui/widget/record/ShootView.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.2.4",
+            version: "1.0.2.5",
             //Lib库前缀
             packeg : "com.cnlive.media",
             //Lib库名称
@@ -9,6 +9,7 @@ public class PickerConfig {
     //视频文件最大时长
     public static final String MAX_TIME = "max_time";
+    public static final int RECODE_MAX_TIME = 60*1000;
     // 默认视频时长
     public static final int DEFAULT_MAX_TIME = Integer.MAX_VALUE;
     //最大选择个数
@@ -88,7 +88,7 @@ public class MediaPresenter extends MvpBasePresenter&lt;MediaView&gt; {
                 mediaPickerActivity.mOptions.setJumpCameraMode(PickerConfig.CAMERA_MODE_ALL);
             }
         }
-
+        mediaPickerActivity.maxTime = mediaPickerActivity.mOptions.getMaxTime();
         mediaPickerActivity.showTime = mediaPickerActivity.mOptions.isShowTime();
         mediaPickerActivity.selectGift = mediaPickerActivity.mOptions.isSelectGift();
         mediaPickerActivity.singlePick = mediaPickerActivity.mOptions.isSinglePick();
@@ -90,7 +90,7 @@ public class RecordFragmentView implements MvpView, PLRecordStateListener {
         if (getActivity().mOptions != null && getActivity().mOptions.getMaxTime() > 0) {
             recordSetting.setMaxRecordDuration(getActivity().mOptions.getMaxTime());
         } else {
-            recordSetting.setMaxRecordDuration(60 * 1000);
+            recordSetting.setMaxRecordDuration(PickerConfig.RECODE_MAX_TIME);
         }
         recordSetting.setRecordSpeedVariable(true);
@@ -42,7 +42,7 @@ public class ImagePickerOptions implements Parcelable {
     public boolean singlePick = false;
     //展示时长
     public boolean showTime = false;
-    public int maxTime = PickerConfig.DEFAULT_MAX_TIME;
+    public int maxTime = PickerConfig.RECODE_MAX_TIME;
     //是否选择Gif
     public boolean selectGift = true;
     //处理返回uri地址
@@ -63,6 +63,8 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
     public String MEDIA_HOME = "tag_media_home";
     public String MEDIA_PRE = "tag_media_pre";
+    public int maxTime = PickerConfig.RECODE_MAX_TIME;
+
     //配置
     public ImagePickerOptions mOptions;
     //加载器
@@ -54,7 +54,7 @@ public class ShootView extends View implements Runnable {
     //当前进度
     int curProgress = 0;
     //最大进度
-    int maxTime = 10000;
+    int maxTime = PickerConfig.RECODE_MAX_TIME;
     //倒计时时间
     Paint innerPaint;
@@ -93,7 +93,7 @@ public class ShootView extends View implements Runnable {
         progressWidth = typedArray.getDimensionPixelSize(R.styleable.MediaShootViewStyle_mediaProgressWidth, 10);
         curProgress = typedArray.getInt(R.styleable.MediaShootViewStyle_curProgress, 0);
-        maxTime = typedArray.getInt(R.styleable.MediaShootViewStyle_maxProgress, PickerConfig.DEFAULT_MAX_TIME);
+        maxTime = typedArray.getInt(R.styleable.MediaShootViewStyle_maxProgress, PickerConfig.RECODE_MAX_TIME);
         typedArray.recycle();