[6.0.0] log

2023-08-24 11:16:26 +08:00
parent 4beb4a3532
commit c377ecc260
94 changed files with 2677 additions and 834 deletions
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/SweeperProvider.java
@@ -35,7 +35,7 @@ public class SweeperProvider implements IMogoOCH {
    private void showFragment() {
        FragmentManager supportFragmentManager = activity.getSupportFragmentManager();
        if (sweeperFragment == null) {
-            CallerLogger.INSTANCE.d(TAG, "准备add fragment======");
+            CallerLogger.d(TAG, "准备add fragment======");
            Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperFragment.TAG);
            if (fragmentByTag instanceof SweeperFragment) {
                sweeperFragment = (SweeperFragment) fragmentByTag;
@@ -47,12 +47,12 @@ public class SweeperProvider implements IMogoOCH {
            }
            return;
        }
-        CallerLogger.INSTANCE.d(TAG, "准备show fragment");
+        CallerLogger.d(TAG, "准备show fragment");
        supportFragmentManager.beginTransaction().show(sweeperFragment).commitAllowingStateLoss();
    }
    private void hideFragment() {
        if (sweeperFragment != null) {
-            CallerLogger.INSTANCE.d(TAG, "准备hide fragment");
+            CallerLogger.d(TAG, "准备hide fragment");
            activity.getSupportFragmentManager().beginTransaction().hide(sweeperFragment).commitAllowingStateLoss();
        }

--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperAmapNaviFragment.java
@@ -125,8 +125,8 @@ public class SweeperAmapNaviFragment extends BaseSweeperUIFragment implements AM

    @Override
    public void onNaviViewLoaded() {
-        CallerLogger.INSTANCE.d(M_TAXI + "wlx", "导航页面加载成功");
-        CallerLogger.INSTANCE.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑");
+        CallerLogger.d(M_TAXI + "wlx", "导航页面加载成功");
+        CallerLogger.d(M_TAXI + "wlx", "请不要使用AMapNaviView.getMap().setOnMapLoadedListener();会overwrite导航SDK内部画线逻辑");
    }

    @Override
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/model/SweeperTaskModel.java
@@ -154,31 +154,31 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
            public void accept(Throwable e) {
                if (e instanceof UndeliverableException) {
                    e = e.getCause();
-                    CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "UndeliverableException");
+                    CallerLogger.d(M_SWEEPER + TAG, "UndeliverableException");
                }
                if ((e instanceof IOException)) {//
                    // fine, irrelevant network problem or API that throws on cancellation
-                    CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "IOException");
+                    CallerLogger.d(M_SWEEPER + TAG, "IOException");
                    return;
                }
                if (e instanceof InterruptedException) {
                    // fine, some blocking code was interrupted by a dispose call
-                    CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "InterruptedException");
+                    CallerLogger.d(M_SWEEPER + TAG, "InterruptedException");
                    return;
                }
                if ((e instanceof NullPointerException) || (e instanceof IllegalArgumentException)) {
                    // that's likely a bug in the application
-                    CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "NullPointerException or IllegalArgumentException");
+                    CallerLogger.d(M_SWEEPER + TAG, "NullPointerException or IllegalArgumentException");
                    Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
                    return;
                }
                if (e instanceof IllegalStateException) {
                    // that's a bug in RxJava or in a custom operator
-                    CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "IllegalStateException");
+                    CallerLogger.d(M_SWEEPER + TAG, "IllegalStateException");
                    Thread.currentThread().getUncaughtExceptionHandler().uncaughtException(Thread.currentThread(), e);
                    return;
                }
-                CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "Undeliverable exception");
+                CallerLogger.d(M_SWEEPER + TAG, "Undeliverable exception");
            }
        });
    }
