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

* 'dev_1.1.2' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher:
  opt

modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item_bottom.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/surrounding_item_bottom_color"/>
+    <corners android:bottomLeftRadius="@dimen/module_v2x_surrounding_item_bottom_size"
+        android:bottomRightRadius="@dimen/module_v2x_surrounding_item_bottom_size"/>
+
+</shape>

modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml

@@ -20,7 +20,6 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="20px"
             android:textSize="18px"
-            android:text="周边5公里，共有23条数据 "
             android:textColor="@color/white" />
 
         <TextView
@@ -43,8 +42,8 @@
         android:id="@+id/list_layout_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="15px"
-        android:layout_marginBottom="30px"
+        android:layout_marginTop="10px"
+        android:layout_marginBottom="20px"
         android:layout_below="@+id/layout_top">
 
         <androidx.recyclerview.widget.RecyclerView
@@ -68,7 +67,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="59px"
-                android:src="@drawable/icon_default_black_logo" />
+                android:src="@drawable/mogo_image_blank_nor" />
 
             <TextView
                 android:id="@+id/tv_main_empty_1"

modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml

@@ -2,21 +2,18 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout_root"
     android:layout_width="291px"
-    android:layout_height="173px"
-    android:padding="8px"
-    android:background="#FF1B1B">
+    android:layout_height="173px">
 
     <ImageView
         android:id="@+id/iv_event_bg"
-        android:layout_width="291px"
-        android:layout_height="130px"
         android:scaleType="center"
-        android:src="@drawable/icon_default_black_logo" />
+        android:layout_width="280px"
+        android:layout_height="130px" />
 
     <RelativeLayout
         android:layout_below="@+id/iv_event_bg"
-        android:background="@color/surrounding_item_bottom_color"
-        android:layout_width="match_parent"
+        android:background="@drawable/bg_v2x_event_surrounding_item_bottom"
+        android:layout_width="280px"
         android:layout_height="43px">
 
         <ImageView
@@ -43,7 +40,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="22px"
+            android:layout_marginRight="30px"
             android:layout_centerVertical="true"
             android:textSize="16px"
             android:textColor="@color/transparent_white_30"

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

@@ -23,5 +23,6 @@
     <dimen name="module_v2x_event_distance_title">40px</dimen>
 
     <dimen name="module_v2x_history_event_icon_size">80px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
 
 </resources>

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

@@ -24,6 +24,7 @@
     <dimen name="module_v2x_event_distance_title">22px</dimen>
 
     <dimen name="module_v2x_history_event_icon_size">40px</dimen>
-
+    <dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
+    <dimen name="module_v2x_surrounding_item_size">16px</dimen>
 
 </resources>