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

[6.4.0]

Browse Source 
[shuttle driver ui change]
This commit is contained in:
yangyakun
2024-04-19 20:49:21 +08:00
parent 99b872e26a
commit 2faa411866
10 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
View File

@@ -42,7 +42,6 @@ import com.mogo.map.listener.MogoMapListenerHandler;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.map.uicontroller.VisualAngleMode;
import com.mogo.och.shuttle.R;
import com.mogo.och.shuttle.ui.ShuttleTrafficDataView;
import com.mogo.och.shuttle.view.BizMapView;
import com.mogo.och.data.bean.BusRoutesResult;
import com.mogo.och.shuttle.model.OrderModel;

0
OCH/shuttle/driver/src/main/res/drawable-xhdpi/press_start_status.png → OCH/shuttle/driver/src/main/res/drawable-nodpi/press_start_status.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
OCH/shuttle/driver/src/main/res/drawable-xhdpi/start_failure.png → OCH/shuttle/driver/src/main/res/drawable-nodpi/start_failure.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
OCH/shuttle/driver/src/main/res/drawable-xhdpi/shuttle_write_off_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
OCH/shuttle/driver/src/main/res/drawable/press_start_status.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
OCH/shuttle/driver/src/main/res/drawable/start_failure.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

16
OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
View File

@@ -38,7 +38,7 @@
<FrameLayout
android:id="@+id/fl_speed"
android:layout_width="@dimen/dp_624"
android:layout_width="@dimen/dp_618"
android:layout_height="@dimen/dp_269"
android:layout_marginStart="@dimen/dp_10"
app:layout_constraintLeft_toLeftOf="parent"
@@ -171,10 +171,10 @@
<RelativeLayout
android:id="@+id/module_mogo_och_autopilot_status"
android:layout_width="@dimen/dp_585"
android:layout_height="@dimen/dp_171"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_m_10"
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:background="@drawable/bus_autopilot_0_1_status_bg"
android:gravity="center"
app:layout_constraintLeft_toLeftOf="parent"
@@ -226,11 +226,11 @@
<com.mogo.och.shuttle.ui.writeoff.WriteOffView
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/module_mogo_och_arrived_tv"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginBottom="-40dp"
android:background="@drawable/shuttle_write_off_bg"
android:layout_width="@dimen/dp_585"
android:layout_height="@dimen/dp_176"/>
android:layout_width="@dimen/dp_618"
android:layout_height="@dimen/dp_177"/>
<TextView
android:id="@+id/module_mogo_och_arrived_tv"

6
OCH/shuttle/driver/src/main/res/layout/shuttle_fragment_och.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/module_och_bus_order_status_stationInfo"
android:layout_width="@dimen/dp_587"
android:layout_width="@dimen/dp_616"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_28"
android:background="@drawable/bus_line_panel_bg"
@@ -98,8 +98,8 @@
android:id="@+id/switch_line_btn"
android:layout_width="match_parent"
android:layout_height="@dimen/bus_switch_line_btn_height_1"
android:layout_marginStart="@dimen/dp_28"
android:layout_marginEnd ="@dimen/dp_26"
android:layout_marginStart="@dimen/dp_29"
android:layout_marginEnd ="@dimen/dp_27"
android:layout_marginTop="@dimen/dp_40"
app:layout_goneMarginTop="@dimen/dp_550"
android:background="@drawable/bus_switch_line_btn"

2
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt
View File

@@ -48,7 +48,7 @@ class AutoPilotLaunchBeforeView: LinearLayout, IStatusListener {
constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
LayoutInflater.from(context).inflate(R.layout.layout_autopilot_launch_before, this, true)
background = ContextCompat.getDrawable(context, R.drawable.icon_bg_autopilot_status)
setPadding(AutoSizeUtils.dp2px(context, 27f), AutoSizeUtils.dp2px(context, 33f), AutoSizeUtils.dp2px(context, 30f), AutoSizeUtils.dp2px(context, 30f))
setPadding(AutoSizeUtils.dp2px(context, 29f), AutoSizeUtils.dp2px(context, 35f), AutoSizeUtils.dp2px(context, 30f), AutoSizeUtils.dp2px(context, 30f))
}

6
core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml
View File

@@ -2,13 +2,13 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:parentTag="android.widget.LinearLayout"
tools:layout_width="@dimen/dp_624"
tools:layout_width="@dimen/dp_618"
tools:layout_height="@dimen/dp_269"
tools:orientation="horizontal"
tools:background="@drawable/icon_bg_autopilot_status"
tools:paddingTop="@dimen/dp_33"
tools:paddingTop="@dimen/dp_35"
tools:paddingBottom="@dimen/dp_30"
tools:paddingStart="@dimen/dp_27"
tools:paddingStart="@dimen/dp_29"
tools:paddingEnd="@dimen/dp_30">
<LinearLayout