Merge remote-tracking branch 'origin/qa_light' into qa_light

2020-09-17 14:56:59 +08:00
parent a344cd18c3 c5033d05dd
commit 44c60f2af8
23 changed files with 173 additions and 66 deletions
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
@@ -204,7 +204,7 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
        LinearLayoutManager layoutManager = new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false);
        mLoopRecyclerView.setLayoutManager(layoutManager);

-        mTanluSlideAdapter = new TanluSlideAdapterNew(mContext, mAnalytics, mTanluModelData, mogoImageloader);
+        mTanluSlideAdapter = new TanluSlideAdapterNew(mContext, mAnalytics, mTanluModelData, mogoImageloader, mMogoRegisterCenter);
        mLoopRecyclerView.setAdapter(mTanluSlideAdapter);

        //保证滑动单页显示
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
@@ -5,6 +5,7 @@ import android.animation.AnimatorInflater;
 import android.animation.AnimatorSet;
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.mogo.commons.debug.DebugConfig;
+import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.glide.SkinAbleBitmapTarget;
 import com.mogo.module.tanlu.R;
@@ -30,9 +32,13 @@ import com.mogo.module.tanlu.model.event.StartPlayInfo;
 import com.mogo.module.tanlu.model.event.VoiceControlUpInfo;
 import com.mogo.module.tanlu.util.ChartUtil;
 import com.mogo.module.tanlu.video.SimpleCoverVideoPlayer;
+import com.mogo.module.tanlu.view.RoundLayout;
+import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.imageloader.IMogoImageloader;
 import com.mogo.service.imageloader.MogoImageView;
+import com.mogo.service.module.IMogoRegisterCenter;
+import com.mogo.skin.support.SkinMode;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder;
@@ -57,7 +63,7 @@ import static com.mogo.module.tanlu.util.Utils.handleDistance;
 * @description
 * @since 2020/3/11
 */
