diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java index 0b04bef6b9..60f7798a05 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/BusLineModel.java @@ -119,11 +119,11 @@ public class BusLineModel { } public void commitSwitchLineId(int taskId,int lineId){ - OchChainLogManager.writeChainLog("选择线路","taskId:"+taskId+"--lineId:"+lineId,true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS); + OchChainLogManager.writeChainLog("选择线路","taskId:"+taskId+"--lineId:"+lineId); OrderServiceManager.switchLine(mContext,taskId, new OchCommonServiceCallback() { @Override public void onSuccess(BusRoutesResponse o) { - OchChainLogManager.writeChainLog("选择线路成功","taskId:"+taskId+"--lineId:"+lineId,true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS); + OchChainLogManager.writeChainLog("选择线路成功","taskId:"+taskId+"--lineId:"+lineId); SharedPrefsMgr.getInstance().putInt(BusSwitchLineActivity.LASTCOMMITLINEID,lineId); if (mBusLinesCallback != null){ mBusLinesCallback.onChangeLineIdSuccess(); @@ -133,7 +133,7 @@ public class BusLineModel { @Override public void onError() { if (!NetworkUtils.isConnected(mContext)) { - OchChainLogManager.writeChainLog("选择线路失败","taskId:"+taskId+"--lineId:"+lineId,true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS); + OchChainLogManager.writeChainLog("选择线路失败","taskId:"+taskId+"--lineId:"+lineId); ToastUtils.showShort(mContext.getString(R.string.network_error_tip)); } else { ToastUtils.showShort(mContext.getString(R.string.request_error_tip)); diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index 41484f0972..31874fa05d 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -779,8 +779,7 @@ public class OrderModel { * 到站后重置站点状态 */ private void arriveSiteStation(String changeInfo) { - OchChainLogManager.writeChainLog("触发进站", changeInfo, - true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS); + OchChainLogManager.writeChainLog("触发进站", changeInfo); if ( backgroundCurrentStationIndex +1 > stationList.size() - 1 ) { //到站短时间内调用多次 CallerLogger.e( M_BUS + TAG, "数组越界" ); return; @@ -890,8 +889,7 @@ public class OrderModel { String changeInfo = "taskId:" + currentTaskId + "--lineId:" + currentLineId + "--currentStationName:"+currentStationName+"--finalNextStationName:"+finalNextStationName; - OchChainLogManager.writeChainLog("滑动出发", changeInfo, - true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS); + OchChainLogManager.writeChainLog("滑动出发", changeInfo); OrderServiceManager.leaveStation(mContext, busStationBean.getSeq(), busStationBean.getSiteId(), @@ -899,8 +897,7 @@ public class OrderModel { new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - OchChainLogManager.writeChainLog("滑动出发成功", changeInfo, - true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS); + OchChainLogManager.writeChainLog("滑动出发成功", changeInfo); } diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt index 663fdb4406..92884c272b 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/net/OrderServiceManager.kt @@ -324,7 +324,7 @@ object OrderServiceManager { ) ) .transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "runCarHeartbeat")) + .subscribe(OchCommonSubscribeImpl(context, callback, "runCarHeartbeat",false)) } } diff --git a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderModel.kt b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderModel.kt index 99200a7896..34bc8a803c 100644 --- a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderModel.kt +++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/model/OrderModel.kt @@ -31,6 +31,7 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatu import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager import com.mogo.och.common.module.manager.distance.IDistanceListener import com.mogo.och.common.module.manager.distance.TrajectoryAndDistanceManager +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager @@ -261,6 +262,7 @@ object OrderModel { ) return } + OchChainLogManager.writeChainLog("订单信息流转","$data"); if (routesResult != null && routesResult!!.writeVersion < data.result.writeVersion diff --git a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt index 4b34f2936e..f7f2644a68 100644 --- a/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt +++ b/OCH/bus/passenger/src/main/java/com/mogo/och/bus/passenger/network/BusPassengerServiceManager.kt @@ -41,14 +41,14 @@ object BusPassengerServiceManager { SharedPrefsMgr.getInstance().token, LoginLanPassengerSocket.driverSn ).transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate")) + .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate",false)) }else{ mBusPassengerServiceApi.queryDriverSiteByCoordinate( MoGoAiCloudClientConfig.getInstance().serviceAppId, SharedPrefsMgr.getInstance().token, BusPassengerQueryLineRequest(LoginLanPassengerSocket.driverSn) ).transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate")) + .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate",false)) } } diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt index 0c15df4cd3..6ecaf99c6a 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt @@ -48,6 +48,7 @@ import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotManager import com.mogo.och.common.module.manager.device.LightAirconditionDoorManager import com.mogo.och.common.module.manager.device.LightAirconditionDoorStatusManager +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.startLoopAbnormalFactors import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManager.stopLoopAbnormalFactors import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager @@ -746,6 +747,8 @@ class DriverM1Model { d(SceneConstant.M_CHARTER_D + TAG, "queryCurrentOrder order =" + GsonUtils.toJson(data.data)) + OchChainLogManager.writeChainLog("订单信息流转","$data"); + mCurrentOrder = data.data diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt index 46c8ca5959..8d7aa4630d 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/net/DriverM1ServiceManager.kt @@ -59,7 +59,7 @@ object DriverM1ServiceManager { SharedPrefsMgr.getInstance().token, SharedPrefsMgr.getInstance().sn )?.transformTry() - ?.subscribe(OchCommonSubscribeImpl(context!!, callback, "queryCurrentOrder")) + ?.subscribe(OchCommonSubscribeImpl(context!!, callback, "queryCurrentOrder",false)) } fun checkOrderCountDown(context: Context?, diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt index 2de61eac89..e59f8c7802 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt @@ -734,7 +734,7 @@ object CharterPassengerModel { private fun setOrderStatus(orderStatus: OrderStatusEnum) { if (this.orderStatus != orderStatus) { d(M_BUS_P + TAG, "${this.orderInfo?.orderNo}新的状态：$orderStatus") - OchChainLogManager.writeChainLog(this.orderInfo.toString(),"新的状态：$orderStatus") + OchChainLogManager.writeChainLog(this.orderStatus.name,"新的状态：${this.orderInfo}") this.orderStatus = orderStatus BeautifyManager.notifyViewChange(BeautifyManager.ChangeTypeEnum.ORDER_STATU_CHANGE) for (callback in orderStatusChangeListeners.values) { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt index c5bb0bef1a..2e1035b131 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/net/BusPassengerServiceManager.kt @@ -64,7 +64,7 @@ object BusPassengerServiceManager { return } mBusPassengerServiceApi.queryOrderInfo().transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "order")) + .subscribe(OchCommonSubscribeImpl(context, callback, "order",false)) } @JvmStatic @@ -93,7 +93,7 @@ object BusPassengerServiceManager { return } mBusPassengerServiceApi.queryBusinessStatus().transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "businessStatus")) + .subscribe(OchCommonSubscribeImpl(context, callback, "businessStatus",false)) } @@ -138,7 +138,7 @@ object BusPassengerServiceManager { return } mBusPassengerServiceApi.queryBusinessTime().transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusinessTime")) + .subscribe(OchCommonSubscribeImpl(context, callback, "queryBusinessTime",false)) } @JvmStatic diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt index 41db86def2..cc338ff006 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt @@ -20,6 +20,7 @@ import com.mogo.och.common.module.biz.login.LoginStatusManager import com.mogo.och.common.module.biz.login.RoleEnum import com.mogo.och.common.module.biz.login.LoginStatusEnum import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType import com.mogo.och.common.module.manager.socket.lan.bean.EnvType import com.mogo.och.common.module.manager.socket.lan.bean.ProjectType @@ -145,7 +146,9 @@ class LoginProvider : LoginService { override fun setLoginInfo(loginInfo: LoginInfo) { CallerLogger.d(tag, "setLoginInfo:${loginInfo}") - this.loginInfo = loginInfo + if(this.loginInfo!=loginInfo){ + this.loginInfo = loginInfo + } } override fun getLoginInfo(): LoginInfo? { @@ -172,6 +175,7 @@ class LoginProvider : LoginService { override fun setLoginStatus(loginStatus: LoginStatusEnum) { CallerLogger.d(tag, "setLoginStatus:${loginStatus}----old${this.loginStatus}") if (loginStatus != this.loginStatus) { + OchChainLogManager.writeChainLog("登录状态变化","${this.loginStatus}-->${loginStatus}"); this.loginStatus = loginStatus LoginStatusManager.invokeLoginStatusChange(loginStatus) } @@ -194,6 +198,7 @@ class LoginProvider : LoginService { override fun setOpenOrderStatusType(type: Int) { CallerLogger.d(tag, "setOpenOrderStatusType:${type}") if (openOrderStatusEnum.code != type) { + OchChainLogManager.writeChainLog("接单状态变化","${this.openOrderStatusEnum}-->${OpenOrderStatusEnum.valueOf(type)}"); this.openOrderStatusEnum = OpenOrderStatusEnum.valueOf(type) LoginStatusManager.invokeLOpenOrderStatusChange(this.openOrderStatusEnum) } diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/net/OchCommonServiceManager.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/net/OchCommonServiceManager.kt index 3d7ecef812..4670b0d98e 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/net/OchCommonServiceManager.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/net/OchCommonServiceManager.kt @@ -152,14 +152,14 @@ object OchCommonServiceManager { SharedPrefsMgr.getInstance().token, sn ).transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "loginStatus")) + .subscribe(OchCommonSubscribeImpl(context, callback, "loginStatus",false)) }else{ ochLoginServiceSaasEh.queryDriverServiceStatusAndLoginStatus( MoGoAiCloudClientConfig.getInstance().serviceAppId, SharedPrefsMgr.getInstance().token, sn ).transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "loginStatus")) + .subscribe(OchCommonSubscribeImpl(context, callback, "loginStatus",false)) } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java index 2fa411d9dd..4be3e01f95 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java @@ -157,4 +157,48 @@ public class LoginInfo { ", photos='" + photos + '\'' + '}'; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + LoginInfo loginInfo = (LoginInfo) o; + + if (driverStatus != loginInfo.driverStatus) return false; + if (servingStatus != loginInfo.servingStatus) return false; + if (businessType != loginInfo.businessType) return false; + if (purpose != loginInfo.purpose) return false; + if (!orderNo.equals(loginInfo.orderNo)) return false; + if (!sn.equals(loginInfo.sn)) return false; + if (!plateNumber.equals(loginInfo.plateNumber)) return false; + if (!phone.equals(loginInfo.phone)) return false; + if (!lineId.equals(loginInfo.lineId)) return false; + if (!taskId.equals(loginInfo.taskId)) return false; + if (!vin.equals(loginInfo.vin)) return false; + if (!cityCode.equals(loginInfo.cityCode)) return false; + if (!brand.equals(loginInfo.brand)) return false; + if (!carModel.equals(loginInfo.carModel)) return false; + return photos.equals(loginInfo.photos); + } + + @Override + public int hashCode() { + int result = driverStatus; + result = 31 * result + servingStatus; + result = 31 * result + businessType; + result = 31 * result + orderNo.hashCode(); + result = 31 * result + purpose; + result = 31 * result + sn.hashCode(); + result = 31 * result + plateNumber.hashCode(); + result = 31 * result + phone.hashCode(); + result = 31 * result + lineId.hashCode(); + result = 31 * result + taskId.hashCode(); + result = 31 * result + vin.hashCode(); + result = 31 * result + cityCode.hashCode(); + result = 31 * result + brand.hashCode(); + result = 31 * result + carModel.hashCode(); + result = 31 * result + photos.hashCode(); + return result; + } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt index df85819e93..f65a14e55d 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/trajectory/TrajectoryManager.kt @@ -8,7 +8,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager -import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager.writeChainLog import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil import mogo.telematics.pad.MessagePad import java.util.concurrent.ConcurrentHashMap @@ -105,7 +104,7 @@ object TrajectoryManager : IMoGoPlanningRottingListener { fun addDownLoadSuccessLine(lineId:Long){ if(lineId>0){ - writeChainLog("轨迹监控", "onAutopilotGuardian() 轨迹下载成功${lineId}", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY) + OchChainLogManager.writeChainLog("轨迹监控", "onAutopilotGuardian() 轨迹下载成功${lineId}", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY) downLoadSuccessLineIds.add(lineId) } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt index 4d6b642322..83e7d6f449 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt @@ -16,17 +16,23 @@ import com.zhjt.service.chain.ChainLog object OchChainLogManager { private val TAG = OchChainLogManager::class.java.simpleName - + // 通用 title changeinfo 日志 const val EVENT_KEY_INFE_WITH_CHANGE = "event_key_och_common_info_and_changeinfo" + // 轨迹信息监控 const val EVENT_KEY_INFE_WITH_TRAJECTORY = "event_key_och_trajectory_info" + // 音乐播放日志 const val EVENT_KEY_INFE_WITH_MUSIC = "event_key_och_music_info" - const val EVENT_KEY_INFE_WITH_BUS = "event_key_och_bus_info" + // 需要举行观察的 const val EVENT_KEY_INFE_ERROR = "event_key_och_error" + // 网络接口 const val EVENT_KEY_INFO_Net = "event_key_och_net" + // 初始化信息 const val EVENT_KEY_INFO_INIT = "event_key_och_init" + // 局域网内socket 通讯 const val EVENT_KEY_INFO_SOCKET = "analytics_event_och_track_screen_msg" + // 局域网内socket 连接状态流转 const val EVENT_KEY_INFO_SOCKET_CONNECT = "analytics_event_och_track_screen_connect" @@ -39,13 +45,17 @@ object OchChainLogManager { fun writeChainLogNetLanSocketConnect(title: String, info: String){ writeChainLog(title,info,true,EVENT_KEY_INFO_SOCKET_CONNECT) } + @JvmStatic fun writeChainLogLanSocket(title: String, info: String, action:String){ val map = hashMapOf() map["action"] = action writeChainLog(title,info,true,EVENT_KEY_INFO_SOCKET, map) } - + @JvmStatic + fun writeChainLog(title: String, info: String){ + writeChainLog(title,info,true,EVENT_KEY_INFE_WITH_CHANGE) + } @JvmStatic fun writeChainLog(title: String, info: String, upload:Boolean = true, eventID:String=EVENT_KEY_INFE_WITH_CHANGE) { writeChainLog(title,info,upload,eventID,null) diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java index 0d5b1691a4..f31bb3d66c 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/model/OrderModel.java @@ -704,8 +704,7 @@ public class OrderModel { * 到站后重置站点状态 */ private void arriveSiteStation(String changeInfo) { - OchChainLogManager.writeChainLog("触发进站", changeInfo, - true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS); + OchChainLogManager.writeChainLog("触发进站", changeInfo); if ( backgroundCurrentStationIndex +1 > stationList.size() - 1 ) { //到站短时间内调用多次 CallerLogger.e( M_BUS + TAG, "数组越界" ); return; @@ -856,8 +855,7 @@ public class OrderModel { String changeInfo = "taskId:" + busRoutesResult.getTaskId() + "--lineId:" + busRoutesResult.getLineId() + "--currentStationName:"+currentStationName+"--finalNextStationName:"+finalNextStationName; - OchChainLogManager.writeChainLog("滑动出发", changeInfo, - true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS); + OchChainLogManager.writeChainLog("滑动出发", changeInfo); OrderServiceManager.leaveStation(mContext, stationList.get(backgroundCurrentStationIndex).getSeq(), stationList.get(backgroundCurrentStationIndex).getSiteId(), @@ -865,8 +863,7 @@ public class OrderModel { new OchCommonServiceCallback() { @Override public void onSuccess(BaseData o) { - OchChainLogManager.writeChainLog("滑动出发成功", changeInfo, - true,OchChainLogManager.EVENT_KEY_INFE_WITH_BUS); + OchChainLogManager.writeChainLog("滑动出发成功", changeInfo); } 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 b30d911249..de87800908 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 @@ -60,7 +60,7 @@ object PassengerServiceManager { driverAppSn ) ).transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate")) + .subscribe(OchCommonSubscribeImpl(context, callback, "queryDriverSiteByCoordinate",false)) } /** diff --git a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java index e923f1a3bc..ac8e02b8d2 100644 --- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java @@ -26,6 +26,7 @@ import com.mogo.eagle.core.utilcode.util.StringUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatusListener; import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager; +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager; import com.mogo.och.common.module.manager.socket.lan.LanSocketManager; import com.mogo.och.common.module.manager.socket.lan.bean.BusinessType; import com.mogo.och.common.module.voice.VoiceNotice; @@ -182,6 +183,8 @@ public class BusPassengerModel { return; } + OchChainLogManager.writeChainLog("线路发生变化",data.toString()); + if (routesResult != null && routesResult.getWriteVersion() < data.getResult().getWriteVersion()){ routesResult = data.getResult(); diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt index d709d0088f..18208cc5bc 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt @@ -39,7 +39,7 @@ object TaxiServiceManager { SharedPrefsMgr.getInstance().sn ) .transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrdersInAndWaitService")) + .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrdersInAndWaitService",false)) } /** @@ -102,7 +102,7 @@ object TaxiServiceManager { ) ) .transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrderGrabStatus")) + .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrderGrabStatus",false)) } /** @@ -292,7 +292,7 @@ object TaxiServiceManager { ) ) .transformTry() - .subscribe(OchCommonSubscribeImpl(context, callback, "runCarHeartbeat")) + .subscribe(OchCommonSubscribeImpl(context, callback, "runCarHeartbeat",false)) } /** diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index c4e69dd216..5ea4f8f359 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -22,6 +22,7 @@ import com.mogo.och.common.module.biz.login.LoginStatusManager; import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum; import com.mogo.och.common.module.biz.login.RoleEnum; import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager; +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager; import com.mogo.och.common.module.voice.VoiceNotice; import com.mogo.och.taxi.bean.OrderQueryRespBean; import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean; @@ -284,6 +285,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS @RequiresApi(api = Build.VERSION_CODES.P) @Override public void onCurrentOrderStatusChanged(OrderQueryRespBean.Result order) { + OchChainLogManager.writeChainLog("订单信息变化",order.toString()); CallerLogger.d(M_TAXI + TAG, "order = " + order.toString()); if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus) { TaxiModel.getInstance().queryAutopilotStatus(true);