diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
index 12b9f07723..4cdaa2b014 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperTaskModel.java
@@ -270,7 +270,7 @@ public class SweeperTaskModel {
                     }
                     CallerLogger.INSTANCE.d(M_SWEEPER + TAG, "onMsgReceived = " + obj.getMessage());
                     OCHSocketMessageManager.INSTANCE.pushAppOperationalMsgBox(obj.getPushTimeStamp(),
-                            obj.getMessage());
+                            obj.getMessage(),OCHSocketMessageManager.OPERATION_SYSTEM);
                 }
             };
 
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt
index 47b5f6d498..118807dbb7 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/net/SweeperServiceManager.kt
@@ -6,16 +6,16 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.och.common.module.biz.constant.OchCommonConst
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback
 import com.mogo.och.common.module.biz.network.OchCommonSubscribeImpl
 import com.mogo.och.common.module.biz.network.interceptor.transformTry
 import com.mogo.och.sweeper.bean.*
-import com.mogo.och.sweeper.constant.SweeperConst.Companion.getBaseUrl
 import com.mogo.och.sweeper.model.SweeperTaskModel
 
 object SweeperServiceManager {
     private val TAG = SweeperTaskModel::class.java.simpleName
-    private val mService: ISweeperApiService = MoGoRetrofitFactory.getInstance(getBaseUrl()).create(
+    private val mService: ISweeperApiService = MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl()).create(
         ISweeperApiService::class.java
     )
 
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt
index 08ed01f84a..ef9aaa9a61 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/adapter/TaskListAdapter.kt
@@ -58,9 +58,9 @@ class TaskListAdapter() : RecyclerView.Adapter<TaskListAdapter.TaskViewHolder>()
             holder.taskDesc.text= "全程包含${mainTask[position].subTaskTotal}个子任务"
             val calendar = DateTimeUtil.formatLongToCalendar(mainTask[position].mainTaskStartTime)
             if (DateTimeUtil.compareDateIsCurrentDay(calendar)){
-                holder.tvTaskTime.text="今天${DateTimeUtil.formatCalendarToString(calendar, DateTimeUtil.TAXI_HH_mm)}"
+                holder.tvTaskTime.text="今天${DateTimeUtil.formatCalendarToString(calendar, DateTimeUtil.HH_mm)}"
             }else{
-                holder.tvTaskTime.text=DateTimeUtil.formatCalendarToString(calendar, DateTimeUtil.TAXI_MM_dd_HH_mm)
+                holder.tvTaskTime.text=DateTimeUtil.formatCalendarToString(calendar, DateTimeUtil.MM_dd_HH_mm)
             }
             holder.itemView.setOnClickListener {
                 mItemClickListener?.onItemClick(position,mainTask[position])
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
index 4693fae7ed..bf01bbf0b5 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
@@ -67,8 +67,7 @@ public class SweeperAnalyticsManager {
 
     private void removeWaitingCallback() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            if (startAutopilotRunnable != null &&
-                    UiThreadHandler.getsUiHandler().hasCallbacks(startAutopilotRunnable)) {
+            if (startAutopilotRunnable != null) {
                 UiThreadHandler.removeCallbacks(startAutopilotRunnable);
             }
         }
diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt
index 91b92d6653..39fc24fd81 100644
--- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt
+++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperCurrentTaskInfoView.kt
@@ -79,7 +79,7 @@ class SweeperCurrentTaskInfoView : ConstraintLayout {
             this@SweeperCurrentTaskInfoView.listTask = subList
             tvTaskName.text = taskName
             val calendar = DateTimeUtil.formatLongToCalendar(taskStartTime)
-            tvTaskTime.text = DateTimeUtil.formatCalendarToString(calendar, DateTimeUtil.TAXI_HH_mm)
+            tvTaskTime.text = DateTimeUtil.formatCalendarToString(calendar, DateTimeUtil.HH_mm)
         }
         listTask?.let {
             mSubTaskStatus=it[currentPosition].taskStatus