yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_robotaxi-d_230912_6.1.0' into dev_robotaxi-d_230912_6.1.0

Browse Source 
# Conflicts:
#	OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
This commit is contained in:
xuxinchao
2023-09-18 16:08:24 +08:00
parent d0241c0a97 49d7ec0a46
commit 50c7668b46
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt
View File

@@ -42,7 +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.OrderChainLogManager
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
@@ -394,7 +394,7 @@ object CharterPassengerModel {
this.orderInfo = orderData
setOrderStatus(OrderStatusEnum.OrdersWithLine)
updateAutopilotControlParameters()
OrderChainLogManager.writeChainLog(this.orderInfo.toString(),"更改线路成功：${orderData.siteName}")
OchChainLogManager.writeChainLog(this.orderInfo.toString(),"更改线路成功：${orderData.siteName}")
} else {
this.orderInfo = orderData
}
@@ -729,7 +729,7 @@ object CharterPassengerModel {
private fun setOrderStatus(orderStatus: OrderStatusEnum) {
if (this.orderStatus != orderStatus) {
d(M_BUS_P + TAG, "${this.orderInfo?.orderNo}新的状态：$orderStatus")
OrderChainLogManager.writeChainLog(this.orderInfo.toString(),"新的状态：$orderStatus")
OchChainLogManager.writeChainLog(this.orderInfo.toString(),"新的状态：$orderStatus")
this.orderStatus = orderStatus
for (callback in orderStatusChangeListeners.values) {
callback.onStatusChange(this.orderStatus)
@@ -740,7 +740,7 @@ object CharterPassengerModel {
fun setEndOrderStatus() {
UiThreadHandler.postDelayed({
setOrderStatus(OrderStatusEnum.NoOrderUse)
OrderChainLogManager.writeChainLog(this.orderInfo.toString(),"手动结束订单：$orderStatus")
OchChainLogManager.writeChainLog(this.orderInfo.toString(),"手动结束订单：$orderStatus")
}, 1000)
}
@@ -937,7 +937,7 @@ object CharterPassengerModel {
}
if (order != null && lineId != null && siteId != null) {
OrderChainLogManager.writeChainLog(this.orderInfo.toString(),"到站成功：${order.siteName}")
OchChainLogManager.writeChainLog(this.orderInfo.toString(),"到站成功：${order.siteName}")
VoiceManager.arrivedStation(
order.siteName!!,
order.siteNameKr ?: "",

27
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt Normal file
View File

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