diff --git a/app/libs/BaiduLBS_Android.jar b/app/libs/BaiduLBS_Android.jar index 6fddea5..1688fa2 100644 Binary files a/app/libs/BaiduLBS_Android.jar and b/app/libs/BaiduLBS_Android.jar differ diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_3_2.so b/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_3_2.so deleted file mode 100644 index e22d9f7..0000000 Binary files a/app/libs/arm64-v8a/libBaiduMapSDK_base_v5_3_2.so and /dev/null differ diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_base_v7_0_0.so b/app/libs/arm64-v8a/libBaiduMapSDK_base_v7_0_0.so new file mode 100644 index 0000000..0e771f6 Binary files /dev/null and b/app/libs/arm64-v8a/libBaiduMapSDK_base_v7_0_0.so differ diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_bikenavi_v5_3_2.so b/app/libs/arm64-v8a/libBaiduMapSDK_bikenavi_v5_3_2.so deleted file mode 100644 index bec470b..0000000 Binary files a/app/libs/arm64-v8a/libBaiduMapSDK_bikenavi_v5_3_2.so and /dev/null differ diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_map_for_bikenavi_v5_3_2.so b/app/libs/arm64-v8a/libBaiduMapSDK_map_for_bikenavi_v5_3_2.so deleted file mode 100644 index 8ccd1f5..0000000 Binary files a/app/libs/arm64-v8a/libBaiduMapSDK_map_for_bikenavi_v5_3_2.so and /dev/null differ diff --git a/app/libs/arm64-v8a/libBaiduMapSDK_map_for_bikenavi_v7_0_0.so b/app/libs/arm64-v8a/libBaiduMapSDK_map_for_bikenavi_v7_0_0.so new file mode 100644 index 0000000..38f017a Binary files /dev/null and b/app/libs/arm64-v8a/libBaiduMapSDK_map_for_bikenavi_v7_0_0.so differ diff --git a/app/libs/arm64-v8a/libcrypto.so b/app/libs/arm64-v8a/libcrypto.so new file mode 100644 index 0000000..0125bd2 Binary files /dev/null and b/app/libs/arm64-v8a/libcrypto.so differ diff --git a/app/libs/arm64-v8a/libgnustl_shared.so b/app/libs/arm64-v8a/libgnustl_shared.so new file mode 100644 index 0000000..be99b75 Binary files /dev/null and b/app/libs/arm64-v8a/libgnustl_shared.so differ diff --git a/app/libs/arm64-v8a/liblocSDK7b.so b/app/libs/arm64-v8a/liblocSDK8a.so similarity index 61% rename from app/libs/arm64-v8a/liblocSDK7b.so rename to app/libs/arm64-v8a/liblocSDK8a.so index 6bab09a..cd47e16 100644 Binary files a/app/libs/arm64-v8a/liblocSDK7b.so and b/app/libs/arm64-v8a/liblocSDK8a.so differ diff --git a/app/libs/arm64-v8a/libssl.so b/app/libs/arm64-v8a/libssl.so new file mode 100644 index 0000000..80b833c Binary files /dev/null and b/app/libs/arm64-v8a/libssl.so differ diff --git a/app/libs/armeabi-v7a/libBaiduMapSDK_base_v5_3_2.so b/app/libs/armeabi-v7a/libBaiduMapSDK_base_v5_3_2.so deleted file mode 100644 index c99a603..0000000 Binary files a/app/libs/armeabi-v7a/libBaiduMapSDK_base_v5_3_2.so and /dev/null differ diff --git a/app/libs/armeabi-v7a/libBaiduMapSDK_base_v7_0_0.so b/app/libs/armeabi-v7a/libBaiduMapSDK_base_v7_0_0.so new file mode 100644 index 0000000..f8da6f0 Binary files /dev/null and b/app/libs/armeabi-v7a/libBaiduMapSDK_base_v7_0_0.so differ diff --git a/app/libs/armeabi-v7a/libBaiduMapSDK_bikenavi_v5_3_2.so b/app/libs/armeabi-v7a/libBaiduMapSDK_bikenavi_v5_3_2.so deleted file mode 100644 index 57ced53..0000000 Binary files a/app/libs/armeabi-v7a/libBaiduMapSDK_bikenavi_v5_3_2.so and /dev/null differ diff --git a/app/libs/armeabi-v7a/libBaiduMapSDK_map_for_bikenavi_v5_3_2.so b/app/libs/armeabi-v7a/libBaiduMapSDK_map_for_bikenavi_v5_3_2.so deleted file mode 100644 index c893a04..0000000 Binary files a/app/libs/armeabi-v7a/libBaiduMapSDK_map_for_bikenavi_v5_3_2.so and /dev/null differ diff --git a/app/libs/armeabi-v7a/libBaiduMapSDK_map_for_bikenavi_v7_0_0.so b/app/libs/armeabi-v7a/libBaiduMapSDK_map_for_bikenavi_v7_0_0.so new file mode 100644 index 0000000..2863d73 Binary files /dev/null and b/app/libs/armeabi-v7a/libBaiduMapSDK_map_for_bikenavi_v7_0_0.so differ diff --git a/app/libs/armeabi-v7a/libcrypto.so b/app/libs/armeabi-v7a/libcrypto.so new file mode 100644 index 0000000..b1b06dc Binary files /dev/null and b/app/libs/armeabi-v7a/libcrypto.so differ diff --git a/app/libs/armeabi-v7a/libgnustl_shared.so b/app/libs/armeabi-v7a/libgnustl_shared.so new file mode 100644 index 0000000..96c22a2 Binary files /dev/null and b/app/libs/armeabi-v7a/libgnustl_shared.so differ diff --git a/app/libs/armeabi-v7a/liblocSDK7b.so b/app/libs/armeabi-v7a/liblocSDK8a.so similarity index 61% rename from app/libs/armeabi-v7a/liblocSDK7b.so rename to app/libs/armeabi-v7a/liblocSDK8a.so index dd040ea..0c6e58c 100644 Binary files a/app/libs/armeabi-v7a/liblocSDK7b.so and b/app/libs/armeabi-v7a/liblocSDK8a.so differ diff --git a/app/libs/armeabi-v7a/libssl.so b/app/libs/armeabi-v7a/libssl.so new file mode 100644 index 0000000..a355974 Binary files /dev/null and b/app/libs/armeabi-v7a/libssl.so differ diff --git a/app/libs/armeabi/libBaiduMapSDK_base_v5_3_2.so b/app/libs/armeabi/libBaiduMapSDK_base_v5_3_2.so deleted file mode 100644 index e4fd43b..0000000 Binary files a/app/libs/armeabi/libBaiduMapSDK_base_v5_3_2.so and /dev/null differ diff --git a/app/libs/armeabi/libBaiduMapSDK_base_v7_0_0.so b/app/libs/armeabi/libBaiduMapSDK_base_v7_0_0.so new file mode 100644 index 0000000..aa146d1 Binary files /dev/null and b/app/libs/armeabi/libBaiduMapSDK_base_v7_0_0.so differ diff --git a/app/libs/armeabi/libBaiduMapSDK_bikenavi_v5_3_2.so b/app/libs/armeabi/libBaiduMapSDK_bikenavi_v5_3_2.so deleted file mode 100644 index af020dc..0000000 Binary files a/app/libs/armeabi/libBaiduMapSDK_bikenavi_v5_3_2.so and /dev/null differ diff --git a/app/libs/armeabi/libBaiduMapSDK_map_for_bikenavi_v5_3_2.so b/app/libs/armeabi/libBaiduMapSDK_map_for_bikenavi_v5_3_2.so deleted file mode 100644 index 379f72f..0000000 Binary files a/app/libs/armeabi/libBaiduMapSDK_map_for_bikenavi_v5_3_2.so and /dev/null differ diff --git a/app/libs/armeabi/libBaiduMapSDK_map_for_bikenavi_v7_0_0.so b/app/libs/armeabi/libBaiduMapSDK_map_for_bikenavi_v7_0_0.so new file mode 100644 index 0000000..32a5b0f Binary files /dev/null and b/app/libs/armeabi/libBaiduMapSDK_map_for_bikenavi_v7_0_0.so differ diff --git a/app/libs/armeabi/libcrypto.so b/app/libs/armeabi/libcrypto.so new file mode 100644 index 0000000..a3b7e42 Binary files /dev/null and b/app/libs/armeabi/libcrypto.so differ diff --git a/app/libs/armeabi/libgnustl_shared.so b/app/libs/armeabi/libgnustl_shared.so new file mode 100644 index 0000000..5cf6d20 Binary files /dev/null and b/app/libs/armeabi/libgnustl_shared.so differ diff --git a/app/libs/armeabi/liblocSDK7b.so b/app/libs/armeabi/liblocSDK8a.so similarity index 50% rename from app/libs/armeabi/liblocSDK7b.so rename to app/libs/armeabi/liblocSDK8a.so index 1a9a34a..5286996 100644 Binary files a/app/libs/armeabi/liblocSDK7b.so and b/app/libs/armeabi/liblocSDK8a.so differ diff --git a/app/libs/armeabi/libssl.so b/app/libs/armeabi/libssl.so new file mode 100644 index 0000000..6699ae1 Binary files /dev/null and b/app/libs/armeabi/libssl.so differ diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 86045a1..b854866 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/src/main/assets/BaiduBikeNavi_Resource_v7_0_0.png b/app/src/main/assets/BaiduBikeNavi_Resource_v7_0_0.png new file mode 100644 index 0000000..514cad7 Binary files /dev/null and b/app/src/main/assets/BaiduBikeNavi_Resource_v7_0_0.png differ diff --git a/app/src/main/assets/Icon_bus_station.png b/app/src/main/assets/Icon_bus_station.png deleted file mode 100644 index 54c6aff..0000000 Binary files a/app/src/main/assets/Icon_bus_station.png and /dev/null differ diff --git a/app/src/main/assets/Icon_end.png b/app/src/main/assets/Icon_end.png deleted file mode 100644 index 0be4ffe..0000000 Binary files a/app/src/main/assets/Icon_end.png and /dev/null differ diff --git a/app/src/main/assets/Icon_line_node.png b/app/src/main/assets/Icon_line_node.png deleted file mode 100644 index 74376d3..0000000 Binary files a/app/src/main/assets/Icon_line_node.png and /dev/null differ diff --git a/app/src/main/assets/Icon_mark1.png b/app/src/main/assets/Icon_mark1.png deleted file mode 100644 index db48787..0000000 Binary files a/app/src/main/assets/Icon_mark1.png and /dev/null differ diff --git a/app/src/main/assets/Icon_mark10.png b/app/src/main/assets/Icon_mark10.png deleted file mode 100644 index b6d2d96..0000000 Binary files a/app/src/main/assets/Icon_mark10.png and /dev/null differ diff --git a/app/src/main/assets/Icon_mark2.png b/app/src/main/assets/Icon_mark2.png deleted file mode 100644 index d7154cd..0000000 Binary files a/app/src/main/assets/Icon_mark2.png and /dev/null differ diff --git a/app/src/main/assets/Icon_mark3.png b/app/src/main/assets/Icon_mark3.png deleted file mode 100644 index b278da1..0000000 Binary files a/app/src/main/assets/Icon_mark3.png and /dev/null differ diff --git a/app/src/main/assets/Icon_mark4.png b/app/src/main/assets/Icon_mark4.png deleted file mode 100644 index 7127b13..0000000 Binary files a/app/src/main/assets/Icon_mark4.png and /dev/null differ diff --git a/app/src/main/assets/Icon_mark5.png b/app/src/main/assets/Icon_mark5.png deleted file mode 100644 index 698ce05..0000000 Binary files a/app/src/main/assets/Icon_mark5.png and /dev/null differ diff --git a/app/src/main/assets/Icon_mark6.png b/app/src/main/assets/Icon_mark6.png deleted file mode 100644 index eac9c75..0000000 Binary files a/app/src/main/assets/Icon_mark6.png and /dev/null differ diff --git a/app/src/main/assets/Icon_mark7.png b/app/src/main/assets/Icon_mark7.png deleted file mode 100644 index fe23401..0000000 Binary files a/app/src/main/assets/Icon_mark7.png and /dev/null differ diff --git a/app/src/main/assets/Icon_mark8.png b/app/src/main/assets/Icon_mark8.png deleted file mode 100644 index 347679c..0000000 Binary files a/app/src/main/assets/Icon_mark8.png and /dev/null differ diff --git a/app/src/main/assets/Icon_mark9.png b/app/src/main/assets/Icon_mark9.png deleted file mode 100644 index 4895f97..0000000 Binary files a/app/src/main/assets/Icon_mark9.png and /dev/null differ diff --git a/app/src/main/assets/Icon_road_nofocus.png b/app/src/main/assets/Icon_road_nofocus.png deleted file mode 100644 index 910f495..0000000 Binary files a/app/src/main/assets/Icon_road_nofocus.png and /dev/null differ diff --git a/app/src/main/assets/Icon_road_yellow_arrow.png b/app/src/main/assets/Icon_road_yellow_arrow.png deleted file mode 100644 index e9c09d1..0000000 Binary files a/app/src/main/assets/Icon_road_yellow_arrow.png and /dev/null differ diff --git a/app/src/main/assets/Icon_start.png b/app/src/main/assets/Icon_start.png deleted file mode 100644 index 0a439d4..0000000 Binary files a/app/src/main/assets/Icon_start.png and /dev/null differ diff --git a/app/src/main/assets/Icon_subway_station.png b/app/src/main/assets/Icon_subway_station.png deleted file mode 100644 index 3d3e401..0000000 Binary files a/app/src/main/assets/Icon_subway_station.png and /dev/null differ diff --git a/app/src/main/assets/Icon_walk_route.png b/app/src/main/assets/Icon_walk_route.png deleted file mode 100644 index 8c15cd7..0000000 Binary files a/app/src/main/assets/Icon_walk_route.png and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12652_4711.jpg b/app/src/main/assets/LocalTileImage/16/16_12652_4711.jpg deleted file mode 100644 index 18169f5..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12652_4711.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12652_4712.jpg b/app/src/main/assets/LocalTileImage/16/16_12652_4712.jpg deleted file mode 100644 index d6a5c5b..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12652_4712.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12652_4713.jpg b/app/src/main/assets/LocalTileImage/16/16_12652_4713.jpg deleted file mode 100644 index 5d3bd09..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12652_4713.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12652_4714.jpg b/app/src/main/assets/LocalTileImage/16/16_12652_4714.jpg deleted file mode 100644 index b40c12a..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12652_4714.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12652_4715.jpg b/app/src/main/assets/LocalTileImage/16/16_12652_4715.jpg deleted file mode 100644 index 937780b..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12652_4715.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12652_4716.jpg b/app/src/main/assets/LocalTileImage/16/16_12652_4716.jpg deleted file mode 100644 index 8d97b32..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12652_4716.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12653_4711.jpg b/app/src/main/assets/LocalTileImage/16/16_12653_4711.jpg deleted file mode 100644 index 13a1560..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12653_4711.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12653_4712.jpg b/app/src/main/assets/LocalTileImage/16/16_12653_4712.jpg deleted file mode 100644 index e9831ec..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12653_4712.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12653_4713.jpg b/app/src/main/assets/LocalTileImage/16/16_12653_4713.jpg deleted file mode 100644 index 9de9dd8..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12653_4713.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12653_4714.jpg b/app/src/main/assets/LocalTileImage/16/16_12653_4714.jpg deleted file mode 100644 index 72cd4bb..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12653_4714.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12653_4715.jpg b/app/src/main/assets/LocalTileImage/16/16_12653_4715.jpg deleted file mode 100644 index 6179c1e..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12653_4715.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12653_4716.jpg b/app/src/main/assets/LocalTileImage/16/16_12653_4716.jpg deleted file mode 100644 index 066c57a..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12653_4716.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12654_4711.jpg b/app/src/main/assets/LocalTileImage/16/16_12654_4711.jpg deleted file mode 100644 index 9009007..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12654_4711.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12654_4712.jpg b/app/src/main/assets/LocalTileImage/16/16_12654_4712.jpg deleted file mode 100644 index 72b0c46..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12654_4712.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12654_4713.jpg b/app/src/main/assets/LocalTileImage/16/16_12654_4713.jpg deleted file mode 100644 index 5ae2463..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12654_4713.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12654_4714.jpg b/app/src/main/assets/LocalTileImage/16/16_12654_4714.jpg deleted file mode 100644 index f035265..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12654_4714.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12654_4715.jpg b/app/src/main/assets/LocalTileImage/16/16_12654_4715.jpg deleted file mode 100644 index 07bc063..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12654_4715.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12654_4716.jpg b/app/src/main/assets/LocalTileImage/16/16_12654_4716.jpg deleted file mode 100644 index 82aea5c..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12654_4716.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12655_4711.jpg b/app/src/main/assets/LocalTileImage/16/16_12655_4711.jpg deleted file mode 100644 index a32d582..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12655_4711.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12655_4712.jpg b/app/src/main/assets/LocalTileImage/16/16_12655_4712.jpg deleted file mode 100644 index b443690..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12655_4712.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12655_4713.jpg b/app/src/main/assets/LocalTileImage/16/16_12655_4713.jpg deleted file mode 100644 index d36e3c2..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12655_4713.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12655_4714.jpg b/app/src/main/assets/LocalTileImage/16/16_12655_4714.jpg deleted file mode 100644 index f1730f5..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12655_4714.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12655_4715.jpg b/app/src/main/assets/LocalTileImage/16/16_12655_4715.jpg deleted file mode 100644 index 98ab335..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12655_4715.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/16/16_12655_4716.jpg b/app/src/main/assets/LocalTileImage/16/16_12655_4716.jpg deleted file mode 100644 index fe5da44..0000000 Binary files a/app/src/main/assets/LocalTileImage/16/16_12655_4716.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9421.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9421.jpg deleted file mode 100644 index bdb12e2..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9421.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9422.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9422.jpg deleted file mode 100644 index 7905697..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9422.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9423.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9423.jpg deleted file mode 100644 index 97de8c8..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9423.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9424.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9424.jpg deleted file mode 100644 index 3a3c5f5..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9424.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9425.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9425.jpg deleted file mode 100644 index 42fe650..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9425.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9426.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9426.jpg deleted file mode 100644 index b8b6ac0..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9426.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9427.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9427.jpg deleted file mode 100644 index 8a194d8..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9427.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9428.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9428.jpg deleted file mode 100644 index 31ff04a..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9428.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9429.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9429.jpg deleted file mode 100644 index aea00b8..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9429.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9430.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9430.jpg deleted file mode 100644 index 89b7c68..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9430.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9431.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9431.jpg deleted file mode 100644 index 9afb264..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9431.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25303_9432.jpg b/app/src/main/assets/LocalTileImage/17/17_25303_9432.jpg deleted file mode 100644 index b379824..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25303_9432.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9421.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9421.jpg deleted file mode 100644 index 831b652..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9421.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9422.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9422.jpg deleted file mode 100644 index b519100..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9422.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9423.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9423.jpg deleted file mode 100644 index ed8e934..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9423.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9424.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9424.jpg deleted file mode 100644 index 4609bcd..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9424.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9425.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9425.jpg deleted file mode 100644 index 1d60f09..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9425.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9426.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9426.jpg deleted file mode 100644 index 532f05b..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9426.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9427.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9427.jpg deleted file mode 100644 index 6d2bee0..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9427.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9428.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9428.jpg deleted file mode 100644 index a09b029..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9428.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9429.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9429.jpg deleted file mode 100644 index 59f51ec..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9429.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9430.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9430.jpg deleted file mode 100644 index dd3c01e..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9430.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9431.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9431.jpg deleted file mode 100644 index 1c1e373..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9431.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25304_9432.jpg b/app/src/main/assets/LocalTileImage/17/17_25304_9432.jpg deleted file mode 100644 index 3f6384e..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25304_9432.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9421.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9421.jpg deleted file mode 100644 index 62f648b..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9421.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9422.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9422.jpg deleted file mode 100644 index aec04fe..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9422.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9423.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9423.jpg deleted file mode 100644 index ecbf79d..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9423.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9424.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9424.jpg deleted file mode 100644 index 2367c31..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9424.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9425.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9425.jpg deleted file mode 100644 index ca28ba3..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9425.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9426.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9426.jpg deleted file mode 100644 index c3adc31..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9426.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9427.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9427.jpg deleted file mode 100644 index 03ed09a..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9427.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9428.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9428.jpg deleted file mode 100644 index 3e0453c..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9428.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9429.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9429.jpg deleted file mode 100644 index 02f66ee..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9429.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9430.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9430.jpg deleted file mode 100644 index 4a7e107..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9430.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9431.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9431.jpg deleted file mode 100644 index b933252..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9431.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25305_9432.jpg b/app/src/main/assets/LocalTileImage/17/17_25305_9432.jpg deleted file mode 100644 index 8988c8f..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25305_9432.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9421.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9421.jpg deleted file mode 100644 index 73fd417..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9421.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9422.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9422.jpg deleted file mode 100644 index cbd2feb..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9422.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9423.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9423.jpg deleted file mode 100644 index d0dcc09..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9423.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9424.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9424.jpg deleted file mode 100644 index dcc77d2..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9424.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9425.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9425.jpg deleted file mode 100644 index 1442fee..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9425.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9426.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9426.jpg deleted file mode 100644 index ad598f9..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9426.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9427.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9427.jpg deleted file mode 100644 index c2e425c..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9427.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9428.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9428.jpg deleted file mode 100644 index 8fa759a..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9428.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9429.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9429.jpg deleted file mode 100644 index f0c74b6..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9429.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9430.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9430.jpg deleted file mode 100644 index 60cabe6..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9430.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9431.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9431.jpg deleted file mode 100644 index c7765dc..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9431.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25306_9432.jpg b/app/src/main/assets/LocalTileImage/17/17_25306_9432.jpg deleted file mode 100644 index 673dc86..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25306_9432.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9421.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9421.jpg deleted file mode 100644 index 66be10c..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9421.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9422.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9422.jpg deleted file mode 100644 index 9e72ee3..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9422.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9423.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9423.jpg deleted file mode 100644 index 7697777..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9423.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9424.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9424.jpg deleted file mode 100644 index 28a72e2..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9424.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9425.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9425.jpg deleted file mode 100644 index 131a3df..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9425.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9426.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9426.jpg deleted file mode 100644 index ec65d6a..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9426.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9427.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9427.jpg deleted file mode 100644 index fb459f5..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9427.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9428.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9428.jpg deleted file mode 100644 index 797e126..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9428.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9429.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9429.jpg deleted file mode 100644 index b43fab1..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9429.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9430.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9430.jpg deleted file mode 100644 index 305d63b..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9430.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9431.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9431.jpg deleted file mode 100644 index f116a86..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9431.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25307_9432.jpg b/app/src/main/assets/LocalTileImage/17/17_25307_9432.jpg deleted file mode 100644 index 422a1bf..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25307_9432.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9421.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9421.jpg deleted file mode 100644 index 83c600e..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9421.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9422.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9422.jpg deleted file mode 100644 index 6201d45..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9422.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9423.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9423.jpg deleted file mode 100644 index 710d52f..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9423.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9424.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9424.jpg deleted file mode 100644 index 56c751c..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9424.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9425.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9425.jpg deleted file mode 100644 index 278e225..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9425.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9426.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9426.jpg deleted file mode 100644 index 38d028b..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9426.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9427.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9427.jpg deleted file mode 100644 index d16ab0b..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9427.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9428.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9428.jpg deleted file mode 100644 index 95e919b..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9428.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9429.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9429.jpg deleted file mode 100644 index a23aa47..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9429.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9430.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9430.jpg deleted file mode 100644 index e1df47f..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9430.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9431.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9431.jpg deleted file mode 100644 index 00c2d94..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9431.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25308_9432.jpg b/app/src/main/assets/LocalTileImage/17/17_25308_9432.jpg deleted file mode 100644 index b3fd152..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25308_9432.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9421.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9421.jpg deleted file mode 100644 index 7463655..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9421.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9422.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9422.jpg deleted file mode 100644 index 9d7154c..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9422.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9423.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9423.jpg deleted file mode 100644 index 65702d4..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9423.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9424.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9424.jpg deleted file mode 100644 index 183ecf0..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9424.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9425.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9425.jpg deleted file mode 100644 index b519bf2..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9425.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9426.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9426.jpg deleted file mode 100644 index 20b0990..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9426.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9427.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9427.jpg deleted file mode 100644 index f11ac3a..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9427.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9428.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9428.jpg deleted file mode 100644 index 2787803..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9428.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9429.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9429.jpg deleted file mode 100644 index cfc2f28..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9429.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9430.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9430.jpg deleted file mode 100644 index b1a2b55..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9430.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9431.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9431.jpg deleted file mode 100644 index 890c84c..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9431.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25309_9432.jpg b/app/src/main/assets/LocalTileImage/17/17_25309_9432.jpg deleted file mode 100644 index 856f38a..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25309_9432.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9421.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9421.jpg deleted file mode 100644 index cc8f544..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9421.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9422.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9422.jpg deleted file mode 100644 index 77991c8..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9422.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9423.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9423.jpg deleted file mode 100644 index 352b304..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9423.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9424.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9424.jpg deleted file mode 100644 index 657c499..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9424.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9425.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9425.jpg deleted file mode 100644 index e3c85b6..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9425.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9426.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9426.jpg deleted file mode 100644 index 0a271bc..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9426.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9427.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9427.jpg deleted file mode 100644 index 94e94ad..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9427.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9428.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9428.jpg deleted file mode 100644 index 07751b4..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9428.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9429.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9429.jpg deleted file mode 100644 index 88be328..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9429.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9430.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9430.jpg deleted file mode 100644 index 6743019..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9430.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9431.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9431.jpg deleted file mode 100644 index 427a3a2..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9431.jpg and /dev/null differ diff --git a/app/src/main/assets/LocalTileImage/17/17_25310_9432.jpg b/app/src/main/assets/LocalTileImage/17/17_25310_9432.jpg deleted file mode 100644 index 2bc69af..0000000 Binary files a/app/src/main/assets/LocalTileImage/17/17_25310_9432.jpg and /dev/null differ diff --git a/app/src/main/assets/customConfigdir/custom_config_dark.json b/app/src/main/assets/customConfigdir/custom_config_dark.json deleted file mode 100644 index 1914851..0000000 --- a/app/src/main/assets/customConfigdir/custom_config_dark.json +++ /dev/null @@ -1,201 +0,0 @@ - -[ - { - "featureType": "green", - "elementType": "geometry", - "stylers": { - "color": "#20363cff" - } - }, - { - "featureType": "green", - "elementType": "geometry", - "stylers": { - "color": "#232c3aff", - "level": "14" - } - }, - { - "featureType": "water", - "elementType": "geometry", - "stylers": { - "color": "#283952ff" - } - }, - { - "featureType": "land", - "elementType": "geometry", - "stylers": { - "color": "#232c3aff", - "level": "12" - } - }, - { - "featureType": "land", - "elementType": "geometry", - "stylers": { - "color": "#283952ff" - } - }, - { - "featureType": "building", - "elementType": "geometry", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "highway", - "elementType": "all", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "arterial", - "elementType": "all", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "manmade", - "elementType": "geometry.fill", - "stylers": { - "color": "#232c3aff" - } - }, - { - "featureType": "manmade", - "elementType": "labels", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "local", - "elementType": "all", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "subway", - "elementType": "geometry", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "subway", - "elementType": "labels", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "poilabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#141920ff" - } - }, - { - "featureType": "poilabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#356e9aff" - } - }, - { - "featureType": "poilabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "medicallabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "educationlabel", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "airportlabel", - "elementType": "all", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "scenicspotslabel", - "elementType": "all", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "scenicspots", - "elementType": "all", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "railway", - "elementType": "geometry", - "stylers": { - "color": "#4a596eff" - } - }, - { - "featureType": "railway", - "elementType": "labels.icon", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "railway", - "elementType": "labels.text.stroke", - "stylers": { - "visibility": "off" - } - }, - { - "featureType": "railway", - "elementType": "labels.text.fill", - "stylers": { - "color": "#4a596eff" - } - }, - { - "featureType": "districtlabel", - "elementType": "labels.text.stroke", - "stylers": { - "color": "#13171dff" - } - }, - { - "featureType": "districtlabel", - "elementType": "labels.text.fill", - "stylers": { - "color": "#4e5961ff" - } - }, - { - "featureType": "entertainment", - "elementType": "all", - "stylers": { - "visibility": "off" - } - } -] \ No newline at end of file diff --git a/app/src/main/assets/ic_location_on_black_36dp.png b/app/src/main/assets/ic_location_on_black_36dp.png deleted file mode 100644 index ebe833b..0000000 Binary files a/app/src/main/assets/ic_location_on_black_36dp.png and /dev/null differ diff --git a/app/src/main/assets/ic_location_on_black_48dp.png b/app/src/main/assets/ic_location_on_black_48dp.png deleted file mode 100644 index 5a21dfa..0000000 Binary files a/app/src/main/assets/ic_location_on_black_48dp.png and /dev/null differ diff --git a/app/src/main/assets/icon_position.png b/app/src/main/assets/icon_position.png deleted file mode 100644 index 6d7a41e..0000000 Binary files a/app/src/main/assets/icon_position.png and /dev/null differ diff --git a/app/src/main/assets/icon_road_blue_arrow.png b/app/src/main/assets/icon_road_blue_arrow.png deleted file mode 100644 index 16b7704..0000000 Binary files a/app/src/main/assets/icon_road_blue_arrow.png and /dev/null differ diff --git a/app/src/main/assets/icon_road_green_arrow.png b/app/src/main/assets/icon_road_green_arrow.png deleted file mode 100644 index de6472f..0000000 Binary files a/app/src/main/assets/icon_road_green_arrow.png and /dev/null differ diff --git a/app/src/main/assets/icon_road_red_arrow.png b/app/src/main/assets/icon_road_red_arrow.png deleted file mode 100644 index 3257616..0000000 Binary files a/app/src/main/assets/icon_road_red_arrow.png and /dev/null differ diff --git a/app/src/main/java/com/zcshou/gogogo/MainActivity.java b/app/src/main/java/com/zcshou/gogogo/MainActivity.java index 64f7953..c07685a 100644 --- a/app/src/main/java/com/zcshou/gogogo/MainActivity.java +++ b/app/src/main/java/com/zcshou/gogogo/MainActivity.java @@ -76,15 +76,6 @@ import com.baidu.mapapi.map.MarkerOptions; import com.baidu.mapapi.map.MyLocationConfiguration; import com.baidu.mapapi.map.MyLocationData; import com.baidu.mapapi.model.LatLng; -import com.baidu.mapapi.search.core.PoiInfo; -import com.baidu.mapapi.search.core.SearchResult; -import com.baidu.mapapi.search.poi.OnGetPoiSearchResultListener; -import com.baidu.mapapi.search.poi.PoiDetailResult; -import com.baidu.mapapi.search.poi.PoiDetailSearchOption; -import com.baidu.mapapi.search.poi.PoiDetailSearchResult; -import com.baidu.mapapi.search.poi.PoiIndoorResult; -import com.baidu.mapapi.search.poi.PoiResult; -import com.baidu.mapapi.search.poi.PoiSearch; import com.baidu.mapapi.search.sug.OnGetSuggestionResultListener; import com.baidu.mapapi.search.sug.SuggestionResult; import com.baidu.mapapi.search.sug.SuggestionSearch; @@ -110,8 +101,6 @@ import java.util.TimeZone; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import mapapi.overlayutil.PoiOverlay; - import com.zcshou.log4j.LogUtil; import com.zcshou.service.GoService; import com.zcshou.database.HistoryLocationDataBaseHelper; @@ -181,7 +170,6 @@ public class MainActivity extends BaseActivity private FloatingActionButton faBtnStop; //位置搜索相关 - PoiSearch poiSearch; private SearchView searchView; private ListView mSearchList; private ListView mSearchHistoryList; @@ -292,9 +280,6 @@ public class MainActivity extends BaseActivity // set 开始定位 listener setGoBtnListener(); - //poi search 实例化 - poiSearch = PoiSearch.newInstance(); - // 搜索相关 searchView = findViewById(id.action_search); mSearchList = findViewById(id.search_list_view); @@ -302,9 +287,6 @@ public class MainActivity extends BaseActivity mSearchHistoryList = findViewById(id.search_history_list_view); mHistorylinearLayout = findViewById(id.search_history_linear); - //初始化POI搜索监听 - initPoiSearchResultListener(); - //搜索结果列表的点击监听 setSearchResultClickListener(); @@ -786,12 +768,11 @@ public class MainActivity extends BaseActivity /** * 单击地图中的POI点 */ - public boolean onMapPoiClick(MapPoi poi) { + public void onMapPoiClick(MapPoi poi) { curMapLatLng = poi.getPosition(); //百度坐标系转wgs坐标系 transformCoordinate(String.valueOf(poi.getPosition().longitude), String.valueOf(poi.getPosition().latitude)); markSelectedPosition(); - return false; } }); @@ -1497,72 +1478,6 @@ public class MainActivity extends BaseActivity }); } - //poi搜索初始化 - private void initPoiSearchResultListener() { - OnGetPoiSearchResultListener poiSearchListener = new OnGetPoiSearchResultListener() { - @Override - public void onGetPoiResult(PoiResult poiResult) { - if (poiResult == null || poiResult.error == SearchResult.ERRORNO.RESULT_NOT_FOUND) {// 没有找到检索结果 - DisplayToast("没有找到检索结果"); - Log.d("BDLOC", "没有找到检索结果"); - log.debug("BDLOC: 没有找到检索结果"); - return; - } - - if (poiResult.error == SearchResult.ERRORNO.NO_ERROR) {// 检索结果正常返回 - if (isSubmit) { - // mBaiduMap.clear(); - PoiGoOverlay poiOverlay = new PoiGoOverlay(mBaiduMap); - poiOverlay.setData(poiResult);// 设置POI数据 - mBaiduMap.setOnMarkerClickListener(poiOverlay); - poiOverlay.addToMap();// 将所有的overlay添加到地图上 - poiOverlay.zoomToSpan(); - mSearchlinearLayout.setVisibility(View.INVISIBLE); - //标注搜索点 关闭搜索列表 - // searchView.clearFocus(); //可以收起键盘 - searchItem.collapseActionView(); //关闭搜索视图 - isSubmit = false; - } else { - List> data = new ArrayList<>(); - int retCnt = poiResult.getAllPoi().size(); - - for (int i = 0; i < retCnt; i++) { - Map testitem = new HashMap<>(); - testitem.put("key_name", poiResult.getAllPoi().get(i).name); - testitem.put("key_addr", poiResult.getAllPoi().get(i).address); - testitem.put("key_lng", "" + poiResult.getAllPoi().get(i).location.longitude); - testitem.put("key_lat", "" + poiResult.getAllPoi().get(i).location.latitude); - data.add(testitem); - } - - simAdapt = new SimpleAdapter( - MainActivity.this, - data, - layout.poi_search_item, - new String[] {"key_name", "key_addr", "key_lng", "key_lat"}, // 与下面数组元素要一一对应 - new int[] {id.poi_name, id.poi_addr, id.poi_longitude, id.poi_latitude}); - mSearchList.setAdapter(simAdapt); - mSearchlinearLayout.setVisibility(View.VISIBLE); - } - } - } - - @Override - public void onGetPoiDetailResult(PoiDetailResult poiDetailResult) { - DisplayToast(poiDetailResult.name); - } - - @Override - public void onGetPoiDetailResult(PoiDetailSearchResult poiDetailSearchResult) { - } - - @Override - public void onGetPoiIndoorResult(PoiIndoorResult poiIndoorResult) { - } - }; - poiSearch.setOnGetPoiSearchResultListener(poiSearchListener); - } - //检索建议 private void setSearchSuggestListener() { mSuggestionSearch = SuggestionSearch.newInstance(); @@ -1574,11 +1489,11 @@ public class MainActivity extends BaseActivity if (isSubmit) { // mBaiduMap.clear(); //normal - PoiGoOverlay poiOverlay = new PoiGoOverlay(mBaiduMap); - poiOverlay.setSugData(res);// 设置POI数据 - mBaiduMap.setOnMarkerClickListener(poiOverlay); - poiOverlay.addToMap();// 将所有的overlay添加到地图上 - poiOverlay.zoomToSpan(); + //PoiGoOverlay poiOverlay = new PoiGoOverlay(mBaiduMap); + //poiOverlay.setSugData(res);// 设置POI数据 + //mBaiduMap.setOnMarkerClickListener(poiOverlay); + //poiOverlay.addToMap();// 将所有的overlay添加到地图上 + //poiOverlay.zoomToSpan(); mSearchlinearLayout.setVisibility(View.INVISIBLE); //标注搜索点 关闭搜索列表 // searchView.clearFocus(); //可以收起键盘 @@ -1686,7 +1601,6 @@ public class MainActivity extends BaseActivity mMapView = null; //poi search destroy - poiSearch.destroy(); mSuggestionSearch.destroy(); //close db @@ -1925,42 +1839,6 @@ public class MainActivity extends BaseActivity } } - public class PoiGoOverlay extends PoiOverlay { - private PoiGoOverlay(BaiduMap arg0) { - super(arg0); - } - - @Override - public boolean onPoiClick(int arg0) { - super.onPoiClick(arg0); - PoiResult poiResult = getPoiResult(); - - if (poiResult != null && poiResult.getAllPoi() != null) { - PoiInfo poiInfo; - poiInfo = poiResult.getAllPoi().get(arg0); - curMapLatLng = poiInfo.location; - transformCoordinate(Double.toString(curMapLatLng.longitude), Double.toString(curMapLatLng.latitude)); - // 检索poi详细信息 - poiSearch.searchPoiDetail(new PoiDetailSearchOption() - .poiUid(poiInfo.uid)); - } - - SuggestionResult suggestionResult = getSugResult(); - - if (suggestionResult != null && suggestionResult.getAllSuggestions() != null) { - SuggestionResult.SuggestionInfo suggestionInfo; - suggestionInfo = suggestionResult.getAllSuggestions().get(arg0); - curMapLatLng = suggestionInfo.pt; - transformCoordinate(Double.toString(curMapLatLng.longitude), Double.toString(curMapLatLng.latitude)); - // 检索sug详细信息 - poiSearch.searchPoiDetail(new PoiDetailSearchOption() - .poiUid(suggestionInfo.uid)); - } - - return true; - } - } - public class GoServiceReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { diff --git a/app/src/main/java/mapapi/overlayutil/BikingRouteOverlay.java b/app/src/main/java/mapapi/overlayutil/BikingRouteOverlay.java index 04bbd05..a6fe424 100644 --- a/app/src/main/java/mapapi/overlayutil/BikingRouteOverlay.java +++ b/app/src/main/java/mapapi/overlayutil/BikingRouteOverlay.java @@ -28,11 +28,11 @@ import java.util.List; public class BikingRouteOverlay extends OverlayManager { private BikingRouteLine mRouteLine = null; - + public BikingRouteOverlay(BaiduMap baiduMap) { super(baiduMap); } - + /** * 设置路线数据。 * @@ -42,91 +42,85 @@ public class BikingRouteOverlay extends OverlayManager { public void setData(BikingRouteLine line) { mRouteLine = line; } - + @Override public final List getOverlayOptions() { if (mRouteLine == null) { return null; } - + List overlayList = new ArrayList(); - if (mRouteLine.getAllStep() != null && mRouteLine.getAllStep().size() > 0) { for (BikingRouteLine.BikingStep step : mRouteLine.getAllStep()) { Bundle b = new Bundle(); b.putInt("index", mRouteLine.getAllStep().indexOf(step)); - if (step.getEntrance() != null) { overlayList.add((new MarkerOptions()) - .position(step.getEntrance().getLocation()) + .position(step.getEntrance().getLocation()) .rotate((360 - step.getDirection())) - .zIndex(10) - .anchor(0.5f, 0.5f) - .extraInfo(b) - .icon(BitmapDescriptorFactory - .fromAssetWithDpi("Icon_line_node.png"))); + .zIndex(10) + .anchor(0.5f, 0.5f) + .extraInfo(b) + .icon(BitmapDescriptorFactory + .fromAssetWithDpi("Icon_line_node.png"))); } - + // 最后路段绘制出口点 if (mRouteLine.getAllStep().indexOf(step) == (mRouteLine .getAllStep().size() - 1) && step.getExit() != null) { overlayList.add((new MarkerOptions()) - .position(step.getExit().getLocation()) + .position(step.getExit().getLocation()) .anchor(0.5f, 0.5f) - .zIndex(10) - .icon(BitmapDescriptorFactory - .fromAssetWithDpi("Icon_line_node.png"))); + .zIndex(10) + .icon(BitmapDescriptorFactory + .fromAssetWithDpi("Icon_line_node.png"))); + } } } - // starting if (mRouteLine.getStarting() != null) { overlayList.add((new MarkerOptions()) - .position(mRouteLine.getStarting().getLocation()) + .position(mRouteLine.getStarting().getLocation()) .icon(getStartMarker() != null ? getStartMarker() : - BitmapDescriptorFactory - .fromAssetWithDpi("Icon_start.png")).zIndex(10)); + BitmapDescriptorFactory + .fromAssetWithDpi("Icon_start.png")).zIndex(10)); } - // terminal if (mRouteLine.getTerminal() != null) { overlayList - .add((new MarkerOptions()) - .position(mRouteLine.getTerminal().getLocation()) - .icon(getTerminalMarker() != null ? getTerminalMarker() : - BitmapDescriptorFactory - .fromAssetWithDpi("Icon_end.png")) - .zIndex(10)); + .add((new MarkerOptions()) + .position(mRouteLine.getTerminal().getLocation()) + .icon(getTerminalMarker() != null ? getTerminalMarker() : + BitmapDescriptorFactory + .fromAssetWithDpi("Icon_end.png")) + .zIndex(10)); } - + // poly line list if (mRouteLine.getAllStep() != null && mRouteLine.getAllStep().size() > 0) { LatLng lastStepLastPoint = null; - for (BikingRouteLine.BikingStep step : mRouteLine.getAllStep()) { List watPoints = step.getWayPoints(); - if (watPoints != null) { List points = new ArrayList(); - if (lastStepLastPoint != null) { points.add(lastStepLastPoint); } - points.addAll(watPoints); overlayList.add(new PolylineOptions().points(points).width(10) - .color(getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255)).zIndex(0)); + .color(getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255)).zIndex(0)); lastStepLastPoint = watPoints.get(watPoints.size() - 1); } } + } - + return overlayList; } - + /** * 覆写此方法以改变默认起点图标 * @@ -146,7 +140,7 @@ public class BikingRouteOverlay extends OverlayManager { public BitmapDescriptor getTerminalMarker() { return null; } - + /** * 处理点击事件 * @@ -161,10 +155,9 @@ public class BikingRouteOverlay extends OverlayManager { && mRouteLine.getAllStep().get(i) != null) { Log.i("baidumapsdk", "BikingRouteOverlay onRouteNodeClick"); } - return false; } - + @Override public final boolean onMarkerClick(Marker marker) { for (Overlay mMarker : mOverlayList) { @@ -174,10 +167,9 @@ public class BikingRouteOverlay extends OverlayManager { } } } - return true; } - + @Override public boolean onPolylineClick(Polyline polyline) { // TODO Auto-generated method stub diff --git a/app/src/main/java/mapapi/overlayutil/BusLineOverlay.java b/app/src/main/java/mapapi/overlayutil/BusLineOverlay.java index 88f0e97..3f49eb7 100644 --- a/app/src/main/java/mapapi/overlayutil/BusLineOverlay.java +++ b/app/src/main/java/mapapi/overlayutil/BusLineOverlay.java @@ -22,65 +22,61 @@ import java.util.List; public class BusLineOverlay extends OverlayManager { private BusLineResult mBusLineResult = null; - + /** * 构造函数 - * + * * @param baiduMap * 该BusLineOverlay所引用的 BaiduMap 对象 */ public BusLineOverlay(BaiduMap baiduMap) { super(baiduMap); } - + /** * 设置公交线数据 - * + * * @param result * 公交线路结果数据 */ public void setData(BusLineResult result) { this.mBusLineResult = result; } - + @Override public final List getOverlayOptions() { + if (mBusLineResult == null || mBusLineResult.getStations() == null) { return null; } - List overlayOptionses = new ArrayList(); - for (BusLineResult.BusStation station : mBusLineResult.getStations()) { overlayOptionses.add(new MarkerOptions() - .position(station.getLocation()) - .zIndex(10) - .anchor(0.5f, 0.5f) - .icon(BitmapDescriptorFactory - .fromAssetWithDpi("Icon_bus_station.png"))); + .position(station.getLocation()) + .zIndex(10) + .anchor(0.5f, 0.5f) + .icon(BitmapDescriptorFactory + .fromAssetWithDpi("Icon_bus_station.png"))); } - + List points = new ArrayList(); - for (BusLineResult.BusStep step : mBusLineResult.getSteps()) { if (step.getWayPoints() != null) { points.addAll(step.getWayPoints()); } } - if (points.size() > 0) { overlayOptionses - .add(new PolylineOptions().width(10) - .color(Color.argb(178, 0, 78, 255)).zIndex(0) - .points(points)); + .add(new PolylineOptions().width(10) + .color(Color.argb(178, 0, 78, 255)).zIndex(0) + .points(points)); } - return overlayOptionses; } - + /** * 覆写此方法以改变默认点击行为 - * + * * @param index * 被点击的站点在 * {@link com.baidu.mapapi.search.busline.BusLineResult#getStations()} @@ -92,18 +88,18 @@ public class BusLineOverlay extends OverlayManager { && mBusLineResult.getStations().get(index) != null) { Log.i("baidumapsdk", "BusLineOverlay onBusStationClick"); } - return false; } - + public final boolean onMarkerClick(Marker marker) { if (mOverlayList != null && mOverlayList.contains(marker)) { return onBusStationClick(mOverlayList.indexOf(marker)); } else { return false; } + } - + @Override public boolean onPolylineClick(Polyline polyline) { // TODO Auto-generated method stub diff --git a/app/src/main/java/mapapi/overlayutil/DrivingRouteOverlay.java b/app/src/main/java/mapapi/overlayutil/DrivingRouteOverlay.java index 8b08187..77700fe 100644 --- a/app/src/main/java/mapapi/overlayutil/DrivingRouteOverlay.java +++ b/app/src/main/java/mapapi/overlayutil/DrivingRouteOverlay.java @@ -27,83 +27,82 @@ public class DrivingRouteOverlay extends OverlayManager { private DrivingRouteLine mRouteLine = null; boolean focus = false; - + /** * 构造函数 - * + * * @param baiduMap * 该DrivingRouteOvelray引用的 BaiduMap */ public DrivingRouteOverlay(BaiduMap baiduMap) { super(baiduMap); } - + @Override public final List getOverlayOptions() { if (mRouteLine == null) { return null; } - + List overlayOptionses = new ArrayList(); - // step node if (mRouteLine.getAllStep() != null && mRouteLine.getAllStep().size() > 0) { + for (DrivingRouteLine.DrivingStep step : mRouteLine.getAllStep()) { Bundle b = new Bundle(); b.putInt("index", mRouteLine.getAllStep().indexOf(step)); - if (step.getEntrance() != null) { overlayOptionses.add((new MarkerOptions()) - .position(step.getEntrance().getLocation()) - .anchor(0.5f, 0.5f) - .zIndex(10) - .rotate((360 - step.getDirection())) - .extraInfo(b) - .icon(BitmapDescriptorFactory - .fromAssetWithDpi("Icon_line_node.png"))); + .position(step.getEntrance().getLocation()) + .anchor(0.5f, 0.5f) + .zIndex(10) + .rotate((360 - step.getDirection())) + .extraInfo(b) + .icon(BitmapDescriptorFactory + .fromAssetWithDpi("Icon_line_node.png"))); } - // 最后路段绘制出口点 if (mRouteLine.getAllStep().indexOf(step) == (mRouteLine .getAllStep().size() - 1) && step.getExit() != null) { overlayOptionses.add((new MarkerOptions()) - .position(step.getExit().getLocation()) - .anchor(0.5f, 0.5f) - .zIndex(10) - .icon(BitmapDescriptorFactory - .fromAssetWithDpi("Icon_line_node.png"))); + .position(step.getExit().getLocation()) + .anchor(0.5f, 0.5f) + .zIndex(10) + .icon(BitmapDescriptorFactory + .fromAssetWithDpi("Icon_line_node.png"))); + } } } - + if (mRouteLine.getStarting() != null) { overlayOptionses.add((new MarkerOptions()) - .position(mRouteLine.getStarting().getLocation()) - .icon(getStartMarker() != null ? getStartMarker() : - BitmapDescriptorFactory - .fromAssetWithDpi("Icon_start.png")).zIndex(10)); + .position(mRouteLine.getStarting().getLocation()) + .icon(getStartMarker() != null ? getStartMarker() : + BitmapDescriptorFactory + .fromAssetWithDpi("Icon_start.png")).zIndex(10)); } - if (mRouteLine.getTerminal() != null) { overlayOptionses - .add((new MarkerOptions()) - .position(mRouteLine.getTerminal().getLocation()) - .icon(getTerminalMarker() != null ? getTerminalMarker() : - BitmapDescriptorFactory - .fromAssetWithDpi("Icon_end.png")) - .zIndex(10)); + .add((new MarkerOptions()) + .position(mRouteLine.getTerminal().getLocation()) + .icon(getTerminalMarker() != null ? getTerminalMarker() : + BitmapDescriptorFactory + .fromAssetWithDpi("Icon_end.png")) + .zIndex(10)); } - // poly line if (mRouteLine.getAllStep() != null && mRouteLine.getAllStep().size() > 0) { + List steps = mRouteLine.getAllStep(); int stepNum = steps.size(); + + List points = new ArrayList(); ArrayList traffics = new ArrayList(); int totalTraffic = 0; - for (int i = 0; i < stepNum ; i++) { if (i == stepNum - 1) { points.addAll(steps.get(i).getWayPoints()); @@ -112,63 +111,58 @@ public class DrivingRouteOverlay extends OverlayManager { } totalTraffic += steps.get(i).getWayPoints().size() - 1; - if (steps.get(i).getTrafficList() != null && steps.get(i).getTrafficList().length > 0) { - for (int j = 0; j < steps.get(i).getTrafficList().length; j++) { + for (int j = 0;j < steps.get(i).getTrafficList().length;j++) { traffics.add(steps.get(i).getTrafficList()[j]); } } } - // Bundle indexList = new Bundle(); - // if (traffics.size() > 0) { - // int raffic[] = new int[traffics.size()]; - // int index = 0; - // for (Integer tempTraff : traffics) { - // raffic[index] = tempTraff.intValue(); - // index++; - // } - // indexList.putIntArray("indexs", raffic); - // } +// Bundle indexList = new Bundle(); +// if (traffics.size() > 0) { +// int raffic[] = new int[traffics.size()]; +// int index = 0; +// for (Integer tempTraff : traffics) { +// raffic[index] = tempTraff.intValue(); +// index++; +// } +// indexList.putIntArray("indexs", raffic); +// } boolean isDotLine = false; if (traffics != null && traffics.size() > 0) { isDotLine = true; } - PolylineOptions option = new PolylineOptions().points(points).textureIndex(traffics) - .width(7).dottedLine(isDotLine).focus(true) - .color(getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255)).zIndex(0); - + .width(7).dottedLine(isDotLine).focus(true) + .color(getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255)).zIndex(0); if (isDotLine) { option.customTextureList(getCustomTextureList()); } - overlayOptionses.add(option); } - return overlayOptionses; } - + /** * 设置路线数据 - * + * * @param routeLine * 路线数据 */ public void setData(DrivingRouteLine routeLine) { this.mRouteLine = routeLine; } - + /** * 覆写此方法以改变默认起点图标 - * + * * @return 起点图标 */ public BitmapDescriptor getStartMarker() { return null; } - + /** * 覆写此方法以改变默认绘制颜色 * @return 线颜色 @@ -187,16 +181,16 @@ public class DrivingRouteOverlay extends OverlayManager { } /** * 覆写此方法以改变默认终点图标 - * + * * @return 终点图标 */ public BitmapDescriptor getTerminalMarker() { return null; } - + /** * 覆写此方法以改变默认点击处理 - * + * * @param i * 线路节点的 index * @return 是否处理了该点击事件 @@ -206,10 +200,9 @@ public class DrivingRouteOverlay extends OverlayManager { && mRouteLine.getAllStep().get(i) != null) { Log.i("baidumapsdk", "DrivingRouteOverlay onRouteNodeClick"); } - return false; } - + @Override public final boolean onMarkerClick(Marker marker) { for (Overlay mMarker : mOverlayList) { @@ -219,14 +212,12 @@ public class DrivingRouteOverlay extends OverlayManager { } } } - return true; } - + @Override public boolean onPolylineClick(Polyline polyline) { boolean flag = false; - for (Overlay mPolyline : mOverlayList) { if (mPolyline instanceof Polyline && mPolyline.equals(polyline)) { // 选中 @@ -234,20 +225,20 @@ public class DrivingRouteOverlay extends OverlayManager { break; } } - setFocus(flag); return true; } - + public void setFocus(boolean flag) { focus = flag; - for (Overlay mPolyline : mOverlayList) { if (mPolyline instanceof Polyline) { // 选中 ((Polyline) mPolyline).setFocus(flag); + break; } } + } } diff --git a/app/src/main/java/mapapi/overlayutil/IndoorPoiOverlay.java b/app/src/main/java/mapapi/overlayutil/IndoorPoiOverlay.java index 1a9dc7d..e6873da 100644 --- a/app/src/main/java/mapapi/overlayutil/IndoorPoiOverlay.java +++ b/app/src/main/java/mapapi/overlayutil/IndoorPoiOverlay.java @@ -20,9 +20,9 @@ import java.util.List; public class IndoorPoiOverlay extends OverlayManager { private static final int MAX_POI_SIZE = 10; - + private PoiIndoorResult mIndoorPoiResult = null; - + /** * 构造函数 * @@ -32,7 +32,7 @@ public class IndoorPoiOverlay extends OverlayManager { public IndoorPoiOverlay(BaiduMap baiduMap) { super(baiduMap); } - + /** * 设置IndoorPoi数据 * @@ -42,34 +42,31 @@ public class IndoorPoiOverlay extends OverlayManager { public void setData(PoiIndoorResult indoorpoiResult) { this.mIndoorPoiResult = indoorpoiResult; } - + @Override public final List getOverlayOptions() { - if (mIndoorPoiResult == null || mIndoorPoiResult.getmArrayPoiInfo() == null) { + if (mIndoorPoiResult == null || mIndoorPoiResult.getArrayPoiInfo() == null) { return null; } - List markerList = new ArrayList(); int markerSize = 0; - - for (int i = 0; i < mIndoorPoiResult.getmArrayPoiInfo().size() + for (int i = 0; i < mIndoorPoiResult.getArrayPoiInfo().size() && markerSize < MAX_POI_SIZE; i++) { - if (mIndoorPoiResult.getmArrayPoiInfo().get(i).latLng == null) { + if (mIndoorPoiResult.getArrayPoiInfo().get(i).latLng == null) { continue; } - markerSize++; Bundle bundle = new Bundle(); bundle.putInt("index", i); markerList.add(new MarkerOptions() - .icon(BitmapDescriptorFactory.fromAssetWithDpi("Icon_mark" - + markerSize + ".png")).extraInfo(bundle) - .position(mIndoorPoiResult.getmArrayPoiInfo().get(i).latLng)); + .icon(BitmapDescriptorFactory.fromAssetWithDpi("Icon_mark" + + markerSize + ".png")).extraInfo(bundle) + .position(mIndoorPoiResult.getArrayPoiInfo().get(i).latLng)); + } - return markerList; } - + /** * 获取该 IndoorPoiOverlay 的 indoorpoi数据 * @@ -78,7 +75,7 @@ public class IndoorPoiOverlay extends OverlayManager { public PoiIndoorResult getIndoorPoiResult() { return mIndoorPoiResult; } - + /** * 覆写此方法以改变默认点击行为 * @@ -90,20 +87,18 @@ public class IndoorPoiOverlay extends OverlayManager { public boolean onPoiClick(int i) { return false; } - + @Override public final boolean onMarkerClick(Marker marker) { if (!mOverlayList.contains(marker)) { return false; } - if (marker.getExtraInfo() != null) { return onPoiClick(marker.getExtraInfo().getInt("index")); } - return false; } - + @Override public boolean onPolylineClick(Polyline polyline) { // TODO Auto-generated method stub diff --git a/app/src/main/java/mapapi/overlayutil/IndoorRouteOverlay.java b/app/src/main/java/mapapi/overlayutil/IndoorRouteOverlay.java index 4db2255..6c6fa3c 100644 --- a/app/src/main/java/mapapi/overlayutil/IndoorRouteOverlay.java +++ b/app/src/main/java/mapapi/overlayutil/IndoorRouteOverlay.java @@ -3,8 +3,8 @@ */ package mapapi.overlayutil; -import android.graphics.Color; -import android.os.Bundle; +import java.util.ArrayList; +import java.util.List; import com.baidu.mapapi.map.BaiduMap; import com.baidu.mapapi.map.BitmapDescriptor; @@ -17,14 +17,14 @@ import com.baidu.mapapi.map.PolylineOptions; import com.baidu.mapapi.model.LatLng; import com.baidu.mapapi.search.route.IndoorRouteLine; -import java.util.ArrayList; -import java.util.List; +import android.graphics.Color; +import android.os.Bundle; public class IndoorRouteOverlay extends OverlayManager { private IndoorRouteLine mRouteLine; int[] colorInfo; - + /** * 构造函数 * @@ -33,12 +33,11 @@ public class IndoorRouteOverlay extends OverlayManager { */ public IndoorRouteOverlay(BaiduMap baiduMap) { super(baiduMap); - colorInfo = new int[] { Color.argb(178, 0, 78, 255), Color.argb(178, 88, 208, 0), Color.argb(178, 88, 78, - 255) - }; + colorInfo = new int[]{ Color.argb(178, 0, 78, 255), Color.argb(178, 88, 208, 0), Color.argb(178, 88, 78, + 255)}; } - - + + /** * 设置路线数据 * @@ -48,7 +47,7 @@ public class IndoorRouteOverlay extends OverlayManager { public void setData(IndoorRouteLine routeOverlay) { this.mRouteLine = routeOverlay; } - + /** * 覆写此方法以改变默认起点图标 * @@ -57,7 +56,7 @@ public class IndoorRouteOverlay extends OverlayManager { public BitmapDescriptor getStartMarker() { return null; } - + /** * 覆写此方法以改变默认终点图标 * @@ -66,7 +65,7 @@ public class IndoorRouteOverlay extends OverlayManager { public BitmapDescriptor getTerminalMarker() { return null; } - + public int getLineColor() { return 0; } @@ -75,93 +74,90 @@ public class IndoorRouteOverlay extends OverlayManager { if (mRouteLine == null) { return null; } - + List overlayList = new ArrayList(); - + + // 添加step的节点 if (mRouteLine.getAllStep() != null && mRouteLine.getAllStep().size() > 0) { for (IndoorRouteLine.IndoorRouteStep step : mRouteLine.getAllStep()) { Bundle b = new Bundle(); b.putInt("index", mRouteLine.getAllStep().indexOf(step)); - if (step.getEntrace() != null) { overlayList.add((new MarkerOptions()).position(step.getEntrace().getLocation()) - .zIndex(10).anchor(0.5f, 0.5f).extraInfo(b) - .icon(BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png"))); + .zIndex(10).anchor(0.5f, 0.5f).extraInfo(b) + .icon(BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png"))); } - + // 最后路段绘制出口点 if (mRouteLine.getAllStep().indexOf(step) == (mRouteLine.getAllStep().size() - 1) && step.getExit() != null) { overlayList.add((new MarkerOptions()).position(step.getExit().getLocation()).anchor(0.5f, 0.5f) - .zIndex(10).icon(BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png"))); + .zIndex(10).icon(BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png"))); + } } } - // 添加起点starting if (mRouteLine.getStarting() != null) { overlayList.add((new MarkerOptions()).position(mRouteLine.getStarting().getLocation()) - .icon(getStartMarker() != null ? getStartMarker() : - BitmapDescriptorFactory.fromAssetWithDpi("Icon_start.png")) - .zIndex(10)); + .icon(getStartMarker() != null ? getStartMarker() : + BitmapDescriptorFactory.fromAssetWithDpi("Icon_start.png")) + .zIndex(10)); } - // 添加终点terminal if (mRouteLine.getTerminal() != null) { overlayList.add((new MarkerOptions()).position(mRouteLine.getTerminal().getLocation()) - .icon(getTerminalMarker() != null ? getTerminalMarker() : - BitmapDescriptorFactory.fromAssetWithDpi("Icon_end.png")) - .zIndex(10)); + .icon(getTerminalMarker() != null ? getTerminalMarker() : + BitmapDescriptorFactory.fromAssetWithDpi("Icon_end.png")) + .zIndex(10)); } - + // 添加线poly line list if (mRouteLine.getAllStep() != null && mRouteLine.getAllStep().size() > 0) { LatLng lastStepLastPoint = null; int idex = 0; - for (IndoorRouteLine.IndoorRouteStep step : mRouteLine.getAllStep()) { List watPoints = step.getWayPoints(); - if (watPoints != null) { List points = new ArrayList(); - if (lastStepLastPoint != null) { points.add(lastStepLastPoint); } - points.addAll(watPoints); overlayList.add(new PolylineOptions().points(points).width(10) - .color(getLineColor() != 0 ? getLineColor() : colorInfo[idex++ % 3]).zIndex(0)); + .color(getLineColor() != 0 ? getLineColor() : colorInfo[idex++ % 3]).zIndex(0)); lastStepLastPoint = watPoints.get(watPoints.size() - 1); } } + } - + return overlayList; + } - - // private BitmapDescriptor getIconForStep(IndoorRouteLine.TransitStep step) { - // switch (step.getVehileType()) { - // case ESTEP_WALK: - // return BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png"); - // case ESTEP_TRAIN: - // return BitmapDescriptorFactory.fromAssetWithDpi("Icon_subway_station.png"); - // case ESTEP_DRIVING: - // case ESTEP_COACH: - // case ESTEP_PLANE: - // case ESTEP_BUS: - // return BitmapDescriptorFactory.fromAssetWithDpi("Icon_bus_station.png"); - // default: - // return null; - // } - // } - + +// private BitmapDescriptor getIconForStep(IndoorRouteLine.TransitStep step) { +// switch (step.getVehileType()) { +// case ESTEP_WALK: +// return BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png"); +// case ESTEP_TRAIN: +// return BitmapDescriptorFactory.fromAssetWithDpi("Icon_subway_station.png"); +// case ESTEP_DRIVING: +// case ESTEP_COACH: +// case ESTEP_PLANE: +// case ESTEP_BUS: +// return BitmapDescriptorFactory.fromAssetWithDpi("Icon_bus_station.png"); +// default: +// return null; +// } +// } + @Override public boolean onMarkerClick(Marker marker) { return false; } - + @Override public boolean onPolylineClick(Polyline polyline) { return false; diff --git a/app/src/main/java/mapapi/overlayutil/MassTransitRouteOverlay.java b/app/src/main/java/mapapi/overlayutil/MassTransitRouteOverlay.java index 439d665..fe9aeca 100644 --- a/app/src/main/java/mapapi/overlayutil/MassTransitRouteOverlay.java +++ b/app/src/main/java/mapapi/overlayutil/MassTransitRouteOverlay.java @@ -3,8 +3,8 @@ */ package mapapi.overlayutil; -import android.graphics.Color; -import android.os.Bundle; +import java.util.ArrayList; +import java.util.List; import com.baidu.mapapi.map.BaiduMap; import com.baidu.mapapi.map.BitmapDescriptor; @@ -16,14 +16,14 @@ import com.baidu.mapapi.map.Polyline; import com.baidu.mapapi.map.PolylineOptions; import com.baidu.mapapi.search.route.MassTransitRouteLine; -import java.util.ArrayList; -import java.util.List; +import android.graphics.Color; +import android.os.Bundle; public class MassTransitRouteOverlay extends OverlayManager { private MassTransitRouteLine mRouteLine; private boolean isSameCity; - + /** * 构造函数 * @@ -33,8 +33,8 @@ public class MassTransitRouteOverlay extends OverlayManager { public MassTransitRouteOverlay(BaiduMap baiduMap) { super(baiduMap); } - - + + /** * 设置路线数据 * @@ -44,7 +44,7 @@ public class MassTransitRouteOverlay extends OverlayManager { public void setData(MassTransitRouteLine routeOverlay) { this.mRouteLine = routeOverlay; } - + public void setSameCity( boolean sameCity ) { isSameCity = sameCity; } @@ -56,7 +56,7 @@ public class MassTransitRouteOverlay extends OverlayManager { public BitmapDescriptor getStartMarker() { return null; } - + /** * 覆写此方法以改变默认终点图标 * @@ -65,7 +65,7 @@ public class MassTransitRouteOverlay extends OverlayManager { public BitmapDescriptor getTerminalMarker() { return null; } - + public int getLineColor() { return 0; } @@ -74,38 +74,38 @@ public class MassTransitRouteOverlay extends OverlayManager { if (mRouteLine == null) { return null; } - + List overlayOptionses = new ArrayList(); List> steps = mRouteLine.getNewSteps(); - if (isSameCity ) { // 同城 (同城时，每个steps的get(i)对应的List是一条step的不同方案，此处都选第一条进行绘制，即get（0）） - + // step node for ( int i = 0; i < steps.size(); i++ ) { + MassTransitRouteLine.TransitStep step = steps.get(i).get(0); Bundle b = new Bundle(); b.putInt("index", i + 1); - + if (step.getStartLocation() != null) { overlayOptionses.add((new MarkerOptions()).position(step.getStartLocation()) - .anchor(0.5f, 0.5f).zIndex(10).extraInfo(b).icon(getIconForStep(step))); + .anchor(0.5f, 0.5f).zIndex(10).extraInfo(b).icon(getIconForStep(step))); } - + // 最后一个终点 if ( (i == steps.size() - 1) && (step.getEndLocation() != null)) { overlayOptionses.add((new MarkerOptions()).position(step.getEndLocation()) - .anchor(0.5f, 0.5f).zIndex(10) - .icon(getIconForStep(step)) - ); + .anchor(0.5f, 0.5f).zIndex(10) + .icon(getIconForStep(step)) + ); } + } - + // polyline for ( int i = 0; i < steps.size(); i++ ) { MassTransitRouteLine.TransitStep step = steps.get(i).get(0); int color = 0; - if (step.getVehileType() != MassTransitRouteLine.TransitStep .StepVehicleInfoType.ESTEP_WALK) { // color = Color.argb(178, 0, 78, 255); @@ -114,49 +114,49 @@ public class MassTransitRouteOverlay extends OverlayManager { // color = Color.argb(178, 88, 208, 0); color = getLineColor() != 0 ? getLineColor() : Color.argb(178, 88, 208, 0); } - overlayOptionses.add(new PolylineOptions() - .points(step.getWayPoints()).width(10).color(color) - .zIndex(0)); + .points(step.getWayPoints()).width(10).color(color) + .zIndex(0)); } + } else { // 跨城 （跨城时，每个steps的get(i)对应的List是一条step的子路线sub_step，需要将它们全部拼接才是一条完整路线） int stepSum = 0; - for (int i = 0; i < steps.size(); i++ ) { stepSum += steps.get(i).size(); } - + // step node int k = 1; - for ( int i = 0; i < steps.size(); i++ ) { + for (int j = 0; j < steps.get(i).size(); j++ ) { MassTransitRouteLine.TransitStep step = steps.get(i).get(j); Bundle b = new Bundle(); b.putInt("index", k); - + if (step.getStartLocation() != null) { overlayOptionses.add((new MarkerOptions()).position(step.getStartLocation()) - .anchor(0.5f, 0.5f).zIndex(10).extraInfo(b).icon(getIconForStep(step))); + .anchor(0.5f, 0.5f).zIndex(10).extraInfo(b).icon(getIconForStep(step))); } - + // 最后一个终点 if ( (k == stepSum ) && (step.getEndLocation() != null)) { overlayOptionses.add((new MarkerOptions()).position(step.getEndLocation()) - .anchor(0.5f, 0.5f).zIndex(10).icon(getIconForStep(step))); + .anchor(0.5f, 0.5f).zIndex(10).icon(getIconForStep(step))); } - + k++; } } - + + // polyline for ( int i = 0; i < steps.size(); i++ ) { + for (int j = 0; j < steps.get(i).size(); j++ ) { MassTransitRouteLine.TransitStep step = steps.get(i).get(j); int color = 0; - if (step.getVehileType() != MassTransitRouteLine.TransitStep .StepVehicleInfoType.ESTEP_WALK) { // color = Color.argb(178, 0, 78, 255); @@ -165,62 +165,59 @@ public class MassTransitRouteOverlay extends OverlayManager { // color = Color.argb(178, 88, 208, 0); color = getLineColor() != 0 ? getLineColor() : Color.argb(178, 88, 208, 0); } - if (step.getWayPoints() != null ) { overlayOptionses.add(new PolylineOptions() - .points(step.getWayPoints()).width(10).color(color) - .zIndex(0)); + .points(step.getWayPoints()).width(10).color(color) + .zIndex(0)); } } } + } - + // 起点 if (mRouteLine.getStarting() != null && mRouteLine.getStarting().getLocation() != null) { overlayOptionses.add((new MarkerOptions()).position(mRouteLine.getStarting().getLocation()) - .icon(getStartMarker() != null - ? getStartMarker() : BitmapDescriptorFactory.fromAssetWithDpi("Icon_start.png")) - .zIndex(10)); + .icon(getStartMarker() != null + ? getStartMarker() : BitmapDescriptorFactory.fromAssetWithDpi("Icon_start.png")) + .zIndex(10)); } - // 终点 if (mRouteLine.getTerminal() != null && mRouteLine.getTerminal().getLocation() != null) { overlayOptionses - .add((new MarkerOptions()) - .position(mRouteLine.getTerminal().getLocation()) - .icon(getTerminalMarker() != null ? getTerminalMarker() : - BitmapDescriptorFactory - .fromAssetWithDpi("Icon_end.png")) - .zIndex(10)); + .add((new MarkerOptions()) + .position(mRouteLine.getTerminal().getLocation()) + .icon(getTerminalMarker() != null ? getTerminalMarker() : + BitmapDescriptorFactory + .fromAssetWithDpi("Icon_end.png")) + .zIndex(10)); } - + return overlayOptionses; + } - + private BitmapDescriptor getIconForStep(MassTransitRouteLine.TransitStep step) { switch (step.getVehileType()) { - case ESTEP_WALK: - return BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png"); - - case ESTEP_TRAIN: - return BitmapDescriptorFactory.fromAssetWithDpi("Icon_subway_station.png"); - - case ESTEP_DRIVING: - case ESTEP_COACH: - case ESTEP_PLANE: - case ESTEP_BUS: - return BitmapDescriptorFactory.fromAssetWithDpi("Icon_bus_station.png"); - - default: - return null; + case ESTEP_WALK: + return BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png"); + case ESTEP_TRAIN: + return BitmapDescriptorFactory.fromAssetWithDpi("Icon_subway_station.png"); + case ESTEP_DRIVING: + case ESTEP_COACH: + case ESTEP_PLANE: + case ESTEP_BUS: + return BitmapDescriptorFactory.fromAssetWithDpi("Icon_bus_station.png"); + default: + return null; } } - + @Override public boolean onMarkerClick(Marker marker) { return false; } - + @Override public boolean onPolylineClick(Polyline polyline) { return false; diff --git a/app/src/main/java/mapapi/overlayutil/OverlayManager.java b/app/src/main/java/mapapi/overlayutil/OverlayManager.java index 82f211b..49a8d41 100644 --- a/app/src/main/java/mapapi/overlayutil/OverlayManager.java +++ b/app/src/main/java/mapapi/overlayutil/OverlayManager.java @@ -2,6 +2,7 @@ package mapapi.overlayutil; import com.baidu.mapapi.map.BaiduMap; import com.baidu.mapapi.map.BaiduMap.OnPolylineClickListener; +import com.baidu.mapapi.map.MapStatus; import com.baidu.mapapi.map.MapStatusUpdateFactory; import com.baidu.mapapi.map.Marker; import com.baidu.mapapi.map.Overlay; @@ -30,9 +31,9 @@ public abstract class OverlayManager implements OnMarkerClickListener, OnPolylin BaiduMap mBaiduMap = null; private List mOverlayOptionList = null; - + List mOverlayList = null; - + /** * 通过一个BaiduMap 对象构造 * @@ -40,24 +41,22 @@ public abstract class OverlayManager implements OnMarkerClickListener, OnPolylin */ public OverlayManager(BaiduMap baiduMap) { mBaiduMap = baiduMap; - // mBaiduMap.setOnMarkerClickListener(this); if (mOverlayOptionList == null) { mOverlayOptionList = new ArrayList(); } - if (mOverlayList == null) { mOverlayList = new ArrayList(); } } - + /** * 覆写此方法设置要管理的Overlay列表 * * @return 管理的Overlay列表 */ public abstract List getOverlayOptions(); - + /** * 将所有Overlay 添加到地图上 */ @@ -65,19 +64,18 @@ public abstract class OverlayManager implements OnMarkerClickListener, OnPolylin if (mBaiduMap == null) { return; } - + removeFromMap(); List overlayOptions = getOverlayOptions(); - if (overlayOptions != null) { - mOverlayOptionList.addAll(getOverlayOptions()); + mOverlayOptionList.addAll(overlayOptions); } - + for (OverlayOptions option : mOverlayOptionList) { mOverlayList.add(mBaiduMap.addOverlay(option)); } } - + /** * 将所有Overlay 从 地图上消除 */ @@ -85,40 +83,62 @@ public abstract class OverlayManager implements OnMarkerClickListener, OnPolylin if (mBaiduMap == null) { return; } - for (Overlay marker : mOverlayList) { marker.remove(); } - mOverlayOptionList.clear(); mOverlayList.clear(); + } - + /** * 缩放地图，使所有Overlay都在合适的视野内 *

