diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
index 70fcc960fc..ace5b743ac 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/OrderModel.kt
@@ -170,14 +170,14 @@ object OrderModel {
             ?.observeOn(AndroidSchedulers.mainThread())
             ?.subscribe(object : Observer<Boolean> {
                 override fun onSubscribe(d: Disposable) {
-                    d(M_BUS + TAG, "onSubscribe")
+                    d(M_BUS + TAG, "queryBusRoutes onSubscribe")
                 }
 
                 override fun onError(e: Throwable) {
                     e.printStackTrace()
-                    d(M_BUS + TAG, "onError${e.printStackTrace()}")
+                    d(M_BUS + TAG, "queryBusRoutes onError${e.printStackTrace()}")
                     LineModel.haveNoRunningTask()
-                    d(M_BUS + TAG, "获取到小巴路线数据:空 ")
+                    d(M_BUS + TAG, "queryBusRoutes 获取到小巴路线数据:空 ")
                     LineManager.setLineInfo(null)
                     updateBusStatus()
                     closeBeautificationMode()
@@ -185,7 +185,7 @@ object OrderModel {
                 }
 
                 override fun onComplete() {
-                    d(M_BUS + TAG, "onComplete")
+                    d(M_BUS + TAG, "queryBusRoutes onComplete")
                 }
 
                 override fun onNext(data: Boolean) {
@@ -194,7 +194,7 @@ object OrderModel {
                         updateBusStatus()
                     }else{
                         LineModel.haveNoRunningTask()
-                        d(M_BUS + TAG, "获取到小巴路线数据:空 ")
+                        d(M_BUS + TAG, "queryBusRoutes 获取到小巴路线数据:空 ")
                         LineManager.setLineInfo(null)
                         updateBusStatus()
                         closeBeautificationMode()
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
index 107ce81281..8701bd166e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
@@ -75,12 +75,12 @@ class WeaknetRepository : ILineRepository {
                 val runningTaskInfo = TaskDb.queryRunningTask()
                 if (runningTaskInfo.isNullOrEmpty()) {
                     // 本地没有进行中的任务
-                    CallerLogger.d(M_BUS + TAG, "没有查询到正在运行的任务")
+                    CallerLogger.d(M_BUS + TAG, "loadCurrentTaskInfo 没有查询到正在运行的任务")
                     return@flatMap loadServerRuningTask()
                 } else if (runningTaskInfo.size > 1) {
                     // 本地有多条正在进行的任务 需要check event
                     // 1 比对event表  1 清理错误数据 2 加载后台数据
-                    CallerLogger.d(M_BUS + TAG, "查询到多个正在执行的任务")
+                    CallerLogger.d(M_BUS + TAG, "loadCurrentTaskInfo 查询到多个正在执行的任务")
                     return@flatMap selectRightData(runningTaskInfo)
                 } else {
                     // 只有一条进行中的任务
@@ -90,6 +90,7 @@ class WeaknetRepository : ILineRepository {
                         // 获取正在进行中的具体信息
                         val runnintTaskAndSites = TaskSiteDb.queryRunningTask(it)
                         if(runnintTaskAndSites.isNullOrEmpty()||runnintTaskAndSites.size<2){
+                            CallerLogger.d(M_BUS + TAG, "异常情况:有任务:${runningTaskInfo} runningTask 表格没有对应的数据:${runnintTaskAndSites}")
                             OchChainLogManager.writeChainLogDb("加载任务", "异常情况:有任务:${runningTaskInfo} runningTask 表格没有对应的数据:${runnintTaskAndSites}")
                             TaskSiteDb.deleteErrorData(it)
                             return@flatMap loadServerRuningTask()
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt
index 111b0e2d89..8b5ea7c5d5 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwitchBizView.kt
@@ -66,7 +66,12 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac
 
     var startLoading = System.currentTimeMillis()
 
-    // 展示loading页面
+    /**
+     * 展示loading页面
+     * 1、
+     * 2、第一次加载页面时展示
+     * 3、
+     */
     override fun showLoadingView(){
         startLoading = System.currentTimeMillis()
         CallerLogger.d(M_BUS+TAG,"开始展示 lading 时间：${startLoading}")
@@ -75,6 +80,7 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac
         swtichTask.visibility = GONE
         queryTimeout = RxUtils.createSubscribe(10_1000) {
             OchChainLogManager.writeChainLog("Loading超时","loading 展示了10s")
+            CallerLogger.d(M_BUS+TAG,"Loading超时：loading 展示了10s")
             viewModel?.queryRuningTask()
         }
     }
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt
index 75842cf7de..1aff5f00fe 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/bizswitch/SwtichBizeModel.kt
@@ -22,14 +22,14 @@ class SwtichBizeModel : ViewModel(), IBusLinesCallback {
 
 
     override fun onCleared() {
-        d(M_BUS + TAG,"SwtichBizeModel onCleared")
+        d(M_BUS + TAG,"onCleared")
         LineModel.setBusLinesCallback(TAG, null)
     }
 
     fun setDistanceCallback(viewCallback: SwtichLineViewCallback) {
-        d(M_BUS + TAG,"SwtichBizeModel setDistanceCallback")
-        this.viewCallback = viewCallback
+        d(M_BUS + TAG,"setDistanceCallback")
         LineModel.setBusLinesCallback(TAG, this)
+        this.viewCallback = viewCallback
         this.viewCallback?.showLoadingView()
         ThreadUtils.getIoPool().execute {
             OrderModel.queryBusRoutes()
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt
index a0a0f4319f..1624907f38 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt
@@ -25,12 +25,6 @@ import mogo_msg.MogoReportMsg.MogoReportMessage
  */
 class BusPresenter(view: ShuttleFragment?) : Presenter<ShuttleFragment?>(view), ILoginCallback {
 
-    init {
-        //2021.11.1 鹰眼架构整合，由IMoGoAutopilotStatusListener逐步替代IMogoAdasOCHCallback接口
-        OrderModel.init()
-        OCHAdasAbilityManager.getInstance().init(AbsMogoApplication.getApp())
-    }
-
     override fun onCreate(owner: LifecycleOwner) {
         super.onCreate(owner)
         initModelListener()
@@ -38,25 +32,25 @@ class BusPresenter(view: ShuttleFragment?) : Presenter<ShuttleFragment?>(view),
 
     override fun onDestroy(owner: LifecycleOwner) {
         super.onDestroy(owner)
-        OrderModel.release()
+
         releaseListener()
     }
 
-    fun initModelListener() {
+    private fun initModelListener() {
+        OCHAdasAbilityManager.getInstance().init(AbsMogoApplication.getApp())
         LoginStatusManager.addListener(TAG, this)
+        OrderModel.init()
     }
 
-    fun releaseListener() {
+    private fun releaseListener() {
         OCHAdasAbilityManager.getInstance().release()
-
         LoginStatusManager.removeListener(TAG)
+        OrderModel.release()
     }
 
     override fun onStatusChange(currentStatus: LoginStatusEnum) {
         d(SceneConstant.M_BUS + TAG, " loginStatus =" + isLogin())
-        if (isLogin()) {
-            //OrderModel.queryBusRoutes()
-        } else {
+        if (!isLogin()) {
             BusTrajectoryManager.stopTrajReqLoop()
             OrderModel.closeBeautificationMode()
         }
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
index 51779c99f7..803b201105 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
@@ -109,7 +109,7 @@ class ShuttleFragment : MvpFragment<ShuttleFragment?, BusPresenter?>() {
         if (mPresenter != null) {
             mPresenter!!.onDestroy(this)
         }
-        if(ProjectUtils.isSaas()&& AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+        if(RepositoryManager.supportDb()){
             CallerEagleBaseFunctionCall4OchManager.removeToolkitByTag(mutableListOf(runningTaskGateWay))
         }
         CallerEagleBaseFunctionCall4OchManager.removeToolKitDefaultItemClickListener(lineView)