feat: 新增【只显示图片】【只显示视频】

Author: BzCoder

LibMediaPicker/src/main/java/me/bzcoder/mediapicker/camera/CameraActivity.java

@@ -40,9 +40,11 @@ public class CameraActivity extends AppCompatActivity {
      */
     public int buttonState;
 
+
     public int duration;
 
     public boolean isMirror;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -72,7 +74,7 @@ public void onError() {
 
             @Override
             public void AudioPermissionError() {
-                Toast.makeText(CameraActivity.this, "给点录音权限可以?", Toast.LENGTH_SHORT).show();
+                Toast.makeText(CameraActivity.this, "需要打开录音权限?", Toast.LENGTH_SHORT).show();
             }
         });
         if (buttonState != 0)
@@ -161,6 +163,11 @@ protected void onPause() {
         jCameraView.onPause();
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
     private void finishActivityWithAnim() {
         finish();
         overridePendingTransition(0, R.anim.camera_push_bottom_out);

LibMediaPicker/src/main/java/me/bzcoder/mediapicker/cameralibrary/CameraInterface.java

@@ -5,7 +5,6 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
 import android.graphics.ImageFormat;
 import android.graphics.Matrix;
 import android.graphics.Rect;
@@ -96,13 +95,16 @@ public static void destroyCameraInterface() {
     public static final int TYPE_RECORDER = 0x090;
     public static final int TYPE_CAPTURE = 0x091;
     private int nowScaleRate = 0;
-    private int recordScleRate = 0;
+    private int recordScaleRate = 0;
 
-    //视频质量
+
+    /**
+     * 视频质量
+     */
     private int mediaQuality = JCameraView.MEDIA_QUALITY_MIDDLE;
 
 
-    private SensorManager sm = null;
+    private SensorManager sensorManager = null;
 
     //获取CameraInterface单例
     public static synchronized CameraInterface getInstance() {
@@ -134,6 +136,7 @@ public void onSensorChanged(SensorEvent event) {
             rotationAnimation();
         }
 
+        @Override
         public void onAccuracyChanged(Sensor sensor, int accuracy) {
         }
     };
@@ -231,10 +234,10 @@ public void setZoom(float zoom, int type) {
                 if (zoom >= 0) {
                     //每移动50个像素缩放一个级别
                     int scaleRate = (int) (zoom / 40);
-                    if (scaleRate <= mParams.getMaxZoom() && scaleRate >= nowScaleRate && recordScleRate != scaleRate) {
+                    if (scaleRate <= mParams.getMaxZoom() && scaleRate >= nowScaleRate && recordScaleRate != scaleRate) {
                         mParams.setZoom(scaleRate);
                         mCamera.setParameters(mParams);
-                        recordScleRate = scaleRate;
+                        recordScaleRate = scaleRate;
                     }
                 }
                 break;
@@ -768,18 +771,18 @@ public interface FocusCallback {
 
 
     void registerSensorManager(Context context) {
-        if (sm == null) {
-            sm = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+        if (sensorManager == null) {
+            sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
         }
-        sm.registerListener(sensorEventListener, sm.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), SensorManager
+        sensorManager.registerListener(sensorEventListener, sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), SensorManager
                 .SENSOR_DELAY_NORMAL);
     }
 
     void unregisterSensorManager(Context context) {
-        if (sm == null) {
-            sm = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+        if (sensorManager == null) {
+            sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
         }
-        sm.unregisterListener(sensorEventListener);
+        sensorManager.unregisterListener(sensorEventListener);
     }
 
     void isPreview(boolean res) {

LibMediaPicker/src/main/java/me/bzcoder/mediapicker/photopicker/PhotoPickUtils.java

@@ -79,11 +79,14 @@ public void onComplete() {
             }
         });
     }
+
     private static void startMatisse(Boolean aBoolean, MediaPickerConfig config, Matisse matisse) {
         if (aBoolean) {
-            if (config.getImageEngine() == null)
+            if (config.getImageEngine() == null) {
                 throw new IllegalArgumentException("ImageEngine cannot be null");
+            }
             matisse.choose(config.getPhotoPickerMediaType())
+                    .showSingleMediaType(config.getMaxVideoSelectable() == 0 || config.getMaxImageSelectable() == 0)
                     .theme(R.style.Matisse_Zhihu)
                     .countable(config.isCountable())
                     .addFilter(new FileSizeFilter(config.getMaxWidth(), config.getMaxHeight(), config.getMaxVideoSize() * Filter.K * Filter.K, config.getMaxImageSize() * Filter.K * Filter.K, config.getMaxVideoLength()))

app/src/main/java/com/bzcoder/mediapicker/MainActivity.java

@@ -49,7 +49,7 @@ private void initView() {
 
         builder = SmartMediaPicker.builder(this)
                 //最大图片选择数目
-                .withMaxImageSelectable(5)
+                .withMaxImageSelectable(0)
                 //最大视频选择数目
                 .withMaxVideoSelectable(1)
                 //图片选择器是否显示数字