修改了图片fragment传参的方式

Author: wanglu1209

README.md

@@ -90,6 +90,10 @@ PhotoViewer
 
 ## 更新日志
 
+### 0.44
+
+修改了图片fragment传参的方式
+
 ### 0.43
 
 修复了图片放大到最大点击退出崩溃的问题

photoviewer/src/main/java/com/wanglu/photoviewerlibrary/PhotoViewer.kt

@@ -43,8 +43,6 @@ object PhotoViewer {
     private var indicatorType = INDICATOR_TYPE_DOT   // 默认type为小圆点
 
 
-
-
     /**
      * 小圆点的drawable
      * 下标0的为没有被选中的
@@ -205,7 +203,7 @@ object PhotoViewer {
         /**
          * 文字版本当前页
          */
-        var tv:TextView ?= null
+        var tv: TextView? = null
 
 
 
@@ -223,11 +221,7 @@ object PhotoViewer {
                 }
 
             }
-            val b = Bundle()
-            b.putString("pic_data", imgData[i])
-            b.putIntArray("exit_location", getCurrentViewLocation())
-            b.putIntArray("img_size", intArrayOf(getItemView().measuredWidth, getItemView().measuredHeight))
-            f.arguments = b
+            f.setData(intArrayOf(getItemView().measuredWidth, getItemView().measuredHeight), getCurrentViewLocation(), imgData[i], true)
             f.longClickListener = longClickListener
             fragments.add(f)
         }
@@ -275,18 +269,13 @@ object PhotoViewer {
                 /**
                  * 设置文字版本当前页的值
                  */
-                if(tv != null){
+                if (tv != null) {
                     tv!!.text = "${currentPage + 1}/${imgData.size}"
                 }
 
                 // 这里延时0.2s是为了解决上面👆的问题。因为如果刚调用ScrollToPosition方法，就获取itemView是获取不到的，所以要延时一下
                 Timer().schedule(timerTask {
-                    val b = Bundle()
-                    b.putString("pic_data", imgData[currentPage])
-                    b.putIntArray("img_size", intArrayOf(getItemView().measuredWidth, getItemView().measuredHeight))
-                    b.putBoolean("in_anim", false)
-                    b.putIntArray("exit_location", getCurrentViewLocation())
-                    fragments[currentPage].arguments = b
+                    fragments[currentPage].setData(intArrayOf(getItemView().measuredWidth, getItemView().measuredHeight), getCurrentViewLocation(), imgData[currentPage], false)
                 }, 200)
 
             }

photoviewer/src/main/java/com/wanglu/photoviewerlibrary/PhotoViewerFragment.kt

@@ -15,6 +15,20 @@ class PhotoViewerFragment : BaseLazyFragment() {
     var exitListener: OnExitListener? = null
     var longClickListener: OnLongClickListener? = null
 
+    private var mImgSize = IntArray(2)
+    private var mExitLocation = IntArray(2)
+    private var mInAnim = true
+    private var mPicData = ""
+    /**
+     * 每次选中图片后设置图片信息
+     */
+    fun setData(imgSize: IntArray, exitLocation: IntArray, picData: String, inAnim: Boolean) {
+        mImgSize = imgSize
+        mExitLocation = exitLocation
+        mInAnim = inAnim
+        mPicData = picData
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 
         return inflater.inflate(R.layout.item_picture, container, false)
@@ -25,11 +39,9 @@ class PhotoViewerFragment : BaseLazyFragment() {
     }
 
 
+
     override fun onLazyLoad() {
 
-        val mExitLocation: IntArray = arguments!!.getIntArray("exit_location")
-        val mImgSize: IntArray = arguments!!.getIntArray("img_size")
-        val mPicData = arguments!!.getString("pic_data")
 
         if (PhotoViewer.mInterface != null) {
             PhotoViewer.mInterface!!.show(mIv, mPicData)
@@ -41,7 +53,7 @@ class PhotoViewerFragment : BaseLazyFragment() {
         mIv.setExitLocation(mExitLocation)
         mIv.setImgSize(mImgSize)
         mIv.setOnLongClickListener {
-            if(longClickListener != null){
+            if (longClickListener != null) {
                 longClickListener!!.onLongClick(it)
             }
             true
@@ -76,7 +88,7 @@ class PhotoViewerFragment : BaseLazyFragment() {
         }
 
         // 添加点击进入时的动画
-        if (arguments!!.getBoolean("in_anim", true))
+        if (mInAnim)
             mIv.post {
 
                 val scaleOa = ObjectAnimator.ofFloat(mIv, "scale", mImgSize[0].toFloat() / mIv.width, 1f)