修改名字

app/src/main/java/com/zxhy/solarmasterace/adapter/AdapterCommonDataFunction.kt

 package com.zxhy.solarmasterace.adapter
 
-import com.zxhy.solarmasterace.data.FileBean
+import com.zxhy.solarmasterace.entia.FileBean
 
 interface AdapterCommonDataFunction {
 

app/src/main/java/com/zxhy/solarmasterace/adapter/CommonAdapter.kt

@@ -3,7 +3,7 @@ package com.zxhy.solarmasterace.adapter
 import android.annotation.SuppressLint
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import com.zxhy.solarmasterace.data.FileBean
+import com.zxhy.solarmasterace.entia.FileBean
 
 abstract class CommonAdapter<T : ViewHolder?>() : RecyclerView.Adapter<T>(),
     AdapterCommonDataFunction {

app/src/main/java/com/zxhy/solarmasterace/dialog/FileDialogs.kt

@@ -3,13 +3,12 @@ package com.zxhy.solarmasterace.dialog
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import com.zxhy.solarmasterace.R
-import com.zxhy.solarmasterace.data.FileBean
 import com.zxhy.solarmasterace.databinding.DialogFolderDetailBinding
 import com.zxhy.solarmasterace.databinding.DialogFolderNameBinding
+import com.zxhy.solarmasterace.entia.FileBean
 
 fun Context.showFolderDialog(
     fileName: String = "",

app/src/main/java/com/zxhy/solarmasterace/data/DupFileBean.kt → app/src/main/java/com/zxhy/solarmasterace/entia/DupFileBean.kt

-package com.zxhy.solarmasterace.data
+package com.zxhy.solarmasterace.entia
 
 data class DupFileBean(
     val md5: String = "",

app/src/main/java/com/zxhy/solarmasterace/data/FileBean.kt → app/src/main/java/com/zxhy/solarmasterace/entia/FileBean.kt

-package com.zxhy.solarmasterace.data
+package com.zxhy.solarmasterace.entia
 
 import android.content.Context
 import android.net.Uri
 import android.text.format.Formatter
-import android.util.Log
 import android.widget.ImageView
 import coil.dispose
 import coil.load

app/src/main/java/com/zxhy/solarmasterace/filebrowser/DupImageAdapter.kt

@@ -8,7 +8,7 @@ import com.zxhy.solarmasterace.R
 import com.zxhy.solarmasterace.adapter.CommonAdapter
 import com.zxhy.solarmasterace.adapter.ItemCardDupImageViewHolder
 import com.zxhy.solarmasterace.adapter.ItemCardImageSelect85ViewHolder
-import com.zxhy.solarmasterace.data.DupFileBean
+import com.zxhy.solarmasterace.entia.DupFileBean
 import com.zxhy.solarmasterace.quicktools.inflate
 import java.io.File
 

app/src/main/java/com/zxhy/solarmasterace/filebrowser/FileBrowserActivity.kt

@@ -13,13 +13,13 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import com.zxhy.solarmasterace.R
-import com.zxhy.solarmasterace.data.FileBean
 import com.zxhy.solarmasterace.databinding.ActivityFileBrowserBinding
 import com.zxhy.solarmasterace.datastore.DUP_IMAGE_COUNTER_KEY
 import com.zxhy.solarmasterace.datastore.EMPTY_FILE_COUNTER_KEY
 import com.zxhy.solarmasterace.datastore.LARGE_FILES_COUNTER_KEY
 import com.zxhy.solarmasterace.datastore.saveFileCount
 import com.zxhy.solarmasterace.dialog.showLoadingDialog
+import com.zxhy.solarmasterace.entia.FileBean
 import com.zxhy.solarmasterace.filedetails.FileDetailActivity
 import com.zxhy.solarmasterace.permission.requestStoreFollow
 import com.zxhy.solarmasterace.quicktools.ActivityLauncher

app/src/main/java/com/zxhy/solarmasterace/internalstorage/FileDirectoryAdapter.kt

 package com.zxhy.solarmasterace.internalstorage
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.os.Environment
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import com.zxhy.solarmasterace.R
 import com.zxhy.solarmasterace.adapter.CommonAdapter
 import com.zxhy.solarmasterace.adapter.ItemCardFileViewHolder
-import com.zxhy.solarmasterace.data.FileBean
-import com.zxhy.solarmasterace.data.toFileBean
+import com.zxhy.solarmasterace.entia.FileBean
+import com.zxhy.solarmasterace.entia.toFileBean
 import com.zxhy.solarmasterace.quicktools.inflate
 import java.io.File
 

app/src/main/java/com/zxhy/solarmasterace/internalstorage/InternalStorageActivity.kt

@@ -10,10 +10,10 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
 import com.zxhy.solarmasterace.R
-import com.zxhy.solarmasterace.data.toFileBean
 import com.zxhy.solarmasterace.databinding.ActivityInternalStorageBinding
 import com.zxhy.solarmasterace.dialog.showFolderDetailDialog
 import com.zxhy.solarmasterace.dialog.showFolderDialog
+import com.zxhy.solarmasterace.entia.toFileBean
 import com.zxhy.solarmasterace.permission.requestStoreFollow
 import com.zxhy.solarmasterace.popupwindow.showPopupMoreOperation
 import com.zxhy.solarmasterace.quicktools.ActivityLauncher

app/src/main/java/com/zxhy/solarmasterace/quicktools/FileEx.kt

@@ -2,26 +2,24 @@ package com.zxhy.solarmasterace.quicktools
 
 import android.os.Environment
 import androidx.lifecycle.LifecycleCoroutineScope
-import androidx.lifecycle.lifecycleScope
-import com.zxhy.solarmasterace.data.DupFileBean
-import com.zxhy.solarmasterace.data.FileBean
-import com.zxhy.solarmasterace.data.isApk
-import com.zxhy.solarmasterace.data.isAudio
-import com.zxhy.solarmasterace.data.isDocument
-import com.zxhy.solarmasterace.data.isExcel
-import com.zxhy.solarmasterace.data.isImage
-import com.zxhy.solarmasterace.data.isLogFile
-import com.zxhy.solarmasterace.data.isPPt
-import com.zxhy.solarmasterace.data.isPdf
-import com.zxhy.solarmasterace.data.isTxt
-import com.zxhy.solarmasterace.data.isVideo
-import com.zxhy.solarmasterace.data.isWord
-import com.zxhy.solarmasterace.data.isZip
-import com.zxhy.solarmasterace.data.toFileBean
+import com.zxhy.solarmasterace.entia.DupFileBean
+import com.zxhy.solarmasterace.entia.FileBean
+import com.zxhy.solarmasterace.entia.isApk
+import com.zxhy.solarmasterace.entia.isAudio
+import com.zxhy.solarmasterace.entia.isDocument
+import com.zxhy.solarmasterace.entia.isExcel
+import com.zxhy.solarmasterace.entia.isImage
+import com.zxhy.solarmasterace.entia.isLogFile
+import com.zxhy.solarmasterace.entia.isPPt
+import com.zxhy.solarmasterace.entia.isPdf
+import com.zxhy.solarmasterace.entia.isTxt
+import com.zxhy.solarmasterace.entia.isVideo
+import com.zxhy.solarmasterace.entia.isWord
+import com.zxhy.solarmasterace.entia.isZip
+import com.zxhy.solarmasterace.entia.toFileBean
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.io.File
-import java.util.Stack
 
 fun dupImage(): List<DupFileBean> {
     val rootDir = Environment.getExternalStorageDirectory()

app/src/main/java/com/zxhy/solarmasterace/quicktools/MediaStoreEx.kt

@@ -4,7 +4,7 @@ import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
 import android.provider.MediaStore
-import com.zxhy.solarmasterace.data.FileBean
+import com.zxhy.solarmasterace.entia.FileBean
 
 fun recentImage(context: Context): ArrayList<FileBean> {
     val list = arrayListOf<FileBean>()