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

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

Browse Source
This commit is contained in:
董宏宇
2020-09-09 15:37:45 +08:00
parent f06ee9b03e 6e6bc8a232
commit 5da27f1d03
6 changed files with 4 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
View File

@@ -485,7 +485,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
typeName = "实时路况";
break;
default:
typeName = "道路拥堵";
typeName = "实时路况";
break;
}
return typeName;

3
modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -80,7 +80,8 @@
<dimen name="tanlu_module_card_height">300px</dimen>
<dimen name="tanlu_module_card_video_width">480px</dimen>
<dimen name="tanlu_module_card_video_height">270px</dimen>
<dimen name="tanlu_module_close_height">80px</dimen>
<dimen name="tanlu_module_card_margin_top">20px</dimen>
<dimen name="tanlu_module_card_margin_left">15px</dimen>
<dimen name="tanlu_module_margin_right">25px</dimen>

2
modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
View File

@@ -80,7 +80,7 @@
<dimen name="tanlu_module_card_height">350px</dimen>
<dimen name="tanlu_module_card_video_width">480px</dimen>
<dimen name="tanlu_module_card_video_height">320px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
<dimen name="tanlu_module_close_height">80px</dimen>
<dimen name="tanlu_module_card_margin_top">23px</dimen>
<dimen name="tanlu_module_card_margin_left">15px</dimen>

93
skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -1,98 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--bottom top -->
<dimen name="tanlu_module_start_width">98px</dimen>
<dimen name="tanlu_module_start_height">98px</dimen>
<dimen name="tanlu_module_loading_width">48px</dimen>
<dimen name="tanlu_module_loading_height">48px</dimen>
<dimen name="tanlu_module_bottom_height">72px</dimen>
<dimen name="tanlu_module_bottom_margin">5px</dimen>
<dimen name="tanlu_module_full_start_width">106px</dimen>
<dimen name="tanlu_module_full_start_height">106px</dimen>
<dimen name="tanlu_module_full_loading_width">96px</dimen>
<dimen name="tanlu_module_full_loading_height">96px</dimen>
<dimen name="tanlu_module_full_bottom_height">100px</dimen>
<dimen name="tanlu_module_full_bottom_width">700px</dimen>
<dimen name="tanlu_module_full_bottom_margin">12px</dimen>
<dimen name="tanlu_module_full_top_height">135px</dimen>
<dimen name="tanlu_module_full_back_width">50px</dimen>
<dimen name="tanlu_module_full_back_height">50px</dimen>
<dimen name="tanlu_module_full_margin_left">30px</dimen>
<dimen name="tanlu_module_full_margin_right">92px</dimen>
<dimen name="tanlu_module_full_margin_top">40px</dimen>
<dimen name="tanlu_module_full_margin_width">800px</dimen>
<dimen name="tanlu_module_card_address_margin_top">30px</dimen>
<dimen name="tanlu_module_card_distance_margin_bottom">28px</dimen>
<dimen name="tanlu_module_card_distance_margin_top">4px</dimen>
<dimen name="tanlu_module_card_video_marginbottom">32px</dimen>
<dimen name="tanlu_module_card_previous_width">255px</dimen>
<dimen name="tanlu_module_card_previous_height">82px</dimen>
<dimen name="tanlu_module_card_empty_magintop">2px</dimen>
<dimen name="tanlu_module_card_empty_maginleft">205px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">20px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop_2">40px</dimen>
<dimen name="tanlu_module_card_previous_margin_left">60px</dimen>
<dimen name="tanlu_module_card_next_margin_left">50px</dimen>
<dimen name="tanlu_module_logo_margin_left">32px</dimen>
<dimen name="tanlu_module_radius">40px</dimen>
<dimen name="tanlu_module_upload_radius">50px</dimen>
<!--播放器高度-->
<dimen name="tanlu_module_small_player_height">10px</dimen>
<dimen name="tanlu_module_map_left">750px</dimen>
<dimen name="tanlu_module_map_top">270px</dimen>
<dimen name="tanlu_module_map_right">120px</dimen>
<dimen name="tanlu_module_map_bottom">60px</dimen>
<dimen name="tanlu_module_upload_width">488px</dimen>
<dimen name="tanlu_module_map_bottom_height">82px</dimen>
<!--字体-->
<dimen name="tanlu_module_full_title_content">34px</dimen>
<dimen name="tanlu_module_full_title_time">24px</dimen>
<dimen name="tanlu_module_card_address_size">28px</dimen>
<dimen name="tanlu_module_card_distance_size">26px</dimen>
<dimen name="tanlu_module_card_next_size">30px</dimen>
<!--dialog-->
<dimen name="tanlu_dialog_width">790px</dimen>
<dimen name="tanlu_dialog_height">524px</dimen>
<dimen name="tanlu_dialog_button_height">130px</dimen>
<dimen name="tanlu_dialog_content_size">40px</dimen>
<dimen name="tanlu_dialog_margin_top">66px</dimen>
<dimen name="tanlu_dialog_first_margin_top">36px</dimen>
<dimen name="tanlu_dialog_margin_button_top">59px</dimen>
<dimen name="tanlu_dialog_neterror_button_top">44px</dimen>
<dimen name="tanlu_dialog_neterror_button_height">105px</dimen>
<dimen name="tanlu_dialog_neterror_margin_left">44px</dimen>
<dimen name="tanlu_dialog_radius">20px</dimen>
<dimen name="tanlu_dialog_neterror_radius">16px</dimen>
<!--new-->
<dimen name="tanlu_module_card_width">1060px</dimen>
<dimen name="tanlu_module_card_height">350px</dimen>
<dimen name="tanlu_module_card_video_width">480px</dimen>
<dimen name="tanlu_module_card_video_height">320px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
<dimen name="tanlu_module_card_margin_top">23px</dimen>
<dimen name="tanlu_module_card_margin_left">15px</dimen>
<dimen name="tanlu_module_margin_right">25px</dimen>
<dimen name="tanlu_module_margin_left">15px</dimen>
<dimen name="tanlu_module_margin_top">10px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>
<dimen name="tanlu_module_button_height">46px</dimen>
<dimen name="tanlu_head_image_size">50px</dimen>
<dimen name="tanlu_image_size">98px</dimen>
<dimen name="tanlu_button_radius_size">6px</dimen>
<dimen name="tanlu_normal_image_radius_size">30px</dimen>
</resources>

