yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into qa_1.1

Browse Source
This commit is contained in:
董宏宇
2020-07-28 18:43:55 +08:00
parent 3511f44ff8 c5fd368986
commit 421a4bde57
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -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
#左侧面板模块

2
modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
View File

@@ -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"

6
modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
View File

@@ -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"