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

Merge branch 'dev' into demo/shunyi_v2v_merge

Browse Source 
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	config.gradle
#	foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml
#	modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
#	modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
#	modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-v2x/src/main/res/values/dimens.xml
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
#	upload.sh
This commit is contained in:
wangcongtao
2020-10-18 16:40:27 +08:00
parent d5abc0b598 83f78f8288
commit e092bb4489
479 changed files with 7101 additions and 8317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,29 +5,19 @@
<dimen name="module_v2x_search_marginLeft">32px</dimen>
<dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
<dimen name="module_v2x_event_window_width">1060px</dimen>
<dimen name="module_v2x_event_window_height">330px</dimen>
<dimen name="module_v2x_event_window_height_ground">450px</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_see_live_window_height">670px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">234px</dimen>
<dimen name="module_v2x_event_icon_size">147px</dimen>
<dimen name="module_v2x_event_button_size">98px</dimen>
<dimen name="module_v2x_event_button_size_detail">130px</dimen>
<dimen name="module_v2x_event_image_height">280px</dimen>
<dimen name="module_v2x_event_image_width">421px</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_v2x_live_window_height">310px</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>
@@ -61,28 +51,51 @@
<dimen name="module_v2x_surrounding_top_textsize">32px</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_des_index_width">31.9px</dimen>
<dimen name="module_v2x_des_index_height">26px</dimen>
<dimen name="module_v2x_surrounding_item_maigin_left">50px</dimen>
<dimen name="module_v2x_panel_icon_cor">30px</dimen>
<dimen name="module_v2x_panel_width">140px</dimen>
<dimen name="share_empty_icon_width">219px</dimen>
<dimen name="v2x_loading_ani_width">100px</dimen>
<dimen name="v2x_share_btn_width">281px</dimen>
<dimen name="v2x_share_btn_height">90px</dimen>
<dimen name="v2x_index_rating_top">28px</dimen>
<dimen name="share_top_text_size">28px</dimen>
<dimen name="share_des_num_size">67.5px</dimen>
<dimen name="share_index_des_size">30px</dimen>
<dimen name="share_empty_btn_padding">40px</dimen>
<dimen name="shaer_refresh_padding">60px</dimen>
<dimen name="share_index_bottom_padding">36px</dimen>
<dimen name="share_index_bottom_padding">31px</dimen>
<dimen name="share_btn_middle_padding">54px</dimen>
<dimen name="v2x_panel_btn_translationY">-10px</dimen>
<dimen name="v2x_panel_btn_image_width">114px</dimen>
<dimen name="module_v2x_panel_tab_height">158px</dimen>
<dimen name="v2x_panel_loading_top">300px</dimen>
<dimen name="share_item_text_size">26px</dimen>
<dimen name="share_item_padding">25px</dimen>
<dimen name="module_v2x_widow_top_gaps">2px</dimen>
<!--适配 V2X 弹窗 UI-->
<dimen name="module_v2x_event_type_title_text_size">24px</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">98px</dimen>
<dimen name="module_v2x_event_button_size_detail">130px</dimen>
<!--道路事件 高的弹窗-->
<dimen name="module_v2x_event_window_height">330px</dimen>
<dimen name="module_v2x_event_window_height_ground">450px</dimen>
<dimen name="module_v2x_event_image_height">280px</dimen>
<dimen name="module_v2x_event_image_width">421px</dimen>
<!--疲劳驾驶、违章停车、道路求助-->
<dimen name="module_v2x_fatigue_driving_window_height_ground">234px</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>
<!--适配 V2X 弹窗 UI-->
</resources>