diff --git a/.idea/misc.xml b/.idea/misc.xml index 733acb1920..97b9126cee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/bak/screenrecord b/bak/screenrecord new file mode 100644 index 0000000000..76347d6414 Binary files /dev/null and b/bak/screenrecord differ diff --git a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java index 5e110bb8ea..dd0a5ee740 100644 --- a/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java +++ b/foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java @@ -2,6 +2,7 @@ package com.mogo.base.websocket; import android.content.Context; import android.os.SystemClock; +import android.util.Log; import androidx.annotation.Keep; @@ -197,7 +198,9 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin if (listener != null) { Logger.d(TAG, "received msgId = " + webSocketData.getSeq() + ", content = " + webSocketData.getData()); Object receiveObj = GsonUtil.objectFromJson(webSocketData.getData(),listener.target()); + final long start = System.currentTimeMillis(); listener.onMsgReceived(receiveObj); + Logger.d("WebSocketManager-sdk-timer", "cost " + (System.currentTimeMillis() - start) + "ms"); } } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 64c1533873..b9b182bc4b 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -86,11 +86,17 @@ class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClickListen public void renderSnapshotData( MogoSnapshotSetData data, boolean machineVision ) { if ( mLastReceiveTime != 0 ) { - mAnimationDuration = SystemClock.elapsedRealtime() - mLastReceiveTime; + mAnimationDuration = System.currentTimeMillis() - mLastReceiveTime; + if ( mAnimationDuration > 1000L ) { + mAnimationDuration = 500L; + } } else { mAnimationDuration = 500L; } - mLastReceiveTime = SystemClock.elapsedRealtime(); + mLastReceiveTime = System.currentTimeMillis(); + if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageLaunched() ) { + return; + } if ( data == null || ( ( data.getAllList() == null || data.getAllList().isEmpty() ) && ( data.getNearList() == null || data.getNearList().isEmpty() ) ) ) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 7b2d457dab..7a5e25d61c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -158,12 +158,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, @Override public void onMsgReceived( MogoSnapshotSetData data ) { - if ( data == null ) { - return; - } - if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageLaunched() ) { - return; - } // if ( !MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) { //// return; // }