fix conflict

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

@@ -4,6 +4,6 @@
     <corners android:radius="@dimen/module_v2x_surrounding_refresh_bt_radius" />
 
     <gradient
-        android:endColor="#256BFF"
-        android:startColor="#5CC1FF" />
+        android:endColor="#5CC1FF"
+        android:startColor="#256BFF" />
 </shape>

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

@@ -4,8 +4,8 @@
     android:id="@+id/clPanelContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_v2x_event_surrounding_item">
-
+>
+<!--    android:background="@drawable/bg_v2x_event_surrounding_item"-->
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -23,7 +23,7 @@
                 android:gravity="top"
                 android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
                 android:text="周围5公里，共15条交通信息"
-                android:textColor="@color/white"
+                android:textColor="@color/v2x_white"
                 android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
 
             <TextView
@@ -36,7 +36,7 @@
                 android:background="@drawable/bg_v2x_refresh"
                 android:gravity="center"
                 android:text="@string/v2x_surrounding_refresh"
-                android:textColor="@color/white"
+                android:textColor="@color/v2x_item_white"
                 android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                 android:textStyle="bold" />
         </RelativeLayout>
@@ -111,7 +111,7 @@
                     android:background="@drawable/bg_v2x_go_to_share"
                     android:gravity="center"
                     android:text="@string/v2x_surrounding_go_to_share"
-                    android:textColor="@color/white"
+                    android:textColor="@color/v2x_white"
                     android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                     android:textStyle="bold" />
 
@@ -126,7 +126,7 @@
                     android:background="@drawable/bg_v2x_refresh"
                     android:gravity="center"
                     android:text="@string/v2x_surrounding_refresh"
-                    android:textColor="@color/white"
+                    android:textColor="@color/v2x_white_refresh"
                     android:textSize="@dimen/module_v2x_surrounding_top_textsize"
                     android:textStyle="bold" />
             </RelativeLayout>

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

@@ -34,7 +34,7 @@
             android:layout_toRightOf="@+id/iv_event_type"
             android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_bottom_left"
             android:textSize="@dimen/module_v2x_surrounding_item_bottom_left_textsize"
-            android:textColor="@color/white"
+            android:textColor="@color/v2x_item_white"
             android:text="求助" />
 
         <TextView

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

@@ -36,7 +36,7 @@
     <dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">130px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">110px</dimen>
     <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>

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

@@ -37,7 +37,7 @@
     <dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">130px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">110px</dimen>
     <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>

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

@@ -3,7 +3,9 @@
     <color name="live_video_progress_bar_loading_color">#256BFF</color>
     <color name="live_video_background_color">#3F4057</color>
     <color name="surrounding_card_background">#10121E</color>
-    <color name="white">#FFFFFF</color>
+    <color name="v2x_white">#FFFFFF</color>
+    <color name="v2x_item_white">#FFFFFF</color>
+    <color name="v2x_white_refresh">#FFFFFF</color>
     <color name="transparent_white_30">#B3FFFFFF</color>
     <color name="surrounding_item_bottom_color">#1F2131</color>
     <color name="share_event_item_bg_color">#1F2131</color>

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

@@ -39,7 +39,7 @@
     <dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
     <dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
-    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">130px</dimen>
+    <dimen name="module_v2x_surrounding_empty_bt_maigin_left">90px</dimen>
     <dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
     <dimen name="module_v2x_surrounding_margin_left">20px</dimen>
     <dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="white_light">#333333</color>
+    <color name="tanlu_white_light">#333333</color>
     <color name="color_99FFFFFF_light">#666666</color>
 
 </resources>

skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="24px" />
+<!--    <solid android:color="@color/live_video_background_color_light" />-->
+    <solid android:color="#E6E6E6" />
+
+</shape>

skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_refresh_light.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="24px" />
+
+    <gradient
+        android:endColor="#1F7EFF"
+        android:startColor="#1E57A4" />
+</shape>
+

skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi-1920x1000/dimens.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
 
 </resources>
 

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
 
 </resources>
 

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

@@ -5,6 +5,10 @@
     <color name="share_event_share_time_color_light">#999999</color>
     <color name="share_event_address_color_light">#333333</color>
     <color name="panel_shadow_shape_color_light">#F5F5F5</color>
+    <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="share_event_no_more_color_light">#333333</color>
     <color name="v2x_FFF_999_white_light">#999999</color>
     <color name="v2x_FFF_333_white_light">#333333</color>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
+
+</resources>
+
+