听云崩溃处理

吴奎庆
1 parent 23923a69
Showing 11 changed files with 33 additions and 21 deletions
app/src/main/java/com/cnlive/strike/debug/MainActivity.java
config.gradle
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
lib_media/src/main/java/com/cnlive/media/frame/view/MediaView.java
lib_media/src/main/java/com/cnlive/media/ui/activity/MediaActivity.java
lib_media/src/main/java/com/cnlive/media/ui/activity/RecordActivity.java
lib_media/src/main/java/com/cnlive/media/ui/adapter/PreviewBottomMediaAdapter.java
lib_media/src/main/java/com/cnlive/media/ui/fragment/MediaPickerFragment.java
lib_media/src/main/java/com/cnlive/media/utils/GlideCacheUtil.java
lib_media/src/main/java/com/cnlive/media/utils/ThumbnailsUtils.java
lib_media/src/main/res/layout/layout_record_camera.xml
@@ -51,11 +51,19 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         switch (view.getId()) {
             case R.id.tv_camera:
                 //打开相机
+
+
                 new ImagePicker
                         .Builder()
-                        .setJumpCameraMode(PickerConfig.CAMERA_MODE_ALL)
+                        .setJumpCameraMode(3)   // 1 图片 3 视频
                         .builder()
                         .startCamera(this, select, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
+
+//                new ImagePicker
+//                        .Builder()
+//                        .setJumpCameraMode(PickerConfig.CAMERA_MODE_ALL)
+//                        .builder()
+//                        .startCamera(this, select, PickerConfig.PICKER_IMAGE, PickerConfig.DEFAULT_RESULT_CODE);
                 break;
             case R.id.bt_preview:
                 //打开预览
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.3.9",
+            version: "1.0.4.4",
             //Lib库前缀
             packeg : "com.cnlive.media",
             //Lib库名称
@@ -137,7 +137,7 @@ public class MediaPickerFragmentView implements MvpView {
         if (isCheckMediaSupport(mActivity, media)) {
             MediaSelectStateObservable.getInstance().selectStateUpdateMedia(media);
             media.setSelect(!isSelect);
-            mFragment.mMediaAdapter.notifyItemChanged(position, media);
+            mFragment.mMediaAdapter.notifyItemChanged(position);
         }
     }
@@ -239,7 +239,7 @@ public class MediaView implements MvpView {
         if (mActivity.selects.indexOf(mMedia) < 0) {
             previewBottomAdapter = new PreviewBottomMediaAdapter(mActivity, 0, mActivity.isPre);
         } else {
-            previewBottomAdapter = new PreviewBottomMediaAdapter(mActivity, mActivity.selects.indexOf(mMedia), mActivity.isPre);
+            previewBottomAdapter = new PreviewBottomMediaAdapter(mActivity, mActivity.selects.indexOf(mMedia),true);
         }
         bottomRv.setAdapter(previewBottomAdapter);
         if (mActivity.selects != null && mActivity.selects.size() > 0) {
@@ -4,6 +4,7 @@ import android.Manifest;
 import android.app.Dialog;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.ListPopupWindow;
@@ -136,7 +137,7 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
     protected int getLayoutId() {
         return R.layout.activity_media;
     }
-
+    long time;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -145,12 +146,14 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
         if (getPresenter() != null) getPresenter().initIntentData(this);
         if (getMvpView() != null) getMvpView().initView();
         getSupportFragmentManager().beginTransaction().add(R.id.frame, MediaPickerFragment.newInstanse(), MEDIA_HOME).addToBackStack("").commit();
+         time=System.currentTimeMillis();
         getMediaData();
     }
     void getMediaData() {
         boolean hasPermissions = getPresenter()
                 .checkPermissions(this, permissionsRead, REQUEST_CODE_PERMISSION_READ, getResources().getString(R.string.dialog_imagepicker_permission_sdcard_nerver_ask_message), true);
+
         if (hasPermissions) {
             if (needCrop && singlePick) {
 //                ThumbnailsUtils.getThumbnails(this);
@@ -189,6 +192,7 @@ public class MediaActivity extends MvpBindingActivity&lt;MediaView, MediaPresenter,
         Fragment currentFragment = getSupportFragmentManager().findFragmentById(R.id.frame);
         if (currentFragment instanceof MediaPickerFragment) {
             ((MediaPickerFragment) currentFragment).setMediaData(list);
+            Log.e("时间:",System.currentTimeMillis()-time+"");
             if (mFolderAdapter != null) mFolderAdapter.updateAdapter(list);
         }
@@ -96,7 +96,6 @@ public class RecordActivity extends MvpBindingActivity&lt;RecordView, RecordPresent
                     if (mOptions.getJumpCameraMode() == PickerConfig.CAMERA_MODE_PIC) {
                         isNeedAudio = false;
                     } else {
-                        mOptions.setJumpCameraMode(PickerConfig.CAMERA_MODE_ALL);
                         isNeedAudio = true;
                     }
                 } else {
@@ -53,13 +53,11 @@ public class PreviewBottomMediaAdapter extends BaseRecyclerViewAdapter&lt;Media&gt; {
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         MediaViewHolder mediaViewHolder = (MediaViewHolder) holder;
         MediaPreviewBottomBarItemBinding bottomBarItemBinding = (MediaPreviewBottomBarItemBinding) mediaViewHolder.getBinding();
-        GlideCacheUtil.intoItemImageThumbnail(context, getItem(position), bottomBarItemBinding.bottomItemImageView, null);
-        if (isPre) {
-            if (selectedPosition == position) {
-                bottomBarItemBinding.bottomItemImageView.setBackgroundResource(R.drawable.shape_green_square_bg);
-            } else {
-                bottomBarItemBinding.bottomItemImageView.setBackgroundResource(R.drawable.shape_gray_square_bg);
-            }
+        GlideCacheUtil.intoItemImage(context, getItem(position), bottomBarItemBinding.bottomItemImageView, null);
+        if (selectedPosition == position) {
+            bottomBarItemBinding.bottomItemImageView.setBackgroundResource(R.drawable.shape_green_square_bg);
+        } else {
+            bottomBarItemBinding.bottomItemImageView.setBackgroundResource(R.drawable.shape_gray_square_bg);
         }
         bottomBarItemBinding.bottomItemImageView.setOnClickListener(v -> {
@@ -70,7 +68,7 @@ public class PreviewBottomMediaAdapter extends BaseRecyclerViewAdapter&lt;Media&gt; {
     public void updateBgState(int curPosition) {
-        if (curPosition < 0) return;
+//        if (curPosition < 0) return;
         selectedPosition = curPosition;
         notifyDataSetChanged();
     }
@@ -121,4 +121,8 @@ public class MediaPickerFragment extends MvpBindingFragment&lt;MediaPickerFragmentV
                 getMvpView().selectDateUpdate(mActivity, isUpdateMedia);
         }
     }
+
+    public void notifySelect(){
+
+    }
 }
@@ -319,7 +319,7 @@ public class GlideCacheUtil {
             if (FileTypeUtil.isGif(media.path)) {
             } else {
                 option = option
-                        .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
                         .dontAnimate();
             }
             if (media.mediaType == 1) {
@@ -36,7 +36,6 @@ public class ThumbnailsUtils {
             _id = cursor.getInt(_idColumn);
             image_id = cursor.getInt(image_idColumn);
             image_path = cursor.getString(dataColumn);
-            Log.e("缩略图视频:","--->videoId:"+image_id+" videoPath:"+image_path);
             thumbnails.put(image_id + "", image_path);
         }
         getImageThumbnails(context);
@@ -58,7 +57,6 @@ public class ThumbnailsUtils {
             _id = cursor.getInt(_idColumn);
             image_id = cursor.getInt(image_idColumn);
             image_path = cursor.getString(dataColumn);
-            Log.e("缩略图图片:","--->image_id:"+image_id+" image_path:"+image_path);
             thumbnails.put(image_id + "", image_path);
         }
     }
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/transparent">
@@ -64,8 +65,8 @@
             <com.cnlive.media.ui.widget.record.ShootView
                 android:id="@+id/shootView"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
+                android:layout_width="106dp"
+                android:layout_height="94dp"
                 android:layout_centerInParent="true"
                 app:innerRadius="28dp"
                 app:outerRadius="35dp" />