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

[6.2.4]调整上报内容和PB

Browse Source
This commit is contained in:
xuxinchao
2023-12-05 20:14:08 +08:00
parent 09b8d1eaeb
commit 226c31cc41
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
View File

@@ -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<String, String>().also { itx ->
itx["carLicense"] = AppConfigInfo.plateNumber?:"" //车牌号
itx["filename"] = recordFileName?:"" //bag包文件地址

8
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt
View File

@@ -128,7 +128,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
// 用HashMap存储听写结果
private val mIatResults: HashMap<String, String> = 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<String, String>().also { itx ->
itx["carLicense"] = AppConfigInfo.plateNumber //车牌号
itx["filename"] = recordFileName?:"" //bag包文件地址

2
libraries/mogo-adas-data/src/main/proto/bag_manager.proto
View File

@@ -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代表录包失败
}
// 各主机上报的包信息