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

[Change]

Browse Source 
完成mogo-module-adas合并到MoGoEagleEye.core.function-impl.mogo-core-function-autopilot

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2022-02-08 20:26:15 +08:00
parent 117897d576
commit 4dc06e5817
31 changed files with 126 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
View File

@@ -10,20 +10,8 @@ import com.alibaba.android.arouter.facade.template.IProvider;
*/
public interface IMogoADASController extends IProvider {
/**
* 显示
*/
void showADAS();
void release();
/**
* 自车定位数据
*
* @param carDataCallback
*/
void setAdasCarDataCallback(IMogoAdasCarDataCallback carDataCallback);
/**
* 获取车身的定位纬度
*
@@ -31,6 +19,11 @@ public interface IMogoADASController extends IProvider {
*/
double getLastLat();
/**
* 设置自车的定位纬度
*/
void setLastLat(double lastLat);
/**
* 获取车身定位经度
*
@@ -38,6 +31,11 @@ public interface IMogoADASController extends IProvider {
*/
double getLastLon();
/**
* 设置自车的定位经度
*/
void setLastLon(double lastLon);
/**
* 获取由工控机传回的GPS星历时间
*
@@ -45,4 +43,9 @@ public interface IMogoADASController extends IProvider {
*/
String getSatelliteTime();
/**
* 设置自车的GPS星历时间
*/
void setSatelliteTime(String satelliteTime);
}

17
services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasCarDataCallback.java
View File

@@ -1,17 +0,0 @@
package com.mogo.service.adas;
import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo;
/**
* adas 自车位置数据回调
*
* @author tongchenfei
*/
public interface IMogoAdasCarDataCallback {
/**
* adas 数据回调
*
* @param msg 具体数据
*/
void onAdasCarDataCallback( AutopilotCarStateInfo msg );
}

2
services/mogo-service/build.gradle
View File

@@ -57,7 +57,6 @@ dependencies {
implementation rootProject.ext.dependencies.mogo_core_utils
implementation rootProject.ext.dependencies.mogocommons
implementation rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.moduleADAS
implementation rootProject.ext.dependencies.mogo_core_data
implementation rootProject.ext.dependencies.mogo_core_function_check
@@ -67,7 +66,6 @@ dependencies {
implementation project(':core:mogo-core-utils')
implementation project(":foudations:mogo-commons")
implementation project(":services:mogo-service-api")
implementation project(':modules:mogo-module-adas')
implementation project(':core:function-impl:mogo-core-function-check')
implementation project(':core:mogo-core-data')

70
services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
View File

@@ -3,95 +3,59 @@ package com.mogo.service.impl.adas;
import android.content.Context;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.eagle.core.network.utils.GsonUtil;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.module.adas.AdasProvider;
import com.mogo.module.adas.IAdasDataListener;
import com.mogo.service.adas.IMogoADASController;
import com.mogo.service.adas.IMogoAdasCarDataCallback;
import com.zhidao.autopilot.support.api.AutopilotServiceManage;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@Route(path = MogoServicePaths.PATH_ADAS_CONTROLLER)
public class MogoADASController implements IMogoADASController {
private static final String TAG = "MogoADASController";
private AdasProvider adasProvider;
private IAdasDataListener mAdasDataListener;
private IMogoAdasCarDataCallback mMogoAdasCarDataCallback;
private double mLastLon;
private double mLastLat;
private String satelliteTime;
private String mSatelliteTime;
@Override
public double getLastLat() {
return mLastLat;
}
@Override
public void setLastLat(double lastLat) {
mLastLat = lastLat;
}
@Override
public double getLastLon() {
return mLastLon;
}
@Override
public void setLastLon(double lastLon) {
mLastLon = lastLon;
}
@Override
public String getSatelliteTime() {
return satelliteTime;
return mSatelliteTime;
}
@Override
public void setSatelliteTime(String satelliteTime) {
mSatelliteTime = satelliteTime;
}
@Override
public void init(Context context) {
adasProvider = ARouter.getInstance().navigation(AdasProvider.class);
}
@Override
public void showADAS() {
Logger.d(TAG, "showADAS()");
init(AbsMogoApplication.getApp());
if (mAdasDataListener == null) {
mAdasDataListener = new IAdasDataListener() {
@Override
public void ownerCarStateInfo(String ownerCarStateInfo) {
// 接收 adas 定位数据线程
AutopilotCarStateInfo stateInfo = GsonUtil.objectFromJson(ownerCarStateInfo, AutopilotCarStateInfo.class);
if (stateInfo == null || stateInfo.getValues() == null) {
return;
}
mLastLon = stateInfo.getValues().getLon();
mLastLat = stateInfo.getValues().getLat();
satelliteTime = stateInfo.getValues().getSatelliteTime();
if (mMogoAdasCarDataCallback != null) {
mMogoAdasCarDataCallback.onAdasCarDataCallback(stateInfo);
}
}
};
adasProvider.addAdasEventListener(mAdasDataListener);
}
}
@Override
public void release() {
adasProvider.removeAdasEventListener(mAdasDataListener);
AutopilotServiceManage.getInstance().release();
}
@Override
public void setAdasCarDataCallback(IMogoAdasCarDataCallback carDataCallback) {
mMogoAdasCarDataCallback = carDataCallback;
}
}