From b3045791a960003bfbd0d1a3305bef825dc1337a Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 20 Feb 2023 17:23:56 +0800 Subject: [PATCH] =?UTF-8?q?[2.14.0]=E5=8C=85=E4=BD=93=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0=E7=82=B9?= =?UTF-8?q?=E5=90=8E=E4=B8=A4=E4=BD=8D=EF=BC=8C=E4=B8=8A=E4=BC=A0Cos?= =?UTF-8?q?=E5=88=A4=E6=96=ADkey=E6=96=B9=E5=BC=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCaseManagerView.kt | 5 ++++- .../badcase/biz/adapter/BagManagerListAdapter.kt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt index 60b299948b..70f318d8fe 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCaseManagerView.kt @@ -114,6 +114,7 @@ class BadCaseManagerView @JvmOverloads constructor( if(bagManagerList.size>0){ bagManagerEntity.reqType = 3 bagManagerEntity.keyReq = bagManagerList[0].key + Log.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity) bagUploadDialog = BagUploadDialog(context) @@ -237,6 +238,7 @@ class BadCaseManagerView @JvmOverloads constructor( Log.i(TAG,"onBagManagerResult Start") Log.i(TAG,"keyReq="+bagManager.keyReq) Log.i(TAG,"reqType="+bagManager.reqType) + Log.i(TAG,"uploadCosResp stat="+bagManager.uploadCosResp.stat) Log.i(TAG,"descReq description="+bagManager.descReq.description +" audioUrl="+bagManager.descReq.audioUrl +" reportBI="+bagManager.descReq.reportBI @@ -352,7 +354,7 @@ class BadCaseManagerView @JvmOverloads constructor( val uploadIterator = bagManagerEntity.bagsInfoResp.iterator() while(uploadIterator.hasNext()){ val uploadBagInfo = uploadIterator.next() - if(uploadBagInfo.key == bagManager.keyReq){ + if(uploadBagInfo.key == bagManager.uploadCosResp.key && bagManager.uploadCosResp.stat!=1){ bagManagerList.remove(uploadBagInfo) if(bagManagerList.size>0){ var remainSize = 0L @@ -363,6 +365,7 @@ class BadCaseManagerView @JvmOverloads constructor( //执行下一个上传Bag命令 bagManagerEntity.reqType = 3 bagManagerEntity.keyReq = bagManagerList[0].key + Log.i("sendBagManagerCmd","bagManagerEntity.keyReq="+bagManagerEntity.keyReq) CallerAutoPilotManager.sendBagManagerCmd(bagManagerEntity) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt index 0dbf9915b2..d3c8abc803 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/adapter/BagManagerListAdapter.kt @@ -24,7 +24,7 @@ class BagManagerListAdapter: RecyclerView.Adapter() { private var data:List ?= null private var bagClickListener: BagClickListener ?= null - private val format = DecimalFormat("0.0") + private val format = DecimalFormat("0.00") fun setData(data: List?){ this.data = data