Merge branch 'vr' into dev_merge_shunyi_vr_map

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java

@@ -107,7 +107,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
 
                     if (poitype != null) {
                         ((shareItemViewHolder) holder).caseStyleTextView.setText(EventTypeUtils.getPoiTypeStr(poitype));
-                        ((shareItemViewHolder) holder).caseStyleTextView.setBackgroundResource(EventTypeUtils.getPoiTypeBg(poitype));
+                        ((shareItemViewHolder) holder).caseStyleTextView.setBackgroundResource(EventTypeUtils.getPoiTypeBgForShareItem(poitype));
 
                     }
                     if (address != null) {

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java

@@ -1,5 +1,6 @@
 package com.mogo.module.v2x.adapter.holder;
 
+import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 import android.util.Log;
@@ -9,6 +10,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.MarkerExploreWay;
@@ -33,8 +36,11 @@ import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
 import com.mogo.service.imageloader.MogoImageView;
+import com.mogo.service.impl.imageloader.glide.transform.GlideRoundBitmapTransform;
 import com.mogo.utils.ArrayUtils;
+import com.mogo.utils.BitmapHelper;
 import com.mogo.utils.DateTimeUtils;
+import com.mogo.utils.glide.GlideRoundedCornersTransform;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 
@@ -58,6 +64,7 @@ import static com.mogo.module.v2x.V2XConst.VR_MODE;
  */
 public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
     private static final String TAG = "V2XRoadEventVH";
+    private Context mContext;
     private MogoImageView ivEventImg;
     private MogoImageView ivReportHead;
     private ImageView ivEventPlay;
@@ -144,6 +151,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
                 LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_v2x_event_detail_vr, viewGroup, false) :
                 LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_v2x_event_detail, viewGroup, false)
         );
+        mContext = viewGroup.getContext();
         init(itemView);
         // 设置视图状态监听
         itemView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
@@ -206,8 +214,8 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
                         imgUrl = mNoveltyInfo.getItems().get(0).getUrl();
                     }
                     if (!TextUtils.isEmpty(imgUrl)) {
-                        V2XServiceManager.getImageLoader()
-                                .displayImage(imgUrl, ivEventImg);
+                        Glide.with(mContext).load(imgUrl).apply(RequestOptions.bitmapTransform(
+                                new GlideRoundedCornersTransform(20, GlideRoundedCornersTransform.CornerType.LEFT))).into(ivEventImg);
                     }
                     if (url.contains(".mp4")) {
                         ivEventImg.setOnClickListener(v -> {

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java

@@ -121,6 +121,36 @@ public class EventTypeUtils {
         return strBg;
     }
 
+    /*
+     * VR模式下道路类型影响到分享列表 (VR模式暂时没有事件面板,所以可以删除此方法,公用上边的getPoiTypeBg)
+     * */
+    public static int getPoiTypeBgForShareItem(String poiType) {
+        int strBg;
+        switch (poiType) {
+            case V2XPoiTypeEnum.FOURS_PARKING: // 停车场
+            case V2XPoiTypeEnum.GAS_STATION: // 加油站
+                strBg = R.drawable.bg_v2x_event_type_blue;
+                break;
+            case V2XPoiTypeEnum.FOURS_BLOCK_UP: // 拥堵
+            case V2XPoiTypeEnum.FOURS_LIVING: // 实时路况
+            case V2XPoiTypeEnum.FOURS_NEALY: // 身边
+                strBg = R.drawable.bg_v2x_event_type_orange;
+                break;
+            case V2XPoiTypeEnum.TRAFFIC_CHECK:// 交通检查
+            case V2XPoiTypeEnum.ROAD_CLOSED:// 封路
+            case V2XPoiTypeEnum.FOURS_ROAD_WORK:// 施工
+            case V2XPoiTypeEnum.FOURS_PONDING:// 积水
+            case V2XPoiTypeEnum.FOURS_FOG: // 浓雾
+            case V2XPoiTypeEnum.FOURS_ICE: // 结冰
+            case V2XPoiTypeEnum.FOURS_ACCIDENT: // 事故
+                strBg = R.drawable.bg_v2x_event_type_read;
+                break;
+            default:
+                strBg = R.drawable.bg_v2x_event_type_read;
+                break;
+        }
+        return strBg;
+    }
 
     /**
      * 判断是否是道路预警事件

modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml

@@ -16,7 +16,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:miv_bottomLeftRadius="@dimen/dp_20"
         app:miv_failureHolder="@drawable/v2x_icon_live_logo"
         app:miv_overlayImageId="@drawable/v2x_icon_live_logo"
         app:miv_placeHolder="@drawable/v2x_icon_live_logo"

modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml

@@ -107,6 +107,7 @@
         android:layout_width="@dimen/module_v2x_event_button_size_vr"
         android:layout_height="@dimen/module_v2x_event_button_size_vr"
         android:src="@drawable/selector_nav_btn"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />