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

Conflicts: lib_media/src/main/java/com/cnlive/media/frame/view/RecordView.java

Merge branch 'test1' of bj.gitlab.cnlive.com:cnlive-team/NewMediaPicker into test1
Conflicts: lib_media/src/main/java/com/cnlive/media/frame/view/RecordView.java
朱显松
2 parents 3286cfc6 bf8a4c7b
Showing 3 changed files with 11 additions and 11 deletions
lib_media/src/main/java/com/cnlive/media/frame/view/RecordView.java
lib_media/src/main/java/com/cnlive/media/ui/adapter/MediaAdapter.java
lib_media/src/main/java/com/cnlive/media/utils/GlideCacheUtil.java
@@ -69,13 +69,7 @@ public class RecordView implements MvpView {
             hasPermissions = mActivity.getPresenter().checkPermissions(mActivity, mActivity.permissionsRecordNoAudio, mActivity.PERMISISSION_CODE_ASK, true);
         }
         if (hasPermissions) {
-            mActivity.isInit = true;
-            mActivity.getSupportFragmentManager()
-                    .beginTransaction()
-                    .replace(R.id.pre_frame, RecordFragment.newInstance())
-                    .addToBackStack("")
-                    .commit();
-
+            mActivity.getSupportFragmentManager().beginTransaction().replace(R.id.pre_frame, RecordFragment.newInstance()).addToBackStack("").commit();
         }
     }
@@ -40,12 +40,14 @@ public class MediaAdapter extends BaseRecyclerViewAdapter&lt;Media&gt; {
     OnItemClickListener listener;
     ImagePickerOptions mOptions;
     private MediaImageItemBinding binding;
+    int itemHight=0;
     public MediaAdapter(Context context, boolean showTime, ImagePickerOptions mOptions) {
         super(context);
         mContxt = context;
         this.showTime = showTime;
         this.mOptions = mOptions;
+        itemHight=getItemWidth();
     }
     /**
@@ -71,7 +73,7 @@ public class MediaAdapter extends BaseRecyclerViewAdapter&lt;Media&gt; {
                 break;
         }
         //让图片是个正方形
-        viewDataBinding.getRoot().setLayoutParams(new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, getItemWidth()));
+        viewDataBinding.getRoot().setLayoutParams(new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, itemHight));
         MediaViewHolder holder = new MediaViewHolder(viewDataBinding.getRoot());
         holder.setBinding(viewDataBinding);
         return holder;
@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Looper;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
@@ -207,7 +208,7 @@ public class GlideCacheUtil {
 //                rb = rm.asGif();
             } else {
                 option = option
-                        .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
+                        .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                         .centerCrop()
                         .dontAnimate();
             }
@@ -291,7 +292,7 @@ public class GlideCacheUtil {
         }
     }
-
+    static  long   start=0;
     @SuppressLint("CheckResult")
     public static void intoItemImageThumbnail(Context context, Media media, ImageView view, ProgressBar loading) {
@@ -311,7 +312,7 @@ public class GlideCacheUtil {
 //                rb = rm.asGif();
             } else {
                 option = option
-                        .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
+                        .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                         .dontAnimate();
             }
@@ -338,11 +339,14 @@ public class GlideCacheUtil {
                 @Override
                 public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
                     if (loading != null) loading.setVisibility(View.GONE);
+
+                    Log.e("加载:",System.currentTimeMillis()-start+"");
                     return false;
                 }
             });
             rb.apply(option).into(view);
+            start= System.currentTimeMillis();
         } catch (Exception e) {
             if (loading != null) loading.setVisibility(View.GONE);
         }