Merge branch 'feature/v1.0.2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.2

This commit is contained in:
wangcongtao
2020-03-12 14:54:25 +08:00
51 changed files with 2582 additions and 105 deletions

View File

@@ -69,7 +69,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
private IMogoStatusManager mMogoStatusManager;
private OrientedViewPager mCardsContainer;
private VerticalStackTransformer mTransformer;
//private VerticalStackTransformer mTransformer;
private CardModulesAdapter mCardModulesAdapter;
private View mHeader;
@@ -100,8 +100,8 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
protected void initViews() {
mCardsContainer = findViewById( R.id.module_main_id_cards_container );
mCardsContainer.setOrientation( OrientedViewPager.Orientation.VERTICAL );
mTransformer = new VerticalStackTransformer( this );
mCardsContainer.setOrientation( OrientedViewPager.Orientation.HORIZONTAL );
//mTransformer = new VerticalStackTransformer( this );
mCardsContainer.setOnPageChangeListener( mOnPageChangeListener = new OnPageChangeListenerAdapter() {
private boolean mIsLast = true;
private boolean mCardFlipStatus = false;
@@ -134,7 +134,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
}
} else if ( state == ViewPager.SCROLL_STATE_IDLE ) {
mCardFlipStatus = false;
mTransformer.resetOffsetScroll();
//mTransformer.resetOffsetScroll();
}
int cardSize = mCardModulesAdapter.getCount();
@@ -159,7 +159,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
int positionOffsetPixels ) {
super.onPageScrolled( position, positionOffset, positionOffsetPixels );
Logger.d( TAG, "pageScrolled : offset --- " + positionOffset );
mTransformer.offsetScrollChanged( positionOffset );
//mTransformer.offsetScrollChanged( positionOffset );
}
} );
@@ -299,7 +299,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
List< IMogoModuleProvider > providers = mMogoModuleHandler.loadCardsModule();
mCardModulesAdapter = new CardModulesAdapter( this, providers );
mCardsContainer.setOffscreenPageLimit( providers.size() );
mCardsContainer.setPageTransformer( true, mTransformer );
//mCardsContainer.setPageTransformer( true, mTransformer );
mCardsContainer.setAdapter( mCardModulesAdapter );
mCardCoverUpBottomLayout.setVisibility( View.VISIBLE );

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View File

@@ -37,14 +37,18 @@
android:layout_marginLeft="@dimen/module_main_card_container_marginLeft"
android:layout_marginTop="@dimen/module_main_card_container_marginTop">
<ImageView
android:layout_width="match_parent"
android:src="@drawable/module_apps_bg_card"
android:layout_height="@dimen/dp_797"/>
<com.mogo.module.main.cards.OrientedViewPager
android:id="@+id/module_main_id_cards_container"
android:layout_width="match_parent"
android:layout_height="@dimen/module_main_card_container_height"
android:layout_marginBottom="@dimen/module_main_card_container_marginBottom"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_30"
android:layout_height="@dimen/dp_600"
android:clipToPadding="false"
android:overScrollMode="never"
android:paddingBottom="@dimen/module_main_card_container_paddingBottom" />
android:overScrollMode="never" />
<!-- 应用入口-->
<FrameLayout
@@ -57,12 +61,12 @@
<FrameLayout
android:id="@+id/module_main_id_card_cover_up_bottom"
android:layout_width="match_parent"
android:layout_height="20px"
android:layout_marginLeft="15px"
android:layout_marginTop="@dimen/module_main_card_cover_up_margin"
android:layout_marginRight="15px"
android:layout_height="@dimen/dp_26"
android:layout_marginTop="@dimen/dp_600"
android:layout_marginLeft="@dimen/dp_64"
android:layout_marginRight="@dimen/dp_64"
android:background="@drawable/module_main_card_cover_up_bottom"
android:visibility="gone" />
/>
</FrameLayout>