diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java index ec9de1b511..83efbdbde7 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java @@ -808,13 +808,13 @@ public class TanluCardViewFragment extends MvpFragment> */ @Subscribe(threadMode = ThreadMode.MAIN) public void onMarkerInfo(final MarkerInfo event) { - Logger.d(TAG, "onMarkerInfo ------------>"); + Log.d(TAG, "onMarkerInfo ------------>"); if (event == null) { return; } String poiType = ""; - if (event.type.equals("1")) { //上报路况 TODO 修改探路 + if (event.type.equals("1")) { //上报路况 mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up); } else if (event.type.equals("2")) { //交通检查 10002 poiType = "10002"; @@ -826,7 +826,7 @@ public class TanluCardViewFragment extends MvpFragment> mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up); } - Logger.d(TAG, "onMarkerInfo share onCompleted ------>"); + Log.d(TAG, "onMarkerInfo share onCompleted ------>"); MogoMarkerOptions options = new MogoMarkerOptions() .icon(mMarkerIcon) .latitude(event.lat) diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_bus.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_bus.png deleted file mode 100755 index 66f73f4454..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_bus.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_car.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_car.png deleted file mode 100755 index b12b10c83f..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_car.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_end.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_end.png deleted file mode 100755 index 5503dc5a28..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_end.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_man.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_man.png deleted file mode 100755 index 16842d5d12..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_man.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_ride.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_ride.png deleted file mode 100755 index 2fa5633c59..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_ride.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_0_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_0_arrow.png deleted file mode 100755 index 21793fea2b..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_0_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_1_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_1_arrow.png deleted file mode 100755 index d7d832857f..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_1_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_2_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_2_arrow.png deleted file mode 100755 index c1d019b4ae..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_2_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_3_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_3_arrow.png deleted file mode 100755 index b3318ad436..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_3_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_4_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_4_arrow.png deleted file mode 100755 index 038e63f485..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_4_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_5_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_5_arrow.png deleted file mode 100755 index e15ce84e87..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_5_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_6_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_6_arrow.png deleted file mode 100755 index 9f3540757a..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_6_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_7_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_7_arrow.png deleted file mode 100755 index cef675f06f..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_7_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_8_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_8_arrow.png deleted file mode 100755 index c4d67d38a4..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_8_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_9_arrow.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_9_arrow.png deleted file mode 100755 index 3c92f82f0d..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_route_color_texture_9_arrow.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_start.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_start.png deleted file mode 100755 index cd716c8840..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_start.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_through.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_through.png deleted file mode 100755 index e636b446c1..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/amap_through.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir1.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir1.png deleted file mode 100755 index fec3f4ec69..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir1.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir10.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir10.png deleted file mode 100755 index 34c2228f6c..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir10.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir11.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir11.png deleted file mode 100755 index df9e8dc67c..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir11.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir12.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir12.png deleted file mode 100755 index a4ba8c22cb..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir12.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir13.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir13.png deleted file mode 100755 index 39ad870c5f..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir13.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir14.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir14.png deleted file mode 100755 index a3c1632562..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir14.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir15.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir15.png deleted file mode 100755 index c99fb65b94..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir15.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir16.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir16.png deleted file mode 100755 index 86898c2144..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir16.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir2.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir2.png deleted file mode 100755 index 750b6fbb7e..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir2.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir3.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir3.png deleted file mode 100755 index 8cbe886e81..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir3.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir4.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir4.png deleted file mode 100755 index cfe7d6c0fb..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir4.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir5.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir5.png deleted file mode 100755 index e465d5eec2..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir5.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir6.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir6.png deleted file mode 100755 index 0d2f3c0360..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir6.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir7.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir7.png deleted file mode 100755 index e53c9ff451..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir7.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir8.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir8.png deleted file mode 100755 index edfdbe1df0..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir8.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir9.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir9.png deleted file mode 100755 index a762d0b74a..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir9.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_end.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_end.png deleted file mode 100755 index f3cb78aed4..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_end.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_start.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_start.png deleted file mode 100755 index 4d2a797823..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_start.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_station.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_station.png deleted file mode 100755 index 2ed622283b..0000000000 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/dir_station.png and /dev/null differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_view_empty_bg.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_view_empty_bg.png new file mode 100644 index 0000000000..797a159dc6 Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_view_empty_bg.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_next.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_next.png new file mode 100644 index 0000000000..339d7731ec Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_next.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_previous.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_previous.png new file mode 100644 index 0000000000..7c0e9618fb Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/media_previous.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_view_empty_bg.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_view_empty_bg.png new file mode 100644 index 0000000000..f868f58df0 Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_view_empty_bg.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_next.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_next.png index 9dd91f20d1..cfb640f6a3 100644 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_next.png and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_next.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_previous.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_previous.png index 2b3c15b3d4..fe7bd3486c 100644 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_previous.png and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/media_previous.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml index dc765b7c94..40a085df42 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml @@ -94,11 +94,11 @@ android:layout_width="@dimen/tanlu_module_card_previous_width" android:layout_height="@dimen/tanlu_module_card_previous_height" android:layout_centerVertical="true" - android:paddingLeft="@dimen/dp_40" + android:paddingLeft="@dimen/tanlu_module_card_previous_margin_left" android:background="@drawable/shape_bg_222533" android:drawableLeft="@drawable/media_previous" android:gravity="center_vertical" - android:drawablePadding="@dimen/dp_40" + android:drawablePadding="@dimen/dp_20" android:text="@string/tanlu_previous" android:textColor="@color/white" android:textSize="@dimen/tanlu_module_card_next_size" /> @@ -110,11 +110,12 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_centerHorizontal="true" - android:paddingRight="@dimen/dp_80" - android:paddingLeft="@dimen/dp_70" + android:paddingRight="@dimen/tanlu_module_card_next_margin_left" + android:paddingLeft="@dimen/tanlu_module_card_next_margin_left" android:background="@drawable/shape_bg_222533" android:drawableRight="@drawable/media_next" android:gravity="center_vertical" + android:drawablePadding="@dimen/dp_20" android:text="@string/tanlu_next" android:textColor="@color/white" android:textSize="@dimen/tanlu_module_card_next_size" /> @@ -138,7 +139,7 @@ android:layout_marginLeft="@dimen/tanlu_module_card_empty_maginleft" android:layout_marginRight="@dimen/tanlu_module_card_empty_maginleft" android:layout_marginTop="@dimen/tanlu_module_card_empty_magintop" - android:src="@mipmap/main_view_empty_bg" /> + android:src="@drawable/main_view_empty_bg" /> 65px 109px 28px + 45px + 45px 20px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index bc6de92c91..c6f46c0772 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -38,6 +38,8 @@ 75px 205px 25px + 90px + 80px 38px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index bc6de92c91..c6f46c0772 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -38,6 +38,8 @@ 75px 205px 25px + 90px + 80px 38px