* 注： 该方法只对Marker类型的overlay有效 *

- * */ public void zoomToSpan() { if (mBaiduMap == null) { return; } - if (mOverlayList.size() > 0) { LatLngBounds.Builder builder = new LatLngBounds.Builder(); - for (Overlay overlay : mOverlayList) { // polyline 中的点可能太多，只按marker 缩放 if (overlay instanceof Marker) { builder.include(((Marker) overlay).getPosition()); } } - - mBaiduMap.setMapStatus(MapStatusUpdateFactory - .newLatLngBounds(builder.build())); + MapStatus mapStatus = mBaiduMap.getMapStatus(); + if (null != mapStatus){ + int width = mapStatus.winRound.right - mBaiduMap.getMapStatus().winRound.left - 400; + int height = mapStatus.winRound.bottom - mBaiduMap.getMapStatus().winRound.top - 400; + mBaiduMap.setMapStatus(MapStatusUpdateFactory + .newLatLngBounds(builder.build(), width, height)); + } + } } - + + /** + * 设置显示在规定宽高中的地图地理范围 + */ + public void zoomToSpanPaddingBounds(int paddingLeft, int paddingTop, int paddingRight, int paddingBottom) { + if (mBaiduMap == null) { + return; + } + if (mOverlayList.size() > 0) { + LatLngBounds.Builder builder = new LatLngBounds.Builder(); + for (Overlay overlay : mOverlayList) { + // polyline 中的点可能太多，只按marker 缩放 + if (overlay instanceof Marker) { + builder.include(((Marker) overlay).getPosition()); + } + } + + mBaiduMap.setMapStatus(MapStatusUpdateFactory + .newLatLngBounds(builder.build(), paddingLeft, paddingTop, paddingRight, paddingBottom)); + } + } + } diff --git a/app/src/main/java/mapapi/overlayutil/PoiOverlay.java b/app/src/main/java/mapapi/overlayutil/PoiOverlay.java index f0f7e1b..b5a1f1d 100644 --- a/app/src/main/java/mapapi/overlayutil/PoiOverlay.java +++ b/app/src/main/java/mapapi/overlayutil/PoiOverlay.java @@ -1,150 +1,113 @@ -package mapapi.overlayutil; - -import android.os.Bundle; -import android.util.Log; - -import com.baidu.mapapi.map.BaiduMap; -import com.baidu.mapapi.map.BitmapDescriptorFactory; -import com.baidu.mapapi.map.Marker; -import com.baidu.mapapi.map.MarkerOptions; -import com.baidu.mapapi.map.OverlayOptions; -import com.baidu.mapapi.map.Polyline; -import com.baidu.mapapi.search.poi.PoiResult; -import com.baidu.mapapi.search.sug.SuggestionResult; -import com.zcshou.gogogo.R; - -import java.util.ArrayList; -import java.util.List; - -/** - * 用于显示poi的overly - */ -public class PoiOverlay extends OverlayManager { - - private static final int MAX_POI_SIZE = 10; - - private PoiResult mPoiResult = null; - private SuggestionResult mSuggestionResult = null; - private BaiduMap mBaiduMap; - - /** - * 构造函数 - * - * @param baiduMap 该 PoiOverlay 引用的 BaiduMap 对象 - */ - public PoiOverlay(BaiduMap baiduMap) { - super(baiduMap); - mBaiduMap = baiduMap; - } - - /** - * 设置POI数据 - * - * @param poiResult 设置POI数据 - */ - public void setData(PoiResult poiResult) { - this.mPoiResult = poiResult; - } - - public void setSugData(SuggestionResult sugResult) { - this.mSuggestionResult = sugResult; - } - - - @Override - public final List getOverlayOptions() { - if ((mPoiResult == null || mPoiResult.getAllPoi() == null) && (mSuggestionResult == null || mSuggestionResult.getAllSuggestions() == null)) { - return null; - } - - List markerList = new ArrayList(); - int curInd = 0; - - if (!(mPoiResult == null || mPoiResult.getAllPoi() == null)) { - for (int i = 0; i < mPoiResult.getAllPoi().size(); i++) { - if (mPoiResult.getAllPoi().get(i).location == null) { - continue; - } - - Bundle bundle = new Bundle(); - bundle.putInt("index", curInd++); - markerList.add(new MarkerOptions() - .icon(BitmapDescriptorFactory.fromAssetWithDpi("ic_location_on_black_36dp.png")).extraInfo(bundle) - .position(mPoiResult.getAllPoi().get(i).location)); - } - } - - if (!(mSuggestionResult == null || mSuggestionResult.getAllSuggestions() == null)) { - for (int j = 0; j < mSuggestionResult.getAllSuggestions().size(); j++) { - if (mSuggestionResult.getAllSuggestions().get(j).pt == null) { - continue; - } - - Bundle bundle = new Bundle(); - bundle.putInt("index", curInd++); - markerList.add(new MarkerOptions() - .icon(BitmapDescriptorFactory.fromAssetWithDpi("ic_location_on_black_36dp.png")).extraInfo(bundle) - .position(mSuggestionResult.getAllSuggestions().get(j).pt)); - } - } - - return markerList; - } - - /** - * 获取该 PoiOverlay 的 poi数据 - * - * @return - */ - public PoiResult getPoiResult() { - return mPoiResult; - } - - public SuggestionResult getSugResult() { - return mSuggestionResult; - } - - /** - * 覆写此方法以改变默认点击行为 - * - * @param i 被点击的poi在 - * {@link com.baidu.mapapi.search.poi.PoiResult#getAllPoi()} 中的索引 - * @return - */ - public boolean onPoiClick(int i) { - // if (mPoiResult.getAllPoi() != null - // && mPoiResult.getAllPoi().get(i) != null) { - // Toast.makeText(BMapManager.getInstance().getContext(), - // mPoiResult.getAllPoi().get(i).name, Toast.LENGTH_LONG) - // .show(); - // } - return false; - } - - @Override - public final boolean onMarkerClick(Marker marker) { - if (!mOverlayList.contains(marker)) { - return false; - } - - if (marker.getExtraInfo() != null) { - // marker.setAnimation(getScaleAnimation()); - // marker.startAnimation(); - mBaiduMap.clear(); - addToMap(); - mBaiduMap.addOverlay(new MarkerOptions().position(marker.getPosition()).icon(BitmapDescriptorFactory - .fromResource(R.drawable.icon_gcoding))); - // marker.setIcon(BitmapDescriptorFactory.fromAssetWithDpi("ic_location_on_black_48dp.png")); - return onPoiClick(marker.getExtraInfo().getInt("index")); - } - - return false; - } - - @Override - public boolean onPolylineClick(Polyline polyline) { - // TODO Auto-generated method stub - return false; - } - -} +package mapapi.overlayutil; + +import android.os.Bundle; + +import com.baidu.mapapi.map.BaiduMap; +import com.baidu.mapapi.map.BitmapDescriptorFactory; +import com.baidu.mapapi.map.Marker; +import com.baidu.mapapi.map.MarkerOptions; +import com.baidu.mapapi.map.OverlayOptions; +import com.baidu.mapapi.map.Polyline; +import com.baidu.mapapi.search.poi.PoiResult; + +import java.util.ArrayList; +import java.util.List; + +/** + * 用于显示poi的overly + */ +public class PoiOverlay extends OverlayManager { + + private static final int MAX_POI_SIZE = 10; + + private PoiResult mPoiResult = null; + + /** + * 构造函数 + * + * @param baiduMap 该 PoiOverlay 引用的 BaiduMap 对象 + */ + public PoiOverlay(BaiduMap baiduMap) { + super(baiduMap); + } + + /** + * 设置POI数据 + * + * @param poiResult 设置POI数据 + */ + public void setData(PoiResult poiResult) { + this.mPoiResult = poiResult; + } + + @Override + public final List getOverlayOptions() { + if (mPoiResult == null || mPoiResult.getAllPoi() == null) { + return null; + } + + List markerList = new ArrayList<>(); + int markerSize = 0; + + for (int i = 0; i < mPoiResult.getAllPoi().size() && markerSize < MAX_POI_SIZE; i++) { + if (mPoiResult.getAllPoi().get(i).location == null) { + continue; + } + + markerSize++; + Bundle bundle = new Bundle(); + bundle.putInt("index", i); + markerList.add(new MarkerOptions() + .icon(BitmapDescriptorFactory.fromAssetWithDpi("Icon_mark" + markerSize + ".png")) + .extraInfo(bundle) + .position(mPoiResult.getAllPoi().get(i).location)); + + } + + return markerList; + } + + /** + * 获取该PoiOverlay的poi数据 + * + * @return POI数据 + */ + public PoiResult getPoiResult() { + return mPoiResult; + } + + /** + * 覆写此方法以改变默认点击行为 + * + * @param i 被点击的poi在 + * {@link com.baidu.mapapi.search.poi.PoiResult#getAllPoi()} 中的索引 + * @return true--事件已经处理，false--事件未处理 + */ + public boolean onPoiClick(int i) { +// if (mPoiResult.getAllPoi() != null +// && mPoiResult.getAllPoi().get(i) != null) { +// Toast.makeText(BMapManager.getInstance().getContext(), +// mPoiResult.getAllPoi().get(i).name, Toast.LENGTH_LONG) +// .show(); +// } + return false; + } + + @Override + public final boolean onMarkerClick(Marker marker) { + if (!mOverlayList.contains(marker)) { + return false; + } + + if (marker.getExtraInfo() != null) { + return onPoiClick(marker.getExtraInfo().getInt("index")); + } + + return false; + } + + @Override + public boolean onPolylineClick(Polyline polyline) { + return false; + } +} diff --git a/app/src/main/java/mapapi/overlayutil/TransitRouteOverlay.java b/app/src/main/java/mapapi/overlayutil/TransitRouteOverlay.java index a6875fa..118b63b 100644 --- a/app/src/main/java/mapapi/overlayutil/TransitRouteOverlay.java +++ b/app/src/main/java/mapapi/overlayutil/TransitRouteOverlay.java @@ -24,145 +24,136 @@ import java.util.List; public class TransitRouteOverlay extends OverlayManager { private TransitRouteLine mRouteLine = null; - + /** * 构造函数 - * + * * @param baiduMap * 该TransitRouteOverlay引用的 BaiduMap 对象 */ public TransitRouteOverlay(BaiduMap baiduMap) { super(baiduMap); } - + @Override public final List getOverlayOptions() { + if (mRouteLine == null) { return null; } - + List overlayOptionses = new ArrayList(); - // step node if (mRouteLine.getAllStep() != null && mRouteLine.getAllStep().size() > 0) { + for (TransitRouteLine.TransitStep step : mRouteLine.getAllStep()) { Bundle b = new Bundle(); b.putInt("index", mRouteLine.getAllStep().indexOf(step)); - if (step.getEntrance() != null) { overlayOptionses.add((new MarkerOptions()) - .position(step.getEntrance().getLocation()) - .anchor(0.5f, 0.5f).zIndex(10).extraInfo(b) - .icon(getIconForStep(step))); + .position(step.getEntrance().getLocation()) + .anchor(0.5f, 0.5f).zIndex(10).extraInfo(b) + .icon(getIconForStep(step))); } - // 最后路段绘制出口点 if (mRouteLine.getAllStep().indexOf(step) == (mRouteLine .getAllStep().size() - 1) && step.getExit() != null) { overlayOptionses.add((new MarkerOptions()) - .position(step.getExit().getLocation()) - .anchor(0.5f, 0.5f).zIndex(10) - .icon(getIconForStep(step))); + .position(step.getExit().getLocation()) + .anchor(0.5f, 0.5f).zIndex(10) + .icon(getIconForStep(step))); } } } - + if (mRouteLine.getStarting() != null) { overlayOptionses.add((new MarkerOptions()) - .position(mRouteLine.getStarting().getLocation()) - .icon(getStartMarker() != null ? getStartMarker() : - BitmapDescriptorFactory - .fromAssetWithDpi("Icon_start.png")).zIndex(10)); + .position(mRouteLine.getStarting().getLocation()) + .icon(getStartMarker() != null ? getStartMarker() : + BitmapDescriptorFactory + .fromAssetWithDpi("Icon_start.png")).zIndex(10)); } - if (mRouteLine.getTerminal() != null) { overlayOptionses - .add((new MarkerOptions()) - .position(mRouteLine.getTerminal().getLocation()) - .icon(getTerminalMarker() != null ? getTerminalMarker() : - BitmapDescriptorFactory - .fromAssetWithDpi("Icon_end.png")) - .zIndex(10)); + .add((new MarkerOptions()) + .position(mRouteLine.getTerminal().getLocation()) + .icon(getTerminalMarker() != null ? getTerminalMarker() : + BitmapDescriptorFactory + .fromAssetWithDpi("Icon_end.png")) + .zIndex(10)); } - // polyline if (mRouteLine.getAllStep() != null && mRouteLine.getAllStep().size() > 0) { + for (TransitRouteLine.TransitStep step : mRouteLine.getAllStep()) { if (step.getWayPoints() == null) { continue; } - int color = 0; - if (step.getStepType() != TransitRouteLine.TransitStep.TransitRouteStepType.WAKLING) { - // color = Color.argb(178, 0, 78, 255); +// color = Color.argb(178, 0, 78, 255); color = getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255); } else { - // color = Color.argb(178, 88, 208, 0); +// color = Color.argb(178, 88, 208, 0); color = getLineColor() != 0 ? getLineColor() : Color.argb(178, 88, 208, 0); } - overlayOptionses.add(new PolylineOptions() - .points(step.getWayPoints()).width(10).color(color) - .zIndex(0)); + .points(step.getWayPoints()).width(10).color(color) + .zIndex(0)); } } - return overlayOptionses; } - + private BitmapDescriptor getIconForStep(TransitRouteLine.TransitStep step) { switch (step.getStepType()) { - case BUSLINE: - return BitmapDescriptorFactory.fromAssetWithDpi("Icon_bus_station.png"); - - case SUBWAY: - return BitmapDescriptorFactory.fromAssetWithDpi("Icon_subway_station.png"); - - case WAKLING: - return BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png"); - - default: - return null; + case BUSLINE: + return BitmapDescriptorFactory.fromAssetWithDpi("Icon_bus_station.png"); + case SUBWAY: + return BitmapDescriptorFactory.fromAssetWithDpi("Icon_subway_station.png"); + case WAKLING: + return BitmapDescriptorFactory.fromAssetWithDpi("Icon_walk_route.png"); + default: + return null; } } - + /** * 设置路线数据 - * + * * @param routeOverlay * 路线数据 */ public void setData(TransitRouteLine routeOverlay) { this.mRouteLine = routeOverlay; } - + /** * 覆写此方法以改变默认起点图标 - * + * * @return 起点图标 */ public BitmapDescriptor getStartMarker() { return null; } - + /** * 覆写此方法以改变默认终点图标 - * + * * @return 终点图标 */ public BitmapDescriptor getTerminalMarker() { return null; } - + public int getLineColor() { return 0; } /** * 覆写此方法以改变起默认点击行为 - * + * * @param i * 被点击的step在 * {@link com.baidu.mapapi.search.route.TransitRouteLine#getAllStep()} @@ -174,10 +165,9 @@ public class TransitRouteOverlay extends OverlayManager { && mRouteLine.getAllStep().get(i) != null) { Log.i("baidumapsdk", "TransitRouteOverlay onRouteNodeClick"); } - return false; } - + @Override public final boolean onMarkerClick(Marker marker) { for (Overlay mMarker : mOverlayList) { @@ -187,14 +177,13 @@ public class TransitRouteOverlay extends OverlayManager { } } } - return true; } - + @Override public boolean onPolylineClick(Polyline polyline) { // TODO Auto-generated method stub return false; } - + } diff --git a/app/src/main/java/mapapi/overlayutil/WalkingRouteOverlay.java b/app/src/main/java/mapapi/overlayutil/WalkingRouteOverlay.java index d4e0ab0..5dd92e5 100644 --- a/app/src/main/java/mapapi/overlayutil/WalkingRouteOverlay.java +++ b/app/src/main/java/mapapi/overlayutil/WalkingRouteOverlay.java @@ -25,108 +25,102 @@ import java.util.List; public class WalkingRouteOverlay extends OverlayManager { private WalkingRouteLine mRouteLine = null; - + public WalkingRouteOverlay(BaiduMap baiduMap) { super(baiduMap); } - + /** * 设置路线数据。 - * + * * @param line * 路线数据 */ public void setData(WalkingRouteLine line) { mRouteLine = line; } - + @Override public final List getOverlayOptions() { if (mRouteLine == null) { return null; } - + List overlayList = new ArrayList(); - if (mRouteLine.getAllStep() != null && mRouteLine.getAllStep().size() > 0) { for (WalkingRouteLine.WalkingStep step : mRouteLine.getAllStep()) { Bundle b = new Bundle(); b.putInt("index", mRouteLine.getAllStep().indexOf(step)); - if (step.getEntrance() != null) { overlayList.add((new MarkerOptions()) - .position(step.getEntrance().getLocation()) + .position(step.getEntrance().getLocation()) .rotate((360 - step.getDirection())) - .zIndex(10) - .anchor(0.5f, 0.5f) - .extraInfo(b) - .icon(BitmapDescriptorFactory - .fromAssetWithDpi("Icon_line_node.png"))); + .zIndex(10) + .anchor(0.5f, 0.5f) + .extraInfo(b) + .icon(BitmapDescriptorFactory + .fromAssetWithDpi("Icon_line_node.png"))); } - + // 最后路段绘制出口点 if (mRouteLine.getAllStep().indexOf(step) == (mRouteLine .getAllStep().size() - 1) && step.getExit() != null) { overlayList.add((new MarkerOptions()) - .position(step.getExit().getLocation()) + .position(step.getExit().getLocation()) .anchor(0.5f, 0.5f) - .zIndex(10) - .icon(BitmapDescriptorFactory - .fromAssetWithDpi("Icon_line_node.png"))); + .zIndex(10) + .icon(BitmapDescriptorFactory + .fromAssetWithDpi("Icon_line_node.png"))); + } } } - // starting if (mRouteLine.getStarting() != null) { overlayList.add((new MarkerOptions()) - .position(mRouteLine.getStarting().getLocation()) + .position(mRouteLine.getStarting().getLocation()) .icon(getStartMarker() != null ? getStartMarker() : - BitmapDescriptorFactory - .fromAssetWithDpi("Icon_start.png")).zIndex(10)); + BitmapDescriptorFactory + .fromAssetWithDpi("Icon_start.png")).zIndex(10)); } - // terminal if (mRouteLine.getTerminal() != null) { overlayList - .add((new MarkerOptions()) - .position(mRouteLine.getTerminal().getLocation()) - .icon(getTerminalMarker() != null ? getTerminalMarker() : - BitmapDescriptorFactory - .fromAssetWithDpi("Icon_end.png")) - .zIndex(10)); + .add((new MarkerOptions()) + .position(mRouteLine.getTerminal().getLocation()) + .icon(getTerminalMarker() != null ? getTerminalMarker() : + BitmapDescriptorFactory + .fromAssetWithDpi("Icon_end.png")) + .zIndex(10)); } - + // poly line list if (mRouteLine.getAllStep() != null && mRouteLine.getAllStep().size() > 0) { LatLng lastStepLastPoint = null; - for (WalkingRouteLine.WalkingStep step : mRouteLine.getAllStep()) { List watPoints = step.getWayPoints(); - if (watPoints != null) { List points = new ArrayList(); - if (lastStepLastPoint != null) { points.add(lastStepLastPoint); } - points.addAll(watPoints); overlayList.add(new PolylineOptions().points(points).width(10) - .color(getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255)).zIndex(0)); + .color(getLineColor() != 0 ? getLineColor() : Color.argb(178, 0, 78, 255)).zIndex(0)); lastStepLastPoint = watPoints.get(watPoints.size() - 1); } } + } - + return overlayList; } - + /** * 覆写此方法以改变默认起点图标 - * + * * @return 起点图标 */ public BitmapDescriptor getStartMarker() { @@ -137,16 +131,16 @@ public class WalkingRouteOverlay extends OverlayManager { } /** * 覆写此方法以改变默认终点图标 - * + * * @return 终点图标 */ public BitmapDescriptor getTerminalMarker() { return null; } - + /** * 处理点击事件 - * + * * @param i * 被点击的step在 * {@link com.baidu.mapapi.search.route.WalkingRouteLine#getAllStep()} @@ -158,10 +152,9 @@ public class WalkingRouteOverlay extends OverlayManager { && mRouteLine.getAllStep().get(i) != null) { Log.i("baidumapsdk", "WalkingRouteOverlay onRouteNodeClick"); } - return false; } - + @Override public final boolean onMarkerClick(Marker marker) { for (Overlay mMarker : mOverlayList) { @@ -171,10 +164,9 @@ public class WalkingRouteOverlay extends OverlayManager { } } } - return true; } - + @Override public boolean onPolylineClick(Polyline polyline) { // TODO Auto-generated method stub diff --git a/app/src/main/java/mapapi/overlayutil/package.html b/app/src/main/java/mapapi/overlayutil/package.html index f3a43d2..e4ba1d8 100644 --- a/app/src/main/java/mapapi/overlayutil/package.html +++ b/app/src/main/java/mapapi/overlayutil/package.html @@ -1,9 +1 @@ - - - - - - - 提供一些基于基础覆盖而组合而成的高级覆盖物，包括用于显示poi数据，规划路线，公交详情路线的覆盖物 - - +提供一些基于基础覆盖而组合而成的高级覆盖物，包括用于显示poi数据，规划路线，公交详情路线的覆盖物 \ No newline at end of file diff --git a/src.rar b/src.rar deleted file mode 100644 index 8d8cbe5..0000000 Binary files a/src.rar and /dev/null differ