From 49d7ec0a46c4d79b1533c4b187158e8e284dd193 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 18 Sep 2023 16:06:34 +0800 Subject: [PATCH] [6.1.0] [ochchainlog] --- .../bean/response/OrderInfoResponse.kt | 15 +++++++++++ .../passenger/model/CharterPassengerModel.kt | 5 ++++ .../TrajectoryAndDistanceManager.kt | 14 +++++----- .../orderlogmanager/OchChainLogManager.kt | 27 +++++++++++++++++++ .../ui/startautopilot/StartAutopilotView.kt | 24 ++++++++++++----- 5 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt index 6e88928e9b..4d93bebfb5 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/bean/response/OrderInfoResponse.kt @@ -3,6 +3,7 @@ package com.mogo.och.charter.passenger.bean.response import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.BaseData import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil +import com.mogo.och.common.module.utils.DateTimeUtil /** * @@ -65,6 +66,20 @@ data class OrderInfoResponse(val data: OrderInfo?) : BaseData() { return null } } + + override fun toString(): String { + return "OrderInfo(orderNo=$orderNo, sn=$sn, productType=${getProductTypeName()}, lineId=$lineId, lineName=$lineName, startSiteId=$startSiteId, startSiteName=$startSiteName, startSiteNameKr=$startSiteNameKr, siteId=$siteId, siteName=$siteName, siteNameKr=$siteNameKr, wgs84Lat=$wgs84Lat, wgs84Lon=$wgs84Lon, startTime=${DateTimeUtil.formatLongToString(startTime?:System.currentTimeMillis(), DateTimeUtil.MM_dd_HH_mm)}, endTime=${DateTimeUtil.formatLongToString(endTime?:System.currentTimeMillis(), DateTimeUtil.MM_dd_HH_mm)}, passengerPhone=$passengerPhone, arriveStatus=$arriveStatus)" + } + + fun getProductTypeName(): String { + return when (productType) { + M1_LOVE -> "爱情号" + M1_FAMILY -> "家庭号" + M1_FRIENDLY -> "朋友号" + else -> "未知" + } + } + } companion object{ val ARRIVING = 1 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 692b642f2b..ab2d27edf2 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 @@ -42,6 +42,7 @@ import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.CharterSendTripInfoManager import com.mogo.och.common.module.manager.CharterSendTripInfoManager.LEAVE_STATION import com.mogo.och.common.module.manager.autopilotmanager.OCHAdasAbilityManager +import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.utils.DateTimeUtil import com.mogo.och.common.module.utils.PinYinUtil @@ -393,6 +394,7 @@ object CharterPassengerModel { this.orderInfo = orderData setOrderStatus(OrderStatusEnum.OrdersWithLine) updateAutopilotControlParameters() + OchChainLogManager.writeChainLog(this.orderInfo.toString(),"更改线路成功：${orderData.siteName}") } else { this.orderInfo = orderData } @@ -727,6 +729,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") this.orderStatus = orderStatus for (callback in orderStatusChangeListeners.values) { callback.onStatusChange(this.orderStatus) @@ -737,6 +740,7 @@ object CharterPassengerModel { fun setEndOrderStatus() { UiThreadHandler.postDelayed({ setOrderStatus(OrderStatusEnum.NoOrderUse) + OchChainLogManager.writeChainLog(this.orderInfo.toString(),"手动结束订单：$orderStatus") }, 1000) } @@ -933,6 +937,7 @@ object CharterPassengerModel { } if (order != null && lineId != null && siteId != null) { + OchChainLogManager.writeChainLog(this.orderInfo.toString(),"到站成功：${order.siteName}") VoiceManager.arrivedStation( order.siteName!!, order.siteNameKr ?: "", diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt index b2fcc24349..0b03eaafec 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt @@ -549,13 +549,13 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ } } - @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_OCH, - linkCode = ChainConstant.CHAIN_SOURCE_OCH, - nodeAliasCode = ChainConstant.CHAIN_CODE_OCH_COMMON_DISTANCE, - paramIndexes = [0,1] - ) - fun writeLog(carLocationInfo: String, location: String) { +// @ChainLog( +// linkChainLog = ChainConstant.CHAIN_TYPE_OCH, +// linkCode = ChainConstant.CHAIN_SOURCE_OCH, +// nodeAliasCode = ChainConstant.CHAIN_CODE_OCH_COMMON_DISTANCE, +// paramIndexes = [0,1] +// ) + private fun writeLog(carLocationInfo: String, location: String) { d(M_OCHCOMMON+ TAG,carLocationInfo) d(M_OCHCOMMON+ TAG,location) } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt new file mode 100644 index 0000000000..61816400db --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt @@ -0,0 +1,27 @@ +package com.mogo.och.common.module.manager.orderlogmanager + +import com.mogo.eagle.core.data.deva.chain.ChainConstant +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.zhjt.service.chain.ChainLog + +object OchChainLogManager { + + private val TAG = OchChainLogManager::class.java.simpleName + + /** + * @param orderInfo 订单详细信息 + * @param changeInfo 变化信息 + */ + @ChainLog( + linkChainLog = ChainConstant.CHAIN_TYPE_OCH, + linkCode = ChainConstant.CHAIN_SOURCE_OCH, + nodeAliasCode = ChainConstant.CHAIN_CODE_OCH_COMMON_DISTANCE, + paramIndexes = [0,1] + ) + fun writeChainLog(orderInfo: String, changeInfo: String) { + d(SceneConstant.M_OCHCOMMON + TAG, orderInfo) + d(SceneConstant.M_OCHCOMMON + TAG, changeInfo) + } + +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt index e21bdecb8f..e2fcf09d52 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/startautopilot/StartAutopilotView.kt @@ -40,8 +40,8 @@ import kotlinx.android.synthetic.main.taxi_p_start_autopilot_view.view.cl_car_ty * ①：不能启动自驾 * ②：可以启动自驾 * ③：启动自驾中 - * ④：启动自驾失败 - * ⑤：初始状态 + * ④：启动自驾超时 + * ⑤：启动自驾失败 */ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAutopilotCallback { @@ -190,7 +190,9 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu taxiPXiaozhiBelt?.start() } - // ①：不能启动自驾 + /** + * ①：不能启动自驾 + */ private fun unableStartAutopilot() { taxiPStartAutopilot?.stop() taxiPStartAutopilotCar?.stop() @@ -201,7 +203,9 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt) } - // ②：可以启动自驾 + /** + * ②：可以启动自驾 + */ private fun ableStartAutopilot() { taxiPStartAutopilot?.reStart() taxiPStartAutopilotCar?.stop() @@ -210,7 +214,9 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt) } - // ③：启动自驾中 + /** + * ③：启动自驾中 + */ fun startAutopiloting() { taxiPStartAutopilot?.reStart() taxiPStartAutopilotCar?.reStart() @@ -221,12 +227,16 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu ) } - // ④：启动自驾超时 + /** + * ④：启动自驾超时 + */ override fun startAutopilotingTimeout() { ableStartAutopilot() } - // ⑤：启动自驾失败 + /** + * ⑤：启动自驾失败 + */ override fun startAutopilotingFail() { ableStartAutopilot() }