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

2
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -34,7 +34,7 @@ public class MogoApplication extends AbsMogoApplication {
// MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) );
DebugConfig.setNetMode(BuildConfig.NET_ENV);
//运营位卡片，需要默认显示，放在第一个加载
MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME));
// MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME));
MogoModulePaths.addModule(new MogoModule(OnLineCarConstants.TAG, OnLineCarConstants.MODULE_NAME));
MogoModulePaths.addModule(new MogoModule(TanluConstants.TAG, TanluConstants.MODEL_NAME));
MogoModulePaths.addModule(new MogoModule(CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME));

5
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
View File

@@ -201,6 +201,11 @@ public class NaviClient implements IMogoNavi {
return mAMapNavi.setBroadcastMode( mode );
}
@Override
public List< MogoLatLng > getNaviPathCoordinates() {
return null;
}
// -- end
private boolean checkAMapNavi() {

8
libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java
View File

@@ -63,8 +63,7 @@ public interface IMogoNavi {
*
* @param isRealNavi true - 实时导航 false - 模拟导航
*/
void
startNavi( boolean isRealNavi );
void startNavi( boolean isRealNavi );
/**
* 是否正在导航
@@ -118,4 +117,9 @@ public interface IMogoNavi {
*/
boolean setBroadcastMode(int mode);
/**
* 获取导航沿途路线的点
* @return
*/
List<MogoLatLng> getNaviPathCoordinates();
}

8
libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java
View File

@@ -149,4 +149,12 @@ public class MogoNavi implements IMogoNavi {
}
return false;
}
@Override
public List< MogoLatLng > getNaviPathCoordinates() {
if ( mDelegate != null ) {
return mDelegate.getNaviPathCoordinates();
}
return null;
}
}

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 ) {