[shuttle-B1/B2] 弱网调试完成

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/bean/dpmsg/DataBean.kt

@@ -42,5 +42,5 @@ data class AppConnectMsg(var isViewShow: Boolean, var isPlay: Boolean, var msg:
 ): BaseDPMsg(DPMsgType.TYPE_COMMON.type)
 
 data class TaskDetailsMsg(
-    var msg: String,
+    var msg: String?,
 ): BaseDPMsg(DPMsgType.TYPE_TASK_DETAILS.type)

OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusTransferData.kt

@@ -5,5 +5,5 @@ package com.mogo.och.data.bean
  */
 data class BusTransferData (
     var loginStatus: Int,
-    var routesResult: BusRoutesResult,
+    var routesResult: BusRoutesResult?,
 )

OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java

@@ -139,7 +139,7 @@ public class BusPassengerModel {
 
     private void queryDriverByLocalDriver() {
         //本地去请求司机端
-        TaskDetailsMsg msg = new TaskDetailsMsg("");
+        TaskDetailsMsg msg = new TaskDetailsMsg("task");
 
         sendMsgToServer(GsonUtils.toJson(msg));
     }
@@ -167,7 +167,7 @@ public class BusPassengerModel {
     private void sendMsgToServer(String msg){
         CallerTelematicManager.INSTANCE.sendMsgToServer(
                 OchCommonConst.BUSINESS_STRING,
-                GsonUtils.toJson(msg).getBytes()
+                msg.getBytes()
         );
     }
 

OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt

@@ -376,6 +376,15 @@ class PM2DrivingModel private constructor() {
                         updatePassengerRouteInfo(data.result)
                     }
 
+                    fun onError() {
+                        CallerLogger.d(
+                            SceneConstant.Companion.M_BUS_P + TAG,
+                            "queryDriverSiteByCoordinate = onError ="
+                                    + ", sn = " + BusPassengerServiceManager.driverAppSn
+                        )
+                        queryDriverByLocalDriver()
+                    }
+
                     override fun onFail(code: Int, msg: String?) {
                         d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate = %s", msg)
                         if (code == 1003){
@@ -405,6 +414,12 @@ class PM2DrivingModel private constructor() {
     }
 
     private fun updatePassengerRouteInfo(result: BusRoutesResult) {
+
+        if (result == null) {
+            clearLocalRouteResult()
+            return
+        }
+
         mDrivingInfoCallback?.updateLine(result.name, result.runningDur)
             if (result.sites != null) {
                 mDrivingInfoCallback?.showNoTaskView(false)

OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java

@@ -819,7 +819,8 @@ public class OrderModel {
     }
 
     private void sendTaskDetailsToClients() {
-        BusTransferData data = new BusTransferData(LoginStatusManager.getLoginStatus().getCode(),busRoutesResult);
+
+        BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,busRoutesResult);
         TaskDetailsMsg msg = new TaskDetailsMsg(GsonUtils.toJson(data));
         CallerLogger.INSTANCE.d(M_BUS + TAG, "sendTaskDetailsToClients = " + GsonUtils.toJson(msg));
         CallerTelematicManager.INSTANCE.sendMsgToAllClients(OchCommonConst.BUSINESS_STRING,
@@ -827,7 +828,7 @@ public class OrderModel {
     }
 
     private void pushCacheTransferData(BusRoutesResult result) {
-        BusTransferData data = new BusTransferData(LoginStatusManager.getLoginStatus().getCode(),result);
+        BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,result);
         CacheDataManager.Companion.getInstance().putCacheData(mContext,
                 BusCacheKey.BUS_LINE_CACHE,
                 GsonUtils.toJson(data));