From 657fb9eb29fad8cbc028c2cc015e2be33b7e7a46 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 18 Jan 2024 17:10:48 +0800 Subject: [PATCH] =?UTF-8?q?[5.2.8]=20[shuttle=5Fp]=20[=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B1=E8=B4=A5=E6=B7=BB=E5=8A=A0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=A4=84=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/module/biz/network/OchCommonServiceCallback.java | 3 +++ .../och/common/module/biz/network/OchCommonSubscribeImpl.kt | 2 +- .../com/mogo/och/shuttle/passenger/model/TicketModel.kt | 6 +++--- .../shuttle/passenger/network/PassengerServiceManager.kt | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceCallback.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceCallback.java index 8433def5f0..7aa1d80dc2 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceCallback.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonServiceCallback.java @@ -14,5 +14,8 @@ public interface OchCommonServiceCallback< T > { default void onError() { + } + default void onError(String msg) { + } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonSubscribeImpl.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonSubscribeImpl.kt index 01f08eaaee..3345bd2980 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonSubscribeImpl.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonSubscribeImpl.kt @@ -25,7 +25,7 @@ class OchCommonSubscribeImpl( override fun onError(e: Throwable) { super.onError(e) CallerLogger.e("$flavorTag$TAG", "$apiName: onError() ${e.message}") - callback?.onError() + callback?.onError("$apiName: onError() ${e.message}") } override fun onError(message: String, code: Int) { diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt index 3e4f325df4..dd1c902a78 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt @@ -77,9 +77,9 @@ object TicketModel : StateChangeListener { } } - override fun onError() { - super.onError() - ScannerChainLogManager.writeChainLog(TAG +"onError","接口请求错误orderNo：${orderNo}__uid：${uid}") + override fun onError(message: String) { + ScannerChainLogManager.writeChainLog(TAG +"onError","/och-vehicle/api/scanner/device/writeOff接口请求错误orderNo：${orderNo}__uid：${uid}__reaseon:${message}") + sendMessage2Driver("网络错误") } } ) diff --git a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt index 72c6705f0c..53014e6a9b 100644 --- a/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt +++ b/OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/network/PassengerServiceManager.kt @@ -106,7 +106,7 @@ object PassengerServiceManager { ticketInfo ) .transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverOperationStatus")) + .subscribe(OchCommonSubscribeImpl(context, callback, "writeOff")) } } \ No newline at end of file