92
skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml
View File

@@ -1,98 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--bottom top -->
<dimen name="tanlu_module_start_width">98px</dimen>
<dimen name="tanlu_module_start_height">98px</dimen>
<dimen name="tanlu_module_loading_width">48px</dimen>
<dimen name="tanlu_module_loading_height">48px</dimen>
<dimen name="tanlu_module_bottom_height">72px</dimen>
<dimen name="tanlu_module_bottom_margin">5px</dimen>
<dimen name="tanlu_module_full_start_width">106px</dimen>
<dimen name="tanlu_module_full_start_height">106px</dimen>
<dimen name="tanlu_module_full_loading_width">96px</dimen>
<dimen name="tanlu_module_full_loading_height">96px</dimen>
<dimen name="tanlu_module_full_bottom_height">100px</dimen>
<dimen name="tanlu_module_full_bottom_width">700px</dimen>
<dimen name="tanlu_module_full_bottom_margin">12px</dimen>
<dimen name="tanlu_module_full_top_height">135px</dimen>
<dimen name="tanlu_module_full_back_width">50px</dimen>
<dimen name="tanlu_module_full_back_height">50px</dimen>
<dimen name="tanlu_module_full_margin_left">30px</dimen>
<dimen name="tanlu_module_full_margin_right">92px</dimen>
<dimen name="tanlu_module_full_margin_top">40px</dimen>
<dimen name="tanlu_module_full_margin_width">800px</dimen>
<dimen name="tanlu_module_card_address_margin_top">30px</dimen>
<dimen name="tanlu_module_card_distance_margin_bottom">28px</dimen>
<dimen name="tanlu_module_card_distance_margin_top">4px</dimen>
<dimen name="tanlu_module_card_video_marginbottom">32px</dimen>
<dimen name="tanlu_module_card_previous_width">255px</dimen>
<dimen name="tanlu_module_card_previous_height">82px</dimen>
<dimen name="tanlu_module_card_empty_magintop">2px</dimen>
<dimen name="tanlu_module_card_empty_maginleft">205px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">20px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop_2">40px</dimen>
<dimen name="tanlu_module_card_previous_margin_left">60px</dimen>
<dimen name="tanlu_module_card_next_margin_left">50px</dimen>
<dimen name="tanlu_module_logo_margin_left">32px</dimen>
<dimen name="tanlu_module_radius">40px</dimen>
<dimen name="tanlu_module_upload_radius">50px</dimen>
<!--播放器高度-->
<dimen name="tanlu_module_small_player_height">10px</dimen>
<dimen name="tanlu_module_map_left">750px</dimen>
<dimen name="tanlu_module_map_top">270px</dimen>
<dimen name="tanlu_module_map_right">120px</dimen>
<dimen name="tanlu_module_map_bottom">60px</dimen>
<dimen name="tanlu_module_upload_width">488px</dimen>
<dimen name="tanlu_module_map_bottom_height">82px</dimen>
<!--字体-->
<dimen name="tanlu_module_full_title_content">34px</dimen>
<dimen name="tanlu_module_full_title_time">24px</dimen>
<dimen name="tanlu_module_card_address_size">28px</dimen>
<dimen name="tanlu_module_card_distance_size">26px</dimen>
<dimen name="tanlu_module_card_next_size">30px</dimen>
<!--dialog-->
<dimen name="tanlu_dialog_width">790px</dimen>
<dimen name="tanlu_dialog_height">524px</dimen>
<dimen name="tanlu_dialog_button_height">130px</dimen>
<dimen name="tanlu_dialog_content_size">40px</dimen>
<dimen name="tanlu_dialog_margin_top">66px</dimen>
<dimen name="tanlu_dialog_first_margin_top">36px</dimen>
<dimen name="tanlu_dialog_margin_button_top">59px</dimen>
<dimen name="tanlu_dialog_neterror_button_top">44px</dimen>
<dimen name="tanlu_dialog_neterror_button_height">105px</dimen>
<dimen name="tanlu_dialog_neterror_margin_left">44px</dimen>
<dimen name="tanlu_dialog_radius">20px</dimen>
<dimen name="tanlu_dialog_neterror_radius">16px</dimen>
<!--new-->
<dimen name="tanlu_module_card_width">1060px</dimen>
<dimen name="tanlu_module_card_height">350px</dimen>
<dimen name="tanlu_module_card_video_width">480px</dimen>
<dimen name="tanlu_module_card_video_height">320px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
<dimen name="tanlu_module_card_margin_top">23px</dimen>
<dimen name="tanlu_module_card_margin_left">15px</dimen>
<dimen name="tanlu_module_margin_right">25px</dimen>
<dimen name="tanlu_module_margin_left">15px</dimen>
<dimen name="tanlu_module_margin_top">10px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>
<dimen name="tanlu_module_button_height">46px</dimen>
<dimen name="tanlu_head_image_size">50px</dimen>
<dimen name="tanlu_image_size">98px</dimen>
<dimen name="tanlu_button_radius_size">6px</dimen>
<dimen name="tanlu_normal_image_radius_size">30px</dimen>
</resources>

