From 28729b7659b497447fc8f0d3245c51eb63350459 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 15 Sep 2020 12:59:44 +0800
Subject: [PATCH 1/4] opt ui

---
 .idea/codeStyles/Project.xml                    | 15 +++------------
 .../fragment/recycler/TanluSlideAdapterNew.java | 17 ++++++++---------
 .../tanlu/video/SimpleCoverVideoPlayer.kt       |  6 +++---
 .../tanlu_item_main_media_recycler_new.xml      |  2 +-
 .../src/main/module-v2x-res/values/colors.xml   |  1 -
 5 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0d156937bb..663459aa50 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
     </JetCodeStyleSettings>
diff --git 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
index d88eb7c9e9..edba6ffed2 100644
--- 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
@@ -333,16 +333,16 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
             RequestOptions requestOptions = new RequestOptions()
                     .placeholder(R.drawable.tanlu_normal_image)
                     .error(R.drawable.tanlu_normal_image);
-            Glide.with(mContext)
-                    .load(mImageUrl)
-                    .apply(requestOptions)
-                    .into(autoZoomInImageView);
-
 //            Glide.with(mContext)
-//                    .asBitmap()
 //                    .load(mImageUrl)
 //                    .apply(requestOptions)
-//                    .into(new SkinAbleBitmapTarget(autoZoomInImageView, requestOptions));
+//                    .into(autoZoomInImageView);
+
+            Glide.with(mContext)
+                    .asBitmap()
+                    .load(mImageUrl)
+                    .apply(requestOptions)
+                    .into(new SkinAbleBitmapTarget(autoZoomInImageView, requestOptions));
         }
 
         traceVideoPlayStatusData();
@@ -374,8 +374,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
         //加载图片
         RequestOptions requestOptions = new RequestOptions()
                 .placeholder(R.drawable.tanlu_normal_image)
-                .error(R.drawable.tanlu_normal_image)
-                .fallback(R.drawable.tanlu_normal_image);
+                .error(R.drawable.tanlu_normal_image);
         Glide.with(mContext)
                 .asBitmap()
                 .load(imageUrl)
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
index 95bfc5700e..c66fbead76 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
+import com.mogo.module.common.glide.SkinAbleBitmapTarget
 import com.mogo.module.tanlu.R
 import com.shuyu.gsyvideoplayer.GSYVideoManager
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType
@@ -59,11 +60,10 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
         val requestOptions = RequestOptions()
                 .placeholder(R.drawable.tanlu_normal_image)
                 .error(R.drawable.tanlu_normal_image)
-        Glide.with(mContext)
+        Glide.with(mContext).asBitmap()
             .load(url)
             .apply(requestOptions)
-            .into(coverImage)
-
+            .into(SkinAbleBitmapTarget(coverImage, requestOptions))
 
     }
 
diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
index 81c7cc2c7d..1bc521c085 100644
--- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
+++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
@@ -38,7 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
-            tools:src="@drawable/tanlu_normal_image"
+            android:src="@drawable/tanlu_normal_image"
             android:scaleType="fitXY" />
     </com.mogo.module.tanlu.view.RoundLayout>
 
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 acfa530deb..3e51d334d1 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
@@ -8,7 +8,6 @@
     <color name="v2x_white_light">#333333</color>
     <color name="v2x_item_white_light">#FFFFFF</color>
     <color name="v2x_white_refresh_light">#FFFFFF</color>
-    <color name="transparent_white_30_light">#333333</color>
     <color name="share_event_no_more_color_light">#333333</color>
     <color name="v2x_FFF_999_light">#999999</color>
     <color name="v2x_FFF_333_light">#333333</color>

