Merge branch 'demo/shunyi_v2v' into demo/shunyi_v2v_merge

# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
#	modules/mogo-module-search/build.gradle
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java

services/mogo-service-api/build.gradle

@@ -42,6 +42,7 @@ dependencies {
     annotationProcessor rootProject.ext.dependencies.aroutercompiler
     api rootProject.ext.dependencies.fresco
     api rootProject.ext.dependencies.obusdk
+    api 'com.mogo.module:module-crash-warning:1'
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogomapapi
     } else {

services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java

@@ -25,6 +25,7 @@ import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.module.IMogoSettingManager;
 import com.mogo.service.monitor.IMogoMonitorProvider;
 import com.mogo.service.network.IMogoNetwork;
+import com.mogo.service.obu.IMogoCrashWarnProvider;
 import com.mogo.service.obu.IMogoObuManager;
 import com.mogo.service.passport.IMogoPassportManager;
 import com.mogo.service.share.IMogoShareManager;
@@ -257,4 +258,10 @@ public interface IMogoServiceApis extends IProvider {
      * @return
      */
     IMogoMonitorProvider getMogoMonitorApi();
+
+    /**
+     * 获取crashWarnProvider
+     * @return
+     */
+    IMogoCrashWarnProvider getCrashWarnProvider();
 }

services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java

@@ -244,4 +244,10 @@ public class MogoServicePaths {
      */
     @Deprecated
     public static final String PATH_STRATEGY_SHARE = "/share/strategy";
+
+    /**
+     * 碰撞报警模块
+     */
+    @Deprecated
+    public static final String PATH_CRASH_WARNING = "/crash/warning";
 }

services/mogo-service-api/src/main/java/com/mogo/service/obu/IMogoCrashWarnProvider.java

@@ -0,0 +1,22 @@
+package com.mogo.service.obu;
+
+import com.alibaba.android.arouter.facade.template.IProvider;
+import com.zhidao.manager.ts.TsThreshold;
+
+/**
+ * 碰撞报警相关接口
+ * @author tongchenfei
+ */
+public interface IMogoCrashWarnProvider extends IProvider {
+    /**
+     * 设置碰撞碰撞报警阈值
+     * @param threshold
+     */
+    void setCrashThreshold(TsThreshold threshold);
+
+    /**
+     * 获取当前碰撞报警阈值
+     * @return
+     */
+    TsThreshold getCurrentCrashThreshold();
+}

services/mogo-service-api/src/main/java/com/mogo/service/obu/IMogoObuManager.java

@@ -1,12 +1,12 @@
 package com.mogo.service.obu;
 
-import com.mogo.service.module.IMogoModuleProvider;
+import com.alibaba.android.arouter.facade.template.IProvider;
 import com.zhidao.smartv2x.listener.OnMessageReceiveListener;
 
 /**
  * obu事件管理器
  * @author tongchenfei
  */
-public interface IMogoObuManager extends IMogoModuleProvider, OnMessageReceiveListener{
+public interface IMogoObuManager extends IProvider, OnMessageReceiveListener{
     void registerObuDataChangedListener(IMogoObuDataChangedListener listener);
 }

services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java

@@ -33,6 +33,7 @@ import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.module.IMogoSettingManager;
 import com.mogo.service.monitor.IMogoMonitorProvider;
 import com.mogo.service.network.IMogoNetwork;
+import com.mogo.service.obu.IMogoCrashWarnProvider;
 import com.mogo.service.obu.IMogoObuManager;
 import com.mogo.service.passport.IMogoPassportManager;
 import com.mogo.service.share.IMogoShareManager;
@@ -218,6 +219,11 @@ public class MogoServiceApis implements IMogoServiceApis {
         return getApiInstance(IMogoMonitorProvider.class,MogoServicePaths.PATH_MOGO_MONITOR);
     }
 
+    @Override
+    public IMogoCrashWarnProvider getCrashWarnProvider() {
+        return getApiInstance(IMogoCrashWarnProvider.class, MogoServicePaths.PATH_CRASH_WARNING);
+    }
+
     private static < T extends IProvider > T getApiInstance(Class< T > clazz, String path ) {
         T inst = SingletonsHolder.get( clazz );
         if ( inst == null ) {