diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml
index 5e1fca3986..f5b1760fd2 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml
@@ -2,9 +2,20 @@
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools">
+
+
+ android:layout_height="0dp"/>
+ android:layout_height="0dp"/>
+ android:layout_height="0dp"/>
\ No newline at end of file
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml
index 2aa5f7ad18..1c0e065ac9 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml
@@ -2,7 +2,8 @@
diff --git a/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml b/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml
index fd1ec0cd92..c45fa5d21e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml
@@ -22,7 +22,6 @@
#323C6F
10dp
20dp
- 200dp
52dp
65dp
20dp
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
index e22fefd1c3..f89b04ef30 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
@@ -34,7 +34,6 @@ import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_distanc
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_end_routing
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_routing_name
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_submit_task
-import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_time_end
import kotlinx.android.synthetic.main.unmanned_routing_running.view.goutp_show_routing_info
import kotlinx.android.synthetic.main.unmanned_routing_running.view.include_empty
import kotlinx.android.synthetic.main.unmanned_routing_running.view.naviToStart
@@ -196,8 +195,7 @@ class RoutingRunningView: ConstraintLayout, RoutingRunningModel.RoutingRuningCal
)
}"
)
- actv_distance_end.text =TaskUtils.getCurrentTaskDistance(meters)
- actv_time_end.text =TaskUtils.getCurrentTaskTime(timeInSecond)
+ actv_distance_end.text = "${TaskUtils.getCurrentTaskDistance(meters)} ${TaskUtils.getCurrentTaskTime(timeInSecond)}"
}
}
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml
index c53c29dd26..865a2f1d6e 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml
@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
android:layout_width="@dimen/dp_880"
- android:layout_height="@dimen/dp_966"
+ android:layout_height="match_parent"
+ tools:layout_height="@dimen/dp_966"
tools:background="@drawable/shape_itinerary_bg_default"
xmlns:tools="http://schemas.android.com/tools">
@@ -41,7 +42,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"/>
+ android:layout_height="@dimen/dp_92"/>
+
-
-
-
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml
index 481fb6f4e7..b41c1767a4 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml
@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
android:layout_width="@dimen/dp_880"
- android:layout_height="@dimen/dp_966"
+ android:layout_height="match_parent"
+ tools:layout_height="@dimen/dp_966"
tools:background="@drawable/shape_itinerary_bg_default"
xmlns:tools="http://schemas.android.com/tools">
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml
index f123ba232c..7e1a136add 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml
@@ -2,7 +2,8 @@
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
index bdbf10549f..15b1f5a5ab 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
@@ -2,9 +2,20 @@
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools">
+
+
+ android:layout_height="0dp"/>
+ android:layout_height="0dp"/>
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml
index d2790945a0..4dd327a9aa 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml
@@ -2,7 +2,8 @@
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
index 5e5fef813b..2f2f5e8065 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
@@ -19,10 +19,11 @@