diff --git a/app/build.gradle b/app/build.gradle index 055b05b947..8aaae8ab84 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -68,6 +68,6 @@ dependencies { implementation project(':modules:mogo-module-common') implementation project(':demo:demo-module-map') implementation project(':demo:demo-module-map2') - implementation project(':demo:tanlu-module') + implementation project(':demo:mogo-module-tanlu') } } diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 01784418b0..ed377918a3 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -8,7 +8,7 @@ import com.mogo.commons.AbsMogoApplication; import com.mogo.demo.module.map.DemoConstants; import com.mogo.demo.module.map2.Demo2Constants; import com.mogo.module.common.MogoModulePaths; -import com.zhidao.tanlu.TanluConstants; +import com.mogo.tanlu.TanluConstants; /** * @author congtaowang diff --git a/config.gradle b/config.gradle index dcf0fd8157..e9d9a0920a 100644 --- a/config.gradle +++ b/config.gradle @@ -78,7 +78,7 @@ ext { // modules moduledemo : "com.mogo.module:module-demo:${DEMO_MODULE_MAP_VERSION}", moduledemo2 : "com.mogo.module:module-demo2:${DEMO_MODULE_MAP2_VERSION}", - tanlu : "com.mogo.module:tanlu-module:${MOGO_MODULE_TANLU_VERSION}", + tanlu : "com.mogo.module:mogo-module-tanlu:${MOGO_MODULE_TANLU_VERSION}", mogocommons : "com.mogo.commons:mogo-commons:${MOGO_COMMONS_VERSION}", mogoutils : "com.mogo.commons:mogo-utils:${MOGO_UTILS_VERSION}", mapamap : "com.mogo.map:map-amap:${MAP_AMAP_VERSION}", diff --git a/demo/tanlu-module/.gitignore b/demo/mogo-module-tanlu/.gitignore similarity index 100% rename from demo/tanlu-module/.gitignore rename to demo/mogo-module-tanlu/.gitignore diff --git a/demo/tanlu-module/build.gradle b/demo/mogo-module-tanlu/build.gradle similarity index 100% rename from demo/tanlu-module/build.gradle rename to demo/mogo-module-tanlu/build.gradle diff --git a/demo/tanlu-module/consumer-rules.pro b/demo/mogo-module-tanlu/consumer-rules.pro similarity index 100% rename from demo/tanlu-module/consumer-rules.pro rename to demo/mogo-module-tanlu/consumer-rules.pro diff --git a/demo/tanlu-module/gradle.properties b/demo/mogo-module-tanlu/gradle.properties similarity index 100% rename from demo/tanlu-module/gradle.properties rename to demo/mogo-module-tanlu/gradle.properties diff --git a/demo/tanlu-module/proguard-rules.pro b/demo/mogo-module-tanlu/proguard-rules.pro similarity index 100% rename from demo/tanlu-module/proguard-rules.pro rename to demo/mogo-module-tanlu/proguard-rules.pro diff --git a/demo/tanlu-module/src/androidTest/java/com/zhidao/tanlu/ExampleInstrumentedTest.java b/demo/mogo-module-tanlu/src/androidTest/java/com/zhidao/tanlu/ExampleInstrumentedTest.java similarity index 100% rename from demo/tanlu-module/src/androidTest/java/com/zhidao/tanlu/ExampleInstrumentedTest.java rename to demo/mogo-module-tanlu/src/androidTest/java/com/zhidao/tanlu/ExampleInstrumentedTest.java diff --git a/demo/tanlu-module/src/main/AndroidManifest.xml b/demo/mogo-module-tanlu/src/main/AndroidManifest.xml similarity index 66% rename from demo/tanlu-module/src/main/AndroidManifest.xml rename to demo/mogo-module-tanlu/src/main/AndroidManifest.xml index c50e289745..0c407d146c 100644 --- a/demo/tanlu-module/src/main/AndroidManifest.xml +++ b/demo/mogo-module-tanlu/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ + package="com.mogo.tanlu" /> diff --git a/demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluCardViewFragment.java b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewFragment.java similarity index 99% rename from demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluCardViewFragment.java rename to demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewFragment.java index 1133efc9a9..3dd94740b6 100644 --- a/demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluCardViewFragment.java +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewFragment.java @@ -1,4 +1,4 @@ -package com.zhidao.tanlu; +package com.mogo.tanlu; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -68,7 +68,7 @@ public class TanluCardViewFragment extends MvpFragment> @Override protected int getLayoutId() { - return R.layout.tanlu_module_card_view; + return R.layout.tanlu_card_view; } @Override diff --git a/demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluCardViewProvider.java b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewProvider.java similarity index 98% rename from demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluCardViewProvider.java rename to demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewProvider.java index 90f6ed286a..cff3d92473 100644 --- a/demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluCardViewProvider.java +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluCardViewProvider.java @@ -1,4 +1,4 @@ -package com.zhidao.tanlu; +package com.mogo.tanlu; import android.content.Context; import android.os.Bundle; diff --git a/demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluConstants.java b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluConstants.java similarity index 85% rename from demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluConstants.java rename to demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluConstants.java index 089a565812..8eafc95191 100644 --- a/demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluConstants.java +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluConstants.java @@ -1,4 +1,4 @@ -package com.zhidao.tanlu; +package com.mogo.tanlu; /** * @author congtaowang diff --git a/demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluInfoWindowAdapter.java b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluInfoWindowAdapter.java similarity index 96% rename from demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluInfoWindowAdapter.java rename to demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluInfoWindowAdapter.java index 7d4fae8fb5..ffa9a0d294 100644 --- a/demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluInfoWindowAdapter.java +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluInfoWindowAdapter.java @@ -1,4 +1,4 @@ -package com.zhidao.tanlu; +package com.mogo.tanlu; import android.content.Context; import android.graphics.Bitmap; @@ -18,7 +18,6 @@ import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.imageloader.MogoImageView; import com.mogo.utils.WindowUtils; import com.mogo.utils.logger.Logger; - import java.text.SimpleDateFormat; import java.util.Date; @@ -45,11 +44,11 @@ public class TanluInfoWindowAdapter implements IMogoInfoWindowAdapter { @Override public View getInfoWindow( IMogoMarker marker ) { if ( marker.getObject() instanceof MogoPoiItem ) { - View view = LayoutInflater.from( mContext ).inflate( R.layout.tanlu_module_poi_info_window, null ); + View view = LayoutInflater.from( mContext ).inflate( R.layout.tanlu_poi_info_window, null ); renderPoiVew( view, marker, ( ( MogoPoiItem ) marker.getObject() ) ); return view; } else { - View view = LayoutInflater.from( mContext ).inflate( R.layout.tanlu_module_info_window, null ); + View view = LayoutInflater.from( mContext ).inflate( R.layout.tanlu_info_window, null ); renderView( view, marker ); return view; } @@ -103,7 +102,7 @@ public class TanluInfoWindowAdapter implements IMogoInfoWindowAdapter { } public View getMarkerView( final MogoMarkerOptions options ) { - final View view = LayoutInflater.from( mContext ).inflate( R.layout.tanlu_module_bubble_marker, null ); + final View view = LayoutInflater.from( mContext ).inflate( R.layout.tanlu_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() { diff --git a/demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluServiceHandler.java b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluServiceHandler.java similarity index 98% rename from demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluServiceHandler.java rename to demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluServiceHandler.java index b47e0f9fba..cd7591ab19 100644 --- a/demo/tanlu-module/src/main/java/com/zhidao/tanlu/TanluServiceHandler.java +++ b/demo/mogo-module-tanlu/src/main/java/com/mogo/tanlu/TanluServiceHandler.java @@ -1,4 +1,4 @@ -package com.zhidao.tanlu; +package com.mogo.tanlu; import android.content.Context; diff --git a/demo/tanlu-module/src/main/res/layout/tanlu_module_bubble_marker.xml b/demo/mogo-module-tanlu/src/main/res/layout/tanlu_bubble_marker.xml similarity index 100% rename from demo/tanlu-module/src/main/res/layout/tanlu_module_bubble_marker.xml rename to demo/mogo-module-tanlu/src/main/res/layout/tanlu_bubble_marker.xml diff --git a/demo/tanlu-module/src/main/res/layout/tanlu_module_card_view.xml b/demo/mogo-module-tanlu/src/main/res/layout/tanlu_card_view.xml similarity index 100% rename from demo/tanlu-module/src/main/res/layout/tanlu_module_card_view.xml rename to demo/mogo-module-tanlu/src/main/res/layout/tanlu_card_view.xml diff --git a/demo/tanlu-module/src/main/res/layout/tanlu_module_info_window.xml b/demo/mogo-module-tanlu/src/main/res/layout/tanlu_info_window.xml similarity index 100% rename from demo/tanlu-module/src/main/res/layout/tanlu_module_info_window.xml rename to demo/mogo-module-tanlu/src/main/res/layout/tanlu_info_window.xml diff --git a/demo/tanlu-module/src/main/res/layout/tanlu_module_poi_info_window.xml b/demo/mogo-module-tanlu/src/main/res/layout/tanlu_poi_info_window.xml similarity index 100% rename from demo/tanlu-module/src/main/res/layout/tanlu_module_poi_info_window.xml rename to demo/mogo-module-tanlu/src/main/res/layout/tanlu_poi_info_window.xml diff --git a/demo/tanlu-module/src/main/res/values/colors.xml b/demo/mogo-module-tanlu/src/main/res/values/colors.xml similarity index 100% rename from demo/tanlu-module/src/main/res/values/colors.xml rename to demo/mogo-module-tanlu/src/main/res/values/colors.xml diff --git a/demo/tanlu-module/src/main/res/values/strings.xml b/demo/mogo-module-tanlu/src/main/res/values/strings.xml similarity index 100% rename from demo/tanlu-module/src/main/res/values/strings.xml rename to demo/mogo-module-tanlu/src/main/res/values/strings.xml diff --git a/demo/tanlu-module/src/test/java/com/zhidao/tanlu/ExampleUnitTest.java b/demo/mogo-module-tanlu/src/test/java/com/zhidao/tanlu/ExampleUnitTest.java similarity index 100% rename from demo/tanlu-module/src/test/java/com/zhidao/tanlu/ExampleUnitTest.java rename to demo/mogo-module-tanlu/src/test/java/com/zhidao/tanlu/ExampleUnitTest.java diff --git a/settings.gradle b/settings.gradle index 4bf5f256dd..8c7a4f2527 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,7 @@ include ':modules:mogo-module-main' include ':modules:mogo-module-navi' include ':demo:demo-module-map' include ':demo:demo-module-map2' -include ':demo:tanlu-module' +include ':demo:mogo-module-tanlu' include ':libraries:map-amap' //include ':libraries:map-baidu' include ':libraries:mogo-map-api' diff --git a/upload.sh b/upload.sh index d8b5a424f6..ee5bce3965 100755 --- a/upload.sh +++ b/upload.sh @@ -13,4 +13,4 @@ ./gradlew :demo:demo-module-map2:clean :demo:demo-module-map2:uploadArchives ./gradlew :modules:mogo-module-apps:clean :modules:mogo-module-apps:uploadArchives ./gradlew :modules:mogo-module-main:clean :modules:mogo-module-main:uploadArchives -./gradlew :demo:tanlu-module:clean :demo:tanlu-module:uploadArchives \ No newline at end of file +./gradlew :demo:mogo-module-tanlu:clean :demo:mogo-module-tanlu:uploadArchives \ No newline at end of file