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-16 13:40:11 +08:00
parent 8744a12486 e95a14477d
commit 4da2a88fb0
25 changed files with 136 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,98 @@
<?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">5px</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">170px</dimen>
<dimen name="tanlu_module_card_video_width">234px</dimen>
<dimen name="tanlu_module_card_video_height">156px</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">13px</dimen>
<dimen name="tanlu_module_margin_left">15px</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_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>

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

@@ -25,7 +25,7 @@
<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">14px</dimen>
<dimen name="tanlu_module_card_address_margin_top">11px</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>
@@ -82,11 +82,11 @@
<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>
<dimen name="tanlu_module_card_margin_top">19px</dimen>
<dimen name="tanlu_module_card_margin_left">13px</dimen>
<dimen name="tanlu_module_margin_right">23px</dimen>
<dimen name="tanlu_module_margin_left">15px</dimen>
<dimen name="tanlu_module_margin_top">5px</dimen>
<dimen name="tanlu_module_margin_top">9px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>
<dimen name="tanlu_module_button_height">46px</dimen>

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

@@ -25,7 +25,7 @@
<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_address_margin_top">11px</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>
@@ -77,16 +77,16 @@
<!--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_card_height">306px</dimen>
<dimen name="tanlu_module_card_video_width">421px</dimen>
<dimen name="tanlu_module_card_video_height">280px</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>
<dimen name="tanlu_module_margin_right">25px</dimen>
<dimen name="tanlu_module_card_margin_top">19px</dimen>
<dimen name="tanlu_module_card_margin_left">13px</dimen>
<dimen name="tanlu_module_margin_right">23px</dimen>
<dimen name="tanlu_module_margin_left">15px</dimen>
<dimen name="tanlu_module_margin_top">10px</dimen>
<dimen name="tanlu_module_margin_top">9px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>
<dimen name="tanlu_module_button_height">46px</dimen>

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

@@ -25,7 +25,7 @@
<dimen name="tanlu_module_full_margin_width">700px</dimen>
<dimen name="tanlu_module_card_address_margin_top">10px</dimen>
<dimen name="tanlu_module_card_address_margin_top">5px</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>
@@ -82,11 +82,11 @@
<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_top">13px</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_margin_top">3px</dimen>
<dimen name="tanlu_module_mavi_height">18px</dimen>
<dimen name="tanlu_module_button_height">26px</dimen>

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_default_black_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.0 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_default_black_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_default_black_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

4
modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_light.xml
View File

@@ -4,7 +4,7 @@
<shape>
<corners android:radius="@dimen/dp_180" />
<gradient
android:angle="180"
android:angle="0"
android:endColor="#5CC1FF"
android:startColor="#256BFF" />
</shape>
@@ -13,7 +13,7 @@
<shape>
<corners android:radius="@dimen/dp_180" />
<gradient
android:angle="180"
android:angle="0"
android:endColor="#5CC1FF"
android:startColor="#256BFF" />
</shape>

6
modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
View File

@@ -25,9 +25,9 @@
android:layout_width="@dimen/module_v2x_event_image_width"
android:layout_height="@dimen/module_v2x_event_image_height"
android:scaleType="center"
app:miv_failureHolder="@drawable/icon_default_black_logo"
app:miv_overlayImageId="@drawable/icon_default_black_logo"
app:miv_placeHolder="@drawable/icon_default_black_logo" />
app:miv_failureHolder="@drawable/v2x_icon_live_logo"
app:miv_overlayImageId="@drawable/v2x_icon_live_logo"
app:miv_placeHolder="@drawable/v2x_icon_live_logo" />
<ImageView
android:id="@+id/ivEventPlay"

6
modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
View File

@@ -83,8 +83,7 @@
android:gravity="center_horizontal"
android:text="周边5公里，暂无交通事件"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/module_v2x_surrounding_top_textsize"
android:textStyle="bold" />
android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
<TextView
android:id="@+id/tv_main_empty_2"
@@ -96,8 +95,7 @@
android:gravity="center_horizontal"
android:text="你可以试着分享一个事件给其他车主"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/module_v2x_surrounding_top_textsize"
android:textStyle="bold" />
android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
<RelativeLayout
android:layout_width="match_parent"

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

@@ -24,7 +24,7 @@
android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_left"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:src="@drawable/icon_default_black_logo" />
android:src="@drawable/v2x_icon_live_logo" />
<TextView
android:id="@+id/tv_poitype"

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

@@ -13,7 +13,7 @@
<RadioGroup
android:id="@+id/rgTabSelect"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_154"
android:layout_height="@dimen/dp_125"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"

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

@@ -11,7 +11,7 @@
<TextView
android:id="@+id/share_event_guide_des"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:alpha="0.8"

6
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
View File

@@ -40,8 +40,8 @@
android:clickable="true"
android:onClick="shareEventAction"
android:text="去分享"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_34" />
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_32" />
<View
android:id="@+id/center"
@@ -57,7 +57,7 @@
android:background="@drawable/v2xt_dw_common_corner_bkg_light"
android:text="刷新"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/dp_32" />
</RelativeLayout>

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

@@ -48,7 +48,7 @@
android:background="@drawable/v2xt_dw_common_corner_bkg_light"
android:text="刷新"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_34"
android:textSize="@dimen/dp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />

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

@@ -23,7 +23,7 @@
<dimen name="module_v2x_history_event_icon_size">80px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">10px</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>

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

@@ -24,7 +24,7 @@
<dimen name="module_v2x_history_event_icon_size">80px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">10px</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>

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_default_black_logo_light.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_default_black_logo_light.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_default_black_logo_light.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

5
skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml
View File

@@ -2,9 +2,10 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="12px"/>
<gradient
android:startColor="#1F7EFF"
android:endColor="#1E57A4"
android:startColor="#B31F7EFF"
android:endColor="#B31E57A4"
android:type="linear"
android:angle="180"/>

4
skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_bkg_dark_light_same_light.xml
View File

@@ -4,8 +4,8 @@
<corners android:radius="@dimen/dp_180" />
<gradient
android:angle="135"
android:endColor="#2E324B"
android:startColor="#585E8B"
android:endColor="#DDDDDD"
android:startColor="#E6E6E6"
android:type="linear"
android:useLevel="true" />

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

@@ -10,7 +10,7 @@
<color name="v2x_white_refresh_light">#FFFFFF</color>
<color name="share_event_no_more_color_light">#333333</color>
<color name="v2x_FFF_999_light">#999999</color>
<color name="v2x_FFF_333_light">#333333</color>
<color name="v2x_FFF_333_light">#B2333333</color>
<color name="v2x_FFF_666_light">#666666</color>
<color name="v2x_555A_F5F5_light">#F5F5F5</color>
<color name="v2x_000_FFF_light">#FFFFFF</color>