优化标签布局

杨宏伟 · 杨宏伟 · commit 732b53e4fed1 · 2023-03-15T14:28:22.000+08:00
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ allprojects {
 	}
 
 dependencies {
-            implementation 'com.github.LuckyCodeer:TagLayout:1.0.4'
+            implementation 'com.github.LuckyCodeer:TagLayout:1.0.5'
 	}
 ```
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation project(path: ':library')
+//    implementation 'com.github.LuckyCodeer:TagLayout:1.0.5'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -16,47 +16,47 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="10dp"
             android:layout_margin="10dp"
-            android:text="正常"
-            android:background="@drawable/tag_selector_bg"/>
+            android:background="@drawable/tag_selector_bg"
+            android:padding="10dp"
+            android:text="正常" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="10dp"
             android:layout_margin="10dp"
-            android:text="单选"
-            android:background="@drawable/tag_selector_bg"/>
+            android:background="@drawable/tag_selector_bg"
+            android:padding="10dp"
+            android:text="单选" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="10dp"
             android:layout_margin="10dp"
-            android:text="多选"
-            android:background="@drawable/tag_selector_bg"/>
+            android:background="@drawable/tag_selector_bg"
+            android:padding="10dp"
+            android:text="多选" />
     </com.yhw.taglayout.TagLayout>
 
     <com.yhw.taglayout.TagLayout
         android:id="@+id/tag_layout_2"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:defaultChoicePosition="0"
-        app:choiceMode="none" />
+        app:choiceMode="none"
+        app:defaultChoicePosition="0" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
+        android:layout_marginTop="20dp"
         android:gravity="center"
-        android:layout_marginTop="20dp">
+        android:orientation="horizontal">
 
         <Button
             android:id="@+id/btn_get_index"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="获取选中项"/>
+            android:text="获取选中项" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_item_layout.xml b/app/src/main/res/layout/list_item_layout.xml
@@ -9,22 +9,23 @@
         android:id="@+id/tv_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"/>
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.yhw.taglayout.TagLayout
         android:id="@+id/tag_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_text"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_text" />
+
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        app:layout_constraintTop_toBottomOf="@id/tag_layout"
-        android:background="#e0e0e0"/>
+        android:background="#e0e0e0"
+        app:layout_constraintTop_toBottomOf="@id/tag_layout" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/tag_item_layout.xml b/app/src/main/res/layout/tag_item_layout.xml
@@ -2,14 +2,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_margin="10dp"
+    android:layout_margin="5dp"
     android:background="@drawable/tag_selector_bg"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:ellipsize="end"
         android:gravity="center"
         android:padding="10dp"
         android:textSize="15sp" />
diff --git a/library/build.gradle b/library/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 104
-        versionName "1.0.4"
+        versionCode 105
+        versionName "1.0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/library/src/main/java/com/yhw/taglayout/TagLayout.kt b/library/src/main/java/com/yhw/taglayout/TagLayout.kt
@@ -4,28 +4,30 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Rect
 import android.util.AttributeSet
+import android.util.DisplayMetrics
 import android.util.Log
 import android.view.View
 import android.view.View.OnLongClickListener
 import android.view.ViewGroup
+import android.view.WindowManager
 import kotlin.math.max
 
-private const val TAG = "TagLayout"
+private const val TAG = "TagLayout===>"
 
 /**
  * 标签布局
  * @author yhw
  */
 class TagLayout : ViewGroup {
-    private val mViewRectList = mutableListOf<Rect>()
-    private val mChildViewList = mutableListOf<View>()
+    private val mViewRectMap = mutableMapOf<View, Rect>()
     private var choiceMode = ChoiceMode.None.choiceMode //选择模式
     private var defChoicePosition: Int = 0 //单选时默认选中
     private lateinit var mAdapter: TagAdapter
     var onItemClickListener: OnItemClickListener? = null
     var onItemLongClickListener: OnItemLongClickListener? = null
     var onSingleCheckedChangeListener: OnSingleCheckedChangeListener? = null
     var onMultipleCheckedChangeListener: OnMultipleCheckedChangeListener? = null
+    var mScreenWidth = 0 //屏幕宽度
 
     constructor(context: Context) : this(context, null)
     constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
@@ -38,6 +40,12 @@ class TagLayout : ViewGroup {
         choiceMode = ta.getInt(R.styleable.TagLayout_choiceMode, ChoiceMode.None.choiceMode)
         defChoicePosition = ta.getInt(R.styleable.TagLayout_defaultChoicePosition, 0)
         ta.recycle()
+
+        val windowManager = context
+            .getSystemService(Context.WINDOW_SERVICE) as WindowManager
+        val displayMetrics = DisplayMetrics()
+        windowManager.defaultDisplay.getMetrics(displayMetrics)
+        this.mScreenWidth = displayMetrics.widthPixels
     }
 
     @SuppressLint("DrawAllocation")
@@ -52,9 +60,8 @@ class TagLayout : ViewGroup {
         var height = 0 //最终父布局高度
         var lineWidth = 0 //行宽
         var lineHeight = 0 //行高
-
+        Log.i(TAG, "widthSize is $widthSize  widthMode is $widthMode mScreenWidth:${mScreenWidth}")
         measureChildren(widthMeasureSpec, heightMeasureSpec)
-
         for (i in 0 until childCount) {
             val childView = getChildAt(i)
             val marginLayoutParams: MarginLayoutParams =
@@ -83,72 +90,76 @@ class TagLayout : ViewGroup {
                 lineHeight = max(childHeight, lineHeight)
             }
 
-            if (!mChildViewList.contains(childView)) {
-                if (choiceMode == ChoiceMode.SingleChoice.choiceMode) {
-                    if (i in 0 until childCount && i == defChoicePosition)
-                        childView.isSelected = true
-                }
-                mChildViewList.add(childView)
-                val childLeft = lineWidth - childWidth + marginLayoutParams.leftMargin
-                val childRight =
-                    lineWidth - childWidth + childWidth - marginLayoutParams.rightMargin
-                val childTop = height + marginLayoutParams.topMargin
-                val childBottom = height + childHeight - marginLayoutParams.bottomMargin
-                val rect = Rect(childLeft, childTop, childRight, childBottom)
-                Log.i(
-                    TAG, "onMeasure  left:${rect.left}  top:${rect.top} ," +
-                            "right:${rect.right} ,bottom:${rect.bottom}"
-                )
-                mViewRectList.add(rect)
-
-                if (onItemClickListener != null || onSingleCheckedChangeListener != null || onMultipleCheckedChangeListener != null) {
-                    childView.isClickable = true
-                    childView.isFocusable = true
-                    childView.setOnClickListener {
-                        changedCheckedItemView(i)
-                        if (onItemClickListener != null) {
-                            onItemClickListener?.onItemClick(i, it)
-                        }
-                        if (choiceMode == ChoiceMode.SingleChoice.choiceMode) {
-                            this.defChoicePosition = i
-                            if (onSingleCheckedChangeListener != null) {
-                                onSingleCheckedChangeListener?.onCheckedChanged(defChoicePosition)
-                            }
-                        } else if (choiceMode == ChoiceMode.MultipleChoice.choiceMode) {
-                            if (onMultipleCheckedChangeListener != null) {
-                                onMultipleCheckedChangeListener?.onCheckedChanged(getCheckedList())
-                            }
-                        }
-                    }
-                }
-
-                if (onItemLongClickListener != null) {
-                    childView.isClickable = true
-                    childView.isFocusable = true
-                    childView.setOnLongClickListener(OnLongClickListener { v ->
-                        onItemLongClickListener?.onItemLongClick(i, v)
-                        true
-                    })
-                }
+            if (choiceMode == ChoiceMode.SingleChoice.choiceMode) {
+                if (i in 0 until childCount && i == defChoicePosition)
+                    childView.isSelected = true
             }
+            val childLeft = lineWidth - childWidth + marginLayoutParams.leftMargin + paddingLeft
+            var childRight = childView.measuredWidth + childLeft
+            if (childRight > mScreenWidth) {
+                childRight = mScreenWidth - marginLayoutParams.rightMargin - paddingRight
+//                childRight = childView.measuredWidth
+            }
+            val childTop = height + marginLayoutParams.topMargin + paddingTop
+            val childBottom =
+                height + childHeight - marginLayoutParams.bottomMargin + paddingTop
+            val rect = Rect(childLeft, childTop, childRight, childBottom)
+            Log.i(
+                TAG, "onMeasure  left:${rect.left}  top:${rect.top} ," +
+                        "right:${rect.right} ,bottom:${rect.bottom}   measuredWidth:${childView.measuredWidth}"
+            )
+            mViewRectMap[childView] = rect
 
             //最后一行处理
             if (i == childCount - 1) {
                 width = max(lineWidth, width)
                 height += lineHeight
             }
         }
-        setMeasuredDimension(
-            if (widthMode == MeasureSpec.EXACTLY) widthSize else width,
-            if (heightMode == MeasureSpec.EXACTLY) heightSize else height
-        )
+        val measuredWidth =
+            if (widthMode == MeasureSpec.EXACTLY) widthSize else width + paddingLeft + paddingRight
+        val measuredHeight =
+            if (heightMode == MeasureSpec.EXACTLY) heightSize else height + paddingTop + paddingBottom
+        Log.i(TAG, "measuredWidth  :${measuredWidth}  measuredHeight:${measuredHeight}  width:${width} lineWidth:${lineWidth}")
+        setMeasuredDimension(max(measuredWidth, width), measuredHeight)
     }
 
     override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
-        for (i in 0 until childCount) {
-            val childView = getChildAt(i)
-            val rect = mViewRectList[i]
+        Log.i(TAG, "=========onLayout========== $changed  $l  $t  $r  $b")
+        var i = 0
+        for ((childView, rect) in mViewRectMap) {
             childView.layout(rect.left, rect.top, rect.right, rect.bottom)
+            if (onItemClickListener != null || onSingleCheckedChangeListener != null || onMultipleCheckedChangeListener != null) {
+                childView.isClickable = true
+                childView.isFocusable = true
+                val position = i
+                childView.setOnClickListener {
+                    changedCheckedItemView(position)
+                    if (onItemClickListener != null) {
+                        onItemClickListener?.onItemClick(position, it)
+                    }
+                    if (choiceMode == ChoiceMode.SingleChoice.choiceMode) {
+                        this.defChoicePosition = position
+                        if (onSingleCheckedChangeListener != null) {
+                            onSingleCheckedChangeListener?.onCheckedChanged(defChoicePosition)
+                        }
+                    } else if (choiceMode == ChoiceMode.MultipleChoice.choiceMode) {
+                        if (onMultipleCheckedChangeListener != null) {
+                            onMultipleCheckedChangeListener?.onCheckedChanged(getCheckedList())
+                        }
+                    }
+                }
+            }
+
+            if (onItemLongClickListener != null) {
+                childView.isClickable = true
+                childView.isFocusable = true
+                childView.setOnLongClickListener(OnLongClickListener { v ->
+                    onItemLongClickListener?.onItemLongClick(i, v)
+                    true
+                })
+            }
+            i++
         }
     }
 
@@ -157,7 +168,8 @@ class TagLayout : ViewGroup {
      */
     private fun changedCheckedItemView(position: Int) {
         Log.i(TAG, "choiceMode is $choiceMode")
-        for ((index, view) in mChildViewList.withIndex()) {
+        var index = 0
+        for ((view, _) in mViewRectMap) {
             if (position == -1) {
                 view.isSelected = false
                 continue
@@ -171,6 +183,7 @@ class TagLayout : ViewGroup {
             } else {
                 view.isSelected = false
             }
+            index++
         }
     }
 
@@ -179,10 +192,12 @@ class TagLayout : ViewGroup {
      */
     fun getCheckedList(): MutableList<Int> {
         val checkedList = mutableListOf<Int>()
-        for ((index, view) in mChildViewList.withIndex()) {
+        var index = 0
+        for ((view, _) in mViewRectMap) {
             if (view.isSelected) {
                 checkedList.add(index)
             }
+            index++
         }
         return checkedList
     }
@@ -204,8 +219,7 @@ class TagLayout : ViewGroup {
 
     private fun changedAdapter() {
         removeAllViews()
-        mChildViewList.clear()
-        mViewRectList.clear()
+        mViewRectMap.clear()
         for (i in 0 until mAdapter.getItemCount()) {
             val itemView = mAdapter.onCreateView(this)
             mAdapter.onBindView(itemView, i)

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ allprojects {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
`15`		`- implementation 'com.github.LuckyCodeer:TagLayout:1.0.4'`
	`15`	`+ implementation 'com.github.LuckyCodeer:TagLayout:1.0.5'`
`16`	`16`	`}`
`17`	`17`	```
`18`	`18`