yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.7.3]

Browse Source 
[fix]
[避免任务被删除]
This commit is contained in:
yangyakun
2024-11-12 10:59:39 +08:00
parent 06478bd548
commit 7e18ab9211
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/LineDataBean.kt
View File

@@ -59,7 +59,6 @@ data class LineDataBean(
if (lineId != other.lineId) return false if (lineId != other.lineId) return false
if (lineName != other.lineName) return false if (lineName != other.lineName) return false
if (endStationName != other.endStationName) return false
return true return true
} }
@@ -67,7 +66,7 @@ data class LineDataBean(
override fun hashCode(): Int { override fun hashCode(): Int {
var result = lineId?.hashCode() ?: 0 var result = lineId?.hashCode() ?: 0
result = 31 * result + (lineName?.hashCode() ?: 0) result = 31 * result + (lineName?.hashCode() ?: 0)
result = 31 * result + (endStationName?.hashCode() ?: 0)
return result return result
} }
} }

8
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt
View File

@@ -28,10 +28,6 @@ class SwitchLineAdapter(
private var mItemClickListener: LineItemClickListener? = null private var mItemClickListener: LineItemClickListener? = null
fun setDataList(dataList: List<LineDataBean>) { fun setDataList(dataList: List<LineDataBean>) {
if (this.mData == dataList) {
// 如果新旧列表一致，则直接返回
return
}
val diffResult = DiffUtil.calculateDiff(MyDiffCallback(this.mData, dataList)) val diffResult = DiffUtil.calculateDiff(MyDiffCallback(this.mData, dataList))
this.mData.clear() this.mData.clear()
@@ -95,13 +91,13 @@ class SwitchLineAdapter(
override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
val oldItem = oldData[oldItemPosition] val oldItem = oldData[oldItemPosition]
val newItem = newData[newItemPosition] val newItem = newData[newItemPosition]
return oldItem == newItem return oldItem == newItem && oldItem.endStationName == newItem.endStationName
} }
override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
val oldItem = oldData[oldItemPosition] val oldItem = oldData[oldItemPosition]
val newItem = newData[newItemPosition] val newItem = newData[newItemPosition]
return oldItem == newItem return oldItem == newItem && oldItem.endStationName == newItem.endStationName
} }
} }