diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2dc54c489f..707ee6e613 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java
index 1912d00ff5..386a05742f 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java
@@ -152,9 +152,9 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_green);
break;
default:
- ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);
- clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_green_info);
- ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_green);
+ ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news);
+ clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info);
+ ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue);
break;
}
}
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
index 5a72bf418d..cd73724614 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
@@ -104,7 +104,7 @@ public class MapMarkerView extends MapMarkerBaseView {
break;
case MarkerPoiTypeEnum.ROAD_CLOSED:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_off);
- ivBg.setImageResource(R.drawable.bg_map_marker_dark_blue);
+ ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);
break;
case MarkerPoiTypeEnum.SHOP_DISCOUNT:
ivIcon.setImageResource(R.drawable.icon_map_marker_shop_discount);
@@ -116,23 +116,23 @@ public class MapMarkerView extends MapMarkerBaseView {
break;
case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_work);
- ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_blue);
+ ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);
break;
case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up);
- ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue);
+ ivBg.setImageResource(R.drawable.bg_map_marker_blue);
break;
case MarkerPoiTypeEnum.FOURS_PONDING:
ivIcon.setImageResource(R.drawable.icon_map_marker_pondingl);
- ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue);
+ ivBg.setImageResource(R.drawable.bg_map_marker_blue);
break;
case MarkerPoiTypeEnum.FOURS_SHOP_FREE:
ivIcon.setImageResource(R.drawable.icon_map_marker_shop);
- ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_green);
+ ivBg.setImageResource(R.drawable.bg_map_marker_green_dark);
break;
default:
-// ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);
-// ivBg.setImageResource(R.drawable.bg_map_marker_green);
+ ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news);
+ ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);
break;
}
}
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shear_news.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shear_news.png
new file mode 100644
index 0000000000..4ce9272666
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shear_news.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_blue.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_dark.png
similarity index 100%
rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_blue.png
rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_dark.png
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_dark.png
similarity index 100%
rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png
rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_dark.png
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png
index 37eae8f2ab..eed1fca00c 100644
Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png
new file mode 100644
index 0000000000..f446cba155
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_video_pause_btn_normal.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_video_pause_btn_normal.png
new file mode 100644
index 0000000000..1bdf51b816
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_video_pause_btn_normal.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_video_play_btn_normal.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_video_play_btn_normal.png
new file mode 100644
index 0000000000..7cdba55696
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/main_video_play_btn_normal.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_logo.png
new file mode 100755
index 0000000000..1fc2152cd5
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/tanlu_logo.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_video_pause_btn_normal.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_video_pause_btn_normal.png
new file mode 100644
index 0000000000..12cec3f24a
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_video_pause_btn_normal.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png
index 7db2e805ee..04eabdb9c7 100644
Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/main_video_play_btn_normal.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_logo.png
new file mode 100755
index 0000000000..d93e27ece5
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/tanlu_logo.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_pause.xml b/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_pause.xml
index 6d6c9f9987..5e45e9d00b 100644
--- a/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_pause.xml
+++ b/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_pause.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_play.xml b/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_play.xml
index 0d2fec0819..84339617e4 100644
--- a/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_play.xml
+++ b/modules/mogo-module-tanlu/src/main/res/drawable/selector_bg_btn_play.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
\ No newline at end of file
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 d15c488a2d..075a6a8688 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
@@ -139,12 +139,21 @@
android:gravity="center_horizontal"
android:visibility="gone">
+
+
diff --git a/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_pause_btn_normal.png b/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_pause_btn_normal.png
deleted file mode 100644
index 2e60a6f3ed..0000000000
Binary files a/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_pause_btn_normal.png and /dev/null differ
diff --git a/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_pause_btn_press.png b/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_pause_btn_press.png
deleted file mode 100644
index e7fd238cd1..0000000000
Binary files a/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_pause_btn_press.png and /dev/null differ
diff --git a/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_play_btn_normal.png b/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_play_btn_normal.png
deleted file mode 100644
index a8f818fd7a..0000000000
Binary files a/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_play_btn_normal.png and /dev/null differ
diff --git a/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_play_btn_press.png b/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_play_btn_press.png
deleted file mode 100644
index 69557977d3..0000000000
Binary files a/modules/mogo-module-tanlu/src/main/res/mipmap-ldpi/main_video_play_btn_press.png and /dev/null differ
diff --git a/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml
index 4ca666a0be..7b5215abfd 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml
@@ -34,11 +34,12 @@
10px
160px
48px
- 65px
+ 22px
109px
28px
45px
42px
+ 16px
6px
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 c0a49c55c2..0b8c28f750 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
@@ -35,11 +35,12 @@
20px
300px
90px
- 122px
+ 40px
205px
50px
90px
80px
+ 32px
10px
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 438de99179..e73ee3984d 100644
--- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
@@ -35,11 +35,12 @@
20px
300px
90px
- 75px
+ 40px
205px
25px
90px
80px
+ 32px
10px