diff --git a/app/build.gradle b/app/build.gradle index c68cd58ebf..772fd116aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,19 +55,18 @@ dependencies { releaseImplementation rootProject.ext.dependencies.leakcanarynoop releaseImplementation rootProject.ext.dependencies.androidxmultidex + implementation rootProject.ext.dependencies.moduledemo + implementation rootProject.ext.dependencies.moduledemo2 + if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.modulemain api rootProject.ext.dependencies.mogocommons - implementation rootProject.ext.dependencies.moduledemo - implementation rootProject.ext.dependencies.moduledemo2 implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.moduletanlu } else { implementation project(':modules:mogo-module-main') implementation project(':foudations:mogo-commons') implementation project(':modules:mogo-module-common') - implementation project(':demo:demo-module-map') - implementation project(':demo:demo-module-map2') - implementation project(':demo:mogo-module-tanlu') + implementation project(':modules:mogo-module-tanlu') } } diff --git a/build.gradle b/build.gradle index 51e13205f9..de0bd174da 100644 --- a/build.gradle +++ b/build.gradle @@ -81,7 +81,7 @@ afterEvaluate { } } it.configurations.all { - resolutionStrategy.cacheChangingModulesFor 0, 'minutes' + resolutionStrategy.cacheChangingModulesFor 0, 'seconds' } } diff --git a/demo/demo-module-map/build.gradle b/demo/demo-module-map/build.gradle deleted file mode 100644 index 4cdc37ad48..0000000000 --- a/demo/demo-module-map/build.gradle +++ /dev/null @@ -1,53 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.alibaba.arouter' - -android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - buildToolsVersion rootProject.ext.android.buildToolsVersion - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode Integer.valueOf(VERSION_CODE) - versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - - javaCompileOptions { - annotationProcessorOptions { - arguments = [AROUTER_MODULE_NAME: project.getName()] - } - } - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - if (Boolean.valueOf(RELEASE)) { - implementation rootProject.ext.dependencies.mogomap - implementation rootProject.ext.dependencies.mogoutils - implementation rootProject.ext.dependencies.mogocommons - implementation rootProject.ext.dependencies.mogoserviceapi - implementation rootProject.ext.dependencies.modulecommon - } else { - implementation project(":libraries:mogo-map") - implementation project(":foudations:mogo-utils") - api project(":foudations:mogo-commons") - implementation project(':services:mogo-service-api') - implementation project(':modules:mogo-module-common') - } - implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.androidxconstraintlayout - implementation rootProject.ext.dependencies.arouter - annotationProcessor rootProject.ext.dependencies.aroutercompiler -} -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/demo/demo-module-map/gradle.properties b/demo/demo-module-map/gradle.properties deleted file mode 100644 index cc80da2676..0000000000 --- a/demo/demo-module-map/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.module -POM_ARTIFACT_ID=module-demo -VERSION_CODE=1 diff --git a/demo/demo-module-map/src/main/AndroidManifest.xml b/demo/demo-module-map/src/main/AndroidManifest.xml deleted file mode 100644 index b4ca7f3c79..0000000000 --- a/demo/demo-module-map/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoCardViewFragment.java b/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoCardViewFragment.java deleted file mode 100644 index 9f9da9fd52..0000000000 --- a/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoCardViewFragment.java +++ /dev/null @@ -1,364 +0,0 @@ -package com.mogo.demo.module.map; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.os.Bundle; -import android.view.MotionEvent; -import android.view.View; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.mogo.commons.mvp.IView; -import com.mogo.commons.mvp.MvpFragment; -import com.mogo.commons.mvp.Presenter; -import com.mogo.map.MogoLatLng; -import com.mogo.map.listener.IMogoMapListener; -import com.mogo.map.location.IMogoLocationListener; -import com.mogo.map.location.MogoLocation; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.map.model.MogoPoi; -import com.mogo.map.search.geo.MogoPoiItem; -import com.mogo.map.search.poisearch.IMogoPoiSearchListener; -import com.mogo.map.search.poisearch.MogoPoiResult; -import com.mogo.map.uicontroller.EnumMapUI; -import com.mogo.service.module.IMogoModuleLifecycle; -import com.mogo.utils.TipToast; -import com.mogo.utils.logger.Logger; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -/** - * @author congtaowang - * @since 2019-12-24 - *

