From 02c3b4e86c1bcaf52019ee3a7087ef11dc382681 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 7 Jun 2021 18:26:16 +0800 Subject: [PATCH] add xingyun obu --- config.gradle | 1 + .../extensions/entrance/EntranceFragment.java | 27 ---------- .../com/mogo/module/service/MogoServices.java | 2 - modules/mogo-module-v2x/build.gradle | 2 + .../com/mogo/module/v2x/V2XObuManager.java | 51 +++++++++++++++++++ .../impl/statusmanager/MogoStatusManager.java | 1 - 6 files changed, 54 insertions(+), 30 deletions(-) diff --git a/config.gradle b/config.gradle index 325b270279..40fc573a16 100644 --- a/config.gradle +++ b/config.gradle @@ -169,6 +169,7 @@ ext { // obu sdk obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", + mebulaobu : 'com.zhidao.support.nebulaobu:nebulaobu:1.0.0.1', // 左侧面板 moduleleftpanel : "com.mogo.module:module-left-panel:${MOGO_MODULE_LEFT_PANEL_VERSION}", // 左侧面板空实现 diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 69a96ba205..c7663c4a29 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -926,7 +926,6 @@ public class EntranceFragment extends MvpFragment "); -// if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { -// if ( ui == EnumMapUI.Type_VR ) { -// Log.d("liyz", "onMapModeChanged mLastStatusIsVr = " + mLastStatusIsVr + "--ui = " +ui); -// if ( !mLastStatusIsVr ) { -// MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true ); -// MapCenterPointStrategy.resetByChangeMode(); -//// MapMarkerManager.getInstance().redrawMarkerByStyleChanged(); -// if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { -// AIAssist.getInstance( getContext() ).speakTTSVoice( "已开启鹰眼模式" ); -// } -// mLastStatusIsVr = true; -// } -// } else { -// if ( mLastStatusIsVr ) { -// mLastStatusIsVr = false; -// MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, false ); -// MapCenterPointStrategy.resetByChangeMode(); -//// MapMarkerManager.getInstance().redrawMarkerByStyleChanged(); -// if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { -// AIAssist.getInstance( getContext() ).speakTTSVoice( "已退出鹰眼模式" ); -// } -// } -// } -// } - if (mCameraMode == null) { return; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index d9e2d98bf4..788ea3028c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -938,9 +938,7 @@ public class MogoServices implements IMogoMapListener, @Override public void onMapModeChanged( EnumMapUI ui ) { - Log.d("liyz", "onMapModeChanged ----> ui = " + ui); if ( ui == EnumMapUI.Type_VR ) { - Log.d("liyz", "onMapModeChanged mLastStatusIsVr = " + mLastStatusIsVr + "--ui = " +ui); if ( !mLastStatusIsVr ) { MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true ); MapCenterPointStrategy.resetByChangeMode(); diff --git a/modules/mogo-module-v2x/build.gradle b/modules/mogo-module-v2x/build.gradle index b84e556603..83006d78b3 100644 --- a/modules/mogo-module-v2x/build.gradle +++ b/modules/mogo-module-v2x/build.gradle @@ -94,6 +94,8 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' implementation project(':modules:mogo-module-obu') +// implementation rootProject.ext.dependencies.mebulaobu + } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java index 548639f6c4..2ab522c913 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java @@ -8,6 +8,7 @@ import android.os.Handler; import android.os.Message; import android.os.SystemClock; import android.util.ArrayMap; +import android.util.Log; import androidx.localbroadcastmanager.content.LocalBroadcastManager; @@ -32,10 +33,15 @@ import com.zhidao.mogo.module.obu.obu.IObuCallback; import com.zhidao.mogo.module.obu.obu.bean.MogoObuEventInfo; import com.zhidao.mogo.module.obu.obu.bean.MogoObuLocationInfo; import com.zhidao.mogo.module.obu.obu.bean.MogoObuTrafficLightInfo; +//import com.zhidao.support.nebulaobu.NebulaObuClient; +//import com.zhidao.support.nebulaobu.OnObuListener; +//import com.zhidao.support.nebulaobu.model.ActiveSafetyInfo; +//import com.zhidao.support.nebulaobu.model.ObuInfo; import org.json.JSONArray; import org.json.JSONObject; +import java.util.List; import java.util.Map; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; @@ -76,14 +82,59 @@ public class V2XObuManager implements IObuCallback, Handler.Callback { public void init(Context context) { Logger.d(MODULE_NAME, "obuManager初始化--"); + //之前内部对接的obu obuManager = new ObuManager(); obuManager.init(context); obuManager.registerObuDataChangedListener(this); + Logger.d("liyz", "obuManager初始化------> "); + //使用adas部门obu sdk (星云) +// NebulaObuClient.getInstance().init(context); +// NebulaObuClient.getInstance().registerObu(100); +// NebulaObuClient.getInstance().registerObuListener(listener); + IntentFilter filter = new IntentFilter("com.mogo.launcher.v2x.action.EXCHANGE_OBU_TYPE"); context.registerReceiver(obuTypeExchangeReceiver, filter); } + +// public void release() { +// NebulaObuClient.getInstance().unregisterObu(); +// NebulaObuClient.getInstance().unregisterObuListener(); +// } + + + /** + * 星云obu数据监听 + */ +// private OnObuListener listener = new OnObuListener() { +// @Override +// public void onRegister() { +// Log.d("liyz", "onRegister ------> "); +// } +// +// @Override +// public void onConnectFail(boolean isNeedReconnect) { +// Log.d("liyz", "onConnectFail ------> "); +// } +// +// @Override +// public void onUnregister() { +// Log.d("liyz", "onUnregister ------> "); +// } +// +// @Override +// public void onObuInfo(ObuInfo info) { +// Log.d("liyz", "onObuInfo ------> "); +// } +// +// @Override +// public void onWarningInfo(List infoList) { +// Log.d("liyz", "onWarningInfo ------> "); +// } +// }; + + /** * 用来处理30秒内不重复播报的情况 */ diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java index 42aa23f9a3..34181e7e32 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java @@ -169,7 +169,6 @@ public class MogoStatusManager implements IMogoStatusManager { @Override public void setVrMode(String tag, boolean vrMode) { - Log.d("liyz", "setVrMode --------> "); doSetStatus(tag, StatusDescriptor.VR_MODE, vrMode); }