实现Grid效果

app/build.gradle

@@ -24,8 +24,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
         jvmTarget = '1.8'
@@ -43,4 +43,8 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation 'q.rorbin:badgeview:1.1.3'
+    implementation "com.github.goweii:AnyLayer:5.0.0-beta3"
+    implementation 'com.github.Dimezis:BlurView:version-2.0.3'
+    implementation 'com.github.shenbengit:PagerGridLayoutManager:1.1.8'
 }

app/src/main/AndroidManifest.xml

@@ -9,11 +9,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.DSDrag">
+
         <activity
-            android:name=".activity.FolderActivity"
-            android:exported="false" />
-        <activity
-            android:name=".activity.MainActivity"
+            android:name=".activity.FolderActivity2"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -26,6 +24,7 @@
         <activity android:name=".activity.MultiplyActivity" />
         <activity android:name=".activity.NotDragHandlerImplActivity" />
         <activity android:name=".activity.TestDragActivity" />
+<!--        <activity android:name=".activity.FolderActivity2" />-->
     </application>
 
 </manifest>

app/src/main/java/com/ds/drag/demo/FolderAdapter.kt

@@ -6,7 +6,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.ds.drag.core.IDragData
+import com.ds.drag.core.SimpleData
 import kotlinx.android.synthetic.main.item_folder_item_layout.view.*
+import kotlinx.android.synthetic.main.item_simple_data_layout.view.image
 
 /**
  * author : linzheng
@@ -18,10 +21,10 @@ import kotlinx.android.synthetic.main.item_folder_item_layout.view.*
 class FolderAdapter(context: Context) : RecyclerView.Adapter<FolderItemVH>() {
 
     private val layoutInflater = LayoutInflater.from(context)
-    private val mList: MutableList<IDragData> = mutableListOf()
+    private val mList: MutableList<SimpleData> = mutableListOf()
 
     @SuppressLint("NotifyDataSetChanged")
-    fun setData(data: List<IDragData>) {
+    fun setData(data: List<SimpleData>) {
         mList.clear()
         mList.addAll(data)
         notifyDataSetChanged()
@@ -35,13 +38,14 @@ class FolderAdapter(context: Context) : RecyclerView.Adapter<FolderItemVH>() {
 
     override fun onBindViewHolder(holder: FolderItemVH, position: Int) {
         val data = mList[position]
-        holder.itemView.tv_content.text = (data as? SimpleData)?.value.toString()
+        holder.itemView.image.setImageResource(data.iconResId!!)
+       holder.itemView.tv_content.visibility = View.GONE
 
 
     }
 
     override fun getItemCount(): Int {
-        return minOf(mList.size, 4)
+        return minOf(mList.size, 100)
     }
 }
 

app/src/main/java/com/ds/drag/demo/FolderItemDragCallback.kt

@@ -4,6 +4,10 @@ import android.graphics.Canvas
 import android.util.Log
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
+import com.ds.drag.core.FolderData
+import com.ds.drag.core.IDragAdapter
+import com.ds.drag.core.IDragData
+import com.ds.drag.core.callback.IDragHandler
 
 /**
  * author : linzheng
@@ -12,12 +16,17 @@ import androidx.recyclerview.widget.RecyclerView
  * desc   : 文件夹内的item拖拽回调
  * version: 1.0
  */
-class FolderItemDragCallback : ItemTouchHelper.Callback() {
+class FolderItemDragCallback(private val dragAdapter: IDragAdapter) : ItemTouchHelper.Callback() {
 
     companion object {
         private val TAG = "FolderItemDragCallback"
     }
 
+    fun setDragHandler(handler: IDragHandler) {
+        this.mDragHandler = handler
+    }
+    // 合并逻辑的处理
+    private var mDragHandler: IDragHandler? = null
 
     var itemLocationListener: ((viewHolder: RecyclerView.ViewHolder?, left: Float, top: Float, activity: Boolean) -> Unit)? = null
 
@@ -30,11 +39,23 @@ class FolderItemDragCallback : ItemTouchHelper.Callback() {
     }
 
     override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
-
-        return false
+        val fromPosition = viewHolder.adapterPosition
+        val toPosition = target.adapterPosition
+        val swap = mDragHandler?.swapPosition(fromPosition, toPosition)?: false
+        if (swap) { // 交换位置
+            mDragHandler?.onBeforeSwap(fromPosition, toPosition)
+            val list = dragAdapter.getDragData()
+            if (list is MutableList) {
+                val item = list.removeAt(fromPosition)
+                list.add(toPosition, item)
+            }
+            mDragHandler?.onAfterSwap(fromPosition, toPosition)
+        }
+        return swap
     }
 
     override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+        Log.d("onSwiped", "onSwiped:  "+direction)
     }
 
 
@@ -55,7 +76,7 @@ class FolderItemDragCallback : ItemTouchHelper.Callback() {
         val y = parentLocation[1] + top + dY
         itemLocationListener?.invoke(viewHolder, x, y, isCurrentlyActive)
         Log.d(TAG, "onChildDrawOver: top $x, left $y")
-
+        Log.d(TAG, "onChildDrawOver: actionState："+actionState)
     }
 
 

