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

[6.4.0]

Browse Source 
[自动驾驶按钮样式修改]
This commit is contained in:
yangyakun
2024-05-06 18:01:51 +08:00
parent 02a2e411b9
commit 21bf873a5d
34 changed files with 114 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
View File

@@ -416,7 +416,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
== autopilotStatus) {
ctvAutopilotStatusTv.setText(R.string.bus_pingxing_driver);
ctvAutopilotStatus.setClickable(false);
ctvAutopilotStatus.setBackgroundResource(R.drawable.pingxingjiashi);
ctvAutopilotStatus.setBackgroundResource(R.drawable.common_autopilot_pxjs);
}
}

4
OCH/bus/driver/src/main/res/drawable/bus_autopilot_0_1_status_bg.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/press_start_status">
<item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press">
</item>
<item android:drawable="@drawable/start_failure">
<item android:drawable="@drawable/common_autopilot_unable">
</item>
</selector>

4
OCH/bus/driver/src/main/res/drawable/bus_autopilot_2_status_bg.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/press_start_status">
<item android:state_pressed="true" android:drawable="@drawable/common_autopilot_press">
</item>
<item android:drawable="@drawable/start_success">
<item android:drawable="@drawable/common_autopilot_in_autopilot">
</item>
</selector>

27
OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
View File

@@ -19,22 +19,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<!-- <FrameLayout-->
<!-- android:id="@+id/fl_speed"-->
<!-- android:layout_width="@dimen/dp_616"-->
<!-- android:layout_height="@dimen/dp_320"-->
<!-- android:layout_marginLeft="@dimen/dp_13"-->
<!-- android:layout_marginTop="@dimen/dp_40"-->
<!-- android:visibility="visible"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent">-->
<!-- <com.mogo.eagle.core.function.hmi.ui.widget.TrafficDataView-->
<!-- android:id="@+id/bus_arc"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent" />-->
<!-- </FrameLayout>-->
<FrameLayout
android:id="@+id/fl_speed"
android:layout_width="@dimen/dp_618"
@@ -171,9 +155,11 @@
<RelativeLayout
android:id="@+id/module_mogo_och_autopilot_status"
android:layout_width="@dimen/dp_616"
android:layout_height="@dimen/dp_180"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_m_1"
android:layout_height="@dimen/dp_185"
android:layout_marginStart="@dimen/dp_9"
android:layout_marginTop="-31dp"
android:paddingTop="@dimen/dp_27"
android:paddingBottom="@dimen/dp_32"
android:background="@drawable/bus_autopilot_0_1_status_bg"
android:gravity="center"
app:layout_constraintLeft_toLeftOf="parent"
@@ -206,9 +192,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="-24dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call" />
/>
<include
android:id="@+id/module_mogo_och_bus_test_bar"