diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml
index 8864e74f0f..e73af0f665 100644
--- a/modules/mogo-module-apps/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml
@@ -23,7 +23,7 @@
94px
94px
- 17px
+ 9px
55px
55px
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
index 465e2dbf3c..70177fc753 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
@@ -479,7 +479,8 @@ public class TopViewAnimHelper {
tvNextDistance.getId(), ConstraintSet.LEFT,
0);
constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
- R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, 0);
+ R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
+ (int) getDimen(R.dimen.module_common_shadow_width_pos));
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.TOP, naviBg.getId(),
ConstraintSet.TOP, 0);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
@@ -541,7 +542,7 @@ public class TopViewAnimHelper {
// .module_ext_navi_info_panel_height);
constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
- 0);
+ (int) getDimen(R.dimen.module_common_shadow_width_pos));
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.TOP, naviBg.getId(),
ConstraintSet.TOP, 0);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
@@ -634,7 +635,7 @@ public class TopViewAnimHelper {
}
private int computeNaviMarginTop(int height) {
- int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height)));
+ int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height))-getDimen(R.dimen.module_common_shadow_width_pos));
Logger.d(TAG, "computeNaviMarginTop: " + height + " result: " + result);
return result;
}
diff --git a/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml b/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml
index 97dc87283c..289e64c9d9 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml
@@ -10,6 +10,9 @@
android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
android:focusable="true"
android:clickable="true"
+ android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
+ android:layout_marginRight="@dimen/module_common_shadow_width_pos"
+ android:layout_marginTop="@dimen/module_common_shadow_width_pos"
app:layout_constraintHorizontal_bias="0.501"
app:layout_constraintLeft_toLeftOf="@id/module_entrance_id_top_container"
app:layout_constraintRight_toRightOf="@id/module_entrance_id_top_container"
diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
index bfb7a65b60..1b660ec7fc 100644
--- a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
@@ -5,4 +5,5 @@
10px
2px
2px
+ 8px
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index c06db31dd1..ba03ec1b90 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -152,4 +152,6 @@
30px
20px
20px
+
+ 10px
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index 37328f34fd..696e7cb80e 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -157,4 +157,6 @@
10px
2px
2px
+
+ 8px
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
index ccb2cb0cc8..b8edafa4bd 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
@@ -93,10 +93,10 @@ public class MediaWindow2 implements IMusicView {
return;
}
- if(!ServiceMediaHandler.getIMogoStatusManager().isMainPageOnResume()){
- Log.d(TAG, "not in front");
- return;
- }
+// if(!ServiceMediaHandler.getIMogoStatusManager().isMainPageOnResume()){
+// Log.d(TAG, "not in front");
+// return;
+// }
if (!mHasAddWindow) {
mHasAddWindow = true;
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png
index 24567d76fc..8e6032a5f1 100644
Binary files a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png and b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png
index 24567d76fc..8e6032a5f1 100644
Binary files a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png and b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png differ
diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml
index 7a4f9479f7..de1d893a59 100644
--- a/modules/mogo-module-media/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-media/src/main/res/values/dimens.xml
@@ -1,6 +1,6 @@
- 468px
+ 467px
573px
@@ -61,7 +61,7 @@
2px
3.2px
- 332px
+ 338px
82px
60px
18px
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png
index 957c298fd6..5480b6d165 100644
Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png and b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml
index 7ae04a2bed..1520ad601e 100644
--- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml
+++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml
@@ -4,10 +4,10 @@
-
+ android:bottom="@dimen/tanlu_module_shade_size"
+ android:left="@dimen/tanlu_module_shade_size"
+ android:right="@dimen/tanlu_module_shade_size"
+ android:top="@dimen/tanlu_module_shade_size" />
@@ -15,10 +15,10 @@
-
+ android:bottom="@dimen/tanlu_module_shade_size"
+ android:left="@dimen/tanlu_module_shade_size"
+ android:right="@dimen/tanlu_module_shade_size"
+ android:top="@dimen/tanlu_module_shade_size" />
diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
index 7716b8ccc7..2a32aa9897 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
@@ -80,16 +80,17 @@
186px
176px
250px
- 172px
+ 158px
45px
13px
- 8px
- 7px
+ 6px
+ 13px
17px
3px
18px
26px
+ 4px
28px
56px
diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 4062891c80..969d398b55 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -90,6 +90,7 @@
9px
27px
46px
+ 4px
50px
90px
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 88af7354b4..1676116d31 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
@@ -90,6 +90,7 @@
9px
27px
46px
+ 4px
50px
98px
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 7716b8ccc7..2a32aa9897 100644
--- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
@@ -80,16 +80,17 @@
186px
176px
250px
- 172px
+ 158px
45px
13px
- 8px
- 7px
+ 6px
+ 13px
17px
3px
18px
26px
+ 4px
28px
56px
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_live_show.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_live_show.xml
index b0b87a8207..00d8af5a9a 100644
--- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_live_show.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_live_show.xml
@@ -1,10 +1,15 @@
-
-
-
-
-
-
\ No newline at end of file
+
+
-
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml
index b516dedff0..b524ced9c9 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml
@@ -12,7 +12,7 @@
android:id="@+id/viewLinStart"
android:layout_width="wrap_content"
android:layout_height="1px"
- android:background="#979797"
+ android:background="@color/share_event_no_more_color"
app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip"
app:layout_constraintEnd_toStartOf="@+id/tvNoMoreDataTrip"
app:layout_constraintStart_toStartOf="parent"
@@ -35,7 +35,7 @@
android:id="@+id/viewLinEnd"
android:layout_width="wrap_content"
android:layout_height="1px"
- android:background="#979797"
+ android:background="@color/share_event_no_more_color"
app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/tvNoMoreDataTrip"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
index d060983917..94c233e74a 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
@@ -52,7 +52,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:textColor="@color/v2x_FFF_333"
- android:textSize="@dimen/dp_28"
+ android:textSize="@dimen/dp_32"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
index 6ab4e26509..e47f51edc5 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
@@ -11,7 +11,7 @@
android:id="@+id/tagEventType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
+ android:layout_marginStart="@dimen/dp_36"
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
@@ -47,7 +47,6 @@
android:id="@+id/ivIconP"
android:layout_width="@dimen/module_v2x_history_event_icon_size"
android:layout_height="@dimen/module_v2x_history_event_icon_size"
- android:layout_marginStart="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_16"
android:src="@drawable/icon_illegal_parking"
app:layout_constraintLeft_toLeftOf="@+id/tagEventType"
@@ -58,13 +57,13 @@
android:id="@+id/tvAddress"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_24"
+ android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_30"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/v2x_FFF_333"
- android:textSize="@dimen/dp_34"
+ android:textSize="@dimen/dp_32"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png
new file mode 100644
index 0000000000..d6aeb4ec4f
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png
new file mode 100644
index 0000000000..d6aeb4ec4f
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png
new file mode 100644
index 0000000000..8968f0595c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_head_image_light.png
new file mode 100644
index 0000000000..8968f0595c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_head_image_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml
index afd05b86dd..94999dc002 100644
--- a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml
@@ -4,10 +4,10 @@
-
+ android:bottom="@dimen/tanlu_module_shade_size_l"
+ android:left="@dimen/tanlu_module_shade_size_l"
+ android:right="@dimen/tanlu_module_shade_size_l"
+ android:top="@dimen/tanlu_module_shade_size_l" />
@@ -15,10 +15,10 @@
-
+ android:bottom="@dimen/tanlu_module_shade_size_l"
+ android:left="@dimen/tanlu_module_shade_size_l"
+ android:right="@dimen/tanlu_module_shade_size_l"
+ android:top="@dimen/tanlu_module_shade_size_l" />
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml
new file mode 100644
index 0000000000..3a2df8bb23
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml
@@ -0,0 +1,8 @@
+
+
+ 16px
+ 10px
+ 8px
+ 4px
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml
index 9514cc43b3..b51d728283 100644
--- a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml
@@ -3,6 +3,7 @@
30px
20px
16px
+ 4px
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml
index b22064a243..9def827f0f 100644
--- a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml
@@ -4,6 +4,7 @@
30px
20px
16px
+ 4px
diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml
index 6a87855ba7..3a2df8bb23 100644
--- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml
+++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml
@@ -3,5 +3,6 @@
16px
10px
8px
+ 4px
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
index 4eb258787e..21bd14ebf9 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
@@ -8,7 +8,7 @@
#333333
#FFFFFF
#FFFFFF
- #CB333333
+ #80333333
#999999
#B2333333
#666666