diff --git a/app/src/main/java/com/casic/br/operationsite/adapter/ManagePointAdapter.kt b/app/src/main/java/com/casic/br/operationsite/adapter/ManagePointAdapter.kt index 71d5a77..5d03399 100644 --- a/app/src/main/java/com/casic/br/operationsite/adapter/ManagePointAdapter.kt +++ b/app/src/main/java/com/casic/br/operationsite/adapter/ManagePointAdapter.kt @@ -32,7 +32,7 @@ override fun onBindViewHolder(holder: ViewHolder, position: Int) { val textView = holder.getView(R.id.textView) - if (position == itemCount - 1 && points.size < countLimit) { + if (position == itemCount - 1 && points.isNotEmpty() && points.size < countLimit) { textView.text = "添加" textView.setTextColor(R.color.greenColor.convertColor(context)) textView.setOnClickListener { @@ -69,6 +69,7 @@ val currentThirdType = points[position].thirdType textView.text = "预置点位 $currentThirdType" textView.setTextColor(R.color.mainTextColor.convertColor(context)) + textView.setOnClickListener(null) textView.setOnLongClickListener { v -> //长按删除巡航点。删除所有线路中相同的点位 val itemsToDelete = pointBeanDao.queryPoint(currentThirdType) @@ -98,5 +99,13 @@ } } - override fun getItemCount(): Int = minOf(countLimit, points.size + 1) + override fun getItemCount(): Int { + return if (points.isEmpty()) { + 1 // 没有数据时只显示“添加” + } else if (points.size < countLimit) { + points.size + 1 // 显示数据 + “添加” + } else { + points.size // 达到上限,不显示“添加” + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/adapter/ManagePointAdapter.kt b/app/src/main/java/com/casic/br/operationsite/adapter/ManagePointAdapter.kt index 71d5a77..5d03399 100644 --- a/app/src/main/java/com/casic/br/operationsite/adapter/ManagePointAdapter.kt +++ b/app/src/main/java/com/casic/br/operationsite/adapter/ManagePointAdapter.kt @@ -32,7 +32,7 @@ override fun onBindViewHolder(holder: ViewHolder, position: Int) { val textView = holder.getView(R.id.textView) - if (position == itemCount - 1 && points.size < countLimit) { + if (position == itemCount - 1 && points.isNotEmpty() && points.size < countLimit) { textView.text = "添加" textView.setTextColor(R.color.greenColor.convertColor(context)) textView.setOnClickListener { @@ -69,6 +69,7 @@ val currentThirdType = points[position].thirdType textView.text = "预置点位 $currentThirdType" textView.setTextColor(R.color.mainTextColor.convertColor(context)) + textView.setOnClickListener(null) textView.setOnLongClickListener { v -> //长按删除巡航点。删除所有线路中相同的点位 val itemsToDelete = pointBeanDao.queryPoint(currentThirdType) @@ -98,5 +99,13 @@ } } - override fun getItemCount(): Int = minOf(countLimit, points.size + 1) + override fun getItemCount(): Int { + return if (points.isEmpty()) { + 1 // 没有数据时只显示“添加” + } else if (points.size < countLimit) { + points.size + 1 // 显示数据 + “添加” + } else { + points.size // 达到上限,不显示“添加” + } + } } \ No newline at end of file diff --git a/app/src/main/res/layout/item_inspection_line_rv_l.xml b/app/src/main/res/layout/item_inspection_line_rv_l.xml index a96b2ec..1ef88c7 100644 --- a/app/src/main/res/layout/item_inspection_line_rv_l.xml +++ b/app/src/main/res/layout/item_inspection_line_rv_l.xml @@ -8,15 +8,15 @@ android:id="@+id/textView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerInParent="true" + android:layout_centerVertical="true" android:text="@string/app_name" android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_14" />