Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/NewMediaPicker

朱显松
2 parents 841318b4 66fe8bb6
Showing 4 changed files with 7 additions and 9 deletions
config.gradle
lib_media/src/main/java/com/cnlive/media/frame/view/MediaView.java
lib_media/src/main/java/com/cnlive/media/frame/view/RecordFragmentView.java
lib_media/src/main/java/com/cnlive/media/ui/fragment/RecordFragment.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.1.5.3",
+            version: "1.1.5.5",
             //Lib库前缀
             packeg : "com.cnlive.media",
             //Lib库名称
@@ -271,7 +271,7 @@ public class MediaView implements MvpView {
      */
     public void setSelectText(Media media) {
         if (mActivity.selects.size() > 0) {
-            String finishText = String.format(mActivity.getResources().getString(R.string.btn_imagepicker_ok), mActivity.selects.size(),3 == mActivity.selects.get(0).mediaType ? 1 : mActivity.maxNum);
+            String finishText = String.format(mActivity.getResources().getString(R.string.btn_imagepicker_ok), mActivity.selects.size(), mActivity.maxNum);
             bDone.setText(finishText);
             bDone.setVisibility(View.VISIBLE);
         } else {
@@ -10,11 +10,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.OvershootInterpolator;
-import androidx.activity.OnBackPressedCallback;
-
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.media.PickerConfig;
-import com.cnlive.media.ui.activity.MediaActivity;
 import com.cnlive.media.ui.activity.RecordActivity;
 import com.cnlive.media.ui.fragment.RecordFragment;
 import com.cnlive.media.utils.AndroidQUtil;
@@ -71,9 +68,9 @@ public class RecordFragmentView implements MvpView, PLRecordStateListener {
         if (cameraSetting == null)
             cameraSetting = new PLCameraSetting();
         //设置摄像头
-        if (SamsungCamaerUtil.isSamsungAndOpenFont(mFragment.getActivity())){
+        if (SamsungCamaerUtil.isSamsungAndOpenFont(mFragment.getActivity())) {
             cameraSetting.setCameraId(PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_FRONT);
-        }else {
+        } else {
             cameraSetting.setCameraId(chooseCameraFacingId());
         }
@@ -163,6 +160,7 @@ public class RecordFragmentView implements MvpView, PLRecordStateListener {
         } else if (PLCameraSetting.hasCameraFacing(PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_BACK)) {
             return PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_BACK;
         } else {
+            processFlash(false);
             return PLCameraSetting.CAMERA_FACING_ID.CAMERA_FACING_FRONT;
         }
     }
@@ -18,7 +18,6 @@ import androidx.core.app.ActivityCompat;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.libs.base.util.DoublePressed;
 import com.cnlive.libs.util.Config;
-import com.cnlive.media.PickerConfig;
 import com.cnlive.media.R;
 import com.cnlive.media.databinding.FragmentRecordBinding;
 import com.cnlive.media.frame.presenter.RecordFragmentPresenter;
@@ -143,7 +142,7 @@ public class RecordFragment extends MvpBindingFragment&lt;RecordFragmentView, Recor
         if (plShortVideoRecorder != null) {
             binding.rcControl.resetRecord();
             plShortVideoRecorder.pause();
-            isFlash=false;
+            isFlash = false;
             getMvpView().processFlash(isFlash);
         }
     }
@@ -189,6 +188,7 @@ public class RecordFragment extends MvpBindingFragment&lt;RecordFragmentView, Recor
                 } else {
                     if (DoublePressed.onDoublePressed()) return;
                     plShortVideoRecorder.switchCamera();
+                    getMvpView().processFlash(false);
                 }
             } else if (state == RecordCameraViewObservable.CLICK_FINISH) {
                 requireActivity().getOnBackPressedDispatcher().onBackPressed();