From b1e75825316b6f905bddcba829d572a7f9ae7159 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sun, 20 Dec 2020 17:08:32 +0800 Subject: [PATCH] opt --- .../com/zhidao/roadcondition/util/FileUtil.kt | 1 - .../module/common/entity/CloudRoadData.java | 4 + .../live/CameraLiveGSYVideoView.java | 3 +- .../extensions/live/CameraLiveManager.java | 2 +- .../utils/CameraLiveNoticeHelper.java | 91 ++++++------------- 5 files changed, 36 insertions(+), 65 deletions(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt index 5c1c0c90d0..c65b722218 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt @@ -43,7 +43,6 @@ fun deletePicFile(filePath: String?): Boolean { //删除某个目录下所有文件 fun deleteAllFile(file: File?) { //判断文件不为null或文件目录存在 if (file == null || !file.exists()) { - Log.e("liyz", "文件删除失败,请检查文件路径是否正确") return } //取得这个目录下的所有子文件对象 diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java index 6a591d2d9c..61cc4892ad 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudRoadData.java @@ -133,6 +133,10 @@ public class CloudRoadData implements Parcelable { this.coordinates = coordinates; } + public void setUuid(String uuid) { + this.uuid = uuid; + } + public String getUuid() { return uuid; } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java index cec15d71d3..92d3f33e15 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveGSYVideoView.java @@ -28,8 +28,7 @@ import com.tencent.rtmp.ui.TXCloudVideoView; * V2XLiveGSYVideoView */ public class CameraLiveGSYVideoView extends LiveRoundLayout implements IMogoSkinCompatSupportable { - private static final String TAG = "liyz"; - + private static final String TAG = "CameraLiveGSYVideoView"; private TXCloudVideoView mTxcVideoView; private ProgressBar mLoading; private TXLivePlayer mLivePlayer; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java index 60285cc361..ab631fd113 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraLiveManager.java @@ -17,7 +17,7 @@ import com.mogo.utils.logger.Logger; * 路边摄像头直播控制 V2XPushLiveCarScenario */ public class CameraLiveManager extends AbsCameraScenario implements IMogoTopViewStatusListener { - private static final String TAG = "liyz"; + private static final String TAG = "CameraLiveManager"; private static CameraLiveManager mCameraLiveManager; private boolean isShowWindow; 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 9b6b78f872..2374b039fa 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 @@ -3,16 +3,14 @@ package com.mogo.module.extensions.utils; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.text.TextUtils; import android.util.Log; -import android.view.View; import com.mogo.commons.AbsMogoApplication; -import com.mogo.map.marker.IMogoInfoWindowAdapter; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.drawer.marker.RoadConditionInfoWindow3DAdapter; import com.mogo.module.common.entity.CloudRoadData; import com.mogo.module.common.entity.MogoSnapshotSetData; import com.mogo.module.extensions.R; @@ -22,9 +20,7 @@ import com.mogo.module.extensions.live.ExtensionServiceManager; import com.mogo.module.extensions.live.PushDataType; import com.mogo.service.connection.IMogoOnWebSocketMessageListener; import com.mogo.service.connection.WebSocketMsgType; -import com.mogo.service.statusmanager.IMogoStatusChangedListener; -import com.mogo.service.statusmanager.StatusDescriptor; -import com.mogo.utils.UiThreadHandler; +import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; @@ -37,6 +33,8 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid()); - if (mCurrentUuid != null && mCurrentUuid.equals(mCloudRoadData.getUuid())) { - Log.d(TAG, "isLoadVr = " + isLoadVr + "....isLoadNormal = " + isLoadNormal); - if (isVrMode) { - if (!isLoadVr) { - isLoadVr = true; - isLoadNormal = false; - Log.d(TAG, "addVrCameraMarker1 ------------1-------- "); - addVrCameraMarker(mCloudRoadData); - } else { - Log.e(TAG, "isVrMode not need add marker"); - } + Logger.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid()); + if (TextUtils.equals(mCurrentUuid, mCloudRoadData.getUuid())) { + if (isVrMode == isVrModeMarker) { + // do nothing. } else { - if (!isLoadNormal) { - isLoadNormal = true; - isLoadVr = false; - Log.d(TAG, "addNormalCameraMarker1------------2-------- "); - addNormalCameraMarker(mCloudRoadData); + if (isVrMode) { + addVrCameraMarker(mCloudRoadData); + isVrModeMarker = true; } else { - Log.e(TAG, "isNormalMode not need add marker"); + addNormalCameraMarker(mCloudRoadData); + isVrModeMarker = false; } } } else { + Logger.d(TAG, "mCurrentUuid != ----------"); mCurrentUuid = mCloudRoadData.getUuid(); - Log.e(TAG, "mCurrentUuid == null " + "-----isVrMode = " + isVrMode); - if (isVrMode) { //TODO - Log.d(TAG, "addVrCameraMarker1 ------------11111-------- "); + if (isVrMode) { addVrCameraMarker(mCloudRoadData); + isVrModeMarker = true; } else { - Log.d(TAG, "addNormalCameraMarker1 ------------22222-------- "); addNormalCameraMarker(mCloudRoadData); + isVrModeMarker = false; } } } else { //删除marker - Log.e(TAG, "onMsgReceived mCloudRoadData == null "); - UiThreadHandler.postDelayed(() -> { - removeCameraMarker(); - }, 2_000); + Logger.e(TAG, "onMsgReceived mCloudRoadData == null "); + removeCameraMarker(); } } else { Logger.e(TAG, "onMsgReceived obj == null ");