diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
index 9b8c4737c8..afe9ab272b 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
@@ -111,7 +111,7 @@ class PM2DrivingInfoFragment :
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.background = ContextCompat.getDrawable(it,R.drawable.bg_p_m2_auto_bg) }
+ context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.bg_p_m2_auto) }
}
}
diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt
index bff17e33c0..ffaa7b1d14 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt
@@ -11,5 +11,5 @@ import com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
*/
class M2TurnLightView @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null
-) : TurnLightViewStatus(context, attrs) {
+) {
}
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_auto_bg.xml b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_auto.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_auto_bg.xml
rename to OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_auto.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_traffic_light_background.xml b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml
similarity index 100%
rename from OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_traffic_light_background.xml
rename to OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_pnc.xml b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_pnc.xml
new file mode 100644
index 0000000000..0357ebb192
--- /dev/null
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_pnc.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml
index 7762402143..b9dcb334f0 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml
@@ -10,7 +10,7 @@
android:id="@+id/m2_p_traffic_light_bg"
android:layout_width="@dimen/m2_p_light_width"
android:layout_height="@dimen/m2_p_light_height"
- android:background="@drawable/bg_p_m2_auto_bg"
+ android:background="@drawable/bg_p_m2_auto"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
index 05b1b51d32..8440be86dd 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
@@ -51,7 +51,7 @@
android:id="@+id/auto_tv"
android:layout_width="@dimen/dp_66"
android:layout_height="@dimen/dp_38"
- android:background="@drawable/bg_p_m2_auto_bg"
+ android:background="@drawable/bg_p_m2_auto"
android:layout_marginTop="@dimen/dp_12"
android:text="@string/m2_p_auto_tv"
android:textSize="@dimen/dp_18"
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
index 30a3a45a92..96a4bb5148 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
@@ -23,9 +23,10 @@
+ app:layout_constraintRight_toRightOf="parent"
+ app:background_resource="@drawable/bg_pnc" />
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml b/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml
index 19447f7f10..da9dd9c7d0 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml
@@ -9,6 +9,7 @@
#0B1E38
#6B7EA6
#2D3E5F
+ #A5D8FF
#FFFFA28B
#FFDA1100