1. 统一Android sdk为30

2. 兼容Android Q版本,修复选择图片闪退的问题。

.gitignore

@@ -10,3 +10,4 @@
 /.idea/caches/*.ser
 /.idea/codeStyles/*.xml
 /.idea/*.xml
+/app/release

app/build.gradle

@@ -45,7 +45,7 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    implementation "androidx.appcompat:appcompat:$rootProject.ext.androidSupportSdkVersion"
+    implementation "androidx.appcompat:appcompat:$rootProject.ext.appcompatSdkVersion"
     implementation project(path: ':multilibrary')
     implementation project(path: ':progresslibrary')
     implementation project(':albumCameraRecorderCommon')

build.gradle

@@ -34,11 +34,14 @@ ext {
     versionCode = 1016
     versionName = '1.0.16'
 
-    androidCompileSdkVersion = 28
+    androidCompileSdkVersion = 30
     androidBuildToolsVersion = '26.0.2'
-    androidSupportSdkVersion = '1.0.0'
+    recyclerviewSdkVersion = '1.1.0'
+    appcompatSdkVersion = '1.2.0'
+    constraintlayoutSdkVersion = '2.0.1'
+    androidMaterialSdkVersion = '1.2.1'
     minSdkVersion = 16
-    targetSdkVersion = 28
+    targetSdkVersion = 30
 
     junitVersion = '4.12'
 

common/build.gradle

@@ -29,6 +29,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    api "androidx.appcompat:appcompat:$rootProject.ext.androidSupportSdkVersion"
+    api "androidx.appcompat:appcompat:$rootProject.ext.appcompatSdkVersion"
 
 }

common/src/main/java/gaode/zhongjh/com/common/enums/MimeType.java

@@ -99,6 +99,21 @@ public static Set<MimeType> ofVideo() {
         return EnumSet.of(MPEG, MP4, QUICKTIME, THREEGPP, THREEGPP2, MKV, WEBM, TS, AVI);
     }
 
+    public static boolean isImage(String mimeType) {
+        if (mimeType == null) return false;
+        return mimeType.startsWith("image");
+    }
+
+    public static boolean isVideo(String mimeType) {
+        if (mimeType == null) return false;
+        return mimeType.startsWith("video");
+    }
+
+    public static boolean isGif(String mimeType) {
+        if (mimeType == null) return false;
+        return mimeType.equals(MimeType.GIF.toString());
+    }
+
     private static Set<String> arraySetOf(String... suffixes) {
         return new ArraySet<>(Arrays.asList(suffixes));
     }

multilibrary/build.gradle

@@ -28,10 +28,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    api "androidx.recyclerview:recyclerview:$rootProject.ext.androidSupportSdkVersion"
-    api "androidx.appcompat:appcompat:$rootProject.ext.androidSupportSdkVersion"
-    api 'androidx.constraintlayout:constraintlayout:1.1.3'
-    api "com.google.android.material:material:$rootProject.ext.androidSupportSdkVersion"
+    api "androidx.recyclerview:recyclerview:$rootProject.ext.recyclerviewSdkVersion"
+    api "androidx.appcompat:appcompat:$rootProject.ext.appcompatSdkVersion"
+    api "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintlayoutSdkVersion"
+    api "com.google.android.material:material:$rootProject.ext.androidMaterialSdkVersion"
     implementation 'it.sephiroth.android.library.imagezoom:library:1.0.4'
     // 图片
     compileOnly 'com.github.bumptech.glide:glide:3.7.0'

multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/album/AlbumsSpinnerAdapter.java

@@ -57,6 +57,6 @@ public void bindView(View view, Context context, Cursor cursor) {
         // do not need to load animated Gif
         GlobalSpec.getInstance().imageEngine.loadThumbnail(context, context.getResources().getDimensionPixelSize(R
                         .dimen.media_grid_size), mPlaceholder,
-                view.findViewById(R.id.album_cover), Uri.fromFile(new File(album.getCoverPath())));
+                view.findViewById(R.id.album_cover), album.getCoverUri());
     }
 }

multilibrary/src/main/java/com/zhongjh/albumcamerarecorder/album/entity/Album.java

@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.database.Cursor;
+import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.MediaStore;
@@ -46,20 +47,20 @@ public Album[] newArray(int size) {
     public static final String ALBUM_NAME_ALL = "All";
 
     private final String mId;
-    private final String mCoverPath;
+    private final Uri mCoverUri;
     private final String mDisplayName;
     private long mCount;
 
-    Album(String id, String coverPath, String albumName, long count) {
+    Album(String id, Uri coverUri, String albumName, long count) {
         mId = id;
-        mCoverPath = coverPath;
+        mCoverUri = coverUri;
         mDisplayName = albumName;
         mCount = count;
     }
 
     Album(Parcel source) {
         mId = source.readString();
-        mCoverPath = source.readString();
+        mCoverUri = source.readParcelable(Uri.class.getClassLoader());
         mDisplayName = source.readString();
         mCount = source.readLong();
     }
@@ -69,9 +70,10 @@ public Album[] newArray(int size) {
      * 此方法不负责管理光标资源，如关闭、迭代等。
      */
     public static Album valueOf(Cursor cursor) {
+        String clumn = cursor.getString(cursor.getColumnIndex(AlbumLoader.COLUMN_URI));
         return new Album(
                 cursor.getString(cursor.getColumnIndex("bucket_id")),
-                cursor.getString(cursor.getColumnIndex(MediaStore.MediaColumns.DATA)),
+                Uri.parse(clumn != null ? clumn : ""),
                 cursor.getString(cursor.getColumnIndex("bucket_display_name")),
                 cursor.getLong(cursor.getColumnIndex(AlbumLoader.COLUMN_COUNT)));
     }
@@ -84,7 +86,7 @@ public int describeContents() {
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(mId);
-        dest.writeString(mCoverPath);
+        dest.writeParcelable(mCoverUri, 0);
         dest.writeString(mDisplayName);
         dest.writeLong(mCount);
     }
@@ -93,8 +95,8 @@ public String getId() {
         return mId;
     }
 
-    public String getCoverPath() {
-        return mCoverPath;
+    public Uri getCoverUri() {
+        return mCoverUri;
     }
 
     public long getCount() {