From c5033d05ddcedc3a924127d259aa5b64c4b00f65 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 17 Sep 2020 14:49:38 +0800 Subject: [PATCH] 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 { +public class TanluSlideAdapterNew extends RecyclerView.Adapter implements IMogoADASControlStatusChangedListener { private List markerExploreWayList = new ArrayList<>(); private static final String TAG = "TanluSlideAdapterNew"; private Context mContext; @@ -74,6 +80,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter 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 "); + 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 @@ + + + + + + \ 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 @@ #5E6079 #3F4057 #555A75 + #F5F5F5 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?fSNF|HzP52Cl9HE3c~)%Nv~nJhjdr-n^X+c%Fw7} z_M+?aX*5+F z>q~K`iqh{%rvCNHvHjjx^K{#$C$ah$_T0?1-RZD>)00{a9Bd1|)QXAUfB5~|Bv zENqp0sWMwQZPS58kGYKD2H*W7bHVRV(ku?8-!YQM&;R8K_$D&9ejC%RXE}>YH@;!& zGOlhqXCKXY)be<j_L+M`z|O_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} zsIVbbvvD5KuIo)V3%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?)^;{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-~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~Ltn-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?fSNF|HzP52Cl9HE3c~)%Nv~nJhjdr-n^X+c%Fw7} z_M+?aX*5+F z>q~K`iqh{%rvCNHvHjjx^K{#$C$ah$_T0?1-RZD>)00{a9Bd1|)QXAUfB5~|Bv zENqp0sWMwQZPS58kGYKD2H*W7bHVRV(ku?8-!YQM&;R8K_$D&9ejC%RXE}>YH@;!& zGOlhqXCKXY)be<j_L+M`z|O_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} zsIVbbvvD5KuIo)V3%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?)^;{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-~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~Ltn-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 @@ 42px 32px 36px - 28px + 30px 16px 42px 120px 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 @@ 42px 32px 36px - 28px + 30px 31.9px 26px 30px