From 87b923ec02a57467ffa7ee70f543402752fb513c Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 13 Aug 2020 16:29:48 +0800
Subject: [PATCH] opt

---
 .../com/mogo/module/v2x/fragment/V2XSurroundingFragment.java | 2 +-
 .../res/layout/module_event_panel_fragment_surrounding.xml   | 1 +
 .../res/layout/module_fragment_surrounding_event_item.xml    | 5 +++--
 .../src/main/res/values-xhdpi-1920x1000/dimens.xml           | 3 +--
 modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml | 3 +--
 modules/mogo-module-v2x/src/main/res/values/dimens.xml       | 3 +--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
index 5950e8e8fc..a0b02cb8bf 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
@@ -181,7 +181,7 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
             SpannableString spannableString = new SpannableString(originStr);
             spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#256BFF")), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             //设置字体大小，true表示前面的字体大小20单位为dip
-            spannableString.setSpan(new AbsoluteSizeSpan(40, true), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            spannableString.setSpan(new AbsoluteSizeSpan(36, true), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             mTotalTv.setText(spannableString);
         } else {
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
index 33f17a7ba6..2a28732b3a 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
@@ -20,6 +20,7 @@
                 android:id="@+id/tv_brief"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
                 android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
                 android:text="周围5公里，共15条交通信息"
                 android:textColor="@color/white"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
index 407831ac28..5e497f6ba6 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
@@ -7,11 +7,12 @@
     <ImageView
         android:id="@+id/iv_event_bg"
         android:scaleType="fitXY"
+        android:src="@drawable/mogo_image_nongwu_nor"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_surrounding_item_image_height" />
+        android:layout_height="match_parent" />
 
     <RelativeLayout
-        android:layout_below="@+id/iv_event_bg"
+        android:layout_alignParentBottom="true"
         android:background="@drawable/bg_v2x_event_surrounding_item_bottom"
         android:layout_width="match_parent"
         android:layout_height="@dimen/module_v2x_surrounding_item_bottom">
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 4cc8c6de38..8afec4fc0b 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -28,7 +28,7 @@
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
     <dimen name="module_v2x_map_bottom">100px</dimen>
-    <dimen name="module_v2x_surrounding_top_height">35px</dimen>
+    <dimen name="module_v2x_surrounding_top_height">40px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
     <dimen name="module_v2x_surrounding_empty_iv_margin_top">58px</dimen>
@@ -41,7 +41,6 @@
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">200px</dimen>
     <dimen name="module_v2x_surrounding_item_height">173px</dimen>
-    <dimen name="module_v2x_surrounding_item_image_height">130px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
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 517b992d18..80c6a08895 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
@@ -29,7 +29,7 @@
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
     <dimen name="module_v2x_map_bottom">100px</dimen>
-    <dimen name="module_v2x_surrounding_top_height">35px</dimen>
+    <dimen name="module_v2x_surrounding_top_height">40px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
     <dimen name="module_v2x_surrounding_empty_iv_margin_top">58px</dimen>
@@ -42,7 +42,6 @@
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">200px</dimen>
     <dimen name="module_v2x_surrounding_item_height">173px</dimen>
-    <dimen name="module_v2x_surrounding_item_image_height">130px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
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 a853afdff8..c584c71ae4 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -31,7 +31,7 @@
     <dimen name="module_v2x_map_top">200px</dimen>
     <dimen name="module_v2x_map_right">200px</dimen>
     <dimen name="module_v2x_map_bottom">100px</dimen>
-    <dimen name="module_v2x_surrounding_top_height">35px</dimen>
+    <dimen name="module_v2x_surrounding_top_height">40px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_width">90px</dimen>
     <dimen name="module_v2x_surrounding_top_bt_height">36px</dimen>
     <dimen name="module_v2x_surrounding_empty_iv_margin_top">58px</dimen>
@@ -44,7 +44,6 @@
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">200px</dimen>
     <dimen name="module_v2x_surrounding_item_height">173px</dimen>
-    <dimen name="module_v2x_surrounding_item_image_height">130px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>