diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 663459aa50..0d156937bb 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -3,9 +3,18 @@ + diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index a4df8026d8..7a0b52969c 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -52,7 +52,7 @@ android:paddingRight="@dimen/dp_10" android:paddingBottom="@dimen/dp_3" android:textColor="#fff" - android:textSize="@dimen/dp_24" + android:textSize="@dimen/module_v2x_event_type_title_text_size" app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg" app:layout_constraintTop_toTopOf="@+id/rlRoadEventImg" tools:text="道路施工" /> @@ -66,7 +66,7 @@ android:ellipsize="end" android:maxLines="1" android:textColor="@color/v2x_FFF_333" - android:textSize="@dimen/dp_36" + android:textSize="@dimen/module_v2x_event_title_text_size" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/ivEventHead" app:layout_constraintStart_toStartOf="@+id/tvEventTypeTitle" @@ -89,7 +89,7 @@ android:layout_marginStart="@dimen/dp_10" android:alpha="0.6" android:textColor="@color/v2x_FFF_666" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/module_v2x_event_sub_title_text_size" app:layout_constraintBottom_toBottomOf="@id/ivEventDistanceLogo" app:layout_constraintStart_toEndOf="@id/ivEventDistanceLogo" app:layout_constraintTop_toTopOf="@id/ivEventDistanceLogo" @@ -102,7 +102,7 @@ android:layout_marginStart="@dimen/dp_30" android:alpha="0.6" android:textColor="@color/v2x_FFF_999" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/module_v2x_event_sub_title_text_size" app:layout_constraintBottom_toBottomOf="@id/ivEventDistanceLogo" app:layout_constraintStart_toEndOf="@+id/tvEventDistance" app:layout_constraintTop_toTopOf="@id/ivEventDistanceLogo" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml index 05b199f00a..1610387581 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml @@ -14,8 +14,8 @@ @@ -78,7 +78,7 @@ android:layout_marginEnd="@dimen/dp_30" android:gravity="center_vertical" android:textColor="@color/v2x_FFF_333" - android:textSize="@dimen/dp_80" + android:textSize="@dimen/module_v2x_event_help_distance_text_size" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall" app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml index 9bd3f76b78..1a0f011c8c 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml @@ -33,7 +33,7 @@ android:paddingBottom="@dimen/dp_3" android:text="违章停车" android:textColor="#FFFFFF" - android:textSize="@dimen/dp_24" + android:textSize="@dimen/module_v2x_event_type_title_text_size" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/tvAddress" app:layout_constraintStart_toEndOf="@+id/ivIconP" @@ -48,7 +48,7 @@ android:ellipsize="end" android:maxLines="1" android:textColor="@color/v2x_FFF_333" - android:textSize="@dimen/dp_34" + android:textSize="@dimen/module_v2x_event_title_text_size" app:layout_constraintBottom_toTopOf="@+id/tvAddressDistance" app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike" app:layout_constraintStart_toStartOf="@+id/tagEventType" @@ -63,7 +63,7 @@ android:alpha="0.6" android:gravity="center_vertical" android:textColor="@color/v2x_FFF_666" - android:textSize="@dimen/dp_26" + android:textSize="@dimen/module_v2x_event_sub_title_text_size" app:layout_constraintEnd_toEndOf="@+id/tvAddress" app:layout_constraintStart_toStartOf="@+id/tagEventType" app:layout_constraintTop_toBottomOf="@+id/tvAddress" diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml index 63f2dac657..77bde39522 100644 --- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml @@ -81,4 +81,16 @@ 16px 20px 6px + + + 13px + 20px + 16px + + 41px + 18px + 14px + 44px + 19px + diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 7afc5f5e14..37279ba003 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -81,4 +81,16 @@ 16px 20px 3px + + + 13px + 20px + 16px + + 41px + 18px + 14px + 44px + 19px + diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 2e18d47106..8dbb945b9d 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -64,4 +64,15 @@ 158px + + 24px + 36px + 28px + + 75px + 32px + 26px + 80px + 34px + diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 562b1d7038..025c49d591 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -80,4 +80,15 @@ 25px 2px + + 24px + 36px + 28px + + 75px + 32px + 26px + 80px + 34px + diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index f0c403220a..2ff91d91f1 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -74,5 +74,15 @@ -8px 84px + + 13px + 20px + 16px + + 41px + 18px + 14px + 44px + 34px