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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
董宏宇
2021-02-23 14:46:57 +08:00
parent 2b0bc7ceab 219c258b21
commit d42e19bf82
7 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/mogo-realtime/src/main/java/com/mogo/realtime/entity/CloudRoadData.java
View File

@@ -32,6 +32,7 @@ public class CloudRoadData implements Parcelable {
private double heading;
private long systemTime;
private long satelliteTime;
/**
* 红绿灯状态 1红 2绿 3黄
@@ -166,6 +167,14 @@ public class CloudRoadData implements Parcelable {
this.fromType = fromType;
}
public long getSatelliteTime() {
return satelliteTime;
}
public void setSatelliteTime( long satelliteTime ) {
this.satelliteTime = satelliteTime;
}
public CloudRoadData() {
}
@@ -185,6 +194,7 @@ public class CloudRoadData implements Parcelable {
dest.writeDouble( this.speed );
dest.writeDouble( this.heading );
dest.writeLong( this.systemTime );
dest.writeLong( this.satelliteTime );
dest.writeInt( this.lightStatus );
dest.writeInt( this.lightLeftTime );
dest.writeString( this.rtmpUrl );
@@ -202,6 +212,7 @@ public class CloudRoadData implements Parcelable {
this.speed = in.readDouble();
this.heading = in.readDouble();
this.systemTime = in.readLong();
this.satelliteTime = in.readLong();
this.lightStatus = in.readInt();
this.lightLeftTime = in.readInt();
this.rtmpUrl = in.readString();

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

@@ -3,11 +3,13 @@ package com.mogo.realtime.socket;
import android.content.Context;
import android.os.SystemClock;
import com.mogo.cloud.GsonUtil;
import com.mogo.cloud.passport.MoGoAiCloudClient;
import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener;
import com.mogo.cloud.socket.MsgBody;
import com.mogo.cloud.socket.SocketManager;
import com.mogo.cloud.socket.WebSocketData;
import com.mogo.cloud.utils.logger.Logger;
import com.mogo.realtime.core.SimpleLocationCorrectStrategy;
import com.mogo.realtime.entity.ADASRecognizedResult;
import com.mogo.realtime.entity.CloudLocationInfo;
@@ -16,8 +18,6 @@ import com.mogo.realtime.entity.MogoSnapshotSetData;
import com.mogo.realtime.entity.OnePerSecondSendContent;
import com.mogo.realtime.spi.RealTimeProviderImp;
import com.mogo.realtime.util.MortonCode;
import com.mogo.cloud.GsonUtil;
import com.mogo.cloud.utils.logger.Logger;
import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
import java.util.ArrayList;
@@ -89,13 +89,12 @@ 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;
}
@Override
public void onMsgReceived(WebSocketData webSocketData) {
int msgType = webSocketData.getMsgType();
public void onMsgReceived(int msgType, WebSocketData webSocketData) {
if (msgType == MSG_TYPE_ACK.getMsgType()) {
if (webSocketData.getUtcTime() > 0) {
serverTime = webSocketData.getUtcTime();