diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
index 0c2952299a..8c5776a89e 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -90,8 +90,10 @@ class TaxiPassengerBaseFragment() :
}
if(selectItem == BottomBar.SelectView.PRECISIONMAP){
mapBizView.visibility = View.VISIBLE
+ itinerary.visibility = View.VISIBLE
}else{
mapBizView.visibility = View.GONE
+ itinerary.visibility = View.GONE
}
}
})
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml
new file mode 100644
index 0000000000..1b15cb5398
--- /dev/null
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml
@@ -0,0 +1,26 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
index 20016f61af..9724d9fd64 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -35,12 +35,13 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginStart="@dimen/dp_557"
- android:layout_marginBottom="50dp"
+ android:layout_marginTop="100dp"
android:background="@drawable/roma_taxi_p_bg_selector"
- app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
app:roma_close="@drawable/roma_taxi_p_bg_selector"
app:roma_open="@drawable/iv_roma_taxi_passenger_press_bg"
- app:layout_constraintLeft_toLeftOf="parent" />
+ />
-
-
-
+ android:layout_marginStart="@dimen/dp_48"
+ android:layout_marginBottom="@dimen/dp_42"
+ android:layout_width="@dimen/dp_726"
+ android:layout_height="wrap_content"/>
+ android:layout_height="@dimen/dp_160"/>
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
index a008d57b41..72a356db45 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
@@ -2,18 +2,23 @@
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
index 48a3da0d04..a354b5a85b 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
@@ -2,73 +2,166 @@
-
-
-
-
-
-
-
-
-
-
-
+ app:layout_constraintBottom_toBottomOf="@+id/progress"
+ android:background="@color/taxi_p_A7BDF3"
+ android:layout_marginTop="@dimen/dp_88"
+ android:layout_width="@dimen/dp_726"
+ android:layout_height="0dp"/>
+ android:text="68" />
+
+
+ app:layout_constraintTop_toTopOf="@+id/actv_speed_unit"
+ android:text="环球贸易中心" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
index f69881eed0..939eae1d95 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
@@ -56,4 +56,19 @@
#8FB3EF
#E1F3FE
#FFFFFF
+
+ #111D2F
+ #004DC4
+ #293449
+ #203555
+ #5C71AB
+ #081831
+ #112B57
+ #476FBE
+
+ #6edbdc
+ #56efa0
+ #A7BDF3
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
index d0c716ab93..ff00cbeb78 100644
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -120,10 +120,8 @@ object ConfigStartUp {
HmiBuildConfig.isShowLimitingVelocityView = false
//白天模式
FunctionBuildConfig.skinMode = 1
- } else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
- //是否显示 限速UI
- HmiBuildConfig.isShowLimitingVelocityView = false
- } else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)) {
+ } else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)||
+ AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
//是否显示 限速UI
HmiBuildConfig.isShowLimitingVelocityView = false
//白天模式