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

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

Browse Source
This commit is contained in:
wangcongtao
2020-09-21 11:05:13 +08:00
parent aee1b67220 941668a186
commit a1e344b66e
17 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

16
modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml
View File

@@ -4,10 +4,10 @@
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
android:bottom="@dimen/tanlu_module_shade_size"
android:left="@dimen/tanlu_module_shade_size"
android:right="@dimen/tanlu_module_shade_size"
android:top="@dimen/tanlu_module_shade_size" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_30" />
</shape>
@@ -15,10 +15,10 @@
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
android:bottom="@dimen/tanlu_module_shade_size"
android:left="@dimen/tanlu_module_shade_size"
android:right="@dimen/tanlu_module_shade_size"
android:top="@dimen/tanlu_module_shade_size" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_30" />
</shape>

7
modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
View File

@@ -80,16 +80,17 @@
<dimen name="tanlu_module_card_height">186px</dimen>
<dimen name="tanlu_module_card_inner_height">176px</dimen>
<dimen name="tanlu_module_card_video_width">250px</dimen>
<dimen name="tanlu_module_card_video_height">172px</dimen>
<dimen name="tanlu_module_card_video_height">158px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
<dimen name="tanlu_module_card_margin_top">13px</dimen>
<dimen name="tanlu_module_card_margin_left">8px</dimen>
<dimen name="tanlu_module_margin_right">7px</dimen>
<dimen name="tanlu_module_card_margin_left">6px</dimen>
<dimen name="tanlu_module_margin_right">13px</dimen>
<dimen name="tanlu_module_margin_left">17px</dimen>
<dimen name="tanlu_module_margin_top">3px</dimen>
<dimen name="tanlu_module_mavi_height">18px</dimen>
<dimen name="tanlu_module_button_height">26px</dimen>
<dimen name="tanlu_module_shade_size">4px</dimen>
<dimen name="tanlu_head_image_size">28px</dimen>
<dimen name="tanlu_image_size">56px</dimen>

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

@@ -90,6 +90,7 @@
<dimen name="tanlu_module_margin_top">9px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>
<dimen name="tanlu_module_button_height">46px</dimen>
<dimen name="tanlu_module_shade_size">4px</dimen>
<dimen name="tanlu_head_image_size">50px</dimen>
<dimen name="tanlu_image_size">90px</dimen>

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

@@ -90,6 +90,7 @@
<dimen name="tanlu_module_margin_top">9px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>
<dimen name="tanlu_module_button_height">46px</dimen>
<dimen name="tanlu_module_shade_size">4px</dimen>
<dimen name="tanlu_head_image_size">50px</dimen>
<dimen name="tanlu_image_size">98px</dimen>

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

@@ -80,16 +80,17 @@
<dimen name="tanlu_module_card_height">186px</dimen>
<dimen name="tanlu_module_card_inner_height">176px</dimen>
<dimen name="tanlu_module_card_video_width">250px</dimen>
<dimen name="tanlu_module_card_video_height">172px</dimen>
<dimen name="tanlu_module_card_video_height">158px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
<dimen name="tanlu_module_card_margin_top">13px</dimen>
<dimen name="tanlu_module_card_margin_left">8px</dimen>
<dimen name="tanlu_module_margin_right">7px</dimen>
<dimen name="tanlu_module_card_margin_left">6px</dimen>
<dimen name="tanlu_module_margin_right">13px</dimen>
<dimen name="tanlu_module_margin_left">17px</dimen>
<dimen name="tanlu_module_margin_top">3px</dimen>
<dimen name="tanlu_module_mavi_height">18px</dimen>
<dimen name="tanlu_module_button_height">26px</dimen>
<dimen name="tanlu_module_shade_size">4px</dimen>
<dimen name="tanlu_head_image_size">28px</dimen>
<dimen name="tanlu_image_size">56px</dimen>

4
modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml
View File

@@ -12,7 +12,7 @@
android:id="@+id/viewLinStart"
android:layout_width="wrap_content"
android:layout_height="1px"
android:background="#979797"
android:background="@color/share_event_no_more_color"
app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip"
app:layout_constraintEnd_toStartOf="@+id/tvNoMoreDataTrip"
app:layout_constraintStart_toStartOf="parent"
@@ -35,7 +35,7 @@
android:id="@+id/viewLinEnd"
android:layout_width="wrap_content"
android:layout_height="1px"
android:background="#979797"
android:background="@color/share_event_no_more_color"
app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/tvNoMoreDataTrip"

BIN
skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_head_image_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

16
skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml
View File

@@ -4,10 +4,10 @@
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
android:bottom="@dimen/tanlu_module_shade_size_l"
android:left="@dimen/tanlu_module_shade_size_l"
android:right="@dimen/tanlu_module_shade_size_l"
android:top="@dimen/tanlu_module_shade_size_l" />
<solid android:color="#0DCCCCCC" />
<corners android:radius="@dimen/dp_30" />
</shape>
@@ -15,10 +15,10 @@
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
android:bottom="@dimen/tanlu_module_shade_size_l"
android:left="@dimen/tanlu_module_shade_size_l"
android:right="@dimen/tanlu_module_shade_size_l"
android:top="@dimen/tanlu_module_shade_size_l" />
<solid android:color="#26CCCCCC" />
<corners android:radius="@dimen/dp_30" />
</shape>

8
skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="tanlu_normal_image_radius_size">16px</dimen>
<dimen name="tanlu_dialog_radius_l">10px</dimen>
<dimen name="tanlu_dialog_neterror_radius_l">8px</dimen>
<dimen name="tanlu_module_shade_size_l">4px</dimen>
</resources>

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

@@ -3,6 +3,7 @@
<dimen name="tanlu_normal_image_radius_size">30px</dimen>
<dimen name="tanlu_dialog_radius_l">20px</dimen>
<dimen name="tanlu_dialog_neterror_radius_l">16px</dimen>
<dimen name="tanlu_module_shade_size_l">4px</dimen>
</resources>

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

@@ -4,6 +4,7 @@
<dimen name="tanlu_normal_image_radius_size">30px</dimen>
<dimen name="tanlu_dialog_radius_l">20px</dimen>
<dimen name="tanlu_dialog_neterror_radius_l">16px</dimen>
<dimen name="tanlu_module_shade_size_l">4px</dimen>
</resources>

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

@@ -3,5 +3,6 @@
<dimen name="tanlu_normal_image_radius_size">16px</dimen>
<dimen name="tanlu_dialog_radius_l">10px</dimen>
<dimen name="tanlu_dialog_neterror_radius_l">8px</dimen>
<dimen name="tanlu_module_shade_size_l">4px</dimen>
</resources>

2
skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
View File

@@ -8,7 +8,7 @@
<color name="v2x_white_light">#333333</color>
<color name="v2x_item_white_light">#FFFFFF</color>
<color name="v2x_white_refresh_light">#FFFFFF</color>
<color name="share_event_no_more_color_light">#CB333333</color>
<color name="share_event_no_more_color_light">#80333333</color>
<color name="v2x_FFF_999_light">#999999</color>
<color name="v2x_FFF_333_light">#B2333333</color>
<color name="v2x_FFF_666_light">#666666</color>