From f66776221ecf4acf586b4e45924c937b3e1411c3 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 17 Sep 2020 17:26:25 +0800
Subject: [PATCH 1/6] opt

---
 .../roadcondition/service/CosStatusController.kt       |  6 +++---
 .../com/zhidao/roadcondition/service/MainService.kt    | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
index b552f706b5..b46e500568 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
@@ -212,9 +212,9 @@ class CosStatusController : CosStatusCallback {
                     latitude = latitude
             ) { success ->
                 CosCallbackMapController.unregisterCallbacks(map)
-                CosCallbackMapController.mainService?.let {
-                    CosCallbackMapController.mainService?.sendCustomResult(success)
-                }
+//                CosCallbackMapController.mainService?.let {
+//                    CosCallbackMapController.mainService?.sendCustomResult(success)
+//                }
                 Log.d(TAG, "type = $type ----success = $success")
                 if (success) {
                     //分享成功，并打点，如果是上报拥堵，需要takeVideo
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
index 7e734f6140..7dbd0c5d3b 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt
@@ -66,11 +66,11 @@ class MainService : Service() {
     private var mLatitude: Double = 0.0
 
     //发送主动上报结果广播给外部
-    fun sendCustomResult(result: Boolean) {
-        var intent = Intent(customResultAction)
-        intent.putExtra("isSuccess", result)
-        sendBroadcast(intent)
-    }
+//    fun sendCustomResult(result: Boolean) {
+//        var intent = Intent(customResultAction)
+//        intent.putExtra("isSuccess", result)
+//        sendBroadcast(intent)
+//    }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         Log.d(TAG, "onStartCommand  -----------> ")

From 3e85471f064c9a923b560a7041845d8341574a22 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 17 Sep 2020 17:41:51 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=97=B4=E8=B7=9D,=E6=96=87=E5=AD=97=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/v2x/fragment/V2XShareEventsFragment.java  | 2 ++
 .../res/layout/module_v2x_event_share_description.xml     | 2 +-
 .../src/main/res/layout/module_v2x_event_share_item.xml   | 8 ++++----
 .../mogo-module-v2x/src/main/res/values-mdpi/dimens.xml   | 1 +
 .../mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml  | 3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index d4095a09f9..21256ebd26 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.module.v2x.R;
+import com.mogo.module.v2x.SpacesItemDecoration;
 import com.mogo.module.v2x.adapter.V2XShareEventAdapter;
 import com.mogo.module.v2x.entity.panel.V2XShareEventDescription;
 import com.mogo.module.v2x.entity.panel.V2XShareEventItem;
@@ -61,6 +62,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
 
     private void initRecyclerView() {
         recyclerView = mRootView.findViewById(R.id.road_case_share_list);
+        recyclerView.addItemDecoration(new SpacesItemDecoration(24));
         adapter = new V2XShareEventAdapter(getActivity(), dataArrayList, this);
         recyclerView.setAdapter(adapter);
         LinearLayoutManager linearLayoutManager =
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
index 56e66341dc..dfcf4e2ab7 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
@@ -19,7 +19,7 @@
         android:paddingLeft="20px"
         android:paddingTop="10px"
         android:text="小窍门：分享路况，点赞其他车主，有助于提高热心指数"
-        android:textColor="#FFFFFF"
+        android:textColor="#CCFFFFFF"
         android:textSize="@dimen/share_top_text_size">
 
     </TextView>
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
index 5b9ea8d44f..49fced883d 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -6,14 +6,14 @@
     android:layout_height="wrap_content"
     android:layout_marginLeft="20px"
     android:layout_marginRight="20px"
-    android:layout_marginBottom="14px"
+    android:layout_marginBottom="@dimen/dp_14"
     android:background="@drawable/bg_v2x_event_list_item">
 
     <TextView
         android:id="@+id/road_case_style"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginLeft="@dimen/dp_36"
         android:layout_marginTop="@dimen/dp_24"
         android:background="@drawable/bg_v2x_event_type_read"
         android:gravity="center"
@@ -80,7 +80,7 @@
         android:lines="1"
         android:text="东城区北三环附近维多欧美"
         android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_34" />
+        android:textSize="@dimen/dp_32" />
 
     <TextView
         android:id="@+id/road_case_share_time"
@@ -94,5 +94,5 @@
         android:gravity="left"
         android:text="时间:"
         android:textColor="@color/v2x_FFF_666"
-        android:textSize="@dimen/dp_30" />
+        android:textSize="@dimen/share_item_text_size" />
 </RelativeLayout>
\ No newline at end of file
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 4deae149b9..326b59bbf9 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
@@ -76,5 +76,6 @@
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
     <dimen name="module_v2x_panel_tab_height">84px</dimen>
     <dimen name="v2x_panel_loading_top">120px</dimen>
+    <dimen name="share_item_text_size">16px</dimen>
 
 </resources>
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 f66ced6bbf..66c449c427 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
@@ -64,7 +64,7 @@
     <dimen name="v2x_share_btn_width">281px</dimen>
     <dimen name="v2x_share_btn_height">90px</dimen>
     <dimen name="v2x_index_rating_top">28px</dimen>
-    <dimen name="share_top_text_size">30px</dimen>
+    <dimen name="share_top_text_size">28px</dimen>
     <dimen name="share_des_num_size">67.5px</dimen>
     <dimen name="share_index_des_size">30px</dimen>
     <dimen name="share_empty_btn_padding">40px</dimen>
@@ -75,5 +75,6 @@
     <dimen name="v2x_panel_btn_image_width">114px</dimen>
     <dimen name="module_v2x_panel_tab_height">158px</dimen>
     <dimen name="v2x_panel_loading_top">300px</dimen>
+    <dimen name="share_item_text_size">26px</dimen>
 
 </resources>

From 7a3d7cdeca2d02ce1c9b8df1cc5fa40c3d2c6c50 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Thu, 17 Sep 2020 17:45:29 +0800
Subject: [PATCH 3/6] =?UTF-8?q?opt=20=E9=9F=B3=E4=B9=90=E6=B5=AE=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../media/widget/AnimCircleImageView.java     |  17 +++++++++++------
 .../module/media/window/MediaWindow2.java     |  14 ++++++++++++--
 .../module_media_window_alert_bg.9.png        | Bin 588 -> 2497 bytes
 .../module_media_window_alert_bg.9.png        | Bin 588 -> 2497 bytes
 .../module_media_window_alert_bg.9.png        | Bin 1156 -> 4017 bytes
 .../src/main/res/values-xhdpi/dimens.xml      |   2 +-
 .../src/main/res/values/dimens.xml            |   2 +-
 7 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java
index ed1e5019be..2217bbdab2 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java
@@ -18,6 +18,7 @@ import android.widget.ImageView;
 
 import com.mogo.module.common.utils.CarSeries;
 import com.mogo.skin.support.IMogoSkinCompatSupportable;
+import com.mogo.skin.support.helper.MogoSkinCompatHelperDelegate;
 import com.mogo.skin.support.helper.MogoSkinCompatImageHelperDelegate;
 
 @SuppressLint("AppCompatCustomView")
@@ -30,6 +31,8 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
     int defaultHeight;
     int diameter;
     int radius;
+    PaintFlagsDrawFilter drawFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG|Paint.FILTER_BITMAP_FLAG);
+    Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
 
     MogoSkinCompatImageHelperDelegate imageHelper;
 
@@ -81,6 +84,7 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
     @Override
     public void setImageResource(int resId) {
         super.setImageResource(resId);
+        Log.d("AnimCircle", "setImageResource: " + MogoSkinCompatHelperDelegate.isSupport());
         imageHelper.setImageResource(resId);
         mDrawbleSrc = getDrawable();
         output = null;
@@ -112,7 +116,7 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
 
     @Override
     protected void onDraw(Canvas canvas) {
-        Log.d("AnimCircle", "onDraw====");
+//        Log.d("AnimCircle", "onDraw====");
         try {
             if (mDrawbleSrc == null) {
                 return;
@@ -131,7 +135,8 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
                 defaultWidth = getWidth();
                 diameter = (defaultHeight > defaultWidth ? defaultWidth : defaultHeight);
                 radius = diameter / 2;
-                mBitmapOut = getCuttedPicture(mDrawbleSrc);
+//                mBitmapOut = getCuttedPicture(mDrawbleSrc);
+                mBitmapOut = ((BitmapDrawable) mDrawbleSrc).getBitmap();
 
                 Paint paint = new Paint();
                 Rect rect = new Rect(0, 0, mBitmapOut.getWidth(),
@@ -156,9 +161,9 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
             if (isRotateEnable) {
                 currentDegree = (currentDegree + mRotateAngleStep) % 360;
                 canvas.save();
-                canvas.setDrawFilter(new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG|Paint.FILTER_BITMAP_FLAG));
+                canvas.setDrawFilter(drawFilter);
                 canvas.rotate(currentDegree, defaultWidth / 2, defaultHeight / 2);
-                canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, null);
+                canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, mPaint);
                 canvas.restore();
                 if (isRotateEnable) {
                     removeCallbacks(loopInvalidate);
@@ -167,9 +172,9 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup
                 }
             } else {
                 canvas.save();
-                canvas.setDrawFilter(new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG|Paint.FILTER_BITMAP_FLAG));
+                canvas.setDrawFilter(drawFilter);
                 canvas.rotate(currentDegree, defaultWidth / 2, defaultHeight / 2);
-                canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, null);
+                canvas.drawBitmap(output, defaultWidth / 2 - radius, defaultHeight / 2 - radius, mPaint);
                 canvas.restore();
             }
         } catch (Exception e) {
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
index 6601cca455..ccb2cb0cc8 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
+import com.mogo.module.common.glide.SkinAbleBitmapTarget;
 import com.mogo.module.media.MediaConstants;
 import com.mogo.module.media.R;
 import com.mogo.module.media.ServiceMediaHandler;
@@ -92,6 +93,11 @@ public class MediaWindow2 implements IMusicView {
             return;
         }
 
+        if(!ServiceMediaHandler.getIMogoStatusManager().isMainPageOnResume()){
+            Log.d(TAG, "not in front");
+            return;
+        }
+
         if (!mHasAddWindow) {
             mHasAddWindow = true;
             mWindowView =
@@ -199,10 +205,14 @@ public class MediaWindow2 implements IMusicView {
 
         if (mCircleImg != null) {
             if(mMediaInfoData!=null&&mMediaInfoData.getMediaImg()!=null&&!mMediaInfoData.getMediaImg().isEmpty()) {
+                int size =
+                        mContext.getResources().getDimensionPixelSize(R.dimen.module_media_pop_window_anim_img_size);
+                Logger.d(TAG, "overload: " + size);
                 com.bumptech.glide.request.RequestOptions options =
                         new com.bumptech.glide.request.RequestOptions()
-                                .placeholder(R.drawable.module_media_default_music_img);
-//                GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mCircleImg);
+                                .placeholder(R.drawable.module_media_default_music_img).error(R.drawable.module_media_default_music_img).override(size, size);
+                GlideApp.with(mContext).asBitmap().apply(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
+//                GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
             }else{
                 mCircleImg.setImageResource(R.drawable.module_media_default_music_img);
             }
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png
index 32bb1aa44251d3a56432e9509e1dabb957ae35ce..24567d76fca7b0144b548487c5b9832bf9e5d6e2 100644
GIT binary patch
delta 2488
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
ClM1o`

literal 588
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U=sFpaSW-r_4ck|(4hd4)<o@G
zUm3U68eZ*s&AB_-WBTT1FDPZz+M0SMS?Mr?^QRB38g=Q<zTEk&{{B<Yo$8`Xb5AK7
z3xdGK_m?Yd?9P6EsB*shWo4XAdZpp&KY>3#_gnq>7P&(8ibxi>soK6Z|6-aCo(-KA
zYo989J-^=KO&OnQ*w(gL)$9gRz2{b`Ki>E&@$+K-y33yfs!uEsXXsvTryut(@x$x7
zp9gPmkZ*YN>6_wijkwnTwK}1ZDdpeU88=jXYTYk-NG{(=vi6yES(&{1L|a8Zhr0!=
zdk-rv_G7r>Tdw!yS-rcUdtfy~_y3=Va-VChUczwb?fdwcO+s<kqVCN&JuUrzfzpi|
zaRzf#SOR=nrSA4D&t)_TT4BG2)9jGq<`jlk>t{9fe%4WK;BP!uf69;3VL`P7Fbt^y
z8kravn8D~f!+{;MD)vj?DA8e_-J|omGG*q%+Pi#jjkj$QX5c&?CUr;Z<(1~>UcJ7O
zR~L`AmAmhp{qSz7vDv<TJAalL@3T9>)b3Wk`#@r)NMz!sr61)IT2F3LjDECP@ZZ5{
zKh~J09uJhyUK3W`<eF!zTXefZdX3Q={sXUiZyKGKV-x^KVc^Oqd+)5!zkKd*|Mlh<
Qq9E^iy85}Sb4q9e0G21}bN~PV

diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png
index 32bb1aa44251d3a56432e9509e1dabb957ae35ce..24567d76fca7b0144b548487c5b9832bf9e5d6e2 100644
GIT binary patch
delta 2488
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
ClM1o`

literal 588
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U=sFpaSW-r_4ck|(4hd4)<o@G
zUm3U68eZ*s&AB_-WBTT1FDPZz+M0SMS?Mr?^QRB38g=Q<zTEk&{{B<Yo$8`Xb5AK7
z3xdGK_m?Yd?9P6EsB*shWo4XAdZpp&KY>3#_gnq>7P&(8ibxi>soK6Z|6-aCo(-KA
zYo989J-^=KO&OnQ*w(gL)$9gRz2{b`Ki>E&@$+K-y33yfs!uEsXXsvTryut(@x$x7
zp9gPmkZ*YN>6_wijkwnTwK}1ZDdpeU88=jXYTYk-NG{(=vi6yES(&{1L|a8Zhr0!=
zdk-rv_G7r>Tdw!yS-rcUdtfy~_y3=Va-VChUczwb?fdwcO+s<kqVCN&JuUrzfzpi|
zaRzf#SOR=nrSA4D&t)_TT4BG2)9jGq<`jlk>t{9fe%4WK;BP!uf69;3VL`P7Fbt^y
z8kravn8D~f!+{;MD)vj?DA8e_-J|omGG*q%+Pi#jjkj$QX5c&?CUr;Z<(1~>UcJ7O
zR~L`AmAmhp{qSz7vDv<TJAalL@3T9>)b3Wk`#@r)NMz!sr61)IT2F3LjDECP@ZZ5{
zKh~J09uJhyUK3W`<eF!zTXefZdX3Q={sXUiZyKGKV-x^KVc^Oqd+)5!zkKd*|Mlh<
Qq9E^iy85}Sb4q9e0G21}bN~PV

diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png
index 6b21dc37ab0386d1b7bb4f10b53960331f2cb062..96ddb81326cc0d4997f4bea23b0b3107d23364d7 100644
GIT binary patch
literal 4017
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
E7kS9AsQ>@~

literal 1156
zcmeAS@N?(olHy`uVBq!ia0vp^eIU%i1|*;VHQ-=iVDa{JaSW-r^>((c-)jev)<_1Y
zlsWUyO=fX%c04LH!Mr)b;hTV_^@FP~gO{J;yOhd&LA`3}{g~q({8~BZZ_Jzh-eY;&
zoZp%6{=~$`es#87m(n8O#Gwc$YOiN}smMKJBCS%E==00Ypv>Ik(&4om<(VhT&HW#@
zqTiKGkNf136U$Cy%<@c=oxXN<djH8Md2gI5O7F#4$ZTDxwW(OrYuc-Wo|ArV{(Uh!
z;Umw)(;=He+0RwjR2Q9o+osgM?XJhQi_OVr{`MM{y{x;^xoF$7$tij_-8s({SkxET
zC;2N{e~!x%5VbgVCQjz-e3A9h-n>i10vjf)yp&$MGJdUh)}`!%9?x)*RqI##?|P+b
z@zl$CVpUGRw*R|af9LA1r$?Tqo}XN8X}eLdFZ=MDhg+ta$7H_Cw<tPZ8IoUd{<6rN
zM@9WkM|OVFv1WY!r{};vwP%0*nxA+6dhp@flE=BLLkmuY=QV{Fx~%`YYTosj+^&lp
zP1hfmYCjNhjyQ99#jNKm4SB+3=Oh*NZz#QabqjC7wwASgb8-U;QaomvE!`X&D${UY
zJMM?CvD39GMT@gdjmq=W1vcF(+sd)y(UN+O$hUjWRqqgWx0|M%vUdB4-K!ov*`FW!
zDO6GMbx!C@MG1?i={sB2TnM^dpv~uAc-8&Wga-l}l9>6}WOytj3Je}Fz*z#w90ool
z8S*$V8xjsMLhVX8pcsS1VU)qf`QX}6tdg+Rj*a>GwHy3Q*D_b;?hsY?<ZoGXW!*N$
z=&5%FH-+7fH2_B0ea?vGOSgp{-1)0^^(JnoYqwUtQIfDY<^v3=U5|V=Cp_qJ>%T5@
zvQ+Nq(rpJ1Xx_d$ZNb&8D|20WvKl{o-FS7Nl9%sXN|E`p*q2$sL6;vqnBvc$%@qE)
zl$YgI<7Ac3=}gxXSEgn^n6mwZbW{JoZ56?r|9m|t*`MzJu75s<eboFVZEKs0_X%wA
z<`Q__IzQG-qc*tUUH%>WjmrftR_bqk%_DOWlmx%j1@&Zv&GKIvd3cjK`|~}Y&cxk#
ze`MqOiBXjrJLL<`xqtc6d+5vG7jySjYHhbKI8`}Ul=aoyJ!elPul(Ee`Ti;A+phwv
zKkc~G!u&k@{Nc8p^3sX^)w9YD{Itp~40-?U#M_5ouGm?`f46z6s<?Lb)yb1%&GsyR
zDK_W*dEq^|TR(og@<4K7{ewRhq4CD&AD7Q_Gg|xelq|c&{kDTClRntAak-QxOnej5
zX4<yl5$p5k3^gCWx+IAoTT<WE|8LTlfV#YzlL4~bJYDP4->w7a(@+_m>zsVZnS9}i
gsmWLWZT-i%@8tmxU&#sVz|w`m)78&qol`;+0OYzDD*ylh

diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
index 28189f70a7..f31888dd72 100644
--- a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
@@ -65,7 +65,7 @@
     <dimen name="module_media_pop_window_height">140px</dimen>
     <dimen name="module_media_pop_window_inner_height">112px</dimen>
     <dimen name="module_media_pop_window_inner_padding">30px</dimen>
-    <dimen name="module_media_pop_window_anim_img_size">90px</dimen>
+    <dimen name="module_media_pop_window_anim_img_size">80px</dimen>
     <dimen name="module_media_pop_window_text_width">230px</dimen>
     <dimen name="module_media_pop_window_text_margin">14px</dimen>
     <dimen name="module_media_pop_window_text_top_size">35px</dimen>
diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml
index 7514da155f..9f6a51ce93 100644
--- a/modules/mogo-module-media/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-media/src/main/res/values/dimens.xml
@@ -65,7 +65,7 @@
     <dimen name="module_media_pop_window_height">76.7px</dimen>
     <dimen name="module_media_pop_window_inner_height">60px</dimen>
     <dimen name="module_media_pop_window_inner_padding">18px</dimen>
-    <dimen name="module_media_pop_window_anim_img_size">48px</dimen>
+    <dimen name="module_media_pop_window_anim_img_size">44px</dimen>
     <dimen name="module_media_pop_window_text_width">123px</dimen>
     <dimen name="module_media_pop_window_text_margin">10px</dimen>
     <dimen name="module_media_pop_window_text_top_size">18px</dimen>

From 8656340e47770d2bd7d1e6f713874c8a7266e10c Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 17 Sep 2020 18:11:04 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E8=BE=B9=E8=B7=9D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/module_v2x_event_share_description.xml    | 4 ++--
 .../src/main/res/layout/module_v2x_event_share_item.xml       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
index dfcf4e2ab7..836cc77d1f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml
@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="20px"
-    android:layout_marginRight="20px"
+    android:layout_marginLeft="@dimen/dp_50"
+    android:layout_marginRight="@dimen/dp_50"
     android:layout_marginBottom="14px"
     android:background="@drawable/bg_v2x_event_description"
     android:orientation="vertical">
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
index 49fced883d..b3103c0ae9 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
@@ -4,8 +4,8 @@
     android:id="@+id/road_case_liset_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="20px"
-    android:layout_marginRight="20px"
+    android:layout_marginLeft="@dimen/dp_50"
+    android:layout_marginRight="@dimen/dp_50"
     android:layout_marginBottom="@dimen/dp_14"
     android:background="@drawable/bg_v2x_event_list_item">
 

From 0806e99e5eb6e32ca2557e2e857dd58fd1d50dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 17 Sep 2020 18:14:14 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/item_v2x_event_detail.xml         | 8 +++++---
 .../src/main/res/layout/item_v2x_scennario_history.xml    | 6 +++---
 .../res/layout/item_v2x_scennario_history_other_help.xml  | 1 +
 .../src/main/res/layout/window_road_event_detail.xml      | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

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 37ac4f3d26..d2586adedc 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
@@ -5,18 +5,20 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/v2x_alert_window_bg"
-    android:padding="@dimen/dp_25"
+    android:paddingTop="@dimen/dp_20"
+    android:paddingBottom="@dimen/dp_20"
     app:roundLayoutRadius="@dimen/dp_30">
 
     <com.mogo.module.v2x.view.RoundLayout
         android:id="@+id/rlRoadEventImg"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/dp_20"
         android:background="@color/v2x_555A_F5F5"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_30">
+        app:roundLayoutRadius="@dimen/dp_18">
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivEventImg"
@@ -109,7 +111,7 @@
         android:id="@+id/ivEventHead"
         android:layout_width="@dimen/dp_55"
         android:layout_height="@dimen/dp_55"
-        android:layout_marginEnd="@dimen/dp_33"
+        android:layout_marginEnd="@dimen/dp_28"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tvEventTypeTitle"
         app:miv_borderColor="#4cffffff"
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 251c55419e..2309dab1bf 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
@@ -11,12 +11,12 @@
         android:id="@+id/tagEventType"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_24"
+        android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
         android:layout_marginTop="@dimen/dp_24"
         android:background="@drawable/bg_v2x_event_type_read"
         android:gravity="center"
         android:paddingLeft="@dimen/dp_10"
-        android:paddingTop="@dimen/dp_3"
+        android:paddingTop="@dimen/dp_5"
         android:paddingRight="@dimen/dp_10"
         android:paddingBottom="@dimen/dp_3"
         android:text="违章停车"
@@ -50,7 +50,7 @@
         android:layout_marginStart="@dimen/dp_24"
         android:layout_marginEnd="@dimen/dp_16"
         android:src="@drawable/icon_illegal_parking"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintLeft_toLeftOf="@+id/tagEventType"
         app:layout_constraintTop_toBottomOf="@+id/tagEventType"
         app:layout_constraintTop_toTopOf="@+id/tvAddress" />
 
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
index e78fa5aac2..59bd21876d 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rlContent"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/bg_v2x_event_list_item">
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
index 0d28b2a2fa..c34c2ce6dd 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml
@@ -24,7 +24,7 @@
         android:layout_width="@dimen/dp_88"
         android:layout_height="@dimen/dp_88"
         android:layout_marginEnd="@dimen/dp_28"
-        android:layout_marginBottom="@dimen/dp_28"
+        android:layout_marginBottom="@dimen/dp_65"
         android:background="@drawable/icon_window_close2"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent" />

From c956d7b8d7650c5a036d8467016a1bef13b58cea Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 17 Sep 2020 18:49:45 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81+?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=88=97=E8=A1=A8=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java    | 1 +
 .../com/mogo/module/v2x/fragment/V2XShareEventsFragment.java    | 2 +-
 modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml     | 2 +-
 modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml    | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

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 a6153eb25d..47dee0a670 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
@@ -55,6 +55,7 @@ public class V2XScenarioHistoryFragment
         mEmptyView = findViewById(R.id.viewEmpty);
         mClHistoryList = findViewById(R.id.clHistoryList);
         mRecyclerView = findViewById(R.id.recyclerView);
+        mRecyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.share_item_padding)));
         mV2XScenarioHistoryAdapter = new V2XScenarioHistoryAdapter(mV2XHistoryScenarioData);
         mRecyclerView.setAdapter(mV2XScenarioHistoryAdapter);
         mRecyclerView.addItemDecoration(new SpacesItemDecoration(14));
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 21256ebd26..50f9eb4eb3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -62,7 +62,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
 
     private void initRecyclerView() {
         recyclerView = mRootView.findViewById(R.id.road_case_share_list);
-        recyclerView.addItemDecoration(new SpacesItemDecoration(24));
+        recyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.share_item_padding)));
         adapter = new V2XShareEventAdapter(getActivity(), dataArrayList, this);
         recyclerView.setAdapter(adapter);
         LinearLayoutManager linearLayoutManager =
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 326b59bbf9..dd5c9e173d 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
@@ -77,5 +77,5 @@
     <dimen name="module_v2x_panel_tab_height">84px</dimen>
     <dimen name="v2x_panel_loading_top">120px</dimen>
     <dimen name="share_item_text_size">16px</dimen>
-
+    <dimen name="share_item_padding">20px</dimen>
 </resources>
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 66c449c427..7df8d3a3b7 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
@@ -76,5 +76,7 @@
     <dimen name="module_v2x_panel_tab_height">158px</dimen>
     <dimen name="v2x_panel_loading_top">300px</dimen>
     <dimen name="share_item_text_size">26px</dimen>
+    <dimen name="share_item_padding">25px</dimen>
+
 
 </resources>