From 47bf18648682a1c1bc274b1dcea4ae077247548b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 15 Sep 2020 18:46:41 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=20=E3=80=90Launcher?=
 =?UTF-8?q?=E4=BA=8C=E6=9C=9F=E3=80=91=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=97=B6=E5=81=B6=E4=BB=8E=E7=99=BD=E5=A4=A9?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F,?=
 =?UTF-8?q?=E6=9C=AA=E9=80=82=E9=85=8D=20http://jira.zhidaohulian.com/brow?=
 =?UTF-8?q?se/FX-448?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     | 58 +++++++++-----
 .../com/mogo/module/v2x/view/RoundLayout.java | 24 ++++--
 .../module/v2x/view/V2XLiveGSYVideoView.java  | 10 ++-
 .../main/res/layout/item_v2x_live_video.xml   |  2 +-
 .../layout/item_v2x_road_live_car_detail.xml  | 80 +++++++++----------
 ...e_v2x_event_panel_fragment_event_panel.xml |  5 +-
 .../res/layout/view_video_layout_normal.xml   |  2 +-
 7 files changed, 110 insertions(+), 71 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 30d2b671de..fd5a81a5aa 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -2,6 +2,10 @@ package com.mogo.module.v2x.fragment
 
 import android.content.Intent
 import android.view.View
+import android.widget.ImageView
+import android.widget.RadioButton
+import android.widget.RadioGroup
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
@@ -11,14 +15,12 @@ import com.mogo.module.v2x.V2XConst.MODULE_NAME
 import com.mogo.module.v2x.V2XServiceManager
 import com.mogo.module.v2x.adapter.V2XEventPagerAdapter
 import com.mogo.module.v2x.presenter.EventPanelPresenter
-import com.mogo.module.v2x.presenter.ShareEventsPresenter
 import com.mogo.module.v2x.utils.TrackUtils
 import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener
 import com.mogo.module.v2x.voice.V2XVoiceConstants
 import com.mogo.module.v2x.voice.V2XVoiceManager
 import com.mogo.utils.logger.Logger
