diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml new file mode 100644 index 0000000000..de34df6c83 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -0,0 +1,98 @@ + + + + 52px + 52px + 48px + 48px + 72px + 5px + + 56px + 56px + 96px + 96px + 90px + 700px + 10px + + 72px + 25px + 25px + 16px + 48px + 22px + 700px + + + 5px + 15px + 2px + 19px + 136px + 44px + 2px + 109px + 10px + 23px + 30px + 28px + 16px + 22px + 26px + + + 6px + + 400px + 150px + 80px + 32px + + 260px + 44px + + + 18px + 14px + 15px + 13px + 16px + + + 418px + 278px + 69px + 22px + 36px + 18px + 32px + + 20px + 56px + 23px + + 10px + 8px + + + 642px + 170px + 234px + 156px + 45px + + 13px + 8px + 13px + 15px + 3px + 18px + 26px + + 28px + 56px + 3px + 16px + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml index f67c962818..d93494cf3a 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -25,7 +25,7 @@ 40px 800px - 14px + 11px 28px 4px 32px @@ -82,11 +82,11 @@ 270px 80px - 20px - 15px - 25px + 19px + 13px + 23px 15px - 5px + 9px 27px 46px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index bfd073df5f..a0c1f15833 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -25,7 +25,7 @@ 40px 800px - 30px + 11px 28px 4px 32px @@ -77,16 +77,16 @@ 1060px - 350px - 480px - 320px + 306px + 421px + 280px 80px - 23px - 15px - 25px + 19px + 13px + 23px 15px - 10px + 9px 27px 46px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index a39e44cd6d..b616be35ca 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -25,7 +25,7 @@ 700px - 10px + 5px 15px 2px 19px @@ -82,11 +82,11 @@ 194px 45px - 16px + 13px 8px 13px 15px - 10px + 3px 18px 26px diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_default_black_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_default_black_logo.png deleted file mode 100644 index 5480b6d165..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_default_black_logo.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_default_black_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_default_black_logo.png deleted file mode 100644 index e02a57044f..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_default_black_logo.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_default_black_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_default_black_logo.png deleted file mode 100644 index e02a57044f..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_default_black_logo.png and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_light.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_light.xml index 1c9c0b5e05..bf62b5cdbd 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_light.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_light.xml @@ -4,7 +4,7 @@ @@ -13,7 +13,7 @@ diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index d35880bce4..7a75859e33 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -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" /> + android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> + android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> + android:src="@drawable/v2x_icon_live_logo" /> + android:textColor="@color/v2x_FFF_333" + android:textSize="@dimen/dp_32" /> + android:textSize="@dimen/dp_32" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml index 209dc2072e..12dc8dd6aa 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml @@ -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" /> diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index a32a64e53a..3d3e928c43 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -23,7 +23,7 @@ 80px - 6px + 10px 550px 200px 200px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index c068621299..780529c46a 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -24,7 +24,7 @@ 80px - 6px + 10px 550px 200px 200px diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_default_black_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_default_black_logo_light.png deleted file mode 100644 index c20fc46314..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_default_black_logo_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_default_black_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_default_black_logo_light.png deleted file mode 100644 index c20fc46314..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_default_black_logo_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_icon_live_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_icon_live_logo_light.png new file mode 100644 index 0000000000..0e41174692 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_icon_live_logo_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_default_black_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_default_black_logo_light.png deleted file mode 100644 index cfbbe87d04..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_default_black_logo_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_icon_live_logo_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_icon_live_logo_light.png new file mode 100644 index 0000000000..755b446f02 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_icon_live_logo_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml index 95faf8680b..b41bb1f336 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml @@ -2,9 +2,10 @@ + diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_bkg_dark_light_same_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_bkg_dark_light_same_light.xml index df4fdef366..1526114fdf 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_bkg_dark_light_same_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_bkg_dark_light_same_light.xml @@ -4,8 +4,8 @@ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index 3e51d334d1..b05b80f6bd 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -10,7 +10,7 @@ #FFFFFF #333333 #999999 - #333333 + #B2333333 #666666 #F5F5F5 #FFFFFF