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

.idea/gradle.xml

@@ -84,6 +84,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

gradle.properties

@@ -138,7 +138,7 @@ HTTPDNS_NOOP_VERSION = 2.0.12
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.2.32
+CARCHATTING_VERSION=2.2.33
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.8
 # websocket

libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java

@@ -359,7 +359,7 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer {
         }
 
         MarkerScaleAnimation animationScale = new MarkerScaleAnimation( fromX, toX );
-        animationScale.setDuration( duration * 1000 );
+        animationScale.setDuration( duration );
 //        animationScale.setFillMode(Animation.FILL_MODE_FORWARDS);
 //        animationScale.setInterpolator(interpolator);
         animationScale.setAnimationListener( new MarkerAnimationListener() {

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

@@ -0,0 +1,23 @@
+package com.mogo.module.common.drawer.marker;
+
+import android.view.View;
+
+import com.mogo.map.marker.IMogoInfoWindowAdapter;
+import com.mogo.map.marker.IMogoMarker;
+
+/**
+ * 简单marker适配器
+ *
+ * @author tongchenfei
+ */
+public class SimpleWindow3DAdapter implements IMogoInfoWindowAdapter {
+
+    public View icon;
+    public SimpleWindow3DAdapter(View icon) {
+        this.icon = icon;
+    }
+    @Override
+    public View getInfoWindow(IMogoMarker marker) {
+        return icon;
+    }
+}

modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java

@@ -48,10 +48,13 @@ public class MogoRTKLocation {
                 if (msg.what == MSG_DATA_CHANGED) {
                     mHandler.sendEmptyMessageDelayed(MSG_DATA_CHANGED, uploadDelay);
                     sendLocationData();
+
+                    Logger.d(TAG,"handleMessage开始发送消息");
                 }
             }
         };
         mHandler.sendEmptyMessage(MSG_DATA_CHANGED);
+        Logger.d(TAG,"构造方法开始发送消息");
     }
 
     public interface RTKLocationListener {

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java

@@ -9,14 +9,11 @@ import com.mogo.map.MogoLatLng;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
-import com.mogo.map.marker.IMogoMarkerIconViewCreator;
-import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.common.drawer.MarkerDrawer;
 import com.mogo.module.common.drawer.marker.IMarkerView;
 import com.mogo.module.common.drawer.marker.MapMarkerAdapter;
-import com.mogo.module.common.drawer.marker.MapMarkerView;
 import com.mogo.module.common.drawer.marker.RoadConditionInfoWindow3DAdapter;
 import com.mogo.module.common.entity.MarkerCardResult;
 import com.mogo.module.common.entity.MarkerExploreWay;
@@ -63,7 +60,6 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
     private static CopyOnWriteArraySet<V2XRoadEventEntity> mV2XRoadEventEntityArrayList = new CopyOnWriteArraySet<>();
     // 上次的道路事件的预警Marker
     private static IMogoMarker mAlarmInfoMarker;
-
     @Override
     public void drawableLastAllPOI() {
         //Logger.w(MODULE_NAME, "V2X---绘制上一次的POI，回调给Launcher底层逻辑让其进行绘制");

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/OptimalSpeedMarker.java

@@ -3,6 +3,9 @@ package com.mogo.module.v2x.scenario.scene.obu;
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
+import com.mogo.module.common.drawer.MarkerDrawer;
+import com.mogo.module.common.drawer.marker.EmptyMarkerView;
+import com.mogo.module.common.drawer.marker.SimpleWindow3DAdapter;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.marker.OptimalSpeedMarkerView;
 import com.mogo.module.v2x.scenario.view.IV2XMarker;
@@ -22,10 +25,23 @@ class OptimalSpeedMarker implements IV2XMarker<MogoLatLng> {
     @Override
     public void drawPOI(MogoLatLng entity) {
         Logger.d(MODULE_NAME, "绘制绿波marker===" + entity);
+
         MogoMarkerOptions optionsRipple = new MogoMarkerOptions()
                 .latitude(entity.getLat())
-                .longitude(entity.getLon()).anchor(0.5f,0.9f).icon( ViewUtils.fromView(new OptimalSpeedMarkerView(V2XServiceManager.getContext())));
-        optimalMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_OPTIMAL_SPEED_MARKER, optionsRipple);
+                .longitude(entity.getLon())
+                .anchor(0.5f, 0.9f)
+                .zIndex(MarkerDrawer.MARKER_Z_INDEX_HIGH);
+        if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+            optionsRipple
+                    .icon(ViewUtils.fromView(new EmptyMarkerView(V2XServiceManager.getContext())));
+            optimalMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_OPTIMAL_SPEED_MARKER, optionsRipple);
+            optimalMarker.setInfoWindowAdapter(new SimpleWindow3DAdapter(new OptimalSpeedMarkerView(V2XServiceManager.getContext())));
+            optimalMarker.showInfoWindow();
+        } else {
+            optionsRipple
+                    .icon(ViewUtils.fromView(new OptimalSpeedMarkerView(V2XServiceManager.getContext())));
+            optimalMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_OPTIMAL_SPEED_MARKER, optionsRipple);
+        }
         if (optimalMarker != null) {
             optimalMarker.setClickable(false);
         }
@@ -33,7 +49,7 @@ class OptimalSpeedMarker implements IV2XMarker<MogoLatLng> {
 
     @Override
     public void clearPOI() {
-        Logger.d(MODULE_NAME,"准备清除绿波marker");
+        Logger.d(MODULE_NAME, "准备清除绿波marker");
         if (optimalMarker != null) {
             Logger.d(MODULE_NAME, "清除绿波marker===" + optimalMarker);
             optimalMarker.remove();