diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt
index 41643c923d..e7823695b4 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt
@@ -13,7 +13,7 @@ import com.mogo.och.weaknet.repository.db.repository.EventRepository
 import com.mogo.och.weaknet.repository.db.repository.LineRepository
 import com.mogo.och.weaknet.repository.db.repository.TaskRepository
 import com.mogo.och.weaknet.repository.db.repository.TaskSiteRepository
-import com.mogo.och.weaknet.fragment.ShuttleFragment
+import com.mogo.och.weaknet.ui.fragment.ShuttleFragment
 import com.mogo.och.weaknet.model.BusLineModel
 import com.mogo.och.weaknet.util.BusAnalyticsManager
 
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt
index 6ac839d90b..3d77a547bd 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/BusLineModel.kt
@@ -26,7 +26,7 @@ import com.mogo.och.weaknet.bean.BusRoutesResponse
 import com.mogo.och.weaknet.bean.CarExecutableTaskResponse
 import com.mogo.och.weaknet.callback.IBusLinesCallback
 import com.mogo.och.weaknet.constant.BusConst
-import com.mogo.och.weaknet.net.OrderServiceManager
+import com.mogo.och.weaknet.repository.net.OrderServiceManager
 import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean
 import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
 import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean
@@ -53,7 +53,6 @@ object BusLineModel {
     private val mBusLinesCallbackMap: MutableMap<String, IBusLinesCallback> = ConcurrentHashMap()
 
     private const val TAG = "BusLineModel"
-    private const val LoopCarInfo = "LoopCarInfo"
 
     // 判断接口是否变化
     private const val executableChangeMd5 = "EXECUTABLECHANGEMD5"
@@ -64,7 +63,7 @@ object BusLineModel {
     var currentTask: TaskDataBean?=null
 
     // 当前任务的站点列表
-    var stationList:MutableList<BusStationBean>? = mutableListOf<BusStationBean>()
+    var stationList:MutableList<BusStationBean>? = mutableListOf()
 
 
     private val isRequesting = AtomicBoolean(false)
@@ -95,7 +94,7 @@ object BusLineModel {
     }
 
     @JvmStatic
-    fun setBusLinesCallback(tag:String,callback: IBusLinesCallback?) {
+    fun setBusLinesCallback(tag:String?,callback: IBusLinesCallback?) {
         if (tag == null || "" == tag) return
         if (callback == null) {
             mBusLinesCallbackMap.remove(tag)
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt
index 79091b7d46..b2226cd69e 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/EventModel.kt
@@ -9,7 +9,7 @@ import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.weaknet.bean.ShuttleEventRequest
 import com.mogo.och.weaknet.bean.WaitUploadLine
 import com.mogo.och.weaknet.bean.WaitUploadTask
-import com.mogo.och.weaknet.net.OrderServiceManager
+import com.mogo.och.weaknet.repository.net.OrderServiceManager
 import com.mogo.och.weaknet.repository.db.bean.EventDataBean
 import com.mogo.och.weaknet.repository.db.repository.EventRepository
 import io.reactivex.Observable
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
index ec9ec79a11..68411ac2ca 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
@@ -24,7 +24,7 @@ import com.mogo.och.common.module.manager.socket.lan.bean.WriteOffMsg
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.weaknet.bean.WriteOffCountResponse
 import com.mogo.och.weaknet.bean.WriteOffPassenger
-import com.mogo.och.weaknet.net.OrderServiceManager
+import com.mogo.och.weaknet.repository.net.OrderServiceManager
 import com.mogo.och.weaknet.util.ShuttleVoiceManager
 import io.reactivex.Observable
 import io.reactivex.ObservableEmitter
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/IBascApiService.java b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/IBascApiService.java
similarity index 98%
rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/IBascApiService.java
rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/IBascApiService.java
index fd0ae91808..b5ede161d0 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/IBascApiService.java
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/IBascApiService.java
@@ -1,4 +1,4 @@
-package com.mogo.och.weaknet.net;
+package com.mogo.och.weaknet.repository.net;
 
 import com.mogo.eagle.core.data.BaseData;
 import com.mogo.och.weaknet.bean.BusQueryLineStationsRequest;
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/OrderServiceManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/OrderServiceManager.kt
similarity index 97%
rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/OrderServiceManager.kt
rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/OrderServiceManager.kt
index be3910d726..74d4e24810 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/net/OrderServiceManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/OrderServiceManager.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.weaknet.net
+package com.mogo.och.weaknet.repository.net
 
 import android.content.Context
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
@@ -9,7 +9,6 @@ import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.network.OchCommonSubscribeImpl
 import com.mogo.och.common.module.network.interceptor.transformIoTry
-import com.mogo.och.common.module.network.interceptor.transformTry
 import com.mogo.och.weaknet.bean.BusQueryLineStationsRequest
 import com.mogo.och.weaknet.bean.BusRoutesResponse
 import com.mogo.och.weaknet.bean.CarExecutableTaskResponse
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt
similarity index 98%
rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.kt
rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt
index 2a7bd1a0c1..333d1fc8fc 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/presenter/BusPresenter.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/BusPresenter.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.weaknet.presenter
+package com.mogo.och.weaknet.ui.fragment
 
 import androidx.lifecycle.LifecycleOwner
 import com.mogo.commons.AbsMogoApplication
@@ -21,7 +21,6 @@ import com.mogo.och.common.module.manager.autopilot.autopilot.IOchAutopilotStatu
 import com.mogo.och.common.module.manager.autopilot.autopilot.OchAutoPilotStatusListenerManager
 import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.weaknet.callback.IBusADASStatusCallback
-import com.mogo.och.weaknet.fragment.ShuttleFragment
 import com.mogo.och.weaknet.model.BusLineModel
 import com.mogo.och.weaknet.model.OrderModel
 import com.mogo.och.weaknet.util.BusTrajectoryManager
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
similarity index 99%
rename from OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.kt
rename to OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
index 842c037818..f0369d4ebc 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/fragment/ShuttleFragment.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
@@ -1,4 +1,4 @@
-package com.mogo.och.weaknet.fragment
+package com.mogo.och.weaknet.ui.fragment
 
 import android.animation.ObjectAnimator
 import android.graphics.BitmapFactory
@@ -41,7 +41,6 @@ import com.mogo.och.common.module.utils.createQRCodeWithPicture
 import com.mogo.och.common.module.wigets.BindQRCodeDialog
 import com.mogo.och.shuttle.weaknet.R
 import com.mogo.och.weaknet.constant.BusConst
-import com.mogo.och.weaknet.presenter.BusPresenter
 import com.mogo.och.weaknet.ui.taskrunned.RunningTaskManager
 import com.mogo.och.weaknet.view.BizMapView
 import me.jessyan.autosize.utils.AutoSizeUtils