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

[3.3.0] reset log tag

Browse Source
This commit is contained in:
zhongchao
2023-06-15 18:32:58 +08:00
parent 1692004f4b
commit e2a60783ec
33 changed files with 129 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt
View File

@@ -3,7 +3,6 @@ package com.mogo.eagle.function.biz.dispatch
import android.content.Context
import android.os.Handler
import android.os.Message
import android.util.Log
import com.mogo.aicloud.services.socket.IMogoOnMessageListener
import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
import com.mogo.commons.voice.AIAssist
@@ -22,6 +21,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
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.mogo.logger.scene.SceneConstant.Companion.M_BIZ
import com.mogo.eagle.core.utilcode.util.CoordinateUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.DISPATCH_COMPLETED
@@ -116,7 +116,7 @@ class DispatchAutoPilotManager private constructor() :
}
override fun onMsgReceived(adasAutoPilotLocReceiverBean: DispatchAdasAutoPilotLocReceiverBean?) {
Log.i(TAG,"onMsgReceived 收到云调度长链接")
CallerLogger.i("$M_BIZ$TAG","onMsgReceived 收到云调度长链接, adasAutoPilotLocReceiver:${adasAutoPilotLocReceiverBean?:""}")
if (adasAutoPilotLocReceiverBean != null && adasAutoPilotLocReceiverBean.startLat != 0.0 && adasAutoPilotLocReceiverBean.startLon != 0.0) {
receiverBean = adasAutoPilotLocReceiverBean
val message = Message()
@@ -130,41 +130,9 @@ class DispatchAutoPilotManager private constructor() :
val mAutoPilotLine = AutopilotControlParameters.AutoPilotLine(it.lineId.toLong(),it.trajUrl,it.trajMd5,it.stopUrl,it.stopMd5,it.timestamp,
it.vehicleModel,it.trajUrl_dpqp,it.trajMd5_dpqp,it.stopUrl_dpqp,it.stopMd5_dpqp,it.timestamp_dpqp)
CallerAutoPilotControlManager.sendTrajectoryDownloadReq(mAutoPilotLine)
Log.i(TAG,"调用路线下载逻辑")
CallerLogger.i("$M_BIZ$TAG","调用路线下载逻辑")
}
}
adasAutoPilotLocReceiverBean?.let {
Log.i(TAG,"taskId="+it.taskId)
Log.i(TAG,"type="+it.type)
Log.i(TAG,"source="+it.source)
Log.i(TAG,"lineName="+it.lineName)
Log.i(TAG,"stopMd5_dpqp="+it.stopMd5_dpqp)
Log.i(TAG,"stopUrl_dpqp="+it.stopUrl_dpqp)
Log.i(TAG,"trajMd5_dpqp="+it.trajMd5_dpqp)
Log.i(TAG,"trajUrl_dpqp="+it.trajUrl_dpqp)
Log.i(TAG,"stopMd5_dpqp="+it.stopMd5_dpqp)
Log.i(TAG,"stopMd5="+it.stopMd5)
Log.i(TAG,"stopUrl="+it.stopUrl)
Log.i(TAG,"trajUrl="+it.trajUrl)
Log.i(TAG,"trajMd5="+it.trajMd5)
Log.i(TAG,"endLocAddress="+it.endLocAddress)
Log.i(TAG,"flightInfo="+it.flightInfo)
Log.i(TAG,"poiId="+it.poiId)
Log.i(TAG,"startLocAddress="+it.startLocAddress)
Log.i(TAG,"taskInfo="+it.taskInfo)
Log.i(TAG,"taskTime="+it.taskTime)
Log.i(TAG,"vehicleModel="+it.vehicleModel)
Log.i(TAG,"endLat="+it.endLat)
Log.i(TAG,"endLon="+it.endLon)
Log.i(TAG,"lineId="+it.lineId)
Log.i(TAG,"startLat="+it.startLat)
Log.i(TAG,"startLon="+it.startLon)
Log.i(TAG,"stopsList="+it.stopsList)
Log.i(TAG,"timestamp="+it.timestamp)
Log.i(TAG,"systemTime="+it.systemTime)
Log.i(TAG,"timestamp_dpqp="+it.timestamp_dpqp)
}
}
private fun startAutoPilot() {
@@ -228,8 +196,7 @@ class DispatchAutoPilotManager private constructor() :
currentAutopilot.endLatLon =
AutopilotControlParameters.AutoPilotLonLat(it.endLat, it.endLon)
currentAutopilot.vehicleType = 10
CallerLogger.d(SceneConstant.Companion.M_DISPATCH + TAG, "开启自动驾驶====$currentAutopilot")
Log.i(TAG,"开启自动驾驶====$currentAutopilot")
CallerLogger.d(M_BIZ + TAG, "开启自动驾驶====$currentAutopilot")
CallerAutoPilotControlManager.startAutoPilot(currentAutopilot)
}
}
@@ -257,7 +224,7 @@ class DispatchAutoPilotManager private constructor() :
onSuccess = {
//取消自动驾驶
CallerAutoPilotControlManager.cancelAutoPilot()
Log.i(TAG,"stopAffirm 取消自动驾驶")
CallerLogger.i("$M_BIZ$TAG","stopAffirm 取消自动驾驶")
}, onError = {})
}
}
@@ -327,10 +294,9 @@ class DispatchAutoPilotManager private constructor() :
}
CallerLogger.d(
SceneConstant.Companion.M_DISPATCH + TAG,
SceneConstant.Companion.M_BIZ + TAG,
"onArriveAt data : $arrivalNotification"
)
Log.i(TAG,"onArriveAt data : $arrivalNotification")
if (arrivalNotification.endLocation == null) {
return
}
@@ -341,12 +307,11 @@ class DispatchAutoPilotManager private constructor() :
receiverBean!!.endLon, receiverBean!!.endLat, endLon, endLat
)
CallerLogger.d(
SceneConstant.Companion.M_DISPATCH + TAG,
SceneConstant.Companion.M_BIZ + TAG,
"onArriveAt cal distance : $distanceFromSelf"
)
Log.i(TAG,"onArriveAt cal distance : $distanceFromSelf")
if (distanceFromSelf < 10) {
CallerLogger.d(SceneConstant.Companion.M_DISPATCH + TAG, "onArriveAt end location")
CallerLogger.d(SceneConstant.Companion.M_BIZ + TAG, "onArriveAt end location")
isDispatch = false
isArriveEnd = true
//到站，调度完成
@@ -368,7 +333,7 @@ class DispatchAutoPilotManager private constructor() :
*/
override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
if (guardianInfo == null || !guardianInfo.hasCode()) return
Log.i(TAG,"onAutopilotGuardian "+guardianInfo.code)
CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian "+guardianInfo.code)
//掉自驾
when(guardianInfo.code){
MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_PLANNING,
@@ -394,15 +359,15 @@ class DispatchAutoPilotManager private constructor() :
}
}
if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.code)){
Log.i(TAG,"onAutopilotGuardian ISYS_INIT_TRAJECTORY_START 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）")
CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian ISYS_INIT_TRAJECTORY_START 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）")
}else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.code)){
Log.i(TAG,"onAutopilotGuardian ISYS_INIT_TRAJECTORY_SUCCESS 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）")
CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian ISYS_INIT_TRAJECTORY_SUCCESS 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）")
}else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.code)){
Log.i(TAG,"onAutopilotGuardian ISYS_INIT_TRAJECTORY_FAILURE 轨迹管理_轨迹下载失败，本地无对应轨迹")
CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian ISYS_INIT_TRAJECTORY_FAILURE 轨迹管理_轨迹下载失败，本地无对应轨迹")
}else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.code)){
Log.i(TAG,"onAutopilotGuardian ISYS_INIT_TRAJECTORY_WARNING 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功")
CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian ISYS_INIT_TRAJECTORY_WARNING 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功")
}else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.code)){
Log.i(TAG,"onAutopilotGuardian ISYS_INIT_TRAJECTORY_TIMEOUT 轨迹管理_轨迹下载超时")
CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian ISYS_INIT_TRAJECTORY_TIMEOUT 轨迹管理_轨迹下载超时")
}
}

