yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

Browse Source
This commit is contained in:
zhangyuanzhen
2020-02-03 17:30:35 +08:00
parent 933f93e4de 08645d8d55
commit 7cfd34e22c
6 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -290,9 +290,11 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
public void switch2( String cardType ) {
if ( mCardModulesAdapter != null ) {
int position = mCardModulesAdapter.getProviderPosition( cardType );
if ( position != -1 ) {
mCardsContainer.setCurrentItem( position, Math.abs( mCurrentPosition - position ) == 1 );
int lastFactPosition = mCardModulesAdapter.getFactPosition( mCurrentPosition );
mCardsContainer.setCurrentItem( mCurrentPosition + position - lastFactPosition, Math.abs( lastFactPosition - position ) == 1 );
if ( !isClickMarker ) {
mMogoCardManager.invoke( position, mMogoModuleHandler.getCurrentModuleName() );
}

4
modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/CardModulesAdapter.java
View File

@@ -47,8 +47,8 @@ public class CardModulesAdapter extends FragmentStatePagerAdapter {
@Override
public int getCount() {
return mProviders.size();
// return Integer.MAX_VALUE;
// return mProviders.size();
return Integer.MAX_VALUE;
}
public IMogoModuleProvider getProvider( int position ) {