diff --git a/.idea/misc.xml b/.idea/misc.xml
index cd77a1f062..21e99e2dc0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 2b479554e4..ef8a91ff95 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -337,7 +337,7 @@ dependencies {
implementation rootProject.ext.dependencies.mogomoduleauth
implementation rootProject.ext.dependencies.modulemedia
implementation rootProject.ext.dependencies.moduleservice
- implementation rootProject.ext.dependencies.moduleobu
+// implementation rootProject.ext.dependencies.moduleobu
implementation rootProject.ext.dependencies.modulesplash
implementation rootProject.ext.dependencies.moduleV2x
implementation rootProject.ext.dependencies.moduletanlu, {
@@ -355,7 +355,7 @@ dependencies {
implementation project(':modules:mogo-module-authorize')
implementation project(':modules:mogo-module-media')
implementation project(':modules:mogo-module-service')
- implementation project(':modules:mogo-module-obu')
+// implementation project(':modules:mogo-module-obu')
implementation project(':modules:mogo-module-splash')
implementation project(':modules:mogo-module-v2x')
implementation project(':modules:mogo-module-tanlu'), {
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 3394d0a926..14ef1e191f 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -97,6 +97,7 @@ public class MogoApplication extends AbsMogoApplication {
// 碰撞报警模块
MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_CRASH_WARNING,
"CrashWarning"));
+
if ( !DebugConfig.isLauncher() ) {
PersistentManager.getInstance().initManager( this );
Intent intent = new Intent( this, MogoMainService.class );
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
index 4f9761ca27..b000edd5f7 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
@@ -28,7 +28,7 @@ public class DebugConfig {
*
* @param sDebug true - 调试模式 false - 非调试模式
*/
- public static void setDebug( boolean sDebug ) {
+ public static void setDebug(boolean sDebug) {
DebugConfig.sDebug = sDebug;
}
@@ -83,6 +83,15 @@ public class DebugConfig {
private static int sCarMachineType = CAR_MACHINE_TYPE_SELF_INNOVATE;
+ /**
+ * 西迪obu
+ */
+ public static final int OBU_TYPE_CIDI = 1;
+ /**
+ * 华砺智行obu
+ */
+ public static final int OBU_TYPE_HUALI = 2;
+
/**
* 获取网络环境类型
*
@@ -102,7 +111,7 @@ public class DebugConfig {
* {@link #NET_MODE_DEMO}
* {@link #NET_MODE_RELEASE}
*/
- public static void setNetMode( int netMode ) {
+ public static void setNetMode(int netMode) {
DebugConfig.sNetMode = netMode;
}
@@ -115,7 +124,7 @@ public class DebugConfig {
return sLaunchLocationService;
}
- public static void setLaunchLocationService( boolean launchLocationService ) {
+ public static void setLaunchLocationService(boolean launchLocationService) {
DebugConfig.sLaunchLocationService = launchLocationService;
}
@@ -128,7 +137,7 @@ public class DebugConfig {
return sUseCustomNavi;
}
- public static void setUseCustomNavi( boolean sUseCustomNavi ) {
+ public static void setUseCustomNavi(boolean sUseCustomNavi) {
DebugConfig.sUseCustomNavi = sUseCustomNavi;
}
@@ -137,8 +146,8 @@ public class DebugConfig {
*
* @param aiType {@link #AI_TYPE_NOOP} {@link #AI_TYPE_TXZ} {@link #AI_TYPE_SPEECH}
*/
- public static void setAIType( int aiType ) {
- Logger.d( "DebugConfig", "setAiType: " + aiType );
+ public static void setAIType(int aiType) {
+ Logger.d("DebugConfig", "setAiType: " + aiType);
sAIType = aiType;
}
@@ -154,7 +163,7 @@ public class DebugConfig {
*
* @param type {@link #CAR_MACHINE_TYPE_SELF_INNOVATE} {@link #CAR_MACHINE_TYPE_BYD}
*/
- public static void setCarMachineType( int type ) {
+ public static void setCarMachineType(int type) {
sCarMachineType = type;
}
@@ -176,7 +185,7 @@ public class DebugConfig {
return sIsLauncher;
}
- public static void setLauncher( boolean isLauncher ) {
+ public static void setLauncher(boolean isLauncher) {
DebugConfig.sIsLauncher = isLauncher;
}
@@ -186,7 +195,7 @@ public class DebugConfig {
return sRequestOnlineCarData;
}
- public static void setRequestOnlineCarData( boolean sRequestOnlineCarData ) {
+ public static void setRequestOnlineCarData(boolean sRequestOnlineCarData) {
DebugConfig.sRequestOnlineCarData = sRequestOnlineCarData;
}
@@ -199,13 +208,13 @@ public class DebugConfig {
return sActiveAIAssistFlag;
}
- public static void setActiveAIAssistFlag( boolean sActiveAIAssistFlag ) {
+ public static void setActiveAIAssistFlag(boolean sActiveAIAssistFlag) {
DebugConfig.sActiveAIAssistFlag = sActiveAIAssistFlag;
}
private static boolean useMockObuData;
- public static void setUseMockObuData( boolean use ) {
+ public static void setUseMockObuData(boolean use) {
useMockObuData = use;
}
@@ -224,13 +233,13 @@ public class DebugConfig {
*
* @param sProductFlavor
*/
- public static void setProductFlavor( String sProductFlavor ) {
+ public static void setProductFlavor(String sProductFlavor) {
DebugConfig.sProductFlavor = sProductFlavor;
}
private static String sSocketAppId;
- public static void setSocketAppId( String sSocketAppId ) {
+ public static void setSocketAppId(String sSocketAppId) {
DebugConfig.sSocketAppId = sSocketAppId;
}
@@ -247,14 +256,14 @@ public class DebugConfig {
return sRoadEventAnimated;
}
- public static void setRoadEventAnimated( boolean sRoadEventAnimated ) {
+ public static void setRoadEventAnimated(boolean sRoadEventAnimated) {
DebugConfig.sRoadEventAnimated = sRoadEventAnimated;
}
private static boolean sLoadGuideModule = false;
- public static void setLoadGuideModule( boolean sLoadGuideModule ) {
+ public static void setLoadGuideModule(boolean sLoadGuideModule) {
DebugConfig.sLoadGuideModule = sLoadGuideModule;
}
@@ -264,17 +273,27 @@ public class DebugConfig {
private static String SP_GUIDE = "SP_GUIDE_2020_09_09";
- public static String getSpGuide(){
+ public static String getSpGuide() {
return SP_GUIDE;
}
private static boolean isSkinSupported = false;
- public static void setSkinSupported( boolean isSkinSupported ) {
+ public static void setSkinSupported(boolean isSkinSupported) {
DebugConfig.isSkinSupported = isSkinSupported;
}
public static boolean isSkinSupported() {
return isSkinSupported;
}
+
+ private static int obuType = OBU_TYPE_HUALI;
+
+ public static int getObuType() {
+ return obuType;
+ }
+
+ public static void setObuType(int type) {
+ obuType = type;
+ }
}
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
index 1b7de74777..5320407166 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java
@@ -21,14 +21,10 @@ import com.mogo.map.navi.MogoTraffic;
import com.mogo.map.uicontroller.EnumMapUI;
import com.mogo.module.main.registercenter.MogoRegisterCenterHandler;
import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
-import com.mogo.service.obu.IMogoObuDataChangedListener;
import com.mogo.utils.logger.Logger;
import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode;
import com.zhidao.adasconfig.listener.IAdasSettingUIListener;
import com.zhidao.adasconfig.listener.IAdasSkinStyleListener;
-import com.zhidao.smartv2x.model.obu.CarEventInfo;
-import com.zhidao.smartv2x.model.obu.CarLocationInfo;
-import com.zhidao.smartv2x.model.obu.TrafficLightInfo;
import java.util.Iterator;
@@ -46,7 +42,6 @@ public class EventDispatchCenter implements
IMogoMapListener,
IMogoNaviListener2,
IMogoLocationListener,
- IMogoObuDataChangedListener,
IAdasSettingUIListener,
IAdasSkinStyleListener {
@@ -486,50 +481,6 @@ public class EventDispatchCenter implements
}
}
- @Override
- public void showCarLocationInfo( CarLocationInfo info ) {
- Iterator< IMogoObuDataChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getObuDataChangedListeners();
- if ( iterator == null ) {
- return;
- }
- while ( iterator.hasNext() ) {
- iterator.next().showCarLocationInfo( info );
- }
- }
-
- @Override
- public void showOtherInfo( String info ) {
- Iterator< IMogoObuDataChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getObuDataChangedListeners();
- if ( iterator == null ) {
- return;
- }
- while ( iterator.hasNext() ) {
- iterator.next().showOtherInfo( info );
- }
- }
-
- @Override
- public void showTrafficLightInfo( TrafficLightInfo info ) {
- Iterator< IMogoObuDataChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getObuDataChangedListeners();
- if ( iterator == null ) {
- return;
- }
- while ( iterator.hasNext() ) {
- iterator.next().showTrafficLightInfo( info );
- }
- }
-
- @Override
- public void showCarEventInfo( CarEventInfo info ) {
- Iterator< IMogoObuDataChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getObuDataChangedListeners();
- if ( iterator == null ) {
- return;
- }
- while ( iterator.hasNext() ) {
- iterator.next().showCarEventInfo( info );
- }
- }
-
@Override
public void northModel() {
Iterator< IMogoADASControlStatusChangedListener > iterator = MogoRegisterCenterHandler.getInstance().getAdasControlStatusChangedListeners();
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 61d14457c1..6b501fafc9 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -6,9 +6,6 @@ import android.util.Log;
import android.view.View;
import android.widget.FrameLayout;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.MvpActivity;
@@ -30,7 +27,6 @@ import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
import com.mogo.service.fragmentmanager.IMogoFragmentManager;
import com.mogo.service.map.IMogoMapService;
import com.mogo.service.module.IMogoModuleProvider;
-import com.mogo.service.obu.IMogoObuManager;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.skin.support.SkinMode;
import com.mogo.utils.logger.Logger;
@@ -40,6 +36,9 @@ import com.zhidao.autopilot.support.api.AutopilotServiceManage;
import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
/**
* @author congtaowang
* @since 2019-12-23
@@ -159,11 +158,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
mMogoMapService.getHostListenerRegister().registerMarkerClickListener( this );
}
- IMogoObuManager obuManager = mServiceApis.getObuManager();
- if(obuManager!=null) {
- obuManager.registerObuDataChangedListener(EventDispatchCenter.getInstance());
- }
-
if ( DebugConfig.isSkinSupported() ) {
initAdasControlStatusListener();
}
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java
index ec029d7bac..447b3005cc 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java
@@ -13,7 +13,6 @@ import com.mogo.service.MogoServicePaths;
import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
import com.mogo.service.module.IMogoModuleLifecycle;
import com.mogo.service.module.IMogoRegisterCenter;
-import com.mogo.service.obu.IMogoObuDataChangedListener;
import java.util.Iterator;
@@ -101,16 +100,6 @@ public class MogoRegisterCenter implements IMogoRegisterCenter {
MogoRegisterCenterHandler.getInstance().unregisterCarLocationChangedListener( tag, listener );
}
- @Override
- public void registerObuDataListener( String tag, IMogoObuDataChangedListener listener ) {
- MogoRegisterCenterHandler.getInstance().registerObuDataListener( tag, listener );
- }
-
- @Override
- public void unregisterObuDataListener( String tag ) {
- MogoRegisterCenterHandler.getInstance().unregisterObuDataListener( tag );
- }
-
@Override
public void registerADASControlStatusChangedListener( String tag, IMogoADASControlStatusChangedListener listener ) {
MogoRegisterCenterHandler.getInstance().registerADASControlStatusChangedListener( tag, listener );
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java
index 060bfe8d67..d4a009fa7d 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java
@@ -11,7 +11,6 @@ import com.mogo.map.navi.IMogoNaviListener;
import com.mogo.service.adas.IMogoADASControlStatusChangedListener;
import com.mogo.service.module.IMogoModuleLifecycle;
import com.mogo.service.module.IMogoRegisterCenter;
-import com.mogo.service.obu.IMogoObuDataChangedListener;
import java.util.HashMap;
import java.util.Iterator;
@@ -34,7 +33,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
private Map< String, IMogoMarkerClickListener > mMarker = new HashMap<>();
private Map< String, IMogoAimlessModeListener > mAimless = new HashMap<>();
private Map< String, IMogoCarLocationChangedListener > mCarLocations = new HashMap<>();
- private Map< String, IMogoObuDataChangedListener > mObus = new HashMap<>();
private Map< String, IMogoADASControlStatusChangedListener > mADAS = new HashMap<>();
private MogoRegisterCenterHandler() {
@@ -126,16 +124,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
mCarLocations.remove( tag );
}
- @Override
- public void registerObuDataListener( String tag, IMogoObuDataChangedListener listener ) {
- mObus.put( tag, listener );
- }
-
- @Override
- public void unregisterObuDataListener( String tag ) {
- mObus.remove( tag );
- }
-
@Override
public void registerADASControlStatusChangedListener( String tag, IMogoADASControlStatusChangedListener listener ) {
mADAS.put( tag, listener );
@@ -182,10 +170,6 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
return mNavi.values().iterator();
}
- public Iterator< IMogoObuDataChangedListener > getObuDataChangedListeners() {
- return mObus.values().iterator();
- }
-
@Override
public Iterator< IMogoLocationListener > getLocationListeners() {
return mLocation.values().iterator();
diff --git a/modules/mogo-module-obu/build.gradle b/modules/mogo-module-obu/build.gradle
index b48130dc8d..a1be0b0c2e 100644
--- a/modules/mogo-module-obu/build.gradle
+++ b/modules/mogo-module-obu/build.gradle
@@ -39,6 +39,9 @@ dependencies {
kapt rootProject.ext.dependencies.aroutercompiler
implementation rootProject.ext.dependencies.rxjava
implementation rootProject.ext.dependencies.rxandroid
+
+ implementation rootProject.ext.dependencies.obusdk
+ implementation 'com.mogo.module:module-crash-warning:1.1.0'
if (Boolean.valueOf(RELEASE)) {
implementation rootProject.ext.dependencies.modulecommon
} else {
diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt
index 67895e4ea2..472c0f6bb7 100644
--- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt
+++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt
@@ -26,12 +26,12 @@ import kotlin.random.Random
*/
object MockUtil {
const val TAG = "MockUtil"
- private lateinit var dataCallback : OnMessageReceiveListener
+ private var dataCallback : OnMessageReceiveListener?=null
private lateinit var intervalObs:Disposable
private lateinit var intervalObs2:Disposable
- fun init(context: Context, callback: OnMessageReceiveListener){
+ fun init(context: Context, callback: OnMessageReceiveListener? = null){
Logger.d(TAG, "使用模拟obu数据===")
dataCallback = callback
val api = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis
@@ -45,7 +45,7 @@ object MockUtil {
0 -> "已更改前方红绿灯状态,可优先通行"
else -> "已增加前方绿灯时间,可优先通行"
}
- dataCallback.showCarEventInfo(carEventInfo)
+ dataCallback?.showCarEventInfo(carEventInfo)
}
view.findViewById