From 226c31cc41f252682f1ccd084fddbd20ec266870 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 5 Dec 2023 20:14:08 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.4]=E8=B0=83=E6=95=B4=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=92=8CPB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/InitiativeBadCaseWindow.kt | 8 ++++---- .../badcase/biz/PassiveBadCaseWindow.kt | 8 ++++---- libraries/mogo-adas-data/src/main/proto/bag_manager.proto | 2 -- 3 files changed, 8 insertions(+), 10 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 c9f8ccf9b8..5bf02d4ae2 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 @@ -110,7 +110,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList private var audioFileName:String?=null //录音文件名称 private var uploadReason: StringBuilder = StringBuilder() //上报原因，标签 - private var reasonDetail: String ?= null //语音转写 + private var reasonDetail: String = "" //语音转写 private var uploadReasonTotal: String = "" @Volatile private var recordKey: Long = 0 //录制bag包key @@ -320,7 +320,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList } Log.i(TAG, "语音内容=$resultBuffer") reasonDetail = resultBuffer.toString() - if(!reasonDetail.isNullOrEmpty()){ + if(reasonDetail.isNotEmpty()){ tvAudioResult.text = reasonDetail } } @@ -420,13 +420,13 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList */ private fun upload(downloadUrl: String?){ GlobalScope.launch{ - uploadReasonTotal = if(reasonDetail.isNullOrEmpty()){ + uploadReasonTotal = if(reasonDetail.isEmpty()){ uploadReason.toString() }else{ "$uploadReason 语音内容：$reasonDetail" } //上报到工控机 - CallerAutoPilotControlManager.recordCause(recordKey.toString(),recordFileName,"",uploadReasonTotal) + CallerAutoPilotControlManager.recordCause(recordKey.toString(),recordFileName,"",uploadReason.toString()+reasonDetail) val uploadResult = presenter.upload(mutableMapOf().also { itx -> itx["carLicense"] = AppConfigInfo.plateNumber?:"" //车牌号 itx["filename"] = recordFileName?:"" //bag包文件地址 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 78dcf232fb..818fcd9f12 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 @@ -128,7 +128,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene // 用HashMap存储听写结果 private val mIatResults: HashMap = LinkedHashMap() - private var reasonDetail: String ?= null //语音转写 + private var reasonDetail: String = "" //语音转写 private var uploadReasonTotal: String = "" private var isUploadCos = false //是否在上传Cos操作 @@ -315,7 +315,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene } Log.i(TAG, "语音内容=$resultBuffer") reasonDetail = resultBuffer.toString() - if(!reasonDetail.isNullOrEmpty()){ + if(reasonDetail.isNotEmpty()){ tvAudioResult.text = reasonDetail } } @@ -416,13 +416,13 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene */ private fun upload(downloadUrl: String?){ GlobalScope.launch{ - uploadReasonTotal = if(reasonDetail.isNullOrEmpty()){ + uploadReasonTotal = if(reasonDetail.isEmpty()){ uploadReason.toString() }else{ "$uploadReason 语音内容：$reasonDetail" } //上报到工控机 - CallerAutoPilotControlManager.recordCause(recordKey,recordFileName,"",uploadReasonTotal) + CallerAutoPilotControlManager.recordCause(recordKey,recordFileName,"",uploadReason.toString()+reasonDetail) val uploadResult = presenter.upload(mutableMapOf().also { itx -> itx["carLicense"] = AppConfigInfo.plateNumber //车牌号 itx["filename"] = recordFileName?:"" //bag包文件地址 diff --git a/libraries/mogo-adas-data/src/main/proto/bag_manager.proto b/libraries/mogo-adas-data/src/main/proto/bag_manager.proto index 88c5a06c29..448e1bfdb9 100644 --- a/libraries/mogo-adas-data/src/main/proto/bag_manager.proto +++ b/libraries/mogo-adas-data/src/main/proto/bag_manager.proto @@ -37,8 +37,6 @@ message BagDescription{ optional bool hasAudio = 2; // 此bag是否具有录音文件 optional string audioUrl = 3; // bag附加录音文件的文件名 optional bool reportBI = 4; //上报BI状态 - optional bool isPassive = 5; // 是否是被动录包，true代表是被动录包，false代表是主动录包 - optional bool recordFail = 6; //录包是否失败，fasle代表录包成功，true代表录包失败 } // 各主机上报的包信息