diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
index b7e352c7b8..8d12623b3f 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
@@ -177,7 +177,7 @@ class PM2DrivingInfoFragment :
context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.m2_p_white_color)) }
context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.auto_button_bg) }
}else{
- context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.m2_button_auto_tv_color)) }
+ context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.shuttle_color_7094ad)) }
context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.bg_p_m2_auto) }
}
}
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png
index 79cad39d39..beed2f2ad2 100644
Binary files a/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png and b/OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/shuttle_p_line_name.png differ
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
index beb7893a71..2dbbcac38a 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
@@ -250,13 +250,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_50"
- android:layout_marginTop="@dimen/dp_27"
android:text="0"
android:textColor="@color/m2_p_speed_tv_color"
android:textSize="@dimen/dp_60"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/aciv_speed_time_bg"
- app:layout_constraintTop_toTopOf="@+id/aciv_speed_time_bg" />
+ app:layout_constraintTop_toTopOf="@+id/viewTextClockHouerMin"
+ app:layout_constraintBottom_toBottomOf="@+id/viewTextClockHouerMin"/>
diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
index 3d073b442c..ec59b620fe 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
@@ -35,4 +35,5 @@
#B9E7C0
#43CEFE
#1466FB
+ #7094AD
\ No newline at end of file
diff --git a/app/config/tempConfig.json b/app/config/tempConfig.json
index 9bb07020f0..edfa2e2ead 100644
--- a/app/config/tempConfig.json
+++ b/app/config/tempConfig.json
@@ -67,7 +67,7 @@
"shuttlepassengerm2": {
"ads": [
{
- "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678946244305/dalim2.mp4",
+ "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4",
"type": 1,
"cacheImgPath": "",
"title": "1"
@@ -143,7 +143,7 @@
"shuttlepassengerm2": {
"ads": [
{
- "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678946244305/dalim2.mp4",
+ "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4",
"type": 1,
"cacheImgPath": "",
"title": "1"
@@ -155,7 +155,7 @@
"shuttlepassenger": {
"ads": [
{
- "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774847276/yangmadao_video.mp4",
+ "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
"title": "1"
@@ -165,7 +165,7 @@
"shuttlepassengerm2": {
"ads": [
{
- "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678946244305/dalim2.mp4",
+ "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4",
"type": 1,
"cacheImgPath": "",
"title": "1"