[5.2.8]

[shuttle_p]
[网络接口失败添加错误处理]

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) {
+
     }
 }

OCH/common/common/src/main/java/com/mogo/och/common/module/biz/network/OchCommonSubscribeImpl.kt

@@ -25,7 +25,7 @@ class OchCommonSubscribeImpl<T : BaseData>(
     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) {

OCH/shuttle/passenger/src/main/java/com/mogo/och/shuttle/passenger/model/TicketModel.kt

@@ -77,9 +77,9 @@ object TicketModel : StateChangeListener {
                     }
                 }
 
-                override fun onError() {
+                override fun onError(message: String) {
-                    super.onError()
+                    ScannerChainLogManager.writeChainLog(TAG +"onError","/och-vehicle/api/scanner/device/writeOff接口请求错误orderNo：${orderNo}__uid：${uid}__reaseon:${message}")
-                    ScannerChainLogManager.writeChainLog(TAG +"onError","接口请求错误orderNo：${orderNo}__uid：${uid}")
+                    sendMessage2Driver("网络错误")
                 }
             }
         )

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"))
 
     }
 }