Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9

# Conflicts:
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java

modules/mogo-module-v2x/src/main/res/drawable/v2x_to_nav.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_to_nav_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/v2x_to_nav_nomal" android:state_pressed="false" />
+    <item android:drawable="@drawable/v2x_to_nav_nomal" />
+</selector>

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

@@ -30,7 +30,7 @@
         android:layout_marginTop="@dimen/dp_20"
         android:background="@drawable/bg_fatigue_driving"
         android:gravity="center"
-        android:text="@string/recommended_route"
+        android:text="@string/recommended_Parking"
         android:textColor="@color/v2x_item_white"
         android:textSize="@dimen/v2x_recommond_route_size"
         app:layout_constraintBottom_toTopOf="@+id/tvAddress"

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

@@ -6,18 +6,15 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/v2x_alert_window_bg"
-    android:paddingStart="@dimen/dp_62"
-    android:paddingTop="@dimen/dp_42"
-    android:paddingEnd="@dimen/dp_62"
-    android:paddingBottom="@dimen/dp_42"
+
     app:roundLayoutRadius="@dimen/dp_40"
     tools:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/ivIconP"
-        android:layout_width="@dimen/module_v2x_event_icon_size"
-        android:layout_height="@dimen/module_v2x_event_icon_size"
-        android:src="@drawable/icon_parking_p"
+        android:layout_width="@dimen/module_v2x_fatigue_driving_window_height_ground"
+        android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
+        android:src="@drawable/v2x_icon_route"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -27,7 +24,7 @@
         android:layout_width="@dimen/v2x_driving_width"
         android:layout_height="@dimen/v2x_driving_heigt"
         android:layout_marginStart="@dimen/dp_30"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_56"
         android:background="@drawable/bg_fatigue_driving"
         android:gravity="center"
         android:text="@string/recommended_route"
@@ -43,36 +40,23 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_15"
         android:layout_marginEnd="@dimen/dp_30"
-        android:layout_marginBottom="@dimen/dp_20"
+        android:layout_marginBottom="@dimen/dp_56"
         android:textColor="@color/v2x_FFF_333"
         android:textSize="@dimen/module_v2x_event_parking_text_size"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/tvAddressDistance"
+        app:layout_constraintEnd_toStartOf="@+id/ivToNav"
         app:layout_constraintStart_toStartOf="@+id/tagEventType"
         app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        tools:text="停车场｜服务区地址" />
+        tools:text="前往 xxx" />
 
-    <TextView
-        android:id="@+id/tvAddressDistance"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_30"
-        android:gravity="center_vertical"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/module_v2x_event_help_distance_text_size"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/ivToNav"
-        app:layout_constraintEnd_toStartOf="@+id/ivToNav"
-        app:layout_constraintTop_toTopOf="@+id/ivToNav"
-        tools:text="300m" />
 
     <ImageView
         android:id="@+id/ivToNav"
         android:layout_width="@dimen/module_v2x_event_button_size"
         android:layout_height="@dimen/module_v2x_event_button_size"
         android:layout_marginEnd="@dimen/dp_40"
-        android:src="@drawable/selector_nav_btn"
+        android:src="@drawable/v2x_to_nav"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/ivClose"
         app:layout_constraintTop_toTopOf="parent" />
@@ -81,6 +65,7 @@
         android:id="@+id/ivClose"
         android:layout_width="@dimen/module_v2x_event_button_size"
         android:layout_height="@dimen/module_v2x_event_button_size"
+        android:layout_marginEnd="@dimen/dp_62"
         android:src="@drawable/v2x_selector_icon_report_err"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -197,14 +197,14 @@
                 app:layout_constraintStart_toStartOf="parent" />
 
             <Button
-                android:id="@+id/btnTriggerPrejectedRoadEvent"
+                android:id="@+id/btnTriggerRecommendRouteEvent"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/dp_10"
                 android:layout_marginBottom="@dimen/dp_10"
                 android:background="#3100E2"
                 android:padding="@dimen/dp_10"
-                android:text="触发基于目的地预测的道路事件"
+                android:text="触发基于目的地预测的线路推荐"
                 android:textColor="#FFFFFF"
                 android:textSize="@dimen/dp_22"
                 app:layout_constraintBottom_toBottomOf="parent"

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

@@ -13,7 +13,8 @@
     <string name="v2x_voice_see_front_car_live_error">诶呀呀，没有查到前方车辆直播视屏，过一会再试试吧</string>
     <string name="v2x_voice_see_crossroad_live">已为您打开路口直播实况</string>
     <string name="v2x_voice_see_crossroad_live_error">诶呀呀，周围没有可用路口实况直播</string>
-    <string name="recommended_route">停车场推荐</string>
+    <string name="recommended_Parking">停车场推荐</string>
+    <string name="recommended_route">线路推荐</string>
     <string name="v2x_recommond_route_size">26px</string>
 
 </resources>