93
skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml
View File

@@ -1,98 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--bottom top -->
<dimen name="tanlu_module_start_width">52px</dimen>
<dimen name="tanlu_module_start_height">52px</dimen>
<dimen name="tanlu_module_loading_width">48px</dimen>
<dimen name="tanlu_module_loading_height">48px</dimen>
<dimen name="tanlu_module_bottom_height">72px</dimen>
<dimen name="tanlu_module_bottom_margin">5px</dimen>
<dimen name="tanlu_module_full_start_width">56px</dimen>
<dimen name="tanlu_module_full_start_height">56px</dimen>
<dimen name="tanlu_module_full_loading_width">96px</dimen>
<dimen name="tanlu_module_full_loading_height">96px</dimen>
<dimen name="tanlu_module_full_bottom_height">90px</dimen>
<dimen name="tanlu_module_full_bottom_width">700px</dimen>
<dimen name="tanlu_module_full_bottom_margin">10px</dimen>
<dimen name="tanlu_module_full_top_height">72px</dimen>
<dimen name="tanlu_module_full_back_width">25px</dimen>
<dimen name="tanlu_module_full_back_height">25px</dimen>
<dimen name="tanlu_module_full_margin_left">16px</dimen>
<dimen name="tanlu_module_full_margin_right">48px</dimen>
<dimen name="tanlu_module_full_margin_top">22px</dimen>
<dimen name="tanlu_module_full_margin_width">700px</dimen>
<dimen name="tanlu_module_card_address_margin_top">10px</dimen>
<dimen name="tanlu_module_card_distance_margin_bottom">15px</dimen>
<dimen name="tanlu_module_card_distance_margin_top">2px</dimen>
<dimen name="tanlu_module_card_video_marginbottom">19px</dimen>
<dimen name="tanlu_module_card_previous_width">136px</dimen>
<dimen name="tanlu_module_card_previous_height">44px</dimen>
<dimen name="tanlu_module_card_empty_magintop">2px</dimen>
<dimen name="tanlu_module_card_empty_maginleft">109px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">10px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop_2">23px</dimen>
<dimen name="tanlu_module_card_previous_margin_left">30px</dimen>
<dimen name="tanlu_module_card_next_margin_left">28px</dimen>
<dimen name="tanlu_module_logo_margin_left">16px</dimen>
<dimen name="tanlu_module_radius">22px</dimen>
<dimen name="tanlu_module_upload_radius">26px</dimen>
<!--播放器高度-->
<dimen name="tanlu_module_small_player_height">6px</dimen>
<dimen name="tanlu_module_map_left">400px</dimen>
<dimen name="tanlu_module_map_top">150px</dimen>
<dimen name="tanlu_module_map_right">80px</dimen>
<dimen name="tanlu_module_map_bottom">32px</dimen>
<dimen name="tanlu_module_upload_width">260px</dimen>
<dimen name="tanlu_module_map_bottom_height">44px</dimen>
<!--字体-->
<dimen name="tanlu_module_full_title_content">18px</dimen>
<dimen name="tanlu_module_full_title_time">14px</dimen>
<dimen name="tanlu_module_card_address_size">15px</dimen>
<dimen name="tanlu_module_card_distance_size">13px</dimen>
<dimen name="tanlu_module_card_next_size">16px</dimen>
<!--dialog-->
<dimen name="tanlu_dialog_width">418px</dimen>
<dimen name="tanlu_dialog_height">278px</dimen>
<dimen name="tanlu_dialog_button_height">69px</dimen>
<dimen name="tanlu_dialog_content_size">22px</dimen>
<dimen name="tanlu_dialog_margin_top">36px</dimen>
<dimen name="tanlu_dialog_first_margin_top">18px</dimen>
<dimen name="tanlu_dialog_margin_button_top">32px</dimen>
<dimen name="tanlu_dialog_neterror_button_top">20px</dimen>
<dimen name="tanlu_dialog_neterror_button_height">56px</dimen>
<dimen name="tanlu_dialog_neterror_margin_left">23px</dimen>
<dimen name="tanlu_dialog_radius">10px</dimen>
<dimen name="tanlu_dialog_neterror_radius">8px</dimen>
<!--new-->
<dimen name="tanlu_module_card_width">642px</dimen>
<dimen name="tanlu_module_card_height">194px</dimen>
<dimen name="tanlu_module_card_video_width">266px</dimen>
<dimen name="tanlu_module_card_video_height">194px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
<dimen name="tanlu_module_card_margin_top">16px</dimen>
<dimen name="tanlu_module_card_margin_left">8px</dimen>
<dimen name="tanlu_module_margin_right">13px</dimen>
<dimen name="tanlu_module_margin_left">15px</dimen>
<dimen name="tanlu_module_margin_top">10px</dimen>
<dimen name="tanlu_module_mavi_height">18px</dimen>
<dimen name="tanlu_module_button_height">26px</dimen>
<dimen name="tanlu_head_image_size">28px</dimen>
<dimen name="tanlu_image_size">56px</dimen>
<dimen name="tanlu_button_radius_size">3px</dimen>
<dimen name="tanlu_normal_image_radius_size">16px</dimen>
</resources>