-import kotlinx.android.synthetic.main.module_v2x_event_panel_fragment_event_panel.*
 
 
 /**
@@ -38,6 +40,14 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
 
     private var mV2XEventPanelHistoryCountView: V2XEventPanelHistoryCountView? = null
 
+    private var mClPanelContainer: ConstraintLayout? = null
+    private var mVpEventPanel: ViewPager2? = null
+    private var mRgTabSelect: RadioGroup? = null
+    private var mBtnHidePanels: ImageView? = null
+    private var mRbScenarioHistory: RadioButton? = null
+    private var mRbSurroundingEvent: RadioButton? = null
+    private var mRbShareEvents: RadioButton? = null
+
     private val mV2XScenarioHistoryFragment = V2XScenarioHistoryFragment()
     private val mV2XShareEventsFragment = V2XShareEventsFragment()
 
@@ -51,7 +61,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     // 打开出行动态TAB
     private val mCheckHistoryEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
         try {
-            rbScenarioHistory?.isChecked = true
+            mRbScenarioHistory?.isChecked = true
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
         }
@@ -60,7 +70,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     // 打开周边事件TAB
     private val mCheckSurroundingCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
         try {
-            rbSurroundingEvent?.isChecked = true
+            mRbSurroundingEvent?.isChecked = true
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
         }
@@ -69,7 +79,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     // 打开我的分享TAB
     private val mCheckShearEventCb = V2XVoiceCallbackListener { command: String?, intent: Intent? ->
         try {
-            rbShareEvents?.isChecked = true
+            mRbShareEvents?.isChecked = true
         } catch (e: java.lang.Exception) {
             e.printStackTrace()
         }
@@ -92,48 +102,60 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     override fun initViews() {
         Logger.d(MODULE_NAME, "事件面板初始化……")
         try {
+            mClPanelContainer = mRootView.findViewById(R.id.clPanelContainer)
+            mVpEventPanel = mRootView.findViewById(R.id.vpEventPanel)
+            mRgTabSelect = mRootView.findViewById(R.id.rgTabSelect)
+            mBtnHidePanels = mRootView.findViewById(R.id.btnHidePanels)
+            mRbScenarioHistory = mRootView.findViewById(R.id.rbScenarioHistory)
+            mRbSurroundingEvent = mRootView.findViewById(R.id.rbSurroundingEvent)
+            mRbShareEvents = mRootView.findViewById(R.id.rbShareEvents)
+
             fragments = arrayOf(
                     mV2XScenarioHistoryFragment,
                     V2XSurroundingFragment(),
                     mV2XShareEventsFragment
             )
             //禁用预加载
-            vpEventPanel.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
-            vpEventPanel.adapter = V2XEventPagerAdapter(this, fragments!!)
-            vpEventPanel.isUserInputEnabled = false; //true:滑动，false：禁止滑动
+            mVpEventPanel?.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
+            mVpEventPanel?.adapter = V2XEventPagerAdapter(this, fragments!!)
+            mVpEventPanel?.isUserInputEnabled = false; //true:滑动，false：禁止滑动
 
-            rgTabSelect?.setOnCheckedChangeListener { group, checkedId ->
+            mRgTabSelect?.setOnCheckedChangeListener { group, checkedId ->
                 when (checkedId) {
                     R.id.rbScenarioHistory -> {
                         TrackUtils.trackV2xHistoryEvent(2)
-                        vpEventPanel.setCurrentItem(0, false)
+                        mVpEventPanel?.setCurrentItem(0, false)
                     }
                     R.id.rbSurroundingEvent -> {
                         TrackUtils.trackV2xHistoryEvent(3)
-                        vpEventPanel.setCurrentItem(1, false)
+                        mVpEventPanel?.setCurrentItem(1, false)
                     }
                     R.id.rbShareEvents -> {
                         TrackUtils.trackV2xHistoryEvent(4)
-                        vpEventPanel.setCurrentItem(2, false)
+                        mVpEventPanel?.setCurrentItem(2, false)
                     }
                 }
             }
 
-            btnHidePanels.setOnClickListener {
+            mBtnHidePanels?.setOnClickListener {
                 TrackUtils.trackV2xHistoryEvent(5)
                 hidePanel()
             }
 
             mV2XEventPanelHistoryCountView = V2XEventPanelHistoryCountView(context)
             mV2XEventPanelHistoryCountView!!.setOnClickListener {
-                if (clPanelContainer != null) {
+                if (mClPanelContainer == null) {
+                    mClPanelContainer = mRootView.findViewById(R.id.clPanelContainer);
+                }
+                if (mClPanelContainer != null) {
                     if (!isPanelShow()) {
                         TrackUtils.trackV2xHistoryEvent(1)
                         showPanel()
                     }
                 }
             }
-            V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView)
+            V2XServiceManager.getMogoEntranceButtonController()
+                    .addBottomLayerView(mV2XEventPanelHistoryCountView)
             changeEventCount()
         } catch (e: Exception) {
             e.printStackTrace()
@@ -151,7 +173,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
 
     fun showPanel() {
         Logger.d(MODULE_NAME, "in fragment show panel")
-        clPanelContainer.visibility = View.VISIBLE
+        mClPanelContainer?.visibility = View.VISIBLE
         // 注册语音交互
         V2XVoiceManager.registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP, mCheckHistoryEventCb)
                 .registerUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP, mCheckSurroundingCb)
@@ -171,7 +193,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
 
     fun hidePanel() {
         Logger.d(MODULE_NAME, "in fragment hide panel")
-        clPanelContainer.visibility = View.GONE
+        mClPanelContainer?.visibility = View.GONE
         // 注册语音交互
         V2XVoiceManager.unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_HISTORY_EVENT_UN_WAKEUP)
                 .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_OPEN_SURROUNDING_EVENT_UN_WAKEUP)
@@ -180,7 +202,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     }
 
     fun isPanelShow(): Boolean {
-        return clPanelContainer.visibility == View.VISIBLE
+        return mClPanelContainer?.visibility == View.VISIBLE
     }
 
     // 修改未处理消息
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundLayout.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundLayout.java
index e9b051e379..b0645b5823 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundLayout.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundLayout.java
@@ -9,6 +9,8 @@ import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 
 import com.mogo.module.v2x.R;
+import com.mogo.skin.support.IMogoSkinCompatSupportable;
+import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate;
 
 /**
  * author : donghongyu
@@ -17,29 +19,34 @@ import com.mogo.module.v2x.R;
  * desc   :
  * version: 1.0
  */
-public class RoundLayout extends RelativeLayout {
+public class RoundLayout extends RelativeLayout implements IMogoSkinCompatSupportable {
     private float roundLayoutRadius = 14f;
     private Path roundPath;
     private RectF rectF;
+    private MogoSkinCompatBackgroundHelperDelegate mBackgroundTintHelper;
 
     public RoundLayout(Context context) {
         this(context, null);
     }
 
-    public RoundLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs);
+    public RoundLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
     }
 
