diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 8dc23821fb..ad7c519538 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -30,6 +30,7 @@ import com.mogo.module.main.assist.MapBroadCastHelper; import com.mogo.module.main.registercenter.MogoRegisterCenterHandler; import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; +import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; @@ -49,9 +50,9 @@ import java.util.Map; * 卡片加载 */ public class MogoModulesManager implements MogoModulesHandler, - IMogoMapListener, - IMogoNaviListener, - IMogoLocationListener { + IMogoMapListener, + IMogoNaviListener, + IMogoLocationListener { private static final String TAG = "MogoModulesManager"; @@ -59,21 +60,26 @@ public class MogoModulesManager implements MogoModulesHandler, private Map mModuleProviders = new HashMap<>(); private IMogoAnalytics mTrackManager; + private IMogoMapService mapService; private String mEnableModuleName = null; private Runnable mMapLoadedCallback; private BroadcastReceiver mReceiver; - public MogoModulesManager( MainActivity activity ) { - if ( activity == null ) { - throw new NullPointerException( "activity can't be null." ); + public MogoModulesManager(MainActivity activity) { + if (activity == null) { + throw new NullPointerException("activity can't be null."); } this.mActivity = activity; mTrackManager = (IMogoAnalytics) ARouter.getInstance() .build(MogoServicePaths.PATH_UTILS_ANALYTICS) .navigation(); + mapService = (IMogoMapService) ARouter.getInstance().build( + MogoServicePaths.PATH_SERVICES_MAP + ).navigation(); + registerReceiver(); } @@ -87,124 +93,140 @@ public class MogoModulesManager implements MogoModulesHandler, @Override public void loadModules() { - final List< MogoModule > modules = MogoModulePaths.getModules(); - if ( modules != null && !modules.isEmpty() ) { - for ( MogoModule module : modules ) { - IMogoModuleProvider provider = load( module.getPath() ); - if ( provider != null ) { - mModuleProviders.put( module, provider ); + final List modules = MogoModulePaths.getModules(); + if (modules != null && !modules.isEmpty()) { + for (MogoModule module : modules) { + IMogoModuleProvider provider = load(module.getPath()); + if (provider != null) { + mModuleProviders.put(module, provider); } } } } @Override - public void setMapLoadedCallback( Runnable callback ) { + public void setMapLoadedCallback(Runnable callback) { mMapLoadedCallback = callback; } @Override - public List< IMogoModuleProvider > loadCardsModule() { - final List< MogoModule > modules = MogoModulePaths.getModules(); - final ArrayList< IMogoModuleProvider > providers = new ArrayList<>(); - for ( MogoModule module : modules ) { - IMogoModuleProvider provider = mModuleProviders.get( module ); - if ( provider.getType() == ModuleType.TYPE_CARD_FRAGMENT ) { - if ( mEnableModuleName == null ) { + public List loadCardsModule() { + final List modules = MogoModulePaths.getModules(); + final ArrayList providers = new ArrayList<>(); + for (MogoModule module : modules) { + IMogoModuleProvider provider = mModuleProviders.get(module); + if (provider.getType() == ModuleType.TYPE_CARD_FRAGMENT) { + if (mEnableModuleName == null) { mEnableModuleName = provider.getModuleName(); } - providers.add( provider ); + providers.add(provider); } } return providers; } @Override - public void loadMapModule( int containerId ) { - IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance().build( MogoModulePaths.PATH_MODULE_MAP ).navigation( getContext() ); - addFragment( provider, containerId ); + public void loadMapModule(int containerId) { + IMogoModuleProvider provider = (IMogoModuleProvider) ARouter.getInstance() + .build(MogoModulePaths.PATH_MODULE_MAP) + .navigation(getContext()); + addFragment(provider, containerId); } @Override - public void loadAppsListModule( int containerId ) { - IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance().build( MogoModulePaths.PATH_MODULE_APPS ).navigation( getContext() ); - addFragment( provider, containerId ); + public void loadAppsListModule(int containerId) { + IMogoModuleProvider provider = (IMogoModuleProvider) ARouter.getInstance() + .build(MogoModulePaths.PATH_MODULE_APPS) + .navigation(getContext()); + addFragment(provider, containerId); } @Override - public void loadExtensionsModule( int containerId ) { - IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance().build( ExtensionsModuleConst.PATH_EXTENSION ).navigation( getContext() ); - addFragment( provider, containerId ); + public void loadExtensionsModule(int containerId) { + IMogoModuleProvider provider = (IMogoModuleProvider) ARouter.getInstance() + .build(ExtensionsModuleConst.PATH_EXTENSION) + .navigation(getContext()); + addFragment(provider, containerId); } @Override - public void loadEntrancesModule( int containerId ) { - IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance().build( ExtensionsModuleConst.PATH_ENTRANCE ).navigation( getContext() ); - addFragment( provider, containerId ); + public void loadEntrancesModule(int containerId) { + IMogoModuleProvider provider = (IMogoModuleProvider) ARouter.getInstance() + .build(ExtensionsModuleConst.PATH_ENTRANCE) + .navigation(getContext()); + addFragment(provider, containerId); } - private IMogoModuleProvider load( String path ) { - return ( IMogoModuleProvider ) ARouter.getInstance().build( path ).navigation( getContext() ); + private IMogoModuleProvider load(String path) { + return (IMogoModuleProvider) ARouter.getInstance().build(path).navigation(getContext()); } - private void addFragment( IMogoModuleProvider provider, int containerId ) { - if ( provider == null ) { - Logger.e( TAG, "add fragment fail cause provider == null, container is %s", ResourcesHelper.getResNameById( getApplicationContext(), containerId ) ); + private void addFragment(IMogoModuleProvider provider, int containerId) { + if (provider == null) { + Logger.e(TAG, "add fragment fail cause provider == null, container is %s", + ResourcesHelper.getResNameById(getApplicationContext(), containerId)); return; } - final Fragment fragment = provider.createFragment( getContext(), null ); - if ( fragment == null ) { - Logger.e( TAG, "add fragment fail cause fragment == null, container is %s", ResourcesHelper.getResNameById( getApplicationContext(), containerId ) ); + final Fragment fragment = provider.createFragment(getContext(), null); + if (fragment == null) { + Logger.e(TAG, "add fragment fail cause fragment == null, container is %s", + ResourcesHelper.getResNameById(getApplicationContext(), containerId)); return; } mActivity.getSupportFragmentManager().beginTransaction() - .add( containerId, fragment, provider.getModuleName() ) - .commitAllowingStateLoss(); + .add(containerId, fragment, provider.getModuleName()) + .commitAllowingStateLoss(); } @Override - public void setModuleEnable( String module ) { + public void setModuleEnable(String module) { // 仅操作上一个模块和当前模块 - Iterator< IMogoModuleProvider > iterator = mModuleProviders.values().iterator(); + Iterator iterator = mModuleProviders.values().iterator(); int counter = 0; - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoModuleProvider provider = iterator.next(); - if ( provider == null ) { + if (provider == null) { continue; } - if ( provider.getType() != ModuleType.TYPE_CARD_FRAGMENT ) { + if (provider.getType() != ModuleType.TYPE_CARD_FRAGMENT) { continue; } - if ( TextUtils.equals( mEnableModuleName, provider.getModuleName() ) ) { - final IMogoModuleLifecycle lifecycle = MogoRegisterCenterHandler.getInstance().getLifecycleListener( mEnableModuleName ); - if ( lifecycle != null ) { + if (TextUtils.equals(mEnableModuleName, provider.getModuleName())) { + final IMogoModuleLifecycle lifecycle = + MogoRegisterCenterHandler.getInstance().getLifecycleListener(mEnableModuleName); + if (lifecycle != null) { try { final long start = System.currentTimeMillis(); lifecycle.onDisable(); - Logger.i(TAG, "set %s module disable event cost " + (System.currentTimeMillis() - start) + "ms", mEnableModuleName); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + Logger.i(TAG, + "set %s module disable event cost " + (System.currentTimeMillis() + - start) + "ms", mEnableModuleName); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } counter++; continue; } - if ( TextUtils.equals( module, provider.getModuleName() ) ) { - final IMogoModuleLifecycle lifecycle = MogoRegisterCenterHandler.getInstance().getLifecycleListener( module ); - if ( lifecycle != null ) { + if (TextUtils.equals(module, provider.getModuleName())) { + final IMogoModuleLifecycle lifecycle = + MogoRegisterCenterHandler.getInstance().getLifecycleListener(module); + if (lifecycle != null) { try { final long start = System.currentTimeMillis(); lifecycle.onPerform(); - Logger.i(TAG, "set %s module perform event cost " + (System.currentTimeMillis() - start) + "ms", module); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + Logger.i(TAG, + "set %s module perform event cost " + (System.currentTimeMillis() + - start) + "ms", module); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } counter++; continue; } - if ( counter == 2 ) { + if (counter == 2) { break; } } @@ -214,115 +236,121 @@ public class MogoModulesManager implements MogoModulesHandler, @Override public void onMapLoaded() { - if ( mMapLoadedCallback != null ) { + if (mMapLoadedCallback != null) { mMapLoadedCallback.run(); mMapLoadedCallback = null; } } @Override - public void onTouch( MotionEvent motionEvent ) { - Iterator< IMogoMapListener > iterator = MogoRegisterCenterHandler.getInstance().getMapListeners(); - if ( iterator == null ) { + public void onTouch(MotionEvent motionEvent) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getMapListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoMapListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { - listener.onTouch( motionEvent ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + listener.onTouch(motionEvent); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } } @Override - public void onPOIClick( MogoPoi poi ) { - Iterator< IMogoMapListener > iterator = MogoRegisterCenterHandler.getInstance().getMapListeners(); - if ( iterator == null ) { + public void onPOIClick(MogoPoi poi) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getMapListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoMapListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { - listener.onPOIClick( poi ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + listener.onPOIClick(poi); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } } @Override - public void onMapClick( MogoLatLng latLng ) { - Iterator< IMogoMapListener > iterator = MogoRegisterCenterHandler.getInstance().getMapListeners(); - if ( iterator == null ) { + public void onMapClick(MogoLatLng latLng) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getMapListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoMapListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { - listener.onMapClick( latLng ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + listener.onMapClick(latLng); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } } @Override - public void onLockMap( boolean isLock ) { - Iterator< IMogoMapListener > iterator = MogoRegisterCenterHandler.getInstance().getMapListeners(); - if ( iterator == null ) { + public void onLockMap(boolean isLock) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getMapListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoMapListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { - listener.onLockMap( isLock ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + listener.onLockMap(isLock); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } } @Override - public void onMapModeChanged( EnumMapUI ui ) { - Iterator< IMogoMapListener > iterator = MogoRegisterCenterHandler.getInstance().getMapListeners(); - if ( iterator == null ) { + public void onMapModeChanged(EnumMapUI ui) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getMapListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoMapListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { - listener.onMapModeChanged( ui ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + listener.onMapModeChanged(ui); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } } @Override - public void onMapChanged( MogoLatLng location, float zoom, float tilt, float bearing ) { - Iterator< IMogoMapListener > iterator = MogoRegisterCenterHandler.getInstance().getMapListeners(); - if ( iterator == null ) { + public void onMapChanged(MogoLatLng location, float zoom, float tilt, float bearing) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getMapListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoMapListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { - listener.onMapChanged( location, zoom, tilt, bearing ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + listener.onMapChanged(location, zoom, tilt, bearing); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } @@ -330,17 +358,18 @@ public class MogoModulesManager implements MogoModulesHandler, @Override public void onInitNaviFailure() { - Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); - if ( iterator == null ) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getNaviListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoNaviListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { listener.onInitNaviFailure(); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } @@ -348,17 +377,18 @@ public class MogoModulesManager implements MogoModulesHandler, @Override public void onInitNaviSuccess() { - Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); - if ( iterator == null ) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getNaviListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoNaviListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { listener.onInitNaviSuccess(); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } @@ -373,13 +403,13 @@ public class MogoModulesManager implements MogoModulesHandler, if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoNaviListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { - listener.onNaviInfoUpdate( naviinfo ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + listener.onNaviInfoUpdate(naviinfo); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } @@ -395,13 +425,13 @@ public class MogoModulesManager implements MogoModulesHandler, if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoNaviListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { listener.onStartNavi(); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } @@ -416,13 +446,13 @@ public class MogoModulesManager implements MogoModulesHandler, if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoNaviListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { listener.onStopNavi(); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } @@ -430,17 +460,18 @@ public class MogoModulesManager implements MogoModulesHandler, @Override public void onCalculateSuccess() { - Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); - if ( iterator == null ) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getNaviListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoNaviListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { listener.onCalculateSuccess(); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } @@ -448,53 +479,56 @@ public class MogoModulesManager implements MogoModulesHandler, @Override public void onoCalculateFailed() { - Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); - if ( iterator == null ) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getNaviListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoNaviListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { listener.onoCalculateFailed(); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } } @Override - public void onUpdateTraffic( MogoTraffic traffic ) { - Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners(); - if ( iterator == null ) { + public void onUpdateTraffic(MogoTraffic traffic) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getNaviListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoNaviListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { - listener.onUpdateTraffic( traffic ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + listener.onUpdateTraffic(traffic); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } } @Override - public void onLocationChanged( MogoLocation location ) { - Iterator< IMogoLocationListener > iterator = MogoRegisterCenterHandler.getInstance().getLocationListeners(); - if ( iterator == null ) { + public void onLocationChanged(MogoLocation location) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getLocationListeners(); + if (iterator == null) { return; } - while ( iterator.hasNext() ) { + while (iterator.hasNext()) { IMogoLocationListener listener = iterator.next(); - if ( listener != null ) { + if (listener != null) { try { - listener.onLocationChanged( location ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + listener.onLocationChanged(location); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } } @@ -503,37 +537,37 @@ public class MogoModulesManager implements MogoModulesHandler, public void registerReceiver() { mReceiver = new BroadcastReceiver() { @Override - public void onReceive( Context context, Intent intent ) { + public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); - if ( TextUtils.equals( action, Intent.ACTION_POWER_CONNECTED ) ) { - Iterator< IMogoModuleLifecycle > iterator = MogoRegisterCenterHandler.getInstance().getLifecycleListeners(); - if ( iterator.hasNext() ) { + if (TextUtils.equals(action, Intent.ACTION_POWER_CONNECTED)) { + Iterator iterator = + MogoRegisterCenterHandler.getInstance().getLifecycleListeners(); + if (iterator.hasNext()) { iterator.next().accOn(); } - } - if ( TextUtils.equals( action, Intent.ACTION_POWER_DISCONNECTED ) ) { + } else if (TextUtils.equals(action, Intent.ACTION_POWER_DISCONNECTED)) { } } }; IntentFilter inputFilter = new IntentFilter(); - inputFilter.addAction( Intent.ACTION_POWER_CONNECTED ); - inputFilter.addAction( Intent.ACTION_POWER_DISCONNECTED ); - getApplicationContext().registerReceiver( mReceiver, inputFilter ); + inputFilter.addAction(Intent.ACTION_POWER_CONNECTED); + inputFilter.addAction(Intent.ACTION_POWER_DISCONNECTED); + getApplicationContext().registerReceiver(mReceiver, inputFilter); } @Override public void destroy() { - if ( mReceiver != null ) { + if (mReceiver != null) { try { - getApplicationContext().unregisterReceiver( mReceiver ); - } catch ( Exception e ) { + getApplicationContext().unregisterReceiver(mReceiver); + } catch (Exception e) { e.printStackTrace(); } } mReceiver = null; mActivity = null; - if ( mModuleProviders != null ) { + if (mModuleProviders != null) { mModuleProviders.clear(); } mModuleProviders = null; @@ -542,13 +576,14 @@ public class MogoModulesManager implements MogoModulesHandler, } @Override - public boolean onMarkerClicked( IMogoMarker marker ) { - IMogoMarkerClickListener listener = MogoRegisterCenterHandler.getInstance().getMarkerListener( marker.getOwner() ); - if ( listener != null ) { + public boolean onMarkerClicked(IMogoMarker marker) { + IMogoMarkerClickListener listener = + MogoRegisterCenterHandler.getInstance().getMarkerListener(marker.getOwner()); + if (listener != null) { try { - return listener.onMarkerClicked( marker ); - } catch ( Exception e ) { - Logger.e( TAG, e, "error." ); + return listener.onMarkerClicked(marker); + } catch (Exception e) { + Logger.e(TAG, e, "error."); } } return false; diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java index b6a8473bff..90939630d2 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/MogoAddressManager.java @@ -24,5 +24,6 @@ public class MogoAddressManager implements IMogoAddressManager { AddressManager.INSTANCE.init(context); SearchServiceHolder.INSTANCE.init(context); SettingManager.INSTANCE.init(context); + NaviManager.INSTANCE.init(context); } } diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt new file mode 100644 index 0000000000..e98cf0e5be --- /dev/null +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt @@ -0,0 +1,50 @@ +package com.mogo.module.navi.manager + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.text.TextUtils +import com.mogo.map.MogoLatLng +import com.mogo.module.common.MogoModulePaths +import com.mogo.module.navi.constants.SearchServiceHolder +import com.mogo.module.navi.ui.search.ChoosePathFragment + +/** + *@author zyz + * 2020-01-18. + */ +object NaviManager { + private lateinit var mReceiver:BroadcastReceiver + private val AUTONAVI_STANDARD_BROADCAST_RECV = "AUTONAVI_STANDARD_BROADCAST_RECV" + + fun init(context: Context){ + mReceiver = object : BroadcastReceiver() { + override fun onReceive( + context: Context, + intent: Intent + ) { + val action = intent.action + if (TextUtils.equals(action, AUTONAVI_STANDARD_BROADCAST_RECV)) { + val key_type = intent.getIntExtra("KEY_TYPE", 0) + if (key_type == 10038) { + val lat = intent.getDoubleExtra("LAT", 0.0) + val lon = intent.getDoubleExtra("LON", 0.0) + + var newInstance = + ChoosePathFragment.newInstance( + MogoLatLng(lat,lon) + ) + SearchServiceHolder.push( + newInstance, MogoModulePaths.PATH_FRAGMENT_CHOOSE_PAHT + ) + } + } + } + } + val inputFilter = IntentFilter() + inputFilter.addAction(AUTONAVI_STANDARD_BROADCAST_RECV) + context.registerReceiver(mReceiver, inputFilter) + + } +} \ No newline at end of file diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/CalculatePathAdapter.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/CalculatePathAdapter.java index 5f92b580b0..28233d49d6 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/CalculatePathAdapter.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/adapter/CalculatePathAdapter.java @@ -40,6 +40,10 @@ public class CalculatePathAdapter extends RecycleBaseAdapter View mName = holder.getView(R.id.amap_calculate_item_strategy_name); holder.setText(R.id.amap_calculate_item_strategy_name, item.getStrategyName()); mName.setBackgroundResource(getStrategyNameBkgResId(holder.getLayoutPosition())); + + if (holder.getLayoutPosition()>=2) { + mName.setVisibility(View.GONE); + } holder.setText(R.id.amap_calculate_item_strategy_time, item.getTime()); holder.setText(R.id.amap_calculate_item_strategy_distance, item.getDistance()); holder.setText(R.id.amap_calculate_item_strategy_desc, item.getDesc()); diff --git a/modules/mogo-module-search/src/main/res/drawable/amap_calculate_navi_strategy1_bkg.xml b/modules/mogo-module-search/src/main/res/drawable/amap_calculate_navi_strategy1_bkg.xml index a3c21b02d5..0ce8c981a7 100644 --- a/modules/mogo-module-search/src/main/res/drawable/amap_calculate_navi_strategy1_bkg.xml +++ b/modules/mogo-module-search/src/main/res/drawable/amap_calculate_navi_strategy1_bkg.xml @@ -2,7 +2,7 @@ - + diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml index ee3d098664..89cedce4a7 100644 --- a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml +++ b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml @@ -44,21 +44,21 @@ + android:layout_height="@dimen/module_search_btn_height"/> @@ -65,7 +65,7 @@ android:layout_width="0dp" android:textSize="@dimen/txt_normal" android:text="@string/navi_company" - android:paddingLeft="@dimen/dp_75" + android:paddingLeft="@dimen/module_search_navi_home_padding_left" android:id="@+id/tv_navi_company" android:gravity="center_vertical" android:drawableLeft="@mipmap/icon_navi_company" @@ -77,11 +77,11 @@ @@ -111,7 +111,7 @@ android:layout_width="match_parent" android:id="@+id/rv_navi_history" android:layout_height="match_parent" - android:layout_marginTop="@dimen/dp_60" + android:layout_marginTop="@dimen/module_search_dp_60" /> @@ -120,8 +120,8 @@ + + + + + + + diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_setting_address.xml b/modules/mogo-module-search/src/main/res/layout/fragment_setting_address.xml index 3825985e64..6decbd8fe6 100644 --- a/modules/mogo-module-search/src/main/res/layout/fragment_setting_address.xml +++ b/modules/mogo-module-search/src/main/res/layout/fragment_setting_address.xml @@ -12,18 +12,18 @@ + android:layout_height="@dimen/module_search_btn_height"/> \ No newline at end of file diff --git a/modules/mogo-module-search/src/main/res/layout/include_search_bar.xml b/modules/mogo-module-search/src/main/res/layout/include_search_bar.xml index 2932e9c021..5d72a9c5a1 100644 --- a/modules/mogo-module-search/src/main/res/layout/include_search_bar.xml +++ b/modules/mogo-module-search/src/main/res/layout/include_search_bar.xml @@ -3,8 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/ll_navi_search" - android:layout_width="600dp" - android:layout_height="@dimen/dp_120" + android:layout_width="@dimen/moudle_search_et_width" + android:layout_height="@dimen/moudle_search_et_hight" android:background="@drawable/shape_round_gray" android:gravity="center_vertical" android:orientation="horizontal" @@ -13,22 +13,23 @@ tools:showIn="@layout/fragment_search" > + + + + 32px + 32px + 640px + 64px + 42px + 12px + 10px + 30px + 22px + 142px + 4px + 22px + 55.5px + 304px + 64px + 16px + 18px + 38px + 75px + 40px + 410px + 640px + 16px + 20px + 30px + 20px + 28px + 144px + 126px + 96px + 42px + 38px + 28px + 23px + 96px + 69px + 192px + 64px + 24px + 446px + 96px + 56px + 100px + + \ No newline at end of file diff --git a/modules/mogo-module-search/src/main/res/values/dimens.xml b/modules/mogo-module-search/src/main/res/values/dimens.xml index 8928f1fa1e..25f203b349 100644 --- a/modules/mogo-module-search/src/main/res/values/dimens.xml +++ b/modules/mogo-module-search/src/main/res/values/dimens.xml @@ -4,4 +4,47 @@ @dimen/dp_60 @dimen/sp_40 25sp + @dimen/dp_60 + @dimen/dp_40 + 600dp + @dimen/dp_120 + @dimen/dp_80 + @dimen/dp_24 + @dimen/dp_20 + @dimen/dp_50 + 40px + 266px + 8px + 40px + 104px + 568px + 120px + 32px + 75px + 72px + 75px + 778px + 1200px + 32px + 40px + 60px + 37px + 268px + 236px + 180px + 80px + 70px + 25sp + 42px + 160px + 150px + 180dp + 120px + 45px + 838px + 184px + 104px + 154px + + \ No newline at end of file diff --git a/modules/mogo-module-search/src/main/res/values/styles.xml b/modules/mogo-module-search/src/main/res/values/styles.xml index 54581e1f8b..22cadcf686 100644 --- a/modules/mogo-module-search/src/main/res/values/styles.xml +++ b/modules/mogo-module-search/src/main/res/values/styles.xml @@ -17,23 +17,23 @@