Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev

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);

modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="heart_ratingbar_width">20px</dimen>
+    <dimen name="heart_ratingbar_width">18px</dimen>
     <dimen name="heart_ratingbar_height">16px</dimen>
     <dimen name="v2x_panel_loading_top">120px</dimen>
     <dimen name="v2x_share_btn_width">150px</dimen>

modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml

@@ -1054,7 +1054,7 @@
     <dimen name="sp_48">48px</dimen>
     <dimen name="module_common_shadow_width">-10px</dimen>
     <dimen name="module_common_shadow_width_pos">10px</dimen>
-    <dimen name="heart_ratingbar_width">33px</dimen>
+    <dimen name="heart_ratingbar_width">34px</dimen>
     <dimen name="heart_ratingbar_height">30px</dimen>
     <dimen name="v2x_panel_loading_top">300px</dimen>
     <dimen name="v2x_share_btn_width">281px</dimen>

modules/mogo-module-common/src/main/res/values/dimens.xml

@@ -1045,7 +1045,7 @@
 	<dimen name="sp_48">26.2500px</dimen>
 	<dimen name="module_common_shadow_width">-8px</dimen>
 	<dimen name="module_common_shadow_width_pos">8px</dimen>
-	<dimen name="heart_ratingbar_width">20px</dimen>
+	<dimen name="heart_ratingbar_width">18px</dimen>
 	<dimen name="heart_ratingbar_height">16px</dimen>
 	<dimen name="v2x_panel_loading_top">120px</dimen>
 	<dimen name="v2x_share_btn_width">150px</dimen>

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"

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"

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">
 
     </TextView>

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"

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" />
 

modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml

@@ -59,7 +59,7 @@
     <dimen name="share_empty_icon_width">117px</dimen>
     <dimen name="v2x_loading_ani_width">50px</dimen>
     <dimen name="v2x_index_rating_top">17px</dimen>
-    <dimen name="share_top_text_size">16px</dimen>
+    <dimen name="share_top_text_size">14px</dimen>
     <dimen name="share_des_num_size">36px</dimen>
     <dimen name="share_index_des_size">16px</dimen>
     <dimen name="share_empty_btn_padding">20px</dimen>

modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml

@@ -60,7 +60,7 @@
     <dimen name="share_empty_icon_width">117px</dimen>
     <dimen name="v2x_loading_ani_width">50px</dimen>
     <dimen name="v2x_index_rating_top">17px</dimen>
-    <dimen name="share_top_text_size">16px</dimen>
+    <dimen name="share_top_text_size">14px</dimen>
     <dimen name="share_des_num_size">36px</dimen>
     <dimen name="share_index_des_size">16px</dimen>
     <dimen name="share_empty_btn_padding">20px</dimen>

modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml

@@ -57,7 +57,7 @@
     <dimen name="share_empty_icon_width">219px</dimen>
     <dimen name="v2x_loading_ani_width">100px</dimen>
     <dimen name="v2x_index_rating_top">28px</dimen>
-    <dimen name="share_top_text_size">28px</dimen>
+    <dimen name="share_top_text_size">26px</dimen>
     <dimen name="share_des_num_size">67.5px</dimen>
     <dimen name="share_index_des_size">30px</dimen>
     <dimen name="share_empty_btn_padding">40px</dimen>

modules/mogo-module-v2x/src/main/res/values/colors.xml

@@ -16,5 +16,6 @@
     <color name="v2x_555A_F5F5">#555A75</color>
     <color name="v2x_000_FFF">#000000</color>
     <color name="v2x_FFF_2896FF">#FFF</color>
+    <color name="v2x_share_des_title_color">#4DFFFFFF</color>
 
 </resources>

modules/mogo-module-v2x/src/main/res/values/dimens.xml

@@ -54,7 +54,7 @@
     <dimen name="share_empty_icon_width">117px</dimen>
     <dimen name="v2x_loading_ani_width">200px</dimen>
     <dimen name="v2x_index_rating_top">17px</dimen>
-    <dimen name="share_top_text_size">16px</dimen>
+    <dimen name="share_top_text_size">14px</dimen>
     <dimen name="share_des_num_size">36px</dimen>
     <dimen name="share_index_des_size">16px</dimen>
     <dimen name="share_empty_btn_padding">20px</dimen>

skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml

@@ -15,4 +15,5 @@
     <color name="v2x_555A_F5F5_light">#F5F5F5</color>
     <color name="v2x_000_FFF_light">#FFFFFF</color>
     <color name="v2x_FFF_2896FF_light">#2896FF</color>
+    <color name="v2x_share_des_title_color_light">#80FFFFFF</color>
 </resources>