diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java index d7cab5bbb4..8403901eef 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java @@ -230,7 +230,6 @@ public class CustomRatingBar extends LinearLayout { layout.setMargins(0, 0, Math.round(elementPadding), 0);//设置每颗星星在线性布局的间距 imageView.setLayoutParams(layout); imageView.setAdjustViewBounds(true); - imageView.setScaleType(ImageView.ScaleType.FIT_XY); imageView.setImageDrawable(elementEmptyDrawable); imageView.setMinimumWidth((int) elementWidth); imageView.setMaxWidth((int) elementWidth); diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png new file mode 100644 index 0000000000..2c7b60f98d Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_choose.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png new file mode 100644 index 0000000000..128d8259b6 Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_second.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png new file mode 100644 index 0000000000..c5965e9414 Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_heart_unchoose.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png index 2310d30095..a2d1364f83 100644 Binary files a/modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png and b/modules/mogo-module-common/src/main/res/drawable/icon_heart_choose.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png index 94112d4498..eff1afe5a3 100644 Binary files a/modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png and b/modules/mogo-module-common/src/main/res/drawable/icon_heart_second.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png b/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png index 4700e20da9..919c363a9d 100644 Binary files a/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png and b/modules/mogo-module-common/src/main/res/drawable/icon_heart_unchoose.png differ diff --git a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml index 73cc314845..7f0779b626 100644 --- a/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml @@ -1,6 +1,6 @@ - 20px + 18px 16px 120px 150px diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index 7934f758bd..2281aa213c 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1054,7 +1054,7 @@ 48px -10px 10px - 33px + 34px 30px 300px 281px diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml index f6bd0495be..c11c6d59ae 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1045,7 +1045,7 @@ 26.2500px -8px 8px - 20px + 18px 16px 120px 150px 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 da50969a5e..a119d15ca1 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 @@ -47,8 +47,9 @@ 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_marginEnd="@dimen/dp_16" + android:layout_marginEnd="@dimen/dp_26" android:src="@drawable/icon_illegal_parking" + app:layout_constraintRight_toLeftOf="@+id/tvAddress" app:layout_constraintLeft_toLeftOf="@+id/tagEventType" app:layout_constraintTop_toBottomOf="@+id/tagEventType" app:layout_constraintTop_toTopOf="@+id/tvAddress" /> @@ -57,7 +58,6 @@ android:id="@+id/tvAddress" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/dp_12" android:layout_marginTop="@dimen/dp_24" android:layout_marginRight="@dimen/dp_30" android:ellipsize="end" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index a7b3b43599..83ff056b82 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.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_orange" android:gravity="center" diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml index 9d2baeffff..900f3b0c19 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml @@ -17,9 +17,9 @@ android:alpha="0.8" android:gravity="center" android:paddingLeft="20px" - android:paddingTop="10px" + android:paddingTop="@dimen/dp_25" android:text="小窍门：分享路况，点赞其他车主，有助于提高热心指数" - android:textColor="#CCFFFFFF" + android:textColor="@color/v2x_share_des_title_color" android:textSize="@dimen/share_top_text_size"> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index 7194aa6524..044f98c29d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -79,6 +79,7 @@ android:ellipsize="end" android:gravity="left" android:layout_marginTop="@dimen/dp_12" + android:textStyle="bold" android:lines="1" android:text="东城区北三环附近维多欧美" android:textColor="@color/v2x_FFF_333" diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml index cb599e80c8..028b4ceb1f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml @@ -26,7 +26,7 @@ android:layout_height="@dimen/dp_88" android:layout_marginEnd="@dimen/dp_28" android:layout_marginBottom="@dimen/dp_40" - android:background="@drawable/icon_window_close2" + android:background="@drawable/v2x_panel_close" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml index 9ab0be6694..8c05ab84b4 100644 --- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml @@ -59,7 +59,7 @@ 117px 50px 17px - 16px + 14px 36px 16px 20px diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index bcf51cad8a..4203353bf9 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -60,7 +60,7 @@ 117px 50px 17px - 16px + 14px 36px 16px 20px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 8968abfbcb..cfe362711a 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -57,7 +57,7 @@ 219px 100px 28px - 28px + 26px 67.5px 30px 40px diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index 66fbad446e..d1db9ba5cf 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -16,5 +16,6 @@ #555A75 #000000 #FFF + #4DFFFFFF \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index e42cbc11b1..cfd4c1b19f 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -54,7 +54,7 @@ 117px 200px 17px - 16px + 14px 36px 16px 20px diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-ldpi/icon_heart_choose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-ldpi/icon_heart_choose_light.png deleted file mode 100644 index 5e35352bfd..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-ldpi/icon_heart_choose_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-ldpi/icon_heart_second_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-ldpi/icon_heart_second_light.png deleted file mode 100644 index 4fda591483..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-ldpi/icon_heart_second_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-ldpi/icon_heart_unchoose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-ldpi/icon_heart_unchoose_light.png deleted file mode 100644 index 20d32c67f0..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-ldpi/icon_heart_unchoose_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/icon_heart_choose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/icon_heart_choose_light.png deleted file mode 100644 index 5e35352bfd..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/icon_heart_choose_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/icon_heart_second_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/icon_heart_second_light.png deleted file mode 100644 index 4fda591483..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/icon_heart_second_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/icon_heart_unchoose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/icon_heart_unchoose_light.png deleted file mode 100644 index 20d32c67f0..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/icon_heart_unchoose_light.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_choose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_choose_light.png index 2310d30095..2c7b60f98d 100644 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_choose_light.png and b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_choose_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_second_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_second_light.png index 14281e2425..1c49555541 100644 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_second_light.png and b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_second_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_light.png index 4700e20da9..09ab4af9e3 100644 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_light.png and b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/icon_heart_unchoose_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_choose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_choose_light.png new file mode 100644 index 0000000000..a2d1364f83 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_choose_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_second_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_second_light.png new file mode 100644 index 0000000000..e26dbe8a7b Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_second_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_unchoose_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_unchoose_light.png new file mode 100644 index 0000000000..c1dbeacc1d Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-common-res/drawable/icon_heart_unchoose_light.png differ 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 83d664a04d..46e3418e18 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 @@ -15,4 +15,5 @@ #F5F5F5 #FFFFFF #2896FF + #80FFFFFF