diff --git a/modules/mogo-module-push-base/build/generated/source/buildConfig/debug/com/mogo/module/push/base/BuildConfig.java b/modules/mogo-module-push-base/build/generated/source/buildConfig/debug/com/mogo/module/push/base/BuildConfig.java deleted file mode 100644 index 531274d279..0000000000 --- a/modules/mogo-module-push-base/build/generated/source/buildConfig/debug/com/mogo/module/push/base/BuildConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package com.mogo.module.push.base; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String LIBRARY_PACKAGE_NAME = "com.mogo.module.push.base"; - /** - * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME - */ - @Deprecated - public static final String APPLICATION_ID = "com.mogo.module.push.base"; - public static final String BUILD_TYPE = "debug"; - public static final String FLAVOR = ""; - public static final int VERSION_CODE = 1; - public static final String VERSION_NAME = "1.1.5.5"; -} diff --git a/modules/mogo-module-push-base/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/modules/mogo-module-push-base/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml deleted file mode 100644 index e96a4f6921..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-push-base/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json b/modules/mogo-module-push-base/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json deleted file mode 100644 index f901ebd0db..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1.5.5","enabled":true,"outputFile":"mogo-module-push-base-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.mogo.module.push.base","split":""}}] \ No newline at end of file diff --git a/modules/mogo-module-push-base/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/modules/mogo-module-push-base/build/intermediates/annotation_processor_list/debug/annotationProcessors.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/annotation_processor_list/debug/annotationProcessors.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/modules/mogo-module-push-base/build/intermediates/compile_library_classes/debug/classes.jar b/modules/mogo-module-push-base/build/intermediates/compile_library_classes/debug/classes.jar deleted file mode 100644 index 77fbebb36a..0000000000 Binary files a/modules/mogo-module-push-base/build/intermediates/compile_library_classes/debug/classes.jar and /dev/null differ diff --git a/modules/mogo-module-push-base/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar b/modules/mogo-module-push-base/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar deleted file mode 100644 index d20cb8e51b..0000000000 Binary files a/modules/mogo-module-push-base/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ diff --git a/modules/mogo-module-push-base/build/intermediates/incremental/debug-mergeNativeLibs/merge-state b/modules/mogo-module-push-base/build/intermediates/incremental/debug-mergeNativeLibs/merge-state deleted file mode 100644 index 26ba7f68ac..0000000000 Binary files a/modules/mogo-module-push-base/build/intermediates/incremental/debug-mergeNativeLibs/merge-state and /dev/null differ diff --git a/modules/mogo-module-push-base/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/modules/mogo-module-push-base/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml deleted file mode 100644 index 595ca12085..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/modules/mogo-module-push-base/build/intermediates/incremental/mergeDebugShaders/merger.xml b/modules/mogo-module-push-base/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index 8444420417..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/modules/mogo-module-push-base/build/intermediates/incremental/packageDebugAssets/merger.xml b/modules/mogo-module-push-base/build/intermediates/incremental/packageDebugAssets/merger.xml deleted file mode 100644 index 0f9983fad1..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/incremental/packageDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/modules/mogo-module-push-base/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/modules/mogo-module-push-base/build/intermediates/incremental/packageDebugResources/compile-file-map.properties deleted file mode 100644 index ab587515f4..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/incremental/packageDebugResources/compile-file-map.properties +++ /dev/null @@ -1 +0,0 @@ -#Tue Aug 04 18:41:32 CST 2020 diff --git a/modules/mogo-module-push-base/build/intermediates/incremental/packageDebugResources/merger.xml b/modules/mogo-module-push-base/build/intermediates/incremental/packageDebugResources/merger.xml deleted file mode 100644 index 4e71560adb..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/incremental/packageDebugResources/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/modules/mogo-module-push-base/build/intermediates/javac/debug/classes/com/mogo/module/push/base/BuildConfig.class b/modules/mogo-module-push-base/build/intermediates/javac/debug/classes/com/mogo/module/push/base/BuildConfig.class deleted file mode 100644 index 9172ea0b72..0000000000 Binary files a/modules/mogo-module-push-base/build/intermediates/javac/debug/classes/com/mogo/module/push/base/BuildConfig.class and /dev/null differ diff --git a/modules/mogo-module-push-base/build/intermediates/javac/debug/classes/com/mogo/module/push/base/PushUIConstants.class b/modules/mogo-module-push-base/build/intermediates/javac/debug/classes/com/mogo/module/push/base/PushUIConstants.class deleted file mode 100644 index 10f3c72d7c..0000000000 Binary files a/modules/mogo-module-push-base/build/intermediates/javac/debug/classes/com/mogo/module/push/base/PushUIConstants.class and /dev/null differ diff --git a/modules/mogo-module-push-base/build/intermediates/library_java_res/debug/res.jar b/modules/mogo-module-push-base/build/intermediates/library_java_res/debug/res.jar deleted file mode 100644 index 15cb0ecb3e..0000000000 Binary files a/modules/mogo-module-push-base/build/intermediates/library_java_res/debug/res.jar and /dev/null differ diff --git a/modules/mogo-module-push-base/build/intermediates/library_manifest/debug/AndroidManifest.xml b/modules/mogo-module-push-base/build/intermediates/library_manifest/debug/AndroidManifest.xml deleted file mode 100644 index e96a4f6921..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/library_manifest/debug/AndroidManifest.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-push-base/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt b/modules/mogo-module-push-base/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt deleted file mode 100644 index 78ac5b8bef..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt +++ /dev/null @@ -1,2 +0,0 @@ -R_DEF: Internal format may change without notice -local diff --git a/modules/mogo-module-push-base/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/modules/mogo-module-push-base/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt deleted file mode 100644 index e724a4f175..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ /dev/null @@ -1,13 +0,0 @@ -1 -2 -6 -7 /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml -9 android:targetSdkVersion="22" /> -9-->/Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml -10 -11 diff --git a/modules/mogo-module-push-base/build/intermediates/merged_manifests/debug/output.json b/modules/mogo-module-push-base/build/intermediates/merged_manifests/debug/output.json deleted file mode 100644 index 29b617ab55..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/merged_manifests/debug/output.json +++ /dev/null @@ -1 +0,0 @@ -[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1.5.5","enabled":true,"outputFile":"mogo-module-push-base-debug.aar","fullName":"debug","baseName":"debug"},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.mogo.module.push.base","split":""}}] \ No newline at end of file diff --git a/modules/mogo-module-push-base/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt b/modules/mogo-module-push-base/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt deleted file mode 100644 index 32b8e6386e..0000000000 --- a/modules/mogo-module-push-base/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt +++ /dev/null @@ -1 +0,0 @@ -com.mogo.module.push.base diff --git a/modules/mogo-module-push-base/build/intermediates/runtime_library_classes/debug/classes.jar b/modules/mogo-module-push-base/build/intermediates/runtime_library_classes/debug/classes.jar deleted file mode 100644 index 77fbebb36a..0000000000 Binary files a/modules/mogo-module-push-base/build/intermediates/runtime_library_classes/debug/classes.jar and /dev/null differ diff --git a/modules/mogo-module-push-base/build/intermediates/symbols/debug/R.txt b/modules/mogo-module-push-base/build/intermediates/symbols/debug/R.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/modules/mogo-module-push-base/build/outputs/logs/manifest-merger-debug-report.txt b/modules/mogo-module-push-base/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index fb652f02eb..0000000000 --- a/modules/mogo-module-push-base/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,37 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:2:1-3:52 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:2:1-3:52 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:2:1-3:52 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:2:1-3:52 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:2:1-3:52 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:2:1-3:52 -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:2:1-3:52 - package - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:3:5-40 - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - android:versionName - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:2:1-3:52 - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - android:versionCode - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:2:1-3:52 - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - xmlns:android - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml:2:11-69 -uses-sdk -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml reason: use-sdk injection requested -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml -INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - android:targetSdkVersion - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - android:minSdkVersion - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - ADDED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml - INJECTED from /Users/admin/Android/ADAS/Launcher/modules/mogo-module-push-base/src/main/AndroidManifest.xml diff --git a/modules/mogo-module-push-base/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin b/modules/mogo-module-push-base/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin deleted file mode 100644 index 070f7a1bc2..0000000000 Binary files a/modules/mogo-module-push-base/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin and /dev/null differ diff --git a/modules/mogo-module-push-base/build/tmp/kapt3/incApCache/debug/classpath-entries.bin b/modules/mogo-module-push-base/build/tmp/kapt3/incApCache/debug/classpath-entries.bin deleted file mode 100644 index 7f9101a5b9..0000000000 Binary files a/modules/mogo-module-push-base/build/tmp/kapt3/incApCache/debug/classpath-entries.bin and /dev/null differ diff --git a/modules/mogo-module-push-base/build/tmp/kapt3/incApCache/debug/classpath-structure.bin b/modules/mogo-module-push-base/build/tmp/kapt3/incApCache/debug/classpath-structure.bin deleted file mode 100644 index 1db7cc8236..0000000000 Binary files a/modules/mogo-module-push-base/build/tmp/kapt3/incApCache/debug/classpath-structure.bin and /dev/null differ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 1d0189338f..b82cca0027 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -364,7 +364,8 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } int size = getAppropriateSize( maxAmount, exploreWayList ); Map< String, IMogoMarker > existCarMap = purgeMarkerData( exploreWayList, ModuleNames.CARD_TYPE_ROAD_CONDITION ); - Logger.i( TAG, "existCarMap: size = %d", existCarMap.size() );for ( int i = 0; i < size; i++ ) { + Logger.i( TAG, "existCarMap: size = %d", existCarMap.size() ); + for ( int i = 0; i < size; i++ ) { MarkerExploreWay markerExploreWay = exploreWayList.get( i ); if ( !markerExploreWay.getCanLive() ) { MarkerLocation markerLocation = markerExploreWay.getLocation(); @@ -402,7 +403,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, return; } IMogoMarker marker = drawMapMarker( entity, ServiceConst.MARKER_Z_INDEX_HIGH ); - marker.startScaleAnimationWithAlpha( 0, 1.2f, 0, 1.2f, 0f, 1f,300, new LinearInterpolator(), new OnMarkerAnimationListener() { + marker.startScaleAnimationWithAlpha( 0, 1.2f, 0, 1.2f, 0f, 1f, 300, new LinearInterpolator(), new OnMarkerAnimationListener() { @Override public void onAnimStart() { Logger.d( TAG, " onAnimStart ---1----> " ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java index 33d1fd0cc1..d87bec74a3 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java @@ -67,11 +67,7 @@ public class RefreshModel { refreshBody.limit = limit; refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lng ); refreshBody.radius = radius; - refreshBody.dataType.add( ServiceConst.CARD_TYPE_CARS_CHATTING ); refreshBody.dataType.add( ServiceConst.CARD_TYPE_ROAD_CONDITION ); - refreshBody.dataType.add( ServiceConst.CARD_TYPE_SHARE_MUSIC ); -// refreshBody.dataType.add(ServiceConst.CARD_TYPE_USER_DATA); - refreshBody.dataType.add( ServiceConst.CARD_TYPE_NOVELTY ); String data = GsonUtil.jsonFromObject( refreshBody ); query.put( "data", data );