20
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt
View File

@@ -11,7 +11,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.eagle.core.network.MoGoRetrofitFactory
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MONITOR
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BIZ
import com.mogo.eagle.function.biz.monitoring.net.ICameraListServices
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
@@ -80,16 +80,16 @@ class CronTaskManager {
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
cameraList = it
// CallerLogger.d("$M_MONITOR$TAG", "requestDeviceList返回结果为：$it")
// CallerLogger.d("$M_BIZ$TAG", "requestDeviceList返回结果为：$it")
}, {
it.printStackTrace()
CallerLogger.e(
"$M_MONITOR$TAG",
"$M_BIZ$TAG",
"requestDeviceList:message is:${it.message}, cause is:${it.cause}"
)
})
}?: run {
CallerLogger.e("$M_MONITOR$TAG", "CurrentLocation is null!")
CallerLogger.e("$M_BIZ$TAG", "CurrentLocation is null!")
}
}
@@ -113,10 +113,10 @@ class CronTaskManager {
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
carCameraList = it
// CallerLogger.d("$M_MONITOR$TAG", "requestCarCameraList返回结果为：$it")
// CallerLogger.d("$M_BIZ$TAG", "requestCarCameraList返回结果为：$it")
}, {
CallerLogger.e(
"$M_MONITOR$TAG",
"$M_BIZ$TAG",
"message is:${it.message}, cause is:${it.cause}"
)
it.printStackTrace()
@@ -137,7 +137,7 @@ class CronTaskManager {
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({
CallerLogger.d("$M_MONITOR$TAG", "reqOpenCameraStream返回结果为：$it")
CallerLogger.d("$M_BIZ$TAG", "reqOpenCameraStream返回结果为：$it")
if (!it.flvUrl.isNullOrEmpty()) {
CallerHmiManager.startRoadCameraLive(it.flvUrl!!)
} else {
@@ -145,7 +145,7 @@ class CronTaskManager {
}
}, {
CallerLogger.e(
"$M_MONITOR$TAG",
"$M_BIZ$TAG",
"reqOpenCameraStream&message is:${it.message}, cause is:${it.cause}"
)
CallerHmiManager.showNoSignalView()
@@ -174,7 +174,7 @@ class CronTaskManager {
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(RetryWithDelay())
.subscribe({
CallerLogger.d("$M_MONITOR$TAG", "reqOpenCameraStream返回结果为：$it")
CallerLogger.d("$M_BIZ$TAG", "reqOpenCameraStream返回结果为：$it")
if (it.code == 200 || it.code == 0) {
val flvString = it.flvUrl
if (!flvString.isNullOrEmpty()) {
@@ -187,7 +187,7 @@ class CronTaskManager {
}
}, {
CallerLogger.e(
"$M_MONITOR$TAG",
"$M_BIZ$TAG",
"reqOpenCameraStream&message is:${it.message}, cause is:${it.cause}"
)
error(it)

4
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/NoticeSocketManager.kt
View File

@@ -59,7 +59,7 @@ internal class NoticeSocketManager {
if (obj == null) {
return
}
d(SceneConstant.M_NOTICE + TAG, "100-- 普通公告数据：" + GsonUtil.jsonFromObject(obj))
d(SceneConstant.M_BIZ + TAG, "100-- 普通公告数据：" + GsonUtil.jsonFromObject(obj))
val noticeFromCloudMsg = NoticeFrCloudMsg(obj, null, 0)
saveMsgBox(MsgBoxBean(MsgBoxType.NOTICE, noticeFromCloudMsg))
}
@@ -78,7 +78,7 @@ internal class NoticeSocketManager {
if (obj == null) {
return
}
d(SceneConstant.M_NOTICE + TAG, "301001-- 交警类型公告数据：" + GsonUtil.jsonFromObject(obj))
d(SceneConstant.M_BIZ + TAG, "301001-- 交警类型公告数据：" + GsonUtil.jsonFromObject(obj))
val noticeFromCloudMsg = NoticeFrCloudMsg(null, obj, 1)
saveMsgBox(MsgBoxBean(MsgBoxType.NOTICE, noticeFromCloudMsg))
}