From e2a60783ecf11c7a2eafe9b26bbecb1840fbb0f9 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 15 Jun 2023 18:32:58 +0800 Subject: [PATCH] [3.3.0] reset log tag --- .../mogo/och/bus/fragment/BusFragment.java | 2 +- .../mogo/och/bus/fragment/BusFragment.java | 2 +- .../biz/dispatch/DispatchAutoPilotManager.kt | 63 +++++-------------- .../biz/monitoring/CronTaskManager.kt | 20 +++--- .../biz/notice/NoticeSocketManager.kt | 4 +- .../autopilot/MoGoAutopilotControlProvider.kt | 26 ++++---- .../MoGoAdasMsgConnectStatusListenerImpl.kt | 14 ++--- .../server/AsyncDataToAutopilotServer.kt | 6 +- .../autopilot/telematic/TeleMsgHandler.kt | 4 +- .../datacenter/v2x/TrafficLightDispatcher.kt | 20 +++--- .../binding/BindingCarManager.kt | 15 +++-- .../binding/BindingCarNetWorkManager.kt | 17 +++-- .../scene/SceneManager.kt | 24 ++----- .../upgrade/ObuUpgradeAppNetWorkManager.kt | 18 ++---- .../upgrade/UpgradeAppNetWorkManager.kt | 6 +- .../upgrade/UpgradeManager.kt | 18 +++--- .../core/function/hmi/ui/MoGoHmiProvider.kt | 8 +-- .../hmi/ui/setting/DebugSettingView.kt | 31 +-------- .../main/res/layout/view_debug_setting.xml | 24 ------- .../CallerAutoPilotControlManager.kt | 1 - .../core/utilcode/mogo/TelephoneUtil.java | 12 +--- .../transform/GlideBlurTransformation.java | 4 -- .../core/utilcode/mogo/logger/scene/Scene.kt | 21 +++---- .../mogo/logger/scene/SceneConstant.kt | 13 +--- .../core/utilcode/mogo/sqlite/SQLBaseDao.java | 4 -- .../mogo/sqlite/proxy/BaseDaoProxyLog.kt | 6 -- .../core/utilcode/mogo/toast/TipToast.java | 7 +-- .../eagle/core/utilcode/util/AppUtils.java | 4 -- .../eagle/core/utilcode/util/BusUtils.java | 14 ----- .../eagle/core/utilcode/util/ClickUtils.java | 3 - .../eagle/core/utilcode/util/FileIOUtils.java | 22 +++---- .../com/mogo/commons/module/MogoServices.java | 8 --- .../java/com/mogo/map/AMapViewWrapper.java | 14 ----- 33 files changed, 129 insertions(+), 326 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 422cf97d38..cd80f7b6e0 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -454,7 +454,7 @@ public class BusFragment extends BaseBusTabFragment } //清除鹰眼右下角小地图轨迹 - CallerLogger.INSTANCE.d(SceneConstant.M_MAP, "clearBusStationsMarkers --------->"); + CallerLogger.INSTANCE.d(SceneConstant.M_BUS, "clearBusStationsMarkers --------->"); smallMapView.clearPolyline(); } diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 50263c9d06..2ee9511215 100644 --- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -461,7 +461,7 @@ public class BusFragment extends BaseBusTabFragment } //清除鹰眼右下角小地图轨迹 - CallerLogger.INSTANCE.d(SceneConstant.M_MAP, "clearBusStationsMarkers --------->"); + CallerLogger.INSTANCE.d(SceneConstant.M_BUS, "clearBusStationsMarkers --------->"); smallMapView.clearPolyline(); } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt index a6f95ce746..4305686ca9 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt @@ -3,7 +3,6 @@ package com.mogo.eagle.function.biz.dispatch import android.content.Context import android.os.Handler import android.os.Message -import android.util.Log import com.mogo.aicloud.services.socket.IMogoOnMessageListener import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager import com.mogo.commons.voice.AIAssist @@ -22,6 +21,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager 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_BIZ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.eagle.function.biz.dispatch.network.DispatchServiceModel.Companion.DISPATCH_COMPLETED @@ -116,7 +116,7 @@ class DispatchAutoPilotManager private constructor() : } override fun onMsgReceived(adasAutoPilotLocReceiverBean: DispatchAdasAutoPilotLocReceiverBean?) { - Log.i(TAG,"onMsgReceived 收到云调度长链接") + CallerLogger.i("$M_BIZ$TAG","onMsgReceived 收到云调度长链接, adasAutoPilotLocReceiver:${adasAutoPilotLocReceiverBean?:""}") if (adasAutoPilotLocReceiverBean != null && adasAutoPilotLocReceiverBean.startLat != 0.0 && adasAutoPilotLocReceiverBean.startLon != 0.0) { receiverBean = adasAutoPilotLocReceiverBean val message = Message() @@ -130,41 +130,9 @@ class DispatchAutoPilotManager private constructor() : val mAutoPilotLine = AutopilotControlParameters.AutoPilotLine(it.lineId.toLong(),it.trajUrl,it.trajMd5,it.stopUrl,it.stopMd5,it.timestamp, it.vehicleModel,it.trajUrl_dpqp,it.trajMd5_dpqp,it.stopUrl_dpqp,it.stopMd5_dpqp,it.timestamp_dpqp) CallerAutoPilotControlManager.sendTrajectoryDownloadReq(mAutoPilotLine) - Log.i(TAG,"调用路线下载逻辑") + CallerLogger.i("$M_BIZ$TAG","调用路线下载逻辑") } } - - adasAutoPilotLocReceiverBean?.let { - Log.i(TAG,"taskId="+it.taskId) - Log.i(TAG,"type="+it.type) - Log.i(TAG,"source="+it.source) - Log.i(TAG,"lineName="+it.lineName) - Log.i(TAG,"stopMd5_dpqp="+it.stopMd5_dpqp) - Log.i(TAG,"stopUrl_dpqp="+it.stopUrl_dpqp) - Log.i(TAG,"trajMd5_dpqp="+it.trajMd5_dpqp) - Log.i(TAG,"trajUrl_dpqp="+it.trajUrl_dpqp) - Log.i(TAG,"stopMd5_dpqp="+it.stopMd5_dpqp) - Log.i(TAG,"stopMd5="+it.stopMd5) - Log.i(TAG,"stopUrl="+it.stopUrl) - Log.i(TAG,"trajUrl="+it.trajUrl) - Log.i(TAG,"trajMd5="+it.trajMd5) - Log.i(TAG,"endLocAddress="+it.endLocAddress) - Log.i(TAG,"flightInfo="+it.flightInfo) - Log.i(TAG,"poiId="+it.poiId) - Log.i(TAG,"startLocAddress="+it.startLocAddress) - Log.i(TAG,"taskInfo="+it.taskInfo) - Log.i(TAG,"taskTime="+it.taskTime) - Log.i(TAG,"vehicleModel="+it.vehicleModel) - Log.i(TAG,"endLat="+it.endLat) - Log.i(TAG,"endLon="+it.endLon) - Log.i(TAG,"lineId="+it.lineId) - Log.i(TAG,"startLat="+it.startLat) - Log.i(TAG,"startLon="+it.startLon) - Log.i(TAG,"stopsList="+it.stopsList) - Log.i(TAG,"timestamp="+it.timestamp) - Log.i(TAG,"systemTime="+it.systemTime) - Log.i(TAG,"timestamp_dpqp="+it.timestamp_dpqp) - } } private fun startAutoPilot() { @@ -228,8 +196,7 @@ class DispatchAutoPilotManager private constructor() : currentAutopilot.endLatLon = AutopilotControlParameters.AutoPilotLonLat(it.endLat, it.endLon) currentAutopilot.vehicleType = 10 - CallerLogger.d(SceneConstant.Companion.M_DISPATCH + TAG, "开启自动驾驶====$currentAutopilot") - Log.i(TAG,"开启自动驾驶====$currentAutopilot") + CallerLogger.d(M_BIZ + TAG, "开启自动驾驶====$currentAutopilot") CallerAutoPilotControlManager.startAutoPilot(currentAutopilot) } } @@ -257,7 +224,7 @@ class DispatchAutoPilotManager private constructor() : onSuccess = { //取消自动驾驶 CallerAutoPilotControlManager.cancelAutoPilot() - Log.i(TAG,"stopAffirm 取消自动驾驶") + CallerLogger.i("$M_BIZ$TAG","stopAffirm 取消自动驾驶") }, onError = {}) } } @@ -327,10 +294,9 @@ class DispatchAutoPilotManager private constructor() : } CallerLogger.d( - SceneConstant.Companion.M_DISPATCH + TAG, + SceneConstant.Companion.M_BIZ + TAG, "onArriveAt data : $arrivalNotification" ) - Log.i(TAG,"onArriveAt data : $arrivalNotification") if (arrivalNotification.endLocation == null) { return } @@ -341,12 +307,11 @@ class DispatchAutoPilotManager private constructor() : receiverBean!!.endLon, receiverBean!!.endLat, endLon, endLat ) CallerLogger.d( - SceneConstant.Companion.M_DISPATCH + TAG, + SceneConstant.Companion.M_BIZ + TAG, "onArriveAt cal distance : $distanceFromSelf" ) - Log.i(TAG,"onArriveAt cal distance : $distanceFromSelf") if (distanceFromSelf < 10) { - CallerLogger.d(SceneConstant.Companion.M_DISPATCH + TAG, "onArriveAt end location") + CallerLogger.d(SceneConstant.Companion.M_BIZ + TAG, "onArriveAt end location") isDispatch = false isArriveEnd = true //到站，调度完成 @@ -368,7 +333,7 @@ class DispatchAutoPilotManager private constructor() : */ override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) { if (guardianInfo == null || !guardianInfo.hasCode()) return - Log.i(TAG,"onAutopilotGuardian "+guardianInfo.code) + CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian "+guardianInfo.code) //掉自驾 when(guardianInfo.code){ MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_PLANNING, @@ -394,15 +359,15 @@ class DispatchAutoPilotManager private constructor() : } } if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.code)){ - Log.i(TAG,"onAutopilotGuardian ISYS_INIT_TRAJECTORY_START 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）") + CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian ISYS_INIT_TRAJECTORY_START 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）") }else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.code)){ - Log.i(TAG,"onAutopilotGuardian ISYS_INIT_TRAJECTORY_SUCCESS 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）") + CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian ISYS_INIT_TRAJECTORY_SUCCESS 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）") }else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.code)){ - Log.i(TAG,"onAutopilotGuardian ISYS_INIT_TRAJECTORY_FAILURE 轨迹管理_轨迹下载失败，本地无对应轨迹") + CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian ISYS_INIT_TRAJECTORY_FAILURE 轨迹管理_轨迹下载失败，本地无对应轨迹") }else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.code)){ - Log.i(TAG,"onAutopilotGuardian ISYS_INIT_TRAJECTORY_WARNING 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功") + CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian ISYS_INIT_TRAJECTORY_WARNING 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功") }else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.code)){ - Log.i(TAG,"onAutopilotGuardian ISYS_INIT_TRAJECTORY_TIMEOUT 轨迹管理_轨迹下载超时") + CallerLogger.i("$M_BIZ$TAG","onAutopilotGuardian ISYS_INIT_TRAJECTORY_TIMEOUT 轨迹管理_轨迹下载超时") } } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt index 0ed7b47a6c..421f97626e 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt @@ -11,7 +11,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MONITOR +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BIZ import com.mogo.eagle.function.biz.monitoring.net.ICameraListServices import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -80,16 +80,16 @@ class CronTaskManager { .observeOn(AndroidSchedulers.mainThread()) .subscribe({ cameraList = it -// CallerLogger.d("$M_MONITOR$TAG", "requestDeviceList返回结果为：$it") +// CallerLogger.d("$M_BIZ$TAG", "requestDeviceList返回结果为：$it") }, { it.printStackTrace() CallerLogger.e( - "$M_MONITOR$TAG", + "$M_BIZ$TAG", "requestDeviceList:message is:${it.message}, cause is:${it.cause}" ) }) }?: run { - CallerLogger.e("$M_MONITOR$TAG", "CurrentLocation is null!") + CallerLogger.e("$M_BIZ$TAG", "CurrentLocation is null!") } } @@ -113,10 +113,10 @@ class CronTaskManager { .observeOn(AndroidSchedulers.mainThread()) .subscribe({ carCameraList = it -// CallerLogger.d("$M_MONITOR$TAG", "requestCarCameraList返回结果为：$it") +// CallerLogger.d("$M_BIZ$TAG", "requestCarCameraList返回结果为：$it") }, { CallerLogger.e( - "$M_MONITOR$TAG", + "$M_BIZ$TAG", "message is:${it.message}, cause is:${it.cause}" ) it.printStackTrace() @@ -137,7 +137,7 @@ class CronTaskManager { .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ - CallerLogger.d("$M_MONITOR$TAG", "reqOpenCameraStream返回结果为：$it") + CallerLogger.d("$M_BIZ$TAG", "reqOpenCameraStream返回结果为：$it") if (!it.flvUrl.isNullOrEmpty()) { CallerHmiManager.startRoadCameraLive(it.flvUrl!!) } else { @@ -145,7 +145,7 @@ class CronTaskManager { } }, { CallerLogger.e( - "$M_MONITOR$TAG", + "$M_BIZ$TAG", "reqOpenCameraStream&message is:${it.message}, cause is:${it.cause}" ) CallerHmiManager.showNoSignalView() @@ -174,7 +174,7 @@ class CronTaskManager { .observeOn(AndroidSchedulers.mainThread()) .retryWhen(RetryWithDelay()) .subscribe({ - CallerLogger.d("$M_MONITOR$TAG", "reqOpenCameraStream返回结果为：$it") + CallerLogger.d("$M_BIZ$TAG", "reqOpenCameraStream返回结果为：$it") if (it.code == 200 || it.code == 0) { val flvString = it.flvUrl if (!flvString.isNullOrEmpty()) { @@ -187,7 +187,7 @@ class CronTaskManager { } }, { CallerLogger.e( - "$M_MONITOR$TAG", + "$M_BIZ$TAG", "reqOpenCameraStream&message is:${it.message}, cause is:${it.cause}" ) error(it) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/NoticeSocketManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/NoticeSocketManager.kt index 376e8d1e33..e40142f09c 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/NoticeSocketManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/notice/NoticeSocketManager.kt @@ -59,7 +59,7 @@ internal class NoticeSocketManager { if (obj == null) { return } - d(SceneConstant.M_NOTICE + TAG, "100-- 普通公告数据：" + GsonUtil.jsonFromObject(obj)) + d(SceneConstant.M_BIZ + TAG, "100-- 普通公告数据：" + GsonUtil.jsonFromObject(obj)) val noticeFromCloudMsg = NoticeFrCloudMsg(obj, null, 0) saveMsgBox(MsgBoxBean(MsgBoxType.NOTICE, noticeFromCloudMsg)) } @@ -78,7 +78,7 @@ internal class NoticeSocketManager { if (obj == null) { return } - d(SceneConstant.M_NOTICE + TAG, "301001-- 交警类型公告数据：" + GsonUtil.jsonFromObject(obj)) + d(SceneConstant.M_BIZ + TAG, "301001-- 交警类型公告数据：" + GsonUtil.jsonFromObject(obj)) val noticeFromCloudMsg = NoticeFrCloudMsg(null, obj, 1) saveMsgBox(MsgBoxBean(MsgBoxType.NOTICE, noticeFromCloudMsg)) } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index 2983765cf6..c5db40725d 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -36,7 +36,7 @@ import com.mogo.eagle.core.function.datacenter.autopilot.telematic.TeleMsgHandle import com.mogo.eagle.core.function.call.telematic.CallerTelematicStatusListenerManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_D_C import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.ParseVersionUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils @@ -92,7 +92,7 @@ class MoGoAutopilotControlProvider : get() = TAG override fun init(context: Context) { - CallerLogger.i("$M_ADAS_IMPL$TAG", "初始化工控机连接……") + CallerLogger.i("$M_D_C$TAG", "初始化工控机连接……") mContext = context // 初始化ADAS 域控制器 CupidLogUtils.setEnableLog(false) @@ -159,7 +159,7 @@ class MoGoAutopilotControlProvider : } override fun onChannelDisConnect(channel: Channel?) { - CallerLogger.d("$M_ADAS_IMPL$TAG", "onChannelDisConnect") + CallerLogger.d("$M_D_C$TAG", "onChannelDisConnect") } override fun onReceiveClientSign(channel: Channel?, sn: String?) { @@ -222,7 +222,7 @@ class MoGoAutopilotControlProvider : } }) CallerAutopilotCarConfigListenerManager.addListener(TAG, this) - CallerLogger.i("$M_ADAS_IMPL$TAG", "initServer……") + CallerLogger.i("$M_D_C$TAG", "initServer……") // 同步数据给工控机的服务 AsyncDataToAutopilotServer.INSTANCE.initServer() } @@ -255,7 +255,7 @@ class MoGoAutopilotControlProvider : NSDNettyManager.getInstance() .sendMsgToAllClients(MogoProtocolMsg(NORMAL_DATA, bytes.size, bytes)) } else { - CallerLogger.d("$M_ADAS_IMPL$TAG", "司机端Server未启动！") + CallerLogger.d("$M_D_C$TAG", "司机端Server未启动！") } } @@ -313,12 +313,12 @@ class MoGoAutopilotControlProvider : override fun onMapCollectStart(cmdId: Int, cmdTime: Long) { val result = recordPackage(2, cmdId) - CallerLogger.d("$M_ADAS_IMPL$TAG", "开始记录包: [$cmdId, $result]") + CallerLogger.d("$M_D_C$TAG", "开始记录包: [$cmdId, $result]") } override fun onMapCollectEnd(cmdId: Int, cmdTime: Long) { val result = stopRecord(2, cmdId) - CallerLogger.d("$M_ADAS_IMPL$TAG", "结束记录包: [$cmdId, $result]") + CallerLogger.d("$M_D_C$TAG", "结束记录包: [$cmdId, $result]") } override fun startAutoPilot(controlParameters: AutopilotControlParameters) { @@ -333,7 +333,7 @@ class MoGoAutopilotControlProvider : invokeAutoPilotResult(if (invokeResult) "自动驾驶调用成功" else "自动驾驶调用失败, socket 或者 rawPack 可能为空") } else { invokeAutoPilotResult("车机与工控机链接失败，无法开启自动驾驶") - CallerLogger.e("$M_ADAS_IMPL$TAG", "车机与工控机链接失败，无法开启自动驾驶") + CallerLogger.e("$M_D_C$TAG", "车机与工控机链接失败，无法开启自动驾驶") } } } @@ -346,7 +346,7 @@ class MoGoAutopilotControlProvider : paramIndexes = [0] ) private fun invokeAutoPilotResult(status: String) { - CallerLogger.e("$M_ADAS_IMPL$TAG", status) + CallerLogger.e("$M_D_C$TAG", status) } override fun sendTrafficLightData(trafficLightResult: TrafficLightResult) { @@ -373,7 +373,7 @@ class MoGoAutopilotControlProvider : if (AdasManager.getInstance().ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.CONNECTED) { AdasManager.getInstance().sendAutoPilotModeReq(0, 1, null) } else { - CallerLogger.e("$M_ADAS_IMPL$TAG", "车机与工控机链接失败，无法断开自动驾驶") + CallerLogger.e("$M_D_C$TAG", "车机与工控机链接失败，无法断开自动驾驶") } } @@ -467,7 +467,7 @@ class MoGoAutopilotControlProvider : ) ) } else { - CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态时司机端Server未启动！") + CallerLogger.d("$M_D_C$TAG", "同步美化模式状态时司机端Server未启动！") } } } @@ -490,7 +490,7 @@ class MoGoAutopilotControlProvider : ) ) } else { - CallerLogger.d("$M_ADAS_IMPL$TAG", "同步美化模式状态时司机端Server未启动！") + CallerLogger.d("$M_D_C$TAG", "同步美化模式状态时司机端Server未启动！") } } } @@ -877,7 +877,7 @@ class MoGoAutopilotControlProvider : paramIndexes = [0] ) private fun invokeNettyConnResult(status: String) { - CallerLogger.d("$M_ADAS_IMPL$TAG", status) + CallerLogger.d("$M_D_C$TAG", status) } override fun getTeleTimeStamp(): Long { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index 359c794e57..f23ba9dc35 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -11,7 +11,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_D_C import com.mogo.eagle.core.utilcode.util.ToastUtils import com.zhidao.support.adas.high.AdasManager import com.zhidao.support.adas.high.OnAdasConnectStatusListener @@ -47,7 +47,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : AppConfigInfo.connectStatusDescribe = reason when (ipcConnectionStatus) { Constants.IPC_CONNECTION_STATUS.CONNECTED -> { - CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 连接成功") + CallerLogger.d("$M_D_C$TAG", "webSocket 连接成功") connectStatus = true // 初始化自动驾驶状态信息 CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP = @@ -70,7 +70,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode) } Constants.IPC_CONNECTION_STATUS.DISCONNECTED -> { - CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 连接失败 reason:$reason") + CallerLogger.d("$M_D_C$TAG", "webSocket 连接失败 reason:$reason") if (connectStatus) { reason?.let { ToastUtils.showLong("工控机连接断开，原因:$it , 等待重连") @@ -88,13 +88,13 @@ class MoGoAdasMsgConnectStatusListenerImpl : CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().pilotmode = 0 } Constants.IPC_CONNECTION_STATUS.CONNECTING -> { - CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 正在连接") + CallerLogger.d("$M_D_C$TAG", "webSocket 正在连接") } Constants.IPC_CONNECTION_STATUS.SEARCH_ADDRESS -> { - CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 正在搜索工控机IP") + CallerLogger.d("$M_D_C$TAG", "webSocket 正在搜索工控机IP") } Constants.IPC_CONNECTION_STATUS.NOT_FOUND_ADDRESS -> { - CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 找不到可用IP 传入的IP不可用或固定IP列表中所有IP不可用") + CallerLogger.d("$M_D_C$TAG", "webSocket 找不到可用IP 传入的IP不可用或固定IP列表中所有IP不可用") } } CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ipcConnStatus = ipcConnectionStatus @@ -117,7 +117,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : * 同步SN信息给工控机 */ private fun syncBasicInfoToAutopilot() { - CallerLogger.d("$M_ADAS_IMPL$TAG", "同步PAD的SN给工控机……") + CallerLogger.d("$M_D_C$TAG", "同步PAD的SN给工控机……") if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { // 设置PAD-SN给工控,网络环境 AdasManager.getInstance() diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt index 63ef5b7958..1742f5631b 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt @@ -1,6 +1,5 @@ package com.mogo.eagle.core.function.datacenter.autopilot.server -import android.annotation.SuppressLint import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener @@ -16,7 +15,6 @@ import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicInteger /** * @author xiaoyuzhou @@ -45,7 +43,7 @@ class AsyncDataToAutopilotServer private constructor() : IMoGoTrafficLightListen override fun onAutopilotStatusResponse(state: Int) { createSubscribe?.let { if (!it.isDisposed) { - bizLog(SceneConstant.M_ADAS_IMPL + TAG, "自动驾驶状态变化，取消前置轨迹请求，间隔2s重新请求底盘轨迹") + bizLog(SceneConstant.M_D_C + TAG, "自动驾驶状态变化，取消前置轨迹请求，间隔2s重新请求底盘轨迹") createSubscribe?.dispose() } when (state) { @@ -53,7 +51,7 @@ class AsyncDataToAutopilotServer private constructor() : IMoGoTrafficLightListen createSubscribe = Observable.timer(2000L, TimeUnit.MILLISECONDS) .observeOn(AndroidSchedulers.mainThread()) .subscribe { - bizLog(SceneConstant.M_ADAS_IMPL + TAG, "请求底盘轨迹") + bizLog(SceneConstant.M_D_C + TAG, "请求底盘轨迹") CallerAutoPilotControlManager.getGlobalPath() } } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt index 5e0262f153..1b55e0fd3a 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt @@ -228,7 +228,7 @@ class TeleMsgHandler : IMsgHandler { override fun handleClientConn2Server(channel: Channel?) { val socketAddress = channel?.remoteAddress().toString() - CallerLogger.d("${SceneConstant.M_ADAS_IMPL}$TAG", "Client ip is:${socketAddress}") + CallerLogger.d("${SceneConstant.M_D_C}$TAG", "Client ip is:${socketAddress}") setDemoMode(FunctionBuildConfig.isDemoMode) setIgnoreConditionDraw(FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData) } @@ -286,7 +286,7 @@ class TeleMsgHandler : IMsgHandler { paramIndexes = [0] ) private fun invokeNettyConnResult(status: String) { - CallerLogger.d("${SceneConstant.M_ADAS_IMPL}$TAG", status) + CallerLogger.d("${SceneConstant.M_D_C}$TAG", status) } /** diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index 930619de99..fd41ef263b 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -83,7 +83,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight */ override fun onAutopilotPerceptionTrafficLight(trafficLights: TrafficLightOuterClass.TrafficLights?) { CallerLogger.d( - "${SceneConstant.M_OBU}${TAG}", + "${SceneConstant.M_D_C}${TAG}", "onAutopilotPerceptionTrafficLight ---- hasObuLightStatus = $hasObuLightStatus ----hasAiLightStatus = $hasAiLightStatus " ) if (!hasObuLightStatus) { @@ -122,7 +122,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight light = it.uTurn } CallerLogger.d( - "${SceneConstant.M_OBU}${TAG}", + "${SceneConstant.M_D_C}${TAG}", "onAutopilotPerceptionTrafficLight light = $light " ) if (light == null) { @@ -149,7 +149,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight if (!hasObuLightStatus) { hasAiLightStatus = true CallerLogger.d( - "${SceneConstant.M_OBU}${TAG}", + "${SceneConstant.M_D_C}${TAG}", "onTrafficLightStatus trafficLightResult = $trafficLightResult " ) updateTrafficLight(trafficLightResult) @@ -161,7 +161,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight * @param enter true:进入路口；false:离开路口 */ override fun onEnterCrossRoad(enter: Boolean) { - CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onEnterCrossRoad enter = $enter ") + CallerLogger.d("${SceneConstant.M_D_C}${TAG}", "onEnterCrossRoad enter = $enter ") if (!enter) { Handler().postDelayed({ hasAiLightStatus = false @@ -187,7 +187,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight override fun onTrafficRequestError() { hasAiLightStatus = false CallerLogger.d( - "${SceneConstant.M_OBU}${TAG}", + "${SceneConstant.M_D_C}${TAG}", "onTrafficRequestError hasObuLightStatus = $hasObuLightStatus ------> " ) CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus) @@ -200,7 +200,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight * obu数据消失 */ override fun onObuTrafficLightDisapper() { - CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "onObuTrafficLightDisapper ------> ") + CallerLogger.d("${SceneConstant.M_D_C}${TAG}", "onObuTrafficLightDisapper ------> ") hasObuLightStatus = false hide("OBU红绿灯消息关闭隐藏", DataSourceType.OBU) } @@ -210,7 +210,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight */ override fun resetTrafficLight(isReset: Boolean) { CallerLogger.d( - "${SceneConstant.M_OBU}${TAG}", + "${SceneConstant.M_D_C}${TAG}", "resetTrafficLight ------> isReset = $isReset ---hasObuLightStatus = $hasObuLightStatus" ) if (!hasObuLightStatus) { @@ -227,7 +227,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight paramIndexes = [0, 1] ) private fun hide(msg: String, sourceType: DataSourceType) { - CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "hide() :$msg type :$sourceType") + CallerLogger.d("${SceneConstant.M_D_C}${TAG}", "hide() :$msg type :$sourceType") CallerTrafficLightListenerManager.disableTrafficLight() } @@ -250,7 +250,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight hasObuLightStatus = true } CallerLogger.d( - "${SceneConstant.M_OBU}${TAG}", + "${SceneConstant.M_D_C}${TAG}", "onTrafficLightPlusSource ----- light = $light ---remain = $remain ---lightSource = $lightSource ---hasObuLightStatus = $hasObuLightStatus ---hasAiLightStatus = $hasAiLightStatus" ) CallerTrafficLightListenerManager.showTrafficLight(light, lightSource) @@ -282,7 +282,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight private fun updateTrafficLight(trafficLightResult: TrafficLightResult) { val currentTrafficLight = trafficLightResult.currentRoadTrafficLight() CallerLogger.d( - "${SceneConstant.M_OBU}${TAG}", + "${SceneConstant.M_D_C}${TAG}", "updateTrafficLight ----- currentTrafficLight = $currentTrafficLight" ) currentTrafficLight?.let { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt index 4fda72eabd..32368ffc0d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt @@ -18,7 +18,6 @@ import com.mogo.eagle.core.function.call.obu.CallerObuApiManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isDriver import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isPassenger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager @@ -62,9 +61,9 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener { } override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { - CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", "onAutopilotCarConfig ----------> ") + CallerLogger.d("${SceneConstant.M_DEVA}${TAG}", "onAutopilotCarConfig ----------> ") if (!TextUtils.isEmpty(carConfigResp.macAddress)) { - CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", + CallerLogger.d("${SceneConstant.M_DEVA}${TAG}", "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} ") getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn) } @@ -90,7 +89,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener { queryObuUpgrade(obuVersion) } } - CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", + CallerLogger.d("${SceneConstant.M_DEVA}${TAG}", "getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5 ---screenType = $screenType" ) SharedPrefsMgr.getInstance(mContext!!).putString(SharedPrefsConstants.APP_MAC, macAddress) @@ -124,7 +123,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener { } fun modifyCarInfo(callBack: (ModifyBindingcarInfo) -> Unit) { - BindingCarNetWorkManager.instance.modifyBindingCar(mContext!!, mAddress, mWidevineIDWithMd5, callBack, screenType) + BindingCarNetWorkManager.instance.modifyBindingCar(mAddress, mWidevineIDWithMd5, callBack, screenType) } private fun driverScreen(macAddress: String, widevineIDWithMd5: String) { @@ -203,10 +202,10 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener { */ fun queryObuUpgrade(obuVersionName: String) { mObuVersion = obuVersionName - CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "screenType = $screenType ----role = $role") + CallerLogger.d("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}", "screenType = $screenType ----role = $role") if (screenType == 1) { - CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected = ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress") - ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(mContext, if(!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!).getString(SharedPrefsConstants.APP_MAC), obuVersionName) + CallerLogger.d("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected = ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress") + ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(if(!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!).getString(SharedPrefsConstants.APP_MAC), obuVersionName) } } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index 205aa21dcf..3a0b9d64d3 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -72,7 +72,7 @@ class BindingCarNetWorkManager private constructor() { override fun onSubscribe(d: Disposable) {} override fun onNext(info: BindingCarInfo) { if (info != null && info.getData() != null) { - d(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data =" + info.getData().toString() + "---getDefaultId() : ${getDefaultId()}") + d(SceneConstant.M_DEVA + TAG, "getBindingCarInfo data =" + info.getData().toString() + "---getDefaultId() : ${getDefaultId()}") SharedPrefsMgr.getInstance(context).putString( SharedPrefsConstants.CAR_INFO, GsonUtils.toJson(info.getData()) @@ -85,13 +85,13 @@ class BindingCarNetWorkManager private constructor() { updateCarVrIconRes(info.getData().brandId) } else { SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "") - e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null ---getDefaultId() : ${getDefaultId()} ") + e(SceneConstant.M_DEVA + TAG, "getBindingCarInfo data = null ---getDefaultId() : ${getDefaultId()} ") } } override fun onError(e: Throwable) { SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "") - e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message + "---getDefaultId() : ${getDefaultId()}") + e(SceneConstant.M_DEVA + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message + "---getDefaultId() : ${getDefaultId()}") } override fun onComplete() {} @@ -103,7 +103,6 @@ class BindingCarNetWorkManager private constructor() { * mac: 48:b0:2d:3a:9c:19 */ fun modifyBindingCar( - context: Context, macAddress: String?, widevineIDWithMd5: String?, callBack: (ModifyBindingcarInfo) -> Unit, @@ -128,13 +127,13 @@ class BindingCarNetWorkManager private constructor() { override fun onNext(info: ModifyBindingcarInfo) { if (info != null) { callBack.invoke(info) - d(SceneConstant.M_BINDING + TAG, "modifyBindingCar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()) + d(SceneConstant.M_DEVA + TAG, "modifyBindingCar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()) updateCarVrIconRes(info.data.brandId) } } override fun onError(e: Throwable) { - e(SceneConstant.M_BINDING + TAG, "modifyBindingCar onError e = " + e.toString() + "---e.getMessage = " + e.message) + e(SceneConstant.M_DEVA + TAG, "modifyBindingCar onError e = " + e.toString() + "---e.getMessage = " + e.message) } override fun onComplete() {} @@ -142,18 +141,18 @@ class BindingCarNetWorkManager private constructor() { } private fun updateCarVrIconRes(brandId: String?) { - d(SceneConstant.M_BINDING + TAG, "CarModelChange : ${DebugConfig.isCarModelChange()}") + d(SceneConstant.M_DEVA + TAG, "CarModelChange : ${DebugConfig.isCarModelChange()}") if(!DebugConfig.isCarModelChange()){ return } if (brandId == null || brandId.isEmpty()) { return } - d(SceneConstant.M_BINDING + TAG, "getDefaultId() : ${getDefaultId()} ---- brandId = $brandId") + d(SceneConstant.M_DEVA + TAG, "getDefaultId() : ${getDefaultId()} ---- brandId = $brandId") if (getDefaultId() == brandId) { return } - d(SceneConstant.M_BINDING + TAG, "updateCarVrIconRes : $brandId") + d(SceneConstant.M_DEVA + TAG, "updateCarVrIconRes : $brandId") when (brandId) { "1" -> { //东风 CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt index 0004ae3307..fa289a6d2c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt @@ -6,16 +6,13 @@ import com.mogo.eagle.core.data.deva.scene.SceneModuleTAG import com.mogo.eagle.core.data.deva.scene.SceneTAG import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.scene.Scene.Companion.scene -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_D_C import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_CHAT import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_NETWORK import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OLD_ROUTE -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OTHER import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_SWEEPER import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P @@ -29,19 +26,16 @@ class SceneManager { companion object { private const val ADAS = "ADAS" - private const val CALLCHAT = "CALLCHAT" private const val DEVA = "DEVA" private const val HMI = "HMI" private const val OBU = "OBU" private const val V2X = "V2X" private const val MAP = "MAP" - private const val ROUTE = "ROUTE" private const val NET = "NET" private const val BUS = "BUS" private const val TAXI = "TAXI" private const val SWEEPER = "SWEEPER" private const val TAXI_P = "TAXI_P" - private const val OTHER = "OTHER" val sceneManager: SceneManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { SceneManager() @@ -53,20 +47,17 @@ class SceneManager { init { //过滤所需条件 - sceneModuleTAG.map[ADAS] = SceneModule(true, M_ADAS_IMPL) - sceneModuleTAG.map[CALLCHAT] = SceneModule(false, M_CHAT) + sceneModuleTAG.map[ADAS] = SceneModule(true, M_D_C) sceneModuleTAG.map[DEVA] = SceneModule(false, M_DEVA) sceneModuleTAG.map[HMI] = SceneModule(false, M_HMI) - sceneModuleTAG.map[OBU] = SceneModule(false, M_OBU) + sceneModuleTAG.map[OBU] = SceneModule(true, M_OBU) sceneModuleTAG.map[V2X] = SceneModule(true, M_V2X) sceneModuleTAG.map[MAP] = SceneModule(true, M_MAP) - sceneModuleTAG.map[ROUTE] = SceneModule(true, M_OLD_ROUTE) sceneModuleTAG.map[NET] = SceneModule(true, M_NETWORK) sceneModuleTAG.map[BUS] = SceneModule(true, M_BUS) sceneModuleTAG.map[TAXI] = SceneModule(true, M_TAXI) sceneModuleTAG.map[TAXI_P] = SceneModule(true, M_TAXI_P) sceneModuleTAG.map[SWEEPER] = SceneModule(true, M_SWEEPER) - sceneModuleTAG.map[OTHER] = SceneModule(true, M_OTHER) sceneLogTAG.map[TAXI] = SceneTAG(false) sceneLogTAG.map[BUS] = SceneTAG(false) @@ -148,28 +139,25 @@ class SceneManager { sceneCache[M_TAXI]?.logger = logger sceneCache[M_TAXI_P]?.logger = logger sceneCache[M_NETWORK]?.logger = logger - sceneCache[M_ADAS_IMPL]?.logger = logger + sceneCache[M_D_C]?.logger = logger sceneCache[M_HMI]?.logger = logger sceneCache[M_DEVA]?.logger = logger - sceneCache[M_OLD_ROUTE]?.logger = logger scene.updateSceneCache(sceneCache) } BUS -> { sceneCache[M_BUS]?.logger = logger sceneCache[M_NETWORK]?.logger = logger - sceneCache[M_ADAS_IMPL]?.logger = logger + sceneCache[M_D_C]?.logger = logger sceneCache[M_HMI]?.logger = logger sceneCache[M_DEVA]?.logger = logger - sceneCache[M_OLD_ROUTE]?.logger = logger scene.updateSceneCache(sceneCache) } SWEEPER -> { sceneCache[M_SWEEPER]?.logger = logger sceneCache[M_NETWORK]?.logger = logger - sceneCache[M_ADAS_IMPL]?.logger = logger + sceneCache[M_D_C]?.logger = logger sceneCache[M_HMI]?.logger = logger sceneCache[M_DEVA]?.logger = logger - sceneCache[M_OLD_ROUTE]?.logger = logger scene.updateSceneCache(sceneCache) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt index 2a7a5c249b..cc97ca970d 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt @@ -1,10 +1,7 @@ package com.zhjt.mogo_core_function_devatools.upgrade -import android.content.* -import android.util.Log import com.mogo.cloud.passport.* import com.mogo.commons.constants.* -import com.mogo.eagle.core.data.deva.bindingcar.* import com.mogo.eagle.core.data.obu.MogoObuConst.TAG_UPGRADE_OBU import com.mogo.eagle.core.function.api.devatools.download.DownloadType.OBU import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.downLoadPackage @@ -14,10 +11,6 @@ import com.mogo.eagle.core.network.utils.* import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.scene.* -import io.reactivex.* -import io.reactivex.android.schedulers.* -import io.reactivex.disposables.* -import io.reactivex.schedulers.* import kotlinx.coroutines.* import okhttp3.* @@ -40,27 +33,28 @@ class ObuUpgradeAppNetWorkManager private constructor() { * mac ：工控机mac地址， * screenType ： 类型 */ - fun getObuUpgradeInfo(context: Context?, mac: String?, versionName: String) { // String sn = "X20202203105S688HZ"; + fun getObuUpgradeInfo(mac: String?, versionName: String) { + // String sn = "X20202203105S688HZ"; // String mac1 = "48:b0:2d:4d:33:40"; scope.launch { try { val sn = MoGoAiCloudClientConfig.getInstance().sn - d(SceneConstant.M_BINDING + TAG_UPGRADE_OBU, "getObuUpgradeInfo mac = $mac ---sn = $sn ---versionName = $versionName --host = ${HostConst.getHost()}") + d(SceneConstant.M_DEVA + TAG_UPGRADE_OBU, "getObuUpgradeInfo mac = $mac ---sn = $sn ---versionName = $versionName --host = ${HostConst.getHost()}") val request = UpgradeAppRequest(sn, mac, "7", null, "0") val requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)) val info = mUpgradeApiService.getUpgradeInfo(requestBody) if (info.result == null) { - d(SceneConstant.M_BINDING + TAG_UPGRADE_OBU, "getObuUpgradeInfo onNext info == null") + d(SceneConstant.M_DEVA + TAG_UPGRADE_OBU, "getObuUpgradeInfo onNext info == null") deleteObuFile() } else { - d(SceneConstant.M_BINDING + TAG_UPGRADE_OBU, "getObuUpgradeInfo appFileName = " + info.result.appFileName + " ----url = " + info.result.appUrl + " ----name = " + info.result.versionName + " --obuVersionName =" + versionName + " ---info.result = " + info.result) + d(SceneConstant.M_DEVA + TAG_UPGRADE_OBU, "getObuUpgradeInfo appFileName = " + info.result.appFileName + " ----url = " + info.result.appUrl + " ----name = " + info.result.versionName + " --obuVersionName =" + versionName + " ---info.result = " + info.result) if (info.result.versionName.toString() != versionName) { //判断是否下载,当文件名称不一致的时候，就下载 downLoadPackage(OBU, info.result.appFileName, info.result.appUrl) } } } catch (t: Throwable) { t.printStackTrace() - e(SceneConstant.M_BINDING + TAG_UPGRADE_OBU, "getObuUpgradeInfo e = $t") //请求出错，需要删除相关文件 + e(SceneConstant.M_DEVA + TAG_UPGRADE_OBU, "getObuUpgradeInfo e = $t") //请求出错，需要删除相关文件 deleteObuFile() } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt index 46a1b8d37e..5938237bd3 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt @@ -71,7 +71,7 @@ class UpgradeAppNetWorkManager private constructor() { Log.d(TAG, "getAppUpgradeInfo: -> records:" + records?.entries?.joinToString(",") { itx -> "key:${itx.key} -> value:[${itx.value.joinToString(",") { "${it.first},${it.second}" } }]"}) val versionCode = AppUtils.getAppVersionCode() val versionName = AppUtils.getAppVersionName() - Log.d(SceneConstant.M_BINDING + TAG, "getAppUpgradeInfo mac = $macAddress---type = $type---sn = $sn---versionCode =$versionCode---versionName =$versionName") + Log.d(SceneConstant.M_DEVA + TAG, "getAppUpgradeInfo mac = $macAddress---type = $type---sn = $sn---versionCode =$versionCode---versionName =$versionName") val request = UpgradeAppRequest(sn, macAddress, type, versionName, "1") val requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)) provider?.recordUpgradeRecord(sn ?: "", macAddress, type, FunctionBuildConfig.isSupportPatchUpgrade) @@ -105,7 +105,7 @@ class UpgradeAppNetWorkManager private constructor() { private suspend fun doUpgrade(info: UpgradeAppInfo) { if (info.result != null) { val versionCode = AppUtils.getAppVersionCode() - Log.d(SceneConstant.M_BINDING + TAG, "UpgradeAppInfo url = " + info.result.appUrl + "----code = " + info.result.versionCode + "--versionCode =" + versionCode + "--info.result = " + info.result) + Log.d(SceneConstant.M_DEVA + TAG, "UpgradeAppInfo url = " + info.result.appUrl + "----code = " + info.result.versionCode + "--versionCode =" + versionCode + "--info.result = " + info.result) if (info.result.versionCode > versionCode) { val patchInfo = info.result.patchInfo var downloadUrl: String = info.result.appUrl @@ -172,7 +172,7 @@ class UpgradeAppNetWorkManager private constructor() { deleteApkFile() } } else { - Log.d(SceneConstant.M_BINDING + TAG, "UpgradeAppInfo onNext info == null") + Log.d(SceneConstant.M_DEVA + TAG, "UpgradeAppInfo onNext info == null") deleteApkFile() } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt index 038c36ce71..b0219909a7 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt @@ -2,7 +2,6 @@ package com.zhjt.mogo_core_function_devatools.upgrade import android.content.Context import android.content.pm.PackageInstaller -import android.util.Log import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.upgrade.IMoGoUpgradeProvider import com.mogo.eagle.core.function.call.base.CallerBase @@ -30,6 +29,7 @@ import kotlinx.coroutines.* import java.io.IOException import java.util.concurrent.ConcurrentHashMap +//todo emArrow trace class UpgradeManager : IDownloadListener { companion object { @@ -75,7 +75,7 @@ class UpgradeManager : IDownloadListener { } override fun onFinished(url: String, path: String) { - Log.d(TAG, "onFinished downloadUrl = $url") + CallerLogger.d("$M_DEVA$TAG", "onFinished downloadUrl = $url") doOnFinished(url, path) } @@ -196,7 +196,7 @@ class UpgradeManager : IDownloadListener { if (type == APK || type == PATCH) { scope.launch { upgradeProvider?.recordDownloadFailed(url, error ?: "下载失败") } } else if (type == OBU) { - CallerLogger.e("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "----updateObuUpgradeStatus errorMsg = $error ") + CallerLogger.e("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}", "----updateObuUpgradeStatus errorMsg = $error ") //下载失败，删除文件夹 CallerObuApiManager.deleteObuFile() } @@ -216,7 +216,6 @@ class UpgradeManager : IDownloadListener { CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress onPause ----> ") } override fun onProgress(url: String?, length: Int) { -// CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress onPause ----> length = $length") val type = types[url] if (type == APK || type == PATCH) { if (length in 1..99) { @@ -235,8 +234,7 @@ class UpgradeManager : IDownloadListener { } override fun onError(url: String?, errorMsg: String?) { - CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress errorMsg = $errorMsg") - Log.e(TAG, "updateUpgradeProgress errorMsg = $errorMsg") + CallerLogger.e(TAG, "updateUpgradeProgress errorMsg = $errorMsg") //出错后，去掉下载进度ui，提示检查网络 updateStatusBarDownloadView(false, "download", 0) } @@ -249,10 +247,10 @@ class UpgradeManager : IDownloadListener { private fun handleObuUpgrade(localPath: String) { //下载完成，解压文件 try { - CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", " onFinished localPath = $localPath") + CallerLogger.d("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}", " onFinished localPath = $localPath") val dest = File(localPath) val files = ZipUtils.unzipFile(localPath, Config.downLoadUnzipObuPath) - CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", " onFinished file = ${Config.downLoadObuPath + dest.name} -----files = $files ") + CallerLogger.d("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}", " onFinished file = ${Config.downLoadObuPath + dest.name} -----files = $files ") //1传给obu升级,升级成功，2需要删除相应文件夹 var md5Path = "" var tarPath = "" @@ -264,10 +262,10 @@ class UpgradeManager : IDownloadListener { tarPath = f.path } } - CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "updateObuUpgradeStatus ---md5Path = $md5Path -----tarPath = $tarPath ") + CallerLogger.d("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}", "updateObuUpgradeStatus ---md5Path = $md5Path -----tarPath = $tarPath ") CallerObuApiManager.uploadObuPack(arrayOf(md5Path, tarPath)) } catch (e: IOException) { - CallerLogger.e("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "----updateObuUpgradeStatus e = $e ") + CallerLogger.e("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}", "----updateObuUpgradeStatus e = $e ") //解压失败,删除文件夹 CallerObuApiManager.deleteObuFile() e.printStackTrace() diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt index e28d26179c..6d5877ef2c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt @@ -4,9 +4,6 @@ import android.content.Context import android.text.TextUtils import android.util.* import android.view.* -import android.view.ViewGroup.LayoutParams -import android.widget.FrameLayout -import androidx.core.view.* import androidx.lifecycle.ProcessLifecycleOwner import androidx.lifecycle.lifecycleScope import com.alibaba.android.arouter.facade.annotation.Route @@ -23,7 +20,6 @@ import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.data.map.Infrastructure import com.mogo.eagle.core.data.biz.notice.NoticeNormalData import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStylePushData -import com.mogo.eagle.core.data.status.StatusSummaryEntity import com.mogo.eagle.core.function.api.hmi.warning.IMoGoHmiProvider import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.function.call.hmi.* @@ -45,13 +41,11 @@ import com.mogo.eagle.core.utilcode.floating.* import com.mogo.eagle.core.utilcode.kotlin.safeCancel import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils 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_HMI import com.mogo.eagle.core.utilcode.util.* import com.zhjt.service_biz.BizConfig import kotlinx.coroutines.* import kotlinx.coroutines.selects.* -import java.lang.ref.WeakReference import java.util.concurrent.atomic.AtomicReference /** @@ -125,7 +119,7 @@ class MoGoHmiProvider : IMoGoHmiProvider { ttsMap[v2xType] = System.currentTimeMillis() } } - CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "warningV2X v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent ") + CallerLogger.d("${M_HMI}${TAG}", "warningV2X v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent ") val playTTS = !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) context?.let { val warningContent = alertContent ?: EventTypeEnumNew.getWarningContent(v2xType) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index d58b361595..1b5d8637a1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -1200,9 +1200,7 @@ internal class DebugSettingView @JvmOverloads constructor( val log = map.value.log when (name) { //ADAS日志标签 - SceneConstant.M_ADAS_IMPL -> cbAdasLog.isChecked = log - //CALLCHAT日志标签 - SceneConstant.M_CHAT -> cbCallChatLog.isChecked = log + SceneConstant.M_D_C -> cbAdasLog.isChecked = log //OBU日志标签 SceneConstant.M_OBU -> cbObuLog.isChecked = log //HMI日志标签 @@ -1215,8 +1213,6 @@ internal class DebugSettingView @JvmOverloads constructor( SceneConstant.M_DEVA -> cbDevaLog.isChecked = log //网络模块日志标签 SceneConstant.M_NETWORK -> cbNetworkLog.isChecked = log - //ROUTE日志标签 - SceneConstant.M_OLD_ROUTE -> cbOldRouteLog.isChecked = log //BUS日志标签 SceneConstant.M_BUS -> cbBusLog.isChecked = log //TAXI日志标签 @@ -1225,8 +1221,6 @@ internal class DebugSettingView @JvmOverloads constructor( SceneConstant.M_TAXI_P -> cbTaxiPLog.isChecked = log //清扫车日志 SceneConstant.M_SWEEPER -> cbSweeperPLog.isChecked = log - //其他模块日志(暂未区分具体模块) - SceneConstant.M_OTHER -> cbOtherLog.isChecked = log } } } @@ -1285,14 +1279,8 @@ internal class DebugSettingView @JvmOverloads constructor( } //ADAS日志标签 cbAdasLog.setOnCheckedChangeListener { _, isChecked -> - val adasModule = SceneModule(isChecked, SceneConstant.M_ADAS_IMPL) - sceneMap[SceneConstant.M_ADAS_IMPL] = adasModule - CallerDevaToolsManager.updateModuleTAG(sceneMap) - } - //CALLCHAT日志标签 - cbCallChatLog.setOnCheckedChangeListener { _, isChecked -> - val callChatModule = SceneModule(isChecked, SceneConstant.M_CHAT) - sceneMap[SceneConstant.M_CHAT] = callChatModule + val adasModule = SceneModule(isChecked, SceneConstant.M_D_C) + sceneMap[SceneConstant.M_D_C] = adasModule CallerDevaToolsManager.updateModuleTAG(sceneMap) } //OBU日志标签 @@ -1331,12 +1319,6 @@ internal class DebugSettingView @JvmOverloads constructor( sceneMap[SceneConstant.M_NETWORK] = networkModule CallerDevaToolsManager.updateModuleTAG(sceneMap) } - //ROUTE日志标签 - cbOldRouteLog.setOnCheckedChangeListener { _, isChecked -> - val oldRouteModule = SceneModule(isChecked, SceneConstant.M_OLD_ROUTE) - sceneMap[SceneConstant.M_OLD_ROUTE] = oldRouteModule - CallerDevaToolsManager.updateModuleTAG(sceneMap) - } //BUS日志标签 cbBusLog.setOnCheckedChangeListener { _, isChecked -> val busModule = SceneModule(isChecked, SceneConstant.M_BUS) @@ -1361,13 +1343,6 @@ internal class DebugSettingView @JvmOverloads constructor( sceneMap[SceneConstant.M_SWEEPER] = sweeperModule CallerDevaToolsManager.updateModuleTAG(sceneMap) } - //其他未分类模块日志 - cbOtherLog.setOnCheckedChangeListener { _, isChecked -> - val otherModule = SceneModule(isChecked, SceneConstant.M_OTHER) - sceneMap[SceneConstant.M_OTHER] = otherModule - CallerDevaToolsManager.updateModuleTAG(sceneMap) - } - //开始停止抓取全量日志 tbLogCatch.isChecked = SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 2d9b5fd0d0..7fce010454 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -2127,14 +2127,6 @@ android:checked="false" android:text="ADAS日志" /> - - - - - - implements SQLIDao { //执行Sql进行自动建表 String createTableSql = getCreateTableSql(); - CallerLogger.INSTANCE.d(M_UTIL + TAG, "执行SQL：" + createTableSql); sqLiteDatabase.execSQL(createTableSql); //初始化缓存空间 @@ -393,7 +390,6 @@ public class SQLBaseDao implements SQLIDao { e.printStackTrace(); } } - CallerLogger.INSTANCE.d(M_UTIL + TAG, "contentValues:" + contentValues); return contentValues; } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/proxy/BaseDaoProxyLog.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/proxy/BaseDaoProxyLog.kt index c792b7460f..b7befe4346 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/proxy/BaseDaoProxyLog.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/sqlite/proxy/BaseDaoProxyLog.kt @@ -1,7 +1,5 @@ package com.mogo.utils.sqlite.proxy -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_UTIL import java.lang.reflect.InvocationHandler import java.lang.reflect.Method import java.lang.reflect.Proxy @@ -43,12 +41,8 @@ class BaseDaoProxyLog : InvocationHandler { */ @Throws(Throwable::class) override fun invoke(proxy: Any, method: Method, args: Array): Any? { - //反射方法前调用 - CallerLogger.i("$M_UTIL$TAG", "SQL数据库管理 当前执行>>${method.name}>>") //反射执行方法 相当于调用target.sayHelllo; val result: Any? = method.invoke(target, *args) - //反射方法后调用. - CallerLogger.i("$M_UTIL$TAG", "SQL数据库管理 执行结果>>$result") return result } } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/TipToast.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/TipToast.java index bf528d2b09..c4d4e1e1e5 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/TipToast.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/toast/TipToast.java @@ -10,11 +10,11 @@ package com.mogo.eagle.core.utilcode.mogo.toast; * @Version 1.1 */ -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_UTIL; import android.content.Context; import android.os.Handler; import android.text.TextUtils; +import android.util.Log; import android.view.Gravity; import android.view.View; import android.widget.Toast; @@ -25,7 +25,6 @@ import androidx.lifecycle.LifecycleEventObserver; import androidx.lifecycle.LifecycleOwner; import com.mogo.eagle.core.utilcode.kotlin.ExtensionsKt; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ToastUtils; @@ -89,11 +88,11 @@ public final class TipToast { private static boolean checkParams() { if (sContext == null) { - CallerLogger.INSTANCE.e(M_UTIL + TAG, "context can't be null."); + Log.e(TAG, "context can't be null."); return false; } if (sHandler == null) { - CallerLogger.INSTANCE.e(M_UTIL + TAG, "sHandler can't be null."); + Log.e(TAG, "sHandler can't be null."); return false; } return true; diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/AppUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/AppUtils.java index be3d0fe040..a60025a8b9 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/AppUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/AppUtils.java @@ -1,6 +1,5 @@ package com.mogo.eagle.core.utilcode.util; -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_UTIL; import android.app.Activity; import android.app.ActivityManager; @@ -22,7 +21,6 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import java.io.File; import java.util.ArrayList; @@ -360,7 +358,6 @@ public final class AppUtils { if (UtilsBridge.isSpace(packageName)) return; Intent launchAppIntent = UtilsBridge.getLaunchAppIntent(packageName); if (launchAppIntent == null) { - CallerLogger.INSTANCE.e(M_UTIL + "AppUtils", "Didn't exist launcher activity."); return; } Utils.getApp().startActivity(launchAppIntent); @@ -381,7 +378,6 @@ public final class AppUtils { public static void relaunchApp(final boolean isKillProcess) { Intent intent = UtilsBridge.getLaunchAppIntent(Utils.getApp().getPackageName()); if (intent == null) { - CallerLogger.INSTANCE.e(M_UTIL + "AppUtils", "Didn't exist launcher activity."); return; } intent.addFlags( diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BusUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BusUtils.java index 56e0b3afcd..a017fb0ec4 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BusUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/BusUtils.java @@ -1,7 +1,6 @@ package com.mogo.eagle.core.utilcode.util; -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_UTIL; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -20,7 +19,6 @@ import java.util.concurrent.CopyOnWriteArraySet; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; /** * 
@@ -121,7 +119,6 @@ public final class BusUtils {
                 isNeedRecordTags = true;
             }
             if (buses.contains(bus)) {
-                CallerLogger.INSTANCE.w(M_UTIL + TAG, "The bus of <" + bus + "> already registered.");
                 return;
             } else {
                 buses.add(bus);
@@ -171,7 +168,6 @@ public final class BusUtils {
     private void consumeSticky(final Object bus, final String tag, final Object arg) {
         List busInfoList = mTag_BusInfoListMap.get(tag);
         if (busInfoList == null) {
-            CallerLogger.INSTANCE.e(M_UTIL + TAG, "The bus of tag <" + tag + "> is not exists.");
             return;
         }
         for (BusInfo busInfo : busInfoList) {
@@ -198,7 +194,6 @@ public final class BusUtils {
         synchronized (mClassName_BusesMap) {
             Set buses = mClassName_BusesMap.get(className);
             if (buses == null || !buses.contains(bus)) {
-                CallerLogger.INSTANCE.e(M_UTIL + TAG, "The bus of <" + bus + "> was not registered before.");
                 return;
             }
             buses.remove(bus);
@@ -212,10 +207,6 @@ public final class BusUtils {
     private void postInner(final String tag, final Object arg, final boolean sticky) {
         List busInfoList = mTag_BusInfoListMap.get(tag);
         if (busInfoList == null) {
-            CallerLogger.INSTANCE.e(M_UTIL + TAG, "The bus of tag <" + tag + "> is not exists.");
-            if (mTag_BusInfoListMap.isEmpty()) {
-                CallerLogger.INSTANCE.e(M_UTIL + TAG, "Please check whether the bus plugin is applied.");
-            }
             return;
         }
         for (BusInfo busInfo : busInfoList) {
@@ -318,9 +309,6 @@ public final class BusUtils {
                 }
             }
             if (buses.size() == 0) {
-                if (!sticky) {
-                    CallerLogger.INSTANCE.e(M_UTIL + TAG, "The " + busInfo + " was not registered before.");
-                }
                 return;
             }
         } else {
@@ -350,7 +338,6 @@ public final class BusUtils {
     private void postStickyInner(final String tag, final Object arg) {
         List busInfoList = mTag_BusInfoListMap.get(tag);
         if (busInfoList == null) {
-            CallerLogger.INSTANCE.e(M_UTIL + TAG, "The bus of tag <" + tag + "> is not exists.");
             return;
         }
         // 获取多对象，然后消费各个 busInfoList
@@ -374,7 +361,6 @@ public final class BusUtils {
     private void removeStickyInner(final String tag) {
         List busInfoList = mTag_BusInfoListMap.get(tag);
         if (busInfoList == null) {
-            CallerLogger.INSTANCE.e(M_UTIL + TAG, "The bus of tag <" + tag + "> is not exists.");
             return;
         }
         for (BusInfo busInfo : busInfoList) {
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ClickUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ClickUtils.java
index 27daf5217b..ce42c515bc 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ClickUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/ClickUtils.java
@@ -1,6 +1,5 @@
 package com.mogo.eagle.core.utilcode.util;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_UTIL;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -25,7 +24,6 @@ import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.core.view.ViewCompat;
 
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 
 /**
  * 
@@ -361,7 +359,6 @@ public class ClickUtils {
                                        final int expandSizeBottom) {
         final View parentView = (View) view.getParent();
         if (parentView == null) {
-            CallerLogger.INSTANCE.e(M_UTIL + "ClickUtils", "expandClickArea must have parent view.");
             return;
         }
         parentView.post(new Runnable() {
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/FileIOUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/FileIOUtils.java
index 5812274aea..90d3adf414 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/FileIOUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/FileIOUtils.java
@@ -1,9 +1,9 @@
 package com.mogo.eagle.core.utilcode.util;
 
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_UTIL;
 
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import android.util.Log;
+
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -160,7 +160,7 @@ public final class FileIOUtils {
                                           final boolean append,
                                           final OnProgressUpdateListener listener) {
         if (is == null || !UtilsBridge.createOrExistsFile(file)) {
-            CallerLogger.INSTANCE.e(M_UTIL + "FileIOUtils", "create file <" + file + "> failed.");
+            Log.e( "FileIOUtils", "create file <" + file + "> failed.");
             return false;
         }
         OutputStream os = null;
@@ -380,18 +380,18 @@ public final class FileIOUtils {
                                                       final boolean append,
                                                       final boolean isForce) {
         if (bytes == null) {
-            CallerLogger.INSTANCE.e(M_UTIL + "FileIOUtils", "bytes is null.");
+            Log.e( "FileIOUtils", "bytes is null.");
             return false;
         }
         if (!UtilsBridge.createOrExistsFile(file)) {
-            CallerLogger.INSTANCE.e(M_UTIL + "FileIOUtils", "create file <" + file + "> failed.");
+            Log.e( "FileIOUtils", "create file <" + file + "> failed.");
             return false;
         }
         FileChannel fc = null;
         try {
             fc = new FileOutputStream(file, append).getChannel();
             if (fc == null) {
-                CallerLogger.INSTANCE.e(M_UTIL + "FileIOUtils", "fc is null.");
+                Log.e( "FileIOUtils", "fc is null.");
                 return false;
             }
             fc.position(fc.size());
@@ -470,14 +470,14 @@ public final class FileIOUtils {
                                                   final boolean append,
                                                   final boolean isForce) {
         if (bytes == null || !UtilsBridge.createOrExistsFile(file)) {
-            CallerLogger.INSTANCE.e(M_UTIL + "FileIOUtils", "create file <" + file + "> failed.");
+            Log.e( "FileIOUtils", "create file <" + file + "> failed.");
             return false;
         }
         FileChannel fc = null;
         try {
             fc = new FileOutputStream(file, append).getChannel();
             if (fc == null) {
-                CallerLogger.INSTANCE.e(M_UTIL + "FileIOUtils", "fc is null.");
+                Log.e( "FileIOUtils", "fc is null.");
                 return false;
             }
             MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_WRITE, fc.size(), bytes.length);
@@ -547,7 +547,7 @@ public final class FileIOUtils {
                                               final boolean append) {
         if (file == null || content == null) return false;
         if (!UtilsBridge.createOrExistsFile(file)) {
-            CallerLogger.INSTANCE.e(M_UTIL + "FileIOUtils", "create file <" + file + "> failed.");
+            Log.e( "FileIOUtils", "create file <" + file + "> failed.");
             return false;
         }
         BufferedWriter bw = null;
@@ -872,7 +872,7 @@ public final class FileIOUtils {
         try {
             fc = new RandomAccessFile(file, "r").getChannel();
             if (fc == null) {
-                CallerLogger.INSTANCE.e(M_UTIL + "FileIOUtils", "fc is null.");
+                Log.e( "FileIOUtils", "fc is null.");
                 return new byte[0];
             }
             ByteBuffer byteBuffer = ByteBuffer.allocate((int) fc.size());
@@ -916,7 +916,7 @@ public final class FileIOUtils {
         try {
             fc = new RandomAccessFile(file, "r").getChannel();
             if (fc == null) {
-                CallerLogger.INSTANCE.e(M_UTIL + "FileIOUtils", "fc is null.");
+                Log.e( "FileIOUtils", "fc is null.");
                 return new byte[0];
             }
             int size = (int) fc.size();
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/MogoServices.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/MogoServices.java
index 8c7baeb296..b921982dd0 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/MogoServices.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/MogoServices.java
@@ -1,7 +1,5 @@
 package com.mogo.commons.module;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_OLD_OTHER;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -14,7 +12,6 @@ import com.mogo.commons.module.intent.IntentManager;
 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.commons.module.receiver.MogoReceiver;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
 
 
@@ -65,7 +62,6 @@ public class MogoServices implements IMogoIntentListener {
         try {
             context.getApplicationContext().registerReceiver(receiver, filter);
         } catch (Exception e) {
-            CallerLogger.INSTANCE.e(M_OLD_OTHER + TAG, "registerMogoReceiver error : " + e);
         }
     }
 
@@ -78,8 +74,4 @@ public class MogoServices implements IMogoIntentListener {
         IntentHandlerFactory.getInstance().handle(mContext, command, intent);
     }
 
-    public void destroy() {
-        CallerLogger.INSTANCE.d(M_OLD_OTHER + TAG, "MogoServices do nothings.");
-    }
-
 }
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 1f0762626e..9dd0a4f135 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
@@ -341,9 +341,6 @@ public class AMapViewWrapper implements IMogoMapView,
             return MapControlResult.ERROR;
         }
         CallerLogger.INSTANCE.d(M_MAP + TAG, "changeZoom : " + zoom);
-        if (DebugConfig.isDebug()) {
-            CallerLogger.INSTANCE.d(M_MAP + TAG, Log.getStackTraceString(new Throwable()));
-        }
         getMap().changeZoom(zoom);
         return MapControlResult.SUCCESS;
     }
@@ -354,9 +351,6 @@ public class AMapViewWrapper implements IMogoMapView,
 //            return;
 //        }
         CallerLogger.INSTANCE.d(M_MAP + TAG, "changeZoom2 : " + zoom);
-        if (DebugConfig.isDebug()) {
-            CallerLogger.INSTANCE.d(M_MAP + TAG, Log.getStackTraceString(new Throwable()));
-        }
         getMap().changeZoom2(zoom);
     }
 
@@ -436,9 +430,6 @@ public class AMapViewWrapper implements IMogoMapView,
             CallerLogger.INSTANCE.e(M_MAP + TAG, "latLng = null or is illegal");
             return;
         }
-        if (DebugConfig.isDebug()) {
-            CallerLogger.INSTANCE.d(M_MAP + TAG, Log.getStackTraceString(new Throwable()));
-        }
         if (checkAMapView()) {
             mMapView.getMapAutoViewHelper().animateCamera(new LonLatPoint(latLng.lon, latLng.lat));
         }
@@ -485,9 +476,6 @@ public class AMapViewWrapper implements IMogoMapView,
 
     @Override
     public void showMyLocation(View view) {
-        if (DebugConfig.isDebug()) {
-            CallerLogger.INSTANCE.d(M_MAP + TAG, Log.getStackTraceString(new Throwable()));
-        }
         if (checkAMapView()) {
             MyLocationStyle style = mMapView.getMapAutoViewHelper().getMyLocationStyle();
             style.myLocationIcon(BitmapDescriptorFactory.INSTANCE.convertViewToBitmap(view));
@@ -846,8 +834,6 @@ public class AMapViewWrapper implements IMogoMapView,
     @Override
     public void onChangeMapStyle(int styleId) {
         CallerLogger.INSTANCE.d(M_MAP + TAG, "currentMapStyle = " + styleId);
-        CallerLogger.INSTANCE.d(M_MAP + TAG, Log.getStackTraceString(new Throwable()));
-
         // 映射地图样式ID到鹰眼样式ID
         if (styleId == MapAutoApi.MAP_STYLE_DAY
                 || styleId == MapAutoApi.MAP_STYLE_DAY_NAV) {