From c5033d05ddcedc3a924127d259aa5b64c4b00f65 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 17 Sep 2020 14:49:38 +0800
Subject: [PATCH 1/3] opt ui

---
 .../tanlu/fragment/TanluListWindow.java       |   2 +-
 .../recycler/TanluSlideAdapterNew.java        |  34 ++++++++++++++++--
 .../res/drawable/shape_tanlu_top_bg_light.xml |   6 ++++
 .../src/main/res/values/colors.xml            |   1 +
 .../v2x_surrounding_bottom_bg.png             | Bin 1565 -> 1650 bytes
 .../v2x_surrounding_bottom_bg.png             | Bin 1565 -> 1650 bytes
 .../res/values-xhdpi-1920x1000/dimens.xml     |   2 +-
 .../src/main/res/values-xhdpi/dimens.xml      |   2 +-
 8 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 modules/mogo-module-tanlu/src/main/res/drawable/shape_tanlu_top_bg_light.xml

diff --git 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
index f9f27f4699..c67414bf1e 100644
--- 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);
 
         //保证滑动单页显示
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 3cea0b5b49..de39f21bd8 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
@@ -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) {
+
+    }
 }
 
diff --git 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
new file mode 100644
index 0000000000..4eba256888
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml
index a552d06283..1a0324e0cc 100644
--- 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>
diff --git 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
index ef5069632f920174b3b41b8f21b0507109ba1ac4..30690aeb2e0b97edc50e37b3c96d40bab918d479 100644
GIT binary patch
literal 1650
zcmeAS@N?(olHy`uVBq!ia0y~yU_1w82XL?fS<inhT?phb76-XIF|0c$^OAvqO~=#4
zF{Fa=?VW>NF|HzP52Cl9HE3c~)%Nv~nJhjdr-n^X<h$O{wf+yhQ?jSMb9Jm?2zN}m
zHnG!F!NvUGgA{e!>+c%Fw7<zL6BC<rJKk*WuF!zc`}XR~jct8)78Y3WT7O8t(`Y>}
z_M+?aX<J-WXN4S?o_FcNIood)nH#@<+qv0zmc~8Fvl?f=hW<%5+3cWdwcSBg>*5+F
z>q~K`iqh{%rvCNHvHjjx^K{#$C$ah$_T0?1-RZD>)00{a9Bd1|)QXAUfB5~|<Pd2e
zQTt|7%-$8(rk76YmAALi+7~=UXUmHnT1J;V&D77NG`b!aO<OWK$8W|-rtUuNGal+U
z=NL?86_X90G0|_6Wuh9lj@3E?<+&-vhkV2$N@5b-tWG{_nW?kk#g0QgC6mr_8b>Bv
zENqp0sWMwQZPS58kGYKD2H*W7bHVRV(ku?8-!YQM&;R8K_$D&9ejC%RXE}>YH@;!&
zGOlhqXCKXY)be&ltj_L+M`z|O_<TOhq41npl=x}A1s0ptU;NoD8Zc*b@3o_wxHZnb
z;k5dn!z%KeBJIb5+TN#ETZ=1Ch<NbkdeolJ@7~%k%iJ~Rhg_duLKxHU>cdwzKe}`0
z)v>dO_1iB$ynObCHY1ZQ>#3sp{9Seb|6RQNbzNP1fPZzhV1~d4-i2&B-ke`V0_NCm
zee1fw(V@^RA<}EX@`gumR_5w6@iKL7W;`7P)Gm_lp9|6vFo!o{n$Qc)1s2s=x4Rvh
z8y@8x*fhn#pYiC;;M;L5QY<3r%+r>#RB>sXn|JG*(glSD7SbDZR4)WO6n?w1O}vo}
zsIVbbvvD5K<mKD;a+q*voEv0Lc(8~mwPK-#epjk&V;@thL|uevdSuz1%V8`WF%A!=
z7QWwH2nx!^t<wY)E_g1OQdCq^^Zw+co15?Z-P=+0^?Ty1d+)bw&*c!Xh=1_q<Ke~O
z*Dt64e_r$D!E$S0<b>uIo)<TEeo!wi(Y|~2p_rU+n&y0b%g-JF#u5vMfPw(`4;9sK
zhTaVfK)x1Z@8(Aa3JxI7#)e~(zh|g|*;5;iMHWg3fFv3t93J=7o)H4Gy&N8|vETuk
z;?Urrv!L*pT^c8tt-7EvOok0)yn}++1&d_)&0zKdp$it;e9TaLGv;jUj|8&=I5Xym
zwljhq)WK?U?#6K)Fna}y$+@n>V3%<mVUkLJlRORNN{$d9`)DHAWh_aIy~e}E`HdT=
zJbeDD6A};#8$uKA8Xq^BY8{<!s{-+?R%7Y;7@PWkulv`>SAM=_z`K2QBqTT;9>_Nq
z?)d#;`eOZ4&rTj(dzjyU`r+%VH=egO*N6j0$^nBpeccZqw;y-Ezs~Sq-W=(frOb2v
zPKRGMiM?m@*$W)XWxl}V6?E+7WZ%Pg?)<m!EjHd*x3~25-t5y)=ga%1{z@?2W666s
zdUgKGec#@j{__KC3gVvf@aQT@yV$!A556)!^Iojm`@W3){pzB7bN?|FOXqRS*c1~1
QtV9?*UHx3vIVCg!02E@dxc~qF

literal 1565
zcmeAS@N?(olHy`uVBq!ia0y~yU_1w82XL?fS<inhT?phb76-XIF|0c$^OAvq^}45v
zV@L(#+q;H&vY{eu56aaiPFNG6Dd4n7!SE!TQa+Q^2R@IJYB#uVIyNwgH5N|1c2JF#
z_Y~8F3GL?7lw6hbCLSyQS8gZueDB7R|G)p*%{kJyz}BkL>^;{XW6>Rt--^b5xiIV6
z3O8rgnwM>2*L!WZR)0UY%b)*+<7ex|%vr@dyXqxnBNj^8ZgDbQbupyT==IVw?|Xvw
z3)!2L&s=|pzt!_^P3tnV>nGP<;PZKPo69$M-Q?(nvNNu17oBx0Mt!@JwZY1KZIi7#
z{oZZc6aVzMo@{e-<?r*WyPsLRvInOxl%FpfkbZadjk&S2_OPEi^Lowfh?!JpUT$98
ze!Oy{Y8>~L*xet>8?I@^3E${w*t&C~(h-FXVg_@v1=n-txEv_RTf$+;v4)lBdDM|?
zCTT%~IntU=JWSb)hj)s7oOQsBh3C0jmq7D@r~?J-T=%GL5Clq4YDDA8t>3bgBabLJ
zJg{Z_Up@P~!JkP7!dPyZ*zT7-r+UHW{M#odUw-}f_<1y^276-`)9HY?{dV;m@7%6;
zUJ>>CowV`;X(z)_&M4ml1!38DYLi)b(tSdk!h{XxT$L)nFTr?NGI;8Ot3c7M$L^ZD
z9Vj>!qMBjKcsO!x;rCvk2Zw`Jp^UYAjpj_1D!(q%nE9(N>+%;H^^HqdvN&Sm|9yL0
z^7q#t*V|jWrNYa+nQn_$6nyzm;d%3(Ywe#WUvB?=_N={peXWYagFM!6_2+7ezyA93
z@!#V;bMDB^wb}jm=-p!lQjAP290DgqKAgRE=H3!DhX#g5M<%i73KhqN6dW2HmNgum
zd2{v^pb`ZGj{}cnSl&lK)NimbuAV%L0jQgeGh$Bj16l6|AZI3%SbAE1kT6i|0R_hH
zVu3x$oB|3C3c&{+oq6M%1=1>^l2FLkRIUTEH-#%=&dj}@z96m5EIQ{LKlG`BT;Rjl
zZM@lhB}i++godM*9QQVYTrfd1p)l>6nkh&tkI)7S_Jh{bKrS$1)j2mz9RK_1&3k-S
zx53_ZQ1Dr>cW%_}zcSOJVn9KsVBnH)bLQp0FE783%Fb_7DbN6ggaC(NMA_4~=VCsc
z`+Uc5pGB?Z`)BK&KXrS8LY3v6&w{tN{KM<#%zr!mdCl+X&C}vz;{X0T3o0{CAGY>>
zqyRQ~Lt<m9y58=>n-fp3i&?ZS?%s0${l8w^zk5IaU0&X~Z}W?-&hI||t={bKj_*J3
zsRQGPk!dH>+qeIoPp^ObdH(xlFQ5LstG+)j?%${L|L;Dx|63FFt1L0V7Fgahc)I$z
JtaD0e0st|7q}%`i

diff --git 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
index ef5069632f920174b3b41b8f21b0507109ba1ac4..30690aeb2e0b97edc50e37b3c96d40bab918d479 100644
GIT binary patch
literal 1650
zcmeAS@N?(olHy`uVBq!ia0y~yU_1w82XL?fS<inhT?phb76-XIF|0c$^OAvqO~=#4
zF{Fa=?VW>NF|HzP52Cl9HE3c~)%Nv~nJhjdr-n^X<h$O{wf+yhQ?jSMb9Jm?2zN}m
zHnG!F!NvUGgA{e!>+c%Fw7<zL6BC<rJKk*WuF!zc`}XR~jct8)78Y3WT7O8t(`Y>}
z_M+?aX<J-WXN4S?o_FcNIood)nH#@<+qv0zmc~8Fvl?f=hW<%5+3cWdwcSBg>*5+F
z>q~K`iqh{%rvCNHvHjjx^K{#$C$ah$_T0?1-RZD>)00{a9Bd1|)QXAUfB5~|<Pd2e
zQTt|7%-$8(rk76YmAALi+7~=UXUmHnT1J;V&D77NG`b!aO<OWK$8W|-rtUuNGal+U
z=NL?86_X90G0|_6Wuh9lj@3E?<+&-vhkV2$N@5b-tWG{_nW?kk#g0QgC6mr_8b>Bv
zENqp0sWMwQZPS58kGYKD2H*W7bHVRV(ku?8-!YQM&;R8K_$D&9ejC%RXE}>YH@;!&
zGOlhqXCKXY)be&ltj_L+M`z|O_<TOhq41npl=x}A1s0ptU;NoD8Zc*b@3o_wxHZnb
z;k5dn!z%KeBJIb5+TN#ETZ=1Ch<NbkdeolJ@7~%k%iJ~Rhg_duLKxHU>cdwzKe}`0
z)v>dO_1iB$ynObCHY1ZQ>#3sp{9Seb|6RQNbzNP1fPZzhV1~d4-i2&B-ke`V0_NCm
zee1fw(V@^RA<}EX@`gumR_5w6@iKL7W;`7P)Gm_lp9|6vFo!o{n$Qc)1s2s=x4Rvh
z8y@8x*fhn#pYiC;;M;L5QY<3r%+r>#RB>sXn|JG*(glSD7SbDZR4)WO6n?w1O}vo}
zsIVbbvvD5K<mKD;a+q*voEv0Lc(8~mwPK-#epjk&V;@thL|uevdSuz1%V8`WF%A!=
z7QWwH2nx!^t<wY)E_g1OQdCq^^Zw+co15?Z-P=+0^?Ty1d+)bw&*c!Xh=1_q<Ke~O
z*Dt64e_r$D!E$S0<b>uIo)<TEeo!wi(Y|~2p_rU+n&y0b%g-JF#u5vMfPw(`4;9sK
zhTaVfK)x1Z@8(Aa3JxI7#)e~(zh|g|*;5;iMHWg3fFv3t93J=7o)H4Gy&N8|vETuk
z;?Urrv!L*pT^c8tt-7EvOok0)yn}++1&d_)&0zKdp$it;e9TaLGv;jUj|8&=I5Xym
zwljhq)WK?U?#6K)Fna}y$+@n>V3%<mVUkLJlRORNN{$d9`)DHAWh_aIy~e}E`HdT=
zJbeDD6A};#8$uKA8Xq^BY8{<!s{-+?R%7Y;7@PWkulv`>SAM=_z`K2QBqTT;9>_Nq
z?)d#;`eOZ4&rTj(dzjyU`r+%VH=egO*N6j0$^nBpeccZqw;y-Ezs~Sq-W=(frOb2v
zPKRGMiM?m@*$W)XWxl}V6?E+7WZ%Pg?)<m!EjHd*x3~25-t5y)=ga%1{z@?2W666s
zdUgKGec#@j{__KC3gVvf@aQT@yV$!A556)!^Iojm`@W3){pzB7bN?|FOXqRS*c1~1
QtV9?*UHx3vIVCg!02E@dxc~qF

literal 1565
zcmeAS@N?(olHy`uVBq!ia0y~yU_1w82XL?fS<inhT?phb76-XIF|0c$^OAvq^}45v
zV@L(#+q;H&vY{eu56aaiPFNG6Dd4n7!SE!TQa+Q^2R@IJYB#uVIyNwgH5N|1c2JF#
z_Y~8F3GL?7lw6hbCLSyQS8gZueDB7R|G)p*%{kJyz}BkL>^;{XW6>Rt--^b5xiIV6
z3O8rgnwM>2*L!WZR)0UY%b)*+<7ex|%vr@dyXqxnBNj^8ZgDbQbupyT==IVw?|Xvw
z3)!2L&s=|pzt!_^P3tnV>nGP<;PZKPo69$M-Q?(nvNNu17oBx0Mt!@JwZY1KZIi7#
z{oZZc6aVzMo@{e-<?r*WyPsLRvInOxl%FpfkbZadjk&S2_OPEi^Lowfh?!JpUT$98
ze!Oy{Y8>~L*xet>8?I@^3E${w*t&C~(h-FXVg_@v1=n-txEv_RTf$+;v4)lBdDM|?
zCTT%~IntU=JWSb)hj)s7oOQsBh3C0jmq7D@r~?J-T=%GL5Clq4YDDA8t>3bgBabLJ
zJg{Z_Up@P~!JkP7!dPyZ*zT7-r+UHW{M#odUw-}f_<1y^276-`)9HY?{dV;m@7%6;
zUJ>>CowV`;X(z)_&M4ml1!38DYLi)b(tSdk!h{XxT$L)nFTr?NGI;8Ot3c7M$L^ZD
z9Vj>!qMBjKcsO!x;rCvk2Zw`Jp^UYAjpj_1D!(q%nE9(N>+%;H^^HqdvN&Sm|9yL0
z^7q#t*V|jWrNYa+nQn_$6nyzm;d%3(Ywe#WUvB?=_N={peXWYagFM!6_2+7ezyA93
z@!#V;bMDB^wb}jm=-p!lQjAP290DgqKAgRE=H3!DhX#g5M<%i73KhqN6dW2HmNgum
zd2{v^pb`ZGj{}cnSl&lK)NimbuAV%L0jQgeGh$Bj16l6|AZI3%SbAE1kT6i|0R_hH
zVu3x$oB|3C3c&{+oq6M%1=1>^l2FLkRIUTEH-#%=&dj}@z96m5EIQ{LKlG`BT;Rjl
zZM@lhB}i++godM*9QQVYTrfd1p)l>6nkh&tkI)7S_Jh{bKrS$1)j2mz9RK_1&3k-S
zx53_ZQ1Dr>cW%_}zcSOJVn9KsVBnH)bLQp0FE783%Fb_7DbN6ggaC(NMA_4~=VCsc
z`+Uc5pGB?Z`)BK&KXrS8LY3v6&w{tN{KM<#%zr!mdCl+X&C}vz;{X0T3o0{CAGY>>
zqyRQ~Lt<m9y58=>n-fp3i&?ZS?%s0${l8w^zk5IaU0&X~Z}W?-&hI||t={bKj_*J3
zsRQGPk!dH>+qeIoPp^ObdH(xlFQ5LstG+)j?%${L|L;Dx|63FFt1L0V7Fgahc)I$z
JtaD0e0st|7q}%`i

diff --git 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
index 2f6e0b2f98..9bdf15b612 100644
--- 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
@@ -53,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>
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 88810c7950..f66ced6bbf 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
@@ -54,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>

From a344cd18c30118e92b8bbcbf5532e786492f0f76 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Thu, 17 Sep 2020 14:56:32 +0800
Subject: [PATCH 2/3] =?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

---
 .idea/misc.xml                                |   2 +-
 .../media/widget/AnimCircleImageView.java     |  28 ++++++++++++++----
 .../module/media/window/MediaWindow2.java     |   2 +-
 .../module_media_default_music_img.png        | Bin 2803 -> 2840 bytes
 .../src/main/res/values-xhdpi/dimens.xml      |   2 +-
 .../src/main/res/values/dimens.xml            |   2 +-
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
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 6a0a8daab1..ed1e5019be 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
@@ -17,9 +17,11 @@ import android.util.Log;
 import android.widget.ImageView;
 
 import com.mogo.module.common.utils.CarSeries;
+import com.mogo.skin.support.IMogoSkinCompatSupportable;
+import com.mogo.skin.support.helper.MogoSkinCompatImageHelperDelegate;
 
 @SuppressLint("AppCompatCustomView")
-public class AnimCircleImageView extends ImageView {
+public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSupportable {
     Drawable mDrawbleSrc;
     Context context;
     Bitmap mBitmapOut;
@@ -29,6 +31,8 @@ public class AnimCircleImageView extends ImageView {
     int diameter;
     int radius;
 
+    MogoSkinCompatImageHelperDelegate imageHelper;
+
     int currentDegree;
     int savedDegree;
     boolean isRotateEnable;
@@ -47,6 +51,7 @@ public class AnimCircleImageView extends ImageView {
 
     public AnimCircleImageView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        imageHelper = new MogoSkinCompatImageHelperDelegate(this);
         this.context = context;
         init();
     }
@@ -76,6 +81,7 @@ public class AnimCircleImageView extends ImageView {
     @Override
     public void setImageResource(int resId) {
         super.setImageResource(resId);
+        imageHelper.setImageResource(resId);
         mDrawbleSrc = getDrawable();
         output = null;
     }
@@ -108,14 +114,17 @@ public class AnimCircleImageView extends ImageView {
     protected void onDraw(Canvas canvas) {
         Log.d("AnimCircle", "onDraw====");
         try {
-            if (mDrawbleSrc == null)
+            if (mDrawbleSrc == null) {
                 return;
+            }
 
-            if (getWidth() == 0 || getHeight() == 0)
+            if (getWidth() == 0 || getHeight() == 0) {
                 return;
+            }
 
-            if (mDrawbleSrc.getClass() == NinePatchDrawable.class)
+            if (mDrawbleSrc.getClass() == NinePatchDrawable.class) {
                 return;
+            }
 
             if (output == null) {
                 defaultHeight = getHeight();
@@ -185,10 +194,12 @@ public class AnimCircleImageView extends ImageView {
         x = mBitmapScaled.getWidth() / 2 - radius;
         y = mBitmapScaled.getHeight() / 2 - radius;
 
-        if (x < 0)
+        if (x < 0) {
             x = 0;
-        if (y < 0)
+        }
+        if (y < 0) {
             y = 0;
+        }
         Bitmap mBitmapCropped = Bitmap.createBitmap(mBitmapScaled, x, y, diameter, diameter);
         return mBitmapCropped;
     }
@@ -200,5 +211,10 @@ public class AnimCircleImageView extends ImageView {
     public void setDelayMilliseconds(int delayMilliseconds) {
         this.delayMilliseconds = delayMilliseconds;
     }
+
+    @Override
+    public void applySkin() {
+        imageHelper.applySkin();
+    }
 }
 
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 be8aba16ba..6601cca455 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
@@ -202,7 +202,7 @@ public class MediaWindow2 implements IMusicView {
                 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);
+//                GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mCircleImg);
             }else{
                 mCircleImg.setImageResource(R.drawable.module_media_default_music_img);
             }
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png
index 4aab1a19b36fe0955b2a16d0cda1163263bbd62a..df81e5d06d441c4f0e6548e2bc83dbc9f330d1ea 100644
GIT binary patch
delta 2833
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

delta 2795
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

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 99b57ab445..28189f70a7 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_media_music_state_location">881px</dimen>
+    <dimen name="module_media_music_state_location">872px</dimen>
     <dimen name="module_media_music_state_location_x">1067px</dimen>
 
     <!-- lcc start-->
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 5c97bf7ec3..7514da155f 100644
--- a/modules/mogo-module-media/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-media/src/main/res/values/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_media_music_state_location">470px</dimen>
+    <dimen name="module_media_music_state_location">462px</dimen>
     <dimen name="module_media_music_state_location_x">573px</dimen>
 
     <!-- lcc start-->

From bef9079fe973d590e4fd019f83e0c9ce36115e92 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 17 Sep 2020 15:02:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawable-xhdpi/v2x_panel_close_light.png  | Bin 1878 -> 1586 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png

diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_close_light.png
old mode 100644
new mode 100755
index c18352b4fa6ac1c012efed7e517951ef46fc75ce..cbf14c556646e009b3c83522c9f93ef7580e0857
GIT binary patch
literal 1586
zcmaJ=3ow*x7~Un9C~|k)@3|~uTXHWEOV*OI(b-n!xFo7|4doKerZx^G>NqKvM1>^e
zva2Pv9BYkBYgy}FIfyo^)^ffxJG0ZwnK|#w|NhVOKF|BiKl9Fi9gXtXEu|&}fk1X6
zJ>C4l8~yJiDGGWEP2>Rt0_CBP2Dk&dy}g~5mIiutbv21Z>g($p8X96UnE=q~bO0tN
zCkF=y84Sk!{JelpPfr6dJ3Bi*KF(sXrlzI<1;dGniP6zfHk%D5Kmrt~Kmrqh1ys<1
zDyaXVKmv<k9fSZgpn?Jv6u<%?=zt15fC|k32vwn3Fcd}!w*(2mCX|F2Oaxe%EHM8}
z1zSJ&pOb}ALhxS|NN_kDfj~GoIJmgDAdyHfFE4LzZ!{Y1=jVsTVsSWJXlQ6uR8(|y
zG#-zSjg3u8O3Kd8CK8Fcxw*x~#g866Dl02{@!~~eV<VYNe)HxHg+h7%{ymjS?eFgg
zM+BE085sem1m6kiywm~CpB?9qItGD?h=}eG6PJ*Zmf0hxsHmi>rlFy!t*5VVXk=mr
zGq<p^-jA?xbaM4XdZEyMn3Jclr$f$!{uUk)iI0s>Oi8_(ef=hpSa7HC-o5)JrDavs
zHP377>R&arbdWo{-uArfqYVs?FvghU6I0VO3rou@Usl(?a=v|A=W;i`^ENm6{H?8M
zxz8{NL^K5Hb|?TtdBzA2RPfs)&Q`xC2Njbp<)9VwSSd;YLFFD#Y;@u(+%v^7Iq95A
zJ<a)WFIV||AET6}Htob_+EiWB(m?{{orrwS*|Fqn9iLvF9@31jh?KI`bCk7Slt?eJ
zI*!fLSwbDTA(NN-jyu)+y^xq*cGN_F<3g_K<8(8)k5tfd!qkodx4=1{Ij1G@v0at;
z*e0)dvi@$Y28*A-R*7#uY}uy0aYSK-oMI!j2`?cg)Ak<n43n;#^esxfbBdQn@_VS&
zXTV4y@pT->jG5m@WzGzqZwS7f*<AGpX3=M_e3r%{zcl!%#LQM9PM6?YHn(M~3zekX
z;wlui;;4N*{%r%Du41xvq+<l4<h;Io25wv(UcSa2MtsN|rg3c&X&9OXw<!Tt2c_WK
zxqE^Q7J7G4V4A^Bt(f-YR~NFb*C+2&s9Co90Sn4eA?>2s)afcE*J;(nSf8VRwCeqk
z=gjAyh14ut!|1bCiyxy_4GkdXf101X5q5q{+urE+yd9~^8kRvhwk)V~c~+iYslpS-
z2%~cGs;<MPvacm0MNKc>qKZDd$$^x3&Owv%b=kW3WVXkFT4`myCW(wJUbDk~KEKFi
zTpeXh$MXr7I`;L^LQ(sQQY*L-T|I7pQ9_rT*70}azN{YTUa=^@MZLe>?rFF#zm`dL
zz%40aSn~Nt7N8{<6hXus`#gxYpuVc8S#XHJR6Q{sUMt(sOw7~`3{RIbi(x#qEojcX
zQe$^I;}RymCxNfljW|c}Px~wuGF%|W<db#!`Q6tH)MI3{>(}US*X((Y_7m8Xhue{|
zqD7XBiOTgKF*9&OCDqV2nu+0>vx9mk;g?7<?5k!gQoc4YMqJ6>gdBHcCC7AU8`na)
zlv^6%s}lJwy3kY&7Jiv%L*O{KG#s>SH1<^pW9kkNzJwk7n<F{>IQwdMLaQpH!L|Kt
zG2huc<KPO>Y-A@@>19>TudCSO`Gwm&<3hX7mF}xctO)-DKQ23)UioTwvqAsUZ8(Z_
zrFSASxpIs6lILv@9c=r$Ak4)l@!^U??{rX0e=f|9Hj=cl7!q**De<E6K-=A(6C6e>
z$+*BNYdfvew!XZjcRw?Y(~(jvH+|I2WB!whs@mqP*0A@6EMoT91HCgdAHm-bLAs;d
Jp1a~Q{{g0lkD>qo

literal 1878
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
QLjV8(07*qoM6N<$f<WzHRR910