obu数据通道基本打通，待实车验证

app/build.gradle

@@ -25,7 +25,7 @@ android {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-                abiFilters 'armeabi-v7a'
+                abiFilters 'armeabi-v7a','x86'
             }
         }
     }

app/src/main/java/com/mogo/launcher/MogoApplication.java

@@ -44,7 +44,6 @@ public class MogoApplication extends AbsMogoApplication {
         DebugConfig.setLaunchLocationService( BuildConfig.LAUNCH_LOCATION_SERVICE );
         DebugConfig.setUseCustomNavi( BuildConfig.USE_CUSTOM_NAVI );
         DebugConfig.setLauncher( BuildConfig.IS_LAUNCHER );
-        DebugConfig.setUseMockObuData(true);
         super.onCreate();
         // Crash 日志收集
         final long start = System.currentTimeMillis();

config.gradle

@@ -124,7 +124,7 @@ ext {
             socketsdkconnsvrprotoco  : 'com.zhidao.ptech:connsvr-protoco:0.1.23',
             socketsdkprotobufjava    : 'com.google.protobuf:protobuf-java:3.5.1',
             // OBU
-            moduleobu                : 'com.mogo.module:module-obu:${MOGO_MODULE_OBU}',
+            moduleobu                : "com.mogo.module:module-obu:${MOGO_MODULE_OBU}",
 
             //
             jetbrainsannotationsjava5: "org.jetbrains:annotations-java5:15.0",

modules/mogo-module-main/build.gradle

@@ -53,6 +53,7 @@ dependencies {
         api rootProject.ext.dependencies.mogoconnection
         api rootProject.ext.dependencies.moduleextensions
         api rootProject.ext.dependencies.mogomoduleback
+        api rootProject.ext.dependencies.moduleobu
     } else {
         api project(":foudations:mogo-utils")
         api project(":foudations:mogo-commons")
@@ -65,6 +66,7 @@ dependencies {
         api project(':foudations:mogo-connection')
         api project(':modules:mogo-module-extensions')
         api project(':modules:mogo-module-back')
+        api project(':modules:mogo-module-obu')
     }
 }
 

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -124,7 +124,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
             mMogoMapService.getHostListenerRegister().registerHostAimlessModeListener( EventDispatchCenter.getInstance() );
             mMogoMapService.getHostListenerRegister().registerMarkerClickListener( this );
         }
-
         mServiceApis.getObuManager().registerObuDataChangedListener(EventDispatchCenter.getInstance());
 
         EventDispatchCenter.getInstance().setMapLoadedCallback( () -> {

modules/mogo-module-obu/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'com.alibaba.arouter'
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
@@ -37,7 +39,7 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxccorektx
     implementation rootProject.ext.dependencies.androidxconstraintlayout
     implementation rootProject.ext.dependencies.arouter
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
 

modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java

@@ -16,14 +16,12 @@ import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.marker.IMogoMarkerClickListener;
-import com.mogo.map.marker.MogoMarkersHandler;
 import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant;
 import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListener;
 import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager;
 import com.mogo.module.share.bean.StepAfterAuth;
-import com.mogo.module.share.bean.StepAfterAuthKt;
 import com.mogo.module.share.constant.ShareConstants;
 import com.mogo.module.share.dialog.LaucherShareDialog;
 import com.mogo.module.share.manager.ServiceApisManager;
@@ -32,7 +30,6 @@ import com.mogo.service.MogoServicePaths;
 import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.service.intent.IMogoIntentManager;
 import com.mogo.service.module.IMogoModuleLifecycle;
-import com.mogo.service.obu.IMogoObuDataChangedListener;
 import com.mogo.service.share.IMogoShareManager;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
@@ -43,9 +40,6 @@ import org.json.JSONObject;
 import java.util.HashMap;
 import java.util.Map;
 import com.mogo.commons.analytics.AnalyticsUtils;
-import com.zhidao.smartv2x.model.obu.CarEventInfo;
-import com.zhidao.smartv2x.model.obu.CarLocationInfo;
-import com.zhidao.smartv2x.model.obu.TrafficLightInfo;
 
 import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SEEK_HELP;
 import static com.mogo.module.share.bean.StepAfterAuthKt.STEP_AFTER_AUTH_TYPE_SHOW_DIALOG;
@@ -202,27 +196,27 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo
                     UPLOAD_ROAD_CONSTRUCTION, this);
         }
 
-        ServiceApisManager.serviceApis.getRegisterCenterApi().registerObuDataListener("share", new IMogoObuDataChangedListener() {
-            @Override
-            public void showCarLocationInfo(CarLocationInfo info) {
-                Logger.d(TAG, "获取到car location info: " + info.carId);
-            }
-
-            @Override
-            public void showOtherInfo(String info) {
-                Logger.d(TAG, "获取到other info: " + info);
-            }
-
-            @Override
-            public void showTrafficLightInfo(TrafficLightInfo info) {
-                Logger.d(TAG, "获取到traffic light info: " + info.id);
-            }
-
-            @Override
-            public void showCarEventInfo(CarEventInfo info) {
-                Logger.d(TAG, "获取到car event info: " + info.describe);
-            }
-        });
+//        ServiceApisManager.serviceApis.getRegisterCenterApi().registerObuDataListener("share", new IMogoObuDataChangedListener() {
+//            @Override
+//            public void showCarLocationInfo(CarLocationInfo info) {
+//                Logger.d(TAG, "获取到car location info: " + info.carId);
+//            }
+//
+//            @Override
+//            public void showOtherInfo(String info) {
+//                Logger.d(TAG, "获取到other info: " + info);
+//            }
+//
+//            @Override
+//            public void showTrafficLightInfo(TrafficLightInfo info) {
+//                Logger.d(TAG, "获取到traffic light info: " + info.id);
+//            }
+//
+//            @Override
+//            public void showCarEventInfo(CarEventInfo info) {
+//                Logger.d(TAG, "获取到car event info: " + info.describe);
+//            }
+//        });
 
         Logger.d(TAG,"init over====");
     }