调整sop视频时间限制

baseSDK/src/main/java/com/dayu/base/ui/adapter/MediaChooseAdapter.java

@@ -38,6 +38,7 @@ public class MediaChooseAdapter extends RecyclerView.Adapter<MediaChooseAdapter.
     private OnItemClickListener<MediaChooseAdapter.Holder, Integer> listener;
     private OnItemClickListener<MediaChooseAdapter.Holder, Integer> listener;
     private boolean addEmpty;
     private boolean addEmpty;
     private boolean canEdit = true;
     private boolean canEdit = true;
+    private boolean showCamera = true;
 
 
     AdapterListener adapterListener;
     AdapterListener adapterListener;
 
 
@@ -93,6 +94,10 @@ public class MediaChooseAdapter extends RecyclerView.Adapter<MediaChooseAdapter.
         }
         }
     }
     }
 
 
+    public void setShowCamera(boolean showCamera) {
+        this.showCamera = showCamera;
+    }
+
     public void setVideoLength(int videoLength) {
     public void setVideoLength(int videoLength) {
         this.videoLength = videoLength;
         this.videoLength = videoLength;
     }
     }
@@ -195,7 +200,7 @@ public class MediaChooseAdapter extends RecyclerView.Adapter<MediaChooseAdapter.
                 .imageSpanCount(4)// 每行显示个数 int
                 .imageSpanCount(4)// 每行显示个数 int
                 .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
                 .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
                 .previewImage(true)// 是否可预览图片 true or false
                 .previewImage(true)// 是否可预览图片 true or false
-                .isCamera(true)// 是否显示拍照按钮 true or false
+                .isCamera(showCamera)// 是否显示拍照按钮 true or false
                 .recordVideoSecond(videoLength)
                 .recordVideoSecond(videoLength)
                 .videoMaxSecond(videoLength)
                 .videoMaxSecond(videoLength)
                 .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
                 .isZoomAnim(true)// 图片列表点击 缩放效果 默认true

baseSDK/src/main/res/layout/activity_camera_sop.xml

@@ -9,7 +9,7 @@
         android:id="@+id/jcameraview"
         android:id="@+id/jcameraview"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_height="match_parent"
-        app:duration_max="31000"
+        app:duration_max="61000"
         app:iconLeft="@drawable/ic_back"
         app:iconLeft="@drawable/ic_back"
         app:iconMargin="20dp"
         app:iconMargin="20dp"
         app:iconRight="@null"
         app:iconRight="@null"

orderCenter/src/main/java/com/dayu/order/ui/activity/SopLocalActivity.java

@@ -90,6 +90,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
 
 
     @Override
     @Override
     public void initView() {
     public void initView() {
+        requestPermission();
         mBundle = getIntent().getBundleExtra(Constants.BUNDLE);
         mBundle = getIntent().getBundleExtra(Constants.BUNDLE);
         canEdit = mBundle.getBoolean(Constants.SOP_CAN_EDIT, true);
         canEdit = mBundle.getBoolean(Constants.SOP_CAN_EDIT, true);
         int id = mBundle.getInt(Constants.ORDER_ID);
         int id = mBundle.getInt(Constants.ORDER_ID);
@@ -124,8 +125,6 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
 
 
     private void setAdapterListener() {
     private void setAdapterListener() {
         mAdapter.setAdapterListener(() -> {
         mAdapter.setAdapterListener(() -> {
-            mImages.clear();
-            mVideos.clear();
             showChooseDailog();
             showChooseDailog();
         });
         });
     }
     }
@@ -390,8 +389,9 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
         mAdapter = new MediaChooseAdapter(this, mVideos,
         mAdapter = new MediaChooseAdapter(this, mVideos,
                 1, PictureMimeType.ofVideo(), true);
                 1, PictureMimeType.ofVideo(), true);
         mAdapter.setCanEdit(canEdit);
         mAdapter.setCanEdit(canEdit);
+        mAdapter.setShowCamera(false);
         mAdapter.setRequestCode(1002);
         mAdapter.setRequestCode(1002);
-        mAdapter.setVideoLength(31);
+        mAdapter.setVideoLength(61);
         mBind.photo.setAdapter(mAdapter);
         mBind.photo.setAdapter(mAdapter);
         setAdapterListener();
         setAdapterListener();
     }
     }
@@ -403,9 +403,11 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
         list.add("视频");
         list.add("视频");
         TextDialog.getInstance().showBottomDialog(mActivity, list, pos -> {
         TextDialog.getInstance().showBottomDialog(mActivity, list, pos -> {
             if (pos == 0) {
             if (pos == 0) {
+                mImages.clear();
                 setImgAdapter();
                 setImgAdapter();
                 mAdapter.showPicDialog();
                 mAdapter.showPicDialog();
             } else {
             } else {
+                mVideos.clear();
                 setVideoAdapter();
                 setVideoAdapter();
                 showVideoDailog();
                 showVideoDailog();
             }
             }
@@ -451,6 +453,21 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
         });
         });
     }
     }
 
 
+    private void requestPermission() {
+        String[] mPerArr = new String[]{Manifest.permission.RECORD_AUDIO};
+
+        MPermissionUtils.requestPermissionsResult(mActivity, 1, mPerArr, new MPermissionUtils.OnPermissionListener() {
+            @SuppressLint("CheckResult")
+            @Override
+            public void onPermissionGranted() {
+            }
+
+            @Override
+            public void onPermissionDenied() {
+            }
+        });
+    }
+
     @Override
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         super.onActivityResult(requestCode, resultCode, data);