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

.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>

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();
+    }
 }
 

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);
             }

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

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

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);
 
         //保证滑动单页显示

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) {
+
+    }
 }
 

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>

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>

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>

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>