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

opt

Browse Source
This commit is contained in:
lixiaopeng
2022-03-24 16:00:46 +08:00
parent d4a4d41e4f
commit 40ab4b1083
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
View File

@@ -54,7 +54,7 @@ public class BindingcarNetWorkManager {
*/
public void getBindingcarInfo(String macAddress) {
String sn = MoGoAiCloudClientConfig.getInstance().getSn();
BindingcarRequest request = new BindingcarRequest(sn, "48:b0:2d:3a:9c:19");
BindingcarRequest request = new BindingcarRequest("48:b0:2d:3a:9c:19", sn);
RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
mBindingcarApiService.getBindingcarInfo(requestBody)
.subscribeOn(Schedulers.io())
@@ -95,7 +95,7 @@ public class BindingcarNetWorkManager {
*/
public void modifyBindingcar(String macAddress, BindingcarCallBack callBack) {
String sn = MoGoAiCloudClientConfig.getInstance().getSn();
BindingcarRequest request = new BindingcarRequest(sn, "48:b0:2d:3a:9c:19");
BindingcarRequest request = new BindingcarRequest("48:b0:2d:3a:9c:19", sn);
RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
mBindingcarApiService.modifyBindingcarInfo(requestBody)
.subscribeOn(Schedulers.io())

2
core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
View File

@@ -341,7 +341,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
// 调度
MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_AI_DISPATCH, "IDispatchProvider"));
// V2X 模块
// MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_V2X_MODULE, "V2XProvider"));
MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_V2X_MODULE, "V2XProvider"));
// 自动驾驶系统检测模块
MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_CHECK, "CheckProvider"));
// 推送模块

21
core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
View File

@@ -396,11 +396,13 @@ class MogoPrivateObuManager private constructor() {
&& info.ext_info.lights.isNotEmpty()
) {
//v2i数据传输延迟
val hvTime = info.threat_info.hv_time.millisecond
val currentTime = TimeUtils.getNowMills()
val hvMillTime = info.threat_info.hv_time.millisecond
val hvSecondMillTime = (info.threat_info.hv_time.second) * 1000
val hvTime = hvMillTime + hvSecondMillTime
val currentTime = TimeUtils.getNowMills() % 60000
val delayTime = currentTime - hvTime
//TODO
Log.e("liyz", "onCvxIvpThreatIndInfo hvTime---> $hvTime --- currentTime = $currentTime")
// Log.e("liyz", "onCvxIvpThreatIndInfo ---> currentTime = $currentTime ----- hvTime---> $hvTime ---hvMillTime = $hvMillTime ----hvSecondMillTime = $hvSecondMillTime ---delayTime---> $delayTime")
CallerObuListenerManager.invokeDelayTime(delayTime)
CallerLogger.e(
"$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
@@ -418,15 +420,18 @@ class MogoPrivateObuManager private constructor() {
// (2) 弱势交通参与者预警信息：CVX_PTC_THREAT_IND
override fun onCvxPtcThreatIndInfo(info: CvxPtcThreatIndInfo?) {
Log.e("liyz", "onCvxPtcThreatIndInfo ---> $info")
CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onCvxPtcInfoIndInfo ------> $info")
// 交通参与者类型 0x0:未知 UNKNOWN | 0x1:非机动车 NON_MOTOR | 0x2:行人 PEDESTRIAN 0x3:RSU
if (info != null && (info.ptc_type == 1 || info.ptc_type == 2)) {
//v2i数据传输延迟
val hvTime = info.threat_info.hv_time.millisecond
val currentTime = TimeUtils.getNowMills()
//v2i数据传输延迟
val hvMillTime = info.threat_info.hv_time.millisecond
val hvSecondMillTime = (info.threat_info.hv_time.second) * 1000
val hvTime = hvMillTime + hvSecondMillTime
val currentTime = TimeUtils.getNowMills() % 60000
val delayTime = currentTime - hvTime
Log.e("liyz", "onCvxPtcThreatIndInfo hvTime---> $hvTime --- currentTime = $currentTime")
// Log.e("liyz", "onCvxPtcThreatIndInfo ---> currentTime = $currentTime ----- hvTime---> $hvTime ---hvMillTime = $hvMillTime ----hvSecondMillTime = $hvSecondMillTime ---delayTime---> $delayTime")
CallerObuListenerManager.invokeDelayTime(delayTime)
CallerLogger.d(
"$M_OBU${MogoObuConst.TAG_MOGO_OBU}",