From 0f0833e26e963a975780f636604625d422aa58e4 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Wed, 24 Apr 2024 12:54:12 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[taxi=20=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/module/biz/lansocket/LoginLanDriverSocket.kt   | 2 +-
 .../src/main/res/layout/taxi_server_orders_panel.xml      | 2 --
 .../src/main/res/layout/task_fragment_current.xml         | 8 ++++----
 .../src/main/res/layout/taxi_server_orders_panel.xml      | 2 ++
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt
index 672c5ec06f..c99bf30c0e 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/lansocket/LoginLanDriverSocket.kt
@@ -70,7 +70,7 @@ object LoginLanDriverSocket : ILoginCallback {
                             FlavorUtils.envType!!
                         )
                     LanSocketManager.sendMsgToClient(msg)
-                    BizLoopManager.setLoopFunction(TAG, LoopInfo(60, ::loopCheck))
+                    BizLoopManager.setLoopFunction(TAG, LoopInfo(60*10, ::loopCheck))
                 }
 
                 else -> {
diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_server_orders_panel.xml b/OCH/taxi/driver/src/main/res/layout/taxi_server_orders_panel.xml
index 317fc4c77f..2191961068 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_server_orders_panel.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_server_orders_panel.xml
@@ -8,8 +8,6 @@
     android:orientation="vertical"
     android:paddingTop="@dimen/dp_26"
     android:paddingBottom="@dimen/dp_32"
-    android:paddingStart="@dimen/dp_29"
-    android:paddingEnd="@dimen/dp_29"
     android:background="@drawable/taxi_order_bg">
 
     <com.google.android.material.tabs.TabLayout
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml
index fa49fb742c..c5fa6bccdf 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/task_fragment_current.xml
@@ -162,8 +162,8 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/startPoint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_38"
+        android:layout_height="@dimen/dp_38"
         android:src="@drawable/taxi_driver_circle_green_big"
         app:layout_constraintTop_toTopOf="@+id/startStationName"
         app:layout_constraintBottom_toBottomOf="@+id/startStationName"
@@ -182,8 +182,8 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/endPoint"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_38"
+        android:layout_height="@dimen/dp_38"
         android:src="@drawable/taxi_driver_circle_blue_big"
         app:layout_constraintTop_toTopOf="@+id/endStationName"
         app:layout_constraintBottom_toBottomOf="@+id/endStationName"
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml
index ddcfa9e919..a397caedce 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_server_orders_panel.xml
@@ -8,6 +8,8 @@
     android:orientation="vertical"
     android:paddingTop="@dimen/dp_26"
     android:paddingBottom="@dimen/dp_32"
+    android:paddingStart="@dimen/dp_29"
+    android:paddingEnd="@dimen/dp_29"
     android:background="@drawable/taxi_order_bg">
 
     <com.google.android.material.tabs.TabLayout