-    public RoundLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
+    public RoundLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
 
         TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.RoundLayout);
         roundLayoutRadius = typedArray.getDimensionPixelSize(R.styleable.RoundLayout_roundLayoutRadius, (int) roundLayoutRadius);
         typedArray.recycle();
 
         init();
+
+        mBackgroundTintHelper = new MogoSkinCompatBackgroundHelperDelegate(this);
+        mBackgroundTintHelper.loadFromAttributes(attrs, defStyleAttr);
     }
 
+
     private void init() {
         setWillNotDraw(false);//如果你继承的是ViewGroup,注意此行,否则draw方法是不会回调的;
         roundPath = new Path();
@@ -72,5 +79,12 @@ public class RoundLayout extends RelativeLayout {
         }
         super.draw(canvas);
     }
+
+    @Override
+    public void applySkin() {
+        if (mBackgroundTintHelper != null) {
+            mBackgroundTintHelper.applySkin();
+        }
+    }
 }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
index 5099c33fbb..205b9d43d5 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
@@ -25,6 +25,7 @@ import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
 import com.mogo.skin.support.IMogoSkinCompatSupportable;
+import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 import com.tencent.rtmp.ITXLivePlayListener;
@@ -51,6 +52,8 @@ public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatS
     private ConstraintLayout mClLoadError;
     private TextView mTvRefreshButton;
 
+    private MogoSkinCompatBackgroundHelperDelegate mBackgroundTintHelper;
+
     private MarkerCarInfo.CarLiveInfo mCarLiveInfo;
     // 重新刷新直播流
     private V2XVoiceCallbackListener v2XVoiceCallbackRefreshListener = new V2XVoiceCallbackListener() {
@@ -76,6 +79,9 @@ public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatS
     public V2XLiveGSYVideoView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         initView(context);
+
+        mBackgroundTintHelper = new MogoSkinCompatBackgroundHelperDelegate(this);
+        mBackgroundTintHelper.loadFromAttributes(attrs, defStyleAttr);
     }
 
     private void initView(Context context) {
@@ -282,6 +288,8 @@ public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatS
 
     @Override
     public void applySkin() {
-
+        if (mBackgroundTintHelper != null) {
+            mBackgroundTintHelper.applySkin();
+        }
     }
 }
diff --git 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
index 48bdbca7bd..6a10089ff5 100644
--- 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
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    >
+    android:background="@drawable/v2x_alert_window_bg">
 
     <com.mogo.module.v2x.view.V2XLiveGSYVideoView
         android:id="@+id/videoPlayer"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
index aec79a948f..d8e4371717 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
@@ -6,52 +6,44 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/module_v2x_event_window_height">
 
-    <androidx.cardview.widget.CardView
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvRoadEventList"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:cardBackgroundColor="#FFFFFF"
-        app:cardCornerRadius="12px"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:overScrollMode="never"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:listitem="@layout/item_v2x_live_video" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvRoadEventList"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:overScrollMode="never"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:listitem="@layout/item_v2x_live_video" />
+    <TextView
+        android:id="@+id/tvEventStubClose"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_25"
+        android:layout_marginTop="@dimen/dp_20"
+        android:background="@drawable/bg_count_down"
+        android:paddingLeft="@dimen/dp_12"
+        android:paddingTop="@dimen/dp_3"
+        android:paddingRight="@dimen/dp_12"
+        android:paddingBottom="@dimen/dp_3"
+        android:text="30s"
+        android:textColor="#FFFFFF"
+        android:textSize="@dimen/dp_30"
+        app:layout_constraintStart_toStartOf="@+id/rvRoadEventList"
+        app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
 
