From 8e130899a48d60888356e7b204623cb8eaa0e097 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Mon, 18 Dec 2023 19:56:04 +0800
Subject: [PATCH] =?UTF-8?q?[Sweeper]=20fix:=20=E4=BF=AE=E5=A4=8DSonar?=
 =?UTF-8?q?=E4=B8=8A=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/och/sweeper/SweeperProvider.java   | 8 ++++----
 .../och/sweeper/cloud/model/SweeperCloudTaskModel.java    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
index 17529023d4..2ccf94dc3b 100644
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
+++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
@@ -57,14 +57,14 @@ public class SweeperProvider implements IMogoOCH, IMoGoSweeperModeListener {
         FragmentManager supportFragmentManager = activity.getSupportFragmentManager();
         if (sweeperOperateFragment == null) {
             CallerLogger.d(TAG, "准备add fragment======");
-            Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperOperateFragment.TAG);
+            Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(SweeperOperateFragment.TAG);
             if (fragmentByTag instanceof SweeperOperateFragment) {
                 sweeperOperateFragment = (SweeperOperateFragment) fragmentByTag;
             } else {
                 sweeperOperateFragment = new SweeperOperateFragment();
             }
             if (!sweeperOperateFragment.isAdded()) {
-                supportFragmentManager.beginTransaction().add(containerId, sweeperOperateFragment, sweeperOperateFragment.TAG).commitAllowingStateLoss();
+                supportFragmentManager.beginTransaction().add(containerId, sweeperOperateFragment, SweeperOperateFragment.TAG).commitAllowingStateLoss();
             }
             return;
         }
@@ -76,14 +76,14 @@ public class SweeperProvider implements IMogoOCH, IMoGoSweeperModeListener {
         FragmentManager supportFragmentManager = activity.getSupportFragmentManager();
         if (sweeperCloudFragment == null) {
             CallerLogger.d(TAG, "准备add fragment======");
-            Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperCloudFragment.TAG);
+            Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(SweeperCloudFragment.TAG);
             if (fragmentByTag instanceof SweeperCloudFragment) {
                 sweeperCloudFragment = (SweeperCloudFragment) fragmentByTag;
             } else {
                 sweeperCloudFragment = new SweeperCloudFragment();
             }
             if (!sweeperCloudFragment.isAdded()) {
-                supportFragmentManager.beginTransaction().add(containerId, sweeperCloudFragment, sweeperCloudFragment.TAG).commitAllowingStateLoss();
+                supportFragmentManager.beginTransaction().add(containerId, sweeperCloudFragment, SweeperCloudFragment.TAG).commitAllowingStateLoss();
             }
             return;
         }
diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
index 0c58b0d95a..e359f8d97f 100644
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
+++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
@@ -458,7 +458,7 @@ public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListene
     public void onSweeperFutianCloudTaskCloudSuspendResume(@NonNull AiCloudTask.MessageType messageType, @Nullable String reqNo, long sysTime,
                                                            @Nullable SweeperTaskCloudSuspendResume.BigTaskActionPush bigTaskActionPush) {
         CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " +
-                "onSweeperFutianCloudTaskCloudSuspendResume：" + SweeperCloudTaskUtils.printMessage(bigTaskActionPush));
+                "onSweeperFutianCloudTaskCloudSuspendResume：" + bigTaskActionPush == null ? "null" : SweeperCloudTaskUtils.printMessage(bigTaskActionPush));
         DebugView.Companion.printInfoMsg("[云控]云端下发暂停/恢复指令，messageType=" + messageType.getNumber()
                 + ", sysTime=" + sysTime
                 + ", reqNo=" + reqNo