diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index c711775c99..473a491c0a 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -6,6 +6,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; import android.text.TextUtils; +import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java index 89cb188fba..9496d677b9 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java @@ -66,7 +66,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener>>>mCurretnUuid = " + mCurretnUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid()); - if (mCurretnUuid != null && mCurretnUuid.equals(mCloudRoadData.getUuid())) { + Log.e(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid()); + if (mCurrentUuid != null && mCurrentUuid.equals(mCloudRoadData.getUuid())) { Log.d(TAG, "isLoadVr = " + isLoadVr + "....isLoadNormal = " + isLoadNormal); if (isVrMode) { if (!isLoadVr) { - addVrCameraMarker(mCloudRoadData); isLoadVr = true; isLoadNormal = false; + Log.d(TAG, "addVrCameraMarker1 ------------1-------- "); + addVrCameraMarker(mCloudRoadData); + } else { + Log.e(TAG, "isVrMode not need add marker"); } } else { if (!isLoadNormal) { - addNormalCameraMarker(mCloudRoadData); isLoadNormal = true; isLoadVr = false; + Log.d(TAG, "addNormalCameraMarker1------------2-------- "); + addNormalCameraMarker(mCloudRoadData); + } else { + Log.e(TAG, "isNormalMode not need add marker"); } } } else { + mCurrentUuid = mCloudRoadData.getUuid(); + Log.e(TAG, "mCurrentUuid == null " + "-----isVrMode = " + isVrMode); if (isVrMode) { + Log.d(TAG, "addVrCameraMarker1 ------------11111-------- "); addVrCameraMarker(mCloudRoadData); } else { + Log.d(TAG, "addNormalCameraMarker1 ------------22222-------- "); addNormalCameraMarker(mCloudRoadData); } - mCurretnUuid = mCloudRoadData.getUuid(); } } else { //删除marker - removeCameraMarker(); - -// Log.e(TAG, "onMsgReceived mCloudRoadData == null "); -// UiThreadHandler.postDelayed(() -> { -// -// }, 1_000); + Log.e(TAG, "onMsgReceived mCloudRoadData == null "); + UiThreadHandler.postDelayed(() -> { + removeCameraMarker(); + }, 2_000); } } else { Logger.e(TAG, "onMsgReceived obj == null "); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java index efbc64f845..f9c9b3e85f 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java @@ -1,6 +1,7 @@ package com.mogo.module.main; import android.location.Location; +import android.util.Log; import android.view.MotionEvent; import com.mogo.map.MogoLatLng; @@ -275,13 +276,6 @@ public class EventDispatchCenter implements } } } - if ( ui == EnumMapUI.Type_VR ) { - MogoApisHandler.getInstance().getApis().getStatusManagerApi() - .setVrMode( TAG, true ); - } else { - MogoApisHandler.getInstance().getApis().getStatusManagerApi() - .setVrMode( TAG, false ); - } } @Override 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 6fc36fbb25..07d1a81d12 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 @@ -10,6 +10,7 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.text.TextUtils; +import android.util.Log; import android.view.MotionEvent; import androidx.annotation.NonNull;