From ed6210d7151b88a6c90f2e7e1ffc5836635c4569 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 30 Nov 2023 18:19:52 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=E5=9B=A0=E7=BD=91=E7=BB=9C=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=B8=8A=E4=BC=A0=E8=AF=AD=E9=9F=B3=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=90=90?= =?UTF-8?q?=E5=8F=B8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/InitiativeBadCaseWindow.kt | 14 ++++++++++---- .../badcase/biz/PassiveBadCaseWindow.kt | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 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 69c375f7b1..3606bd8045 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 @@ -380,8 +380,13 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext,DebugConfig.isDebug(), TAG, MoGoAiCloudClientConfig.getInstance().sn,singlePath, object : OnUploadListener { - override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String) { - try { + override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String?) { + if(downloadUrl == null){ + ToastUtils.showShort("上传语音文件失败，请检查网络") + ThreadUtils.runOnUiThread { + tvInitiativeReport.text = "上报" + } + }else{ CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl") if(downloadUrl.isNotBlank() && downloadUrl.contains(".wav")){ CallerDevaToolsNetManager.invokeUploadCosSuccess(downloadUrl) @@ -391,8 +396,6 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList FileUtil.deleteFile(File(filePath)) } } - }catch (e: java.lang.Exception){ - CallerLogger.d("$M_DEVA$TAG", "onUploadSuccess Exception$e") } } @@ -450,6 +453,9 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList }) if (uploadResult == null || uploadResult.code != 200) { TipToast.shortTip("上报失败") + ThreadUtils.runOnUiThread { + tvInitiativeReport.text = "上报" + } } else { TipToast.shortTip("上报成功") //将上报BI的结果同步给工控机记录保存 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 a3a021b0fc..8b982a16a1 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 @@ -380,8 +380,13 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext, DebugConfig.isDebug(), TAG, MoGoAiCloudClientConfig.getInstance().sn,singlePath, object : OnUploadListener { - override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String) { - try { + override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String?) { + if(downloadUrl == null){ + ToastUtils.showShort("上传语音文件失败，请检查网络") + ThreadUtils.runOnUiThread { + tvPassiveReport.text = "上报" + } + }else{ CallerLogger.d("$M_DEVA$TAG", "语音文件上传成功：downloadUrl=$downloadUrl") if(downloadUrl.isNotBlank() && downloadUrl.contains(".wav")){ CallerDevaToolsNetManager.invokeUploadCosSuccess(downloadUrl) @@ -391,8 +396,6 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene FileUtil.deleteFile(File(filePath)) } } - }catch (e:Exception){ - CallerLogger.d("$M_DEVA$TAG", "onUploadSuccess Exception=$e") } } @@ -451,6 +454,9 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene }) if (uploadResult == null || uploadResult.code != 200) { TipToast.shortTip("上报失败") + ThreadUtils.runOnUiThread{ + tvPassiveReport.text = "上报" + } } else { TipToast.shortTip("上报成功") //将上报BI的结果同步给工控机记录保存