更新图片选择库版本

BaseLibrary/build.gradle

@@ -8,7 +8,7 @@ plugins {
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 android {
-    compileSdk 30
+    compileSdk 31
 
     defaultConfig {
 
@@ -146,8 +146,8 @@ dependencies {
 
     api "de.hdodenhof:circleimageview:2.2.0"
 
-    api 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0'
-//    api 'io.github.lucksiege:pictureselector:v2.7.3-rc10'
+//    api 'com.github.LuckSiege.PictureSelector:picture_library:v2.6.0'
+    api 'io.github.lucksiege:pictureselector:v2.7.3-rc10'
 
     api "com.github.tbruyelle:rxpermissions:0.12"
 

BaseLibrary/src/main/java/com/cooleshow/base/utils/helper/GlideEngine.java

@@ -2,8 +2,6 @@ package com.cooleshow.base.utils.helper;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.PointF;
-import android.view.View;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
@@ -11,17 +9,12 @@ import com.bumptech.glide.load.resource.bitmap.BitmapTransitionOptions;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.BitmapImageViewTarget;
-import com.bumptech.glide.request.target.ImageViewTarget;
 import com.bumptech.glide.request.transition.DrawableCrossFadeFactory;
 import com.luck.picture.lib.engine.ImageEngine;
 import com.luck.picture.lib.listener.OnImageCompleteCallback;
-import com.luck.picture.lib.tools.MediaUtils;
-import com.luck.picture.lib.widget.longimage.ImageSource;
-import com.luck.picture.lib.widget.longimage.ImageViewState;
 import com.luck.picture.lib.widget.longimage.SubsamplingScaleImageView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.core.graphics.drawable.RoundedBitmapDrawable;
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 
@@ -71,39 +64,39 @@ public class GlideEngine implements ImageEngine {
      * @param imageView
      * @param longImageView
      */
-    @Override
-    public void loadImage(@NonNull Context context, @NonNull String url,
-                          @NonNull ImageView imageView,
-                          SubsamplingScaleImageView longImageView) {
-        Glide.with(context)
-                .asBitmap()
-                .load(url)
-                .into(new ImageViewTarget<Bitmap>(imageView) {
-                    @Override
-                    protected void setResource(@Nullable Bitmap resource) {
-                        if (resource != null) {
-                            boolean eqLongImage = MediaUtils.isLongImg(resource.getWidth(),
-                                    resource.getHeight());
-                            longImageView.setVisibility(eqLongImage ? View.VISIBLE : View.GONE);
-                            imageView.setVisibility(eqLongImage ? View.GONE : View.VISIBLE);
-                            if (eqLongImage) {
-                                // 加载长图
-                                longImageView.setQuickScaleEnabled(true);
-                                longImageView.setZoomEnabled(true);
-                                longImageView.setPanEnabled(true);
-                                longImageView.setDoubleTapZoomDuration(100);
-                                longImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP);
-                                longImageView.setDoubleTapZoomDpi(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER);
-                                longImageView.setImage(ImageSource.bitmap(resource),
-                                        new ImageViewState(0, new PointF(0, 0), 0));
-                            } else {
-                                // 普通图片
-                                imageView.setImageBitmap(resource);
-                            }
-                        }
-                    }
-                });
-    }
+//    @Override
+//    public void loadImage(@NonNull Context context, @NonNull String url,
+//                          @NonNull ImageView imageView,
+//                          SubsamplingScaleImageView longImageView) {
+//        Glide.with(context)
+//                .asBitmap()
+//                .load(url)
+//                .into(new ImageViewTarget<Bitmap>(imageView) {
+//                    @Override
+//                    protected void setResource(@Nullable Bitmap resource) {
+//                        if (resource != null) {
+//                            boolean eqLongImage = MediaUtils.isLongImg(resource.getWidth(),
+//                                    resource.getHeight());
+//                            longImageView.setVisibility(eqLongImage ? View.VISIBLE : View.GONE);
+//                            imageView.setVisibility(eqLongImage ? View.GONE : View.VISIBLE);
+//                            if (eqLongImage) {
+//                                // 加载长图
+//                                longImageView.setQuickScaleEnabled(true);
+//                                longImageView.setZoomEnabled(true);
+//                                longImageView.setPanEnabled(true);
+//                                longImageView.setDoubleTapZoomDuration(100);
+//                                longImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP);
+//                                longImageView.setDoubleTapZoomDpi(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER);
+//                                longImageView.setImage(ImageSource.bitmap(resource),
+//                                        new ImageViewState(0, new PointF(0, 0), 0));
+//                            } else {
+//                                // 普通图片
+//                                imageView.setImageBitmap(resource);
+//                            }
+//                        }
+//                    }
+//                });
+//    }
 
     /**
      * 加载相册目录
@@ -145,14 +138,14 @@ public class GlideEngine implements ImageEngine {
      * @param url       图片路径
      * @param imageView 承载图片ImageView
      */
-    @Override
-    public void loadAsGifImage(@NonNull Context context, @NonNull String url,
-                               @NonNull ImageView imageView) {
-        Glide.with(context)
-                .asGif()
-                .load(url)
-                .into(imageView);
-    }
+//    @Override
+//    public void loadAsGifImage(@NonNull Context context, @NonNull String url,
+//                               @NonNull ImageView imageView) {
+//        Glide.with(context)
+//                .asGif()
+//                .load(url)
+//                .into(imageView);
+//    }
 
     /**
      * 加载图片列表图片

student/build.gradle

@@ -12,7 +12,7 @@ kapt {
     }
 }
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.cooleshow.student"

teacher/build.gradle

@@ -14,7 +14,7 @@ kapt {
     }
 }
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.cooleshow.teacher"