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

opt

Browse Source
This commit is contained in:
lixiaopeng
2020-12-20 12:21:31 +08:00
parent 039143bd87
commit a0721705cf
4 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -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;

44
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
View File

@@ -66,7 +66,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
}
public void enterVrMode() {
Logger.d(TAG, "enterVrMode===");
Logger.d(TAG, "进入vr模式===");
isVrMode = true;
}
@@ -83,7 +83,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
* @param roadData
*/
private void addVrCameraMarker(CloudRoadData roadData) {
Logger.d(TAG, "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon());
Log.d(TAG, "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon());
removeCameraMarker();
MogoMarkerOptions options = new MogoMarkerOptions()
.object(roadData)
@@ -108,7 +108,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
* @param roadData
*/
private void addNormalCameraMarker(CloudRoadData roadData) {
Logger.d(TAG, "addNormalCameraMarker --lat = " + roadData.getLat() + " --lon =" + roadData.getLon());
Log.d(TAG, "addNormalCameraMarker --lat = " + roadData.getLat() + " --lon =" + roadData.getLon());
removeCameraMarker();
MogoMarkerOptions options = new MogoMarkerOptions()
.object(roadData)
@@ -141,13 +141,14 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
return MogoSnapshotSetData.class;
}
private volatile boolean isLoadVr;
private volatile boolean isLoadNormal;
private volatile boolean isLoadVr = false;
private volatile boolean isLoadNormal = false;
private volatile String mCurrentUuid;
private String mCurretnUuid;
/**
* @param obj
* @param obj TODO
*/
@Override
public void onMsgReceived(MogoSnapshotSetData obj) {
@@ -155,38 +156,45 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
if (obj != null) {
mCloudRoadData = obj.getCamera();
if (mCloudRoadData != null) {
Log.e(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>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 ");

8
modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
View File

@@ -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

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

@@ -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;