-        <TextView
-            android:id="@+id/tvEventStubClose"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_25"
-            android:layout_marginTop="@dimen/dp_20"
-            android:background="@drawable/bg_count_down"
-            android:paddingLeft="@dimen/dp_12"
-            android:paddingTop="@dimen/dp_3"
-            android:paddingRight="@dimen/dp_12"
-            android:paddingBottom="@dimen/dp_3"
-            android:text="30s"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/dp_30"
-            app:layout_constraintStart_toStartOf="@+id/rvRoadEventList"
-            app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
-
-        <ImageView
-            android:layout_width="@dimen/dp_130"
-            android:layout_height="@dimen/dp_46"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="@dimen/dp_28"
-            android:layout_marginEnd="@dimen/dp_28"
-            android:src="@drawable/v2x_icon_event_live_top"
-            app:layout_constraintEnd_toEndOf="@+id/rvRoadEventList"
-            app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
-    </androidx.cardview.widget.CardView>
+    <ImageView
+        android:layout_width="@dimen/dp_130"
+        android:layout_height="@dimen/dp_46"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_28"
+        android:layout_marginEnd="@dimen/dp_28"
+        android:src="@drawable/v2x_icon_event_live_top"
+        app:layout_constraintEnd_toEndOf="@+id/rvRoadEventList"
+        app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 72367f3873..14f94f2268 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
@@ -15,7 +15,10 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_154"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <RadioButton
             android:id="@+id/rbScenarioHistory"
diff --git 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
index 5f0253cabc..0a5c61c9ea 100644
--- 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
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/module_v2x_event_window_height"
-    android:background="@drawable/v2x_alert_window_bg">
+   >
 
     <com.tencent.rtmp.ui.TXCloudVideoView
         android:id="@+id/txcVideoView"

From 46c019cd61fac8756f2daae0f5d7fdf8de15f96f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 15 Sep 2020 19:22:57 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=20=E3=80=90Launcher?=
 =?UTF-8?q?=E4=BA=8C=E6=9C=9F=E3=80=91=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=97=B6=E5=81=B6=E4=BB=8E=E7=99=BD=E5=A4=A9?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F,?=
 =?UTF-8?q?=E6=9C=AA=E9=80=82=E9=85=8D=20http://jira.zhidaohulian.com/brow?=
 =?UTF-8?q?se/FX-448?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a7fe228083..f0c6c25030 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
@@ -4,7 +4,7 @@
     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/bg_v2x_event_list_item">
+    android:background="@drawable/v2x_alert_window_bg">
 
     <TextView
         android:id="@+id/tvImgTextContent"

From 1b20c710de4337922894cdabc3f8162f42205f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 15 Sep 2020 19:53:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/dimens.xml            |   4 +-
 .../main/res/layout/item_v2x_event_detail.xml | 145 ++++++++++--------
 .../item_v2x_event_detail_stub_live.xml       |   2 +-
 .../res/layout/item_v2x_illegal_parking.xml   |   1 +
 .../src/main/res/values-mdpi/dimens.xml       |   8 +-
 .../src/main/res/values-xhdpi/dimens.xml      |   8 +-
 .../src/main/res/values/dimens.xml            |   8 +-
 7 files changed, 94 insertions(+), 82 deletions(-)

diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml
index abb5b70e10..adabf11063 100644
--- a/modules/mogo-module-main/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-main/src/main/res/values/dimens.xml
@@ -17,12 +17,12 @@
     <dimen name="cards_container_shadow_dp_margin_top">319px</dimen>
 
     <dimen name="module_main_apps_fragment_container_width">110px</dimen>
-    <dimen name="module_main_apps_fragment_container_padding">16px</dimen>
+    <dimen name="module_main_apps_fragment_container_padding">10px</dimen>
     <dimen name="module_main_header_fragment_container_marginTop">15px</dimen>
     <dimen name="module_main_header_fragment_container_marginLeft">460px</dimen>
     <dimen name="module_main_id_entrance_fragment_container_marginLeft">444px</dimen>
     <dimen name="module_main_id_left_panel_fragment_container_width">350px</dimen>
-    <dimen name="module_main_entrance_fragment_container_padding">16px</dimen>
+    <dimen name="module_main_entrance_fragment_container_padding">10px</dimen>
     <dimen name="module_main_entrance_fragment_container_padding_top">16px</dimen>
     <dimen name="module_main_entrance_fragment_container_width">658px</dimen>
     <dimen name="module_event_fragment_container_padding">8px</dimen>
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 7b835f3f95..d35880bce4 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
@@ -61,7 +61,7 @@
         android:id="@+id/tvEventAddress"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_5"
         android:layout_marginRight="@dimen/dp_30"
         android:ellipsize="end"
         android:maxLines="1"
