diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java index b8a025e465..ab9a98ef87 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java @@ -14,7 +14,9 @@ import androidx.appcompat.app.AppCompatDelegate; import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.module.v2x.R; +import com.mogo.skin.support.IMogoSkinCompatSupportable; import com.mogo.skin.support.IMogoSkinSupportInstaller; +import com.mogo.skin.support.MogoSkinManager; import com.mogo.skin.support.SkinMode; /** @@ -24,7 +26,7 @@ import com.mogo.skin.support.SkinMode; * desc : * version: 1.0 */ -public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkinSupportInstaller { +public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkinCompatSupportable { private float roundLayoutRadius = 14f; private Path roundPath; @@ -81,23 +83,9 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin super.draw(canvas); } - @Override - public void install(Application application) { - - } @Override - public void loadSkin(SkinMode skinMode) { - - } - - @Override - public AppCompatDelegate getSkinAppCompatDelegate(AppCompatActivity activity, AppCompatCallback callback) { - return null; - } - - @Override - public void init(Context context) { + public void applySkin() { } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml index 1dad69a517..fc21ce668b 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml @@ -3,7 +3,7 @@ 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 bb45e400c0..903bed8cfa 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 @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_10" - android:textColor="@color/v2x_FFF_333_white" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_28" android:textStyle="bold" app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead" @@ -74,7 +74,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:alpha="0.59" - android:textColor="@color/v2x_FFF_999_white" + android:textColor="@color/v2x_FFF_999" android:textSize="@dimen/dp_26" app:layout_constraintStart_toStartOf="@id/tvFaultHelpName" app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName" @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_30" android:gravity="center_vertical" - android:textColor="@color/v2x_FFF_333_white" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_80" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+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 b7d53a2321..f59c92e5d9 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 @@ -1,5 +1,5 @@ - - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index d9afa4955a..cabc198172 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -77,7 +77,7 @@ android:layout_marginRight="@dimen/dp_30" android:ellipsize="end" android:maxLines="1" - android:textColor="#FFFFFF" + android:textColor="@color/v2x_FFF_333" android:textSize="@dimen/dp_34" app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike" app:layout_constraintStart_toEndOf="@+id/ivIconP" @@ -92,7 +92,7 @@ android:layout_marginBottom="@dimen/dp_24" android:alpha="0.6" android:gravity="center_vertical" - android:textColor="#FFFFFF" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/dp_30" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/tvAddress" diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index 43c372672e..79771659da 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -22,7 +22,7 @@ android:alpha="0.7" android:gravity="bottom" android:text="你还没有分享过道路事件，快去试试吧" - android:textColor="@color/v2x_FFF_333_white" + android:textColor="@color/v2x_FFF_333" android:textSize="18px" /> #FFFFFF #10121E #99FFFFFF - #FFFFFF - #FFFFFF - #ff616381 + #FFFFFF + #FFFFFF + #ff616381 + #FFFFFF //endColor="#ff616381" android:startColor="#ff48495e" diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png new file mode 100644 index 0000000000..46e9240f43 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_illegal_parking_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png new file mode 100644 index 0000000000..47c45a2b5c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_illegal_parking_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index c354dea572..ad612b83a5 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -10,7 +10,8 @@ #FFFFFF #333333 #333333 - #999999 - #333333 + #999999 + #333333 + #666666