yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[M2] M2 pnc UI

Browse Source
This commit is contained in:
wangmingjun
2023-02-14 14:50:14 +08:00
parent 8132a27e4b
commit 1ebfd603c5
9 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
View File

@@ -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) }
}
}

2
OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/M2TurnLightView.kt
View File

@@ -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) {
) {
}

0
OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_auto_bg.xml → OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_auto.xml
View File

0
OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_traffic_light_background.xml → OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_p_m2_traffic_light.xml
View File

5
OCH/mogo-och-bus-passenger/src/m2/res/drawable/bg_pnc.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:centerColor="@color/m2_pnc_bg_color"/>
</shape>

2
OCH/mogo-och-bus-passenger/src/m2/res/layout/m2_p_traffic_light_view.xml
View File

@@ -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" />

2
OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
View File

@@ -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"

7
OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_hpmap_fragment.xml
View File

@@ -23,9 +23,10 @@
<!--pnc行为决策-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
android:id="@+id/pnc_actions_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_231"
android:layout_height="@dimen/dp_36"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
app:layout_constraintRight_toRightOf="parent"
app:background_resource="@drawable/bg_pnc" />
</androidx.constraintlayout.widget.ConstraintLayout>

1
OCH/mogo-och-bus-passenger/src/m2/res/values/colors.xml
View File

@@ -9,6 +9,7 @@
<color name="m2_current_time_tv_color">#0B1E38</color>
<color name="m2_no_line_tv_color">#6B7EA6</color>
<color name="m2_light_tv_color">#2D3E5F</color>
<color name="m2_pnc_bg_color">#A5D8FF</color>
<color name="bus_traffic_light_red_color_up">#FFFFA28B</color>
<color name="bus_traffic_light_red_color_down">#FFDA1100</color>