[6.10.0]

[fea] [删除车型维度]
2025-01-23 14:55:57 +08:00
parent 496af11530
commit bf313f04c1
98 changed files with 1540 additions and 1689 deletions
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/action/TaskUsedAction.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/action/TaskUsedAction.kt
@@ -21,7 +21,7 @@ class TaskUsedAction() :
    override fun onMsgReceived(obj: TaskUsedMsg?) {
        i(tag, "onMsgReceived = $obj")
        obj?.apply {
-            if (LoginStatusManager.getLoginInfo()?.businessType==businessType
+            if (LoginStatusManager.getOchBizInfo()?.businessType==businessType
                &&RepositoryManager.supportDb()) {
                LineModel.endTaskByOther(taskId,plateNumber)
            }
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
@@ -18,7 +18,7 @@ data class ShuttleEventRequest(val requestId: String, val sn: String,val vin:Str
            waitUpdateEvent: List<EventDataBean>?,
            waitUpdateWriteOffEvent: List<WriteOffDataBean>?
        ): ShuttleEventRequest {
-            val businessTypeShuttle = LoginStatusManager.getLoginInfo()?.businessType?:11
+            val businessTypeShuttle = LoginStatusManager.getOchBizInfo()?.businessType?:11
            val eventList4Request = mutableListOf<Event>()
            var tempEvent: Event?=null
            waitUpdateEvent?.forEach {
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt
@@ -470,7 +470,7 @@ object LineModel {
    }

    fun endTaskByOther(taskId: Long,plateNumber:String) {
-        if(LoginStatusManager.getLoginInfo()?.plateNumber==plateNumber){
+        if(LoginStatusManager.getOchCarInfo()?.plateNumber==plateNumber){
            d(TAG,"当前车辆消耗任务")
            return
        }
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/EventDb.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/EventDb.kt
@@ -41,7 +41,7 @@ object EventDb: IDbRepository {
        event.taskStartTime = taskStartTime
        event.businessTime = DateTimeUtil.getCurrentTimeStamp()
        event.writeVersion = DateTimeUtil.getCurrentTimeStamp()
-        event.driverId = LoginStatusManager.getLoginInfo()?.driverId?:-1
+        event.driverId = LoginStatusManager.getOchLoginInfo()?.driverId?:-1
        event.siteId = 0L
        event.seq = 0
        event.msgId = "${OchSPManager.getSn()}_${DateTimeUtil.getCurrentTimeStamp()}"
@@ -72,7 +72,7 @@ object EventDb: IDbRepository {
        event.businessTime = DateTimeUtil.getCurrentTimeStamp()
        event.writeVersion = DateTimeUtil.getCurrentTimeStamp()
        event.siteId = siteId
-        event.driverId = LoginStatusManager.getLoginInfo()?.driverId?:-1
+        event.driverId = LoginStatusManager.getOchLoginInfo()?.driverId?:-1
        event.seq = seq
        event.msgId = "${OchSPManager.getSn()}_${DateTimeUtil.getCurrentTimeStamp()}"
        BizLoopManager.runInIoThread {
@@ -101,7 +101,7 @@ object EventDb: IDbRepository {
        event.lineName = lineName
        event.businessTime = DateTimeUtil.getCurrentTimeStamp()
        event.writeVersion = DateTimeUtil.getCurrentTimeStamp()
-        event.driverId = LoginStatusManager.getLoginInfo()?.driverId?:-1L
+        event.driverId = LoginStatusManager.getOchLoginInfo()?.driverId?:-1L
        event.siteId = siteId
        event.seq = seq
        event.msgId = "${OchSPManager.getSn()}_${DateTimeUtil.getCurrentTimeStamp()}"
@@ -129,7 +129,7 @@ object EventDb: IDbRepository {
        event.taskStartTime = taskStartTime
        event.businessTime = DateTimeUtil.getCurrentTimeStamp()
        event.writeVersion = DateTimeUtil.getCurrentTimeStamp()
-        event.driverId = LoginStatusManager.getLoginInfo()?.driverId?:-1L
+        event.driverId = LoginStatusManager.getOchLoginInfo()?.driverId?:-1L
        event.siteId = 0L
        event.seq = 0
        event.msgId = "${OchSPManager.getSn()}_${DateTimeUtil.getCurrentTimeStamp()}"
--- 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
@@ -174,7 +174,7 @@ class WeaknetRepository : ILineRepository {
            // 2、check 数据库数据
            // 3、数据库没有数据 做延迟等待同步接口同步基础数据  ?? 等待基础数据同步完在进行
            // 4、恢复本地正在运行的数据
-            val loginInfo = LoginStatusManager.getLoginInfo()
+            val loginInfo = LoginStatusManager.getOchBizInfo()
            return Observable.just(loginInfo).flatMap {
                // check数据 是否正在之心
                val taskId = if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)||
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/writeoff/impl/WriteOffCacheRepository.kt
@@ -107,7 +107,7 @@ class WriteOffCacheRepository : IWriteOffRepository {

                // 1、校验租户id
                it.tenantId?.let { tenantId->
-                    if(LoginStatusManager.getLoginInfo()?.tenantId==tenantId){
+                    if(LoginStatusManager.getOchCarInfo()?.tenantId==tenantId){

                    }else{
                        throw DataException(1012,"当前用户下单路线非当前的车辆所属公司")
@@ -124,7 +124,7 @@ class WriteOffCacheRepository : IWriteOffRepository {
                    }
                }
                // 3、校验 bus和shuttle
-                if (LoginStatusManager.getBusInessType()!=Product.valueOf(it.typeBiz)) {
+                if (LoginStatusManager.getProductType()!=Product.valueOf(it.typeBiz)) {
                    throw DataException(1005,"车辆未登录、或没有任务")
                }
                // 4 二维码1分钟失效
@@ -201,7 +201,7 @@ class WriteOffCacheRepository : IWriteOffRepository {
                addWrite.ticketSize = it.ticketSize
                addWrite.ticketName = it.ticketName
                addWrite.msgId = OchSPManager.getSn()+System.currentTimeMillis()
-                addWrite.driverId = LoginStatusManager.getLoginInfo()?.driverId?:0
+                addWrite.driverId = LoginStatusManager.getOchLoginInfo()?.driverId?:0
                addWrite.businessTime = System.currentTimeMillis()
                WriteOffDb.addOrUpdate(addWrite)
                val reslut = PassengerWriteOffResponse.Result(it.phone,it.ticketSize,it.ticketName,it.availableTimes?.toLong(),addWrite.businessTime)
@@ -259,7 +259,7 @@ class WriteOffCacheRepository : IWriteOffRepository {
        addWrite.ticketSize = passenger.passengerSize
        addWrite.ticketName = passenger.ticketName
        //addWrite.msgId = OchSPManager.getSn()+System.currentTimeMillis()
-        addWrite.driverId = LoginStatusManager.getLoginInfo()?.driverId?:0
+        addWrite.driverId = LoginStatusManager.getOchLoginInfo()?.driverId?:0
        //addWrite.businessTime = System.currentTimeMillis()
        addWrite.updateStatus = WriteOffDataBean.updated
        WriteOffDb.addOrUpdate(addWrite)
--- 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
@@ -4,10 +4,9 @@ import androidx.lifecycle.LifecycleOwner
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.mvp.Presenter
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
 import com.mogo.och.common.module.biz.login.ILoginCallback
-import com.mogo.och.common.module.biz.login.LoginStatusEnum
+import com.mogo.och.common.module.biz.login.EnumLoginStatus
 import com.mogo.och.common.module.biz.login.LoginStatusManager
 import com.mogo.och.common.module.biz.login.LoginStatusManager.isLogin
 import com.mogo.och.bridge.autopilot.OCHAdasAbilityManager
@@ -44,7 +43,7 @@ class BusPresenter(view: ShuttleFragment?) : Presenter<ShuttleFragment?>(view),
        OrderModel.release()
    }

-    override fun onStatusChange(currentStatus: LoginStatusEnum) {
+    override fun onLoginStatusChange(currentStatus: EnumLoginStatus) {
        d(TAG, " loginStatus =" + isLogin())
        if (!isLogin()) {
            BusTrajectoryManager.stopTrajReqLoop()