Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8

.idea/gradle.xml

@@ -31,9 +31,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-back" />
             <option value="$PROJECT_DIR$/modules/mogo-module-common" />
             <option value="$PROJECT_DIR$/modules/mogo-module-extensions" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-gps-simulator" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-gps-simulator-debug" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-gps-simulator-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-guide" />
             <option value="$PROJECT_DIR$/modules/mogo-module-left-panel" />
             <option value="$PROJECT_DIR$/modules/mogo-module-left-panel-noop" />
@@ -77,7 +74,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

gradle.properties

@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=1.6.8-SNAPSHOT
+CARCHATTING_VERSION=1.8.8
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.7
 # loglib

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

@@ -28,7 +28,7 @@
     <dimen name="module_event_fragment_container_padding">20px</dimen>
     <dimen name="module_main_apps_fragment_container_paddingTop">20px</dimen>
 
-    <dimen name="module_main_event_panel_fragment_paddingTop">18px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingTop">20px</dimen>
     <dimen name="module_main_event_panel_fragment_paddingBottom">18px</dimen>
     <dimen name="module_main_event_panel_fragment_paddingLeft">18px</dimen>
     <dimen name="module_main_event_panel_fragment_paddingRight">18px</dimen>

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

@@ -23,8 +23,8 @@
     <dimen name="module_service_content_minWidth">120px</dimen>
     <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
 
-    <dimen name="module_services_online_car_panel_marginTop">13px</dimen>
-    <dimen name="module_services_online_car_panel_marginBottom">13px</dimen>
+    <dimen name="module_services_online_car_panel_marginTop">18px</dimen>
+    <dimen name="module_services_online_car_panel_marginBottom">18px</dimen>
     <dimen name="module_services_online_car_panel_marginRight">13px</dimen>
     <dimen name="module_services_online_car_panel_paddingLeft">43px</dimen>
     <dimen name="module_services_online_car_panel_paddingBottom">28px</dimen>

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

@@ -3,7 +3,7 @@
     android:id="@+id/llIllegalParkingUnLike"
     android:layout_width="@dimen/module_v2x_event_button_size"
     android:layout_height="@dimen/module_v2x_event_button_size"
-    android:background="@drawable/icon_heart_unlike_bg"
+    android:background="@drawable/icon_gray_back_heart"
     android:gravity="center">
 
     <ImageView

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/v2x_nav_select_light" android:state_pressed="true" />
+    <item android:drawable="@drawable/v2x_nav_normal_light" android:state_pressed="false" />
+    <item android:drawable="@drawable/v2x_nav_normal_light" />
+</selector>