@@ -197,18 +197,18 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
        @Override
        public void onAutopilotRotting(MessagePad.GlobalPathResp routeList) {
            if (null != routeList && routeList.getWayPointsList() != null && routeList.getWayPointsList().size() > 0) {
-                CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotRotting: " + printMessage(routeList));
+                CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: " + printMessage(routeList));

                // MAP返回路线信息，在1秒内返回了2次，这里加上数据过滤
                long current = System.currentTimeMillis();
                if (current - mRouteDataCurrentTimeMillis <= ROUTE_DATA_INTERVAL_MILLIS) {
-                    CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotRotting: interval <=" + ROUTE_DATA_INTERVAL_MILLIS + " data is abandon");
+                    CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: interval <=" + ROUTE_DATA_INTERVAL_MILLIS + " data is abandon");
                    return;
                }
                mRouteDataCurrentTimeMillis = current;

                if (mCurrentLineId != mPreLineId) {//判断是否同一条路线
-                    CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotRotting: mCurrentLineId" + mCurrentLineId + "mPreLineId：" + mPreLineId);
+                    CallerLogger.d(M_SWEEPER + TAG, "onAutopilotRotting: mCurrentLineId" + mCurrentLineId + "mPreLineId：" + mPreLineId);
                    mPreLineId = mCurrentLineId;
                    points.addAll(coordinateConverterWgsToGcjList(mContext, routeList.getWayPointsList()));
                    if (mSweeperTaskCallback != null) {
@@ -336,7 +336,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
    public void onSweeperFutianCloudTask(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime,
                                         SweeperTask.TaskInfo taskInfo) {

-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
+        CallerLogger.d(M_SWEEPER + TAG,
                "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " onSweeperFutianCloudTask：" + (taskInfo == null ? "null" : printMessage(taskInfo)) + " mSweeperTaskCallback：" + mSweeperTaskCallback);
        if (mSweeperTaskCallback != null) {
            msgTypeAndReqNo.put(messageType.getNumber(), reqNo);
@@ -348,7 +348,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
    public void onSweeperFutianCloudTaskConfirm(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime,
                                                SweeperTaskConfirm.TaskConfirm taskConfirm) {

-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
+        CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
                "onSweeperFutianCloudTaskConfirm：" + printMessage(taskConfirm));
        if (mSweeperTaskCallback != null && taskConfirm != null) {
            msgTypeAndReqNo.put(messageType.getNumber(), reqNo);
@@ -359,7 +359,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
    @Override
    public void onSweeperFutianCloudTaskStatus(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime,
                                               SweeperTaskStatus.TaskStatusPush taskStatusPush) {
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
+        CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
                "onSweeperFutianCloudTaskStatus：" + printMessage(taskStatusPush));
        if (mSweeperTaskCallback != null && taskStatusPush != null) {
            msgTypeAndReqNo.put(messageType.getNumber(), reqNo);
@@ -370,7 +370,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
    @Override
    public void onSweeperFutianCloudTaskStop(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime,
                                             SweeperTaskStop.StopTaskReq stopTaskReq) {
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
+        CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
                "onSweeperFutianCloudTaskStop：" + printMessage(stopTaskReq));
        if (mSweeperTaskCallback != null && stopTaskReq != null) {
            msgTypeAndReqNo.put(messageType.getNumber(), reqNo);
@@ -381,7 +381,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
    @Override
    public void onSweeperFutianCloudTaskSuspendResume(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime,
                                                      SweeperTaskSuspendResume.SuspendResumeTaskResp suspendResumeTaskResp) {
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
+        CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
                "onSweeperFutianCloudTaskSuspendResume：" + printMessage(suspendResumeTaskResp));
        if (mSweeperTaskCallback != null && suspendResumeTaskResp != null) {
            msgTypeAndReqNo.put(messageType.getNumber(), reqNo);
@@ -393,7 +393,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
    @Override
    public void onSweeperFutianCloudBootable(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime,
                                             SweeperBootable.IsBootableResp isBootableResp) {
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
+        CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
                "onSweeperFutianCloudBootable：" + printMessage(isBootableResp));
        if (mSweeperTaskCallback != null && isBootableResp != null) {
            msgTypeAndReqNo.put(messageType.getNumber(), reqNo);
@@ -404,7 +404,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
    @Override
    public void onSweeperFutianCloudBigTaskStatus(@NonNull SweeperCloudTask.MessageType messageType, String reqNo, long sysTime,
                                                  SweeperBigTaskStatus.BigTaskStatusPush bigTaskStatusPush) {
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
+        CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
                "onSweeperFutianCloudBigTaskStatus：" + printMessage(bigTaskStatusPush));
        if (mSweeperTaskCallback != null && bigTaskStatusPush != null) {
            msgTypeAndReqNo.put(messageType.getNumber(), reqNo);
@@ -422,7 +422,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
            return;
        }
        mVehicleStateCurrentTimeMillis = current;
-        // CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onSweeperFutianCleanSystemState：" + printMessage(cleanSystemState));
+        // CallerLogger.d(M_SWEEPER + TAG, "onSweeperFutianCleanSystemState：" + printMessage(cleanSystemState));
        if (mSweeperTaskCallback != null) {
            mSweeperTaskCallback.onSweeperFutianCleanSystemState(cleanSystemState);
        }
@@ -445,7 +445,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
            return;
        }

-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
+        CallerLogger.d(M_SWEEPER + TAG,
                "mSubTaskType：" + mSubTaskType + "+ onSweeperFutianTaskIndexData：" + printMessage(roboSweeperTaskIndex));
        handleWeltData(roboSweeperTaskIndex);
    }
@@ -508,7 +508,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
        builder.setSn(getDriverSn());
        String reqNo = SweeperCloudTaskUtils.getRequestId();
        SweeperTask.GetTaskReq getTaskReq = builder.build();
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
+        CallerLogger.d(M_SWEEPER + TAG,
                "getCurrentTask:" + printMessage(getTaskReq) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.PadSendGetTaskReq.getNumber());
        getAutoPilotControlManager().sendSweeperGetTaskReq(reqNo, getTaskReq);
    }
@@ -524,7 +524,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
        SweeperTask.StartTaskResp startTaskResp = builder.build();
        String reqNo = msgTypeAndReqNo.get(SweeperCloudTask.MessageType.CloudPushTask.getNumber());
        getAutoPilotControlManager().sendSweeperStartTaskResp(reqNo, startTaskResp);
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
+        CallerLogger.d(M_SWEEPER + TAG,
                "sendSweeperStartTaskResp:" + printMessage(startTaskResp) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.CloudPushTask.getNumber());
    }

@@ -539,7 +539,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
        builder.setCode(code);
        SweeperTaskConfirm.TaskConfirmResp taskConfirmResp = builder.build();
        String reqNo = msgTypeAndReqNo.get(SweeperCloudTask.MessageType.CloudPushTaskConfirm.getNumber());
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
+        CallerLogger.d(M_SWEEPER + TAG,
                "sendSweeperTaskConfirmResp" + printMessage(taskConfirmResp) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.CloudPushTaskConfirm.getNumber());
        getAutoPilotControlManager().sendSweeperTaskConfirmResp(reqNo, taskConfirmResp);
    }
@@ -557,7 +557,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
        builder.setCode(code);
        SweeperTaskStop.StopTaskResp stopTaskResp = builder.build();
        String reqNo = msgTypeAndReqNo.get(SweeperCloudTask.MessageType.CloudPushTaskStop.getNumber());
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
+        CallerLogger.d(M_SWEEPER + TAG,
                "sendSweeperStopTaskResp" + printMessage(stopTaskResp) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.CloudPushTaskStop.getNumber());
        getAutoPilotControlManager().sendSweeperStopTaskResp(reqNo, stopTaskResp);
    }
@@ -577,7 +577,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
        builder.setLineId(lineId);
        SweeperBootable.IsBootable isBootable = builder.build();
        String reqNo = SweeperCloudTaskUtils.getRequestId();
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG,
+        CallerLogger.d(M_SWEEPER + TAG,
                "sendSweeperAutopilotBootable" + printMessage(isBootable) + " reqNo:" + reqNo + " messageType:" + SweeperCloudTask.MessageType.PadSendBootable.getNumber());
        getAutoPilotControlManager().sendSweeperAutopilotBootable(reqNo, isBootable);
        // TODO: 2023/5/16
@@ -594,7 +594,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM

    @Override
    public void onAutopilotStatusResponse(@NonNull AutopilotStatusInfo autoPilotStatusInfo) {
-        //CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotStatusResponse state:" + autoPilotStatusInfo.getState());
+        //CallerLogger.d(M_SWEEPER + TAG, "onAutopilotStatusResponse state:" + autoPilotStatusInfo.getState());
        this.mAutopilotState = autoPilotStatusInfo.getState();
        if (mControllerStatusCallback != null) {
            mControllerStatusCallback.onAutopilotState(autoPilotStatusInfo.getState());
@@ -635,12 +635,12 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
                getCurrentTask();
            }, 10000);
        }
-        //CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotIpcConnectStatusChanged status:" + status + " reason：" + reason);
+        //CallerLogger.d(M_SWEEPER + TAG, "onAutopilotIpcConnectStatusChanged status:" + status + " reason：" + reason);
    }

    @Override
    public void onAutopilotStatusRespByQuery(@NonNull SystemStatusInfo.StatusInfo status) {
-        // CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onAutopilotStatusRespByQuery status:" + status.getSysState().getNumber());
+        // CallerLogger.d(M_SWEEPER + TAG, "onAutopilotStatusRespByQuery status:" + status.getSysState().getNumber());
    }

    @Override
@@ -661,7 +661,7 @@ public class SweeperTaskModel implements IMoGoSweeperFutianCloudTaskListener, IM
    @Override
    public void onSweeperFutianCloudTaskUnknown(@NonNull byte[] bytes) {
        String string = new String(bytes, StandardCharsets.UTF_8);
-        CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onSweeperFutianCloudTaskUnknown:" + string);
+        CallerLogger.d(M_SWEEPER + TAG, "onSweeperFutianCloudTaskUnknown:" + string);
    }

    @Override
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/receiver/TestSweeperBroadcastReceiver.java
@@ -25,7 +25,7 @@ public class TestSweeperBroadcastReceiver extends BroadcastReceiver {
        try {
            this.mContext = context;
            int sceneType = intent.getIntExtra(SweeperConst.BROADCAST_TEST_SWEEPER_CONTROL_TYPE_EXTRA_KEY, 0);
-            CallerLogger.INSTANCE.d(M_BUS + TAG, "sceneType:" + sceneType);
+            CallerLogger.d(M_BUS + TAG, "sceneType:" + sceneType);

            // 分发场景
            dispatchSceneTest(sceneType);
--- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java
+++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/util/SweeperAnalyticsManager.java
@@ -49,7 +49,7 @@ public class SweeperAnalyticsManager {
    private void triggerStartAutopilotFailureEvent(String failCode, String failMsg){
        if (mStartAutopilotParams.isEmpty()) return;

-        CallerLogger.INSTANCE.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg );
+        CallerLogger.e( M_SWEEPER + "triggerStartAutopilotFailureEvent", failMsg );

        if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() !=
                IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING){