From 31ec814578f6e9caff0fd0861ce281c2077e507a Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 11 Dec 2023 16:24:12 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.4]=E5=BD=95=E5=8C=85=E6=88=AA=E5=9B=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=B7=E5=A7=8B=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/InitiativeBadCaseWindow.kt | 4 ++-- .../badcase/biz/PassiveBadCaseWindow.kt | 4 ++-- .../badcase/util/RecordBitmapUtils.kt | 5 +++-- .../autopilot/CallerAutoPilotStatusListenerManager.kt | 8 ++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt index 7371773efb..b9d63b1296 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt @@ -665,9 +665,9 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList else->"自驾状态:未知" } val speed = "当前车速:${BadCaseConfig.currentSpeed}" + val site = "起点:${CallerAutoPilotStatusListenerManager.getLineStartName()};终点:${CallerAutoPilotStatusListenerManager.getLineEndName()}" - - val outBitmap = RecordBitmapUtils.drawTextOnBitmap(bitmap,time,lineId,state,speed, + val outBitmap = RecordBitmapUtils.drawTextOnBitmap(bitmap,time,lineId,state,speed,site, BadCaseConfig.gpsStatus,BadCaseConfig.tracingStatus,BadCaseConfig.socketStatus ,BadCaseConfig.newFMInfoMsg,BadCaseConfig.newReportEntity) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt index 007c329b0f..b13cb793d2 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt @@ -632,9 +632,9 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene else->"自驾状态:未知" } val speed = "当前车速:${BadCaseConfig.currentSpeed}" + val site = "起点:${CallerAutoPilotStatusListenerManager.getLineStartName()};终点:${CallerAutoPilotStatusListenerManager.getLineEndName()}" - - val outBitmap = RecordBitmapUtils.drawTextOnBitmap(bitmap,time,lineId,state,speed, + val outBitmap = RecordBitmapUtils.drawTextOnBitmap(bitmap,time,lineId,state,speed,site, BadCaseConfig.gpsStatus,BadCaseConfig.tracingStatus,BadCaseConfig.socketStatus ,BadCaseConfig.newFMInfoMsg,BadCaseConfig.newReportEntity) //图片保存本地 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/util/RecordBitmapUtils.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/util/RecordBitmapUtils.kt index 4bba14ca95..9020546532 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/util/RecordBitmapUtils.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/util/RecordBitmapUtils.kt @@ -76,8 +76,8 @@ object RecordBitmapUtils { /** * 在指定Bitmap中绘制文字 */ - fun drawTextOnBitmap(bitmap: Bitmap, time: String,lineId: String,state: String,currentSpeed: String - ,gpsStatus: String?,tracingStatus: String?,socketStatus: String? + fun drawTextOnBitmap(bitmap: Bitmap, time: String,lineId: String,state: String,currentSpeed: String, + site: String,gpsStatus: String?,tracingStatus: String?,socketStatus: String? ,fm: FMInfoMsg?,report: ReportEntity? ): Bitmap? { val mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true) @@ -90,6 +90,7 @@ object RecordBitmapUtils { canvas.drawText(lineId,100f,200f,paint) canvas.drawText(state,100f,300f,paint) canvas.drawText(currentSpeed,100f,400f,paint) + canvas.drawText(site,100f,500f,paint) gpsStatus?.let { canvas.drawText(it,1000f,100f,paint) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index 5ede15519a..6ac2ab06b3 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -83,6 +83,14 @@ object CallerAutoPilotStatusListenerManager : CallerBase