Merge branch 'dev_robotaxi-d-app-module_265_220329_2.6.5' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_265_220329_2.6.5

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/collect/MoGoMapDataCollectProvider.kt

@@ -155,7 +155,7 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,
             location.latitude,
             location.bearing,
             location.speed,
-            location.provider == "GPS_SELF")
+            location.provider == "GPS_RTK")
     }
 
 

core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt

@@ -2,9 +2,11 @@ package com.mogo.eagle.core.function.obu.mogo
 
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
@@ -29,18 +31,27 @@ class MoGoObuProvider : IMoGoObuProvider {
 
     override fun init(context: Context) {
         CallerLogger.d("$M_OBU$TAG", "初始化蘑菇自研OBU……")
-        mContext = context
-        val ipAddress =
-            SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, "192.168.1.199")
-        MogoPrivateObuManager.INSTANCE.init(context, ipAddress)
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            //不处理
+        } else {
+            mContext = context
+            val ipAddress =
+                    SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, "192.168.1.199")
+            MogoPrivateObuManager.INSTANCE.init(context, ipAddress)
+        }
     }
 
     override fun connect(ipAddress: String) {
-        mContext?.let {
-            // 保存本地OBU IP地址
-            SharedPrefsMgr.getInstance(it).putString(MoGoConfig.OBU_IP, ipAddress)
-            MogoPrivateObuManager.INSTANCE.connectObu(it, ipAddress)
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            //不处理
+        } else {
+            mContext?.let {
+                // 保存本地OBU IP地址
+                SharedPrefsMgr.getInstance(it).putString(MoGoConfig.OBU_IP, ipAddress)
+                MogoPrivateObuManager.INSTANCE.connectObu(it, ipAddress)
+            }
         }
+
     }
 
 

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.v2x
 
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_V2X_MODULE
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
 import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightManager
@@ -9,6 +10,7 @@ import com.mogo.eagle.core.function.v2x.events.V2XEventManager
 import com.mogo.eagle.core.function.v2x.redlightwarning.RedLightWarningManager
 import com.mogo.eagle.core.function.v2x.speedlimit.SpeedLimitDataManager
 import com.mogo.eagle.core.function.v2x.vip.VipCarManager
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 
 @Route(path = PATH_V2X_MODULE)
 class V2XProvider : IMoGoFunctionServerProvider {
@@ -20,14 +22,25 @@ class V2XProvider : IMoGoFunctionServerProvider {
         CallTrafficLightManager.getTrafficLightProvider().initTrafficLightServer(context)
         VipCarManager.INSTANCE.initServer(context)
         SpeedLimitDataManager.getInstance().start()
-        V2XEventManager.init(context)
-        SpeedLimitDataManager.getInstance().start();
+
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            //不处理
+        } else {
+            V2XEventManager.init(context)
+        }
+
 //        RedLightWarningManager.INSTANCE.listenTrafficLight()
     }
 
     override fun onDestroy() {
         VipCarManager.INSTANCE.destroy()
-        V2XEventManager.onDestroy()
+
+        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            //不处理
+        } else {
+            V2XEventManager.onDestroy()
+        }
+
 //        RedLightWarningManager.INSTANCE.onDestroy()
     }
 }

libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java

@@ -157,7 +157,19 @@ public class ObjectUtils {
             return null;
         }
         MogoLocation location = new MogoLocation();
-        location.setLocType(1); // 定位类型
+
+        //agps 高德
+        //agps_rtk 高德-高精
+        if (aLocation.getProvider().isEmpty()) {
+            location.setLocType(0);
+        }
+        if ("AGPS".equals(aLocation.getProvider())) {
+            location.setLocType(1); // 定位类型为高德坐标(网路或者硬件定位)
+        } else if ("AGPS_RTK".equals(aLocation.getProvider())) {
+            location.setLocType(1000); // 定位类型为WGS84进行转译的坐标
+        } else {
+            location.setLocType(0);
+        }
         location.setSatellite(4);
         location.setSpeed(aLocation.getSpeed());
         location.setLatitude(aLocation.getLat());