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

修改guide模块依赖，解决1+16上adas不显示的问题。

Browse Source
This commit is contained in:
wangcongtao
2020-11-24 17:38:02 +08:00
parent efc3fc75f0
commit 3a3467138a
11 changed files with 164 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,8 +7,11 @@ import android.content.Intent;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.context.ContextHolderUtil;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.common.map.MyLocationUtil;
import com.mogo.module.common.utils.CarSeries;
import com.mogo.service.MogoServicePaths;
@@ -60,7 +63,7 @@ public class MogoADASController implements IMogoADASController {
private List<IMogoAdasDataCallback> adasDataCallbackList = new ArrayList<>();
private boolean mIsReleased = true;
private IAutopolitDataCallBack mAutopolitDataCallBack;
@Override
public void openADAS() {
@@ -80,8 +83,11 @@ public class MogoADASController implements IMogoADASController {
@Override
public void showADAS() {
if ( !SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getBoolean( getSpGuide(), false ) ) {
return;
if( DebugConfig.isNeedLoadGuideModule() ){
if ( !SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getBoolean( getSpGuide(), false ) ) {
return;
}
}
init( AbsMogoApplication.getApp() );
AutopilotServiceManage.getInstance().registerAutopilotServiceStatusListener( new IAutopilotServiceStatusListener() {
@@ -96,54 +102,58 @@ public class MogoADASController implements IMogoADASController {
}
} );
invokeShowADASOperation();
AutopilotServiceManage.getInstance().registerAutopilotDataListener(new IAutopolitDataCallBack() {
@Override
public void sendMsg(String msg) {
Logger.d(TAG, "收到adas数据回调: " + msg);
for (IMogoAdasDataCallback callback : adasDataCallbackList) {
try {
callback.onAdasDataCallback(msg);
} catch ( Exception e ) {
Logger.e( TAG, e, "sendMsg" );
if ( mAutopolitDataCallBack == null ) {
mAutopolitDataCallBack = new IAutopolitDataCallBack() {
@Override
public void sendMsg( String msg ) {
Logger.d( TAG, "收到adas数据回调: " + msg );
for ( IMogoAdasDataCallback callback : adasDataCallbackList ) {
try {
callback.onAdasDataCallback( msg );
} catch ( Exception e ) {
Logger.e( TAG, e, "sendMsg" );
}
}
}
}
@Override
public void cameraEyeDetectResult(String detectResult) {
@Override
public void cameraEyeDetectResult( String detectResult ) {
}
@Override
public void selectCarModelUrl(String carStyleUrl) {
Logger.d(TAG,"selectCarModelUrl: "+carStyleUrl);
needEmphasizeMyLocation = true;
// 修改自车图标展示
SharedPrefsMgr.getInstance(context).putString("MY_LOCATION_CONFIG", carStyleUrl);
MyLocationUtil.setMyLocationIconUrl(context, carStyleUrl);
}
@Override
public void requestGetCarModelListInfo() {
Logger.d(TAG, "requestGetCarModelListInfo");
// 向adas发送车模list
AutopilotServiceManage.getInstance().settingCarModelListInfo(SharedPrefsMgr.getInstance(context).getString(
"CAR_MODEL_LIST", "default-value"));
}
@Override
public void clickSettingBack() {
if (needEmphasizeMyLocation) {
MyLocationUtil.emphasizeMyLocation();
}
needEmphasizeMyLocation = false;
}
@Override
public void showToast(String msg) {
UiThreadHandler.post(() -> TipToast.tip(msg));
}
});
@Override
public void selectCarModelUrl( String carStyleUrl ) {
Logger.d( TAG, "selectCarModelUrl: " + carStyleUrl );
needEmphasizeMyLocation = true;
// 修改自车图标展示
SharedPrefsMgr.getInstance( context ).putString( "MY_LOCATION_CONFIG", carStyleUrl );
MyLocationUtil.setMyLocationIconUrl( context, carStyleUrl );
}
@Override
public void requestGetCarModelListInfo() {
Logger.d( TAG, "requestGetCarModelListInfo" );
// 向adas发送车模list
AutopilotServiceManage.getInstance().settingCarModelListInfo( SharedPrefsMgr.getInstance( context ).getString(
"CAR_MODEL_LIST", "default-value" ) );
}
@Override
public void clickSettingBack() {
if ( needEmphasizeMyLocation ) {
MyLocationUtil.emphasizeMyLocation();
}
needEmphasizeMyLocation = false;
}
@Override
public void showToast( String msg ) {
UiThreadHandler.post( () -> TipToast.tip( msg ) );
}
};
AutopilotServiceManage.getInstance().registerAutopilotDataListener( mAutopolitDataCallBack );
}
}
private void invokeShowADASOperation() {
@@ -212,7 +222,6 @@ public class MogoADASController implements IMogoADASController {
public void init( Context context ) {
AutopilotServiceManage.getInstance().init( context );
this.context = context;
mIsReleased = false;
}
@Override
@@ -227,7 +236,7 @@ public class MogoADASController implements IMogoADASController {
@Override
public void changeAdasControlMode( EnumMapUI ui ) {
if ( ui == null ) {
if ( ui == null || !DebugConfig.isMapBased() ) {
return;
}
@@ -260,6 +269,9 @@ public class MogoADASController implements IMogoADASController {
@Override
public EnumMapUI getCurrentSkinMode() {
if ( !DebugConfig.isMapBased() ) {
return EnumMapUI.Type_Night;
}
boolean white = AdasConfigApiController.getInstance().isShowUISkinWhiteModel();
if ( !white ) {
return EnumMapUI.Type_Night;
@@ -288,7 +300,6 @@ public class MogoADASController implements IMogoADASController {
@Override
public void release() {
mIsReleased = true;
AutopilotServiceManage.getInstance().release();
}
}