diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java index 09f0e3441b..0a901e78ad 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java @@ -18,6 +18,7 @@ import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity; import com.mogo.module.v2x.utils.ChartingUtil; +import com.mogo.module.v2x.utils.SpanUtils; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.service.imageloader.MogoImageView; import com.mogo.utils.logger.Logger; @@ -103,7 +104,7 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter @@ -18,13 +18,13 @@ android:duration="100" android:propertyName="translationX" android:valueFrom="0" - android:valueTo="2" + android:valueTo="5" android:valueType="floatType" /> diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml index 3a224c6654..ee2a754125 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml @@ -1,11 +1,10 @@ - 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 417047d526..a87e825882 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 @@ -5,74 +5,42 @@ android:layout_width="match_parent" android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" android:background="@drawable/v2x_fault_help_bg" - android:paddingStart="@dimen/dp_40" - android:paddingEnd="@dimen/dp_40"> - - - - - - - - - + android:paddingEnd="@dimen/dp_40" + app:roundLayoutRadius="@dimen/dp_30"> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" /> + + + app:layout_constraintTop_toTopOf="@+id/ivIconP" /> 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 721fba8c3c..936ab7c995 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 @@ -8,11 +8,11 @@ 450px 390px - 210px + 200px - 160px + 180px - 90px + 110px 100px 270px diff --git a/modules/mogo-module-v2x/src/main/res/values/color.xml b/modules/mogo-module-v2x/src/main/res/values/color.xml index 0faa50d319..f8a3476000 100644 --- a/modules/mogo-module-v2x/src/main/res/values/color.xml +++ b/modules/mogo-module-v2x/src/main/res/values/color.xml @@ -1,5 +1,5 @@ #256BFF - #FF3F4057 + #3F4057 \ No newline at end of file