Merge remote-tracking branch 'origin/qa_light' into qa_light

.idea/misc.xml

@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

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

@@ -85,7 +85,7 @@
     <dimen name="tanlu_module_card_margin_top">13px</dimen>
     <dimen name="tanlu_module_card_margin_left">8px</dimen>
     <dimen name="tanlu_module_margin_right">13px</dimen>
-    <dimen name="tanlu_module_margin_left">15px</dimen>
+    <dimen name="tanlu_module_margin_left">17px</dimen>
     <dimen name="tanlu_module_margin_top">3px</dimen>
     <dimen name="tanlu_module_mavi_height">18px</dimen>
     <dimen name="tanlu_module_button_height">26px</dimen>

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

@@ -85,7 +85,7 @@
     <dimen name="tanlu_module_card_margin_top">19px</dimen>
     <dimen name="tanlu_module_card_margin_left">13px</dimen>
     <dimen name="tanlu_module_margin_right">23px</dimen>
-    <dimen name="tanlu_module_margin_left">15px</dimen>
+    <dimen name="tanlu_module_margin_left">30px</dimen>
     <dimen name="tanlu_module_margin_top">9px</dimen>
     <dimen name="tanlu_module_mavi_height">27px</dimen>
     <dimen name="tanlu_module_button_height">46px</dimen>

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

@@ -85,7 +85,7 @@
     <dimen name="tanlu_module_card_margin_top">19px</dimen>
     <dimen name="tanlu_module_card_margin_left">13px</dimen>
     <dimen name="tanlu_module_margin_right">23px</dimen>
-    <dimen name="tanlu_module_margin_left">15px</dimen>
+    <dimen name="tanlu_module_margin_left">30px</dimen>
     <dimen name="tanlu_module_margin_top">9px</dimen>
     <dimen name="tanlu_module_mavi_height">27px</dimen>
     <dimen name="tanlu_module_button_height">46px</dimen>

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

@@ -85,7 +85,7 @@
     <dimen name="tanlu_module_card_margin_top">13px</dimen>
     <dimen name="tanlu_module_card_margin_left">8px</dimen>
     <dimen name="tanlu_module_margin_right">13px</dimen>
-    <dimen name="tanlu_module_margin_left">15px</dimen>
+    <dimen name="tanlu_module_margin_left">17px</dimen>
     <dimen name="tanlu_module_margin_top">3px</dimen>
     <dimen name="tanlu_module_mavi_height">18px</dimen>
     <dimen name="tanlu_module_button_height">26px</dimen>

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

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="#1F2131"/>
-    <corners android:radius="12px"/>
+    <corners android:radius="@dimen/dp_24"/>
 
 </shape>

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

@@ -72,7 +72,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_10"
         android:layout_marginEnd="@dimen/dp_30"
-        android:textColor="@android:color/white"
+        android:textColor="@color/v2x_FFF_333"
         android:textSize="@dimen/dp_33"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
@@ -87,7 +87,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:alpha="0.59"
-        android:textColor="@android:color/white"
+        android:textColor="@color/v2x_FFF_999"
         android:textSize="@dimen/dp_29"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginBottom="@dimen/dp_24"
@@ -101,7 +101,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_30"
         android:gravity="center_vertical"
-        android:textColor="#FFF"
+        android:textColor="@color/v2x_FFF_333"
         android:textSize="@dimen/dp_80"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"

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

@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="#DDDDDD"/>
-    <corners android:radius="12px"/>
+    <corners android:radius="@dimen/dp_24"/>
 
 </shape>