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 14:16:34 +08:00
parent a0721705cf
commit c5584d0a54
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,27 +53,45 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
if (mCloudRoadData != null) {
CameraLiveManager.getInstance().init(mCloudRoadData);
} else {
Logger.e(TAG, " mCloudRoadData == null ");
Logger.e(TAG, " onMarkerClicked mCloudRoadData == null ");
}
return false;
}
});
}
public void release() {
MogoApisHandler.getInstance().getApis().getWebSocketManagerApi(mContext).unregisterOnWebSocketMessageListener(this);
mCloudRoadData = null;
}
public void enterVrMode() {
Logger.d(TAG, "进入vr模式===");
isVrMode = true;
//test
// CloudRoadData cloudRoadData = new CloudRoadData();
// cloudRoadData.setRtmpUrl("rtmp://58.200.131.2:1935/livetv/hunantv");
// //shunyi
// cloudRoadData.setLat(40.200583);
// cloudRoadData.setLon(116.738538);
// addVrCameraMarker(cloudRoadData);
}
public void exitVrMode() {
Logger.d(TAG, "退出vr模式===");
isVrMode = false;
//test
// CloudRoadData mCloudRoadData = new CloudRoadData();
// mCloudRoadData.setRtmpUrl("rtmp://58.200.131.2:1935/livetv/hunantv");
// //shunyi
// mCloudRoadData.setLat(40.200583);
// mCloudRoadData.setLon(116.738538);
// addNormalCameraMarker(mCloudRoadData);
}
/**
@@ -143,7 +161,6 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
private volatile boolean isLoadVr = false;
private volatile boolean isLoadNormal = false;
private volatile String mCurrentUuid;
@@ -155,6 +172,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
Logger.d(TAG, "onMsgReceived cameralive : " + obj);
if (obj != null) {
mCloudRoadData = obj.getCamera();
if (mCloudRoadData != null) {
Log.e(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
if (mCurrentUuid != null && mCurrentUuid.equals(mCloudRoadData.getUuid())) {
@@ -181,7 +199,7 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
} else {
mCurrentUuid = mCloudRoadData.getUuid();
Log.e(TAG, "mCurrentUuid == null " + "-----isVrMode = " + isVrMode);
if (isVrMode) {
if (isVrMode) { //TODO
Log.d(TAG, "addVrCameraMarker1 ------------11111-------- ");
addVrCameraMarker(mCloudRoadData);
} else {

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

@@ -123,7 +123,6 @@ public class MogoRTKLocation {
cloudLocationInfo.setSatelliteTime(location.getTime());
cloudLocationInfo.setSystemTime(System.currentTimeMillis());
// Log.e("liyz", "lat = " + location.getLatitude() + ">>>>long = " + location.getLongitude());
cacheList.add(cloudLocationInfo);
} else {
Logger.e(TAG, "location == null");