@@ -76,7 +76,7 @@
         android:id="@+id/ivEventDistanceLogo"
         android:layout_width="@dimen/dp_35"
         android:layout_height="@dimen/dp_35"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_5"
         android:src="@drawable/v2x_icon_help_navi"
         app:layout_constraintStart_toStartOf="@id/tvEventTypeTitle"
         app:layout_constraintTop_toBottomOf="@+id/tvEventAddress" />
@@ -121,77 +121,88 @@
         app:miv_shape="circle"
         app:miv_shapeBorderWidth="@dimen/dp_4" />
 
-    <ImageView
-        android:id="@+id/ivEventLive"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:layout_marginLeft="@dimen/dp_10"
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_10"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/selector_live_btn"
-        android:visibility="gone"
+        android:gravity="center"
+        android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="@+id/rlRoadEventImg"
         app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg"
-        tools:visibility="visible" />
+        app:layout_constraintTop_toBottomOf="@+id/ivEventDistanceLogo">
 
-    <ImageView
-        android:id="@+id/ivEventReportTrue"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:padding="@dimen/dp_10"
-        android:scaleType="fitXY"
-        android:src="@drawable/icon_report_true"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-        app:layout_constraintStart_toEndOf="@id/ivEventLive"
-        app:layout_goneMarginLeft="@dimen/dp_10"
-        tools:visibility="visible" />
+        <ImageView
+            android:id="@+id/ivEventLive"
+            android:layout_width="@dimen/module_v2x_event_button_size_detail"
+            android:layout_height="@dimen/module_v2x_event_button_size_detail"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/selector_live_btn"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
 
-    <ImageView
-        android:id="@+id/ivEventReportErr"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/icon_report_err"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-        app:layout_constraintStart_toEndOf="@id/ivEventReportTrue"
-        app:layout_goneMarginLeft="@dimen/dp_10"
-        tools:visibility="visible" />
+        <ImageView
+            android:id="@+id/ivEventReportTrue"
+            android:layout_width="@dimen/module_v2x_event_button_size_detail"
+            android:layout_height="@dimen/module_v2x_event_button_size_detail"
+            android:padding="@dimen/dp_10"
+            android:scaleType="fitXY"
+            android:src="@drawable/icon_report_true"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
+            app:layout_constraintStart_toEndOf="@id/ivEventLive"
+            app:layout_goneMarginLeft="@dimen/dp_10"
+            tools:visibility="visible" />
 
-    <ImageView
-        android:id="@+id/ivEventCallChart"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/selector_talk_btn"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-        app:layout_constraintStart_toEndOf="@id/ivEventReportErr"
-        app:layout_goneMarginLeft="@dimen/dp_10"
-        tools:visibility="visible" />
+        <ImageView
+            android:id="@+id/ivEventReportErr"
+            android:layout_width="@dimen/module_v2x_event_button_size_detail"
+            android:layout_height="@dimen/module_v2x_event_button_size_detail"
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/icon_report_err"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
+            app:layout_constraintStart_toEndOf="@id/ivEventReportTrue"
+            app:layout_goneMarginLeft="@dimen/dp_10"
+            tools:visibility="visible" />
 
-    <ImageView
-        android:id="@+id/ivEventEventNav"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/selector_nav_btn"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-        app:layout_constraintStart_toEndOf="@id/ivEventCallChart"
-        app:layout_goneMarginLeft="@dimen/dp_10"
-        tools:visibility="visible" />
+        <ImageView
+            android:id="@+id/ivEventCallChart"
+            android:layout_width="@dimen/module_v2x_event_button_size_detail"
+            android:layout_height="@dimen/module_v2x_event_button_size_detail"
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/selector_talk_btn"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
+            app:layout_constraintStart_toEndOf="@id/ivEventReportErr"
+            app:layout_goneMarginLeft="@dimen/dp_10"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/ivEventEventNav"
+            android:layout_width="@dimen/module_v2x_event_button_size_detail"
+            android:layout_height="@dimen/module_v2x_event_button_size_detail"
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/selector_nav_btn"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
+            app:layout_constraintStart_toEndOf="@id/ivEventCallChart"
+            app:layout_goneMarginLeft="@dimen/dp_10"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/ivEventZan"
+            android:layout_width="@dimen/module_v2x_event_button_size_detail"
+            android:layout_height="@dimen/module_v2x_event_button_size_detail"
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/v2x_event_icon_zan"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
+            app:layout_constraintStart_toEndOf="@id/ivEventEventNav"
+            app:layout_goneMarginLeft="@dimen/dp_10"
+            tools:visibility="visible" />
+    </LinearLayout>
 
