From d2ab538d5971ff3b2a3433ad2b5fdc3f568be8d4 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 3 Sep 2024 15:32:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[6.6.0][downloader]=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=93=BE=E6=8E=A5=E4=B8=8D=E6=94=AF=E6=8C=81?= =?UTF-8?q?HEAD=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index e66bf81d1f..30921f62a6 100644 --- a/config.gradle +++ b/config.gradle @@ -30,7 +30,7 @@ ext { amapsearch : "com.amap.api:search:9.7.0", amaplocation : "com.amap.api:location:6.3.0", - downloader : "com.mogo.core.net:downloader:1.0.6.3", + downloader : "com.mogo.core.net:downloader:1.0.6.4", // json 转换 gson : "com.google.code.gson:gson:2.8.4", From 4fbd2efc45e4a27451e0eb65adc34d4cc4dc2c51 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 3 Sep 2024 15:33:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[6.6.0]=E4=BF=AE=E6=94=B9=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=90=8E=E6=9C=AA=E6=B8=85=E7=A9=BA=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E9=80=89=E6=8B=A9=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo_core_function_devatools/workorder/TakeOverRecordView.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt index 7e2f09ed7e..0e9cbbbbe3 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt @@ -212,6 +212,7 @@ class TakeOverRecordView @JvmOverloads constructor( CallerTakeOverManager.updateRecord(context,it) takeOverListAdapter?.notifyRecordItemChanged(it) } + selectedUploadRecord.clear() } } From 07fd9100ec75794bc099d13f57ec83bd85acb9d4 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 3 Sep 2024 15:44:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[6.6.0]saas=E7=8E=AF=E5=A2=83=E4=B8=8B?= =?UTF-8?q?=E5=8E=9F=E6=9C=89=E7=9A=84=E6=8E=A5=E7=AE=A1=E5=BD=95=E5=8C=85?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E4=B8=8D=E5=BC=B9=E4=BA=86=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E7=8E=AF=E5=A2=83=E4=B8=8B=E8=BF=98=E5=BC=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/BadCaseManager.kt | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt index b86c0d0b66..b3dbcfe91e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt @@ -373,29 +373,31 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis fun onReceiveBadCaseRecord(msgBoxBean: MsgBoxBean, activity: Activity, countdown: Boolean) { CallerLogger.d("$M_DEVA$TAG", "收到录包结果回调${record}") CallerLogger.d("$M_DEVA$TAG", "开始创建被动录包弹窗,window num=${BadCaseConfig.windowNum}") - ThreadUtils.runOnUiThread { - val passiveBadCaseWindow = PassiveBadCaseWindow(activity) - passiveBadCaseWindow.setRecord(msgBoxBean) - passiveBadCaseWindow.setClickListener(object : PassiveBadCaseWindow.ClickListener { - override fun closeWindow() { - passiveBadCaseWindow.hideFloatWindow() - } - }) - passiveBadCaseWindow.showFloatWindow() - if (countdown) { - val countDownTimer = object : CountDownTimer(10000, 10000) { - override fun onTick(p0: Long) { + if(!ProjectUtils.isSaas()){ + ThreadUtils.runOnUiThread { + val passiveBadCaseWindow = PassiveBadCaseWindow(activity) + passiveBadCaseWindow.setRecord(msgBoxBean) + passiveBadCaseWindow.setClickListener(object : PassiveBadCaseWindow.ClickListener { + override fun closeWindow() { + passiveBadCaseWindow.hideFloatWindow() } + }) + passiveBadCaseWindow.showFloatWindow() + if (countdown) { + val countDownTimer = object : CountDownTimer(10000, 10000) { + override fun onTick(p0: Long) { + } - override fun onFinish() { - //如果有页面操作，则不自动关闭窗口 - if(!passiveBadCaseWindow.isOperated()){ - passiveBadCaseWindow.hideFloatWindow() - BadCaseConfig.windowNum-- + override fun onFinish() { + //如果有页面操作，则不自动关闭窗口 + if(!passiveBadCaseWindow.isOperated()){ + passiveBadCaseWindow.hideFloatWindow() + BadCaseConfig.windowNum-- + } } } + countDownTimer.start() } - countDownTimer.start() } } }