From 3138b9e70a7cd13c62097d92263d8d49d85d9106 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Mon, 7 Sep 2020 17:12:49 +0800
Subject: [PATCH 1/5] opt load image

---
 .../v2x/adapter/V2XSurroundingAdapter.java    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java
index 224fcfef4d..1b00b259ca 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java
@@ -11,7 +11,9 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.mogo.module.common.entity.MarkerPoiTypeEnum;
+import com.mogo.module.common.glide.SkinAbleBitmapTarget;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.entity.panel.SurroundingConstruction;
 import com.mogo.module.v2x.listener.SurroundingItemClickListener;
@@ -84,22 +86,20 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
                 .load(getTypeRes(surroundingConstruction.getPoiType()))
                 .into(mBgImageView);
 
-//        CornerTransform transformation = new CornerTransform(mContext, dip2px(mContext, 15));
-//        //只是绘制左上角和右上角圆角
-//        transformation.setExceptCorner(true, true, false, false);
-//
-//        Glide.with(mContext).
-//                load(getTypeRes(surroundingConstruction.getPoiType()))
-//                .asBitmap()
-//                .skipMemoryCache(true)
-//                .diskCacheStrategy(DiskCacheStrategy.NONE)
-//                .transform(transformation)
-//                .into(mBgImageView);
-//
+//        Glide.with(mContext)
+//                .load(getTypeSmallRes(surroundingConstruction.getPoiType()))
+//                .into(mTypeImageView);
 
+        RequestOptions requestOptions = new RequestOptions()
+                .placeholder(R.drawable.v2x_icon_live_logo)
+                .error(R.drawable.v2x_icon_live_logo)
+                .fallback(R.drawable.v2x_icon_live_logo);
         Glide.with(mContext)
+                .asBitmap()
                 .load(getTypeSmallRes(surroundingConstruction.getPoiType()))
