Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0

OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java

@@ -16,7 +16,6 @@ import com.mogo.commons.mvp.MvpFragment;
 
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
-import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.function.view.MapBizView;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
@@ -59,9 +58,6 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
 
     @Override
     protected void initViews() {
-        //隐藏小地图
-        CallerSmpManager.INSTANCE.hidePanel();
-
         mapBizView = findViewById(R.id.mapBizView);
         mCurrentArriveStation = findViewById(R.id.bus_p_cur_station_name);
         mCurrentArriveStationTitle = findViewById(R.id.bus_p_cur_station_title);

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java

@@ -19,7 +19,6 @@ import com.mogo.eagle.core.data.temp.EventLogout;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.map.marker.IMogoMarker;

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java

@@ -18,7 +18,6 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView;
 import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxButtonView;
@@ -93,9 +92,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 
     @Override
     protected void initViews() {
-
-        hideEagleConfig();
-
         mapBizView = findViewById(R.id.mapBizView);
         mAutopilotImage = findViewById(R.id.module_och_autopilot_iv);
         mMapswitchBtn = findViewById(R.id.module_och_taxi_swich_map_iv);
@@ -188,14 +184,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         mArrivedCheckView.get().setITaxiPassengerCommonValueCallback(phoneTail -> getPresenter().checkAndUpdateStatus(phoneTail));
     }
 
-    /**
-     * 隐藏鹰眼原有控件
-     */
-    private void hideEagleConfig() {
-        //隐藏小地图
-        CallerSmpManager.INSTANCE.hidePanel();
-    }
-
     @Override
     public void onResume() {
         super.onResume();

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java

@@ -22,7 +22,6 @@ import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
@@ -34,7 +33,6 @@ import com.mogo.och.common.module.map.ICommonNaviChangedCallback;
 import com.mogo.och.common.module.utils.DateTimeUtil;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
 import com.mogo.och.common.module.utils.OCHThreadPoolManager;
-import com.mogo.och.common.module.utils.ToastUtilsOch;
 import com.mogo.och.common.module.voice.VoiceNotice;
 import com.mogo.och.common.module.wigets.OCHCommitDialog;
 import com.mogo.och.taxi.R;

app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt

@@ -1,7 +1,6 @@
 package com.mogo.launcher.startup
 
 import android.content.Context
-import android.util.Log
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -10,7 +9,6 @@ import com.mogo.eagle.core.data.config.HmiBuildConfig
 import com.mogo.eagle.core.data.deva.net.UrlConfig
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
-import com.mogo.eagle.core.utilcode.util.ProcessUtils
 import com.mogo.launcher.BuildConfig
 import com.mogo.launcher.R
 import com.mogo.test.crashreport.CrashReportConstants
@@ -35,7 +33,6 @@ object ConfigStartUp {
         AppConfigInfo.appBuildTime = BuildConfig.APP_BUILD_TIME
         // 使用与渠道配置一样的gps提供者提供的数据,app/productFlavors/fPadLenovo.gradle  GPS_PROVIDER  0-Android系统，1-工控机，2-OBU
         FunctionBuildConfig.gpsProvider = BuildConfig.GPS_PROVIDER
-//        FunctionBuildConfig.gpsProvider = 2
         // 演示模式,上一次勾选的数据
         FunctionBuildConfig.isDemoMode = BuildConfig.IS_DEMO_MODE
 //        // app安装的身份信息
@@ -43,8 +40,6 @@ object ConfigStartUp {
         // 各个module需要的url
         FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java)
 
-        Log.d("ConfigStartUp", "ProcessUtils.getCurrentProcessName():" + ProcessUtils.getCurrentProcessName())
-
 //        // 这里影响当前Activity的身份信息，多进程先保持与原来一样，主进程为司机端，:passenger 进程为乘客端 TODO 暂时不启用，仅做洱海交付，独立乘客屏+宣传视频
 //        if (ProcessUtils.getCurrentProcessName().contains(":passenger")) {
 //            if (AppIdentityModeUtils.isBus(BuildConfig.APP_IDENTITY_MODE)) {
@@ -77,7 +72,6 @@ object ConfigStartUp {
         DebugConfig.setSocketAppId(BuildConfig.SOCKET_APP_ID)
         DebugConfig.setMapVersion(BuildConfig.MAP_SDK_VERSION)
         DebugConfig.setMapOptVersion(BuildConfig.MAP_SDK_OPT_VERSION)
-        DebugConfig.setNeedUploadCoordinatesInTime(BuildConfig.IS_NEED_UPLOAD_COORDINATES_IN_TIME)
         DebugConfig.setMultiDisplay(BuildConfig.IS_MULTI_DISPLAY)
         DebugConfig.setCarModelChange(BuildConfig.IS_CAR_MODEL_CHANGE)
     }
@@ -109,23 +103,27 @@ object ConfigStartUp {
         val mapParams = MapParams.init()
         mapParams.setDebugMode(false) //todo 1-使用本地地图数据，0-使用在线地图数据
             //.setDataFileSource(1)
+            .setDebugMode(false)
             .setCoordinateType(MapParams.COORDINATETYPE_GCJ02)
             .setPerspectiveMode(MapParams.MAP_PERSPECTIVE_UP_CAR)
-            .setHDVisibileArray(intArrayOf(
-                HDTypes.DIVIDER.type,
-                HDTypes.ROAD_AREA.type,
-                HDTypes.STOP_LINE.type,
-                HDTypes.ARROW.type,
-                HDTypes.STATION_BRIDGE.type,
-                HDTypes.ZEBRA_LINE.type,
-                HDTypes.GREEN_BELT.type,
-                HDTypes.DIVERSION.type,
-                HDTypes.SAFE_ISLAND.type,
-                HDTypes.ALPHANUMERIC.type,
-                HDTypes.GUARDBAR.type,
-                HDTypes.TRAFFIC_DEVICE.type,
-                HDTypes.CABLE.type,
-                HDTypes.SIGNAL_LINE.type))
+            .setHDVisibileArray(
+                intArrayOf(
+                    HDTypes.DIVIDER.type,
+                    HDTypes.ROAD_AREA.type,
+                    HDTypes.STOP_LINE.type,
+                    HDTypes.ARROW.type,
+                    HDTypes.STATION_BRIDGE.type,
+                    HDTypes.ZEBRA_LINE.type,
+                    HDTypes.GREEN_BELT.type,
+                    HDTypes.DIVERSION.type,
+                    HDTypes.SAFE_ISLAND.type,
+                    HDTypes.ALPHANUMERIC.type,
+                    HDTypes.GUARDBAR.type,
+                    HDTypes.TRAFFIC_DEVICE.type,
+                    HDTypes.CABLE.type,
+                    HDTypes.SIGNAL_LINE.type
+                )
+            )
         // .setZoom( 20 )
         // .setPointToCenter( 0.734375f, 0.5f )
         //todo 2D模式下需要注意ADAS部分遮挡

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

@@ -587,6 +587,8 @@ class MogoPrivateObuNewManager private constructor() {
                     EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType)
                 ttsContent =
                     EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType)
+
+//                ObuManager.getInstance().obuRvToTrackedObject(info) //todo emArrow
             }
 
             //交叉路口碰撞预警
@@ -734,7 +736,6 @@ class MogoPrivateObuNewManager private constructor() {
                         }, direction
                     )
                 }
