Merge branch 'dev2_aiSdk' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev2_aiSdk

modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/V2XWarnDataDrawer.java

@@ -83,12 +83,12 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
         WorkThreadHandler.getInstance().postDelayed(() -> {
             IMogoMarker marker = drawMarker(markerShowEntity);
             Log.d("liyz", "renderWarnData  marker != null ");
-            marker.addDynamicAnchorPosition(new MogoLatLng(data.getCollisionLat(), data.getCollisionLon()), (float) data.getHeading(), 4000);
+            marker.addDynamicAnchorPosition(new MogoLatLng(data.getCollisionLat(), data.getCollisionLon()), (float) data.getHeading(), 5000);
 
             //移动完成以后，3s后消失
             UiThreadHandler.postDelayed( () -> {
                 marker.remove();
-            }, 3000 );
+            }, 8000 );
 
         }, 0);
 
@@ -103,7 +103,8 @@ public class V2XWarnDataDrawer extends BaseDrawer implements IMogoStatusChangedL
         IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(mContext, markerShowEntity, options);
         options.icon3DRes(getModelRes(2)); //TODO
 
-        options.anchorColor("#FF4040");
+//        options.anchorColor("#FF4040");
+        options.anchorColor("#FF3036"); //红色
         IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(markerShowEntity.getMarkerType(), options);
         iMarkerView.setMarker(marker);
         marker.setToTop();

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWarningEntity.java

@@ -54,6 +54,7 @@ public class V2XWarningEntity implements Serializable {
     public long satelliteTime;
     //预警蒙层等展示时长
     private long showTime;
+    private float roadwidth;
 
     //自组字段
     //tts播报
@@ -218,6 +219,14 @@ public class V2XWarningEntity implements Serializable {
         return stopLines;
     }
 
+    public float getRoadwidth() {
+        return roadwidth;
+    }
+
+    public void setRoadwidth(float roadwidth) {
+        this.roadwidth = roadwidth;
+    }
+
     @Override
     public String toString() {
         return "V2XWarningEntity{" +
@@ -231,6 +240,7 @@ public class V2XWarningEntity implements Serializable {
                 ", angle=" + angle +
                 ", direction=" + direction +
                 ", speed=" + speed +
+                ", stopLines=" + stopLines +
                 ", stopLineDistance=" + stopLineDistance +
                 ", roadId='" + roadId + '\'' +
                 ", laneId='" + laneId + '\'' +
@@ -241,6 +251,8 @@ public class V2XWarningEntity implements Serializable {
                 ", heading=" + heading +
                 ", systemTime=" + systemTime +
                 ", satelliteTime=" + satelliteTime +
+                ", showTime=" + showTime +
+                ", roadwidth=" + roadwidth +
                 ", tts='" + tts + '\'' +
                 ", carLocation=" + carLocation +
                 '}';