被冲掉的代码提交

MyDemo3/app/src/main/java/com/xm/test/myfilemaster/adapter/MediaAdapter.kt

@@ -66,7 +66,7 @@ class MediaAdapter(
 
         if (mFileType.equals("image")){
 
-            mViewHolder.image.setImageDrawable(mListData[position].drawable)
+//            mViewHolder.image.setImageDrawable(mListData[position].drawable)
             mViewHolder.image.layoutParams.height = dpToPx
 
         }else{

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

@@ -58,9 +58,9 @@ class SimilarBeanAdapter(context: Context) : RecyclerView.Adapter<SimilarBeanAda
         val layoutParams = holder.binding.imageItemGrid.layoutParams
 
         if (list[position].getmList().size.toFloat() / 4.0 == 1.0){
-            layoutParams.height = FileUtil.dpToPx(83*(list[position].getmList().size / 4), context)
+            layoutParams.height = FileUtil.dpToPx(80*(list[position].getmList().size / 4), context)
         }else{
-            layoutParams.height = FileUtil.dpToPx(83*(list[position].getmList().size / 4 + 1 ), context)
+            layoutParams.height = FileUtil.dpToPx(80*(list[position].getmList().size / 4 + 1 ), context)
         }
 
         holder.binding.imageItemGrid.setOnItemClickListener { parent, view, itemPosition, id ->

MyDemo3/app/src/main/java/com/xm/test/myfilemaster/base/BaseActivity.kt

@@ -17,6 +17,7 @@ import androidx.core.content.FileProvider
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
+import com.xm.test.myfilemaster.MyApplication
 import com.xm.test.myfilemaster.R
 import com.xm.test.myfilemaster.activity.BaseActivityViewModel
 import com.xm.test.myfilemaster.activity.HomeActivity
@@ -194,7 +195,21 @@ abstract class BaseActivity : BaseAbsView(), BaseActivityListener{
                 mFileAdapter.setEditClickState(isClickEditBtn)
             }
             R.id.btn_delete ->{
-                //TODO 删除
+
+                val customDialog = CustomDialog(this)
+                customDialog.setsCancel(View.OnClickListener {
+                    customDialog.dismiss()
+                }).setsConfirm(View.OnClickListener {
+                    for (fileBean in mFileCheckedItemList!!){
+                        mItemDataList.remove(fileBean)
+                        MyApplication.mCleanSdk?.delete(File(fileBean.filePath))
+                    }
+                    mFileAdapter.setData(mItemDataList)
+                }).show()
+                customDialog.isShowEditText(false)
+                customDialog.setsTitle("Delete")
+                customDialog.setsHint("Are you sure you want to delete ${mFileCheckedItemList.size} item?")
+                customDialog.setsRightDelete("Delete")
             }
             R.id.btn_share ->{
                 if (switchNumber > 1){

MyDemo3/app/src/main/java/com/xm/test/myfilemaster/util/MediaUtil.kt

@@ -5,6 +5,8 @@ import android.content.ContentResolver
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
 import android.provider.MediaStore
 import android.util.TypedValue
 import com.xm.test.myfilemaster.model.FileBean
@@ -78,7 +80,8 @@ object MediaUtil {
                 fileBean.fileName = file.name
                 fileBean.filePath = file.absolutePath
                 fileBean.fileType = FileUtil.getFileType(file)
-                fileBean.fileBitmap = BitmapFactory.decodeFile(imagePath)
+//                fileBean.fileBitmap = BitmapFactory.decodeFile(imagePath)
+                fileBean.drawable = getDrawable(context, imagePath)
                 images.add(fileBean)
                 count++
             }
@@ -109,6 +112,10 @@ object MediaUtil {
 //        return similarImages
 //    }
 
+    fun getDrawable(context: Context,filePath: String): Drawable {
+        return BitmapDrawable(context.resources, filePath)
+    }
+
 
 
 }
\ No newline at end of file

MyDemo3/app/src/main/res/layout/fragment_file_manager.xml

@@ -9,7 +9,7 @@
         android:orientation="vertical"
         android:layout_height="match_parent">
         <RelativeLayout
-                android:id="@+id/recent_file_view"
+            android:id="@+id/recent_file_view"
             android:layout_marginTop="12dp"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"