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

Merge branch 'dev_robotaxi-d_250417_8.0.0_routing' into dev_robotaxi-d_250709_8.2.0_advideo

Browse Source 
# Conflicts:
#	OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/MusicModel.kt
#	OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt
This commit is contained in:
yangyakun
2025-07-29 16:43:30 +08:00
parent 0523dcceab d2595e29dd
commit eca13ec7df
145 changed files with 4302 additions and 1389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OCH/offline/driver/src/main/java/com/mogo/och/offline/model/ThirdDeviceData.kt
View File

@@ -82,8 +82,8 @@ object ThirdDeviceData {
LedScreenManager.sendTripInfo2Led(
LedScreenManager.LEAVE_STATION,
lineInfo.lineName,
start.name,
end.name,
start.name?:"",
end.name?:"",
LineModel.isLastStation() == true
)
}
@@ -100,8 +100,8 @@ object ThirdDeviceData {
LedScreenManager.sendTripInfo2Led(
LedScreenManager.ARRIVE_STATION,
lineInfo.lineName,
start.name,
end.name,
start.name?:"",
end.name?:"",
LineModel.isLastStation(end)
)
}

3
OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/repository/SiteDb.kt
View File

@@ -3,7 +3,6 @@ package com.mogo.och.offline.repository.db.repository
import androidx.room.Transaction
import com.mogo.eagle.core.network.utils.digest.DigestUtils
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.offline.repository.db.bean.SiteDataBean
@@ -13,6 +12,8 @@ import com.mogo.och.offline.repository.db.dao.SiteDataDao
object SiteDb: IDbRepository {
private val TAG = "SiteDb"
private var siteDataDao: SiteDataDao? = null
get() {
if(field==null){