Merge branch 'master' of gitlab.huolea.com:yanglin/filemanager

MyDemo3/app/src/main/java/com/test/mydemo3/activity/SimilarImagesActivity.kt

 package com.test.mydemo3.activity
 
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.View.OnClickListener
 import android.widget.CheckBox
@@ -109,44 +110,43 @@ class SimilarImagesActivity : AppCompatActivity(), OnClickListener{
 
     private fun startDuplicateImages() {
 
-        Thread(Runnable {
-            MyApplication.mCleanSdk?.startSimilarScan(object : SimilarScanCallBack {
-                override fun onSmilarleError(p0: Int) {
-                    println("error : $p0")
-                    runOnUiThread {
-                        mStartAnimation.visibility = View.GONE
-                    }
+        MyApplication.mCleanSdk?.startSimilarScan(object : SimilarScanCallBack {
+            override fun onSmilarleError(p0: Int) {
+                println("error : $p0")
+                runOnUiThread {
+                    mStartAnimation.visibility = View.GONE
                 }
+            }
 
-                override fun onSmilarEmitOne(p0: PicSimilarInfo?) {
-                    var listPath = ArrayList<FileBean>()
+            override fun onSmilarEmitOne(p0: PicSimilarInfo?) {
+                var listPath = ArrayList<FileBean>()
 //                    for (i in p0?.getmList()!!) {
 //                        val fileBean = FileBean()
 //                        fileBean.filePath = i.path
 //                        listPath.add(fileBean)
 //                    }
 //                    mDataBeans.add(listPath)
-                    mSimilarDatas.add(p0!!)
+                mSimilarDatas.add(p0!!)
 
-                }
+            }
 
-                override fun onSmilarScanFinish() {
-                    runOnUiThread {
-                        mStartAnimation.visibility = View.GONE
-                        mEditBtn.visibility = View.VISIBLE
+            override fun onSmilarScanFinish() {
+                runOnUiThread {
+                    mStartAnimation.visibility = View.GONE
+                    mEditBtn.visibility = View.VISIBLE
 //                        if (mDataBeans.size == 0) {
-                        if (mSimilarDatas.size == 0) {
-                            findViewById<View>(R.id.not_file_found_layout).visibility = View.VISIBLE
-                        }else{
+                    if (mSimilarDatas.size == 0) {
+                        findViewById<View>(R.id.not_file_found_layout).visibility = View.VISIBLE
+                    }else{
 //                            mImageItemAdapter?.setData(mDataBeans)
-                            mSimilarBeanAdapter?.setData(mSimilarDatas)
-                        }
+                        Log.e("yanglin", "onSmilarScanFinish: mSimilarDatas.size = ${mSimilarDatas.size}", )
+                        mSimilarBeanAdapter?.setData(mSimilarDatas)
                     }
-
                 }
-            }, 15)
 
-        }).start()
+            }
+        }, 15)
+
     }
 
     override fun onClick(v: View?) {

MyDemo3/app/src/main/java/com/test/mydemo3/adapter/CleanAdapter.kt

@@ -26,7 +26,7 @@ class CleanAdapter(
     private var inflater: LayoutInflater
     private var sparseBooleanArray = ArrayList<SparseBooleanArray>()
 
-    private var itemAdapter : ItemAdapter? = null
+    private var itemAdapters = ArrayList<ItemAdapter>()
 
     private lateinit var viewHolder: ViewHolder
 
@@ -88,8 +88,8 @@ class CleanAdapter(
 
         val layoutParams = viewHolder.listView?.layoutParams as LinearLayout.LayoutParams
 
-        itemAdapter =
-            ItemAdapter(context, dataBeanList[position].fileBeans, sparseBooleanArray[position], position)
+        itemAdapters.add(ItemAdapter(context, dataBeanList[position].fileBeans, sparseBooleanArray[position], position))
+
 
         viewHolder.listView?.visibility = if (!isCleanOver) View.GONE else View.VISIBLE
         viewHolder.unfoldImg?.visibility = if (!isCleanOver) View.GONE else View.VISIBLE
@@ -111,8 +111,8 @@ class CleanAdapter(
         }
         mAllSizes.add(allSize)
 
-        layoutParams.height = FileUtil.dpToPx(62*itemAdapter?.count!!, context)
-        viewHolder.listView?.adapter = itemAdapter
+        layoutParams.height = FileUtil.dpToPx(62*itemAdapters[position]?.count!!, context)
+        viewHolder.listView?.adapter = itemAdapters[position]
         viewHolder.itemBar?.setOnClickListener {
 //            Log.e("yanglin", "setViewOnclickListener: 11111111", )
             dataBeanList[position].isListViewShow = !dataBeanList[position].isListViewShow
@@ -160,7 +160,7 @@ class CleanAdapter(
         }else{
             mFileCheckedItemList[position].remove(fileBeanList[itemPosition])
         }
-        itemAdapter?.notifyDataSetChanged()
+        itemAdapters[position]?.notifyDataSetChanged()
     }
 
 

MyDemo3/app/src/main/java/com/test/mydemo3/adapter/SimilarBeanAdapter.kt

@@ -16,7 +16,7 @@ import com.test.mydemo3.databinding.ImageItemLayoutBinding
 import com.test.mydemo3.util.FileUtil
 
 class SimilarBeanAdapter(context: Context) : RecyclerView.Adapter<SimilarBeanAdapter.AA>() {
-    private val list = arrayListOf<   PicSimilarInfo>()
+    private val list = arrayListOf<PicSimilarInfo>()
     private var context: Context
     var mCheckedLists: MutableList<PicInfo> = mutableListOf<PicInfo>()
     private var mItemCheckedArray =  ArrayList<SparseBooleanArray>()