-//                ObuManager.getInstance().obuRvToTrackedObject(info)
                 //更新周边车辆进行预警颜色变换，车辆实时移动和变色 ，UUID不需要匹配了
                 TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
                     CallerMapUIServiceManager.getMarkerService()

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt

@@ -101,7 +101,7 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     }
 
     fun modifyCarInfo(callBack: (ModifyBindingcarInfo) -> Unit) {
-        BindingCarNetWorkManager.instance.modifyBindingcar(mContext!!, mAddress, mWidevineIDWithMd5, callBack, screenType)
+        BindingCarNetWorkManager.instance.modifyBindingCar(mContext!!, mAddress, mWidevineIDWithMd5, callBack, screenType)
     }
 
     private fun driverScreen(macAddress: String, widevineIDWithMd5: String) {

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt

@@ -74,12 +74,10 @@ class BindingCarNetWorkManager private constructor() {
                 override fun onSubscribe(d: Disposable) {}
                 override fun onNext(info: BindingCarInfo) {
                     if (info != null && info.getData() != null) {
-                        d(SceneConstant.M_BINDING + TAG, "getBindingcarInfo data =" + info.getData().toString())
-                        //根据车辆类型切换不同的车辆模型,只针对红旗做处理,当mac地址不一致，切换模型
+                        d(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data =" + info.getData().toString())
                         if (!SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.MAC_ADDRESS).equals(macAddress) && DebugConfig.isCarModelChange()) {
-                            updateCarVrIconRes(info.getData().brandId)
+                            updateCarVrIconRes(info.getData().brandId);
                         }
-
                         when (info.getData().compare) {
                             "0" -> showBindingCarDialog()
                             "3" -> showModifyBindingCarDialog()
@@ -93,7 +91,7 @@ class BindingCarNetWorkManager private constructor() {
                 override fun onError(e: Throwable) {
                     e(
                         SceneConstant.M_BINDING + TAG,
-                        "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message
+                        "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message
                     )
                 }
 
@@ -105,7 +103,7 @@ class BindingCarNetWorkManager private constructor() {
      * 绑定和修改绑定车辆
      * mac: 48:b0:2d:3a:9c:19
      */
-    fun modifyBindingcar(
+    fun modifyBindingCar(
         context: Context,
         macAddress: String?,
         widevineIDWithMd5: String?,
@@ -133,12 +131,11 @@ class BindingCarNetWorkManager private constructor() {
                         callBack.invoke(info)
                         d(
                             SceneConstant.M_BINDING + TAG,
-                            "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()
+                            "modifyBindingCar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()
                         )
                         if (!SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.MAC_ADDRESS).equals(macAddress) && DebugConfig.isCarModelChange()) {
-                            updateCarVrIconRes(info.data.brandId)
+                            updateCarVrIconRes(info.data.brandId);
                         }
-
                         SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.MAC_ADDRESS, macAddress)
                     }
                 }
@@ -146,7 +143,7 @@ class BindingCarNetWorkManager private constructor() {
                 override fun onError(e: Throwable) {
                     e(
                         SceneConstant.M_BINDING + TAG,
-                        "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.message
+                        "modifyBindingCar onError e = " + e.toString() + "---e.getMessage = " + e.message
                     )
                 }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -9,6 +9,7 @@ import android.graphics.Color
 import android.os.Build
 import android.text.Html
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.annotation.RequiresApi
@@ -607,7 +608,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             tbIsDemoMode.visibility = View.GONE
         }
 
-
         // 雨天模式，上一次勾选的数据
         tbIsRainMode.isChecked = FunctionBuildConfig.isRainMode
         //雨天模式
@@ -624,36 +624,30 @@ internal class DebugSettingView @JvmOverloads constructor(
         //感知优化模式
         tbBeautyMode.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isBeautyMode = isChecked
-            if (!FunctionBuildConfig.isBeautyMode) {
-                tbBeautyMode.isChecked = false
-            }
         }
 
         tbV2NFromCar.isChecked = FunctionBuildConfig.isV2NFromCar
         //v2n车端预警
         tbV2NFromCar.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isV2NFromCar = isChecked
-            if (!FunctionBuildConfig.isV2NFromCar) {
-                tbV2NFromCar.isChecked = false
-            }
         }
 
         tbDrawAiCloudFusion.isChecked = FunctionBuildConfig.isDrawAiCloudFusion
         //云端感知绘制
         tbDrawAiCloudFusion.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isDrawAiCloudFusion = isChecked
-            if (!FunctionBuildConfig.isDrawAiCloudFusion) {
-                tbDrawAiCloudFusion.isChecked = false
-            }
         }
 
         tbDrawRomaMode.isChecked = FunctionBuildConfig.isRomaMode
         //roma
         tbDrawRomaMode.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isRomaMode = isChecked
-            if (!FunctionBuildConfig.isRomaMode) {
-                tbDrawRomaMode.isChecked = false
-            }
+        }
+
+        tbObuWarningFusionUnion.isChecked = FunctionBuildConfig.isObuWarningFusionUnion
+        //ObuWarningFusionUnion
+        tbObuWarningFusionUnion.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isObuWarningFusionUnion = isChecked
         }
 
         //重启工控机所有节点
@@ -749,12 +743,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             FunctionBuildConfig.isDrawUnknownIdentifyData = isChecked
         }
 
-//        // 初始化 OBU感知数据是否绘制 选择情况
-//        tbIsDrawOBUIdentifyData.isChecked = FunctionBuildConfig.isDrawObuIdentifyData
-//        tbIsDrawOBUIdentifyData.setOnCheckedChangeListener { buttonView, isChecked ->
-//            FunctionBuildConfig.isDrawObuIdentifyData = isChecked
-//        }
-
         //TODO
         tbIsDrawPath.setOnCheckedChangeListener { _, isChecked ->
 
@@ -1062,18 +1050,6 @@ internal class DebugSettingView @JvmOverloads constructor(
      * 设置Hmi点击监听
      */
     private fun setHmiCheckedChangeListener() {
-
-        /**
-         * 隐藏、显示小地图
-         */
-        tbControlView.setOnCheckedChangeListener { _, isChecked ->
-//            if (isChecked) {
-//                CallerSmpManager.hidePanel()
-//            } else {
-//                CallerSmpManager.showPanel()
-//            }
-        }
-
         /**
          * sn绑定控制
          */

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -278,6 +278,18 @@
                 android:textOn="关闭漫游模式"
                 android:textSize="@dimen/dp_24" />
 
+            <ToggleButton
+                android:id="@+id/tbObuWarningFusionUnion"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启obu预警融合"
+                android:textOn="关闭obu预警融合"
+                android:textSize="@dimen/dp_24" />
+
             <ToggleButton
                 android:id="@+id/tbMojie"
                 android:layout_width="match_parent"
@@ -1310,18 +1322,6 @@
                         app:layout_constraintLeft_toRightOf="@+id/tbChangeCurrentCarIcon"
                         app:layout_constraintTop_toTopOf="@id/tbChangeCurrentCarIcon" />
 
-                    <ToggleButton
-                        android:id="@+id/tbControlView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_columnWeight="1"
-                        android:layout_margin="2dp"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_20"
-                        android:textOff="隐藏「小地图」"
-                        android:textOn="显示「小地图」"
-                        android:textSize="@dimen/dp_24" />
-
                     <ToggleButton
                         android:id="@+id/tbOpenSnBinding"
                         android:layout_width="wrap_content"

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt

@@ -11,6 +11,7 @@ import android.view.MotionEvent
 import android.view.View
 import android.widget.RelativeLayout
 import android.widget.TextView
+import androidx.annotation.MainThread
 import ch.hsr.geohash.GeoHash
 import com.amap.api.maps.AMap
 import com.amap.api.maps.CameraUpdate
@@ -71,7 +72,7 @@ class OverMapView @JvmOverloads constructor(
     private val zoomLevel = 15
     private var mCameraUpdate: CameraUpdate? = null
     private var mContext: Context? = null
-    private val mTilt = 60f
+    private var mTilt = 0f
     private var overLayerView: TextView? = null
 
     // 全局路径规划中的GeoHash网格
@@ -99,6 +100,7 @@ class OverMapView @JvmOverloads constructor(
     private var isFirstLocation = true
     var mCustomMapStyleOptions: CustomMapStyleOptions? = null
     var currMarkerList: ArrayList<Marker>? = null
+    var siteMarkerList: ArrayList<Marker>? = null
 
     companion object {
         const val TAG = "OverMapView"
@@ -155,18 +157,56 @@ class OverMapView @JvmOverloads constructor(
     }
     // =================必须通知高德地图生命周期的变化=================
 
+    /**
+     * 隐藏右下角的重置View
+     */
     fun hideResetView() {
         overLayerView?.visibility = View.GONE
     }
 
+    /**
+     * siteLatLngs: 高德坐标集合
+     * bitmap: Marker对应的图片
+     * (anchorX,anchorY)为锚点坐标，各自取值范围为[0,1]，默认值为(0.5,1)
+     */
+    @MainThread
+    fun drawSiteMarkers(siteLatLngs: List<LatLng>?, bitmap: Bitmap, anchorX: Float, anchorY: Float) {
+        if (siteLatLngs.isNullOrEmpty()) return
+        clearSiteMarkers()
+        val markerOptionsList = ArrayList<MarkerOptions>()
+        for (latLng in siteLatLngs) {
+            val markerOption = MarkerOptions()
+            markerOption.position(latLng)
+            markerOption.anchor(anchorX, anchorY)
+            markerOption.icon(
+                BitmapDescriptorFactory.fromBitmap(bitmap)
+            )
+            markerOptionsList.add(markerOption)
+        }
+        siteMarkerList = mAMap!!.addMarkers(markerOptionsList, false)
+    }
+
+    @MainThread
+    fun clearSiteMarkers() {
+        if (siteMarkerList != null) {
+            for (marker in siteMarkerList!!) {
+                marker.destroy()
+            }
+            siteMarkerList = null
+        }
+    }
+
     private fun initView(context: Context) {
         mContext = context
         val smpView = LayoutInflater.from(context).inflate(R.layout.module_overview_map_view, this)
         mMapView = smpView.findViewById(R.id.aMapView)
         overLayerView = findViewById(R.id.overLayer)
-        overLayerView?.background = resources.getDrawable(if (resetDrawable != -1) resetDrawable else R.drawable.amap_reset)
-        arrivedBitmap = BitmapDescriptorFactory.fromResource(if (arrivedDrawable != -1) arrivedDrawable else R.drawable.taxi_map_arrow_arrived)
-        unArrivedBitmap = BitmapDescriptorFactory.fromResource(if (unArrivedDrawable != -1) unArrivedDrawable else R.drawable.taxi_map_arrow_un_arrive)
+        overLayerView?.background =
+            resources.getDrawable(if (resetDrawable != -1) resetDrawable else R.drawable.amap_reset)
+        arrivedBitmap =
+            BitmapDescriptorFactory.fromResource(if (arrivedDrawable != -1) arrivedDrawable else R.drawable.taxi_map_arrow_arrived)
+        unArrivedBitmap =
+            BitmapDescriptorFactory.fromResource(if (unArrivedDrawable != -1) unArrivedDrawable else R.drawable.taxi_map_arrow_un_arrive)
         CallerPlanningRottingListenerManager.addListener(TAG, this)
         initAMapView(context)
         // 注册定位监听
@@ -177,6 +217,7 @@ class OverMapView @JvmOverloads constructor(
 
     private fun initAMapView(context: Context) {
         Log.d(TAG, "initAMapView")
+        mTilt = 30f
         mCameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel.toFloat())
         mAMap = mMapView!!.map
         mCustomMapStyleOptions = CustomMapStyleOptions()
@@ -197,6 +238,8 @@ class OverMapView @JvmOverloads constructor(
             }
             // 实时路况图层关闭，必须添加在loaded结束之后,其他位置不生效
             mAMap?.isTrafficEnabled = false
+            mAMap?.showBuildings(true)
+            mAMap?.animateCamera(CameraUpdateFactory.changeTilt(mTilt))
         }
         setUpMap()
         customOptions()
@@ -350,7 +393,7 @@ class OverMapView @JvmOverloads constructor(
         return bitmap
     }
 
-    fun clearV2XMarkers() {
+    private fun clearV2XMarkers() {
         if (currMarkerList != null) {
             for (marker in currMarkerList!!) {
                 marker.destroy()
@@ -428,6 +471,7 @@ class OverMapView @JvmOverloads constructor(
                     bitmap
                 )
             )
+            markerOption.anchor(0.18f, 0.98f)
             markerOption.zIndex(2f)
             posInfMap[latLng] = structureList
             markerOptionsList.add(markerOption)
@@ -448,8 +492,8 @@ class OverMapView @JvmOverloads constructor(
         val marker = MakerWithCount(context)
         marker.setCount(count)
         marker.measure(
-            MeasureSpec.makeMeasureSpec(116, MeasureSpec.EXACTLY),
-            MeasureSpec.makeMeasureSpec(116, MeasureSpec.EXACTLY)
+            MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(mContext, 116f), MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(mContext, 116f), MeasureSpec.EXACTLY)
         )
         marker.layout(0, 0, marker.measuredWidth, marker.measuredHeight)
         val bitmap = Bitmap.createBitmap(marker.width, marker.height, Bitmap.Config.ARGB_8888)
@@ -486,7 +530,7 @@ class OverMapView @JvmOverloads constructor(
         } else {
             //设置希望展示的地图缩放级别
             val cameraPosition = CameraPosition.Builder()
-                .target(mCarMarker!!.position).tilt(0f).zoom(zoomLevel.toFloat()).build()
+                .target(mCarMarker!!.position).tilt(mTilt).zoom(zoomLevel.toFloat()).build()
             mAMap!!.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition))
         }
     }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestV2XReceiver.java

@@ -10,7 +10,6 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.entity.V2XMessageEntity;
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
 import com.mogo.eagle.core.data.v2x.V2XOptimalRouteDataRes;
-import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.function.v2x.events.consts.V2XConst;
 
 import java.util.List;

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt

@@ -28,6 +28,7 @@ object AppConfigInfo {
 
     // 高精地图版本
     var mapSdkVersion: String? = null
+
     // 高精地图采集版本
     var mapSdkOptVersion: String? = null
     var adasSdkVersion: String? = null
@@ -40,12 +41,15 @@ object AppConfigInfo {
     //车牌号
     @Volatile
     var plateNumber: String? = null
+
     //工控机MAC地址
     @Volatile
     var iPCMacAddress: String? = null
+
     //工控机DockerVersion
     @Volatile
     var dockerVersion: String? = null
+
     //工控机协议版本
     var protocolVersionNumber: Int = 0
 
@@ -168,11 +172,17 @@ object AppConfigInfo {
                         "<font color='red'>"
                     }
                 }${isConnectedNetty}</font><br/>" +
-                "<font color='red' size='30'>------------------工控机感知&规控数据---------------------</font><br/>"
+                "<font color='red' size='30'>------------------工控机数据---------------------</font><br/>"+
+                "车牌：${plateNumber}<br/>" +
+                "mac：${iPCMacAddress}<br/>" +
+                "docker version：${dockerVersion}<br/>" +
+                "protocol：${protocolVersionNumber}<br/>" +
+                "<font color='red' size='30'>------------------业务信息---------------------</font><br/>"+
+                "角色：$role , isDriver : $isDriver <br/>"
     }
 }
 
-fun AppConfigInfo.toConfigUpload():ConfigUpload{
+fun AppConfigInfo.toConfigUpload(): ConfigUpload {
     val configUpload = ConfigUpload()
     configUpload.adasSdkVersion = adasSdkVersion
     configUpload.appBuildTime = appBuildTime
@@ -199,12 +209,11 @@ fun AppConfigInfo.toConfigUpload():ConfigUpload{
     configUpload.protocolVersionNumber = protocolVersionNumber
     configUpload.role = role
     configUpload.serverSn = serverSn
-    configUpload.iPCMacAddress = iPCMacAddress
     configUpload.teleTimeStamp = teleTimeStamp
     configUpload.timeStamp = System.currentTimeMillis()
     configUpload.uniqueDeviceId = uniqueDeviceId
     configUpload.widevineIDMd5 = widevineIDMd5
     configUpload.workingBranchHash = workingBranchHash
     configUpload.workingBranchName = workingBranchName
-        return configUpload
+    return configUpload
 }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt

@@ -89,6 +89,14 @@ object FunctionBuildConfig {
     @JvmField
     var isFusionColor = false
 
+    /**
+     * 是否开启obu rv预警感知物融合功能 , 仅大理，烟台交付项目
+     * 默认关闭
+     */
+    @Volatile
+    @JvmField
+    var isObuWarningFusionUnion = false
+
     /**
      * 当前APP的身份模式
      *

foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java

@@ -168,18 +168,6 @@ public class DebugConfig {
         return mapOptVersion;
     }
 
-    /**
-     * 是否需要实时上报坐标位置
-     */
-    private static boolean sIsNeedUploadCoordinatesInTime = false;
-
-    public static boolean isNeedUploadCoordinatesDurationInTime() {
-        return sIsNeedUploadCoordinatesInTime;
-    }
-
-    public static void setNeedUploadCoordinatesInTime(boolean sIsNeedUploadCoordinatesInTime) {
-        DebugConfig.sIsNeedUploadCoordinatesInTime = sIsNeedUploadCoordinatesInTime;
-    }
     // 兼容是否支持多屏幕方案
     private static boolean isMultiDisplay = false;
 

libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java

@@ -1,42 +0,0 @@
-package com.mogo.map;
-
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.map.uicontroller.AMapUIController;
-import com.mogo.map.uicontroller.IMogoMapUIController;
-
-/**
- * @author congtaowang
- * @since 2020/12/9
- * <p>
- * 描述
- */
-public class CustomMapApiBuilder {
-
-    private static final String TAG = "CustomMapApiBuilder";
-
-    private static CustomMapApiBuilder sApiBuilder;
-
-    private static CustomMapApiBuilder getApiBuilder() {
-        if (sApiBuilder == null) {
-            synchronized (CustomMapApiBuilder.class) {
-                if (sApiBuilder == null) {
-                    CallerLogger.INSTANCE.d(TAG, "init");
-                    sApiBuilder = new CustomMapApiBuilder();
-                }
-            }
-        }
-        return sApiBuilder;
-    }
-
-    public IMogoMapUIController getMapUIController() {
-        return AMapUIController.getInstance();
-    }
-
-
-    public static IMogoMapUIController getMapUIControllerDelegate() {
-        return getApiBuilder().getMapUIController();
-    }
-
-    public static void destroy() {
-    }
-}

libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java

@@ -8,6 +8,7 @@ import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.map.uicontroller.AMapUIController;
 import com.mogo.map.uicontroller.CarCursorOption;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.MapCameraPosition;
@@ -37,7 +38,7 @@ public class MogoMapUIController implements IMogoMapUIController {
 
     private void initDelegate() {
         if (mDelegate == null) {
-            mDelegate = CustomMapApiBuilder.getMapUIControllerDelegate();
+            mDelegate = AMapUIController.getInstance();
         }
     }
 

libraries/mogo-obu/src/main/java/com/zhidao/support/obu/ObuManager.java

@@ -755,7 +755,9 @@ public class ObuManager {
             trackedObjectBuilder.setAltitude(vehBasics.getElevation());
             trackedObjectBuilder.setSpeed(vehBasics.getSpeed());
             trackedObjectBuilder.setHeading(vehBasics.getHeading());
-            trackedObjectBuilder.addTrackedSource(MessagePad.TrackedSource.newBuilder().setSource(2));
+            MessagePad.TrackedSource source = MessagePad.TrackedSource.newBuilder().setSource(2)
+                    .addSubSource(MessagePad.SubSource.newBuilder().setSource(1).setId(vehBasics.getId())).build();
+            trackedObjectBuilder.addTrackedSource(source);
             /**
              * 0 未知车辆
              * 1 特殊用途车辆