From 91c9e65e30b7b830c388a9a107f8c79db9f1c25b Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Thu, 2 Jan 2020 18:36:37 +0800 Subject: [PATCH] notify card accOn when acc on --- app/build.gradle | 9 +- build.gradle | 2 +- demo/demo-module-map/build.gradle | 53 - demo/demo-module-map/gradle.properties | 3 - .../src/main/AndroidManifest.xml | 2 - .../demo/module/map/DemoCardViewFragment.java | 364 --- .../demo/module/map/DemoCardViewProvider.java | 90 - .../mogo/demo/module/map/DemoConstants.java | 14 - .../module/map/DemoInfoWindowAdapter.java | 132 -- .../mogo/demo/module/map/ServiceHandler.java | 73 - .../src/main/res/drawable/ic_launcher.png | Bin 2963 -> 0 bytes .../main/res/drawable/ic_launcher_round.png | Bin 2783 -> 0 bytes .../main/res/layout/demo_module_card_view.xml | 152 -- .../layout/demo_module_demo_bubble_marker.xml | 23 - .../layout/demo_module_demo_info_window.xml | 46 - .../demo_module_demo_poi_info_window.xml | 27 - .../src/main/res/values/strings.xml | 3 - demo/demo-module-map2/.gitignore | 1 - demo/demo-module-map2/build.gradle | 53 - demo/demo-module-map2/consumer-rules.pro | 0 demo/demo-module-map2/gradle.properties | 3 - demo/demo-module-map2/proguard-rules.pro | 21 - .../src/main/AndroidManifest.xml | 2 - .../module/map2/Demo2CardViewFragment.java | 388 ---- .../module/map2/Demo2CardViewProvider.java | 79 - .../mogo/demo/module/map2/Demo2Constants.java | 12 - .../module/map2/Demo2InfoWindowAdapter.java | 131 -- .../demo/module/map2/Service2Handler.java | 72 - .../res/layout/demo2_module_card_view.xml | 165 -- .../demo2_module_demo_bubble_marker.xml | 23 - .../layout/demo2_module_demo_info_window.xml | 46 - .../demo2_module_demo_poi_info_window.xml | 27 - .../src/main/res/values/strings.xml | 3 - demo/mogo-module-tanlu/.gitignore | 1 - demo/mogo-module-tanlu/consumer-rules.pro | 0 demo/mogo-module-tanlu/proguard-rules.pro | 21 - .../49d7ab72247aaef4db980a35afc218b5.bin | 1 - .../full/classes.dex | Bin 24000 -> 0 bytes .../e0d467f1a5213a48fbac63ff3056db9a.bin | 1 - .../arouter/routes/ARouter$$Group$$tanlu.java | 18 - .../ARouter$$Providers$$tanlumodule.java | 18 - .../routes/ARouter$$Root$$tanlumodule.java | 17 - .../com/zhidao/tanlu/test/BuildConfig.java | 13 - .../debug/com/zhidao/tanlu/BuildConfig.java | 18 - .../debug/aapt/AndroidManifest.xml | 10 - .../debug/aapt/output.json | 1 - .../debug/annotationProcessors.json | 1 - .../compile_library_classes/debug/classes.jar | Bin 31305 -> 0 bytes .../debug/R.jar | Bin 450711 -> 0 bytes .../debug/createFullJarDebug/full.jar | Bin 31305 -> 0 bytes .../debug-mergeNativeLibs/merge-state | Bin 601 -> 0 bytes .../mergeDebugJniLibFolders/merger.xml | 2 - .../incremental/mergeDebugShaders/merger.xml | 2 - .../incremental/packageDebugAssets/merger.xml | 2 - .../compile-file-map.properties | 5 - .../merged.dir/values/values.xml | 18 - .../packageDebugResources/merger.xml | 2 - .../routes/ARouter$$Group$$tanlu.class | Bin 1375 -> 0 bytes .../ARouter$$Providers$$tanlumodule.class | Bin 1461 -> 0 bytes .../routes/ARouter$$Root$$tanlumodule.class | Bin 1039 -> 0 bytes .../com/zhidao/tanlu/BuildConfig.class | Bin 819 -> 0 bytes .../tanlu/TanluCardViewFragment$1.class | Bin 1011 -> 0 bytes .../tanlu/TanluCardViewFragment$10.class | Bin 1018 -> 0 bytes .../tanlu/TanluCardViewFragment$11.class | Bin 1018 -> 0 bytes .../tanlu/TanluCardViewFragment$12.class | Bin 1163 -> 0 bytes .../tanlu/TanluCardViewFragment$13.class | Bin 1163 -> 0 bytes .../tanlu/TanluCardViewFragment$14.class | Bin 1015 -> 0 bytes .../tanlu/TanluCardViewFragment$15.class | Bin 1015 -> 0 bytes .../tanlu/TanluCardViewFragment$16.class | Bin 1152 -> 0 bytes .../tanlu/TanluCardViewFragment$17.class | Bin 739 -> 0 bytes .../tanlu/TanluCardViewFragment$2.class | Bin 2074 -> 0 bytes .../tanlu/TanluCardViewFragment$3.class | Bin 3032 -> 0 bytes .../tanlu/TanluCardViewFragment$4.class | Bin 1071 -> 0 bytes .../tanlu/TanluCardViewFragment$5.class | Bin 1496 -> 0 bytes .../tanlu/TanluCardViewFragment$6.class | Bin 1314 -> 0 bytes .../tanlu/TanluCardViewFragment$7.class | Bin 1187 -> 0 bytes .../tanlu/TanluCardViewFragment$8.class | Bin 957 -> 0 bytes .../tanlu/TanluCardViewFragment$9.class | Bin 1151 -> 0 bytes .../zhidao/tanlu/TanluCardViewFragment.class | Bin 11849 -> 0 bytes .../zhidao/tanlu/TanluCardViewProvider.class | Bin 2164 -> 0 bytes .../com/zhidao/tanlu/TanluConstants.class | Bin 375 -> 0 bytes .../tanlu/TanluInfoWindowAdapter$1.class | Bin 1042 -> 0 bytes .../tanlu/TanluInfoWindowAdapter$2.class | Bin 1385 -> 0 bytes .../tanlu/TanluInfoWindowAdapter$3.class | Bin 1067 -> 0 bytes .../tanlu/TanluInfoWindowAdapter$4.class | Bin 1496 -> 0 bytes .../tanlu/TanluInfoWindowAdapter$5.class | Bin 1596 -> 0 bytes .../zhidao/tanlu/TanluInfoWindowAdapter.class | Bin 4765 -> 0 bytes .../zhidao/tanlu/TanluServiceHandler.class | Bin 2837 -> 0 bytes .../library_java_res/debug/res.jar | Bin 22 -> 0 bytes .../debug/AndroidManifest.xml | 10 - .../parseDebugLibraryResources/R-def.txt | 45 - .../manifest-merger-blame-debug-report.txt | 12 - ...-merger-blame-debug-androidTest-report.txt | 93 - .../merged_manifests/debug/output.json | 1 - .../debugAndroidTest/AndroidManifest.xml | 45 - .../debugAndroidTest/output.json | 1 - .../layout/tanlu_module_bubble_marker.xml | 23 - .../debug/layout/tanlu_module_card_view.xml | 157 -- .../debug/layout/tanlu_module_info_window.xml | 46 - .../layout/tanlu_module_poi_info_window.xml | 27 - .../packaged_res/debug/values/values.xml | 18 - .../debug/package-aware-r.txt | 1372 ------------ .../runtime_library_classes/debug/classes.jar | Bin 31305 -> 0 bytes .../build/intermediates/symbols/debug/R.txt | 1968 ----------------- .../logs/manifest-merger-debug-report.txt | 31 - gradle.properties | 2 +- .../com/mogo/module/main/MainActivity.java | 2 + .../module/main/cards/MogoModulesHandler.java | 5 + .../module/main/cards/MogoModulesManager.java | 56 +- .../module/main/receiver/MogoReceiver.java | 40 + .../mogo-module-tanlu}/.gitignore | 0 .../mogo-module-tanlu/build.gradle | 0 .../mogo-module-tanlu}/consumer-rules.pro | 0 .../mogo-module-tanlu/gradle.properties | 0 .../mogo-module-tanlu}/proguard-rules.pro | 0 .../zhidao/tanlu/ExampleInstrumentedTest.java | 0 .../src/main/AndroidManifest.xml | 0 .../com/mogo/tanlu/TanluCardViewFragment.java | 4 + .../com/mogo/tanlu/TanluCardViewProvider.java | 0 .../java/com/mogo/tanlu/TanluConstants.java | 0 .../mogo/tanlu/TanluInfoWindowAdapter.java | 0 .../com/mogo/tanlu/TanluServiceHandler.java | 0 .../main/res/layout/tanlu_bubble_marker.xml | 0 .../src/main/res/layout/tanlu_card_view.xml | 0 .../src/main/res/layout/tanlu_info_window.xml | 0 .../main/res/layout/tanlu_poi_info_window.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../com/zhidao/tanlu/ExampleUnitTest.java | 0 .../com/mogo/service/MogoServicePaths.java | 5 + .../service/module/IMogoModuleLifecycle.java | 5 + .../statusmanager/IMogoStatusManager.java | 68 + .../impl/statusmanager/MogoStatusManager.java | 88 + settings.gradle | 6 +- 134 files changed, 281 insertions(+), 6019 deletions(-) delete mode 100644 demo/demo-module-map/build.gradle delete mode 100644 demo/demo-module-map/gradle.properties delete mode 100644 demo/demo-module-map/src/main/AndroidManifest.xml delete mode 100644 demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoCardViewFragment.java delete mode 100644 demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoCardViewProvider.java delete mode 100644 demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoConstants.java delete mode 100644 demo/demo-module-map/src/main/java/com/mogo/demo/module/map/DemoInfoWindowAdapter.java delete mode 100644 demo/demo-module-map/src/main/java/com/mogo/demo/module/map/ServiceHandler.java delete mode 100644 demo/demo-module-map/src/main/res/drawable/ic_launcher.png delete mode 100644 demo/demo-module-map/src/main/res/drawable/ic_launcher_round.png delete mode 100644 demo/demo-module-map/src/main/res/layout/demo_module_card_view.xml delete mode 100644 demo/demo-module-map/src/main/res/layout/demo_module_demo_bubble_marker.xml delete mode 100644 demo/demo-module-map/src/main/res/layout/demo_module_demo_info_window.xml delete mode 100644 demo/demo-module-map/src/main/res/layout/demo_module_demo_poi_info_window.xml delete mode 100644 demo/demo-module-map/src/main/res/values/strings.xml delete mode 100644 demo/demo-module-map2/.gitignore delete mode 100644 demo/demo-module-map2/build.gradle delete mode 100644 demo/demo-module-map2/consumer-rules.pro delete mode 100644 demo/demo-module-map2/gradle.properties delete mode 100644 demo/demo-module-map2/proguard-rules.pro delete mode 100644 demo/demo-module-map2/src/main/AndroidManifest.xml delete mode 100644 demo/demo-module-map2/src/main/java/com/mogo/demo/module/map2/Demo2CardViewFragment.java delete mode 100644 demo/demo-module-map2/src/main/java/com/mogo/demo/module/map2/Demo2CardViewProvider.java delete mode 100644 demo/demo-module-map2/src/main/java/com/mogo/demo/module/map2/Demo2Constants.java delete mode 100644 demo/demo-module-map2/src/main/java/com/mogo/demo/module/map2/Demo2InfoWindowAdapter.java delete mode 100644 demo/demo-module-map2/src/main/java/com/mogo/demo/module/map2/Service2Handler.java delete mode 100644 demo/demo-module-map2/src/main/res/layout/demo2_module_card_view.xml delete mode 100644 demo/demo-module-map2/src/main/res/layout/demo2_module_demo_bubble_marker.xml delete mode 100644 demo/demo-module-map2/src/main/res/layout/demo2_module_demo_info_window.xml delete mode 100644 demo/demo-module-map2/src/main/res/layout/demo2_module_demo_poi_info_window.xml delete mode 100644 demo/demo-module-map2/src/main/res/values/strings.xml delete mode 100644 demo/mogo-module-tanlu/.gitignore delete mode 100644 demo/mogo-module-tanlu/consumer-rules.pro delete mode 100644 demo/mogo-module-tanlu/proguard-rules.pro delete mode 100644 demo/tanlu-module/build/.transforms/49d7ab72247aaef4db980a35afc218b5.bin delete mode 100644 demo/tanlu-module/build/.transforms/49d7ab72247aaef4db980a35afc218b5/full/classes.dex delete mode 100644 demo/tanlu-module/build/.transforms/e0d467f1a5213a48fbac63ff3056db9a.bin delete mode 100644 demo/tanlu-module/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.java delete mode 100644 demo/tanlu-module/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Providers$$tanlumodule.java delete mode 100644 demo/tanlu-module/build/generated/ap_generated_sources/debug/out/com/alibaba/android/arouter/routes/ARouter$$Root$$tanlumodule.java delete mode 100644 demo/tanlu-module/build/generated/source/buildConfig/androidTest/debug/com/zhidao/tanlu/test/BuildConfig.java delete mode 100644 demo/tanlu-module/build/generated/source/buildConfig/debug/com/zhidao/tanlu/BuildConfig.java delete mode 100644 demo/tanlu-module/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml delete mode 100644 demo/tanlu-module/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json delete mode 100644 demo/tanlu-module/build/intermediates/annotation_processor_list/debug/annotationProcessors.json delete mode 100644 demo/tanlu-module/build/intermediates/compile_library_classes/debug/classes.jar delete mode 100644 demo/tanlu-module/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar delete mode 100644 demo/tanlu-module/build/intermediates/full_jar/debug/createFullJarDebug/full.jar delete mode 100644 demo/tanlu-module/build/intermediates/incremental/debug-mergeNativeLibs/merge-state delete mode 100644 demo/tanlu-module/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml delete mode 100644 demo/tanlu-module/build/intermediates/incremental/mergeDebugShaders/merger.xml delete mode 100644 demo/tanlu-module/build/intermediates/incremental/packageDebugAssets/merger.xml delete mode 100644 demo/tanlu-module/build/intermediates/incremental/packageDebugResources/compile-file-map.properties delete mode 100644 demo/tanlu-module/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml delete mode 100644 demo/tanlu-module/build/intermediates/incremental/packageDebugResources/merger.xml delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$tanlu.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$tanlumodule.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$tanlumodule.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/BuildConfig.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$1.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$10.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$11.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$12.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$13.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$14.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$15.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$16.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$17.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$2.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$3.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$4.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$5.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$6.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$7.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$8.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment$9.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewFragment.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluCardViewProvider.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluConstants.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluInfoWindowAdapter$1.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluInfoWindowAdapter$2.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluInfoWindowAdapter$3.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluInfoWindowAdapter$4.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluInfoWindowAdapter$5.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluInfoWindowAdapter.class delete mode 100644 demo/tanlu-module/build/intermediates/javac/debug/classes/com/zhidao/tanlu/TanluServiceHandler.class delete mode 100644 demo/tanlu-module/build/intermediates/library_java_res/debug/res.jar delete mode 100644 demo/tanlu-module/build/intermediates/library_manifest/debug/AndroidManifest.xml delete mode 100644 demo/tanlu-module/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt delete mode 100644 demo/tanlu-module/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt delete mode 100644 demo/tanlu-module/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt delete mode 100644 demo/tanlu-module/build/intermediates/merged_manifests/debug/output.json delete mode 100644 demo/tanlu-module/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml delete mode 100644 demo/tanlu-module/build/intermediates/merged_manifests/debugAndroidTest/output.json delete mode 100644 demo/tanlu-module/build/intermediates/packaged_res/debug/layout/tanlu_module_bubble_marker.xml delete mode 100644 demo/tanlu-module/build/intermediates/packaged_res/debug/layout/tanlu_module_card_view.xml delete mode 100644 demo/tanlu-module/build/intermediates/packaged_res/debug/layout/tanlu_module_info_window.xml delete mode 100644 demo/tanlu-module/build/intermediates/packaged_res/debug/layout/tanlu_module_poi_info_window.xml delete mode 100644 demo/tanlu-module/build/intermediates/packaged_res/debug/values/values.xml delete mode 100644 demo/tanlu-module/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt delete mode 100644 demo/tanlu-module/build/intermediates/runtime_library_classes/debug/classes.jar delete mode 100644 demo/tanlu-module/build/intermediates/symbols/debug/R.txt delete mode 100644 demo/tanlu-module/build/outputs/logs/manifest-merger-debug-report.txt create mode 100644 modules/mogo-module-main/src/main/java/com/mogo/module/main/receiver/MogoReceiver.java rename {demo/demo-module-map => modules/mogo-module-tanlu}/.gitignore (100%) rename {demo => modules}/mogo-module-tanlu/build.gradle (100%) rename {demo/demo-module-map => modules/mogo-module-tanlu}/consumer-rules.pro (100%) rename {demo => modules}/mogo-module-tanlu/gradle.properties (100%) rename {demo/demo-module-map => modules/mogo-module-tanlu}/proguard-rules.pro (100%) rename {demo => modules}/mogo-module-tanlu/src/androidTest/java/com/zhidao/tanlu/ExampleInstrumentedTest.java (100%) rename {demo => modules}/mogo-module-tanlu/src/main/AndroidManifest.xml (100%) rename {demo => modules}/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewFragment.java (99%) rename {demo => modules}/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewProvider.java (100%) rename {demo => modules}/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluConstants.java (100%) rename {demo => modules}/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluInfoWindowAdapter.java (100%) rename {demo => modules}/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluServiceHandler.java (100%) rename {demo => modules}/mogo-module-tanlu/src/main/res/layout/tanlu_bubble_marker.xml (100%) rename {demo => modules}/mogo-module-tanlu/src/main/res/layout/tanlu_card_view.xml (100%) rename {demo => modules}/mogo-module-tanlu/src/main/res/layout/tanlu_info_window.xml (100%) rename {demo => modules}/mogo-module-tanlu/src/main/res/layout/tanlu_poi_info_window.xml (100%) rename {demo => modules}/mogo-module-tanlu/src/main/res/values/colors.xml (100%) rename {demo => modules}/mogo-module-tanlu/src/main/res/values/strings.xml (100%) rename {demo => modules}/mogo-module-tanlu/src/test/java/com/zhidao/tanlu/ExampleUnitTest.java (100%) create mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java create mode 100644 services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java 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 898f3ed59ac9f3248734a00e5902736c9367d455..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2963 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 JPDHLkV1g@XpTGbB 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 dae5e082342fcdeee5db8a6e0b27028e2d2808f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2783 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 lV%Z2*hu); - - - - - - - -