app/src/main/java/com/ds/drag/demo/SimpleAdapter.kt

@@ -2,17 +2,27 @@ package com.ds.drag.demo
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.graphics.Color
+import android.util.Log
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.ds.drag.core.FolderData
 import com.ds.drag.core.IDragAdapter
+import com.ds.drag.core.IDragData
 import com.ds.drag.core.IDragItem
+import com.ds.drag.core.PreviewData
+import com.ds.drag.core.SimpleData
 import kotlinx.android.synthetic.main.item_folder_data_layout.view.*
 import kotlinx.android.synthetic.main.item_preview_data_layout.view.*
+import q.rorbin.badgeview.QBadgeView
 
 /**
  * author : linzheng
@@ -43,6 +53,7 @@ class SimpleAdapter(private val context: Context, private val inFolder: Boolean
         }
     }
 
+    var isSHow=true;
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseDataVH {
         val layoutInflater = LayoutInflater.from(context)
@@ -53,24 +64,38 @@ class SimpleAdapter(private val context: Context, private val inFolder: Boolean
             }
             2 -> {
                 val view = layoutInflater.inflate(R.layout.item_preview_data_layout, parent, false)
+
                 PreviewViewHolder(view)
+
             }
             else -> {
-                val view = layoutInflater.inflate(R.layout.item_simple_data_layout, parent, false)
+                var view:View?=null
+                if(inFolder){
+                    view = layoutInflater.inflate(R.layout.item_simple_data_infolder_layout, parent, false)
+                }else{
+                    view = layoutInflater.inflate(R.layout.item_simple_data_layout, parent, false)
+                }
                 SimpleViewHolder(view)
             }
         }
     }
-
     override fun onBindViewHolder(holder: BaseDataVH, position: Int) {
 
         if (inFolder) {
-
-            holder.itemView.setBackgroundResource(R.drawable.se_folder_bg)
+            Log.d("onBindViewHolder", "onBindViewHolder:"+position)
+
+            if(!isSHow){
+                holder.itemView.visibility=View.GONE
+                Log.d("onBindViewHolder", "是否透明:"+isSHow)
+            }else{
+                holder.itemView.visibility=View.VISIBLE
+            //    holder.itemView.setBackgroundResource(R.drawable.se_folder_bg)
+            }
         }
 
         holder.bindData(mList[position])
         if (holder is FolderViewHolder) {
+
             holder.itemView.clk_mask.setOnClickListener {
                 itemClickListener?.invoke(mList[position])
             }
@@ -108,8 +133,13 @@ abstract class BaseDataVH(itemView: View) : RecyclerView.ViewHolder(itemView), I
  */
 class PreviewViewHolder(itemView: View) : BaseDataVH(itemView) {
     override fun bindData(data: IDragData) {
+        itemView.isSelected=true
         val simpleData = (data as? PreviewData)?.realData
-        itemView.tv_content.text = simpleData?.value?.toString()
+        var image=itemView.findViewById<ImageView>(R.id.image)
+        image.setImageResource(simpleData?.iconResId!!)
+        itemView.findViewById<TextView>(R.id.tv_content).text=simpleData.titleName
+        itemView.findViewById<TextView>(R.id.tv_content).visibility=View.VISIBLE
+        bindunreadQBadge(simpleData,image)
     }
 
     override fun canDrag(viewHolder: RecyclerView.ViewHolder): Boolean {
@@ -143,9 +173,13 @@ class SimpleViewHolder(itemView: View) : BaseDataVH(itemView) {
     @SuppressLint("SetTextI18n")
     override fun bindData(data: IDragData) {
         val simpleData = data as SimpleData
-        itemView.findViewById<TextView>(R.id.tv_content).text = "${simpleData.value}"
-    }
 
+        var image=itemView.findViewById<ImageView>(R.id.image)
+        image.setImageResource(simpleData.iconResId!!)
+        itemView.findViewById<TextView>(R.id.tv_content).text=simpleData.titleName
+        itemView.findViewById<TextView>(R.id.tv_content).visibility=View.VISIBLE
+        bindunreadQBadge(simpleData,image)
+    }
     override fun canDrag(viewHolder: RecyclerView.ViewHolder): Boolean {
 
         return true
@@ -179,16 +213,19 @@ class SimpleViewHolder(itemView: View) : BaseDataVH(itemView) {
  */
 class FolderViewHolder(itemView: View) : BaseDataVH(itemView) {
 
-
+    val 透明=false;
     override fun bindData(data: IDragData) {
         val folderData = data as FolderData
         val context = itemView.context
-        val recyclerView = itemView.findViewById<RecyclerView>(R.id.recycler_view)
-        recyclerView.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+        val recyclerView = itemView.findViewById<RecyclerView>(R.id.grvDesk)
+        recyclerView.layoutManager =GridLayoutManager(context,2,  LinearLayoutManager.VERTICAL,false)
         val folderAdapter = FolderAdapter(context)
         folderAdapter.setData(folderData.list)
         recyclerView.adapter = folderAdapter
 
+        itemView.findViewById<TextView>(R.id.tv_content).text=folderData.getFolderId()
+        itemView.findViewById<TextView>(R.id.tv_content).visibility=View.VISIBLE
+        bindunreadQBadge(folderData,recyclerView)
         showMergePreview(this, false)
     }
 
@@ -241,5 +278,42 @@ class DiffCallback(private val oldList: List<IDragData>, private val newList: Li
 
 
 }
+fun bindunreadQBadge( data: IDragData, targetView:View){
+    //未读数
+    val unreadQBadge: QBadgeView
+    if (targetView.getTag(R.id.viewTag1) == null) {
+        unreadQBadge = QBadgeView(targetView.context)
+        unreadQBadge.badgeBackgroundColor = Color.parseColor("#FC353A")
+        unreadQBadge.setBadgeTextSize(9f, true)
+        unreadQBadge.setBadgePadding(3f, true)
+        unreadQBadge.bindTarget(targetView)
+        targetView.setTag(R.id.viewTag1, unreadQBadge)
+    } else {
+        unreadQBadge = targetView.getTag(R.id.viewTag1) as QBadgeView
+    }
+    unreadQBadge.badgeGravity = Gravity.END or Gravity.TOP
+    unreadQBadge.setGravityOffset(2f,true)
+
+
+    if(data is SimpleData){
+        if ( data.unreadcount > 0 ) {
+            unreadQBadge.badgeNumber = data.unreadcount
+            unreadQBadge.visibility = View.VISIBLE
+        } else {
+            unreadQBadge.visibility = View.GONE
+        }
+    }else if(data is FolderData){
+        if ( data.getUnreadcount() > 0 ) {
+            unreadQBadge.badgeNumber = data.getUnreadcount()
+            unreadQBadge.visibility = View.VISIBLE
+        } else {
+            unreadQBadge.visibility = View.GONE
+        }
+    }else{
+        unreadQBadge.visibility = View.GONE
+    }
+
+
+}
 
 

app/src/main/java/com/ds/drag/demo/activity/AdditionActivity.kt

@@ -5,11 +5,11 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.ds.drag.core.IDragData
+import com.ds.drag.core.SimpleData
 import com.ds.drag.core.callback.DragTouchCallback
-import com.ds.drag.demo.IDragData
 import com.ds.drag.demo.R
 import com.ds.drag.demo.SimpleAdapter
-import com.ds.drag.demo.SimpleData
 import com.ds.drag.demo.handler.AdditionHandlerImpl
 
 /**
@@ -29,7 +29,7 @@ class AdditionActivity : AppCompatActivity() {
         setContentView(R.layout.activity_simple_handler)
         supportActionBar?.title = "加法逻辑"
 
-        recyclerView = findViewById(R.id.recycler_view)
+        recyclerView = findViewById(R.id.grvDesk)
         recyclerView.layoutManager = LinearLayoutManager(this)
         mAdapter = SimpleAdapter(this)
         mAdapter.setData(getTestList())

app/src/main/java/com/ds/drag/demo/activity/FolderActivity.kt

@@ -8,6 +8,10 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.ds.drag.core.FolderData
+import com.ds.drag.core.IDragData
+import com.ds.drag.core.PreviewData
+import com.ds.drag.core.SimpleData
 import com.ds.drag.core.callback.DragTouchCallback
 import com.ds.drag.demo.*
 import com.ds.drag.demo.handler.FolderHandlerImpl
@@ -50,7 +54,7 @@ class FolderActivity : AppCompatActivity() {
      * 初始化左侧列表
      */
     private fun initSimpleList() {
-        recyclerView = findViewById(R.id.recycler_view)
+        recyclerView = findViewById(R.id.grvDesk)
         recyclerView.layoutManager = LinearLayoutManager(this)
         listAdapter.setData(getTestList())
         listAdapter.itemClickListener = { item ->
@@ -76,15 +80,15 @@ class FolderActivity : AppCompatActivity() {
      * 初始化文件夹RecyclerView
      */
     private fun initFolderList() {
-        recycler_view_folder.layoutManager = LinearLayoutManager(this)
-        recycler_view_folder.adapter = folderAdapter
+        grvDeskFolder.layoutManager = LinearLayoutManager(this)
+        grvDeskFolder.adapter = folderAdapter
         // 拖拽位置监听，实现将文件夹的item拖回左侧列表
-        val itemTouchCallback = FolderItemDragCallback()
+        val itemTouchCallback = FolderItemDragCallback(folderAdapter)
         itemTouchCallback.itemLocationListener = { viewHolder, left, top, activity ->
             Log.d("FolderActivity", "initFolderList: left $left, top $top")
             notifyPreviewViewHolder(viewHolder, left, top, activity)
         }
-        ItemTouchHelper(itemTouchCallback).attachToRecyclerView(recycler_view_folder)
+        ItemTouchHelper(itemTouchCallback).attachToRecyclerView(grvDeskFolder)
     }
 
     /**