diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index cbccabe03f..a32f01a3ab 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.2.2' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.2.4' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index 2d5c46bf19..235292d02d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -80,7 +80,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { Message msg = Message.obtain(); msg.what = MSG_SET_POINT; msg.obj = points.get( i ); - mPointSettingHandler.sendMessageDelayed( msg, ( i + 1 ) * 10 ); + mPointSettingHandler.sendMessageDelayed( msg, ( i + 1 ) * 20 ); } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 0744946fd7..98bb603575 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -226,7 +226,7 @@ class BaseDrawer { if ( interval < 45 ) { interval = 45; } - return interval; + return interval - 20; } /** diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/LogWriter.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/LogWriter.java index faea27080a..32a95a38dd 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/LogWriter.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/LogWriter.java @@ -44,11 +44,30 @@ class LogWriter { super.handleMessage( msg ); if ( msg.what == 100 ) { writeImpl( msg.obj ); + } else if ( msg.what == 101 ) { + writeImpl( msg.obj, msg.arg1 ); } } }; } + private void writeImpl( Object log, int time ) { + try { + FileWriter fw = new FileWriter( path, true ); + fw.append( time + " - " ); + if ( log instanceof CharSequence ) { + fw.append( ( ( CharSequence ) log ) ); + } else { + fw.append( GsonUtil.jsonFromObject( log ) ); + } + fw.append( "\n" ); + fw.flush(); + fw.close(); + } catch ( Exception e ) { + e.printStackTrace(); + } + } + private void writeImpl( Object log ) { try { FileWriter fw = new FileWriter( path, true ); @@ -72,4 +91,12 @@ class LogWriter { msg.what = 100; writeHandler.sendMessage( msg ); } + + public void write( Object log, long recTime ) { + Message msg = Message.obtain(); + msg.obj = log; + msg.what = 101; + msg.arg1 = ( int ) ( System.currentTimeMillis() - recTime ); + writeHandler.sendMessage( msg ); + } } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 139a85d722..22feafbf62 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -326,11 +326,23 @@ public class MogoADASController implements IMogoADASController { } } + private LogWriter locLogWriter; + @Override @Deprecated public void ownerCarStateInfo( String ownerCarStateInfo ) { + if ( locLogWriter == null ) { + SimpleDateFormat sdf = new SimpleDateFormat( "yyyyMMddhhmmss" ); + String date = sdf.format( new Date() ); + String path = context.getExternalCacheDir().getAbsolutePath() + "/adaslog/" + date + "/loc.txt"; + Logger.d( TAG, path ); + locLogWriter = new LogWriter( path ); + } + final long start = System.currentTimeMillis(); ADASCarStateInfo stateInfo = GsonUtil.objectFromJson( ownerCarStateInfo, ADASCarStateInfo.class ); + long cost = System.currentTimeMillis() - start; + locLogWriter.write( ownerCarStateInfo, Long.valueOf( stateInfo.getValues().getReceiverDataTime() ) - cost ); if ( stateInfo == null || stateInfo.getValues() == null ) { return; }