yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.7.0]

Browse Source 
[fix]
[退出登录环境还原]
This commit is contained in:
yangyakun
2024-10-24 15:40:04 +08:00
parent 066621ab41
commit 52ea40970b
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -445,6 +445,7 @@ object OrderModel {
}
MapMakerManager.removeAllMapMarkerByOwner(TAG)
BusTrajectoryManager.getInstance().stopTrajReqLoop();
RepositoryManager.release()
LoginStatusManager.loginOut()
}
}

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

@@ -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)
}
}