[6.7.2]

[fix]
[重置数据]

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ShuttleDriverProvider.kt

@@ -56,7 +56,7 @@ class ShuttleDriverProvider : CommonServiceImpl() {
         busFragment = null
         OchAutopilotAnalytics.ochEventKey = null
         LineModel.release()
-        RepositoryManager.closeDb()
+        RepositoryManager.release()
     }
 
     override fun createOchBusinessView(context: Context?): View? {

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt

@@ -30,6 +30,7 @@ import com.mogo.och.weaknet.repository.db.bean.TaskSiteDataBean
 import com.mogo.och.weaknet.repository.db.repository.EventDb
 import com.mogo.och.weaknet.repository.RepositoryManager
 import com.mogo.och.weaknet.repository.exception.DataException
+import com.mogo.och.weaknet.util.ShuttleVoiceManager
 import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/RepositoryManager.kt

@@ -60,8 +60,7 @@ object RepositoryManager {
         }
 
     fun release(){
-        CallerLogger.d(TAG,"重置 repository")
-        repository = null
+        closeDb()
     }
 
     fun loadCurrentTaskInfo():Observable<Boolean>?{
@@ -142,9 +141,12 @@ object RepositoryManager {
     fun closeDb() {
         if (supportDb()) {
             MyDataBase.instance?.close()
+            CallerLogger.d(TAG,"关闭数据库")
             MyDataBase.instance = null
+            CallerLogger.d(TAG,"重置数据库")
             repository?.release()
             repository = null
+            CallerLogger.d(TAG,"重置 repository")
         }
     }
 

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/NormalRepository.kt

@@ -6,6 +6,7 @@ import com.mogo.commons.env.ProjectUtils
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
@@ -30,6 +31,8 @@ import io.reactivex.Observable
 
 class NormalRepository: IRepository {
 
+    private val TAG = "NormalRepository"
+
     private var normalNetInterface: NormalNetInterface?=null
         get() {
             if(field==null){
@@ -194,6 +197,7 @@ class NormalRepository: IRepository {
 
     override fun release() {
         normalNetInterface=null
+        CallerLogger.d(TAG,"重置 normalNetInterface")
     }
 
 

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/WeaknetRepository.kt

@@ -339,5 +339,6 @@ class WeaknetRepository : IRepository {
 
     override fun release() {
         weakNetInterface = null
+        CallerLogger.d(TAG,"重置 weakNetInterface")
     }
 }