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

Merge remote-tracking branch 'origin/dev_robotaxi-d_240807_6.6.0' into dev_robotaxi-d_240807_6.6.0

Browse Source
This commit is contained in:
donghongyu-pc
2024-09-03 15:58:13 +08:00
parent 8b421771ed 07fd9100ec
commit 9f2c123aa7
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.gradle
View File

@@ -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",

38
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
View File

@@ -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()
}
}
}

1
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt
View File

@@ -212,6 +212,7 @@ class TakeOverRecordView @JvmOverloads constructor(
CallerTakeOverManager.updateRecord(context,it)
takeOverListAdapter?.notifyRecordItemChanged(it)
}
selectedUploadRecord.clear()
}
}