diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/start_autopilot_tip_bkg_top.xml b/OCH/mogo-och-common-module/src/main/res/drawable/start_autopilot_tip_bkg_top.xml
new file mode 100644
index 0000000000..203bde5b74
--- /dev/null
+++ b/OCH/mogo-och-common-module/src/main/res/drawable/start_autopilot_tip_bkg_top.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/res/layout/start_autopilot_animation_view.xml b/OCH/mogo-och-common-module/src/main/res/layout/start_autopilot_animation_view.xml
index e32fc060b1..11bded81e4 100644
--- a/OCH/mogo-och-common-module/src/main/res/layout/start_autopilot_animation_view.xml
+++ b/OCH/mogo-och-common-module/src/main/res/layout/start_autopilot_animation_view.xml
@@ -16,11 +16,16 @@
+ android:textColor="@android:color/white"
+ android:background="@drawable/start_autopilot_tip_bkg_top"/>
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index 395920467e..688952c541 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -898,7 +898,7 @@ object TaxiTaskModel {
}
fun prepareNextTask(siteId: Long) {
- DebugView.printInfoMsg("[PrepareNextTask] 准备发送请求")
+ DebugView.printInfoMsg("[PrepareNextTask] 准备发送请求 siteId = $siteId")
TaxiTaskWithOrderServiceManager.prepareTask(
mContext,
siteId,
@@ -931,17 +931,15 @@ object TaxiTaskModel {
fun startPrepareTaskDelay120S(siteId: Long) {
removePrepareTaskDelay120S()
- if (mPrepareTaskDelay120SRunnable == null){
- mPrepareTaskDelay120SRunnable = Runnable {
- prepareNextTask(siteId)
- }
+ mPrepareTaskDelay120SRunnable = Runnable {
+ prepareNextTask(siteId)
}
mTaxiTaskWithOrderCallbackMap.forEach {
val listener = it.value
listener.onStartPrepareTask120s(true)
}
- DebugView.printInfoMsg("[PrepareNextTask] 倒计时${TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S/1000}秒后prepareNextTask")
+ DebugView.printInfoMsg("[PrepareNextTask] 倒计时${TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S/1000}秒后prepareNextTask siteId = $siteId")
UiThreadHandler.postDelayed(mPrepareTaskDelay120SRunnable, TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S)
}
@@ -953,6 +951,7 @@ object TaxiTaskModel {
val listener = it.value
listener.onStartPrepareTask120s(false)
}
+ mPrepareTaskDelay120SRunnable = null
}
}