-public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHolderNew> {
+public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHolderNew> implements IMogoADASControlStatusChangedListener {
    private List<MarkerExploreWay> markerExploreWayList = new ArrayList<>();
    private static final String TAG = "TanluSlideAdapterNew";
    private Context mContext;
@@ -74,6 +80,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
    private TextView mTypeTv;
    private IMogoImageloader mogoImageloader;
    private ImageView mCloseImage;
+    private RoundLayout mRoundLayout;

    //media
    private GSYVideoOptionBuilder gsyVideoOptionBuilder = new GSYVideoOptionBuilder();
@@ -87,11 +94,14 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
    private HashMap<Integer, SimpleCoverVideoPlayer> list = new HashMap<>();


-    public TanluSlideAdapterNew(Context context, IMogoAnalytics analytics, TanluModelData tanluModelData, IMogoImageloader mogoImageloader) {
+    public TanluSlideAdapterNew(Context context, IMogoAnalytics analytics, TanluModelData tanluModelData, IMogoImageloader mogoImageloader,
+                                IMogoRegisterCenter mogoRegisterCenter) {
        this.mContext = context;
        this.mAnalytics = analytics;
        this.mTanluModelData = tanluModelData;
        this.mogoImageloader = mogoImageloader;
+        mogoRegisterCenter.registerADASControlStatusChangedListener( TAG, this );
+
        EventBus.getDefault().register(this);
    }

@@ -121,6 +131,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
        mLikeLayout = holder.itemView.findViewById(R.id.tanlu_like_layout);
        mTypeTv = holder.itemView.findViewById(R.id.tv_information_type);
        mCloseImage = holder.itemView.findViewById(R.id.tanlu_close_imageView);
+        mRoundLayout = holder.itemView.findViewById(R.id.media_layout);

        mCloseImage.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -496,5 +507,24 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
        return typeName;
    }

+    @Override
+    public void onMapUiModeChanged(EnumMapUI mapUI) {
+        switch ( mapUI ) {
+            case Type_Night:
+                Log.d("liyz", "Type_Night ---------> ");
+                mRoundLayout.setBackgroundResource(R.drawable.shape_tanlu_top_bg);
+                break;
+
+            case Type_Light:
+                Log.d("liyz", "Type_Light ---------> ");
+                mRoundLayout.setBackgroundResource(R.drawable.shape_tanlu_top_bg_light);
+                break;
+        }
+    }
+
+    @Override
+    public void onCarStatusChanged(boolean visible) {
+
+    }
 }

--- a/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml
+++ b/modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<!--    <corners android:radius="4dp"/>-->
+    <solid android:color="@color/tanlu_555A_F5F5F5"/>
+
+</shape>
--- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml
@@ -52,5 +52,6 @@
    <color name="tanlu_top_bg_startcolor">#5E6079</color>
    <color name="tanlu_top_bg_endcolor">#3F4057</color>
    <color name="tanlu_555A_F5F5">#555A75</color>
+    <color name="tanlu_555A_F5F5F5">#F5F5F5</color>

 </resources>
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
@@ -47,11 +47,6 @@ public class V2XShareNetworkModel {

            @Override
            public void subscribe(ObservableEmitter<String> emitter) throws Exception {
-                try {
-                    getShareIndex(callback);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
                emitter.onNext("1");
                emitter.onComplete();
            }
@@ -60,16 +55,10 @@ public class V2XShareNetworkModel {
        Observable<String> listObservable = Observable.create(new ObservableOnSubscribe<String>() {
            @Override
            public void subscribe(ObservableEmitter<String> emitter) throws Exception {
-                try {
-                    getShareEventList(page, size, callback);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
                emitter.onNext("2");
                emitter.onComplete();
            }
        });
-
        indexObservable.flatMap(new Function<String, ObservableSource<?>>() {
            @Override
            public ObservableSource<?> apply(String s) throws Exception {
@@ -82,12 +71,20 @@ public class V2XShareNetworkModel {

                    @Override
                    public void onSubscribe(Disposable d) {
-
+                        try {
+                            getShareIndex(callback);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                    }

                    @Override
                    public void onNext(Object o) {
-
+                        try {
+                            getShareEventList(page, size, callback);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                    }

                    @Override
@@ -135,7 +132,7 @@ public class V2XShareNetworkModel {
                    @Override
                    public void onError(Throwable e) {
                        super.onError(e);
-                        if (callback != null){
+                        if (callback != null) {
                            callback.onFail("网络异常，点击刷新重试");
                        }
                    }
@@ -179,7 +176,7 @@ public class V2XShareNetworkModel {
                    @Override
                    public void onError(Throwable e) {
                        super.onError(e);
-                        if (callback != null){
+                        if (callback != null) {
                            callback.onFail("网络异常，点击刷新重试");
                        }
                    }
--- a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png
--- a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png
+++ b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png
--- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml
+++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml
@@ -1,11 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="@dimen/dp_30" />
-    <gradient
-        android:angle="135"
-        android:endColor="#3F4057"
-        android:startColor="#5E6079"
-        android:type="linear"
-        android:useLevel="true" />
-</shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="#00000000" />
+            <corners android:radius="@dimen/dp_30" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="#00000000" />
+            <corners android:radius="@dimen/dp_30" />
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/dp_30" />
+            <gradient
+                android:angle="135"
+                android:endColor="#3F4057"
+                android:startColor="#5E6079"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+</layer-list>
--- 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
@@ -5,9 +5,7 @@
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:background="@drawable/v2x_alert_window_bg"
-    android:paddingStart="@dimen/dp_15"
-    android:paddingTop="@dimen/dp_15"
-    android:paddingBottom="@dimen/dp_15"
+    android:padding="@dimen/dp_25"
    app:roundLayoutRadius="@dimen/dp_30">

    <com.mogo.module.v2x.view.RoundLayout
@@ -67,7 +65,7 @@
        android:maxLines="1"
        android:textColor="@color/v2x_FFF_333"
        android:textSize="@dimen/dp_36"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/ivEventHead"
        app:layout_constraintStart_toStartOf="@id/tvEventTypeTitle"
        app:layout_constraintTop_toBottomOf="@+id/tvEventTypeTitle"
        tools:text="东城区北三环中路辅路小黄庄路口" />
@@ -127,7 +125,6 @@
        android:layout_marginTop="@dimen/dp_10"
        android:gravity="center"
        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="@+id/rlRoadEventImg"
        app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg"
        app:layout_constraintTop_toBottomOf="@+id/ivEventDistanceLogo">

--- 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
@@ -4,10 +4,12 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/rlContent"
    android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
+    android:layout_height="wrap_content"
    android:background="@drawable/v2x_alert_window_bg"
-    android:paddingStart="@dimen/dp_40"
-    android:paddingEnd="@dimen/dp_40"
+    android:paddingStart="@dimen/dp_62"
+    android:paddingTop="@dimen/dp_42"
+    android:paddingEnd="@dimen/dp_62"
+    android:paddingBottom="@dimen/dp_42"
    app:roundLayoutRadius="@dimen/dp_40">

    <ImageView
--- 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
@@ -4,7 +4,8 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
-    android:background="@drawable/v2x_alert_window_bg">
+    android:background="@drawable/v2x_alert_window_bg"
+    android:padding="@dimen/dp_25">

    <TextView
        android:id="@+id/tvImgTextContent"
@@ -12,7 +13,7 @@
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
-        android:layout_marginTop="@dimen/dp_40"
+        android:layout_marginTop="@dimen/dp_20"
        android:layout_marginEnd="@dimen/dp_7"
        android:background="@drawable/bg_v2x_event_type_orange"
        android:gravity="center_vertical"
@@ -100,7 +101,7 @@
        android:id="@+id/ivFaultHelpEventNavi"
        android:layout_width="@dimen/module_v2x_event_button_size"
        android:layout_height="@dimen/module_v2x_event_button_size"
-        android:layout_marginRight="26px"
+        android:layout_marginRight="@dimen/dp_54"
        android:src="@drawable/selector_nav_btn"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
--- 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
@@ -4,10 +4,12 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/rlContent"
    android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
+    android:layout_height="wrap_content"
    android:background="@drawable/v2x_alert_window_bg"
-    android:paddingStart="@dimen/dp_40"
-    android:paddingEnd="@dimen/dp_40">
+    android:paddingStart="@dimen/dp_62"
+    android:paddingTop="@dimen/dp_42"
+    android:paddingEnd="@dimen/dp_62"
+    android:paddingBottom="@dimen/dp_42">

    <ImageView
        android:id="@+id/ivIconP"
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
@@ -3,13 +3,13 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/module_v2x_event_window_height"
    android:background="@drawable/v2x_alert_window_bg">

    <com.mogo.module.v2x.view.V2XLiveGSYVideoView
        android:id="@+id/videoPlayer"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_event_window_height"
+        android:layout_height="match_parent"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_event_detail.xml
@@ -15,13 +15,20 @@
        app:layout_constraintTop_toTopOf="parent"
        app:roundLayoutRadius="@dimen/dp_30">

-        <com.mogo.service.imageloader.MogoImageView
-            android:id="@+id/ivImg"
+        <com.mogo.module.v2x.view.RoundLayout
+            android:id="@+id/rlRoadEventImg"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
-            android:scaleType="fitXY"
-            app:actualImageScaleType="fitXY" />
+            app:roundLayoutRadius="@dimen/dp_30">

+            <com.mogo.service.imageloader.MogoImageView
+                android:id="@+id/ivImg"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="fitXY"
+                app:actualImageScaleType="fitXY" />
+
+        </com.mogo.module.v2x.view.RoundLayout>
    </com.mogo.module.v2x.view.RoundLayout>

    <com.mogo.service.imageloader.MogoImageView
--- a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
@@ -3,13 +3,12 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_event_window_height"
-   >
+    android:layout_height="@dimen/module_v2x_live_window_height">

    <com.tencent.rtmp.ui.TXCloudVideoView
        android:id="@+id/txcVideoView"
        android:layout_width="match_parent"
-        android:layout_height="@dimen/module_v2x_event_window_height"
+        android:layout_height="@dimen/module_v2x_live_window_height"
        android:gravity="center" />

    <androidx.core.widget.ContentLoadingProgressBar
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -7,6 +7,7 @@
    <dimen name="module_v2x_event_window_height">170px</dimen>
    <dimen name="module_v2x_event_window_height_ground">250px</dimen>
    <dimen name="module_v2x_push_img_height">190px</dimen>
+    <dimen name="module_v2x_push_img_container_height">210px</dimen>

    <dimen name="module_v2x_fatigue_driving_window_height_ground">122px</dimen>

@@ -27,6 +28,7 @@

    <dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>

+    <dimen name="module_v2x_live_window_height">150px</dimen>
    <dimen name="module_v2x_map_left">550px</dimen>
    <dimen name="module_v2x_map_top">200px</dimen>
    <dimen name="module_v2x_map_right">200px</dimen>
--- 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
@@ -4,9 +4,10 @@

    <dimen name="module_v2x_search_marginLeft">32px</dimen>
    <dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
-    <dimen name="module_v2x_event_window_height">300px</dimen>
+    <dimen name="module_v2x_event_window_height">330px</dimen>
    <dimen name="module_v2x_event_window_height_ground">450px</dimen>
    <dimen name="module_v2x_push_img_height">390px</dimen>
+    <dimen name="module_v2x_push_img_container_height">410px</dimen>

    <dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>

@@ -23,6 +24,7 @@

    <dimen name="module_v2x_history_event_icon_size">80px</dimen>

+    <dimen name="module_v2x_live_window_height">310px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
    <dimen name="module_v2x_map_left">550px</dimen>
    <dimen name="module_v2x_map_top">200px</dimen>
@@ -51,7 +53,7 @@
    <dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
    <dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
    <dimen name="module_v2x_des_index_width">16px</dimen>
    <dimen name="module_v2x_des_index_height">42px</dimen>
    <dimen name="module_v2x_panel_width">120px</dimen>
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -4,11 +4,12 @@

    <dimen name="module_v2x_search_marginLeft">32px</dimen>
    <dimen name="module_v2x_operation_panel_share_goneMarginRight">32px</dimen>
-    <dimen name="module_v2x_event_window_height">306px</dimen>
+    <dimen name="module_v2x_event_window_height">330px</dimen>
    <dimen name="module_v2x_event_window_height_ground">450px</dimen>
    <dimen name="module_v2x_push_img_height">390px</dimen>
+    <dimen name="module_v2x_push_img_container_height">410px</dimen>

-    <dimen name="module_v2x_fatigue_driving_window_height_ground">210px</dimen>
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">234px</dimen>

    <dimen name="module_v2x_event_icon_size">147px</dimen>

@@ -24,6 +25,7 @@

    <dimen name="module_v2x_history_event_icon_size">80px</dimen>

+    <dimen name="module_v2x_live_window_height">310px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
    <dimen name="module_v2x_map_left">550px</dimen>
    <dimen name="module_v2x_map_top">200px</dimen>
@@ -52,7 +54,7 @@
    <dimen name="module_v2x_surrounding_refresh_bt_radius">42px</dimen>
    <dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
    <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
-    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">28px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
    <dimen name="module_v2x_des_index_width">31.9px</dimen>
    <dimen name="module_v2x_des_index_height">26px</dimen>
    <dimen name="module_v2x_panel_icon_cor">30px</dimen>
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -7,6 +7,7 @@
    <dimen name="module_v2x_event_window_height">170px</dimen>
    <dimen name="module_v2x_event_window_height_ground">250px</dimen>
    <dimen name="module_v2x_push_img_height">190px</dimen>
+    <dimen name="module_v2x_push_img_container_height">210px</dimen>

    <dimen name="module_v2x_fatigue_driving_window_height_ground">122px</dimen>

@@ -27,6 +28,7 @@

    <dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>

+    <dimen name="module_v2x_live_window_height">170px</dimen>
    <dimen name="module_v2x_map_left">550px</dimen>
    <dimen name="module_v2x_map_top">200px</dimen>
    <dimen name="module_v2x_map_right">200px</dimen>
--- 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
--- 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
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_illegal_parking_light.png
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_illegal_parking_light.png
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml
@@ -1,11 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="@dimen/dp_30" />
-    <gradient
-        android:angle="135"
-        android:endColor="#FFFFFF"
-        android:startColor="#F5F5F5"
-        android:type="linear"
-        android:useLevel="true" />
-</shape>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="#0DCCCCCC" />
+            <corners android:radius="@dimen/dp_30" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="#26CCCCCC" />
+            <corners android:radius="@dimen/dp_30" />
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#ffffff" />
+            <corners android:radius="@dimen/dp_30" />
+            <padding
+                android:bottom="10dp"
+                android:left="10dp"
+                android:right="10dp"
+                android:top="10dp" />
+        </shape>
+    </item>
+</layer-list>