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

Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk

Browse Source
This commit is contained in:
wujifei
2021-05-17 16:49:52 +08:00
parent 1b2feb6c47 728b4bd2de
commit fecfd46b84
21 changed files with 27 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

0
OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png → OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_base_icon_not_in_autopilot.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png → OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arrived_station.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png → OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arriving_station.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png → OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_base_slide_block.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png → OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_dot_line.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1004 B

After

Width:  |  Height:  |  Size: 1004 B

0
OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml → OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

15
foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
View File

@@ -1,8 +1,10 @@
package com.mogo.commons.mvp;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.view.MotionEvent;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
@@ -28,6 +30,7 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
@Override
protected void onCreate( @Nullable Bundle savedInstanceState ) {
hideBottomUIMenu();
super.onCreate( savedInstanceState );
beforeSetContentView(savedInstanceState);
if ( DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD ) {
@@ -40,6 +43,18 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
getLifecycle().addObserver( mPresenter );
}
//隐藏导航栏
protected void hideBottomUIMenu() {
//隐藏虚拟按键
if (Build.VERSION.SDK_INT >= 19) {
//for new api versions.
View decorView = getWindow().getDecorView();
int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY ;
decorView.setSystemUiVisibility(uiOptions);
}
}
protected void beforeSetContentView(Bundle savedInstanceState){
}

0
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png → modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/module_v2x_vr_close.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png → modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_optimal_route_warning.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

0
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png → modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_car_warning.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

0
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png → modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

0
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png → modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_m_warning.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png → modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_p_warning.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

2
modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
View File

@@ -28,7 +28,7 @@
android:layout_marginRight="@dimen/dp_20"
android:text="为您推荐最优路线"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_32"
android:textSize="@dimen/module_v2x_event_warning_type_text_size"
app:layout_constraintBottom_toBottomOf="@+id/warning_type_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/warning_type_image"

4
modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
View File

@@ -101,8 +101,8 @@
<dimen name="module_v2x_event_parking_text_size">19px</dimen>
<!--最优路线-->
<dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
<dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
<dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
<dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
<!--适配 V2X 弹窗 UI-->

4
modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
View File

@@ -101,8 +101,8 @@
<dimen name="module_v2x_event_parking_text_size">19px</dimen>
<!--最优路线-->
<dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
<dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
<dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
<dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
<!--适配 V2X 弹窗 UI-->

5
modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -31,4 +31,9 @@
<dimen name="module_v2x_car_for_help_event_maxwidth">480px</dimen>
<dimen name="module_v2x_car_for_help_event_text_size">42px</dimen>
<dimen name="module_v2x_car_for_help_cancel_text_size">40px</dimen>
<!--最优路线-->
<dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
<dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
</resources>

105
modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
View File

@@ -1,105 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<!--联想PAD适配-->
<dimen name="module_main_v2x_animation_width">800px</dimen>
<dimen name="module_v2x_search_marginLeft">32px</dimen>
<dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
<dimen name="module_v2x_push_img_height">390px</dimen>
<dimen name="module_v2x_push_img_container_height">410px</dimen>
<dimen name="module_v2x_event_icon_size">160px</dimen>
<dimen name="module_v2x_event_distance_text">60px</dimen>
<dimen name="module_v2x_event_distance_title">40px</dimen>
<dimen name="module_v2x_history_event_icon_size">80px</dimen>
<dimen name="module_ext_top_view_no_link_width_in_vr_mode">778px</dimen>
<dimen name="module_v2x_event_see_live_window_height_vr">687px</dimen>
<dimen name="module_v2x_event_window_top_margin_vr">200px</dimen>
<dimen name="module_v2x_event_window_close_distance">10px</dimen>
<dimen name="module_v2x_event_window_height_vr_for_item">487px</dimen>
<dimen name="module_v2x_event_window_width_vr">778px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
<dimen name="module_v2x_map_left">550px</dimen>
<dimen name="module_v2x_map_top">200px</dimen>
<dimen name="module_v2x_map_right">200px</dimen>
<dimen name="module_v2x_map_bottom">100px</dimen>
<dimen name="module_v2x_surrounding_top_height">90px</dimen>
<dimen name="module_v2x_surrounding_top_bt_width">162px</dimen>
<dimen name="module_v2x_surrounding_top_bt_height">64px</dimen>
<dimen name="module_v2x_surrounding_empty_iv_margin_top">80px</dimen>
<dimen name="module_v2x_surrounding_empty_tv_margin_top">26px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
<dimen name="module_v2x_surrounding_margin_left">48px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
<dimen name="module_v2x_surrounding_item_width">465px</dimen>
<dimen name="module_v2x_surrounding_item_height">306px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_image_height">50px</dimen>
<dimen name="module_v2x_surrounding_item_marigin_left">28px</dimen>
<dimen name="module_v2x_surrounding_item_marigin_bottom_left">16px</dimen>
<dimen name="module_v2x_panel_surrounding_marginbottom">5px</dimen>
<dimen name="module_v2x_panel_surrounding_stance">80px</dimen>
<dimen name="module_v2x_surrounding_top">22px</dimen>
<dimen name="module_v2x_surrounding_list_margin_left">20px</dimen>
<dimen name="module_v2x_surrounding_item_margin_left">30px</dimen>
<dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
<dimen name="module_v2x_surrounding_top_textsize">30px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
<dimen name="module_v2x_surrounding_item_maigin_left">50px</dimen>
<dimen name="module_v2x_panel_width">120px</dimen>
<dimen name="module_v2x_panel_tab_height">158px</dimen>
<!--适配 V2X 弹窗 UI-->
<dimen name="module_v2x_event_type_title_text_size">20px</dimen>
<dimen name="module_v2x_event_title_text_size">36px</dimen>
<dimen name="module_v2x_event_sub_title_text_size">28px</dimen>
<dimen name="module_v2x_event_head_size">55px</dimen>
<dimen name="module_v2x_event_live_error_text_size">36px</dimen>
<dimen name="module_v2x_live_window_height">310px</dimen>
<dimen name="module_v2x_event_button_size">110px</dimen>
<dimen name="module_v2x_event_button_size_detail">120px</dimen>
<!--道路事件 高的弹窗-->
<dimen name="module_v2x_event_image_height">270px</dimen>
<dimen name="module_v2x_event_image_width">480px</dimen>
<dimen name="module_v2x_event_window_height">330px</dimen>
<dimen name="module_v2x_event_window_height_ground">450px</dimen>
<!--疲劳驾驶、违章停车、道路求助-->
<dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
<dimen name="module_v2x_event_help_head_size">75px</dimen>
<dimen name="module_v2x_event_help_title_text_size">32px</dimen>
<dimen name="module_v2x_event_help_sub_title_text_size">26px</dimen>
<dimen name="module_v2x_event_help_distance_text_size">80px</dimen>
<dimen name="module_v2x_event_parking_text_size">34px</dimen>
<!--最优路线-->
<dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
<dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
<!--适配 V2X 弹窗 UI-->
<dimen name="module_v2x_event_panel_btn_x">940px</dimen>
<dimen name="module_v2x_event_panel_btn_y">701px</dimen>
<dimen name="v2x_driving_width">150px</dimen>
<dimen name="v2x_driving_heigt">46px</dimen>
<dimen name="v2x_recommond_route_size">26px</dimen>
</resources>

4
modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
View File

@@ -117,8 +117,8 @@
<dimen name="module_v2x_event_parking_text_size">34px</dimen>
<!--最优路线-->
<dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
<dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
<dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
<dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
<!--适配 V2X 弹窗 UI-->