- * 描述:demo测试各种接口 - */ - -public class DemoCardViewFragment extends MvpFragment< IView, Presenter< IView > > - implements IView, - IMogoMarkerClickListener, - IMogoModuleLifecycle, - IMogoMapListener, - IMogoPoiSearchListener, - IMogoLocationListener { - - private static final String TAG = "demo.DemoCardViewProvider"; - - private Button mAddMarker; - private Button mAddMarkers; - - private static IMogoMarker mLastClickedMarker; - - private Bitmap mMarkerIcon; - private Bitmap mClickedMarkerIcon; - private TextView mLocInfo; - private TextView mLoc; - private Button m2D3D; - private CheckBox mNaviMode; - - private DemoInfoWindowAdapter mDemoInfoWindowAdapter; - private MogoLocation mLocation; - - private int position = -1; - - @Override - protected int getLayoutId() { - return R.layout.demo_module_card_view; - } - - @Override - protected void initViews() { - - position = getArguments().getInt( "position" ); - - mNaviMode = findViewById( R.id.demo_module_id_navi_mode ); - - ServiceHandler.getPoiSearch().setPoiSearchListener( this ); - mLocation = ServiceHandler.getLocationClient().getLastKnowLocation(); - m2D3D = findViewById( R.id.demo_module_id_2d3d ); - - mLocInfo = findViewById( R.id.demo_module_id_loc_info ); - mLoc = findViewById( R.id.demo_module_id_loc ); - mLoc.setOnClickListener( - new View.OnClickListener() { - @Override - public void onClick( View v ) { - ServiceHandler.getLocationClient().start( 4_000L ); - } - } - ); - - mDemoInfoWindowAdapter = new DemoInfoWindowAdapter( getContext(), ServiceHandler.getNavi(), ServiceHandler.getImageloader() ); - - mMarkerIcon = BitmapFactory.decodeResource( getResources(), R.drawable.ic_search_poi_location ); - mClickedMarkerIcon = BitmapFactory.decodeResource( getResources(), R.drawable.ic_search_choice_point ); - mAddMarker = findViewById( R.id.demo_module_id_add_marker ); - mAddMarker.setOnClickListener( new View.OnClickListener() { - @Override - public void onClick( View v ) { - MogoMarkerOptions options = new MogoMarkerOptions() - .icon( mMarkerIcon ) - .latitude( 39.974525d ) - .owner( DemoConstants.TAG ) - .longitude( 116.41733d ); - IMogoMarker marker = ServiceHandler.getMarkerManager().addMarker( DemoConstants.TAG, options ); - marker.setInfoWindowAdapter( mDemoInfoWindowAdapter ); - marker.setOnMarkerClickListener( DemoCardViewFragment.this ); - } - } ); - mAddMarkers = findViewById( R.id.demo_module_id_add_markers ); - mAddMarkers.setOnClickListener( new View.OnClickListener() { - @Override - public void onClick( View v ) { - - ArrayList< MogoMarkerOptions > optionsList = new ArrayList<>(); - for ( int i = 0; i < 10; i++ ) { - MogoMarkerOptions options = new MogoMarkerOptions() - .owner( DemoConstants.TAG ) - .latitude( 39.974525d + new Random().nextDouble() ) - .longitude( 116.41733d + new Random().nextDouble() ); - if ( i % 2 == 0 ) { - options.icon( mMarkerIcon ); - } else { - options.icon( mDemoInfoWindowAdapter.getMarkerView( options ) ); - } - optionsList.add( options ); - } - List< IMogoMarker > iMogoMarkers = ServiceHandler.getMarkerManager().addMarkers( DemoConstants.TAG, optionsList, true ); - for ( IMogoMarker iMogoMarker : iMogoMarkers ) { - iMogoMarker.setInfoWindowAdapter( mDemoInfoWindowAdapter ); - iMogoMarker.setOnMarkerClickListener( DemoCardViewFragment.this ); - } - } - } ); - - findViewById( R.id.demo_module_id_clear ).setOnClickListener( new View.OnClickListener() { - @Override - public void onClick( View v ) { - ServiceHandler.getMarkerManager().removeMarkers( DemoConstants.TAG ); - } - } ); - - m2D3D.setOnClickListener( new View.OnClickListener() { - - private EnumMapUI ui = EnumMapUI.NorthUP_2D; - - @Override - public void onClick( View v ) { - ServiceHandler.getMapUIController().changeMapMode( ui = ui.next() ); - m2D3D.setText( ui.toString() ); - } - } ); - - findViewById( R.id.demo_module_id_current ).setOnClickListener( new View.OnClickListener() { - @Override - public void onClick( View v ) { - ServiceHandler.getMapUIController().moveToCenter( new MogoLatLng( mLocation.getLatitude(), mLocation.getLongitude() ) ); - } - } ); - - findViewById( R.id.demo_module_id_start_navi ).setOnClickListener( new View.OnClickListener() { - @Override - public void onClick( View v ) { - ServiceHandler.getNavi().startNavi( !mNaviMode.isChecked() ); - } - } ); - - findViewById( R.id.demo_module_id_stop_navi ).setOnClickListener( new View.OnClickListener() { - @Override - public void onClick( View v ) { - ServiceHandler.getNavi().stopNavi(); - } - } ); - - findViewById( R.id.demo_module_id_traffic ).setOnClickListener( new View.OnClickListener() { - - private boolean enable = true; - - @Override - public void onClick( View v ) { - ServiceHandler.getMapUIController().setTrafficEnabled( enable = !enable ); - } - } ); - - findViewById( R.id.demo_module_id_zoom_in ).setOnClickListener( new View.OnClickListener() { - - @Override - public void onClick( View v ) { - ServiceHandler.getMapUIController().changeZoom( true ); - } - } ); - - findViewById( R.id.demo_module_id_zoom_out ).setOnClickListener( new View.OnClickListener() { - - @Override - public void onClick( View v ) { - ServiceHandler.getMapUIController().changeZoom( false ); - } - } ); - - findViewById( R.id.demo_module_id_day_light ).setOnClickListener( new View.OnClickListener() { - - @Override - public void onClick( View v ) { - ServiceHandler.getMapUIController().changeMapMode( EnumMapUI.Type_Light ); - } - } ); - - findViewById( R.id.demo_module_id_day_night ).setOnClickListener( new View.OnClickListener() { - - @Override - public void onClick( View v ) { - ServiceHandler.getMapUIController().changeMapMode( EnumMapUI.Type_Night ); - } - } ); - - findViewById( R.id.demo_module_id_display_overlay ).setOnClickListener( new View.OnClickListener() { - - @Override - public void onClick( View v ) { - ServiceHandler.getMapUIController().displayOverview(); - } - } ); - - findViewById( R.id.demo_module_id_reverse_lock ).setOnClickListener( new View.OnClickListener() { - - @Override - public void onClick( View v ) { - ServiceHandler.getMapUIController().recoverLockMode(); - } - } ); - - ServiceHandler.getLocationClient().addLocationListener( new IMogoLocationListener() { - @Override - public void onLocationChanged( MogoLocation location ) { - mLocation = location; - Logger.d( TAG, "demo模块定位，定位间隔4s" ); - } - } ); - } - - @Override - public void onActivityCreated( @Nullable Bundle savedInstanceState ) { - super.onActivityCreated( savedInstanceState ); - getViewLifecycleOwner().getLifecycle().addObserver( mPresenter ); - } - - @Override - public boolean onMarkerClicked( IMogoMarker marker ) { -// if ( mLastClickedMarker != null ) { -// mLastClickedMarker.setIcon( this.mMarkerIcon ); -// } -// marker.setIcon( mClickedMarkerIcon ); -// mLastClickedMarker = marker; - -// marker.showInfoWindow(); - return true; - } - - @NonNull - @Override - protected Presenter createPresenter() { - return new Presenter( this ) { - }; - } - - @Override - public void onPerform() { - Logger.d( TAG, "卡片demo有效" ); - } - - @Override - public void onDisable() { - Logger.d( TAG, "卡片demo无效" ); - } - - - @Override - public void onMapLoaded() { - Logger.d( TAG, "地图加载事件" ); - } - - @Override - public void onTouch( MotionEvent motionEvent ) { -// Logger.d( TAG, "地图触摸事件" ); - } - - @Override - public void onPOIClick( MogoPoi poi ) { - if ( poi != null ) { - TipToast.shortTip( poi.getName() ); - } - ServiceHandler.getPoiSearch().searchPOIIdAsyn( poi.getPoiId() ); - } - - @Override - public void onPoiSearched( MogoPoiResult result, int errorCode ) { - - } - - private IMogoMarker mPoiMarker; - - @Override - public void onPoiItemSearched( MogoPoiItem item, int errorCode ) { - if ( item == null ) { - return; - } - if ( mPoiMarker != null ) { - mPoiMarker.destroy(); - } - mPoiMarker = ServiceHandler.getMarkerManager().addMarker( DemoConstants.TAG, new MogoMarkerOptions() - .longitude( item.getPoint().lng ) - .latitude( item.getPoint().lat ) - .icon( mMarkerIcon ) ); - if ( mPoiMarker != null ) { - mPoiMarker.setInfoWindowAdapter( mDemoInfoWindowAdapter ); - mPoiMarker.setObject( item ); - mPoiMarker.showInfoWindow(); - } - } - - @Override - public void onLocationChanged( MogoLocation location ) { - mLocation = location; - Logger.i( TAG, "接受到的地图模块定位信息" ); - if ( mLocInfo != null ) { - if ( location.getErrCode() == 0 ) { - mLocInfo.setText( "当前位置：" + location.getAddress() ); - } else { - mLocInfo.setText( location.getErrInfo() ); - } - } - } - - @Override - public void onMapClick( MogoLatLng latLng ) { - - } - - @Override - public void onLockMap( boolean isLock ) { - - } - - @Override - public void onMapModeChanged( EnumMapUI ui ) { - Logger.d( TAG, ui.name() ); - } - - @Override - public void onDestroyView() { - Logger.w( TAG, "onDestroyView position=" + position ); - super.onDestroyView(); - getViewLifecycleOwner().getLifecycle().removeObserver( mPresenter ); - ServiceHandler.getLocationClient().removeLocationListener( this ); - } -} diff --git a/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoCardViewProvider.java b/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoCardViewProvider.java deleted file mode 100644 index 12f06d2fea..0000000000 --- a/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoCardViewProvider.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.mogo.demo.module.map; - -import android.content.Context; -import android.os.Bundle; -import android.view.MotionEvent; -import android.view.View; - -import androidx.fragment.app.Fragment; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.map.MogoLatLng; -import com.mogo.map.listener.IMogoMapListener; -import com.mogo.map.location.IMogoLocationListener; -import com.mogo.map.location.MogoLocation; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.model.MogoPoi; -import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.map.search.geo.MogoPoiItem; -import com.mogo.map.search.poisearch.IMogoPoiSearchListener; -import com.mogo.map.search.poisearch.MogoPoiResult; -import com.mogo.map.uicontroller.EnumMapUI; -import com.mogo.module.common.MogoModulePaths; -import com.mogo.service.module.IMogoModuleLifecycle; -import com.mogo.service.module.IMogoModuleProvider; -import com.mogo.utils.logger.Logger; - -/** - * @author congtaowang - * @since 2019-12-24 - *

- * 描述 - */ -@Route( path = DemoConstants.TAG ) -public class DemoCardViewProvider implements IMogoModuleProvider { - - private static final String TAG = "DemoCardViewProvider"; - - private DemoCardViewFragment fragment; - - @Override - public Fragment createFragment( Context context, Bundle data ) { - fragment = new DemoCardViewFragment(); - fragment.setArguments( data ); - Logger.i( TAG, "createFragment" ); - return fragment; - } - - @Override - public void init( Context context ) { - ServiceHandler.init( context ); - } - - @Override - public String getModuleName() { - return DemoConstants.TAG; - } - - @Override - public View createView( Context context ) { - // don't - return null; - } - - @Override - public int getType() { - return IMogoModuleProvider.TYPE_FRAGMENT; - } - - @Override - public IMogoNaviListener getNaviListener() { - return null; - } - - - @Override - public IMogoModuleLifecycle getCardLifecycle() { - return fragment; - } - - @Override - public IMogoMapListener getMapListener() { - return fragment; - } - - @Override - public IMogoLocationListener getLocationListener() { - return fragment; - } -} diff --git a/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoConstants.java b/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoConstants.java deleted file mode 100644 index 3178029fde..0000000000 --- a/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoConstants.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.mogo.demo.module.map; - -import com.mogo.module.common.MogoModulePaths; - -/** - * @author congtaowang - * @since 2019-12-24 - *

- * 描述 - */ -public class DemoConstants { - - public static final String TAG = "/demo/ui"; -} diff --git a/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoInfoWindowAdapter.java b/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoInfoWindowAdapter.java deleted file mode 100644 index e5e0dc8043..0000000000 --- a/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoInfoWindowAdapter.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.mogo.demo.module.map; - -import android.content.Context; -import android.graphics.Bitmap; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.Button; -import android.widget.TextView; - -import com.mogo.map.marker.IMogoInfoWindowAdapter; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.map.navi.IMogoNavi; -import com.mogo.map.navi.MogoNaviConfig; -import com.mogo.map.search.geo.MogoPoiItem; -import com.mogo.service.imageloader.IMogoImageLoaderListener; -import com.mogo.service.imageloader.IMogoImageloader; -import com.mogo.service.imageloader.MogoImageView; -import com.mogo.utils.WindowUtils; -import com.mogo.utils.logger.Logger; -import com.mogo.utils.network.utils.Util; - -import java.text.SimpleDateFormat; -import java.util.Date; - -/** - * @author congtaowang - * @since 2019-12-24 - *

- * 描述 - */ -public class DemoInfoWindowAdapter implements IMogoInfoWindowAdapter { - - private static final String TAG = "DemoInfoWindowAdapter"; - - private Context mContext; - private IMogoNavi mNavi; - private IMogoImageloader mImageloader; - - public DemoInfoWindowAdapter( Context mContext, IMogoNavi mNavi, IMogoImageloader iMogoImageloader ) { - this.mContext = mContext; - this.mNavi = mNavi; - this.mImageloader = iMogoImageloader; - } - - @Override - public View getInfoWindow( IMogoMarker marker ) { - if ( marker.getObject() instanceof MogoPoiItem ) { - View view = LayoutInflater.from( mContext ).inflate( R.layout.demo_module_demo_poi_info_window, null ); - renderPoiVew( view, marker, ( ( MogoPoiItem ) marker.getObject() ) ); - return view; - } else { - View view = LayoutInflater.from( mContext ).inflate( R.layout.demo_module_demo_info_window, null ); - renderView( view, marker ); - return view; - } - - } - - private void renderView( View view, final IMogoMarker marker ) { - final TextView time = view.findViewById( R.id.demo_module_id_iw_time ); - Button refresh = view.findViewById( R.id.demo_module_id_iw_refresh ); - time.setText( new SimpleDateFormat( "yyyyMMdd HHMMSS" ).format( new Date() ) ); - refresh.setOnClickListener( new View.OnClickListener() { - @Override - public void onClick( View v ) { - marker.showInfoWindow(); - } - } ); - Button navi2 = view.findViewById( R.id.demo_module_id_iw_navito ); - navi2.setOnClickListener( new View.OnClickListener() { - @Override - public void onClick( View v ) { - if ( mNavi != null ) { - mNavi.naviTo( marker.getPosition(), new MogoNaviConfig() ); - } - } - } ); - Button stopNavi = view.findViewById( R.id.demo_module_id_iw_navi_stop ); - stopNavi.setOnClickListener( new View.OnClickListener() { - @Override - public void onClick( View v ) { - if ( mNavi != null ) { - mNavi.stopNavi(); - } - } - } ); - } - - private void renderPoiVew( View view, final IMogoMarker marker, MogoPoiItem item ) { - final TextView time = view.findViewById( R.id.demo_module_id_iw_poi_title ); - time.setText( item.getTitle() ); - Button navi2 = view.findViewById( R.id.demo_module_id_iw_poi_navito ); - navi2.setOnClickListener( new View.OnClickListener() { - @Override - public void onClick( View v ) { - if ( mNavi != null ) { - mNavi.naviTo( marker.getPosition(), new MogoNaviConfig() ); - } - marker.hideInfoWindow(); - marker.remove(); - } - } ); - } - - public View getMarkerView( final MogoMarkerOptions options ) { - final View view = LayoutInflater.from( mContext ).inflate( R.layout.demo_module_demo_bubble_marker, null ); - final MogoImageView icon = view.findViewById( R.id.icon ); - mImageloader.displayImage( "http://imgnews.gmw.cn/attachement/jpg/site2/20191229/00d86176ed0b1f71f4580f.jpg", icon, WindowUtils.dip2px( mContext, 50 ), WindowUtils.dip2px( mContext, 50 ), - new IMogoImageLoaderListener() { - @Override - public void onStart() { - - } - - @Override - public void onCompleted( Bitmap bitmap ) { - // 刷新图标 - Logger.d( TAG, "loaded." ); - options.icon( view ); - options.notifyObservers(); - } - - @Override - public void onFailure( Exception e ) { - - } - } ); - return view; - } -} - diff --git a/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/ServiceHandler.java b/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/ServiceHandler.java deleted file mode 100644 index 3eff1914fb..0000000000 --- a/demo/demo-module-map/src/main/java/com/mogo/demo/module/map/ServiceHandler.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.mogo.demo.module.map; - -import android.content.Context; - -import com.alibaba.android.arouter.launcher.ARouter; -import com.mogo.map.location.IMogoLocationClient; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.IMogoMarkerManager; -import com.mogo.map.navi.IMogoNavi; -import com.mogo.map.search.poisearch.IMogoPoiSearch; -import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; -import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.service.MogoServicePaths; -import com.mogo.service.imageloader.IMogoImageloader; -import com.mogo.service.map.IMogoMapService; - -/** - * @author congtaowang - * @since 2019-12-30 - *

- * 持有服务接口实例 - */ -public class ServiceHandler { - - private static IMogoMapService mMapService; - - private static IMogoPoiSearch mPoiSearch; - private static IMogoLocationClient mLocationClient; - private static IMogoMarkerManager mMarkerManager; - private static IMogoNavi mNavi; - private static IMogoMapUIController mMapUIController; - - private static IMogoImageloader mImageloader; - - public static void init( Context context ) { - mMapService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation( context ); - mMapService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation( context ); - mImageloader = ( IMogoImageloader ) ARouter.getInstance().build( MogoServicePaths.PATH_UTILS_IMAGE_LOADER ).navigation( context ); - mPoiSearch = mMapService.getPoiSearch( context, new MogoPoiSearchQuery() ); - mLocationClient = mMapService.getLocationClient( context ); - mMarkerManager = mMapService.getMarkerManager( context ); - mNavi = mMapService.getNavi( context ); - mMapUIController = mMapService.getMapUIController(); - } - - public static IMogoMapService getMapService() { - return mMapService; - } - - public static IMogoPoiSearch getPoiSearch() { - return mPoiSearch; - } - - public static IMogoLocationClient getLocationClient() { - return mLocationClient; - } - - public static IMogoMarkerManager getMarkerManager() { - return mMarkerManager; - } - - public static IMogoNavi getNavi() { - return mNavi; - } - - public static IMogoMapUIController getMapUIController() { - return mMapUIController; - } - - public static IMogoImageloader getImageloader() { - return mImageloader; - } -} diff --git a/demo/demo-module-map/src/main/res/drawable/ic_launcher.png b/demo/demo-module-map/src/main/res/drawable/ic_launcher.png deleted file mode 100644 index 898f3ed59a..0000000000 Binary files a/demo/demo-module-map/src/main/res/drawable/ic_launcher.png and /dev/null differ diff --git a/demo/demo-module-map/src/main/res/drawable/ic_launcher_round.png b/demo/demo-module-map/src/main/res/drawable/ic_launcher_round.png deleted file mode 100644 index dae5e08234..0000000000 Binary files a/demo/demo-module-map/src/main/res/drawable/ic_launcher_round.png and /dev/null differ diff --git a/demo/demo-module-map/src/main/res/layout/demo_module_card_view.xml b/demo/demo-module-map/src/main/res/layout/demo_module_card_view.xml deleted file mode 100644 index 3a5cf150c4..0000000000 --- a/demo/demo-module-map/src/main/res/layout/demo_module_card_view.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - -