diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 06daa4c10c..1d197c2e9f 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -72,6 +72,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme private View mEntrance; private FrameLayout mFloatingLayout; private FrameLayout mCoverUpLayout; + private FrameLayout mCardCoverUpBottomLayout; private View mLeftShadowFrame; private View mTopShadowFrame; @@ -208,6 +209,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mLeftShadowFrame = findViewById( R.id.module_main_id_map_left_shadow_frame ); mTopShadowFrame = findViewById( R.id.module_main_id_map_top_shadow_frame ); mCoverUpLayout = findViewById( R.id.module_main_id_cover_up ); + mCardCoverUpBottomLayout = findViewById( R.id.module_main_id_card_cover_up_bottom ); WindowViewHandler.init( mFloatingLayout ); } @@ -324,6 +326,8 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mCardsContainer.setPageTransformer( true, new VerticalStackTransformer( this ) ); mCardsContainer.setAdapter( mCardModulesAdapter ); + mCardCoverUpBottomLayout.setVisibility(View.VISIBLE); + mCardStartShowTime = System.currentTimeMillis(); } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java index 97ec68e2b7..41a50a3e6e 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java @@ -6,6 +6,7 @@ import android.view.View; import com.mogo.module.main.R; import com.mogo.utils.WindowUtils; +import com.mogo.utils.logger.Logger; public class VerticalStackTransformer extends VerticalBaseTransformer { @@ -15,7 +16,7 @@ public class VerticalStackTransformer extends VerticalBaseTransformer { public VerticalStackTransformer( Context context ) { this.context = context; - spaceBetweenFirAndSecHeight = context.getResources().getDimensionPixelSize( R.dimen.module_main_card_card_shadow_height_div ); + spaceBetweenFirAndSecHeight = 0; spaceBetweenFirAndSecWith = context.getResources().getDimensionPixelSize( R.dimen.module_main_card_card_shadow_width_div ); } @@ -34,6 +35,7 @@ public class VerticalStackTransformer extends VerticalBaseTransformer { page.setClickable( true ); } else { float scale = ( float ) ( page.getWidth() - spaceBetweenFirAndSecWith * position ) / ( float ) ( page.getWidth() ); + Logger.d("VerticalStackTransformer","scale :" + scale); //控制下面卡片的可见度 page.setAlpha( 1.0f ); //控制停止滑动切换的时候,只有最上面的一张卡片可以点击 diff --git a/modules/mogo-module-main/src/main/res/drawable/module_main_card_cover_up_bottom.png b/modules/mogo-module-main/src/main/res/drawable/module_main_card_cover_up_bottom.png new file mode 100644 index 0000000000..e90b7ffae8 Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable/module_main_card_cover_up_bottom.png differ diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 8f0fe91943..c52dced8ed 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -58,6 +58,7 @@ android:clipToPadding="false" android:overScrollMode="never" android:paddingBottom="@dimen/module_main_card_container_paddingBottom" /> + + + + diff --git a/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml index 1741bfe659..f89dff3f4e 100644 --- a/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml @@ -11,4 +11,5 @@ 20px 10px 144px + 352px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index bfcbccdc2b..cb915f082e 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -11,4 +11,5 @@ 30px 15px 270px + 660px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 6a4570d3cc..9b62f05a55 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -11,4 +11,5 @@ 30px 15px 270px + 352px \ No newline at end of file