From d3f57bd38aad46559fc8cc78a659a529d798f89f Mon Sep 17 00:00:00 2001 From: EmArrow Date: Fri, 12 Jul 2024 17:56:53 +0800 Subject: [PATCH] [6.5.0] fix bug of taxi model --- .../java/com/mogo/och/common/module/biz/order/OrderModel.kt | 5 +---- .../java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt index 84048b6426..fbed1c8d2d 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/order/OrderModel.kt @@ -22,14 +22,11 @@ object OrderModel { } fun invokeListener(orderBean: T?){ - - - if(this.orderBean==null){ this.orderBean = orderBean }else { if(orderBean==null){ - this.orderBean = orderBean + this.orderBean = null }else{ if (this.orderBean!!.orderNo == orderBean.orderNo && this.orderBean!!.orderStatus == orderBean.orderStatus) { return diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index 2254e61cb8..74f471b216 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -773,7 +773,7 @@ object TaxiTaskModel { if (newOrderStatus!=mCurrentTaskWithOrder?.order?.orderStatus) { // 订单状态发生改变 orderStatusChange = true - OrderModel.invokeListener(mCurrentTaskWithOrder!!.order) + OrderModel.invokeListener(mCurrentTaskWithOrder?.order) } } //订单或者伪任务更新, 都去刷新下界面