diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/RoundLayout.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/RoundLayout.java index b0b4162176..5912f8c56a 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/RoundLayout.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/view/RoundLayout.java @@ -8,6 +8,8 @@ import android.graphics.RectF; import android.util.AttributeSet; import android.widget.RelativeLayout; +import androidx.annotation.DrawableRes; + import com.mogo.module.tanlu.R; import com.mogo.skin.support.IMogoSkinCompatSupportable; import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate; @@ -65,6 +67,15 @@ public class RoundLayout extends RelativeLayout implements IMogoSkinCompatSuppor postInvalidate(); } + + @Override + public void setBackgroundResource(@DrawableRes int resId) { + super.setBackgroundResource(resId); + if (mBackgroundTintHelper != null) { + mBackgroundTintHelper.onSetBackgroundResource(resId); + } + } + @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { super.onLayout(changed, l, t, r, b); diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_top_bg.9.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_top_bg.9.png new file mode 100644 index 0000000000..f5010b2c44 Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/tanlu_top_bg.9.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_top_bg.9.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_top_bg.9.png new file mode 100644 index 0000000000..f5010b2c44 Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_top_bg.9.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg.xml new file mode 100644 index 0000000000..7ef399ca1a --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml index 40d6946339..622a231939 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml @@ -2,19 +2,17 @@ - + android:layout_height="@dimen/tanlu_module_card_height"> + + android:background="@drawable/shape_tanlu_top_bg"> - - - - - - - + + + + + + + @@ -138,16 +136,16 @@ android:layout_width="@dimen/tanlu_image_size" android:layout_height="@dimen/tanlu_image_size" android:layout_marginRight="@dimen/tanlu_module_margin_left" - android:visibility="gone" - android:src="@drawable/selector_chat_btn" /> + android:src="@drawable/selector_chat_btn" + android:visibility="gone" /> + android:gravity="center"> diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml index e4c7898356..6bafcfdbbb 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_main_media_recycler_new.xml @@ -1,14 +1,16 @@ + android:background="@drawable/tanlu_top_bg"> - + android:layout_height="match_parent" + /> + \ No newline at end of file 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 index a1e06f3f9c..2daeba4505 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -77,14 +77,14 @@ 642px - 170px - 234px - 156px + 186px + 250px + 172px 45px 13px 8px - 13px + 7px 17px 3px 18px 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 a3ea0c5760..35ac4ea9c3 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 @@ -77,14 +77,14 @@ 1233px - 300px + 326px 480px - 270px + 280px 80px 19px - 13px - 23px + 12px + 12px 30px 9px 27px 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 caf019b61c..205767293e 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 @@ -77,14 +77,14 @@ 1060px - 306px + 326px 421px 280px 80px 19px - 13px - 23px + 5px + 0px 30px 9px 27px 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 caa0a414c4..2daeba4505 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -77,14 +77,14 @@ 642px - 194px - 266px - 194px + 186px + 250px + 172px 45px 13px 8px - 13px + 7px 17px 3px 18px diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000..5a9ca34e56 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000..5a9ca34e56 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000..ef5069632f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png new file mode 100644 index 0000000000..ef5069632f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index 423d2f4831..c09cc9f93d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -22,14 +22,16 @@ android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left" android:text="周围5公里,共15条交通信息" android:textColor="@color/v2x_white" + android:layout_marginBottom="2px" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> + - + diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 23c2a7b011..179a600a5d 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -39,10 +39,10 @@ 150px 48px 32px - 10px - 10px + 28px + 28px 190px - 173px + 170px 43px 26px 12px 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 deaa4519ee..93b3fe83b1 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 - 10px + 15px 550px 200px 200px @@ -36,8 +36,8 @@ 270px 86px 58px - 10px - 10px + 48px + 48px 349px 306px 77px 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 2c8f472e72..29c98cc629 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 - 10px + 15px 550px 200px 200px @@ -37,8 +37,8 @@ 270px 86px 58px - 10px - 10px + 48px + 48px 349px 306px 77px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index a6544a61fc..861e240354 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -39,10 +39,10 @@ 150px 48px 32px - 10px - 10px + 28px + 28px 190px - 173px + 170px 43px 26px 12px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_top_bg_light.9.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_top_bg_light.9.png new file mode 100644 index 0000000000..9954c018db Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_top_bg_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_top_bg_light.9.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_top_bg_light.9.png new file mode 100644 index 0000000000..9954c018db Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_top_bg_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_top_bg_light.9.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_top_bg_light.9.png new file mode 100644 index 0000000000..61d0b6c1d5 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_top_bg_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_top_bg_light.9.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_top_bg_light.9.png new file mode 100644 index 0000000000..61d0b6c1d5 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_top_bg_light.9.png differ