From 1b5b0937f8257ab68f39798a693843fd5fe27fa7 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 28 Jul 2020 17:42:50 +0800
Subject: [PATCH 1/2] opt

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index ae9f6c6d8d..45c439c828 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -63,7 +63,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22
 
 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=1.3.1.15
+MOGO_MODULE_TANLU_VERSION=1.3.1.16
 # 车聊聊
 CARCHATTING_VERSION=1.4.8
 # 车聊聊接口
@@ -81,7 +81,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 探路上报和分享模块
-TANLULIB_VERSION=1.3.1.15
+TANLULIB_VERSION=1.3.1.16
 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块

From 203b37c39c2288faab05a512123608dca00c07c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 28 Jul 2020 18:10:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/item_v2x_fault_help.xml             | 2 +-
 .../src/main/res/layout/window_fatigue_driving.xml          | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
index f8a664ecf6..0cd149aba3 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
@@ -82,10 +82,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_30"
-        android:fontFamily="sans-serif-condensed-medium"
         android:gravity="center_vertical"
         android:textColor="#FFF"
         android:textSize="@dimen/dp_80"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
         app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
         app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
index 8c230a983c..23efbbf041 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
@@ -21,9 +21,10 @@
 
     <ImageView
         android:id="@+id/ivIconPIcon"
-        android:layout_marginStart="@dimen/dp_20"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_20"
         android:src="@drawable/icon_parting_icon"
         app:layout_constraintBottom_toTopOf="@+id/tvAddress"
         app:layout_constraintStart_toEndOf="@+id/ivIconP"
@@ -34,6 +35,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_30"
+        android:layout_marginBottom="@dimen/dp_20"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/dp_34"
         android:textStyle="bold"
@@ -48,10 +50,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_30"
-        android:fontFamily="sans-serif-condensed-medium"
         android:gravity="center_vertical"
         android:textColor="#FFF"
         android:textSize="@dimen/dp_80"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="@+id/ivToNav"
         app:layout_constraintEnd_toStartOf="@+id/ivToNav"
         app:layout_constraintTop_toTopOf="@+id/ivToNav"