diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java index ddb089d00c..65ef5770a2 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java @@ -472,7 +472,7 @@ class MogoOCHTaxiModel { /** * 注销到达起始站围栏监听 */ - private void unregisterCarLocationListener() { + public void unregisterCarLocationListener() { if ( mCarLocationChangedListener2 == null ) { return; } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index 0772631a53..52421d08ec 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -250,6 +250,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i .getApis() .getRegisterCenterApi() .unregisterCarLocationChangedListener( TAG, this ); + MogoOCHTaxiModel.getInstance().unregisterCarLocationListener(); mLocation = null; } diff --git a/foudations/mogo-aicloud-services-apk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java b/foudations/mogo-aicloud-services-apk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java index 5beeac81cb..0a8c165e06 100644 --- a/foudations/mogo-aicloud-services-apk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java +++ b/foudations/mogo-aicloud-services-apk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java @@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; @Keep public class MogoAiCloudSocketManager implements IMogoSocketManager { - private static final String TAG = "SocketManager-apk"; + private static final String TAG = "MogoAiCloudSocketManager-apk"; private static volatile MogoAiCloudSocketManager sInstance; private String mAppId; diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java index 5beeac81cb..84327184c8 100644 --- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java +++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java @@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; @Keep public class MogoAiCloudSocketManager implements IMogoSocketManager { - private static final String TAG = "SocketManager-apk"; + private static final String TAG = "MogoAiCloudSocketManager-sdk"; private static volatile MogoAiCloudSocketManager sInstance; private String mAppId; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 98272ec65f..d8ef1cb730 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -976,6 +976,11 @@ public class MogoServices implements IMogoMapListener, } catch ( Exception e ) { e.printStackTrace(); } + try { + data.putOpt( "satelliteTime", Long.valueOf( stateInfo.getValues().getSatelliteTime() ) ); + } catch ( Exception e ) { + e.printStackTrace(); + } try { data.putOpt( "receiverDataTime", Long.valueOf( stateInfo.getValues().getReceiverDataTime() ) ); } catch ( Exception e ) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotLocationController.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotLocationController.java index e7670fd577..fdbcb1a7eb 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotLocationController.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/uploadintime/SnapshotLocationController.java @@ -81,12 +81,8 @@ class SnapshotLocationController { double acceleration = data.optDouble( "acceleration", -1 ); double yawRate = data.optDouble( "yawRate", -1 ); double speed = data.optDouble( "speed", -1 ); - long satelliteTime = 0L; - try { - satelliteTime = Long.valueOf( data.optString( "satelliteTime" ) ); - } catch ( Exception e ) { - e.printStackTrace(); - } + long satelliteTime = data.optLong( "satelliteTime" ); + long systemTime = data.optLong( "systemTime" ); CloudLocationInfo cloudLocationInfo = new CloudLocationInfo(); cloudLocationInfo.setAlt( alt ); @@ -95,7 +91,7 @@ class SnapshotLocationController { cloudLocationInfo.setLon( lon ); cloudLocationInfo.setSpeed( speed ); cloudLocationInfo.setSatelliteTime( satelliteTime ); - cloudLocationInfo.setSystemTime( System.currentTimeMillis() ); + cloudLocationInfo.setSystemTime( systemTime ); cloudLocationInfo.convertCoor2GCJ02(); mLastLocationInfo = cloudLocationInfo; mMachineCacheList.add( cloudLocationInfo ); 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 661f4c5059..7dbeb7f816 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 @@ -300,6 +300,7 @@ public class MogoADASController implements IMogoADASController { @Override public void notifyOwnerCarState( AdasAIDLOwnerCarStateModel ownerCarStateModel ) { + final long start = System.currentTimeMillis(); ADASCarStateInfo stateInf = new ADASCarStateInfo(); stateInf.setAction( "state" ); ADASCarStateInfo.ValuesBean bean = new ADASCarStateInfo.ValuesBean(); @@ -319,6 +320,7 @@ public class MogoADASController implements IMogoADASController { if ( mMogoAdasCarDataCallback != null ) { mMogoAdasCarDataCallback.onAdasCarDataCallback( stateInf ); } + Logger.i("ADAS-LOC-timer", "cost " + (System.currentTimeMillis() - start) + "ms"); } @Override @@ -333,6 +335,8 @@ public class MogoADASController implements IMogoADASController { public void notifyOwnerCarRect( List< AdasAIDLOwnerCarRectModel > ownerCarStateRectList ) { // 物体识别返回 Logger.d( TAG, "onRectData = %s", ownerCarStateRectList.toString() ); + Logger.d( TAG, "ADAS-REC-received data: size = %s", ownerCarStateRectList==null?0:ownerCarStateRectList.size() ); + final long start = System.currentTimeMillis(); if ( mLastFrameData == null ) { mLastFrameData = new ArrayList<>(); } @@ -348,7 +352,12 @@ public class MogoADASController implements IMogoADASController { if ( !SingletonsHolder.get( IMogoStatusManager.class ).isMainPageLaunched() ) { return; } - handleAdasRecognizedData( ownerCarStateRectList ); + try { + handleAdasRecognizedData( ownerCarStateRectList ); + } catch ( Exception e ) { + e.printStackTrace(); + } + Logger.i("ADAS-REC-timer", "cost " + (System.currentTimeMillis() - start) + "ms"); } }; AutopilotServiceManage.getInstance().registerAutopilotDataListener( mAutopolitDataCallBack ); diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java index a0b4bc1f52..3267279738 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java @@ -63,7 +63,7 @@ public class MogoSocketManager implements IMogoSocketManager { public void init( Context context ) { try { - Class< ? > clazz = Class.forName( "com.mogo.aicloud.services.socket.SocketManager" ); + Class< ? > clazz = Class.forName( "com.mogo.aicloud.services.socket.MogoAiCloudSocketManager" ); Method getInstanceMethod = clazz.getMethod( "getInstance", Context.class ); getInstanceMethod.setAccessible( true ); mDelegate = ( IMogoSocketManager ) getInstanceMethod.invoke( null, context );