diff --git a/app/build.gradle b/app/build.gradle index 65532a4c2f..eb85ed4ff1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -81,6 +81,7 @@ dependencies { api rootProject.ext.dependencies.mogocommons implementation rootProject.ext.dependencies.modulecommon implementation rootProject.ext.dependencies.moduletanlu + implementation rootProject.ext.dependencies.modulesearch } else { implementation project(':modules:mogo-module-main') implementation project(':foudations:mogo-commons') diff --git a/config.gradle b/config.gradle index c7760b645a..d18358877d 100644 --- a/config.gradle +++ b/config.gradle @@ -101,6 +101,7 @@ ext { // 在线车辆 moduleonlinecar : "com.mogo.module:module-onlinecar:${MOGO_MODULE_ONLINECAR_VERSION}", modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}", + modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}", // 长链 socketsdk : 'com.zhidao.socketsdk:socketsdk:2.1.0', diff --git a/gradle.properties b/gradle.properties index 0fc019f84b..352d189739 100644 --- a/gradle.properties +++ b/gradle.properties @@ -50,5 +50,6 @@ CARCHATTINGPROVIDER_VERSION=1.0.0-SNAPSHOT MOGO_MODULE_ONLINECAR_VERSION=1.0.0-SNAPSHOT MOGO_MODULE_MEDIA_VERSION=1.0.0-SNAPSHOT MOGO_MODULE_PUSH_VERSION=1.0.0-SNAPSHOT +MOGO_MODULE_SEARCH_VERSION=1.0.0-SNAPSHOT diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index f80491fafd..a94702a4fa 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -95,10 +95,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, options.setTrafficLayerEnabled( false ); // 设置导航界面是否显示路线全览按钮。 options.setRouteListButtonShow( false ); - // 设置起点位图，须在画路前设置 -// options.setStartPointBitmap( BitmapFactory.decodeResource( getContext().getResources(), R.drawable.ic_current_location_cursor ) ); - // 设置终点位图，须在画路前设置 -// options.setEndPointBitmap( BitmapFactory.decodeResource( getContext().getResources(), R.drawable.ic_search_choice_point ) ); // 设置导航状态下屏幕是否一直开启。 options.setScreenAlwaysBright( true ); // 设置交通播报是否打开（只适用于驾车导航，需要联网）。 diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_1.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_1.png new file mode 100755 index 0000000000..0fa0edb0a4 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_1.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_10.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_10.png new file mode 100755 index 0000000000..797b106127 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_10.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_11.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_11.png new file mode 100755 index 0000000000..e54bbd6292 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_11.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_12.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_12.png new file mode 100755 index 0000000000..f93a673421 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_12.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_13.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_13.png new file mode 100755 index 0000000000..bf8d9bc3db Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_13.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_14.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_14.png new file mode 100755 index 0000000000..e7288ac5c2 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_14.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_15.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_15.png new file mode 100755 index 0000000000..9c0c2af8f4 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_15.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_16.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_16.png new file mode 100755 index 0000000000..30cffd20e5 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_16.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_17.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_17.png new file mode 100755 index 0000000000..81ebaa35cd Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_17.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_18.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_18.png new file mode 100755 index 0000000000..8370408b15 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_18.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_19.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_19.png new file mode 100755 index 0000000000..da5648fb9c Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_19.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_2.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_2.png new file mode 100755 index 0000000000..851d6d878e Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_2.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_20.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_20.png new file mode 100755 index 0000000000..79ffe11b10 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_20.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_21.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_21.png new file mode 100755 index 0000000000..9f80ca5181 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_21.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_22.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_22.png new file mode 100755 index 0000000000..403c5ea7e8 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_22.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_23.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_23.png new file mode 100755 index 0000000000..6e1b9f33b8 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_23.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_24.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_24.png new file mode 100755 index 0000000000..060b5e94f0 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_24.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_25.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_25.png new file mode 100755 index 0000000000..7a027897ce Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_25.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_26.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_26.png new file mode 100755 index 0000000000..6806d3457e Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_26.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_27.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_27.png new file mode 100755 index 0000000000..dd1717bd6b Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_27.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_28.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_28.png new file mode 100755 index 0000000000..239b379f3b Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_28.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_4.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_4.png new file mode 100755 index 0000000000..5cf551b141 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_4.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_5.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_5.png new file mode 100755 index 0000000000..70ac563aa4 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_5.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_50.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_50.png new file mode 100755 index 0000000000..4780ef7427 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_50.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_51.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_51.png new file mode 100755 index 0000000000..f6501640a1 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_51.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_52.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_52.png new file mode 100755 index 0000000000..7c8a880609 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_52.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_53.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_53.png new file mode 100755 index 0000000000..4cb5e21820 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_53.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_54.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_54.png new file mode 100755 index 0000000000..37289bbaaf Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_54.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_55.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_55.png new file mode 100755 index 0000000000..e8263cdc1b Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_55.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_56.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_56.png new file mode 100755 index 0000000000..48b91385ad Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_56.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_57.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_57.png new file mode 100755 index 0000000000..080eaece28 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_57.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_58.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_58.png new file mode 100755 index 0000000000..7f7034ff9f Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_58.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_59.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_59.png new file mode 100755 index 0000000000..735392d59d Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_59.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_6.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_6.png new file mode 100755 index 0000000000..ff9757c869 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_6.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_60.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_60.png new file mode 100755 index 0000000000..98c94b3826 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_60.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_61.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_61.png new file mode 100755 index 0000000000..a924085ef8 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_61.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_62.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_62.png new file mode 100755 index 0000000000..c20542f34f Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_62.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_63.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_63.png new file mode 100755 index 0000000000..d408fe0153 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_63.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_64.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_64.png new file mode 100755 index 0000000000..5a9af68c32 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_64.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_65.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_65.png new file mode 100755 index 0000000000..57a7454b4f Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_65.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_66.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_66.png new file mode 100755 index 0000000000..c471bf466a Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_66.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_67.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_67.png new file mode 100755 index 0000000000..22e6178738 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_67.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_68.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_68.png new file mode 100755 index 0000000000..a782cffbd9 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_68.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_69.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_69.png new file mode 100755 index 0000000000..a1545ef55f Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_69.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_7.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_7.png new file mode 100755 index 0000000000..b4a6465ce0 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_7.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_8.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_8.png new file mode 100755 index 0000000000..d19f036aa9 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_8.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/ic_9.png b/libraries/map-amap/src/main/res/drawable-ldpi/ic_9.png new file mode 100755 index 0000000000..a2b07ad3d7 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/ic_9.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_10.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_10.png new file mode 100755 index 0000000000..629e98359d Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_10.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_11.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_11.png new file mode 100755 index 0000000000..c0d6528e63 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_11.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_12.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_12.png new file mode 100755 index 0000000000..c14ec9a985 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_12.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_13.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_13.png new file mode 100755 index 0000000000..71bc66ca60 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_13.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_14.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_14.png new file mode 100755 index 0000000000..15e798dcce Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_14.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_15.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_15.png new file mode 100755 index 0000000000..a69e9437f3 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_15.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_16.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_16.png new file mode 100755 index 0000000000..ff948797b4 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_16.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_17.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_17.png new file mode 100755 index 0000000000..8fc3e5d0df Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_17.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_20.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_20.png new file mode 100755 index 0000000000..b6cf203416 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_20.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_21.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_21.png new file mode 100755 index 0000000000..0c55bebb7a Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_21.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_22.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_22.png new file mode 100755 index 0000000000..73f6c6c7ca Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_22.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_23.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_23.png new file mode 100755 index 0000000000..fb4a106126 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_23.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_24.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_24.png new file mode 100755 index 0000000000..a40251e6af Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_24.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_25.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_25.png new file mode 100755 index 0000000000..dba53847bb Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_25.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_26.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_26.png new file mode 100755 index 0000000000..c2ad298a10 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_26.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_27.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_27.png new file mode 100755 index 0000000000..266e5a9a6b Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_27.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_28.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_28.png new file mode 100755 index 0000000000..15259c17eb Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_28.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_30.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_30.png new file mode 100755 index 0000000000..bc76d71ab9 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_30.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_31.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_31.png new file mode 100755 index 0000000000..5e8e8d31fb Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_31.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_32.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_32.png new file mode 100755 index 0000000000..52e2e6a540 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_32.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_33.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_33.png new file mode 100755 index 0000000000..357de360f4 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_33.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_34.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_34.png new file mode 100755 index 0000000000..ef5a9d75b2 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_34.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_35.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_35.png new file mode 100755 index 0000000000..9c0d6b2058 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_35.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_36.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_36.png new file mode 100755 index 0000000000..f99d780e06 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_36.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_37.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_37.png new file mode 100755 index 0000000000..17fff66f7b Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_37.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_38.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_38.png new file mode 100755 index 0000000000..d4464587af Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_38.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_39.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_39.png new file mode 100755 index 0000000000..a7db692ecc Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_39.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_40.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_40.png new file mode 100755 index 0000000000..5cd1176c4d Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_40.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_41.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_41.png new file mode 100755 index 0000000000..89c97b5dc8 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_41.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_42.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_42.png new file mode 100755 index 0000000000..d76fa3a7c6 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_42.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_43.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_43.png new file mode 100755 index 0000000000..15ca9088f1 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_43.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_44.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_44.png new file mode 100755 index 0000000000..fe01e04472 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_44.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_68.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_68.png new file mode 100755 index 0000000000..0d57b42290 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_68.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_84.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_84.png new file mode 100755 index 0000000000..99bdea2e1e Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_84.png differ diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/tc_85.png b/libraries/map-amap/src/main/res/drawable-ldpi/tc_85.png new file mode 100755 index 0000000000..e85921c9c3 Binary files /dev/null and b/libraries/map-amap/src/main/res/drawable-ldpi/tc_85.png differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_start.png b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_start.png new file mode 100755 index 0000000000..b2efbe3bf6 Binary files /dev/null and b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_start.png differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_target.png b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_target.png new file mode 100755 index 0000000000..7ee0a97750 Binary files /dev/null and b/libraries/mogo-map-api/src/main/res/drawable-ldpi/ic_navi_target.png differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-ldpi/map_api_ic_current_location.png b/libraries/mogo-map-api/src/main/res/drawable-ldpi/map_api_ic_current_location.png new file mode 100755 index 0000000000..70be2a654c Binary files /dev/null and b/libraries/mogo-map-api/src/main/res/drawable-ldpi/map_api_ic_current_location.png differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back.png deleted file mode 100755 index c77c7bc701..0000000000 Binary files a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back.png and /dev/null differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back_dark.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back_dark.png deleted file mode 100755 index f2e0599f2a..0000000000 Binary files a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_back_dark.png and /dev/null differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_current_location_cursor.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_current_location_cursor.png deleted file mode 100755 index cebdc6a37a..0000000000 Binary files a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_current_location_cursor.png and /dev/null differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_choice_point.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_choice_point.png deleted file mode 100755 index 9f75ac8e88..0000000000 Binary files a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_choice_point.png and /dev/null differ diff --git a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_poi_location.png b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_poi_location.png deleted file mode 100755 index 484f80efd5..0000000000 Binary files a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/ic_search_poi_location.png and /dev/null differ diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java index 8b2f0fca5f..e8b8227a46 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java @@ -11,59 +11,59 @@ import java.util.Map; * @author Lzq */ public enum Phenomena { - Sunny( "00", "晴", "Sunny", R.drawable.ic_sunny ), - Cloudy( "01", "多云", "Cloudy", R.drawable.ic_cloudy ), - Overcast( "02", "阴", "Overcast", R.drawable.ic_overcast ), + Sunny( "00", "晴", "Sunny", R.drawable.module_ext_ic_sunny ), + Cloudy( "01", "多云", "Cloudy", R.drawable.module_ext_ic_cloudy ), + Overcast( "02", "阴", "Overcast", R.drawable.module_ext_ic_overcast ), - Shower( "03", "阵雨", "Shower", R.drawable.ic_shower ), - Thundershower( "04", "雷阵雨", "Thundershower", R.drawable.ic_thundershower ), - ThundershowerWithHail( "05", "雷阵雨伴有冰雹", "Thundershower with hail", R.drawable.ic_thundershower ), - Sleet( "06", "雨夹雪", "Sleet", R.drawable.ic_snow ), - LightRain( "07", "小雨", "Light rain", R.drawable.ic_light_rain ), - ModerateRain( "08", "中雨", "Moderate rain", R.drawable.ic_light_rain ), - HeavyRain( "09", "大雨", "Heavy rain", R.drawable.ic_heavy_rain ), - Storm( "10", "暴雨", "Storm", R.drawable.ic_heavy_rain ), - HeavyStorm( "11", "大暴雨", "Heavy storm", R.drawable.ic_heavy_rain ), - SevereStorm( "12", "特大暴雨", "Severe storm", R.drawable.ic_severe_storm ), + Shower( "03", "阵雨", "Shower", R.drawable.module_ext_ic_shower ), + Thundershower( "04", "雷阵雨", "Thundershower", R.drawable.module_ext_ic_thundershower ), + ThundershowerWithHail( "05", "雷阵雨伴有冰雹", "Thundershower with hail", R.drawable.module_ext_ic_thundershower ), + Sleet( "06", "雨夹雪", "Sleet", R.drawable.module_ext_ic_snow ), + LightRain( "07", "小雨", "Light rain", R.drawable.module_ext_ic_light_rain ), + ModerateRain( "08", "中雨", "Moderate rain", R.drawable.module_ext_ic_light_rain ), + HeavyRain( "09", "大雨", "Heavy rain", R.drawable.module_ext_ic_heavy_rain ), + Storm( "10", "暴雨", "Storm", R.drawable.module_ext_ic_heavy_rain ), + HeavyStorm( "11", "大暴雨", "Heavy storm", R.drawable.module_ext_ic_heavy_rain ), + SevereStorm( "12", "特大暴雨", "Severe storm", R.drawable.module_ext_ic_severe_storm ), - SnowFlurry( "13", "阵雪", "Snow flurry", R.drawable.ic_snow ), - LightSnow( "14", "小雪", "Light snow", R.drawable.ic_snow ), - ModerateSnow( "15", "中雪", "Moderate snow", R.drawable.ic_snow ), - HeavySnow( "16", "大雪", "Heavy snow", R.drawable.ic_snow ), - Snowstorm( "17", "暴雪", "Snowstorm", R.drawable.ic_snow ), + SnowFlurry( "13", "阵雪", "Snow flurry", R.drawable.module_ext_ic_snow ), + LightSnow( "14", "小雪", "Light snow", R.drawable.module_ext_ic_snow ), + ModerateSnow( "15", "中雪", "Moderate snow", R.drawable.module_ext_ic_snow ), + HeavySnow( "16", "大雪", "Heavy snow", R.drawable.module_ext_ic_snow ), + Snowstorm( "17", "暴雪", "Snowstorm", R.drawable.module_ext_ic_snow ), - Foggy( "18", "雾", "Foggy", R.drawable.ic_fog ), - IceRain( "19", "冻雨", "Ice rain", R.drawable.ic_heavy_rain ), - Duststorm( "20", "沙尘暴", "Duststorm", R.drawable.ic_duststorm ), + Foggy( "18", "雾", "Foggy", R.drawable.module_ext_ic_fog ), + IceRain( "19", "冻雨", "Ice rain", R.drawable.module_ext_ic_heavy_rain ), + Duststorm( "20", "沙尘暴", "Duststorm", R.drawable.module_ext_ic_duststorm ), - LightToModerateRain( "21", "小到中雨", "Light to moderate rain", R.drawable.ic_moderate_rain ), - ModerateToHeavyRain( "22", "中到大雨", "Moderate to heavy rain", R.drawable.ic_heavy_rain ), - HeavyRainToStorm( "23", "大到大雨", "Heavy rain to storm", R.drawable.ic_heavy_rain ), - StormToHeavyStorm( "24", "暴雨到大暴雨", "Storm to heavy storm", R.drawable.ic_severe_storm ), - HeavyToSevereStorm( "25", "大暴雨到特大暴雨", "Heavy to severe storm", R.drawable.ic_severe_storm ), + LightToModerateRain( "21", "小到中雨", "Light to moderate rain", R.drawable.module_ext_ic_moderate_rain ), + ModerateToHeavyRain( "22", "中到大雨", "Moderate to heavy rain", R.drawable.module_ext_ic_heavy_rain ), + HeavyRainToStorm( "23", "大到大雨", "Heavy rain to storm", R.drawable.module_ext_ic_heavy_rain ), + StormToHeavyStorm( "24", "暴雨到大暴雨", "Storm to heavy storm", R.drawable.module_ext_ic_severe_storm ), + HeavyToSevereStorm( "25", "大暴雨到特大暴雨", "Heavy to severe storm", R.drawable.module_ext_ic_severe_storm ), - LightToModerateSnow( "26", "小到中雪", "Light to moderate snow", R.drawable.ic_snow ), - ModerateToHeavySnow( "27", "中到大雪", "Moderate to heavy snow", R.drawable.ic_snow ), - HeavySnowToSnowStorm( "28", "大到暴雪", "Heavy snow to snowstorm", R.drawable.ic_snow ), + LightToModerateSnow( "26", "小到中雪", "Light to moderate snow", R.drawable.module_ext_ic_snow ), + ModerateToHeavySnow( "27", "中到大雪", "Moderate to heavy snow", R.drawable.module_ext_ic_snow ), + HeavySnowToSnowStorm( "28", "大到暴雪", "Heavy snow to snowstorm", R.drawable.module_ext_ic_snow ), - Dust( "29", "浮尘", "Dust", R.drawable.ic_dust_sand ), - Sand( "30", "扬沙", "Sand", R.drawable.ic_dust_sand ), - SandStorm( "31", "强沙尘暴", "Sandstorm", R.drawable.ic_duststorm ), + Dust( "29", "浮尘", "Dust", R.drawable.module_ext_ic_dust_sand ), + Sand( "30", "扬沙", "Sand", R.drawable.module_ext_ic_dust_sand ), + SandStorm( "31", "强沙尘暴", "Sandstorm", R.drawable.module_ext_ic_duststorm ), - Densefog( "32", "浓雾", "Dense fog", R.drawable.ic_fog ), - StrongFog( "49", "强浓雾", "Strong fog", R.drawable.ic_fog ), - DenseFog( "57", "大雾", "Dense fog", R.drawable.ic_fog ), - ExtraHeavyFog( "58", "特强浓雾", "Extra heavy fog", R.drawable.ic_fog ), + Densefog( "32", "浓雾", "Dense fog", R.drawable.module_ext_ic_fog ), + StrongFog( "49", "强浓雾", "Strong fog", R.drawable.module_ext_ic_fog ), + DenseFog( "57", "大雾", "Dense fog", R.drawable.module_ext_ic_fog ), + ExtraHeavyFog( "58", "特强浓雾", "Extra heavy fog", R.drawable.module_ext_ic_fog ), - Haze( "53", "霾", "Haze", R.drawable.ic_haze ), - ModerateHaze( "54", "中度霾", "Moderate haze", R.drawable.ic_haze ), - Severehaze( "55", "重度霾", "Severe haze", R.drawable.ic_haze ), - SevereHaze( "56", "严重霾", "Severe haze", R.drawable.ic_haze ), + Haze( "53", "霾", "Haze", R.drawable.module_ext_ic_haze ), + ModerateHaze( "54", "中度霾", "Moderate haze", R.drawable.module_ext_ic_haze ), + Severehaze( "55", "重度霾", "Severe haze", R.drawable.module_ext_ic_haze ), + SevereHaze( "56", "严重霾", "Severe haze", R.drawable.module_ext_ic_haze ), - Unknown( "99", "无", "Unknown", R.drawable.ic_unknown ), + Unknown( "99", "无", "Unknown", R.drawable.module_ext_ic_unknown ), - Rain( "301", "雨", "rain", R.drawable.ic_heavy_rain ), - Snow( "302", "雪", "snow", R.drawable.ic_snow ); + Rain( "301", "雨", "rain", R.drawable.module_ext_ic_heavy_rain ), + Snow( "302", "雪", "snow", R.drawable.module_ext_ic_snow ); public final String id; public final String nameCn; diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_cloudy.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_cloudy.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_cloudy.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_cloudy.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_dust_sand.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_dust_sand.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_dust_sand.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_dust_sand.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_duststorm.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_duststorm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_duststorm.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_duststorm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_fog.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_fog.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_fog.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_fog.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_haze.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_haze.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_haze.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_haze.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_heavy_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_heavy_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_heavy_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_heavy_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_light_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_light_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_light_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_light_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_moderate_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_moderate_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_moderate_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_moderate_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_overcast.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_overcast.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_overcast.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_overcast.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_severe_storm.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_severe_storm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_severe_storm.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_severe_storm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_shower.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_shower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_shower.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_shower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_snow.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_snow.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_snow.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_snow.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_sunny.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_sunny.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_sunny.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_sunny.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thunder.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_thunder.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thunder.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_thunder.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thundershower.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_thundershower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_thundershower.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_thundershower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_unknown.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_unknown.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-ldpi/ic_unknown.png rename to modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_unknown.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_cloudy.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_cloudy.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_dust_sand.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_dust_sand.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_duststorm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_duststorm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_fog.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_fog.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_haze.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_haze.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_haze.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_haze.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_heavy_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_heavy_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_light_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_light_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_moderate_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_moderate_rain.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_moderate_rain.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_moderate_rain.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_overcast.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_overcast.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_overcast.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_overcast.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_severe_storm.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_severe_storm.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_shower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_shower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_snow.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_snow.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_snow.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_snow.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_sunny.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_sunny.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_thunder.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_thunder.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thundershower.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_thundershower.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thundershower.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_thundershower.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_unknown.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_unknown.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_unknown.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_ic_unknown.png diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index 7aafa02548..c621f1fdeb 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/module_ext_weather_marginRight" - android:gravity="bottom" + android:gravity="center" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@+id/module_ext_id_date" diff --git a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml index 9f9c7a937f..eca441b69d 100644 --- a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml @@ -3,7 +3,7 @@ 58px 18px - 8px + 1px 11.2px 10.8px 17px @@ -11,7 +11,7 @@ 58px 19px - 8px + 1px 64.2px 58px 1px @@ -22,13 +22,13 @@ 96px 96px - 8px + 1px 32px 32px 15px 20px - 8px + 1px 58px 20px @@ -53,7 +53,7 @@ 22px - 640px + 64px 32px 32px 64px diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java index 425bdc4af9..b91b2d4a5f 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java @@ -4,6 +4,7 @@ import android.content.Context; import android.util.Log; import android.view.View; +import com.mogo.module.main.R; import com.mogo.utils.WindowUtils; public class VerticalStackTransformer extends VerticalBaseTransformer { @@ -14,6 +15,8 @@ public class VerticalStackTransformer extends VerticalBaseTransformer { public VerticalStackTransformer( Context context ) { this.context = context; + spaceBetweenFirAndSecHeight = context.getResources().getDimensionPixelSize( R.dimen.module_main_card_card_shadow_height_div ); + spaceBetweenFirAndSecWith = context.getResources().getDimensionPixelSize( R.dimen.module_main_card_card_shadow_width_div ); } public VerticalStackTransformer( Context context, int spaceBetweenFirAndSecWith, int spaceBetweenFirAndSecHeight ) { @@ -30,7 +33,7 @@ public class VerticalStackTransformer extends VerticalBaseTransformer { //控制停止滑动切换的时候，只有最上面的一张卡片可以点击 page.setClickable( true ); } else { - float scale = ( float ) ( page.getWidth() - WindowUtils.dip2px( context, spaceBetweenFirAndSecWith * position ) ) / ( float ) ( page.getWidth() ); + float scale = ( float ) ( page.getWidth() - spaceBetweenFirAndSecWith * position ) / ( float ) ( page.getWidth() ); //控制下面卡片的可见度 page.setAlpha( 1.0f ); //控制停止滑动切换的时候，只有最上面的一张卡片可以点击 @@ -39,7 +42,7 @@ public class VerticalStackTransformer extends VerticalBaseTransformer { page.setPivotY( page.getHeight() / 2f ); page.setScaleX( scale ); page.setScaleY( scale ); - page.setTranslationY( -page.getHeight() * position + ( page.getHeight() * 0.5f ) * ( 1 - scale ) + WindowUtils.dip2px( context, spaceBetweenFirAndSecHeight ) * position ); + page.setTranslationY( -page.getHeight() * position + ( page.getHeight() * 0.5f ) * ( 1 - scale ) + spaceBetweenFirAndSecHeight * position ); } } } \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index e761f21d4f..30d62c2164 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -35,8 +35,8 @@ + android:layout_marginTop="@dimen/module_main_card_container_marginTop" + android:layout_height="match_parent"> - 720px - 10px - 660px - 60px - 211px - 20px + 384px + 8px + 352px + 32px + 140.5px + 18px + 20px + 10px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index a707ceedb5..3fe82f9cb8 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -6,5 +6,7 @@ 660px 60px 211px - 20px + 30px + 30px + 15px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index d69bd56a73..3fe82f9cb8 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -1,10 +1,12 @@ - 384px - 8px - 352px - 32px - 140.5px - 20px + 720px + 10px + 660px + 60px + 211px + 30px + 30px + 15px \ No newline at end of file diff --git a/modules/mogo-module-search/build.gradle b/modules/mogo-module-search/build.gradle index cc2624ce99..31d10b703e 100644 --- a/modules/mogo-module-search/build.gradle +++ b/modules/mogo-module-search/build.gradle @@ -77,3 +77,5 @@ dependencies { } implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-module-search/gradle.properties b/modules/mogo-module-search/gradle.properties index 1e04f0d3e4..00d1dc7d25 100644 --- a/modules/mogo-module-search/gradle.properties +++ b/modules/mogo-module-search/gradle.properties @@ -1,3 +1,3 @@ GROUP=com.mogo.module -POM_ARTIFACT_ID=module-navi +POM_ARTIFACT_ID=module-search VERSION_CODE=1 diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java index 514d584dae..b813426215 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java @@ -466,7 +466,7 @@ public class MogoServiceProvider implements IMogoModuleProvider, } Logger.d( TAG, mAutoRefreshCallback == callback ? "触发自动刷新" : "触发手动刷新" ); Logger.i( TAG, "刷新半径 = %d, 点 = %s", radius, latLng ); - mRefreshModel.refreshData( latLng, radius, callback ); + mRefreshModel.refreshData( latLng, radius, mLastZoomLevel >= 10 ? 5 : 10, callback ); } @Override 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 605ba68188..d36fc9713c 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 @@ -52,7 +52,7 @@ public class RefreshModel { } } - public void refreshData(MogoLatLng latLng, int radius, final RefreshCallback callback) { + public void refreshData(MogoLatLng latLng, int radius, int limit, final RefreshCallback callback) { if (mRefreshApiService != null) { final Map query = new ParamsProvider.Builder(mContext).build(); final RefreshBody refreshBody = new RefreshBody(); diff --git a/upload.sh b/upload.sh index 7fc06055a3..3ad1ccbd45 100755 --- a/upload.sh +++ b/upload.sh @@ -8,10 +8,11 @@ ./gradlew :libraries:map-amap:clean :libraries:map-amap:uploadArchives ./gradlew :libraries:mogo-map:clean :libraries:mogo-map:uploadArchives ./gradlew :services:mogo-service:clean :services:mogo-service:uploadArchives -./gradlew :modules:mogo-module-common:clean :modules:mogo-module-common:uploadArchives ./gradlew :modules:mogo-module-map:clean :modules:mogo-module-map:uploadArchives ./gradlew :modules:mogo-module-tanlu:clean :modules:mogo-module-tanlu:uploadArchives ./gradlew :modules:mogo-module-apps:clean :modules:mogo-module-apps:uploadArchives ./gradlew :modules:mogo-module-service:clean :modules:mogo-module-service:uploadArchives -./gradlew :modules:mogo-module-extensions:clean :modules:mogo-module-service:uploadArchives +./gradlew :modules:mogo-module-share:clean :modules:mogo-module-share:uploadArchives +./gradlew :modules:mogo-module-extensions:clean :modules:mogo-module-extensions:uploadArchives +./gradlew :modules:mogo-module-search:clean :modules:mogo-module-search:uploadArchives ./gradlew :modules:mogo-module-main:clean :modules:mogo-module-main:uploadArchives