修改show的方式

XuQK · Feb 1, 2020 · cd1b454 · cd1b454
1 parent cb66772
commit cd1b454
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/app/src/main/java/github/xuqk/kdimageviewer/sample/MainActivity.kt b/app/src/main/java/github/xuqk/kdimageviewer/sample/MainActivity.kt
@@ -53,55 +53,55 @@ class MainActivity : AppCompatActivity() {
             .override(Target.SIZE_ORIGINAL)
             .into(iv0)
         iv0.setOnClickListener {
-            ivHelper.setImageData(originList, list, iv0, 0).show()
+            ivHelper.show(originList, list, iv0, 0)
         }
 
         Glide.with(iv1)
             .load(list[1])
             .override(Target.SIZE_ORIGINAL)
             .into(iv1)
         iv1.setOnClickListener {
-            ivHelper.setImageData(originList, list, iv1,  1).show()
+            ivHelper.show(originList, list, iv1,  1)
         }
 
         Glide.with(iv2)
             .load(list[2])
             .override(Target.SIZE_ORIGINAL)
             .into(iv2)
         iv2.setOnClickListener {
-            ivHelper.setImageData(originList, list, iv2, 2).show()
+            ivHelper.show(originList, list, iv2, 2)
         }
 
         Glide.with(iv3)
             .load(list[3])
             .override(Target.SIZE_ORIGINAL)
             .into(iv3)
         iv3.setOnClickListener {
-            ivHelper.setImageData(originList, list, iv3, 3).show()
+            ivHelper.show(originList, list, iv3, 3)
         }
 
         Glide.with(iv4)
             .load(list[4])
             .override(Target.SIZE_ORIGINAL)
             .into(iv4)
         iv4.setOnClickListener {
-            ivHelper.setImageData(originList, list, iv4, 4).show()
+            ivHelper.show(originList, list, iv4, 4)
         }
 
         Glide.with(iv5)
             .load(list[5])
             .override(Target.SIZE_ORIGINAL)
             .into(iv5)
         iv5.setOnClickListener {
-            ivHelper.setImageData(originList, list, iv5, 5).show()
+            ivHelper.show(originList, list, iv5, 5)
         }
 
         Glide.with(iv6)
             .load(list[6])
             .override(Target.SIZE_ORIGINAL)
             .into(iv6)
         iv6.setOnClickListener {
-            ivHelper.setImageData(originList, list, iv6, 6).show()
+            ivHelper.show(originList, list, iv6, 6)
         }
 
     }

diff --git a/kdimageviewer/src/main/java/github/xuqk/kdimageviewer/DragPhotoViewHelper.kt b/kdimageviewer/src/main/java/github/xuqk/kdimageviewer/DragPhotoViewHelper.kt
@@ -93,7 +93,10 @@ class DragPhotoViewHelper(
         }
     }
 
-    fun setImageData(originUrlList: List<String?>, thumbUrlList: List<String?>, srcView: ImageView, position: Int): DragPhotoViewHelper {
+    fun show(originUrlList: List<String?>, thumbUrlList: List<String?>, srcView: ImageView, position: Int) {
+        if (photoViewContainer.isAnimating) return
+        showing = true
+
         this.originUrlList.clear()
         this.originUrlList.addAll(originUrlList)
         this.thumbUrlList.clear()
@@ -105,12 +108,7 @@ class DragPhotoViewHelper(
         pager.currentItem = position
 
         this.srcView = srcView
-        return this
-    }
 
-    fun show() {
-        if (photoViewContainer.isAnimating) return
-        showing = true
         photoViewContainer.isAnimating = true
 
         // 将snapshotView设置成列表中的srcView的样子