1、升级Glide版本至4.8;2、优化PhotoGroupView绘制层级

Author: dida-logistics

app/src/main/java/pizzk/media/picker/demo/MainActivity.kt

@@ -19,14 +19,14 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        PickControl.authority(getString(R.string.file_provider))
         //多张选择示例
         val photoGroup: PhotoGroupView = findViewById(R.id.photoGroup)
         val size: Int = resources.getDimensionPixelSize(R.dimen.x75)
         val tvHint: TextView = findViewById(R.id.tvHint)
         val lp: ViewGroup.LayoutParams = ViewGroup.LayoutParams(size, size)
         val special: PhotoGroupView.Special = PhotoGroupView.Special(
-                this@MainActivity, lp = lp, limit = 4,
-                authority = getString(R.string.file_provider), column = 4
+                this@MainActivity, lp = lp, limit = 4, column = 4
         )
         photoGroup.setup(special, emptyList(), false) {
             tvHint.text = "(${it.selectCount()}/${special.limit})"

app/src/main/res/layout/activity_main.xml

@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/tvTitleMulti"
-        android:background="@color/album_item_mask"
+        android:background="#00ffffff"
         android:paddingBottom="@dimen/pick_media_activity_margin"
         android:paddingLeft="@dimen/pick_media_activity_margin"
         android:paddingRight="@dimen/pick_media_activity_margin"

picker/build.gradle

@@ -32,7 +32,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     api 'com.android.support:recyclerview-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
-    implementation 'com.github.bumptech.glide:glide:4.7.1'
+    api 'com.github.bumptech.glide:glide:4.8.0'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
 
 }

picker/src/main/res/drawable/shape_pick_chose_background.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_white"/>
+    <solid android:color="@color/pick_photo_background"/>
     <corners android:radius="@dimen/pick_chose_bkg_radius"/>
 </shape>

picker/src/main/res/drawable/shape_pick_photo_dash.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#ffffffff"/>
+    <solid android:color="@android:color/transparent"/>
     <stroke
         android:width="@dimen/pick_photo_split_line"
         android:color="@color/pick_photo_dash_line"

picker/src/main/res/drawable/shape_pick_photo_solid.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#ffffffff"/>
+    <solid android:color="@android:color/transparent"/>
     <stroke
         android:width="@dimen/pick_photo_split_line"
         android:color="@color/pick_photo_solid_line"/>

picker/src/main/res/layout/pick_photo_list_item.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@color/color_white"
     android:foreground="?android:attr/selectableItemBackground"
     android:minHeight="@dimen/pick_photo_min_size"
     android:minWidth="@dimen/pick_photo_min_size"
@@ -22,7 +22,7 @@
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <ImageView
         android:id="@+id/imgTarget"
@@ -32,12 +32,12 @@
         android:contentDescription="@string/description"
         android:padding="@dimen/pick_photo_split_line"
         android:scaleType="centerCrop"
-        android:visibility="visible"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/tvHint"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <TextView
         android:id="@+id/tvHint"
@@ -53,7 +53,7 @@
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"/>
 
     <ImageView
         android:id="@+id/imgDelete"
@@ -68,6 +68,6 @@
         android:visibility="visible"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
 </android.support.constraint.ConstraintLayout>

picker/src/main/res/values/colors.xml

@@ -20,6 +20,7 @@
     <color name="bottom_tool_text">#ffffff</color>
     <color name="pick_title_color">#ffffff</color>
     <!--图片拾取-->
+    <color name="pick_photo_background">@android:color/transparent</color>
     <color name="pick_photo_dash_line">#dcdcdc</color>
     <color name="pick_photo_solid_line">#e6e6e6</color>
     <color name="pick_photo_hint_text_color">#222222</color>