diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index 9211a4f569..a6153eb25d 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -3,6 +3,7 @@ package com.mogo.module.v2x.fragment; import android.content.Context; import android.util.Log; import android.view.View; +import android.widget.LinearLayout; import androidx.annotation.NonNull; import androidx.coordinatorlayout.widget.CoordinatorLayout; @@ -37,7 +38,7 @@ public class V2XScenarioHistoryFragment private String TAG = "ScenarioHistoryFragment"; private V2XListEmptyView mEmptyView; - private CoordinatorLayout mClHistoryList; + private LinearLayout mClHistoryList; private RecyclerView mRecyclerView; private V2XScenarioHistoryAdapter mV2XScenarioHistoryAdapter; private ArrayList mV2XHistoryScenarioData = new ArrayList<>(); 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 40e05358a0..607d8a3a04 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 @@ -18,6 +18,9 @@ import com.mogo.skin.support.IMogoSkinCompatSupportable; import com.mogo.skin.support.IMogoSkinSupportInstaller; import com.mogo.skin.support.MogoSkinManager; import com.mogo.skin.support.SkinMode; +import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate; +import com.mogo.skin.support.helper.MogoSkinCompatHelperDelegate; +import com.mogo.skin.support.helper.MogoSkinCompatTextHelperDelegate; /** * author : donghongyu @@ -31,19 +34,14 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin private float roundLayoutRadius = 14f; private Path roundPath; private RectF rectF; - + private MogoSkinCompatBackgroundHelperDelegate mBackgroundTintHelper; public RoundConstraintLayout(Context context) { this(context, null); } - public RoundConstraintLayout(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs); - } - public RoundConstraintLayout(Context context, AttributeSet attrs) { - super(context, attrs); - + this(context, attrs, 0); TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.RoundLayout); roundLayoutRadius = typedArray.getDimensionPixelSize(R.styleable.RoundLayout_roundLayoutRadius, (int) roundLayoutRadius); typedArray.recycle(); @@ -51,6 +49,13 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin init(); } + public RoundConstraintLayout(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + mBackgroundTintHelper = new MogoSkinCompatBackgroundHelperDelegate(this); + mBackgroundTintHelper.loadFromAttributes(attrs, defStyleAttr); + } + + private void init() { setWillNotDraw(false);//如果你继承的是ViewGroup,注意此行,否则draw方法是不会回调的; roundPath = new Path(); @@ -84,9 +89,11 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin super.draw(canvas); } - @Override public void applySkin() { - + if (mBackgroundTintHelper != null) { + mBackgroundTintHelper.applySkin(); + } } + } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png new file mode 100644 index 0000000000..245c2e855c Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png new file mode 100644 index 0000000000..e69d3fbacb Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png differ 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 f59c92e5d9..41be2d9bb6 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/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 8823070525..3270297d56 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -5,105 +5,95 @@ android:id="@+id/clPanelContainer" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@drawable/v2x_panel_list_background" android:clickable="true" android:visibility="gone" tools:visibility="visible"> - + android:layout_height="@dimen/dp_154" + android:gravity="center_vertical" + android:orientation="horizontal"> - + - + - + - + - + + - + - - + - + - - - - - diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml index 4f91e0dbcb..ade8f9ebe6 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml @@ -12,30 +12,23 @@ android:visibility="gone" tools:visibility="visible" /> - - - - - - + android:paddingStart="@dimen/dp_60" + android:paddingBottom="@dimen/dp_27" + android:text="今日出行遇到的交通事件" + android:textColor="@color/v2x_FFF_333" + android:textSize="@dimen/dp_36" + android:textStyle="bold" + app:layout_scrollFlags="scroll|enterAlways" /> - + \ No newline at end of file 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 79771659da..2ab0139341 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 @@ -36,7 +36,7 @@ android:layout_height="48px" android:layout_centerHorizontal="true" android:layout_toLeftOf="@id/center" - android:background="@drawable/v2xt_dw_common_corner_bkg_dark" + android:background="#3F4057" android:clickable="true" android:onClick="shareEventAction" android:text="去分享" diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index 1285a749e4..2c5b584b68 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -18,5 +18,6 @@ #ff616381 #FFFFFF #555A75 + #000000 \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_list_background_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_list_background_light.9.png new file mode 100644 index 0000000000..245c2e855c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_list_background_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_list_background_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_list_background_light.9.png new file mode 100644 index 0000000000..e69d3fbacb Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_list_background_light.9.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 0d1e99e607..dc220b6993 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 @@ -14,5 +14,5 @@ #333333 #666666 #F5F5F5 - + #FFFFFF