[6.7.2]

[fea]
[多个数据库、release check]

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

@@ -7,6 +7,7 @@ import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.network.utils.digest.DigestUtils
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
@@ -71,6 +72,7 @@ object LineModel {
 
     @JvmStatic
     fun init() {
+        CallerLogger.d(TAG,"init")
         mContext = AbsMogoApplication.getApp()
         EventModel.load()
         loopQueryInfo.run()
@@ -79,6 +81,7 @@ object LineModel {
     @JvmStatic
     @Synchronized
     fun release() {
+        CallerLogger.d(TAG,"release")
         mContext = null
         EventModel.release()
         mBusLinesCallbackMap.clear()

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

@@ -83,6 +83,8 @@ object OrderModel {
     fun release() {
         // 注销定位监听
 
+        mContext = null
+
         ThirdDeviceData.release()
 
         TicketModel.release()
@@ -445,6 +447,7 @@ object OrderModel {
             }
             MapMakerManager.removeAllMapMarkerByOwner(TAG)
             BusTrajectoryManager.getInstance().stopTrajReqLoop();
+            RepositoryManager.closeDb()
             LoginStatusManager.loginOut()
         }
     }

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

@@ -69,7 +69,7 @@ object TicketModel : IOchOnMessageListener<WriteOffPassenger>{
     }
 
     fun release(){
-        if(ProjectUtils.isDali()) {
+        if(!ProjectUtils.isMogo()) {
             BizLoopManager.removeLoopFunction(SELECTWRITEOFFCOUNT)
         }
         LanSocketManager.unRegisterSocketMessageListener(DPMsgType.TYPE_WRITEOFF_INFO.type,writeOffMsg)

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

@@ -10,6 +10,7 @@ import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.weaknet.bean.request.ShuttleEventRequest
 import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
 import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
+import com.mogo.och.weaknet.repository.db.MyDataBase
 import com.mogo.och.weaknet.repository.db.bean.LineDataBean
 import com.mogo.och.weaknet.repository.db.bean.TaskDataBean
 import com.mogo.och.weaknet.repository.db.repository.EventDb
@@ -119,4 +120,10 @@ object RepositoryManager {
         }
     }
 
+    fun closeDb() {
+        if (supportDb()) {
+            MyDataBase.instance.close()
+        }
+    }
+
 }

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

@@ -8,6 +8,10 @@ import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 import androidx.sqlite.db.SupportSQLiteOpenHelper
 import com.mogo.commons.AbsMogoApplication
+import com.mogo.commons.env.Project
+import com.mogo.commons.env.ProjectUtils
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean
 import com.mogo.och.weaknet.repository.db.bean.EventDataBean
 import com.mogo.och.weaknet.repository.db.bean.LineDataBean
@@ -33,7 +37,7 @@ abstract class MyDataBase : RoomDatabase() {
 
     private object SingleTon {
         val instance: MyDataBase = Room.databaseBuilder(
-            AbsMogoApplication.getApp()!!.applicationContext, MyDataBase::class.java, ROOT_PATH+DATABASE_NAME
+            AbsMogoApplication.getApp()!!.applicationContext, MyDataBase::class.java, ROOT_PATH+getDBName()
         )
             .addMigrations(Migration1_2(1,2))
             .build()
@@ -51,7 +55,29 @@ abstract class MyDataBase : RoomDatabase() {
     abstract val taskSiteDataDao: TaskSiteDataDao?
 
     companion object {
-        private const val DATABASE_NAME = "shuttle_db"
+        fun getDBName():String{
+            return when (ProjectUtils.getProjectType()) {
+                Project.SAAS -> {
+                    if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+                        "shuttle_db"
+                    }else if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+                        "saas_bus_db"
+                    }else{
+                        FunctionBuildConfig.appIdentityMode
+                    }
+                }
+                Project.DALI -> {
+                    if(AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
+                        "dali_shuttle_db"
+                    }else{
+                        FunctionBuildConfig.appIdentityMode
+                    }
+                }
+                else->{
+                    FunctionBuildConfig.appIdentityMode
+                }
+            }
+        }
         val ROOT_PATH =
             Environment.getExternalStorageDirectory().absolutePath + File.separator + "Mogo" + File.separator + "APP_cache" + File.separator //程序外部存储跟目录
 

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

@@ -58,7 +58,7 @@ class NormalRepository: IRepository {
     }
 
     override fun loadCurrentTaskInfo(): Observable<Boolean>? {
-        return SaasBusServiceManager.queryBusRoutes()
+        return normalNetInterface.queryBusRoutes()
             ?.flatMap { busRoutesResult ->
                 if (!busRoutesResult.sites.isNullOrEmpty() && busRoutesResult.sites.size > 1) {
                     OchChainLogManager.writeChainLogDb(