-                .into(mTypeImageView);
+                .apply(requestOptions)
+                .into(new SkinAbleBitmapTarget(mTypeImageView, requestOptions));
+
     }
 
     public static int dip2px(Context context, float dpValue) {

From f29eb4d30c50cefb7646ec79e1a8034d5eebb33b Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Mon, 7 Sep 2020 17:57:20 +0800
Subject: [PATCH 2/5] opt

---
 .../java/com/mogo/module/tanlu/fragment/TanluListWindow.java    | 1 -
 .../com/mogo/module/v2x/fragment/V2XSurroundingFragment.java    | 1 +
 .../src/main/res/values-xhdpi-1920x1000/dimens.xml              | 2 +-
 modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml    | 2 +-
 modules/mogo-module-v2x/src/main/res/values/dimens.xml          | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
index 8baaea1315..f9f27f4699 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
@@ -184,7 +184,6 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
     }
 
     public void initWindow() {
-        Logger.d("liyz", "initWindow --------->");
         EventBus.getDefault().register(this);
         initInterface();
         initModelData();
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 7d893ee97e..087374690c 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
@@ -184,6 +184,7 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
             //设置字体大小，true表示前面的字体大小 dip
             spannableString.setSpan(new AbsoluteSizeSpan((int) getContext().getResources().getDimension(R.dimen.module_v2x_surrounding_top), true),
                     7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            Log.d("liyz", "size = " + (int) getContext().getResources().getDimension(R.dimen.module_v2x_surrounding_top));
             spannableString.setSpan(new StyleSpan(Typeface.NORMAL), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
             mTotalTv.setText(spannableString);
         } else {
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 d9e4018a43..b143f7e952 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
@@ -42,7 +42,7 @@
     <dimen name="module_v2x_surrounding_item_height">306px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_image_height">38px</dimen>
-    <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
+    <dimen name="module_v2x_surrounding_item_marigin_left">28px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_bottom_left">16px</dimen>
     <dimen name="module_v2x_panel_surrounding_marginbottom">5px</dimen>
     <dimen name="module_v2x_panel_surrounding_stance">80px</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 ad5339c148..fca032e5c5 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
@@ -43,7 +43,7 @@
     <dimen name="module_v2x_surrounding_item_height">306px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom">77px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_image_height">38px</dimen>
-    <dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>
+    <dimen name="module_v2x_surrounding_item_marigin_left">28px</dimen>
     <dimen name="module_v2x_surrounding_item_marigin_bottom_left">16px</dimen>
     <dimen name="module_v2x_panel_surrounding_marginbottom">5px</dimen>
     <dimen name="module_v2x_panel_surrounding_stance">80px</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 a3bf9f03d7..1588dd0e23 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -49,7 +49,7 @@
     <dimen name="module_v2x_surrounding_item_marigin_bottom_left">8px</dimen>
     <dimen name="module_v2x_panel_surrounding_marginbottom">2px</dimen>
     <dimen name="module_v2x_panel_surrounding_stance">30px</dimen>
-    <dimen name="module_v2x_surrounding_top">30px</dimen>
+    <dimen name="module_v2x_surrounding_top">50px</dimen>
 
     <dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>

From 2fdf10bc3fbbebe0a560286de00d14c4ee80e85e Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 7 Sep 2020 19:14:08 +0800
Subject: [PATCH 3/5] [add] f

---
 .../res/drawable/v2x_bkg_dark_light_same.xml  | 12 ++++++++++
 .../module_v2x_event_share_description.xml    | 24 +++++++++----------
 .../layout/module_v2x_event_share_empty.xml   |  4 ++--
 .../main/res/layout/view_history_empty.xml    |  4 ++--
 .../res/values-xhdpi-1920x1000/dimens.xml     |  2 +-
 .../src/main/res/values-xhdpi/dimens.xml      |  9 +++++--
 .../src/main/res/values/dimens.xml            |  5 ++++
 .../v2x_bkg_dark_light_same_light.xml         | 12 ++++++++++
 8 files changed, 53 insertions(+), 19 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_bkg_dark_light_same.xml
 create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_bkg_dark_light_same_light.xml

diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_bkg_dark_light_same.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_bkg_dark_light_same.xml
new file mode 100644
index 0000000000..df4fdef366
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_bkg_dark_light_same.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/dp_180" />
+    <gradient
+        android:angle="135"
+        android:endColor="#2E324B"
+        android:startColor="#585E8B"
+        android:type="linear"
+        android:useLevel="true" />
+
+</shape>
\ No newline at end of file
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 90a57dcea2..cd7d13d2a8 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
@@ -20,7 +20,7 @@
         android:paddingTop="10px"
         android:text="小窍门：分享路况，点赞其他车主，有助于提高热心指数"
         android:textColor="#FFFFFF"
-        android:textSize="16px">
+        android:textSize="@dimen/share_top_text_size">
 
     </TextView>
 
@@ -42,17 +42,17 @@
                 android:gravity="center_horizontal|center"
                 android:text="0"
                 android:textColor="#FFFFFF"
-                android:textSize="36px" />
+                android:textSize="@dimen/share_des_num_size" />
 
             <TextView
                 android:id="@+id/shre_num_des"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal|center"
+                android:paddingBottom="22px"
                 android:text="分享次数"
                 android:textColor="#FFFFFF"
-                android:textSize="16px"
-                android:paddingBottom="22px"/>
+                android:textSize="@dimen/share_index_des_size" />
 
         </LinearLayout>
 
@@ -76,17 +76,17 @@
                 android:gravity="center_horizontal|top"
                 android:text="0"
                 android:textColor="#FFFFFF"
-                android:textSize="36px" />
+                android:textSize="@dimen/share_des_num_size" />
 
             <TextView
                 android:id="@+id/share_approve_des"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal|top"
+                android:paddingBottom="22px"
                 android:text="车友认同次数"
                 android:textColor="#FFFFFF"
-                android:textSize="16px"
-                android:paddingBottom="22px"/>
+                android:textSize="@dimen/share_index_des_size" />
 
         </LinearLayout>
 
@@ -101,9 +101,9 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:gravity="center"
             android:orientation="vertical"
-            android:paddingTop="17px"
-            android:gravity="center">
+            android:paddingTop="@dimen/v2x_index_rating_top">
 
             <RatingBar
                 android:id="@+id/rating_bar"
@@ -116,12 +116,12 @@
                 android:id="@+id/share_index_des"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="热心指数"
                 android:layout_alignTop="@id/share_approve_des"
-                android:textColor="#FFFFFF"
                 android:gravity="center"
                 android:paddingTop="15px"
-                android:textSize="16px" />
+                android:text="热心指数"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/share_index_des_size" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
index bfe0b1657d..9bbee7ce4e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -28,7 +28,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="20px">
+        android:layout_marginTop="@dimen/share_empty_btn_padding">
 
         <Button
             android:id="@+id/share_event_button"
@@ -36,7 +36,7 @@
             android:layout_height="@dimen/v2x_share_btn_height"
             android:layout_centerHorizontal="true"
             android:layout_toLeftOf="@id/center"
-            android:background="@drawable/v2xt_dw_common_corner_bkg_dark"
+            android:background="@drawable/v2x_bkg_dark_light_same"
             android:clickable="true"
             android:onClick="shareEventAction"
             android:text="去分享"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
index e5e1eac405..7e74267929 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
@@ -8,7 +8,7 @@
         android:id="@+id/ivEmptyView"
         android:layout_width="@dimen/dp_355"
         android:layout_height="@dimen/dp_355"
-        android:layout_marginTop="@dimen/dp_120"
+        android:layout_marginTop="60px"
         android:src="@drawable/icon_share_empty"
         app:layout_constraintBottom_toTopOf="@+id/tvTrip"
         app:layout_constraintEnd_toEndOf="parent"
@@ -23,7 +23,7 @@
         android:gravity="center"
         android:text="周边5公里，暂无交通事件\n
 你可以试着分享一个交通事件给其他车主"
-        android:textColor="@color/transparent_white_30"
+        android:textColor="@color/v2x_FFF_333"
         android:textSize="@dimen/dp_36"
         app:layout_constraintBottom_toTopOf="@+id/btnShear"
         app:layout_constraintEnd_toEndOf="parent"
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 b143f7e952..3013345101 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
@@ -53,7 +53,7 @@
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
     <dimen name="module_v2x_des_index_width">16px</dimen>
-    <dimen name="module_v2x_des_index_height">4px</dimen>
+    <dimen name="module_v2x_des_index_height">40px</dimen>
     <dimen name="module_v2x_panel_cor">16px</dimen>
     <dimen name="module_v2x_panel_width">120px</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 fca032e5c5..5a425fa70c 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
@@ -54,13 +54,18 @@
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
     <dimen name="module_v2x_des_index_width">16px</dimen>
-    <dimen name="module_v2x_des_index_height">4px</dimen>
+    <dimen name="module_v2x_des_index_height">40px</dimen>
     <dimen name="module_v2x_panel_icon_cor">30px</dimen>
     <dimen name="module_v2x_panel_width">120px</dimen>
-    <dimen name="share_empty_icon_width">360px</dimen>
+    <dimen name="share_empty_icon_width">219px</dimen>
     <dimen name="v2x_loading_ani_width">400px</dimen>
     <dimen name="v2x_share_btn_width">281px</dimen>
     <dimen name="v2x_share_btn_height">90px</dimen>
     <dimen name="v2x_share_btn_size">33.75px</dimen>
+    <dimen name="v2x_index_rating_top">35px</dimen>
+    <dimen name="share_top_text_size">30px</dimen>
+    <dimen name="share_des_num_size">67.5px</dimen>
+    <dimen name="share_index_des_size">30px</dimen>
+    <dimen name="share_empty_btn_padding">80px</dimen>
 
 </resources>
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 1588dd0e23..e2e5dc1ea9 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -64,6 +64,11 @@
     <dimen name="v2x_share_btn_width">150px</dimen>
     <dimen name="v2x_share_btn_height">48px</dimen>
     <dimen name="v2x_share_btn_size">18px</dimen>
+    <dimen name="v2x_index_rating_top">17px</dimen>
+    <dimen name="share_top_text_size">16px</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>
 
 
 </resources>
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_bkg_dark_light_same_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_bkg_dark_light_same_light.xml
new file mode 100644
index 0000000000..df4fdef366
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_bkg_dark_light_same_light.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/dp_180" />
+    <gradient
+        android:angle="135"
+        android:endColor="#2E324B"
+        android:startColor="#585E8B"
+        android:type="linear"
+        android:useLevel="true" />
+
+</shape>
\ No newline at end of file

From e7756ad05d0e596b7b33f159af15effa1309f0b8 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 7 Sep 2020 20:11:45 +0800
Subject: [PATCH 4/5] f

---
 .../res/layout/module_v2x_event_share_description.xml  |  2 +-
 .../main/res/layout/module_v2x_event_share_empty.xml   |  6 +++---
 .../src/main/res/layout/v2x_network_loading_item.xml   |  2 +-
 .../src/main/res/values-xhdpi-1920x1000/dimens.xml     |  2 +-
 .../src/main/res/values-xhdpi/dimens.xml               | 10 ++++++----
 modules/mogo-module-v2x/src/main/res/values/dimens.xml |  3 +++
 6 files changed, 15 insertions(+), 10 deletions(-)

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 cd7d13d2a8..cdb15517bc 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
@@ -118,7 +118,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignTop="@id/share_approve_des"
                 android:gravity="center"
-                android:paddingTop="15px"
+                android:paddingTop="@dimen/share_index_bottom_padding"
                 android:text="热心指数"
                 android:textColor="#FFFFFF"
                 android:textSize="@dimen/share_index_des_size" />
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
index 9bbee7ce4e..c66f16aa27 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -18,7 +18,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/no_share_image"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="12.6px"
+        android:layout_marginTop="@dimen/share_empty_btn_padding"
         android:alpha="0.7"
         android:gravity="bottom"
         android:text="你还没有分享过道路事件，快去试试吧"
@@ -45,8 +45,8 @@
 
         <View
             android:id="@+id/center"
-            android:layout_width="29px"
-            android:layout_height="29px"
+            android:layout_width="@dimen/share_btn_middle_padding"
+            android:layout_height="@dimen/share_btn_middle_padding"
             android:layout_centerInParent="true" />
 
         <Button
diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
index 5a931c9632..72398e903d 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
@@ -44,7 +44,7 @@
         android:layout_below="@id/loading_text"
         android:layout_centerHorizontal="true"
         android:layout_gravity="top|center"
-        android:layout_marginTop="34px"
+        android:layout_marginTop="@dimen/shaer_refresh_padding"
         android:background="@drawable/v2xt_dw_common_corner_bkg_light"
         android:text="刷新"
         android:textColor="#FFFFFF"
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 3013345101..a32a64e53a 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
@@ -53,7 +53,7 @@
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
     <dimen name="module_v2x_des_index_width">16px</dimen>
-    <dimen name="module_v2x_des_index_height">40px</dimen>
+    <dimen name="module_v2x_des_index_height">42px</dimen>
     <dimen name="module_v2x_panel_cor">16px</dimen>
     <dimen name="module_v2x_panel_width">120px</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 5a425fa70c..799c9bd8ea 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
@@ -54,7 +54,7 @@
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
     <dimen name="module_v2x_des_index_width">16px</dimen>
-    <dimen name="module_v2x_des_index_height">40px</dimen>
+    <dimen name="module_v2x_des_index_height">42px</dimen>
     <dimen name="module_v2x_panel_icon_cor">30px</dimen>
     <dimen name="module_v2x_panel_width">120px</dimen>
     <dimen name="share_empty_icon_width">219px</dimen>
@@ -62,10 +62,12 @@
     <dimen name="v2x_share_btn_width">281px</dimen>
     <dimen name="v2x_share_btn_height">90px</dimen>
     <dimen name="v2x_share_btn_size">33.75px</dimen>
-    <dimen name="v2x_index_rating_top">35px</dimen>
+    <dimen name="v2x_index_rating_top">26px</dimen>
     <dimen name="share_top_text_size">30px</dimen>
     <dimen name="share_des_num_size">67.5px</dimen>
     <dimen name="share_index_des_size">30px</dimen>
-    <dimen name="share_empty_btn_padding">80px</dimen>
-
+    <dimen name="share_empty_btn_padding">40px</dimen>
+    <dimen name="shaer_refresh_padding">60px</dimen>
+    <dimen name="share_index_bottom_padding">22px</dimen>
+    <dimen name="share_btn_middle_padding">54px</dimen>
 </resources>
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 e2e5dc1ea9..0ac07328fd 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -69,6 +69,9 @@
     <dimen name="share_des_num_size">36px</dimen>
     <dimen name="share_index_des_size">16px</dimen>
     <dimen name="share_empty_btn_padding">20px</dimen>
+    <dimen name="shaer_refresh_padding">34px</dimen>
+    <dimen name="share_index_bottom_padding">15px</dimen>
+    <dimen name="share_btn_middle_padding">29px</dimen>
 
 
 </resources>

From 95d3e47f84a3b3c73cee69f7932682732f6b8dc8 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Mon, 7 Sep 2020 20:36:05 +0800
Subject: [PATCH 5/5] opt

---
 .../com/mogo/module/v2x/fragment/V2XSurroundingFragment.java  | 1 -
 .../res/layout/module_event_panel_fragment_surrounding.xml    | 4 ++--
 .../mogo-skin-light/src/main/module-v2x-res/values/colors.xml | 2 +-
 3 files changed, 3 insertions(+), 4 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 087374690c..7d893ee97e 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
@@ -184,7 +184,6 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
             //设置字体大小，true表示前面的字体大小 dip
             spannableString.setSpan(new AbsoluteSizeSpan((int) getContext().getResources().getDimension(R.dimen.module_v2x_surrounding_top), true),
                     7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            Log.d("liyz", "size = " + (int) getContext().getResources().getDimension(R.dimen.module_v2x_surrounding_top));
             spannableString.setSpan(new StyleSpan(Typeface.NORMAL), 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 e868cfe098..b4890addec 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
@@ -83,7 +83,7 @@
                     android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
                     android:gravity="center_horizontal"
                     android:text="周边5公里，暂无交通事件"
-                    android:textColor="@color/transparent_white_30"
+                    android:textColor="@color/v2x_FFF_333"
                     android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                     android:textStyle="bold" />
 
@@ -96,7 +96,7 @@
                     android:layout_marginTop="1px"
                     android:gravity="center_horizontal"
                     android:text="你可以试着分享一个事件给其他车主"
-                    android:textColor="@color/transparent_white_30"
+                    android:textColor="@color/v2x_FFF_333"
                     android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                     android:textStyle="bold" />
 
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 77f0c902c2..acfa530deb 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 @@
     <color name="v2x_white_light">#333333</color>
     <color name="v2x_item_white_light">#FFFFFF</color>
     <color name="v2x_white_refresh_light">#FFFFFF</color>
-    <color name="transparent_white_30_light">#B3FFFFFF</color>
+    <color name="transparent_white_30_light">#333333</color>
     <color name="share_event_no_more_color_light">#333333</color>
     <color name="v2x_FFF_999_light">#999999</color>
     <color name="v2x_FFF_333_light">#333333</color>