diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 83405b8de1..4ff10f68a5 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -91,6 +91,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 97b9126cee..74aa6f6b47 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/PushRoadConditionDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/PushRoadConditionDrawer.java
index a281288538..644c8bf7bb 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/PushRoadConditionDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/PushRoadConditionDrawer.java
@@ -1,17 +1,6 @@
package com.mogo.module.common.drawer;
-import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
-import com.mogo.map.marker.IMogoMarker;
-import com.mogo.map.marker.MogoMarkerOptions;
import com.mogo.map.overlay.IMogoPolyline;
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.constants.DataTypes;
-import com.mogo.module.common.drawer.marker.MapVrMarkerView;
-import com.mogo.module.common.entity.V2XPushMessageEntity;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* @author donghongyu
@@ -20,11 +9,10 @@ import java.util.List;
*/
public class PushRoadConditionDrawer {
- private static final String TAG = "OnlineCarDrawer";
+ private static final String TAG = "PushRoadConditionDrawer";
private static volatile PushRoadConditionDrawer sInstance;
private static IMogoPolyline mMogoPolyline;
- private static IMogoMarker mMogoMarker;
private PushRoadConditionDrawer() {
}
@@ -41,57 +29,11 @@ public class PushRoadConditionDrawer {
}
public synchronized void release() {
- clearMarker();
clearPolyline();
mMogoPolyline = null;
- mMogoMarker = null;
sInstance = null;
}
-
- private Object readResolve() {
- // 阻止反序列化，必须实现 Serializable 接口
- return sInstance;
- }
-
-
- /**
- * 绘制路况事件Marker移动轨迹
- */
- public void drawRoadConditionMarker(V2XPushMessageEntity entity) {
- // 道路事件
- MogoMarkerOptions options = new MogoMarkerOptions()
- .object(entity)
- .latitude(entity.getLat())
- .longitude(entity.getLon());
- options.anchor(0.5f, 0.5f);
-
- options.icon(MapVrMarkerView.getInstance().getBitmap(entity.getSceneId()));
-
- mMogoMarker =
- MogoApisHandler
- .getInstance()
- .getApis()
- .getMapServiceApi()
- .getMarkerManager(AbsMogoApplication.getApp())
- .addMarker(DataTypes.TYPE_MARKER_PUSH_DATA, options);
-
- List points = new ArrayList<>();
-
- for (double[] doubles : entity.getMoveTrack()) {
- points.add(new MogoLatLng(doubles[1], doubles[0]));
- }
-
- mMogoMarker.startSmooth(points, 10);
- }
-
-
- public void clearMarker() {
- if (mMogoMarker != null) {
- mMogoMarker.remove();
- }
- }
-
public void clearPolyline() {
if (mMogoPolyline != null) {
mMogoPolyline.remove();
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPushMessageEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPushMessageEntity.java
index 223e86a268..b6a9fe2ca8 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPushMessageEntity.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XPushMessageEntity.java
@@ -48,8 +48,6 @@ public class V2XPushMessageEntity implements Serializable {
private List polyline;
- private List moveTrack;
-
private List recommendPolyline;
public int getViewType() {
@@ -283,14 +281,6 @@ public class V2XPushMessageEntity implements Serializable {
this.polyline = polyline;
}
- public List getMoveTrack() {
- return moveTrack;
- }
-
- public void setMoveTrack(List moveTrack) {
- this.moveTrack = moveTrack;
- }
-
public List getRecommendPolyline() {
return recommendPolyline;
}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java
index aa18f70f8b..e3541d261b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java
@@ -1,5 +1,7 @@
package com.mogo.module.v2x.scenario.scene.pushVR;
+import android.graphics.Color;
+
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.overlay.IMogoPolyline;
import com.mogo.map.overlay.MogoPolylineOptions;
@@ -39,10 +41,6 @@ public class V2XPushVREventMarker implements IV2XMarker {
if (mMogoPolyline != null) {
mMogoPolyline.remove();
}
-
- // 绘制事件点Marker
- PushRoadConditionDrawer.getInstance().drawRoadConditionMarker(entity);
-
// 绘制引导线
drawablePloyLine(entity);
drawableRecommendPolyline(entity);
@@ -67,7 +65,7 @@ public class V2XPushVREventMarker implements IV2XMarker {
colors.add(0xFFFA8C34);
// 线条粗细，渐变，渐变色值
- options.width(15).useGradient(true).color(0xFF1F7EFF);
+ options.width(300).useGradient(false).color(Color.argb(255, 255, 0, 0));
for (double[] doubles : entity.getPolyline()) {
options.add(doubles[0], doubles[1]);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
index 919831af2b..83a9e3e949 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
@@ -7,7 +7,9 @@ import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;
+import android.widget.CompoundButton;
import android.widget.LinearLayout;
+import android.widget.ToggleButton;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -62,7 +64,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
private Button mBtnTriggerEventUgc;
private Button mBtnTriggerTrafficSearch;
private Button mBtnTriggerRecommendRouteEvent;
- private Button nBtnTriggerVR;
+ private ToggleButton nBtnTriggerVR;
private Button btnTriggerRearVIPCarTip,
btnTriggerVehicleBrakes,
@@ -140,10 +142,11 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
break;
}
- nBtnTriggerVR.setOnClickListener(new OnClickListener() {
+ nBtnTriggerVR.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+
@Override
- public void onClick(View v) {
- V2XServiceManager.getMoGoStatusManager().setVrMode("nBtnTriggerVR", true);
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ V2XServiceManager.getMoGoStatusManager().setVrMode("nBtnTriggerVR", isChecked);
}
});
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
index 2e1d5e64cb..e19d12dce3 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
@@ -20,6 +20,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
+ android:layout_marginBottom="@dimen/dp_10"
android:orientation="horizontal"
app:alignContent="flex_start"
app:alignItems="center"
@@ -30,9 +31,8 @@
-