From fd4059cb81b41ca717fe210479d3e1ad42b997a1 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 22 Mar 2022 19:23:06 +0800 Subject: [PATCH] =?UTF-8?q?[Log]=E6=97=A5=E5=BF=97=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BD=BF=E7=94=A8CallerLogger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../badcase/biz/BadCasePresenter.kt | 10 +++-- .../feedback/FeedbackManager.kt | 16 ++++--- .../feedback/biz/FeedBackView.kt | 2 +- .../feedback/biz/adapter/FeedbackAdapter.kt | 5 ++- .../call/map/CallerVisualAngleManager.kt | 45 ++++++++++--------- .../java/com/mogo/map/AMapViewWrapper.java | 31 ++++++------- 6 files changed, 62 insertions(+), 47 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kt index 2cbff00cc6..6b11098988 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/BadCasePresenter.kt @@ -1,6 +1,9 @@ package com.zhjt.mogo_core_function_devatools.badcase.biz import android.util.Log +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.UploadResult import com.zhjt.mogo_core_function_devatools.badcase.repository.Repository @@ -18,7 +21,7 @@ internal class BadCasePresenter: IBadCasePresenter { try { repository.insert(record) } catch (t: Throwable) { - Log.d(BadCaseManager.TAG, "-- 插入数据失败 -- msg: $t") + CallerLogger.d(BadCaseManager.TAG, "-- 插入数据失败 -- msg: $t") } } @@ -26,7 +29,7 @@ internal class BadCasePresenter: IBadCasePresenter { return try { repository.getAllUnConsumedRecord() ?: emptyList() } catch (t: Throwable) { - Log.d(BadCaseManager.TAG, "-- 获取所有未消费的数据失败 -- msg: $t") + CallerLogger.d("${SceneConstant.M_DEVA}${BadCaseManager.TAG}", "-- 获取所有未消费的数据失败 -- msg: $t") emptyList() } } @@ -35,7 +38,7 @@ internal class BadCasePresenter: IBadCasePresenter { try { repository.deleteRecord(record) } catch (t: Throwable) { - Log.d(BadCaseManager.TAG, "-- 删除某条记录失败 -- msg: $t") + CallerLogger.d("${Companion.M_DEVA}${BadCaseManager.TAG}", "-- 删除某条记录失败 -- msg: $t") } } @@ -46,7 +49,6 @@ internal class BadCasePresenter: IBadCasePresenter { } override suspend fun getLastModified(): Long { - Log.d(BadCaseManager.TAG, " --- 2 ----") return repository.getLastModified() } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt index 7f0a429838..cfae062e4f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/FeedbackManager.kt @@ -13,10 +13,14 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.utilcode.kotlin.* +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.utilcode.util.KeyboardUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.zhjt.mogo_core_function_devatools.R +import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager import com.zhjt.mogo_core_function_devatools.badcase.repository.db.entity.AutoPilotRecord import com.zhjt.mogo_core_function_devatools.badcase.repository.net.api.entity.BadCaseResponse.Reason import com.zhjt.mogo_core_function_devatools.badcase.toRecord @@ -76,7 +80,7 @@ internal object FeedbackManager { super.onAutopilotRecordResult(recordPanel) launch { val newRecord = recordPanel.toRecord() - Log.d(TAG, "-- 收到工控机录制任务回调 -- $recordPanel") + CallerLogger.d("${M_DEVA}${TAG}", "-- 收到工控机录制任务回调 -- $recordPanel") if (newRecord.type == 1 && newRecord.id == taskId) { when(newRecord.stat) { 100, 101 -> { @@ -113,14 +117,14 @@ internal object FeedbackManager { record.setTag(R.id.feed_back_badcase_taskid_tag, taskId) recordBag(1, taskId) launch { - Log.d(TAG, "延时20秒开始....") + CallerLogger.d("${M_DEVA}${TAG}", "延时20秒开始....") delay(20000) //延时20秒 - Log.d(TAG, "延时20秒结束....") + CallerLogger.d("${M_DEVA}${TAG}", "延时20秒结束....") stopRecordBag(1, taskId) }.also { itx -> itx.invokeOnCompletion { if (it is CancellationException) { - Log.d(TAG, "延时任务取消") + CallerLogger.d("${M_DEVA}${TAG}", "延时任务取消") } } record.setTag(R.id.feed_back_badcase_job, itx) @@ -154,12 +158,12 @@ internal object FeedbackManager { } private fun startRecordLog(record: AutoPilotRecord) { - Log.d(TAG, "录制Bag开始, 触发录制全量日志 ...") + CallerLogger.d("${M_DEVA}${TAG}", "录制Bag开始, 触发录制全量日志 ...") CallerDevaToolsManager.startCatchLog(1,record.fileName) } private fun stopRecordLog(newRecord: AutoPilotRecord) { - Log.d(TAG, "录制Bag完成, 触发结束录制全量日志 ...") + CallerLogger.d("${M_DEVA}${TAG}", "录制Bag完成, 触发结束录制全量日志 ...") CallerDevaToolsManager.startCatchLog() } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/FeedBackView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/FeedBackView.kt index cffe0e1c5b..d772dac0a7 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/FeedBackView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/FeedBackView.kt @@ -92,7 +92,7 @@ internal class FeedBackView : ConstraintLayout { val activity = context as? FragmentActivity activity?.also { itx -> itx.softKeyboardHeightChanged { - Log.d(FeedbackManager.TAG, "-- onHeightChanged ---:H -> $it") + CallerLogger.d("${M_DEVA}${FeedbackManager.TAG}", "-- onHeightChanged ---:H -> $it") if (it == 0) { transitionTo(0) } else { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/adapter/FeedbackAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/adapter/FeedbackAdapter.kt index 97f49bf744..4f191769b6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/adapter/FeedbackAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/feedback/biz/adapter/FeedbackAdapter.kt @@ -4,6 +4,9 @@ import android.util.Log import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion import com.zhjt.mogo_core_function_devatools.feedback.FeedbackManager import com.zhjt.mogo_core_function_devatools.feedback.biz.adapter.vh.BadCaseFBViewHolder import com.zhjt.mogo_core_function_devatools.feedback.biz.adapter.vh.base.FeedbackViewHolder @@ -32,7 +35,7 @@ internal class FeedbackAdapter(val onHolderAttached: (holder: Feedb val data = data ?: return super.getItemViewType(position) when(val item = data[position]) { is BadCase -> { - Log.d(FeedbackManager.TAG, "item->$item") + CallerLogger.d("${SceneConstant.M_DEVA}${FeedbackManager.TAG}", "item->$item") return ITEM_TYPE_BAD_CASE } } diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt index 062b25077e..7c93e26c09 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt @@ -3,7 +3,6 @@ package com.mogo.eagle.core.function.call.map import android.os.Handler import android.os.Looper import android.os.SystemClock -import android.util.Log import com.mogo.eagle.core.data.map.MapRoadInfo.StopLine import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager.OnRoadListener @@ -11,6 +10,8 @@ import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Cros import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Default import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.LowSpeed import com.mogo.eagle.core.utilcode.kotlin.safeCancel +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.map.uicontroller.VisualAngleMode import kotlinx.coroutines.* import kotlinx.coroutines.android.asCoroutineDispatcher @@ -170,9 +171,6 @@ object CallerVisualAngleManager { } private val heap by lazy { - /** - * 堆, 大根堆还是小根堆由[Record.compareTo]方法决定 - */ PriorityQueue() } @@ -180,49 +178,53 @@ object CallerVisualAngleManager { fun changeVisualAngle(scene: Scene) { val triggerTime = SystemClock.elapsedRealtime() scope.launch { - Log.d("XXX", "--- 1 -----") + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 1 ---") val displayed = getDisplayed() if (displayed == null) { - Log.d("XXX", "--- 2 -----") + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 2 ---") val top = getTop() //堆顶 if (top != null && top.target.priority > scene.priority) { + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 3 ---") doChangeAngle(top) heap += Record(scene, triggerTime = triggerTime) } else { + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 4 ---") doChangeAngle(Record(scene, triggerTime = triggerTime)) } - Log.d(TAG, "没有正在展示的视角，当前要展示的视角: $scene") } else { - Log.d("XXX", "--- 3 -----") + if (scene.javaClass == displayed.target.javaClass) { - Log.d("XXX", "--- 4 -----") - Log.d(TAG, "同一种场景不需要重复展示") + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 5 ---") defaultDelayJob?.safeCancel() return@launch } if (scene is Default) { - Log.d("XXX", "--- 5 -----") - Log.d(TAG, "恢复到默认视图，之前展示的视图：$displayed") + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 6 ---") defaultDelayJob?.safeCancel() launch { val delay = scene.unit.toMillis(scene.delay) - Log.d(TAG, "默认视图开启延时倒计时, 倒计时时间：${delay} ms.") + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 7 ---") delay(delay) - Log.d(TAG, "默认视图结束倒计时，开始展示...") + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 8 ---") doChangeAngle(Record(scene, triggerTime = triggerTime)) heap -= displayed - }.also { defaultDelayJob = it } + }.also { itx -> + itx.invokeOnCompletion { + if (it is CancellationException) { + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 9 ---") + } + } + defaultDelayJob = itx + } } else { - Log.d("XXX", "--- 6 -----") + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 10 ---") defaultDelayJob?.safeCancel() val delta = triggerTime - displayed.triggerTime if (delta >= MaxDisplayThreshold) { - Log.d("XXX", "--- 6-1 -----") - Log.d(TAG, "场景: $scene 触发展示，满足条件开始展示...") + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 11 ---") doChangeAngle(Record(scene, triggerTime = triggerTime)) } else { - Log.d("XXX", "--- 6-2 -----") - Log.d(TAG, "场景: $scene 触发展示，但是在30s内，丢弃...") + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 12 ---") } } } @@ -232,6 +234,7 @@ object CallerVisualAngleManager { @OptIn(InternalCoroutinesApi::class) private fun doChangeAngle(record: Record) { CallerMapUIServiceManager.getMapUIController()?.also { + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 13 ---") if (record.target !is Default) { record.isDisplay = true synchronized(heap) { @@ -240,8 +243,10 @@ object CallerVisualAngleManager { } val target = record.target if (target is LowSpeed) { + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 14 ---") it.changeMapVisualAngle(record.target.angle, MogoLatLng(target.lat, target.lon)) } else { + CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 15 ---") it.changeMapVisualAngle(record.target.angle, null) } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 78589ef411..54474a3d41 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -175,36 +175,37 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onRoadIdInfo(@androidx.annotation.Nullable String roadId) { - if (!TextUtils.isEmpty(roadId)) { - Log.d(TAG, "-- onRoadIdInfo --RoadId:" + roadId); + + if (roadId != null && !TextUtils.isEmpty(roadId)) { + CallerLogger.INSTANCE.d("${M_DEVA}${TAG}", "onRoadIdInfo::" + roadId); CallerMapRoadListenerManager.INSTANCE.invokeListenersOnRoadIdGet(roadId); + } else { + CallerLogger.INSTANCE.d("${M_DEVA}${TAG}", "onRoadIdInfo::null"); } } @Override public void onStopLineInfo(@androidx.annotation.Nullable StopLine stopLine) { - Log.d(TAG, "-- onStopLineInfo -- 1 --:" + (stopLine != null ? stopLine.toString() : null) + "-> road_id:" + mRoadId); MogoLocation carLoc = CallerMapLocationListenerManager.INSTANCE.getCurrentLocation(); if (stopLine != null && !TextUtils.isEmpty(stopLine.road_id) && stopLine.points != null && stopLine.points.size() > 0) { ArrayList points = stopLine.points; if (carLoc != null) { + CallerLogger.INSTANCE.d("${M_DEVA}${TAG}", "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); MapRoadInfo.StopLine stopInfo = convert(stopLine); LonLatPoint match = new LonLatPoint(); double ret = MapDataApi.INSTANCE.GetDisFromPointToLine(convert(carLoc), points, match, 1); - Log.d(TAG, "-- onStopLineInfo --- ret: "+ ret); - double distanceOfCarToStopLine = -1.0; - if (Double.compare(ret, -1.0) != 0) { - distanceOfCarToStopLine = MapTools.INSTANCE.distance(carLoc.getLatitude(), carLoc.getLongitude(), match.getLatitude(), match.getLongitude()); - stopInfo.setDistanceOfCarToStopLine(distanceOfCarToStopLine); - } else { - LonLatPoint p1 = points.get(0); - LonLatPoint p2 = points.get(points.size() - 1); - distanceOfCarToStopLine = MapDataApi.INSTANCE.getNearstFromPointToSegment(carLoc.getLongitude(), carLoc.getLatitude(), p1.longitude, p1.latitude, p2.longitude, p2.latitude); - stopInfo.setDistanceOfCarToStopLine(distanceOfCarToStopLine); - } - Log.d(TAG, "-- onStopLineInfo --- distance: "+ distanceOfCarToStopLine); + CallerLogger.INSTANCE.d("${M_DEVA}${TAG}", "onStopLineInfo: --- ret: "+ ret); + LonLatPoint p1 = points.get(0); + LonLatPoint p2 = points.get(points.size() - 1); + double distanceOfCarToStopLine = MapDataApi.INSTANCE.getNearstFromPointToSegment(carLoc.getLongitude(), carLoc.getLatitude(), p1.longitude, p1.latitude, p2.longitude, p2.latitude); + stopInfo.setDistanceOfCarToStopLine(distanceOfCarToStopLine); + CallerLogger.INSTANCE.d("${M_DEVA}${TAG}", "onStopLineInfo: --- distance: "+ distanceOfCarToStopLine); CallerMapRoadListenerManager.INSTANCE.invokeListenersOnStopLineGet(stopInfo); } + } else { + if (carLoc != null) { + CallerLogger.INSTANCE.d("${M_DEVA}${TAG}", "onStopLineInfo::null, car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); + } } }