From a02cd2363ec7292606588230c4a0b47b593c602b Mon Sep 17 00:00:00 2001 From: zhangyuanzhen Date: Sat, 18 Jan 2020 15:24:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=AF=BC=E8=88=AA=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/main/cards/MogoModulesManager.java | 399 ++++++++++-------- .../navi/manager/MogoAddressManager.java | 1 + .../mogo/module/navi/manager/NaviManager.kt | 50 +++ .../navi/ui/adapter/CalculatePathAdapter.java | 4 + .../amap_calculate_navi_strategy1_bkg.xml | 2 +- .../main/res/layout/fragment_navi_setting.xml | 42 +- .../src/main/res/layout/fragment_search.xml | 44 +- .../res/layout/fragment_search_category.xml | 25 +- .../res/layout/fragment_setting_address.xml | 8 +- .../main/res/layout/include_search_bar.xml | 15 +- .../src/main/res/layout/item_search_poi.xml | 12 +- .../res/mipmap-xhdpi/icon_choose_position.png | Bin 11088 -> 0 bytes .../src/main/res/values-ldpi/dimens.xml | 49 +++ .../src/main/res/values/dimens.xml | 43 ++ .../src/main/res/values/styles.xml | 8 +- 15 files changed, 451 insertions(+), 251 deletions(-) create mode 100644 modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/NaviManager.kt delete mode 100755 modules/mogo-module-search/src/main/res/mipmap-xhdpi/icon_choose_position.png create mode 100644 modules/mogo-module-search/src/main/res/values-ldpi/dimens.xml 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" > vymJ+04DQOl^2?6O45F}KPSQTOE1_cF_ z?h=sF_u}{W{;|(K&)m7^ocYY0bMAa*67T41kP$NxgFqlMElo8e5D2V!{euwz5^)+A z3E&UxZ=|6DdNs_l0RjmTYpE%l1c7%7JW_ai0~QR9!-oo59~HiDn#UjF_vp`T3FEiq z91~Ad+0;RBFoRz|i&)MASvC)iQsN7i;B_-_M{#L9ag8nZG9p-}0B5>pfTnw%v7(-- z%-zLb6#VH(JK*q)YG^yD>HSe#eQWxzcESA4kAmEb^%r+4Nj!Aa6W%bxuFqrq>hpxnB(_2fmh(Sx_Dt#^|Tzcco;(!47xZotw7 z_PrUHd@hjLVa;{1E_m#2-WRbUvq{9^G_F_@c0`0i40)G+Q3&(VTQw~{^UxDqes6+X z;a`~NQGAwLC#kA1S8=Z%^?j*n(v)^9++XjPxUsT{8VMLyMwhaI^xG8@Kb=+=3`{a9 zW24QJqSf6Z>ru}REohSAc^14$CpX!;L>e%xbYuHnzlO{zWfUrJhBqU4S%LS_T6NWV zg8J7Ihnb4IPWbn+J{%fv_>DD=h2`Q{Hy01&@lu(Jh~YR;!+6dU_H5}*6QlGj9*vig zgaoSN7M0xLfrRPMmMM?NCw_6WK{pHkl)V@th6fs*W7DJIRm zt&gfJL;_aRjJ9r!iBvGD56F>k!Ev|vHSXN*;@4I#hb2Yz5fN1-s(B@>#KNhE$3l21+L(b^1$V;UJp08MC2cD5B*c9dqZ)wZ=!g?g?UQDOihq#uVJ}U*?^YnF zK)b=KY<{QN9(pLKLRn{Y#q#4ouCD@(;zhlfQL=4SdwT!*{hRBVD7>;N%}3!uiFtem z#;jW(m%MMmoKgnaO$Pov=+v9iC*PxY>@LhLNs?+YOEV-JU|#Ytf;o}aw)XzMqOYFa ztnPL5M2K;q{R;E;BBI>a4fSE;8iBAf3Qha0p!D%$g5IGX0!Rpv$!Zl^!@EP5!YT&E z#$EDb&wp)Ft|!X`E#@9YMD0lQP9<2qqf|cq%Tq^td|eQl6y|B-SNO{Rv{Z79raI|E zwqco%zBE{x)cUb|y@C#zF2%S8J)}CZoGB`|^|clW3{^wKKN!o21xKXc7<Zza+P4)veYHJtN6<((1>K=u8(qGKnYE7gTgJ{sRc zK*dpbhs_0h_e?$}SfqffII0Dpw|G}BhDW7V4bHtO0X)p)Wy2R-T;I%<2B+v>fa1A( zs20a|RSE;|{gFrBoK@(|MPM8m4i2$asdQUj$KPE&5g1CyQ>uWMrn4U#KaY_Sqgg(z z&GRki6Pvvk<0R5Yqh1nK6?M$j%kwZ*zfy}GRz(nESDuR1zZ&PP*d>jMQO)JT8b|M1 zRtnd4%Y18w!%B%p^vn11l zQ^U;(11r-&BhSM&{F`II`POCF?O6Y@J*rf|X@OF|}7mZY>ylF;zgE z?;$K%_Wno;b3hDay>AD3@q*Jxf6danNo;ZEx}onb6}>@P-7X@M@D>kx`T)YR|I_oS zR3l4@bQ7e{FlbWR!E8S@=ix%^{=6sTZ5P^KqQ(#{E`Zt93{Xuqaa3se`iQ=L01Cd> zTi1D6*hl$5h+25kJdr|)S7(^64#jd&WJeF>n>ZV6dUVC?a6eW{$?AbiXW7BILg~h6%lr>_Ps+7*W^O4K)midlRe@M!BoyH-{`)X z`j#qem=oMde^xlC^4(}5rh7Bz#@+ZTRXQRk`zgJb_*6f0KF<*c^i!dmlbzhzU$>H^ zQ@A^Cn5oz_YDVpiNh&?4Y$Qws=iZptt}=c`R2Hzv8=#G{bge~!*2YC%7%2j~(Ds^c zV3*|eD|3*lYgTTqAq=i>aQ&3l1+8#KSY+EK5nG0rSc2|a3zeUKm2 z;rq%_d(NGeXY(f+@?+e$PPLlb-q1gn|W}zRN1jWmD?w^ zj?@@o#}A(1%3_|2S@y;)N)W~0oAM!nN>VO{=I;gQtu{ZuX@m$S;!tcT@2InfLsI|` z$Sxf5%DUvE4j;1J;E+5pLK`69tl-YI@1kHeb2a{f+eFK){^A;2%`7i@aZm^X^8m6r z{|JdKvSQ%E$n*QJ=pP50C8r$p6$M5MAuz#^u)VHYNo-k$mt*((A3is>7cN7W3Q@$- zSWSpKr9(!Gol^;e0TTy?rJ!>D&Vu?U0tiCv7-~UcL9GkQc!w(dQ+A`uuvVSg4oe6J zfhAxKybV&^J9;IMzCEV4qvlxTw3aOaKRa}g6Pt&f#r(R!so`fXAgg{{wOi`pd80s3 zUBrL#Zm5y^QO<`@4Qdh9-yp~;m0hY`oo4?hHE8CVtc~|#hoezynx8U44{9Nlna7@+ zfa+}1PKMb&tI(n8j7IqZVhf4PeMBI78JR7JH55qfFVTgA&=0BXhBO^I0&5}F^E}J1 zhh+=s`P&K5Wkd~u4e{L@8lI58Psc4*;@_8Vp-XN6FRa4=xy&)26uNy+LNd8LcFg8h z11V$z6@`p#;eOTD!--kz=%=@h2vjz0=3w2;dWy{x|W`=QEyyfQiP!);K5QU^Ah1l- z&KAu$Xrm#v3MpcHZ3B^7H8KNMmbarAvl2UI%fJtYqM{O7;*osBbhG%GF0Bh+y0N-6 zsrb(kAV>^R!>ZcrkGJ2W=CAmN0=$x(sn+aFZV>~%_JUgYTZBHGv93Y+4N6rq>{Mkw z05uQ-kwpfnRcKqf?M{mm;;W9PmH7JZ%N-K9CNp@NZ5mM!;X$o=k2%pzLH0Sp8vvnb zDm$|AR(YVnDDc>@7&GR;}LBc&ePzYt(!gb4RZ)#+MDiE&?Lk z?8b?9irZbTVu_qGg5L2nS zpwsoPY77-H#sf&LVXdkC09nC-{MZe%q1ex9VE|0NaJy88I$~=xe)PlA`?Zb^K^E&c z017x4xZKp9>nfHCcfnpPu2>Ft#4F_oyf6y2sIh4J$N=NP*pPJeiZx^q0;4lR?2$qZ zsQKfZ8!bnY2hc$$v0@WI+l?EW_j#7Kc^8e}C{O<<&gIS;2CxVOeMku_wLwEO9}mbK z`-~j62@=Txt3klyK_2F#0!nD;;iYUyx;+y?FrYk$fSY`R5IH@dgSg$6_(TE>EC!8s z&+$gfx9}$K*pLp#y3s6y!Emt{kOzZDuB~?%iIY7^hep?(406B)cOlBngW0IVTzpP{2#9%suy@ouS}GMqe=9h088kp^;z0np z7WICOnn!CH2bDr{@Vl z9Q!}L-(znwAbmD>1o-zM-r=TEJlBzu09ZTsu6H{FvQbIGl)BXbL?;L`M$J&^%Y{E~ zKreYNSOon~5qm3@SrEfga+d~onwjtV?Xl@Uc^b&$Th+)-Qd-<&MSUJ!^7L2sc8q{O zf+4lOwE>^x8JQT{19hFnNgtJWd@T;J8q z4(s_up`OBUJQmy+k<0J!m7 zQ&8&3E5)~_O%e4Ite26I?6)yc=v_!}`slgzOn33$ALL<#t%e$VlrwrkkV}T}hka+Q z<@jqOahR?OTb8fV)gd{DGw(=6k_SllZu;rVq3!de_e&ZNf)sXUbk@&Bg-2C;vkU62 zpIt(x?8nhzzGVM!Y}DVVS3ZU6c};xNM|7 zeR*VR+?~+)2U766yYF?0&IFUed`=?XCx<%9$7WhWkrt-2UwyuLd_i=4=T`(c2GxY_)GN_9a z;I^&D<>yJ}J~vXV3IstehsSV*OCMyb3d^>(J}muahLXeWb{xsJmD&vu3vCJWj!G=s z6uelj&%7P}EZZw`8eh#*9&~-e3;jgIGKmd`d=*eZJTCpj$cyzS6VB|)lVaMISk>ITv`5pA{bVlzhqL;mBzFHQAn`k1g zMnBefBDZhh@uhHKnQ&I?GH>`Wo7j2fJ?;o)EEm==*um0zhn8Wg-s=6%G>_m#!*hH{ zsMR|@%uHTT`>@KuZ9~GewW{0Ernp8=&%5-mjHTRTtk!u)>*GQpxqB*zfSBPV1@b^< zJzQfMtZ&6SK>KCb6Ay88gz&eEE?504c2nWqUINHt*mCUEYgIxd>+iY9taa5#ByD@% zFrya^KGMf-_#tPHGynWTYAr;l8Y>eH`aJY6`S$mg4?|=$=rvsk!#7s)qoeuWd71Ts zZc*5NGXqEWg1Lfbo!IW3gU?Dw>B1p@-;?7%DUqAvd$KFfxxVdIvUiCZU+dZ&wPv4i@06WpYQ%Mi&N7*+$&J) zx=4=sd{E>@cSnC9_}2r!LM66}8QxmwxTwm+S12p!Z$qK}8aqQ%Rk@&kvRU7o#g|6gbk5we=arHD~5Fse*us73%FA zW$c8SIpUEVTvH&LA9FOhD6G=HupP%)3Uxy*gMvTr3TD3B^Kzy z_a(=yth4B%O`J;fN~>c{l=mCkoLe7QdNt*2e$Keoexo(Q8HT~*TE^V1;hO%>ai9^F5YtL}mY|YpVv)>$ID3Yu*C;Ry(153J z*OYMPIlVNiN-=}HSJ)bP$h2G~|MyS{pIVDfW4KhVWaO3CRqJru2eUV@1}UooR+!V9 zJX3EkcVtLR?C(g~y3Rx1G12h8gX4EY=~IBaUB8Par3wXGD>g|ZU^pHecvMi74bF!li|<^F4@uxx=bZ2DX2w#3DQ zSC97xC4s=OxbJFJQ-*!7KK85=%S(A#i3ujZlxH-C^fP(x2{nAvceyA2*reX^%9tn9YDr^P)D36* zQdi`8xSef$*++Z$zFt%dW%`#+UyfpSi1efNxMSh1N>hW~8Lg#L&-iTN2R@c}d9xMd zS%;%gVvx%O;oU2q*4bfWMGLbs0`vit*jZ5YS%IyIF^{6M%Bz$SN<~{p~ebW}{ zo)a|r${xVFmHyzt#9Mgd4H|W)LoGYAJLc`DhOM0VPs3J~#o;+Q*uxV4H<+w0=5EYR zf^Fw(w{WB;TNyrD3kK8js#(0_SDFSebM4hU4X>ST?hJRWzl9i$t0$D&T4`1$gFH%2 z^BYRZKxxAn06fNC*7%&4X8pJUTj%p}OzteNP1{lT+w=8! zF0y$FqEoh$yx#7y8rx$}e5Ax75g{4t3b*6g<9n}Nwd(l`(d+YZBLSAOrCxH%KpB*C ztPYIXHXnmJFNssjfHO=btL@#SS{B>P0v6IT8jm_(j&q`fGfZF0Az#E8699R@3AB9o zf)nkY*xf_TFbO;w`+a|)J*GA_+T+alMP~1TSKi>;w_~*OZya8jlPhBNffa^xo!%^E zjrY&x#lA-T9q~@|*k#)ODDu@JyGg{r?0x6&q9p>4BFf)q$5GpzNrj$1kY z_S4{%oYKh{b2-;uZzT0{er@l{d_idN#dfgsB0cmYl@HR;IS}8kLNl;~ zd79=BjTMFz4A{!go^Aa-!8E+xdzQu;6#jQrXrzmi^|gU!Zv(A%m;r9Jg?h66B7uXfyHw1GzEis&;{+hyUL$Mg{NO<@;+=r zlo~*4;}+f*1R5Zw7IHS1s1cd?T#F)v@`rzFHYak;V^-AM;hM47Lb_cAhbCs2RfeWx z(H$VEQ-uX73(7w_A#nSR_0+G!0c1Up6dG$U{`*!wzD)&@DW@lR2~Z?OFqTo^``U6F zuA=cn5J-OkE`<>3^8z*RO8}8+F((ithagb@B!!U{U*cG%otI><)f6GM;kD>1MoMRT}tk*AqVBP9b$m?ges~qU%tX39i zBRkcJG6>qJ2V_-bG`JOFsQ4T(AHX{NOSE=K%*I~)0C;ux(9;4R*Q>P#ifaTcIk1%7 zw!zx96fZ}xY}|Y%S-b~qe(;+tcwjh=25o31ZGx!rRz*kz&=!dU`glYs<88%|vs6)I z=815E!)|53#1w$;aI9lCD=3Easm?bhYb|}k{_Ul$-dZ6qoKNTkm>Y!%hxP}%N36Z=e#Sl$evJ5f=TSyp z1Su!kwSRJS5ed)E=x{)x?2|oO_tmYie`_#=T70q?xLv-Xv}TQv$@;D)+Q`m!?YD7t zL{&UK70$l~j(ccBzE1~56}>>+Av;pgT%z?G$?~fI!?<7Z0H zv%EZI{_ro5fQ8oHkE6n67nYjMbM!hP_Q|f1%>jAPdYCaV6+_3#3_FwVIWa8a0Llg~ z0WesliZx>W&+kC`2u3K8uN6aStgZpp%maDQc$iu!K@5&IMAv`0tf+J-`(O3`7ibmm zszJl0aqpy^hCi{p%6{l6apXt3lxwyO0Y{>7VA-;0$iDcI&Zi@Q5fLp2#B(S z;>nuaJ0)L=OtQ`k@Gnk^=+6s)b|2+vxfVbhUVi$xI##mmQ{;3__`CzI=LDn{A%!rc zFHKk0s;pGJ0en3;Ksi1~mCz?%Q;rBXfO1T~OYa5g>(RegENeC+M&t?T_)^>L*prQ0 zzItZ39r0NIDyjC@jl4ajcwp}XTvT2ZvG!~Kv$t_(=*ig_ClFB6OI1m0Zbzgt@oxkC zq!Ylck$a@?&brcTrserMC92eiPueJd0r12rf~WHvC_`_Ljr~d3p*@+`SV^KWIsDTj zdL3VC%KzIH_i5g=oFWwX*4mnvcK+KjC7kf`X*FI9Q24XaWlP`8jIse1!;5A5WJOJz zii2jdDq2@CDGtF+Cq9V4bfv-5bkjNf0%|AZxMwZ2RwK z*l`_W*NTP+W*b-CyW&@`BN0)cB71EkgF3>t==*>{a;l-*!~Eo5lym<3;V!PsLZ0$W zzX9?zCl=&EPn5i<^?|ibm4l^v_$(8YZnJfO_9x&5#uJK zlHpsAef|-e@sxIC_QH&T_f8MKKmjh=yr#MQJ>;5I7E^#)sFqmVlt{6=5hHmOw{Q`g z@3A+o^7rO7tk<+}Ipb`^ia>FA$8nXPBfVxI!2nzXNi>WG!C1KAD}EnioR9yq&T$1s z7N6Emn04yv|NpB9NG)wGW6ZF6_zg<5eB`|^8f%%=K9i{HXheyEr-`RYJIt;ub(R53 zcm5aV^9$FeUWeYU)z$*d>%rh{(V01eGQthoKjUkz8XZA9|9_szLu$!tDd!ioE_nqp z@^@{&6zkPCYL#pl^1^a-qLAnoj$r|X7*}pV%r^Y7pcPFJyG)g@4=J?bDab?RiT&WE zpWa=>SHmOVY-dvh7L$DD<@jK8F?-(T-I({Pn#CLzeQ@R<~BMb)?;ZAS6 zT7jbi$jMLN^!>z@rP68!rl}tS^+{qGZKq<{izwh+LMef-YiCk!-63~`Q^UJ=ADw(a z=61~&adkZV8a=-!aeb5$P%rK~3#yEydcPuCS`sT$K`y7?m*ohn;auLl3K?i z(-3NTy?9*+J8^VUoB0HP+Mwi91hG&iMGzcm8F#wk(qedsOQ<> z@)XgbeV}8f3qEuOzKAmcDDA8Wod_rgfHs1fZ;#ot%GsA)8HFCma{_Oz6YUc-7D5Z( z1g9-^mx}v93_0WwZGTjo&19mzv>0? ziSo54dVk;3nK=A_paDw6q)}XPVV;SvxC)&x17J60Eb#p8Z#ErO6SluCvoFN6(!X4p zsyQ7-Fnu8eD?oMAp|2{RG3F4;kjK*JvMjt~)F56{#AqeK9t z4>4Sj)hhI8+^9qEv%Q@U3lz0T2WCr=Ipg&zR1&S&ox5W!fcds9ALRcxOVZZ6it+As zs1s0KUsB~GV`&@gGfeC4@iE3i7&f_kpE`KlD22SQVFM#WYRr17KIBaH_)bp68;fE{ z4}bAF7t0yw?AY{gK}h5f7&C}FqQd-3@z6EvY_(N1;0;^$$_!eb4$%6bpGTy7!FBxM z4bUHgDCzv5P}=#SBO%}$A$D;@m-^jR-KKDh;C<-{S~3e6*fPjYzW-`dP#9?D0ayCM zpyKMlslU*qZ#{8KTj3Q42Zjq~?{EgYb?Ye+WJ2md&b3q-(F-?D|8@qnSKM^*BjwN6 zrv(?zS=3P}8J!xf1Puz>CV&=3y_= z@moMwQ}b}R`f6ur23?3v9ubC2OBoA;u%Op~v;E@o)5Kd&UQaxrqXe_mw<71o^Tc9= zHJYulTQ6$Ha3tGRPG=!0G1>k;-s){4jA*leP4lpSPst6!H_CQKkg(Ll7Ghsg4Jrkk z&$ko51HpWtXXPf3D+N&?DFSQ!Xtk|5W=bpzNdWZ|j|goIjy_A(vs#~hGAEb73Qx!d zMRKj;sJt9MzGd5oYbvnV2<@)1vX#qJYMQ15dO%5x9f|hWo2QCrJw}Z1N+%qB&-6j) zU#b0(D$?`IS}ze#@*?kRG8TfmT;zk}HZ6##3x71^!*TXbk}PX(%H|@<{K%r%L@@NO zy?k9P=ZIhsVcU zMacb02B2X|?%miRd$He4iMCw&h$6!%cVg?E&FT@>TPBekGVb8XIlLv+4DRhaw$qsQ=bp%M;$lJ|J0+i*yIRKng1<;baOQ+Y(TyAvi)H+3A z2mVZ@G-v7R>S^tzo3aG+_DNBw_+mQ$LSv6ci!VkhS|&Y3`h)vO`ra6kO*yu@T~4HE zePY`EBeBX{5Y$Lwlz+&#{_x|!o-@YovXso`h&h&I-wNgTE(W6_1UA2pQu{ff;)0Eo za{-?-T`PPG`V+WmZf;{%zbD9QR0ljmBymvk7Lq}7gQ#_PQC${E5ZVINp~rg2C7__RHZ{&J`+N~ll7H@1y(eE2MXv8#nBT@-S$4AK=|>m3T>G}qFzdCK iZjb)170#&dFMHJY_#xz#z#h;d3(`{8S9_&m7yW-`%NQ5{ diff --git a/modules/mogo-module-search/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-search/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..d1dd0a81e3 --- /dev/null +++ b/modules/mogo-module-search/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,49 @@ + + + + + 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 @@