|
@@ -235,11 +235,17 @@ object FusionManager : LifecycleObserver, OnFdcClientStateChangedListener,
|
|
|
|
|
|
//将订单页面减去此需消除订单
|
|
|
val orders = SPUtil.getOrderListByPump(dc.pumpNo)
|
|
|
- orders.remove(orders.find { it.pumpNo == dc.pumpNo && it.releaseTokenElement == dc.releaseTokenElement && it.transactionSeqNo == dc.transactionSeqNo })
|
|
|
+ val result = orders.remove(orders.find { it.pumpNo == dc.pumpNo && it.releaseTokenElement == dc.releaseTokenElement && it.transactionSeqNo == dc.transactionSeqNo })
|
|
|
SPUtil.setOrderListByPump(dc.pumpNo,orders)
|
|
|
onRefreshNozzleUi?.onRefreshNozzleUi(dc.pumpNo, orders.isNotEmpty()) //枪页面显示浅色
|
|
|
onRefreshOrderUi?.onRefreshOrderUi(dc.pumpNo,orders)
|
|
|
|
|
|
+ if (!result) {
|
|
|
+ val findOrder = "${dc.pumpNo}-${dc.releaseTokenElement}-${dc.transactionSeqNo}-${dc.releaseTokenAttribute}"
|
|
|
+ val ordersStr = orders.map { "${it.pumpNo}-${it.releaseTokenElement}-${it.transactionSeqNo}-${it.releaseTokenAttribute}" }
|
|
|
+ DFSLog.i("查找的订单:${findOrder}","当前订单:${ordersStr}")
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
"Locked" -> if (null != dc.pumpNo && null != dc.transactionSeqNo) { // 锁单(被某一设备正在支付),或本机锁,或其他设备锁
|
|
|
// DFSLog.i("订单订单订单",dc.toString())
|