Merge remote-tracking branch 'origin/master'

# Conflicts:
#	MyDemo3/app/src/main/AndroidManifest.xml
#	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/adapter/MediaAdapter.kt
#	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/adapter/SimilarBeanAdapter.kt
#	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/base/BaseActivity.kt
#	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/util/MediaUtil.kt

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

@@ -32,7 +32,7 @@ class MediaActivity : AppCompatActivity() {
 
     lateinit var mItemCheckedArray: SparseBooleanArray
     private  var mItemDataList = ArrayList<FileBean>()
-    private lateinit var mItemAdapter: MediaAdapter
+    private var mItemAdapter: MediaAdapter? =null
     private var mDataList: ArrayList<String> = ArrayList<String>()
     private var mCheckedDataList: ArrayList<String> = ArrayList<String>()
 
@@ -87,7 +87,7 @@ class MediaActivity : AppCompatActivity() {
             WaitDialog.show("please wait..")
             mItemDataList = FileUtil.getMediaFiles(this, fileType, 20)
             runOnUiThread {
-                mItemAdapter.setData(mItemDataList)
+                mItemAdapter?.setData(mItemDataList)
                 WaitDialog.dismiss()
                 for (fileBean in mItemDataList){
                     mDataList.add(fileBean.filePath)
@@ -117,7 +117,7 @@ class MediaActivity : AppCompatActivity() {
             mCancelBtn.visibility = View.VISIBLE
 
             isClickEditBtn = true
-            mItemAdapter.notifyDataSetChanged()
+            mItemAdapter?.notifyDataSetChanged()
         }
         mCancelBtn.setOnClickListener {
             cancelBtn()
@@ -158,7 +158,7 @@ class MediaActivity : AppCompatActivity() {
         }else{
             mCheckedDataList.remove(mDataList[position])
         }
-        mItemAdapter.notifyDataSetChanged()
+        mItemAdapter?.notifyDataSetChanged()
         mCheckedNumber = mCheckedDataList.size
         mModel.setNumber(mCheckedNumber)
     }
@@ -174,11 +174,11 @@ class MediaActivity : AppCompatActivity() {
             0
         }
         mModel.setNumber(mCheckedNumber)
-        mItemAdapter.notifyDataSetChanged()
+        mItemAdapter?.notifyDataSetChanged()
     }
 
     override fun onBackPressed() {
-        mItemAdapter.notifyDataSetChanged()
+        mItemAdapter?.notifyDataSetChanged()
         if (isClickEditBtn){
             cancelBtn()
         }else{
@@ -194,6 +194,6 @@ class MediaActivity : AppCompatActivity() {
         mCancelBtn.visibility = View.GONE
 
         isClickEditBtn = false
-        mItemAdapter.notifyDataSetChanged()
+        mItemAdapter?.notifyDataSetChanged()
     }
 }
\ No newline at end of file

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

@@ -21,6 +21,8 @@ class ScanLargeFilesActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         setTitle("Scan Large Files")
         isNewShow(false)
+        isCurrantTvShow(false)
+
         mInitView()
     }
 

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

@@ -33,11 +33,16 @@ class FileManagerFragment : Fragment(), View.OnClickListener {
     private lateinit var mPdfBtn: View
     private lateinit var mTxtBtn: View
     private lateinit var mRecentGrid: GridView
+    private lateinit var mRecentView: View
 
     private var mFileBeanList: ArrayList<FileBean>? = null
 
     private var mIntent: Intent? = null
 
+    private var mRecentAdapter: MediaAdapter? = null
+
+    private var mRecentImages = ArrayList<FileBean>()
+
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -63,6 +68,7 @@ class FileManagerFragment : Fragment(), View.OnClickListener {
         mPdfBtn = mView.findViewById(R.id.btn_pdf)
         mTxtBtn = mView.findViewById(R.id.btn_txt)
         mRecentGrid = mView.findViewById(R.id.recent_file_grid)
+        mRecentView = mView.findViewById(R.id.recent_file_view)
 
         mImageBtn.setOnClickListener(this)
         mVideoBtn.setOnClickListener(this)
@@ -76,6 +82,7 @@ class FileManagerFragment : Fragment(), View.OnClickListener {
         mPptBtn.setOnClickListener(this)
         mPdfBtn.setOnClickListener(this)
         mTxtBtn.setOnClickListener(this)
+        mRecentView.setOnClickListener(this)
 
         mIntent = Intent(context, FileManagerActivity::class.java)
         mImageBtn.setOnClickListener{
@@ -89,11 +96,15 @@ class FileManagerFragment : Fragment(), View.OnClickListener {
             intent.putExtra("fileType", "video")
             context?.startActivity(intent)
         }
-        val recentImages = MediaUtil.getRecentImages(requireContext(), 4)
+        mRecentView.setOnClickListener {
+            val intent = Intent(context, MediaActivity::class.java)
+            intent.putExtra("fileType", "image")
+            context?.startActivity(intent)
+        }
         val sparseBooleanArray = SparseBooleanArray()
-        val recentAdapter = MediaAdapter(recentImages, requireContext(), sparseBooleanArray, "image", 80)
-        recentAdapter.setItemHeight(80)
-        mRecentGrid.adapter = recentAdapter
+        mRecentAdapter = MediaAdapter(mRecentImages, requireContext(), sparseBooleanArray, "image", 80)
+        mRecentAdapter?.setItemHeight(80)
+        mRecentGrid.adapter = mRecentAdapter
 
 
     }
@@ -133,4 +144,9 @@ class FileManagerFragment : Fragment(), View.OnClickListener {
         return true
     }
 
+    override fun onResume() {
+        super.onResume()
+        mRecentImages = MediaUtil.getRecentImages(requireContext(), 4)
+        mRecentAdapter?.setData(mRecentImages)
+    }
 }

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

@@ -47,7 +47,6 @@
         android:id="@+id/similar_start_animation"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
         android:background="#F8F8F8"
         android:layout_below="@+id/top_title_bar">
 

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

@@ -9,6 +9,7 @@
         android:orientation="vertical"
         android:layout_height="match_parent">
         <RelativeLayout
+                android:id="@+id/recent_file_view"
             android:layout_marginTop="12dp"
             android:layout_marginStart="12dp"
             android:layout_marginEnd="12dp"
@@ -22,14 +23,14 @@
                 android:layout_marginTop="16dp"
                 android:layout_marginStart="16dp"
                 android:textSize="16dp"
-                android:text="Recent files"
+                android:text="Recent images"
                 android:textColor="#333333"/>
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:layout_marginStart="16dp"
-                android:src="@mipmap/unfold"
+                android:src="@mipmap/join_to_image"
                 android:layout_alignParentEnd="true"/>
 
             <GridView
@@ -40,6 +41,7 @@
                 android:layout_marginBottom="16dp"
                 android:layout_marginStart="16dp"
                 android:numColumns="4"
+                android:horizontalSpacing="2dp"
                 android:columnWidth="80dp"
                 android:paddingLeft="1dp"
                 android:scrollbars="none"
@@ -351,7 +353,12 @@
         android:layout_alignParentBottom="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <include layout="@layout/ad_layout"/>
+<!--        <include layout="@layout/ad_layout"/>-->
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ad"/>
     </RelativeLayout>
 
 

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

@@ -351,10 +351,15 @@
 
     <RelativeLayout
         android:layout_alignParentBottom="true"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <include
-            layout="@layout/ad_layout"/>
+<!--        <include-->
+<!--            layout="@layout/ad_layout"/>-->
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ad"/>
 
     </RelativeLayout>
 

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:background="@drawable/bg_item_shape"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
 
     <TextView
@@ -23,7 +23,8 @@
         android:layout_marginEnd="12dp"
         android:columnWidth="82dp"
         android:scrollbars="none"
-        android:padding="1dp"
+        android:paddingStart="1dp"
+        android:horizontalSpacing="2dp"
         android:layout_marginBottom="16dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>