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

Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge

Browse Source
This commit is contained in:
donghongyu
2022-02-17 18:18:17 +08:00
parent fad91e0b92 025a965be3
commit 2820d87d8c
13 changed files with 122 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -80,8 +80,8 @@
<dimen name="module_mogo_och_autopilot_status_bg_width">460px</dimen>
<dimen name="module_mogo_och_autopilot_status_bg_height">140px</dimen>
<dimen name="module_mogo_och_operation_status_bg_width">140px</dimen>
<dimen name="module_mogo_och_operation_status_bg_height">140px</dimen>
<dimen name="module_mogo_och_operation_status_bg_width">112px</dimen>
<dimen name="module_mogo_och_operation_status_bg_height">112px</dimen>
<dimen name="module_mogo_och_operation_status_padding">92px</dimen>
@@ -110,7 +110,7 @@
<dimen name="bus_ext_speed_width_big_radius">130px</dimen>
<dimen name="bus_ext_speed_width_sm_radius">30px</dimen>
<dimen name="bus_switch_map">279px</dimen>
<dimen name="bus_switch_map_height">119px</dimen>
<dimen name="bus_switch_map_height">112px</dimen>
<dimen name="bus_switch_margin_left">22px</dimen>
<dimen name="bus_switch_text_size">36px</dimen>
<dimen name="bus_switch_image">50px</dimen>

1
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/BaseOchTaxiTabFragment.java
View File

@@ -422,6 +422,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
public void changeOperationViewVisible(int visible){
getActivity().runOnUiThread(() -> {
if (tvOperationStatus == null) return;
tvOperationStatus.setVisibility(visible);
});
}

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 53 KiB

19
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_base_fragment.xml
View File

@@ -7,10 +7,10 @@
<LinearLayout
android:id="@+id/module_mogo_och_speed_layout"
android:layout_height="244px"
android:layout_width="244px"
android:layout_marginLeft="15px"
android:layout_marginTop="15px"
android:layout_height="@dimen/taxi_tab_speed_width_height"
android:layout_width="@dimen/taxi_tab_speed_width_height"
android:layout_marginLeft="20px"
android:layout_marginTop="20px"
android:elevation="@dimen/dp_10"
android:orientation="vertical"
android:gravity="center_horizontal"
@@ -42,11 +42,10 @@
<LinearLayout
android:id="@+id/module_mogo_och_autopilot_status"
android:layout_width="420px"
android:layout_height="220px"
android:layout_marginTop="25px"
android:layout_marginLeft="230px"
android:elevation="@dimen/dp_10"
android:layout_width="@dimen/taxi_tab_autoaploit_width"
android:layout_height="@dimen/taxi_tab_autoaploit_height"
android:layout_marginTop="20px"
android:layout_marginLeft="220px"
android:background="@drawable/anmi_flow"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -77,13 +76,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:layout_marginLeft="15px"
app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_speed_layout"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="244px"
app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call"
tools:visibility="visible" />
<CheckedTextView
android:id="@+id/module_mogo_och_operation_status"
android:layout_width="250px"

4
OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml
View File

@@ -19,4 +19,8 @@
<dimen name="taxi_order_list_boot_refresh_no_data_view_height">160px</dimen>
<dimen name="taxi_tab_item_custom_width">280px</dimen>
<dimen name="taxi_tab_item_custom_height">120px</dimen>
<dimen name="taxi_tab_speed_width_height">220px</dimen>
<dimen name="taxi_tab_autoaploit_width">420px</dimen>
<dimen name="taxi_tab_autoaploit_height">220px</dimen>
</resources>

