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

Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0

Browse Source
This commit is contained in:
wangcongtao
2020-01-17 14:13:16 +08:00
parent 8f60a876dc 3abcb82e68
commit e5b0bd0df8
4 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml
View File

@@ -37,12 +37,12 @@
<TextView
android:id="@+id/tv_media_title_content"
android:layout_width="@dimen/dp_660"
android:layout_width="@dimen/tanlu_module_full_margin_width"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/tanlu_module_full_margin_top"
android:ellipsize="end"
android:gravity="center"
android:maxWidth="@dimen/dp_560"
android:maxWidth="700px"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="@dimen/tanlu_module_full_title_content"

3
modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml
View File

@@ -135,6 +135,8 @@
android:id="@+id/iv_main_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/tanlu_module_card_empty_maginleft"
android:layout_marginRight="@dimen/tanlu_module_card_empty_maginleft"
android:layout_marginTop="@dimen/tanlu_module_card_empty_magintop"
android:src="@mipmap/main_view_empty_bg" />
@@ -143,6 +145,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_main_empty"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/tanlu_module_card_empty_tv_magintop"
android:text="@string/main_empty_content"
android:textColor="@color/white"

56
modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml
View File

@@ -1,45 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--bottom top -->
<dimen name="tanlu_module_start_width">60px</dimen>
<dimen name="tanlu_module_start_height">60px</dimen>
<dimen name="tanlu_module_start_width">56px</dimen>
<dimen name="tanlu_module_start_height">56px</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">120px</dimen>
<dimen name="tanlu_module_full_start_height">120px</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">144px</dimen>
<dimen name="tanlu_module_full_bottom_width">760px</dimen>
<dimen name="tanlu_module_full_bottom_margin">10px</dimen>
<dimen name="tanlu_module_full_top_height">135px</dimen>
<dimen name="tanlu_module_full_back_width">60px</dimen>
<dimen name="tanlu_module_full_back_height">60px</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_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_width">660px</dimen>
<dimen name="tanlu_module_card_margin_left">24px</dimen>
<dimen name="tanlu_module_card_address_margin_top">58px</dimen>
<dimen name="tanlu_module_card_distance_margin_bottom">8px</dimen>
<dimen name="tanlu_module_card_distance_margin_top">2px</dimen>
<dimen name="tanlu_module_card_video_width">613px</dimen>
<dimen name="tanlu_module_card_video_height">355px</dimen>
<dimen name="tanlu_module_card_video_marginbottom">20px</dimen>
<dimen name="tanlu_module_card_previous_width">300px</dimen>
<dimen name="tanlu_module_card_previous_height">90px</dimen>
<dimen name="tanlu_module_card_empty_magintop">122px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">70px</dimen>
<dimen name="tanlu_module_card_width">352px</dimen>
<dimen name="tanlu_module_card_margin_left">12px</dimen>
<dimen name="tanlu_module_card_address_margin_top">32px</dimen>
<dimen name="tanlu_module_card_distance_margin_bottom">4px</dimen>
<dimen name="tanlu_module_card_distance_margin_top">1px</dimen>
<dimen name="tanlu_module_card_video_width">327px</dimen>
<dimen name="tanlu_module_card_video_height">189px</dimen>
<dimen name="tanlu_module_card_video_marginbottom">10px</dimen>
<dimen name="tanlu_module_card_previous_width">160px</dimen>
<dimen name="tanlu_module_card_previous_height">48px</dimen>
<dimen name="tanlu_module_card_empty_magintop">65px</dimen>
<dimen name="tanlu_module_card_empty_maginleft">109px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">28px</dimen>
<!--字体-->
<dimen name="tanlu_module_full_title_content">38px</dimen>
<dimen name="tanlu_module_full_title_time">26px</dimen>
<dimen name="tanlu_module_card_address_size">34px</dimen>
<dimen name="tanlu_module_card_distance_size">26px</dimen>
<dimen name="tanlu_module_card_next_size">28px</dimen>
<dimen name="tanlu_module_full_title_content">20px</dimen>
<dimen name="tanlu_module_full_title_time">14px</dimen>
<dimen name="tanlu_module_card_address_size">18px</dimen>
<dimen name="tanlu_module_card_distance_size">14px</dimen>
<dimen name="tanlu_module_card_next_size">15px</dimen>
</resources>

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

@@ -2,15 +2,15 @@
<resources>
<!--bottom top -->
<dimen name="tanlu_module_start_width">60px</dimen>
<dimen name="tanlu_module_start_height">60px</dimen>
<dimen name="tanlu_module_start_width">106px</dimen>
<dimen name="tanlu_module_start_height">106px</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">120px</dimen>
<dimen name="tanlu_module_full_start_height">120px</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">144px</dimen>
@@ -18,11 +18,12 @@
<dimen name="tanlu_module_full_bottom_margin">10px</dimen>
<dimen name="tanlu_module_full_top_height">135px</dimen>
<dimen name="tanlu_module_full_back_width">60px</dimen>
<dimen name="tanlu_module_full_back_height">60px</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_width">660px</dimen>
<dimen name="tanlu_module_card_margin_left">24px</dimen>
@@ -34,8 +35,9 @@
<dimen name="tanlu_module_card_video_marginbottom">20px</dimen>
<dimen name="tanlu_module_card_previous_width">300px</dimen>
<dimen name="tanlu_module_card_previous_height">90px</dimen>
<dimen name="tanlu_module_card_empty_magintop">122px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">70px</dimen>
<dimen name="tanlu_module_card_empty_magintop">75px</dimen>
<dimen name="tanlu_module_card_empty_maginleft">205px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">25px</dimen>
<!--字体-->
<dimen name="tanlu_module_full_title_content">38px</dimen>