diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketData.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketData.java index f86afcf64e..098b700382 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketData.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketData.java @@ -2,7 +2,7 @@ package com.mogo.base.websocket; import java.io.Serializable; -public class WebSocketData implements Serializable { +public class WebSocketData implements Serializable { private long seq; @@ -10,7 +10,7 @@ public class WebSocketData implements Serializable { private String sn; - private T t; + private String data; public long getSeq() { return seq; @@ -36,11 +36,11 @@ public class WebSocketData implements Serializable { this.sn = sn; } - public T getT() { - return t; + public String getData() { + return data; } - public void setT(T t) { - this.t = t; + public void setData(String data) { + this.data = data; } } diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java index e83e05a4a3..f8d85e6f04 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java @@ -5,6 +5,7 @@ import android.content.Context; import androidx.annotation.Keep; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.mogo.commons.network.Utils; import com.mogo.service.connection.IMogoMsgAckListener; import com.mogo.service.connection.IMogoOnWebSocketMessageListener; @@ -116,7 +117,8 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin webSocketData.setSeq(System.currentTimeMillis()); webSocketData.setMsgType(listener.getUpLinkType().getMsgType()); webSocketData.setSn(Utils.getSn()); - webSocketData.setT(body); + webSocketData.setData(new Gson().toJson(body)); + Logger.d(TAG,"sendMsg : " + new Gson().toJson(webSocketData)); handlerThread.sendMsg(new Gson().toJson(webSocketData)); } } @@ -145,8 +147,9 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin while (iterator.hasNext()) { IMogoOnWebSocketMessageListener listener = iterator.next(); if (listener != null) { - Logger.d(TAG, "received msgId = " + webSocketData.getSeq() + ", content = " + webSocketData.getT().toString()); - listener.onMsgReceived(webSocketData.getT()); + Logger.d(TAG, "received msgId = " + webSocketData.getSeq() + ", content = " + webSocketData.getData()); + Object receiveObj = GsonUtil.objectFromJson(webSocketData.getData(),listener.target()); + listener.onMsgReceived(receiveObj); } } } diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 31c8e8ebee..56e4020d79 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -55,7 +55,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-online-18' + implementation 'com.zhidaoauto.machine:map:1.0.0-online-19' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java index 30e6993f02..66234c0fdf 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/AdasNoticeHelper.java @@ -249,6 +249,11 @@ public class AdasNoticeHelper implements IMogoAdasWarnMessageCallback, IMogoLoca return WebSocketMsgType.MSG_TYPE_DOWNLINK_CAR_DATA; } + @Override + public Class target() { + return MogoSnapshotSetData.class; + } + @Override public void onMsgReceived(MogoSnapshotSetData obj) { Logger.d(TAG, "收到大而全数据: " + obj); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index d52be7d4d9..757e1044ab 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -146,6 +146,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, return WebSocketMsgType.MSG_TYPE_DOWNLINK_CAR_DATA; } + @Override + public Class target() { + return MogoSnapshotSetData.class; + } + @Override public void onMsgReceived( MogoSnapshotSetData data ) { if ( data == null ) { 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 f1ad2a1afc..317fab173f 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 @@ -50,6 +50,16 @@ public class V2XTestConsoleWindow extends ConstraintLayout { private Button mBtnTriggerParkEvent; private Button mBtnTriggerCallUserInfo; + private Button btnTriggerRearVIPCarTip, + btnTriggerVehicleBrakes, + btnTriggerRearDangerousVehicles, + btnTriggerReverseVehicleRoutePrediction, + btnTriggerVIPLightChange, + btnTriggerObstacleDetour, + btnTriggerPedestrianWarning, + btnTriggerCongestedRouteRecommendation, + btnTriggerDoubleFlash; + public static V2XTestConsoleWindow getInstance(Context context) { if (mV2XTestConsoleWindow == null) { synchronized (V2XTestConsoleWindow.class) { @@ -89,6 +99,17 @@ public class V2XTestConsoleWindow extends ConstraintLayout { mBtnTriggerParkEvent = findViewById(R.id.btnTriggerParkEvent); mBtnTriggerCallUserInfo = findViewById(R.id.btnTriggerCallUserInfo); + btnTriggerRearVIPCarTip = findViewById(R.id.btnTriggerRearVIPCarTip); + btnTriggerVehicleBrakes = findViewById(R.id.btnTriggerVehicleBrakes); + btnTriggerRearDangerousVehicles = findViewById(R.id.btnTriggerRearDangerousVehicles); + btnTriggerReverseVehicleRoutePrediction = findViewById(R.id.btnTriggerReverseVehicleRoutePrediction); + btnTriggerVIPLightChange = findViewById(R.id.btnTriggerVIPLightChange); + btnTriggerObstacleDetour = findViewById(R.id.btnTriggerObstacleDetour); + btnTriggerPedestrianWarning = findViewById(R.id.btnTriggerPedestrianWarning); + btnTriggerCongestedRouteRecommendation = findViewById(R.id.btnTriggerCongestedRouteRecommendation); + btnTriggerDoubleFlash = findViewById(R.id.btnTriggerDoubleFlash); + + mBtnTriggerCallUserInfo.setOnClickListener(v -> { MogoDriverInfo mogoDriverInfo = new MogoDriverInfo(); mogoDriverInfo.setAge(24); 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 ab57767085..7b52dcf96f 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 @@ -24,9 +24,11 @@ android:id="@+id/btnTriggerOpen" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/dp_10" + android:layout_marginBottom="@dimen/dp_10" + android:background="#FFF" android:padding="@dimen/dp_10" android:text="隐藏测试按钮面板" - android:background="#FFF" android:textColor="#000" android:textSize="@dimen/dp_22" app:layout_constraintBottom_toBottomOf="parent" @@ -36,6 +38,8 @@ android:id="@+id/btnClearRoadEvent" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/dp_10" + android:layout_marginBottom="@dimen/dp_10" android:background="#6BCF23" android:padding="@dimen/dp_10" android:text="清除缓存播报" @@ -44,10 +48,24 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> + +