24
OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -39,7 +39,7 @@
<dimen name="module_mogo_och_notice_text_max_width">460px</dimen>
<dimen name="module_mogo_och_notice_text_size">30px</dimen>
<dimen name="module_och_taxi_panel_width">464px</dimen>
<dimen name="module_och_taxi_panel_width">560px</dimen>
<dimen name="module_och_taxi_panel_height">310px</dimen>
<dimen name="module_och_taxi_order_start_station_marginLeft">15px</dimen>
<dimen name="module_och_taxi_order_status_marginLeft">25px</dimen>
@@ -65,4 +65,26 @@
<dimen name="module_och_taxi_order_distance_marginRight">17px</dimen>
<dimen name="module_och_taxi_order_text_marginRight">31.5px</dimen>
<dimen name="taxi_operation_data_item_width">800px</dimen>
<dimen name="taxi_operation_data_item_height">222px</dimen>
<dimen name="taxi_order_cancel_width">1120px</dimen>
<dimen name="taxi_order_cancel_btn_height">162px</dimen>
<dimen name="taxi_grab_order_start_station_width">446px</dimen>
<dimen name="taxi_order_nodata_width">400px</dimen>
<dimen name="taxi_order_nodata_height">160px</dimen>
<dimen name="taxi_reserve_item_station_width">432px</dimen>
<dimen name="taxi_order_list_item_height">64px</dimen>
<dimen name="taxi_order_list_show_bt_width">616px</dimen>
<dimen name="taxi_order_list_show_bt_height">132px</dimen>
<dimen name="taxi_order_list_tab_max_weight">300px</dimen>
<dimen name="taxi_order_list_tab_min_weight">240px</dimen>
<dimen name="taxi_order_list_boot_refresh_no_data_view_width">400px</dimen>
<dimen name="taxi_order_list_boot_refresh_no_data_view_height">160px</dimen>
<dimen name="taxi_tab_item_custom_width">280px</dimen>
<dimen name="taxi_tab_item_custom_height">120px</dimen>
<dimen name="taxi_tab_speed_width_height">220px</dimen>
<dimen name="taxi_tab_autoaploit_width">420px</dimen>
<dimen name="taxi_tab_autoaploit_height">220px</dimen>
</resources>

22
OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml
View File

@@ -60,4 +60,26 @@
<dimen name="module_och_taxi_order_distance_textSize">24px</dimen>
<dimen name="module_och_taxi_order_distance_marginRight">17px</dimen>
<dimen name="module_och_taxi_order_text_marginRight">22.5px</dimen>
<dimen name="taxi_operation_data_item_width">800px</dimen>
<dimen name="taxi_operation_data_item_height">222px</dimen>
<dimen name="taxi_order_cancel_width">1120px</dimen>
<dimen name="taxi_order_cancel_btn_height">162px</dimen>
<dimen name="taxi_grab_order_start_station_width">446px</dimen>
<dimen name="taxi_order_nodata_width">400px</dimen>
<dimen name="taxi_order_nodata_height">160px</dimen>
<dimen name="taxi_reserve_item_station_width">432px</dimen>
<dimen name="taxi_order_list_item_height">64px</dimen>
<dimen name="taxi_order_list_show_bt_width">616px</dimen>
<dimen name="taxi_order_list_show_bt_height">132px</dimen>
<dimen name="taxi_order_list_tab_max_weight">300px</dimen>
<dimen name="taxi_order_list_tab_min_weight">240px</dimen>
<dimen name="taxi_order_list_boot_refresh_no_data_view_width">400px</dimen>
<dimen name="taxi_order_list_boot_refresh_no_data_view_height">160px</dimen>
<dimen name="taxi_tab_item_custom_width">280px</dimen>
<dimen name="taxi_tab_item_custom_height">120px</dimen>
<dimen name="taxi_tab_speed_width_height">220px</dimen>
<dimen name="taxi_tab_autoaploit_width">420px</dimen>
<dimen name="taxi_tab_autoaploit_height">220px</dimen>
</resources>

1
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java
View File

@@ -427,6 +427,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
public void changeOperationViewVisible(int visible){
getActivity().runOnUiThread(() -> {
if (tvOperationStatus == null) return;
tvOperationStatus.setVisibility(visible);
});
}

BIN
OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_speed_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 53 KiB

18
OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml
View File

@@ -7,10 +7,10 @@
<LinearLayout
android:id="@+id/module_mogo_och_speed_layout"
android:layout_height="244px"
android:layout_width="244px"
android:layout_marginLeft="15px"
android:layout_marginTop="15px"
android:layout_height="@dimen/taxi_tab_speed_width_height"
android:layout_width="@dimen/taxi_tab_speed_width_height"
android:layout_marginLeft="20px"
android:layout_marginTop="20px"
android:elevation="@dimen/dp_10"
android:orientation="vertical"
android:gravity="center_horizontal"
@@ -42,11 +42,10 @@
<LinearLayout
android:id="@+id/module_mogo_och_autopilot_status"
android:layout_width="420px"
android:layout_height="220px"
android:layout_marginTop="25px"
android:layout_marginLeft="230px"
android:elevation="@dimen/dp_10"
android:layout_width="@dimen/taxi_tab_autoaploit_width"
android:layout_height="@dimen/taxi_tab_autoaploit_height"
android:layout_marginTop="20px"
android:layout_marginLeft="220px"
android:background="@drawable/anmi_flow"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -77,7 +76,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:layout_marginLeft="15px"
app:layout_constraintLeft_toLeftOf="@+id/module_mogo_och_speed_layout"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="244px"

4
OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml
View File

