From 5e6f6360cfee6dff6030ebc940f6252f4ffb9bae Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 4 Sep 2023 17:49:51 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=201=E3=80=81=E4=BF=AE=E6=94=B9=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=90=AF=E5=8A=A8=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6?=
 =?UTF-8?q?=E5=80=92=E6=95=B0=E8=AE=A1=E6=97=B6UI=202=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8B=89=E5=8F=96=E4=BB=BB=E5=8A=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/drawable/start_autopilot_tip_bkg_top.xml |  8 ++++++++
 .../res/layout/start_autopilot_animation_view.xml     | 11 ++++++++---
 .../java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt   | 11 +++++------
 3 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 OCH/mogo-och-common-module/src/main/res/drawable/start_autopilot_tip_bkg_top.xml

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:endColor="#00000000"
+        android:centerColor="#000000"
+        android:startColor="#00000000"
+        android:type="linear"/>
+</shape>
\ 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 @@
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/startAutopilotTip"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
+        android:minWidth="@dimen/dp_756"
+        android:paddingLeft="@dimen/dp_150"
+        android:paddingRight="@dimen/dp_150"
+        android:gravity="center"
+        android:layout_height="@dimen/dp_186"
+        android:layout_marginTop="@dimen/dp_40"
         android:layout_gravity="center_horizontal"
         android:visibility="gone"
         android:textStyle="bold"
         android:textSize="@dimen/dp_42"
-        android:textColor="@android:color/white"/>
+        android:textColor="@android:color/white"
+        android:background="@drawable/start_autopilot_tip_bkg_top"/>
 </FrameLayout>
\ 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
         }
     }