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 022835a157..071f934a57 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 @@ -105,6 +105,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList private var uploadReason: StringBuilder = StringBuilder() //上报原因,标签 private var reasonDetail: String ?= null //语音转写 + private var uploadReasonTotal: String = "" @Volatile private var recordKey: Long = 0 //录制bag包key @Volatile @@ -207,6 +208,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList ToastUtils.showShort("请选择最少一个原因") return@setOnClickListener } + tvInitiativeReport.text = "上报中..." if(audioStatus){ audioStatus = false setAudio(false) @@ -248,7 +250,6 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList * 初始化监听器。 */ private val mInitListener = InitListener { code -> - Log.i(TAG, "SpeechRecognizer init() code = $code") if (code != ErrorCode.SUCCESS) { ToastUtils.showShort("讯飞语音听写初始化失败,错误码:$code") } @@ -422,16 +423,17 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList */ private fun upload(downloadUrl: String?){ GlobalScope.launch{ + uploadReasonTotal = if(reasonDetail.isNullOrEmpty()){ + uploadReason.toString() + }else{ + "$uploadReason 语音内容:$reasonDetail" + } val uploadResult = presenter.upload(mutableMapOf().also { itx -> itx["carLicense"] = AppConfigInfo.plateNumber?:"" //车牌号 itx["filename"] = recordFileName?:"" //bag包文件地址 itx["filesize"] = "0" //bag包文件大小 itx["key"] = recordKey.toString() //key - if(reasonDetail.isNullOrEmpty()){ - itx["reason"] = uploadReason.toString() - }else{ - itx["reason"] = "$uploadReason 语音内容:$reasonDetail" //采集原因 - } + itx["reason"] = uploadReasonTotal //采集原因 itx["duration"] = BadCaseConfig.totalDuration.toString() //采集时长,固定为20S itx["startTime"] = System.currentTimeMillis().toString() //上报时间(时间戳格式) itx["channel"] = "1" //渠道 @@ -459,13 +461,13 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList BadCaseAnalyticsManager.bagRecordUpload(recordKey.toString(),recordFileName?:"",uploadStamp, "100",AppConfigInfo.plateNumber,BadCaseConfig.totalDuration.toString(),MoGoAiCloudClientConfig.getInstance().sn, BadCaseConfig.dockerVersion ?:"",AppUtils.getAppVersionName(),loc.latitude.toString(),loc.longitude.toString(), - BadCaseConfig.identity,downloadUrl?:"",uploadReason.toString(),System.currentTimeMillis().toString(),"1") + BadCaseConfig.identity,downloadUrl?:"",uploadReasonTotal,System.currentTimeMillis().toString(),"1") //日志 CallerLogger.i("$M_DEVA$TAG", "BadCase Initiative Analytics="+"key="+recordKey+" filename="+recordFileName+ " receiveTime="+uploadStamp+" stat="+"100"+" plateNumber="+AppConfigInfo.plateNumber+ " totalDuration="+ BadCaseConfig.totalDuration +" carSn="+MoGoAiCloudClientConfig.getInstance().sn+" mapVersion="+BadCaseConfig.dockerVersion+ " eyeVersion="+AppUtils.getAppVersionName()+" latitude="+ loc.latitude +" longitude="+ loc.longitude+ - " identity="+BadCaseConfig.identity + " downloadUrl="+downloadUrl +" uploadReason="+uploadReason+ + " identity="+BadCaseConfig.identity + " downloadUrl="+downloadUrl +" uploadReason="+uploadReasonTotal+ " uploadTime="+System.currentTimeMillis()+" channel="+"1") BadCaseConfig.windowNum-- clickListener?.closeWindow() @@ -513,7 +515,6 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList // mWindowParams!!.x = metrics.widthPixels mWindowParams!!.x = 0 mWindowParams!!.y = metrics.heightPixels - BarUtils.getStatusBarHeight()-950 - Log.i(TAG,"showFloatWindow hashcode = "+mFloatLayout.hashCode()) mWindowManager!!.addView(mFloatLayout, mWindowParams) //开启录包 recordKey = Random(SystemClock.elapsedRealtime()).nextInt().toLong() @@ -528,7 +529,6 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList } fun showReportBIWindow(bagInfoEntity: BagInfoEntity){ - Log.i(TAG,"showReportBIWindow") if (mFloatLayout.parent == null) { val metrics = DisplayMetrics() // 默认固定位置,靠屏幕右边缘的中间 @@ -551,9 +551,6 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList CallerAutopilotRecordListenerManager.removeListener(this.hashCode().toString()) //注销采集原因回调监听 CallerDevaToolsNetManager.removeListener(this.hashCode().toString()) - - Log.i(TAG,"hide window hash="+mFloatLayout.hashCode()) - if (mFloatLayout.parent != null){ mWindowManager!!.removeView(mFloatLayout)