@@ -19,4 +19,8 @@
<dimen name="taxi_order_list_boot_refresh_no_data_view_height">160px</dimen>
<dimen name="taxi_tab_item_custom_width">280px</dimen>
<dimen name="taxi_tab_item_custom_height">120px</dimen>
<dimen name="taxi_tab_speed_width_height">220px</dimen>
<dimen name="taxi_tab_autoaploit_width">420px</dimen>
<dimen name="taxi_tab_autoaploit_height">220px</dimen>
</resources>

24
OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -39,7 +39,7 @@
<dimen name="module_mogo_och_notice_text_max_width">460px</dimen>
<dimen name="module_mogo_och_notice_text_size">30px</dimen>
<dimen name="module_och_taxi_panel_width">464px</dimen>
<dimen name="module_och_taxi_panel_width">560px</dimen>
<dimen name="module_och_taxi_panel_height">310px</dimen>
<dimen name="module_och_taxi_order_start_station_marginLeft">15px</dimen>
<dimen name="module_och_taxi_order_status_marginLeft">25px</dimen>
@@ -65,4 +65,26 @@
<dimen name="module_och_taxi_order_distance_marginRight">17px</dimen>
<dimen name="module_och_taxi_order_text_marginRight">31.5px</dimen>
<dimen name="taxi_operation_data_item_width">800px</dimen>
<dimen name="taxi_operation_data_item_height">222px</dimen>
<dimen name="taxi_order_cancel_width">1120px</dimen>
<dimen name="taxi_order_cancel_btn_height">162px</dimen>
<dimen name="taxi_grab_order_start_station_width">446px</dimen>
<dimen name="taxi_order_nodata_width">400px</dimen>
<dimen name="taxi_order_nodata_height">160px</dimen>
<dimen name="taxi_reserve_item_station_width">432px</dimen>
<dimen name="taxi_order_list_item_height">64px</dimen>
<dimen name="taxi_order_list_show_bt_width">616px</dimen>
<dimen name="taxi_order_list_show_bt_height">132px</dimen>
<dimen name="taxi_order_list_tab_max_weight">300px</dimen>
<dimen name="taxi_order_list_tab_min_weight">240px</dimen>
<dimen name="taxi_order_list_boot_refresh_no_data_view_width">400px</dimen>
<dimen name="taxi_order_list_boot_refresh_no_data_view_height">160px</dimen>
<dimen name="taxi_tab_item_custom_width">280px</dimen>
<dimen name="taxi_tab_item_custom_height">120px</dimen>
<dimen name="taxi_tab_speed_width_height">220px</dimen>
<dimen name="taxi_tab_autoaploit_width">420px</dimen>
<dimen name="taxi_tab_autoaploit_height">220px</dimen>
</resources>

24
OCH/mogo-och-taxi/src/main/res/values/dimens.xml
View File

@@ -60,4 +60,28 @@
<dimen name="module_och_taxi_order_distance_textSize">24px</dimen>
<dimen name="module_och_taxi_order_distance_marginRight">17px</dimen>
<dimen name="module_och_taxi_order_text_marginRight">22.5px</dimen>
<dimen name="taxi_operation_data_item_width">800px</dimen>
<dimen name="taxi_operation_data_item_height">222px</dimen>
<dimen name="taxi_order_cancel_width">1120px</dimen>
<dimen name="taxi_order_cancel_btn_height">162px</dimen>
<dimen name="taxi_grab_order_start_station_width">446px</dimen>
<dimen name="taxi_order_nodata_width">400px</dimen>
<dimen name="taxi_order_nodata_height">160px</dimen>
<dimen name="taxi_reserve_item_station_width">432px</dimen>
<dimen name="taxi_order_list_item_height">64px</dimen>
<dimen name="taxi_order_list_show_bt_width">616px</dimen>
<dimen name="taxi_order_list_show_bt_height">132px</dimen>
<dimen name="taxi_order_list_tab_max_weight">300px</dimen>
<dimen name="taxi_order_list_tab_min_weight">240px</dimen>
<dimen name="taxi_order_list_boot_refresh_no_data_view_width">400px</dimen>
<dimen name="taxi_order_list_boot_refresh_no_data_view_height">160px</dimen>
<dimen name="taxi_tab_item_custom_width">280px</dimen>
<dimen name="taxi_tab_item_custom_height">120px</dimen>
<dimen name="taxi_tab_speed_width_height">220px</dimen>
<dimen name="taxi_tab_autoaploit_width">420px</dimen>
<dimen name="taxi_tab_autoaploit_height">220px</dimen>
<dimen name="module_mogo_och_margin_left">40px</dimen>
</resources>