yangyakun921/MoGoAiCloudSdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extends socket interface

Browse Source
This commit is contained in:
zhongchao
2021-02-22 16:19:44 +08:00
parent e30e9cab0e
commit 3748b01fd6
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/gradle.xml generated
View File

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

2
foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java
View File

@@ -63,7 +63,7 @@ public class LiveStreamManagerImpl implements ILiveStreamManager {
new IMogoCloudSocketOnMessageListener<CommandModel>() {
@Override
public Class<CommandModel> target() {
public Class<CommandModel> target(int msgType) {
return CommandModel.class;
}

3
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/IMogoCloudSocketOnMessageListener.java
View File

@@ -7,9 +7,10 @@ public interface IMogoCloudSocketOnMessageListener<T> {
/**
* 获取解析实例对象
* @param msgType 消息类型
* @return class
*/
Class<T> target();
Class<T> target(int msgType);
/**
* 消息接收回调

3
foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java
View File

@@ -83,7 +83,6 @@ public class SocketManager implements IMogoCloudSocketManager, Callback {
.setClient(Platform.getClient(Platform.car))
.setChannelId(SocketServicesConstants.SOCKET_CHANNEL_ID)
.setOpenAnalytics(true)
// TODO 这里先用设备ID,原因是因为后台分配的SN与蘑菇自研车机SN不符合导致在线及推送有问题
.setSn(cloudClientConfig.getThirdPartyDeviceId())
.setToken(cloudClientConfig.getToken())
.setAuthPubKey(cloudClientConfig.getAuthPubKey())
@@ -144,7 +143,7 @@ public class SocketManager implements IMogoCloudSocketManager, Callback {
while (iterator.hasNext()) {
IMogoCloudSocketOnMessageListener listener = iterator.next();
if (object == null) {
object = GsonUtil.objectFromJson(payload.getPayload().toStringUtf8(), listener.target());
object = GsonUtil.objectFromJson(payload.getPayload().toStringUtf8(), listener.target(msgType));
}
if (listener != null) {
Logger.d(TAG, "received msgId = %s, content = %s", msgId, payload.getPayload().toStringUtf8());

18
gradle.properties
View File

@@ -30,20 +30,20 @@ PASSWORD=xintai2018
RELEASE=true
# AI CLOUD 云平台
# 工具类
MOGO_UTILS_VERSION=1.0.28-SNAPSHOT
MOGO_UTILS_VERSION=1.0.30-SNAPSHOT
# 网络请求
MOGO_NETWORK_VERSION=1.0.28-SNAPSHOT
MOGO_NETWORK_VERSION=1.0.30-SNAPSHOT
# 网络DNS
MOGO_HTTPDNS_VERSION=1.0.28-SNAPSHOT
MOGO_HTTPDNS_VERSION=1.0.30-SNAPSHOT
# 鉴权
MOGO_PASSPORT_VERSION=1.0.28-SNAPSHOT
MOGO_PASSPORT_VERSION=1.0.30-SNAPSHOT
# 常链接
MOGO_SOCKET_VERSION=1.0.28-SNAPSHOT
MOGO_SOCKET_VERSION=1.0.30-SNAPSHOT
# 数据采集
MOGO_REALTIME_VERSION=1.0.28-SNAPSHOT
MOGO_REALTIME_VERSION=1.0.30-SNAPSHOT
# 探路，道路事件发布，获取
MOGO_TANLU_VERSION=1.0.28-SNAPSHOT
MOGO_TANLU_VERSION=1.0.30-SNAPSHOT
# 直播推流
MOGO_LIVE_VERSION=1.0.28-SNAPSHOT
MOGO_LIVE_VERSION=1.0.30-SNAPSHOT
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.0.28-SNAPSHOT
MOGO_TRAFFICLIVE_VERSION=1.0.30-SNAPSHOT

2
modules/mogo-realtime/src/main/java/com/mogo/realtime/socket/SocketHandler.java
View File

@@ -89,7 +89,7 @@ public class SocketHandler {
private final IMogoCloudSocketOnMessageListener<WebSocketData> onMessageListener = new IMogoCloudSocketOnMessageListener<WebSocketData>() {
@Override
public Class<WebSocketData> target() {
public Class<WebSocketData> target(int msgType) {
return WebSocketData.class;
}