From 7e18ab921139ce4dbf9781dd8814b8bbe94bf1c6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 12 Nov 2024 10:59:39 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.3]=20[fix]=20[=E9=81=BF=E5=85=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=A2=AB=E5=88=A0=E9=99=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/weaknet/repository/db/bean/LineDataBean.kt | 3 +-- .../mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt index 7be426037c..d2b7d38eb4 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt @@ -59,7 +59,6 @@ data class LineDataBean( if (lineId != other.lineId) return false if (lineName != other.lineName) return false - if (endStationName != other.endStationName) return false return true } @@ -67,7 +66,7 @@ data class LineDataBean( override fun hashCode(): Int { var result = lineId?.hashCode() ?: 0 result = 31 * result + (lineName?.hashCode() ?: 0) - result = 31 * result + (endStationName?.hashCode() ?: 0) return result } + } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt index d1b340a761..b3487fa0ce 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt @@ -28,10 +28,6 @@ class SwitchLineAdapter( private var mItemClickListener: LineItemClickListener? = null fun setDataList(dataList: List) { - if (this.mData == dataList) { - // 如果新旧列表一致，则直接返回 - return - } val diffResult = DiffUtil.calculateDiff(MyDiffCallback(this.mData, dataList)) this.mData.clear() @@ -95,13 +91,13 @@ class SwitchLineAdapter( override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { val oldItem = oldData[oldItemPosition] val newItem = newData[newItemPosition] - return oldItem == newItem + return oldItem == newItem && oldItem.endStationName == newItem.endStationName } override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { val oldItem = oldData[oldItemPosition] val newItem = newData[newItemPosition] - return oldItem == newItem + return oldItem == newItem && oldItem.endStationName == newItem.endStationName } }