[6.7.0]

[适配]
[1536x2560 运营单]

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt

@@ -66,7 +66,6 @@ import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.naviToEnd
 import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.naviToStart
 import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.prepareTaskCountdownTv
 import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.taskStatus
-import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.actv_time_end
 import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.endStationName
 import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.startStationName
 import kotlinx.android.synthetic.main.unmanned_itinerary_current.view.orderPhoneAndNum
@@ -146,13 +145,11 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
                     // 全程距离和时间
                     is TaskWithOrderUIState.UpdateOrderTripInfo -> {
                         dialog?.setOrderMileage(taskAndOrderUiState.mileage*1000)
-                        actv_distance_end.text = TaskUtils.getCurrentTaskDistance(taskAndOrderUiState.mileage.toLong())
+                        actv_distance_end.text = TaskUtils.getCurrentTaskDistance(taskAndOrderUiState.mileage.toLong()) + "  "+ TaskUtils.getCurrentTaskTime(taskAndOrderUiState.duration.toLong())
-                        actv_time_end.text = TaskUtils.getCurrentTaskTime(taskAndOrderUiState.duration.toLong())
                     }
                     // 根据轨迹计算剩余距离和时间
                     is TaskWithOrderUIState.UpdateTaskTripLocalCalculateInfo -> {
-                        actv_distance_end.text = TaskUtils.getCurrentTaskDistance(taskAndOrderUiState.meters.toLong())
+                        actv_distance_end.text = TaskUtils.getCurrentTaskDistance(taskAndOrderUiState.meters.toLong())+"  "+TaskUtils.getCurrentTaskTime(taskAndOrderUiState.timeInSecond.toLong())
-                        actv_time_end.text = TaskUtils.getCurrentTaskTime(taskAndOrderUiState.timeInSecond.toLong())
                     }
 
                     is TaskWithOrderUIState.UpdatePrepareTaskDelay -> {
@@ -586,7 +583,7 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
                     actv_submit_task.visibility = VISIBLE
                 }
                 hideNaviBtns()
-                actv_time_end.text = TaskUtils.getCurrentTaskWaitTimeHtml()
+                actv_distance_end.text = TaskUtils.getCurrentTaskWaitTimeHtml()
             }
 
             TaxiOrderStatusEnum.OnTheWayToStart.code -> { //前往上车地点
@@ -757,10 +754,8 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
             currentTaskWithOrder.taskType <= TaskTypeEnum.ToOrderStartTask.code
         ) {
             actv_distance_end.text = ""
-            actv_time_end.text = ""
         } else {
-            actv_distance_end.text = "-- 公里"
+            actv_distance_end.text = "-- 公里  -- 分钟"
-            actv_time_end.text = "-- 分钟"
         }
     }
 
@@ -817,8 +812,7 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
     }
 
     override fun onCurrentNaviDistAndTimeChanged(meters: Int, timeInSecond: Long) {
-        actv_distance_end.text = TaskUtils.getCurrentTaskDistance(meters.toLong())
+        actv_distance_end.text = TaskUtils.getCurrentTaskDistance(meters.toLong())+"  "+TaskUtils.getCurrentTaskTime(timeInSecond)
-        actv_time_end.text = TaskUtils.getCurrentTaskTime(timeInSecond)
     }
 
     override fun reInitNaviAmap(isPlay: Boolean, isRestart: Boolean) {

OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml

@@ -87,7 +87,7 @@
         android:layout_marginEnd="@dimen/dp_52"
         android:layout_width="match_parent"
         android:background="@drawable/shape_itinerary_bg_default"
-        android:layout_height="@dimen/dp_351"/>
+        android:layout_height="@dimen/dp_272"/>
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_current_itinerary_start_point"
@@ -107,7 +107,7 @@
         android:layout_marginTop="@dimen/dp_8"
         android:background="@color/taxi_color_4D000000"
         android:layout_width="@dimen/dp_6"
-        android:layout_height="@dimen/dp_171"/>
+        android:layout_height="@dimen/dp_92"/>
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/aciv_current_itinerary_end_point"
@@ -148,17 +148,6 @@
         android:textColor="@color/taxi_color_CCCCCC"
         app:layout_constraintTop_toBottomOf="@+id/startStationName"
         app:layout_constraintStart_toStartOf="@+id/startStationName"
-        app:layout_constraintBottom_toTopOf="@+id/actv_time_end"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/actv_time_end"
-        android:text="1小时36分钟"
-        android:textSize="@dimen/dp_32"
-        android:textColor="@color/taxi_color_CCCCCC"
-        app:layout_constraintTop_toBottomOf="@+id/actv_distance_end"
-        app:layout_constraintStart_toStartOf="@+id/startStationName"
         app:layout_constraintBottom_toTopOf="@+id/endStationName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
@@ -313,7 +302,7 @@
         android:id="@+id/prepareTaskCountdownTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/taxi_color_91A1EA"
+        android:textColor="@color/common_B3FFFFFF"
         android:textSize="@dimen/dp_30"
         android:layout_marginTop="50dp"
         app:layout_constraintStart_toStartOf="parent"