Merge branch 'dev_obu' into dev

# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java

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/EventDispatchCenter.java

@@ -20,7 +20,11 @@ import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.navi.MogoTraffic;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.main.registercenter.MogoRegisterCenterHandler;
+import com.mogo.service.obu.IMogoObuDataChangedListener;
 import com.mogo.utils.logger.Logger;
+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;
 
@@ -37,7 +41,8 @@ public class EventDispatchCenter implements
         IMogoCarLocationChangedListener2,
         IMogoMapListener,
         IMogoNaviListener2,
-        IMogoLocationListener {
+        IMogoLocationListener,
+        IMogoObuDataChangedListener {
 
 
     private static volatile EventDispatchCenter sInstance;
@@ -459,4 +464,48 @@ 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);
+        }
+    }
 }

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

@@ -8,27 +8,21 @@ import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.viewpager.widget.ViewPager;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.MvpActivity;
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.location.IMogoLocationClient;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.uicontroller.IMogoMapUIController;
-import com.mogo.module.common.MogoModule;
-import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.common.map.MapCenterPointStrategy;
 import com.mogo.module.common.map.Scene;
-import com.mogo.module.main.cards.MogoModulesHandler;
 import com.mogo.module.main.cards.MogoModulesManager;
 import com.mogo.module.main.service.MogoMainService;
 import com.mogo.module.main.windowview.FloatingViewHandler;
-import com.mogo.module.service.ServiceConst;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.fragmentmanager.IMogoFragmentManager;
@@ -38,8 +32,6 @@ import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.autopilot.support.api.AutopilotServiceManage;
 
-import org.aspectj.lang.annotation.Around;
-
 import java.util.List;
 
 /**
@@ -132,6 +124,7 @@ 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( () -> {
             Logger.d( TAG, "map loaded." + Thread.currentThread().getName() );

modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenter.java

@@ -12,9 +12,9 @@ import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.module.IMogoRegisterCenter;
+import com.mogo.service.obu.IMogoObuDataChangedListener;
 
 import java.util.Iterator;
-import java.util.List;
 
 /**
  * @author congtaowang
@@ -100,6 +100,16 @@ 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 init( Context context ) {
     }

modules/mogo-module-main/src/main/java/com/mogo/module/main/registercenter/MogoRegisterCenterHandler.java

@@ -10,6 +10,7 @@ import com.mogo.map.navi.IMogoCarLocationChangedListener;
 import com.mogo.map.navi.IMogoNaviListener;
 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;
@@ -32,6 +33,7 @@ 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 MogoRegisterCenterHandler() {
     }
@@ -122,6 +124,16 @@ 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 init( Context context ) {
     }
@@ -158,6 +170,9 @@ 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();
@@ -176,5 +191,4 @@ public class MogoRegisterCenterHandler implements IMogoRegisterCenter {
         return mCarLocations.values().iterator();
     }
 
-
 }

modules/mogo-module-obu/.gitignore

@@ -0,0 +1 @@
+/build

modules/mogo-module-obu/build.gradle

@@ -0,0 +1,53 @@
+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
+    // buildToolsVersion rootProject.ext.android.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode Integer.valueOf(VERSION_CODE)
+        versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [AROUTER_MODULE_NAME: project.getName()]
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.androidxrecyclerview
+    implementation rootProject.ext.dependencies.androidxccorektx
+    implementation rootProject.ext.dependencies.androidxconstraintlayout
+    implementation rootProject.ext.dependencies.arouter
+    kapt rootProject.ext.dependencies.aroutercompiler
+    implementation rootProject.ext.dependencies.rxjava
+    implementation rootProject.ext.dependencies.rxandroid
+
+    if (Boolean.valueOf(RELEASE)) {
+        implementation rootProject.ext.dependencies.modulecommon
+    } else {
+        implementation project(':modules:mogo-module-common')
+    }
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

modules/mogo-module-obu/gradle.properties

@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-obu
+VERSION_CODE=1

modules/mogo-module-obu/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

modules/mogo-module-obu/src/androidTest/java/com/zhidao/mogo/module/obu/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.zhidao.mogo.module.obu
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.zhidao.mogo.module.obu.test", appContext.packageName)
+    }
+}

modules/mogo-module-obu/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.zhidao.mogo.module.obu">
+
+    /
+</manifest>

modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/MockUtil.kt

@@ -0,0 +1,56 @@
+package com.zhidao.mogo.module.obu
+
+import com.mogo.service.obu.IMogoObuDataChangedListener
+import com.mogo.utils.logger.Logger
+import com.zhidao.smartv2x.listener.OnMessageReceiveListener
+import com.zhidao.smartv2x.model.obu.CarEventInfo
+import com.zhidao.smartv2x.model.obu.CarLocationInfo
+import com.zhidao.smartv2x.model.obu.TrafficLightInfo
+import io.reactivex.Observable
+import io.reactivex.Scheduler
+import io.reactivex.Single
+import io.reactivex.disposables.Disposable
+import io.reactivex.internal.operators.single.SingleSubscribeOn
+import io.reactivex.schedulers.Schedulers
+import java.util.concurrent.TimeUnit
+
+/**
+ * 模拟相关操作及数据的单例类
+ *
+ * @author tongchenfei
+ */
+object MockUtil {
+    const val TAG = "MockUtil"
+    private lateinit var dataCallback : OnMessageReceiveListener
+
+    private lateinit var intervalObs:Disposable
+
+    fun init(callback: OnMessageReceiveListener){
+        Logger.d(TAG, "使用模拟obu数据===")
+        dataCallback = callback
+        intervalMockData()
+    }
+
+    private fun intervalMockData(){
+        intervalObs = Observable.interval(1000,TimeUnit.MILLISECONDS).map {
+            it.toString()
+        }.subscribe {
+            val carLocationInfo = CarLocationInfo()
+            carLocationInfo.carId = "carLocation$it"
+            dataCallback.showCarLocationInfo(carLocationInfo)
+            val other = "other$it"
+            dataCallback.showOtherInfo(other)
+            val eventInfo = CarEventInfo()
+            eventInfo.describe = "event des $it"
+            eventInfo.type = "event type $it"
+            dataCallback.showCarEventInfo(eventInfo)
+            val traffic = TrafficLightInfo()
+            traffic.id = "traffic $it"
+            dataCallback.showTrafficLightInfo(traffic)
+        }
+    }
+
+    fun  destroy(){
+        intervalObs.dispose()
+    }
+}

modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuConstant.java

@@ -0,0 +1,9 @@
+package com.zhidao.mogo.module.obu;
+
+/**
+ * obu涉及的常量汇总
+ *
+ * @author tongchenfei
+ */
+class ObuConstant {
+}

modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/ObuManager.kt

@@ -0,0 +1,128 @@
+package com.zhidao.mogo.module.obu
+
+import android.content.Context
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.commons.debug.DebugConfig
+import com.mogo.map.listener.IMogoMapListener
+import com.mogo.map.location.IMogoLocationListener
+import com.mogo.map.marker.IMogoMarkerClickListener
+import com.mogo.map.navi.IMogoNaviListener
+import com.mogo.service.MogoServicePaths
+import com.mogo.service.module.IMogoModuleLifecycle
+import com.mogo.service.obu.IMogoObuDataChangedListener
+import com.mogo.service.obu.IMogoObuManager
+import com.mogo.utils.logger.Logger
+import com.zhidao.smartv2x.api.V2xController
+import com.zhidao.smartv2x.model.obu.CarEventInfo
+import com.zhidao.smartv2x.model.obu.CarLocationInfo
+import com.zhidao.smartv2x.model.obu.TrafficLightInfo
+
+/**
+ * obu provider
+ *
+ * @author tongchenfei
+ */
+@Route(path = MogoServicePaths.PATH_OBU)
+class ObuManager: IMogoObuManager {
+    companion object{
+        const val TAG = "ObuManger"
+    }
+    private var dataChangedListener: IMogoObuDataChangedListener? = null
+
+    private var handler = Handler(Looper.getMainLooper())
+
+    override fun getNaviListener(): IMogoNaviListener? {
+        return null
+    }
+
+    override fun getLocationListener(): IMogoLocationListener? {
+        return null
+    }
+
+    override fun getType(): Int {
+        return 0
+    }
+
+    override fun getMarkerClickListener(): IMogoMarkerClickListener? {
+        return null
+    }
+
+    override fun init(context: Context) {
+        Logger.d(TAG,"init=======")
+        if (DebugConfig.isUseMockObuData()) {
+            MockUtil.init(this)
+        } else {
+            // 初始化sdk，注册数据回调等信息
+            V2xController.getInstance().setMessageReceiveListener(this@ObuManager)
+        }
+    }
+
+    override fun getMapListener(): IMogoMapListener? {
+        return null
+    }
+
+    override fun getAppPackage(): String {
+        return ""
+    }
+
+    override fun createView(context: Context?): View? {
+        return null
+    }
+
+    override fun createFragment(context: Context?, data: Bundle?): Fragment? {
+        return null
+    }
+
+    override fun getModuleName(): String {
+        return "moduleObu"
+    }
+
+    override fun getAppName(): String {
+        return ""
+    }
+
+    override fun getCardLifecycle(): IMogoModuleLifecycle? {
+        return null
+    }
+
+    override fun registerObuDataChangedListener(listener: IMogoObuDataChangedListener?) {
+        this.dataChangedListener = listener
+    }
+
+    /**
+     * 车辆位置信息回调接口
+     */
+    override fun showCarLocationInfo(info: CarLocationInfo?) {
+        Logger.d(TAG, "thread: ${Thread.currentThread()} showCarLocationInfo: ${info?.carId}")
+        dataChangedListener?.showCarLocationInfo(info)
+    }
+
+    /**
+     * UDP 收发消息回调接口
+     */
+    override fun showOtherInfo(info: String?) {
+        Logger.d(TAG, "thread: ${Thread.currentThread()} showOtherInfo: $info")
+        dataChangedListener?.showOtherInfo(info)
+    }
+
+    /**
+     * 交通信号灯信息回调接口
+     */
+    override fun showTrafficLightInfo(info: TrafficLightInfo?) {
+        Logger.d(TAG, "thread: ${Thread.currentThread()} showTrafficLightInfo: ${info?.id}")
+        dataChangedListener?.showTrafficLightInfo(info)
+    }
+
+    /**
+     * 场景触发事件信息回调接口
+     */
+    override fun showCarEventInfo(info: CarEventInfo?) {
+        Logger.d(TAG, "thread: ${Thread.currentThread()} showCarEventInfo: ${info?.type}")
+        dataChangedListener?.showCarEventInfo(info)
+    }
+}

modules/mogo-module-obu/src/test/java/com/zhidao/mogo/module/obu/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package com.zhidao.mogo.module.obu
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

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,6 +30,7 @@ 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;
@@ -42,6 +41,9 @@ 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;
@@ -198,6 +200,28 @@ 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);
+            }
+        });
+
         Logger.d(TAG,"init over====");
     }