diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java index edba6ffed2..3cea0b5b49 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java @@ -66,7 +66,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter + + + + + \ 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 1bc521c085..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,29 +2,17 @@ - - - - - - - - - - - + android:layout_height="@dimen/tanlu_module_card_height"> + + android:background="@drawable/shape_tanlu_top_bg"> - - + android:scaleType="center" + app:miv_failureHolder="@drawable/tanlu_icon_logo" + app:miv_overlayImageId="@drawable/tanlu_icon_logo" + app:miv_placeHolder="@drawable/tanlu_icon_logo" /> - + + + + + + + + + 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/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index ff1c78b482..a552d06283 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -51,5 +51,6 @@ #50526E #5E6079 #3F4057 + #555A75 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/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java index 82f1820538..80287bf5f9 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java @@ -191,10 +191,10 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter + - + 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_icon_logo_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_icon_logo_light.png new file mode 100644 index 0000000000..0e41174692 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_icon_logo_light.png differ 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_icon_logo_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_icon_logo_light.png new file mode 100644 index 0000000000..0e41174692 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_icon_logo_light.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_icon_logo_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_icon_logo_light.png new file mode 100644 index 0000000000..755b446f02 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_icon_logo_light.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_icon_logo_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_icon_logo_light.png new file mode 100644 index 0000000000..755b446f02 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_icon_logo_light.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 diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml index 89743501de..1f6879d9dc 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml @@ -13,5 +13,6 @@ #E8E8E8 #F5F5F5 #FFFFFF + #F5F5F5 diff --git a/skin/mogo-skin-support-impl/build.gradle b/skin/mogo-skin-support-impl/build.gradle index f1c0486449..bff7a262ee 100644 --- a/skin/mogo-skin-support-impl/build.gradle +++ b/skin/mogo-skin-support-impl/build.gradle @@ -47,7 +47,7 @@ dependencies { // implementation 'skin.support:skin-support-constraint-layout:4.0.5' // skin-support-constraint-layout ConstraintLayout 控件支持[可选] implementation project(":skin:skin-support") - implementation project(":skin:skin-support-appcompat") + api project(":skin:skin-support-appcompat") implementation project(":skin:skin-support-cardview") implementation project(":skin:skin-support-constraint-layout") implementation project(":skin:skin-support-design") diff --git a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatHelperDelegate.java b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatHelperDelegate.java index 6efbd650ae..960eb384c3 100644 --- a/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatHelperDelegate.java +++ b/skin/mogo-skin-support/src/main/java/com/mogo/skin/support/helper/MogoSkinCompatHelperDelegate.java @@ -65,16 +65,16 @@ abstract class MogoSkinCompatHelperDelegate implements IMogoSkinCompatSupportabl protected static Method getLoadFromAttributesMethod() throws Exception { if ( mTargetClazz != null ) { - Method method = mTargetClazz.getDeclaredMethod( "loadFromAttributes", AttributeSet.class, int.class ); - method.setAccessible( true ); + sMethodLoadFromAttributes = mTargetClazz.getDeclaredMethod( "loadFromAttributes", AttributeSet.class, int.class ); + sMethodLoadFromAttributes.setAccessible( true ); } return null; } private static Method getApplySkinMethod() throws Exception { if ( mTargetClazz != null ) { - Method method = mTargetClazz.getDeclaredMethod( "applySkin" ); - method.setAccessible( true ); + sMethodApplySkin = mTargetClazz.getDeclaredMethod( "applySkin" ); + sMethodApplySkin.setAccessible( true ); } return null; }