From 52ea40970b3546b5e4e9e620a2ac30e74b007652 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 24 Oct 2024 15:40:04 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fix]=20[=E9=80=80=E5=87=BA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=8E=AF=E5=A2=83=E8=BF=98=E5=8E=9F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/weaknet/model/OrderModel.kt  |  1 +
 .../weaknet/repository/RepositoryManager.kt   | 50 +++++++++++--------
 2 files changed, 29 insertions(+), 22 deletions(-)

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 429d4d6b2e..f83b7d01a5 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
@@ -445,6 +445,7 @@ object OrderModel {
             }
             MapMakerManager.removeAllMapMarkerByOwner(TAG)
             BusTrajectoryManager.getInstance().stopTrajReqLoop();
+            RepositoryManager.release()
             LoginStatusManager.loginOut()
         }
     }
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
index 2a3bdbeae1..ab9f6ca1c4 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt
@@ -17,51 +17,57 @@ import io.reactivex.Observable
 object RepositoryManager {
 
 
-    private lateinit var repository: IRepository
-
-    init {
-        if(ProjectUtils.isSaas()){
-            if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
-                repository = ShuttleSaasRepository()
-            }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
-                repository = BusSaasRepository()
-            }
-        }else {
-            if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
-                repository = ShuttleRepository()
-            }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
-                repository = BusRepository()
+    private var repository: IRepository?=null
+        get() {
+            if(field==null){
+                if(ProjectUtils.isSaas()){
+                    if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+                        repository = ShuttleSaasRepository()
+                    }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+                        repository = BusSaasRepository()
+                    }
+                }else {
+                    if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+                        repository = ShuttleRepository()
+                    }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+                        repository = BusRepository()
+                    }
+                }
             }
+            return field
         }
+
+    fun release(){
+        repository = null
     }
 
     fun loadCurrentTaskInfo():Observable<Boolean>?{
-        return repository.loadCurrentTaskInfo()
+        return repository?.loadCurrentTaskInfo()
     }
 
     fun queryCanUseLine() : Observable<List<LineDataBean>?>? {
-        return repository.queryCanUseLine()
+        return repository?.queryCanUseLine()
     }
 
     fun queryCanUserTask(lineId: Long): Observable<List<TaskDataBean>?>? {
-        return repository.queryCanUserTask(lineId)
+        return repository?.queryCanUserTask(lineId)
     }
 
     fun startTask(taskId:Long,lineId:Long,taskTime:Long,lineName:String): Observable<Boolean>? {
-        return repository.startTask(taskId,lineId,taskTime,lineName)
+        return repository?.startTask(taskId,lineId,taskTime,lineName)
     }
 
     fun leaveStation(seq: Int, siteId: Long, taskId: Long, lineId: Long, taskStartTime:Long
     ): Observable<Boolean>?{
-        return repository.leaveStation(seq,siteId,taskId,lineId,taskStartTime)
+        return repository?.leaveStation(seq,siteId,taskId,lineId,taskStartTime)
     }
 
     fun arriveStation(seq: Int, siteId: Long, taskId: Long): Observable<Boolean>?{
-        return repository.arriveStation(seq,siteId,taskId)
+        return repository?.arriveStation(seq,siteId,taskId)
     }
 
     fun endTask(taskId: Long): Observable<Boolean>?{
-        return repository.endTask(taskId)
+        return repository?.endTask(taskId)
     }
 
 
@@ -85,7 +91,7 @@ object RepositoryManager {
         ochCommonServiceCallback: OchCommonServiceCallback<CarExecutableTaskResponse>
     ) {
         if (repository is ShuttleSaasRepository) {
-            repository.queryCarExecutableTaskList(ochCommonServiceCallback)
+            repository?.queryCarExecutableTaskList(ochCommonServiceCallback)
         }
     }