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

[6.8.4]

Browse Source 
[fea]
[代码整理]
This commit is contained in:
yangyakun
2024-12-06 18:18:31 +08:00
parent cee6be8bb5
commit 47718b2130
4 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/ContrailDataBean.kt
View File

@@ -62,17 +62,6 @@ data class ContrailDataBean(
) {
companion object {
const val ContrailDataTable: String = "contrail_data_table"
fun save2Common(contrail:ContrailDataBean?) {
contrail?.apply {
if (lineId == null || lineId!! < 0L||csvFileUrl.isNullOrEmpty()||csvFileMd5.isNullOrEmpty()||txtFileUrl.isNullOrEmpty()||txtFileMd5.isNullOrEmpty()) {
ToastUtils.showLong("请设置轨迹信息")
OchChainLogManager.writeChainLogAutopilot("轨迹错误",this.toString())
return
}
LineManager.setContraiInfo(ContraiInfo(lineId!!,csvFileUrl!!,csvFileMd5!!,txtFileUrl!!,txtFileMd5!!,contrailSaveTime!!))
}
}
}
override fun toString(): String {

9
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt
View File

@@ -2,7 +2,6 @@ package com.mogo.och.weaknet.repository.db.repository
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.util.TAG
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.common.module.utils.DateTimeUtil
@@ -16,6 +15,8 @@ import io.reactivex.Observable
object TaskDb : IDbRepository {
private const val TAG = "TaskDb"
private var taskDataDao: TaskDataDao? = null
get() {
if(field==null){
@@ -189,10 +190,4 @@ object TaskDb : IDbRepository {
}
interface TaskStatusCallback{
fun startSuccess()
fun startFail(msg:String)
}
}

3
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskSiteDb.kt
View File

@@ -1,7 +1,6 @@
package com.mogo.och.weaknet.repository.db.repository
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.util.TAG
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.weaknet.repository.db.IDbRepository
@@ -12,6 +11,8 @@ import com.mogo.och.weaknet.repository.db.exception.DbException
object TaskSiteDb: IDbRepository {
private const val TAG = "TaskSiteDb"
private var taskSiteDataDao: TaskSiteDataDao? = null
get() {
if(field==null){

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

@@ -8,15 +8,16 @@ 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.eagle.core.utilcode.util.ToastUtils
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
import com.mogo.och.data.bean.ContraiInfo
import com.mogo.och.weaknet.bean.request.ShuttleEventRequest
import com.mogo.och.weaknet.bean.response.BusRoutesResponse
import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
import com.mogo.och.weaknet.model.LineModel
import com.mogo.och.weaknet.model.LineModel.currentTask
import com.mogo.och.weaknet.repository.db.bean.ContrailDataBean
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.bean.TaskSiteDataBean
@@ -107,8 +108,13 @@ class WeaknetRepository : ILineRepository {
}
// 设置自动驾驶信息
currentTask?.lineId?.let {
val contraiInfoTemp = ContraiDb.queryAutopilotInfoByLineid(it)
ContrailDataBean.save2Common(contraiInfoTemp)
ContraiDb.queryAutopilotInfoByLineid(it)?.apply {
if (lineId == null || lineId!! < 0L||csvFileUrl.isNullOrEmpty()||csvFileMd5.isNullOrEmpty()||txtFileUrl.isNullOrEmpty()||txtFileMd5.isNullOrEmpty()) {
ToastUtils.showLong("请设置轨迹信息")
OchChainLogManager.writeChainLogAutopilot("轨迹错误",this.toString())
}
LineManager.setContraiInfo(ContraiInfo(lineId!!,csvFileUrl!!,csvFileMd5!!,txtFileUrl!!,txtFileMd5!!,contrailSaveTime!!))
}
}
return@flatMap Observable.just(true)
}