Merge branch 'dev_robotaxi-d_230711_3.4.0' into dev_20230708_unmanned_3.5.0

2023-08-09 10:52:46 +08:00
parent f99d739dba 4808778f1a
commit 70c7b1774a
9 changed files with 41 additions and 13 deletions
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -142,11 +142,11 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
                if (controller != null) {
                    //切换地图的远近视图
                    if (controller.getCurrentMapVisualAngle().isLongSight()) {
-                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
+                        //Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
                        controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                        mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium);
                    } else if (controller.getCurrentMapVisualAngle().isMediumSight()) {
-                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
+                        //Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
                        controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
                        mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long);
                    } else {
--- a/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
+++ b/OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
@@ -109,13 +109,13 @@ abstract class CharterBaseFragment<V : IView?, P : Presenter<V>?>() :
                if (controller != null) {
                    //切换地图的远近视图
                    if (controller.currentMapVisualAngle.isLongSight) {
-                        Objects.requireNonNull(getMapUIController())
-                            ?.setLockMode(true)
+                        //Objects.requireNonNull(getMapUIController())
+                        //    ?.setLockMode(true)
                        controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
                        mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_medium)
                    } else if (controller.currentMapVisualAngle.isMediumSight) {
-                        Objects.requireNonNull(getMapUIController())
-                                ?.setLockMode(false)
+                        //Objects.requireNonNull(getMapUIController())
+                        //        ?.setLockMode(false)
                            controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null)
                        mSwitchMapModeImage!!.setImageResource(R.drawable.bus_switch_map_long)
                    } else {
--- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -145,11 +145,11 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
                if (controller != null) {
                    //切换地图的远近视图
                    if (controller.getCurrentMapVisualAngle().isLongSight()) {
-                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
+                        //Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
                        controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                        mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium);
                    } else if (controller.getCurrentMapVisualAngle().isMediumSight()) {
-                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
+                        //Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
                        controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
                        mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long);
                    } else {
--- a/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/taxi/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -193,11 +193,11 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
                if (controller != null) {
                    //切换地图的远近视图
                    if (controller.getCurrentMapVisualAngle().isLongSight()) {
-                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
+                        //Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
                        controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                        mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_medium);
                    } else if (controller.getCurrentMapVisualAngle().isMediumSight()) {
-                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
+                        //Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
                        controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
                        mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_long);
                    } else {
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -132,7 +132,7 @@ object ConfigStartUp {
        }

        val mapParams = MapParams.init()
-        mapParams.setDebugMode(DebugConfig.isDebug()) // 1-使用本地地图数据，0-使用在线地图数据
+        mapParams.setDebugMode(false) // 1-使用本地地图数据，0-使用在线地图数据
            //.setDataFileSource(1)
            .setIsRecordLogs(false)
            .setIsWeatherEnable(false)
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/obu/V2xObuEventManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/obu/V2xObuEventManager.kt
@@ -40,6 +40,8 @@ object V2xObuEventManager : IMoGoObuSaveMessageListener {
     */
    override fun onMoGoObuSaveMessage(type: String, content: String, tts: String, sourceType: DataSourceType,communicationType: CommunicationType) {
        if (content.isNotEmpty()) {
+            //消息埋点
+            V2XEventAnalyticsManager.receiveV2XEvent(type,content,tts,sourceType,communicationType)
            if (obuDataMap.containsKey(type)) {
                val oldTime = obuDataMap[type]
                oldTime?.let {
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/V2XEventAnalyticsManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/V2XEventAnalyticsManager.kt
@@ -22,6 +22,7 @@ object V2XEventAnalyticsManager: IMoGoChassisLocationWGS84Listener,IFuncBizProvi
    private const val TAG = "V2XEventAnalyticsManager"
    private val hasInit by lazy { AtomicBoolean(false) }

+    private const val EVENT_KEY_RECEIVE_V2X_MSG ="event_key_receive_v2x_msg" //鹰眼接收到的V2X事件埋点关键字
    private const val EVENT_KEY_V2X_MSG_EVENT = "event_key_v2x_msg_event" //消息盒子播报V2X事件埋点关键字

    private const val EVENT_PARAMS_POI_TYPE = "poiType" //事件类型
@@ -71,7 +72,29 @@ object V2XEventAnalyticsManager: IMoGoChassisLocationWGS84Listener,IFuncBizProvi
    }

    /**
-     * 触发V2X消息埋点
+     * 收到V2X消息埋点（鹰眼收到事件）
+     */
+    fun receiveV2XEvent(poiType: String,content: String?,ttsContent: String?,
+                        dataSource: DataSourceType,communicationType: CommunicationType){
+        val msgEventParams = HashMap<String,Any>()
+        msgEventParams[EVENT_PARAMS_POI_TYPE] = poiType //事件类型
+        msgEventParams[EVENT_PARAMS_CONTENT] = content?:"" //事件内容
+        msgEventParams[EVENT_PARAMS_TTS_CONTENT] = ttsContent?:"" //语音播报内容
+        msgEventParams[EVENT_PARAMS_DISPLAY_TIME] = DateTimeUtils.getTimeText(
+            System.currentTimeMillis(), DateTimeUtils.yyyy_MM_dd_HH_mm_ss) //展示时间
+        msgEventParams[EVENT_PARAMS_DATA_SOURCE] = dataSource.name //数据来源
+        msgEventParams[EVENT_PARAMS_COMMUNICATION_TYPE] = communicationType.name //通信类型
+        msgEventParams[EVENT_PARAMS_PLATE_NUMBER] =  AppConfigInfo.plateNumber //车牌号
+        msgEventParams[EVENT_PARAMS_CAR_SN] = MoGoAiCloudClientConfig.getInstance().sn //鹰眼SN
+        msgEventParams[EVENT_PARAMS_EYE_VERSION] = AppUtils.getAppVersionName() //鹰眼版本
+        msgEventParams[EVENT_PARAMS_LONGITUDE] = "$longitude" //经度
+        msgEventParams[EVENT_PARAMS_LATITUDE] = "$latitude" //纬度
+        msgEventParams[EVENT_PARAMS_HEADING] = "$heading" //航向角
+        MogoAnalyticUtils.track(EVENT_KEY_RECEIVE_V2X_MSG,msgEventParams)
+    }
+
+    /**
+     * 触发V2X消息埋点(播报事件)
     */
    fun triggerV2XEvent(poiType: String,content: String?,ttsContent: String?,
                        dataSource: DataSourceType,communicationType: CommunicationType){
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt
@@ -325,6 +325,9 @@ class SmallMapView @JvmOverloads constructor(
        super.onAutopilotRouteLineId(lineId)
        if(lineId == 0L){
            this.globalPathResp = null
+            UiThreadHandler.post {
+                clearPolyline()
+            }
        }
    }

--- a/gradle.properties
+++ b/gradle.properties
@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.7.12
 MOGO_TELEMATIC_VERSION=1.4.7.12
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.14.1.5
+MAP_SDK_VERSION=2.14.2.8
 MAP_SDK_OPERATION_VERSION=1.1.4.1
 # websocket
 WEBSOCKET_VERSION=1.1.7