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

add xingyun obu

Browse Source
This commit is contained in:
lixiaopeng
2021-06-07 18:26:16 +08:00
parent 4730ff3a4e
commit 02c3b4e86c
6 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config.gradle
View File

@@ -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}",
// 左侧面板空实现

27
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -926,7 +926,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
}
} else if (descriptor == StatusDescriptor.VR_MODE) {
try {
Log.d("liyz", "vr isTrue = " + isTrue);
if (isTrue) {
enterVrMode();
} else {
@@ -1114,32 +1113,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
@Override
public void onMapModeChanged(EnumMapUI ui) {
Log.d("liyz", "fragment onMapModeChanged -----> ");
// 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;
}

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -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();

2
modules/mogo-module-v2x/build.gradle
View File

@@ -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()

51
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
View File

@@ -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<ActiveSafetyInfo> infoList) {
// Log.d("liyz", "onWarningInfo ------> ");
// }
// };
/**
* 用来处理30秒内不重复播报的情况
*/

1
services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
View File

@@ -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);
}