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

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

Browse Source 
# Conflicts:
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
This commit is contained in:
tongchenfei
2021-03-12 16:12:16 +08:00
parent 0608a0d3f7 ce13957149
commit 100edfcd54
8 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-service/src/main/assets/adas.txt
View File

File diff suppressed because one or more lines are too long

2
modules/mogo-module-service/src/main/assets/loc.txt
View File

File diff suppressed because one or more lines are too long

11
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -972,17 +972,22 @@ public class MogoServices implements IMogoMapListener,
data.putOpt( "acceleration", stateInfo.getValues().getAcceleration() );
data.putOpt( "yawRate", stateInfo.getValues().getYaw_rate() );
try {
data.putOpt( "systemTime", Long.valueOf( stateInfo.getValues().getSystemTime() ) );
data.putOpt( "systemTime", Long.parseLong( stateInfo.getValues().getSystemTime() ) );
} catch ( Exception e ) {
e.printStackTrace();
}
try {
data.putOpt( "satelliteTime", Long.valueOf( stateInfo.getValues().getSatelliteTime() ) );
data.putOpt( "satelliteTime", Long.parseLong( stateInfo.getValues().getSatelliteTime() ) );
} catch ( Exception e ) {
e.printStackTrace();
}
try {
data.putOpt( "receiverDataTime", Long.valueOf( stateInfo.getValues().getReceiverDataTime() ) );
data.putOpt( "receiverDataTime", Long.parseLong( stateInfo.getValues().getReceiverDataTime() ) );
} catch ( Exception e ) {
e.printStackTrace();
}
try {
data.putOpt( "adasSatelliteTime", Long.parseLong( stateInfo.getValues().getAdasSatelliteTime() ) );
} catch ( Exception e ) {
e.printStackTrace();
}

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java
View File

@@ -161,7 +161,6 @@ public class CarZegoLiveVideoView extends RoundLayout {
Logger.w(TAG, "心跳：关闭直播...");
// 暂停
MoGoAiCloudTrafficLive.stopLive(carLiveInfo.getVideoSn());
MoGoAiCloudTrafficLive.destroyLive();
} catch (Exception e) {
e.printStackTrace();
}