-    <ImageView
-        android:id="@+id/ivEventZan"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/v2x_event_icon_zan"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-        app:layout_constraintStart_toEndOf="@id/ivEventEventNav"
-        app:layout_goneMarginLeft="@dimen/dp_10"
-        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml
index 20bacf4ae4..dd7f9200b1 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml
@@ -7,7 +7,7 @@
     android:background="@drawable/v2x_alert_window_bg"
     android:gravity="center"
     app:roundLayoutRadius="@dimen/dp_40"
-    tools:layout_height="@dimen/dp_382">
+    tools:layout_height="@dimen/module_v2x_event_window_height">
 
     <ImageView
         android:layout_width="@dimen/dp_110"
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 ec8da8c971..eeaaabd6a8 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
@@ -15,6 +15,7 @@
         android:layout_height="@dimen/module_v2x_event_icon_size"
         android:src="@drawable/icon_illegal_parking"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
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 2d45b0b58f..b16f4bb593 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
@@ -4,11 +4,11 @@
 
     <dimen name="module_v2x_search_marginLeft">18px</dimen>
     <dimen name="module_v2x_operation_panel_share_goneMarginRight">20px</dimen>
-    <dimen name="module_v2x_event_window_height">194px</dimen>
+    <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_fatigue_driving_window_height_ground">130px</dimen>
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">122px</dimen>
 
     <dimen name="module_v2x_event_icon_size">82px</dimen>
 
@@ -16,8 +16,8 @@
 
     <dimen name="module_v2x_event_button_size_detail">64px</dimen>
 
-    <dimen name="module_v2x_event_image_height">175px</dimen>
-    <dimen name="module_v2x_event_image_width">262px</dimen>
+    <dimen name="module_v2x_event_image_height">156px</dimen>
+    <dimen name="module_v2x_event_image_width">234px</dimen>
 
 
     <dimen name="module_v2x_event_distance_text">34px</dimen>
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 812e949135..c068621299 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
@@ -4,19 +4,19 @@
 
     <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">350px</dimen>
+    <dimen name="module_v2x_event_window_height">306px</dimen>
     <dimen name="module_v2x_event_window_height_ground">450px</dimen>
     <dimen name="module_v2x_push_img_height">390px</dimen>
 
-    <dimen name="module_v2x_fatigue_driving_window_height_ground">220px</dimen>
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">210px</dimen>
 
     <dimen name="module_v2x_event_icon_size">147px</dimen>
 
     <dimen name="module_v2x_event_button_size">98px</dimen>
     <dimen name="module_v2x_event_button_size_detail">130px</dimen>
 
-    <dimen name="module_v2x_event_image_height">320px</dimen>
-    <dimen name="module_v2x_event_image_width">480px</dimen>
+    <dimen name="module_v2x_event_image_height">280px</dimen>
+    <dimen name="module_v2x_event_image_width">421px</dimen>
 
 
     <dimen name="module_v2x_event_distance_text">60px</dimen>
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 b049144d59..cec87bea7c 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -4,11 +4,11 @@
 
     <dimen name="module_v2x_search_marginLeft">18px</dimen>
     <dimen name="module_v2x_operation_panel_share_goneMarginRight">20px</dimen>
-    <dimen name="module_v2x_event_window_height">194px</dimen>
+    <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_fatigue_driving_window_height_ground">130px</dimen>
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">122px</dimen>
 
     <dimen name="module_v2x_event_icon_size">82px</dimen>
 
@@ -16,8 +16,8 @@
 
     <dimen name="module_v2x_event_button_size_detail">64px</dimen>
 
-    <dimen name="module_v2x_event_image_height">175px</dimen>
-    <dimen name="module_v2x_event_image_width">262px</dimen>
+    <dimen name="module_v2x_event_image_height">156px</dimen>
+    <dimen name="module_v2x_event_image_width">234px</dimen>
 
 
     <dimen name="module_v2x_event_distance_text">34px</dimen>