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

[6.9.0]

Browse Source 
[fea]
[driver]
[时间同步算法优化]
This commit is contained in:
yangyakun
2025-01-03 11:35:29 +08:00
parent 0e707da214
commit 4bdbee3056
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/common/biz/src/main/java/com/mogo/och/biz/time/TimeProvider.kt
View File

@@ -80,7 +80,7 @@ class TimeProvider : TimeService {
d(TAG, "时间同步_请求时间信息成功:${data};时间差是:${offset}_路上的时间:${delay}")
if(netTime>3_000){
// 网络延迟大 10s 同步一次
RxUtils.createSubscribeOnOwnThread(60_000) {
RxUtils.createSubscribeOnOwnThread(30_000) {
loadNewTime()
}
}else{

31
OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/line/LineManager.kt
View File

@@ -18,7 +18,7 @@ import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchMana
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON
import com.mogo.eagle.core.utilcode.util.CoordinateUtils
import com.mogo.eagle.core.utilcode.util.StringUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
@@ -42,7 +42,7 @@ import kotlin.properties.Delegates
* 订单中
*/
object LineManager : CallerBase<ILineCallback>() {
const val TAG = "LineManager"
const val TAG = M_OCHCOMMON+"LineManager"
const val firstStationFirstStartAutopilotFlag = 1
const val middleStationFirstStartAutopilotFlag = 2
@@ -124,10 +124,12 @@ object LineManager : CallerBase<ILineCallback>() {
val ochInfo = OchInfo(0, mutableListOf(start.toMogoLocation(), end.toMogoLocation()))
CallerDataCenterBizListener.invokeOchInfo(ochInfo)
OchChainLogManager.writeChainLogMap("向地图传参数", "参数信息:${ochInfo}")
d(TAG,"向地图传参数_参数信息:${ochInfo}")
}else{
val ochInfo = OchInfo(0, mutableListOf())
CallerDataCenterBizListener.invokeOchInfo(ochInfo)
OchChainLogManager.writeChainLogMap("向地图传参数", "参数信息:${ochInfo}")
d(TAG,"向地图传参数_参数信息:${ochInfo}")
}
}
}
@@ -165,6 +167,7 @@ object LineManager : CallerBase<ILineCallback>() {
*/
val token = CallerAutoPilotControlManager.sendSsmFuncQueryAutoPilotStation(teleOrderId)
OchChainLogManager.writeChainLogAutopilot("到站逻辑","距离站点：$distance 请求token：$token")
d(TAG,"到站逻辑_距离站点：$distance 请求token：$token")
}
}
}
@@ -212,12 +215,14 @@ object LineManager : CallerBase<ILineCallback>() {
setAutopilotControlParameters()
}
OchChainLogManager.writeChainLogAutopilot("自驾参数", "站点信息:${startStation}---${endStation}")
d(TAG,"自驾参数 设置站点_站点信息:${startStation}---${endStation}")
}
fun setContraiInfo(contraiInfo: ContraiInfo?){
this._contraiInfo = contraiInfo
setAutopilotControlParameters()
OchChainLogManager.writeChainLogAutopilot("自驾参数", "轨迹信息:${contraiInfo}")
d(TAG,"自驾参数 设置轨迹_轨迹信息:${contraiInfo}")
}
@JvmStatic
@@ -237,10 +242,12 @@ object LineManager : CallerBase<ILineCallback>() {
sb.append(it.value)
}
OchChainLogManager.writeChainLogAutopilot("设置线路", "$sb")
d(TAG,"自驾参数 设置线路_线路信息:${_lineInfos}_${sb}")
CallerEagleBaseFunctionCall4OchManager.updateOrderLine(sb.toString())
}
}
OchChainLogManager.writeChainLogAutopilot("设置线路", "线路信息:$_lineInfos")
d(TAG,"自驾参数 设置线路_线路信息:${_lineInfos}")
}
fun getStations(): Pair<BusStationBean?, BusStationBean?> {
@@ -254,7 +261,6 @@ object LineManager : CallerBase<ILineCallback>() {
return
}
}
OchChainLogManager.writeChainLog("异常情况","startStation:${startStation}__endStation:$endStation")
}
fun getStationsWithLine(function: (start: BusStationBean, end: BusStationBean, lineInfo: LineInfo) -> Unit) {
@@ -266,10 +272,6 @@ object LineManager : CallerBase<ILineCallback>() {
}
}
}
OchChainLogManager.writeChainLog(
"异常情况",
"startStation:${startStation}__endStation:${endStation}__lineInfos:$_lineInfos"
)
}
fun getStationsWithLineAndContrai(function: (start: BusStationBean, end: BusStationBean, lineInfo: LineInfo, contrai: ContraiInfo) -> Unit) {
@@ -283,10 +285,6 @@ object LineManager : CallerBase<ILineCallback>() {
}
}
}
OchChainLogManager.writeChainLog(
"异常情况",
"startStation:${startStation}__endStation:${endStation}__lineInfos:${_lineInfos}__contraiInfo:$_contraiInfo"
)
}
fun getStartStation(function: (start: BusStationBean) -> Unit) {
@@ -294,7 +292,6 @@ object LineManager : CallerBase<ILineCallback>() {
function.invoke(start)
return
}
OchChainLogManager.writeChainLog("异常情况", "startStation:$startStation")
}
fun getLineInfo(function: (lineInfo: LineInfo) -> Unit){
@@ -302,7 +299,6 @@ object LineManager : CallerBase<ILineCallback>() {
function.invoke(line)
return
}
OchChainLogManager.writeChainLog("异常情况", "lineInfos:$_lineInfos")
}
@@ -319,10 +315,10 @@ object LineManager : CallerBase<ILineCallback>() {
getStationsWithLine { start, end, lineInfo ->
val parameters = initAutopilotControlParameters()
if (null == parameters) {
e(M_BUS + TAG, "AutopilotControlParameters is empty.")
e(TAG, "AutopilotControlParameters is empty.")
return@getStationsWithLine
}
d(M_BUS + TAG, "AutopilotControlParameters is update.")
d(TAG, "AutopilotControlParameters is update.")
if (lineInfo.isFirstStation(start)) {
autopilotFlag = firstStationFirstStartAutopilotFlag
}else{
@@ -561,15 +557,14 @@ object LineManager : CallerBase<ILineCallback>() {
val parameters = initAutopilotControlParameters()
if (null == parameters) {
e(M_BUS + TAG, "行程日志-AutopilotControlParameters is empty.")
e(TAG, "行程日志-AutopilotControlParameters is empty.")
return
}
val sessionId = startAutoPilot(parameters)
OchAutopilotAnalytics.triggerUpdateStartAutoPilotSessionId(sessionId)
d(
M_BUS + TAG,
d(TAG,
"行程日志-开启自动驾驶====" + GsonUtil.jsonFromObject(parameters)
+ " startLatLon=" + parameters.startName + "，endLatLon=" + parameters.endName +
"isRestart = " + isFirstStartAutopilot