界面优化+组件交互动态

MyDemo3/app/src/main/java/com/xm/test/myfilemaster/activity/BatteryActivity.kt

@@ -86,6 +86,14 @@ class BatteryActivity : AppCompatActivity() {
         findViewById<View>(R.id.battery_quit_btn_2).setOnClickListener {
             finish()
         }
+        findViewById<View>(R.id.battery_go_to_result).setOnClickListener {
+            val intent = Intent(this, ResultPageActivity::class.java)
+            intent.putExtra("pageTitle", "Battery")
+            intent.putExtra("pageName", "battery")
+            intent.putExtra("pageSuccessText", "")
+            startActivity(intent)
+            finish()
+        }
     }
     private fun setViewSwitch(textView: TextView, isOpen: Boolean){
         textView.text = if (isOpen) "Off" else "On"

MyDemo3/app/src/main/java/com/xm/test/myfilemaster/activity/ImageShowActivity.kt

@@ -18,23 +18,25 @@ class ImageShowActivity : AppCompatActivity() {
     private lateinit var mShareBtn: View
     private lateinit var mDeleteBtn: View
 
-    private var mFileBean: FileBean? = null
+//    private var mFileBean: FileBean? = null
     private var mFileType: String = ""
+    private var mFilePath: String = ""
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_image_show)
 
-        mFileBean = intent.getSerializableExtra("fileBean") as FileBean ?: null
+//        mFileBean = intent.getSerializableExtra("fileBean") as FileBean ?: null
         mFileType = intent.getStringExtra("fileType").toString() ?: ""
+        mFilePath = intent.getStringExtra("filePath").toString() ?: ""
 
         if (!mFileType.isEmpty()){
             when(mFileType){
                 "image"->{
-                    Glide.with(this).load(mFileBean?.filePath).centerCrop().into(mImageShowView)
+                    mImageShowView.visibility = View.VISIBLE
+                    Glide.with(this).load(mFilePath).centerCrop().into(mImageShowView)
                 }
                 "video"->{
-//                    mVideoShowView.
-//                    TODO
+
                 }
                 else ->{}
             }
@@ -46,7 +48,7 @@ class ImageShowActivity : AppCompatActivity() {
 
     private fun setOnClickListener() {
         mShareBtn.setOnClickListener {
-            val uri = Uri.parse(mFileBean?.filePath)
+            val uri = Uri.parse(mFilePath)
             shareFile(uri)
         }
         mDeleteBtn.setOnClickListener {

MyDemo3/app/src/main/java/com/xm/test/myfilemaster/activity/MediaActivity.kt

@@ -13,6 +13,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import com.kongzue.dialogx.dialogs.WaitDialog
 import com.test.mydemo3.activity.ImageShowActivity
+import com.xm.test.myfilemaster.MyApplication
 import com.xm.test.myfilemaster.R
 import com.xm.test.myfilemaster.adapter.MediaAdapter
 import com.xm.test.myfilemaster.adapter.MediaAdapter2
@@ -20,6 +21,8 @@ import com.xm.test.myfilemaster.databinding.ActivityMediaBinding
 import com.xm.test.myfilemaster.model.FileBean
 import com.xm.test.myfilemaster.util.FileUtil
 import com.xm.test.myfilemaster.util.PermissionUtil
+import com.xm.test.myfilemaster.view.CustomDialog
+import java.io.File
 
 class MediaActivity : AppCompatActivity() {
     private lateinit var mGridView: GridView
@@ -43,7 +46,7 @@ class MediaActivity : AppCompatActivity() {
         private var mItemAdapter: MediaAdapter? = null
 //    private var mItemAdapter: MediaAdapter2? = null
     private var mDataList: ArrayList<String> = ArrayList<String>()
-    private var mCheckedDataList: ArrayList<String> = ArrayList<String>()
+    private var mCheckedDataList: ArrayList<FileBean> = ArrayList<FileBean>()
 
     private var mCheckedNumber = 0
     private var mFileType: String? = null
@@ -161,16 +164,32 @@ class MediaActivity : AppCompatActivity() {
             } else {
                 //TODO 点击进入图片或视频播放
                 Intent(this, ImageShowActivity::class.java)
-                val bundle = Bundle()
-                bundle.putSerializable("fileBean", mItemDataList[position])
-                intent.putExtras(bundle)
+//                val bundle = Bundle()
+//                bundle.putSerializable("fileBean", mItemDataList[position])
+                intent.putExtra("filePath", mItemDataList[position].filePath)
+//                intent.putExtras(bundle)
                 intent.putExtra("fileType", mFileType)
-//                startActivity(intent)
+                startActivity(intent)
             }
         }
         findViewById<View>(R.id.go_to_setting_btn).setOnClickListener {
             PermissionUtil.requestPermission(this)
         }
+        mDeleteBtn.setOnClickListener {
+            val customDialog = CustomDialog(this)
+            customDialog.setsCancel(View.OnClickListener {
+                customDialog.dismiss()
+            }).setsConfirm(View.OnClickListener {
+                for (fileBean in mCheckedDataList!!){
+                    MyApplication.mCleanSdk?.delete(File(fileBean.filePath))
+                    mItemDataList.remove(fileBean)
+                }
+                mItemAdapter?.notifyDataSetChanged()
+            }).show()
+            customDialog.isShowEditText(false)
+            customDialog.setsTitle("Delete")
+            customDialog.setsHint("Are you sure you want to delete ${mCheckedDataList.size} item?")
+        }
     }
 
     private fun setStateCheckedMap(isChecked: Boolean) {
@@ -186,9 +205,9 @@ class MediaActivity : AppCompatActivity() {
         mGridView.setItemChecked(position, viewHolder.checkedBox.isChecked)
         mItemCheckedArray.put(position, viewHolder.checkedBox.isChecked)
         if (viewHolder.checkedBox.isChecked) {
-            mCheckedDataList.add(mDataList[position])
+            mCheckedDataList.add(mItemDataList[position])
         } else {
-            mCheckedDataList.remove(mDataList[position])
+            mCheckedDataList.remove(mItemDataList[position])
         }
         mItemAdapter?.notifyDataSetChanged()
         mCheckedNumber = mCheckedDataList.size
@@ -199,7 +218,7 @@ class MediaActivity : AppCompatActivity() {
         mCheckedDataList.clear()
         mCheckedNumber = if (mIsCheckClick) {
             setStateCheckedMap(true)
-            mCheckedDataList.addAll(mDataList)
+            mCheckedDataList.addAll(mItemDataList)
             mCheckedDataList.size
         } else {
             setStateCheckedMap(false)

MyDemo3/app/src/main/java/com/xm/test/myfilemaster/activity/ResultPageActivity.kt

@@ -41,6 +41,9 @@ class ResultPageActivity : ComponentActivity() {
                 binding.cleanView.visibility = View.VISIBLE
                 binding.AntivirusView.visibility = View.GONE
             }
+            "battery" ->{
+                binding.batteryView.visibility = View.GONE
+            }
         }
     }
 

MyDemo3/app/src/main/java/com/xm/test/myfilemaster/fragment/InternalStorageFragment.kt

@@ -47,7 +47,7 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
     lateinit var mEditBtn: ImageView
     lateinit var mBottomBar: View
     lateinit var mSelectNumText: TextView
-    lateinit var mCurrantFilePathTv: TextView
+    lateinit var mCurrentFilePathTv: TextView
 
     lateinit var mCheckItemSelectAllBtn: CheckBox
 
@@ -72,6 +72,7 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
     var mCurrentFilePath: String = FileUtil.EXTERNAL_STORAGE
     var mCurrentFileBean: FileBean? = null
     var mTitleStr: String = ""
+    private var mCurrentPaths = ArrayList<String>()
     companion object{
         var isClickEditBtn = false
         var isClickCheckBoxAllBtn = false
@@ -111,7 +112,7 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
         mCheckItemSelectAllBtn = mView.findViewById(R.id.checkbox_item_all)
         mNotFileFoundLayout = mView.findViewById(R.id.not_file_found_layout)
         mNotPermissionLayout = mView.findViewById(R.id.not_file_permission_layout)
-        mCurrantFilePathTv = mView.findViewById(R.id.current_file_path)
+        mCurrentFilePathTv = mView.findViewById(R.id.current_file_path)
         mFilesItemListView = mView.findViewById<ListView>(R.id.files_item_listview)
 
 
@@ -129,6 +130,7 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
         mQuitBtn.setOnClickListener(this)
         mEditBtn.setOnClickListener(this)
         mCheckItemSelectAllBtn.setOnClickListener(this)
+        mCurrentFilePathTv.setOnClickListener(this)
 
 
         mMoveBottomBtn.setOnClickListener(this)
@@ -154,8 +156,8 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
     private fun requestDataList() {
         println("yanglin start getData")
         mNewBtn.visibility = View.VISIBLE
-        mShareBtn.visibility = View.VISIBLE
-        mCurrantFilePathTv.visibility = View.VISIBLE
+        mCurrentFilePathTv.visibility = View.VISIBLE
+        mCurrentPaths.add("Internal Storage/")
 
         if (mItemDataList.size == 0){
             WaitDialog.show("please wait..")
@@ -324,6 +326,9 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
             R.id.go_to_setting_btn ->{
                 PermissionUtil.requestPermission(context)
             }
+            R.id.current_file_path ->{
+                backQuit()
+            }
         }
     }
 
@@ -353,7 +358,7 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
         val size = mFilesItemLists.size
         if (size-1 == 0){
             mQuitBtn.visibility = View.GONE
-            mCurrantFilePathTv.text = "Internal Storage/"
+            mCurrentFilePathTv.text = "Internal Storage/"
         }
         if (size < 1){
             if (mNotFileFoundLayout.isVisible && mItemDataList.size > 0){
@@ -370,11 +375,12 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
             mNotFileFoundLayout.visibility = View.GONE
             mFilesItemLists.remove(mFilesItemLists[size-1])
             mCurrentList.remove(mCurrentList[size-1])
+            mCurrentPaths.remove(mCurrentPaths[mCurrentPaths.size -1])
             if (size - 1 > 0){
                 mCurrentFileBean = mCurrentList[size-2]
-                mCurrantFilePathTv.text = "Internal Storage/ ${mCurrentFileBean?.fileName}"
+                mCurrentFilePathTv.text = mCurrentPaths[mCurrentPaths.size -1]
             }else{
-                mCurrantFilePathTv.text = "Internal Storage/"
+                mCurrentFilePathTv.text = "Internal Storage/"
             }
             return false
         }
@@ -502,7 +508,8 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
                 if (!mCurrentFileBean?.fileType.equals("dir")){
                     return@setOnItemClickListener
                 }
-                mCurrantFilePathTv.text = "Internal Storage/ ${mCurrentFileBean?.fileName}"
+                mCurrentPaths.add("${mCurrentPaths[mCurrentPaths.size - 1]}${mCurrentFileBean?.fileName}/")
+                mCurrentFilePathTv.text = mCurrentPaths[mCurrentPaths.size -1]
                 mCurrentList.add(mCurrentFileBean!!)
                 mFilesItemLists.add(mItemDataList)
                 if (mCurrentFileBean?.fileType.equals("dir") && mCurrentFileBean?.childList?.size!! > 0){
@@ -510,8 +517,12 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
                         requireActivity().runOnUiThread {
                             mItemDataList = FileUtil.getFileList(File(mCurrentFileBean!!.filePath))
 //                            mItemDataList = mCurrentFileBean!!.childList
-                            val fileListSort = FileUtil.fileListSort(mItemDataList)
-                            mFileAdapter?.setData(fileListSort)
+                            if (mItemDataList.size == 0){
+                                mNotFileFoundLayout.visibility = View.VISIBLE
+                            }else{
+                                val fileListSort = FileUtil.fileListSort(mItemDataList)
+                                mFileAdapter?.setData(fileListSort)
+                            }
                         }
                     }).start()
                 }else if(mCurrentFileBean?.fileType.equals("dir") && mCurrentFileBean?.childList?.size == 0){
@@ -543,10 +554,8 @@ class InternalStorageFragment : Fragment(), View.OnClickListener {
         if (PermissionUtil.checkGrantedPermission(requireActivity())){
             requestDataList()
         }else {
-            mNewBtn.visibility = View.GONE
-            mShareBtn.visibility = View.GONE
             mEditBtn.visibility = View.GONE
-            mCurrantFilePathTv.visibility = View.GONE
+            mCurrentFilePathTv.visibility = View.GONE
             mNotPermissionLayout.visibility = View.VISIBLE
         }
     }

MyDemo3/app/src/main/res/drawable/bg_all_layer_select.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#00CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#10CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#20CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#30CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#DBD3EA" />
+            <padding android:left="1dp"
+                android:right="1dp"
+                android:top="0dp"
+                android:bottom="8dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/bg_btn_sure_select_shape.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#2159CC"/>
+    <corners android:radius="30dp"/>
+</shape>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/bg_excell_layer_select.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#00CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#10CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#20CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#30CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#C7DDD0" />
+            <padding android:left="1dp"
+                android:right="1dp"
+                android:top="0dp"
+                android:bottom="8dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/bg_item_select_shape.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#EBECF1"/>
+    <corners android:radius="10dp"/>
+</shape>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/bg_pdf_layer_select.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#00CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#10CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#20CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#30CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#EAD6D9" />
+            <padding android:left="1dp"
+                android:right="1dp"
+                android:top="0dp"
+                android:bottom="8dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/bg_ppt_layer_select.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#00CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#10CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#20CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#30CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#E9DDD3" />
+            <padding android:left="1dp"
+                android:right="1dp"
+                android:top="0dp"
+                android:bottom="8dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/bg_txt_layer_select.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#00CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#10CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#20CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#30CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#E9DDD3" />
+            <padding android:left="1dp"
+                android:right="1dp"
+                android:top="0dp"
+                android:bottom="8dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/bg_wordl_layer_select.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#00CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#10CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#20CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#30CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="0dp" />
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="6dp" />
+        </shape>
+    </item>
+
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#D3DBEA" />
+            <padding android:left="1dp"
+                android:right="1dp"
+                android:top="0dp"
+                android:bottom="8dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/selector_all_type.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_all_layer_select" android:state_selected="true"/>
+    <item android:drawable="@drawable/bg_all_layer_select" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_all_layer_select" android:state_focused="true" />
+    <item android:drawable="@drawable/bg_all_layer"/>
+</selector>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/selector_excel_type.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_excell_layer_select" android:state_selected="true"/>
+    <item android:drawable="@drawable/bg_excell_layer_select" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_excell_layer_select" android:state_focused="true" />
+    <item android:drawable="@drawable/bg_excell_layer"/>
+</selector>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/selector_file_type_item.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_file_type_item_select" android:state_selected="true"/>
+    <item android:drawable="@drawable/shape_file_type_item_select" android:state_pressed="true"/>
+    <item android:drawable="@drawable/shape_file_type_item_select" android:state_focused="true" />
+    <item android:drawable="@drawable/shape_file_type_item"/>
+</selector>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/selector_item_bar.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_item_select_shape" android:state_selected="true"/>
+    <item android:drawable="@drawable/bg_item_select_shape" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_item_select_shape" android:state_focused="true" />
+    <item android:drawable="@drawable/bg_item_shape"/>
+</selector>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/selector_pdf_type.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_pdf_layer_select" android:state_selected="true"/>
+    <item android:drawable="@drawable/bg_pdf_layer_select" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_pdf_layer_select" android:state_focused="true" />
+    <item android:drawable="@drawable/bg_pdf_layer"/>
+</selector>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/selector_ppt_type.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_ppt_layer_select" android:state_selected="true"/>
+    <item android:drawable="@drawable/bg_ppt_layer_select" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_ppt_layer_select" android:state_focused="true" />
+    <item android:drawable="@drawable/bg_ppt_layer"/>
+</selector>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/selector_sure_btn.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_btn_sure_select_shape" android:state_selected="true"/>
+    <item android:drawable="@drawable/bg_btn_sure_select_shape" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_btn_sure_select_shape" android:state_focused="true" />
+    <item android:drawable="@drawable/bg_btn_sure_shape"/>
+</selector>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/selector_txt_type.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_txt_layer_select" android:state_selected="true"/>
+    <item android:drawable="@drawable/bg_txt_layer_select" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_txt_layer_select" android:state_focused="true" />
+    <item android:drawable="@drawable/bg_txt_layer"/>
+</selector>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/selector_word_type.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_wordl_layer_select" android:state_selected="true"/>
+    <item android:drawable="@drawable/bg_wordl_layer_select" android:state_pressed="true"/>
+    <item android:drawable="@drawable/bg_wordl_layer_select" android:state_focused="true" />
+    <item android:drawable="@drawable/bg_wordl_layer"/>
+</selector>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/shape_file_type_item.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white"/>
+</shape>
\ No newline at end of file

MyDemo3/app/src/main/res/drawable/shape_file_type_item_select.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#EBECF1"/>
+</shape>
\ No newline at end of file

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

@@ -467,6 +467,7 @@
         android:background="#FFFFFF">
 
         <TextView
+            android:id="@+id/battery_go_to_result"
             android:layout_width="match_parent"
             android:layout_height="34dp"
             android:text="Got it"

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

@@ -124,6 +124,7 @@
             android:visibility="gone" />
 
         <ImageView
+            android:layout_gravity="center"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@mipmap/ad"/>

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

@@ -18,8 +18,9 @@
     <RadioGroup
         android:id="@+id/home_btn_group"
         android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:paddingTop="5dp"
         android:background="#FFFFFF"
         android:layout_alignParentBottom="true">
 

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

@@ -34,7 +34,8 @@
         android:layout_centerVertical="true"
         android:layout_width="match_parent"
         android:scaleType="fitCenter"
-        android:layout_height="wrap_content"/>
+        android:visibility="gone"
+        android:layout_height="300dp"/>
     <VideoView
         android:id="@+id/video_show_view"
         android:layout_centerVertical="true"

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

@@ -69,7 +69,7 @@
             android:layout_weight="1"
             android:text="Sure"
             android:textSize="17dp"
-            android:background="@drawable/bg_btn_sure_shape"
+            android:background="@drawable/selector_sure_btn"
             android:textColor="#FFFFFF"/>
 
     </LinearLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:background="@drawable/bg_item_shape"
+    android:background="@drawable/selector_item_bar"
     android:id="@+id/item_layout"
     android:layout_height="61dp">
 

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

@@ -56,7 +56,7 @@
             </RelativeLayout>
 
             <TextView
-                android:layout_width="92dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/category"
                 android:layout_marginStart="16dp"
@@ -81,6 +81,7 @@
                         android:layout_height="match_parent"
                         android:gravity="center"
                         android:layout_weight="1"
+                        android:background="@drawable/selector_file_type_item"
                         tools:ignore="NestedWeights">
 
                         <ImageView
@@ -100,6 +101,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:gravity="center"
+                        android:background="@drawable/selector_file_type_item"
                         android:layout_weight="1">
 
                         <ImageView
@@ -119,6 +121,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:gravity="center"
+                        android:background="@drawable/selector_file_type_item"
                         android:layout_weight="1">
 
                         <ImageView
@@ -146,6 +149,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:gravity="center"
+                        android:background="@drawable/selector_file_type_item"
                         android:layout_weight="1">
 
                         <ImageView
@@ -166,6 +170,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:gravity="center"
+                        android:background="@drawable/selector_file_type_item"
                         android:layout_weight="1">
 
                         <ImageView
@@ -185,6 +190,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:gravity="center"
+                        android:background="@drawable/selector_file_type_item"
                         android:layout_weight="1">
 
                         <ImageView
@@ -229,7 +235,7 @@
                         android:layout_height="82dp"
                         android:orientation="vertical"
                         android:gravity="center"
-                        android:background="@drawable/bg_all_layer"
+                        android:background="@drawable/selector_all_type"
                         android:layout_weight="1">
 
                         <ImageView
@@ -249,7 +255,7 @@
                         android:layout_height="82dp"
                         android:orientation="vertical"
                         android:gravity="center"
-                        android:background="@drawable/bg_wordl_layer"
+                        android:background="@drawable/selector_word_type"
                         android:layout_weight="1">
 
                         <ImageView
@@ -269,7 +275,7 @@
                         android:layout_height="82dp"
                         android:orientation="vertical"
                         android:gravity="center"
-                        android:background="@drawable/bg_excell_layer"
+                        android:background="@drawable/selector_excel_type"
                         android:layout_weight="1">
 
                         <ImageView
@@ -297,7 +303,7 @@
                         android:layout_height="82dp"
                         android:orientation="vertical"
                         android:gravity="center"
-                        android:background="@drawable/bg_ppt_layer"
+                        android:background="@drawable/selector_ppt_type"
                         android:layout_weight="1">
 
                         <ImageView
@@ -317,7 +323,7 @@
                         android:layout_height="82dp"
                         android:orientation="vertical"
                         android:gravity="center"
-                        android:background="@drawable/bg_pdf_layer"
+                        android:background="@drawable/selector_pdf_type"
                         android:layout_weight="1">
 
                         <ImageView
@@ -337,7 +343,7 @@
                         android:layout_height="82dp"
                         android:orientation="vertical"
                         android:gravity="center"
-                        android:background="@drawable/bg_txt_layer"
+                        android:background="@drawable/selector_txt_type"
                         android:layout_weight="1">
 
                         <ImageView

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

@@ -210,6 +210,7 @@
         android:orientation="vertical"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
+        android:padding="1dp"
         android:layout_marginEnd="16dp"
         android:layout_below="@+id/home_progress_bar_layout">
 
@@ -221,9 +222,11 @@
             <LinearLayout
                 android:id="@+id/antivirus_btn"
                 android:layout_width="0dp"
+                android:elevation="3dp"
+                android:layout_margin="4dp"
+                android:background="@drawable/selector_item_bar"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:background="@drawable/scan_item_shape"
                 android:orientation="horizontal">
                 <ImageView
                     android:layout_width="wrap_content"
@@ -242,7 +245,9 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/scan_item_shape"
+                android:elevation="3dp"
+                android:layout_margin="4dp"
+                android:background="@drawable/selector_item_bar"
                 android:orientation="horizontal">
                 <ImageView
                     android:layout_width="wrap_content"
@@ -259,6 +264,7 @@
 
         </LinearLayout>
         <LinearLayout
+            android:layout_marginTop="8dp"
             android:layout_width="match_parent"
             android:orientation="horizontal"
             android:layout_weight="1"
@@ -266,9 +272,11 @@
             <LinearLayout
                 android:id="@+id/scan_large_files"
                 android:layout_width="0dp"
+                android:layout_margin="4dp"
+                android:elevation="3dp"
+                android:background="@drawable/selector_item_bar"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:background="@drawable/scan_item_shape"
                 android:orientation="horizontal">
                 <ImageView
                     android:layout_width="wrap_content"
@@ -308,8 +316,10 @@
                 android:id="@+id/scan_for_duplicate_picture"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_margin="4dp"
+                android:elevation="3dp"
+                android:background="@drawable/selector_item_bar"
                 android:layout_weight="1"
-                android:background="@drawable/scan_item_shape"
                 android:orientation="horizontal">
                 <ImageView
                     android:layout_weight="0.1"
@@ -348,6 +358,7 @@
     <RelativeLayout
         android:layout_alignParentBottom="true"
         android:layout_width="match_parent"
+        android:layout_marginBottom="12dp"
         android:layout_height="wrap_content">
 <!--        <include-->
 <!--            layout="@layout/ad_layout"/>-->

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

@@ -73,10 +73,9 @@
 
 
     <LinearLayout
-        android:layout_marginTop="75dp"
+        android:layout_marginTop="155dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:orientation="vertical">
 
         <include layout="@layout/ad_layout" />
@@ -88,6 +87,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
+            android:elevation="10dp"
             android:background="@drawable/bg_item_shape">
 
             <LinearLayout
@@ -154,6 +154,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
+            android:elevation="10dp"
             android:layout_marginEnd="16dp"
             android:background="@drawable/bg_item_shape">
 
@@ -220,6 +221,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:elevation="10dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
             android:background="@drawable/bg_item_shape">
@@ -286,6 +288,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
+            android:elevation="10dp"
             android:layout_marginEnd="16dp"
             android:background="@drawable/bg_item_shape">
 
@@ -351,6 +354,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
+            android:elevation="10dp"
             android:layout_marginEnd="16dp"
             android:background="@drawable/bg_item_shape">