[dev_robotaxi-d_230412_2.15.0] 添加v2i新类型，优化升级请求

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

@@ -205,6 +205,13 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
                         MogoObuConstants.RTS.RTI_TYPE_ACCIDENT -> { //事故
                             appId = EventTypeEnumNew.TYPE_USECASE_ID_ACCIDENT.poiType
                         }
+                        MogoObuConstants.RTS.RTI_TYPE_ATTENTION_CONFLUENCE -> { //注意合流
+                            appId = EventTypeEnumNew.TYPE_ATTENTION_CONFLUENCE.poiType
+                        }
+
+                        MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN_CROSSING -> { //人行横道
+                            appId = EventTypeEnumNew.TYPE_PEDESTRIAN_CROSSING.poiType
+                        }
                     }
 
                     alertContent = EventTypeEnumNew.getWarningContent(appId)

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

@@ -465,6 +465,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                                         appId =
                                             EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType
                                     }
+
 //                                MogoObuConstants.RTS.RTI_TYPE_SPEED_LIMIT -> { //限速
 //                                    appId =
 //                                        EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType
@@ -486,6 +487,14 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
                                     MogoObuConstants.RTS.RTI_TYPE_ACCIDENT -> { //事故
                                         appId = EventTypeEnumNew.TYPE_USECASE_ID_ACCIDENT.poiType
                                     }
+
+                                    MogoObuConstants.RTS.RTI_TYPE_ATTENTION_CONFLUENCE -> { //注意合流
+                                        appId = EventTypeEnumNew.TYPE_ATTENTION_CONFLUENCE.poiType
+                                    }
+
+                                    MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN_CROSSING -> { //人行横道
+                                        appId = EventTypeEnumNew.TYPE_PEDESTRIAN_CROSSING.poiType
+                                    }
                                 }
 
                                 alertContent = EventTypeEnumNew.getWarningContent(appId)

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

@@ -5,6 +5,7 @@ import android.text.TextUtils
 import android.util.Log
 import com.elegant.utils.UiThreadHandler
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.constants.SharedPrefsConstants
 import com.mogo.eagle.core.data.app.AppConfigInfo.role
 import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -24,7 +25,9 @@ import com.zhjt.mogo_core_function_devatools.upgrade.ObuUpgradeAppNetWorkManager
 import com.zhjt.mogo_core_function_devatools.upgrade.UpgradeAppNetWorkManager
 import mogo.telematics.pad.MessagePad
 
-
+/**
+ * 车辆绑定
+ */
 class BindingCarManager : IMoGoAutopilotCarConfigListener {
 
     companion object {
@@ -61,6 +64,10 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
         if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.macAddress)) {
             Log.d("Upgrade", "MoGoHandAdasMsgManager address = " + carConfigResp.macAddress)
+            CallerLogger.d(
+                "$M_DEVA$TAG",
+                "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} "
+            )
             getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
         }
     }
@@ -75,6 +82,8 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
             "$M_DEVA$TAG",
             "getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5"
         )
+        SharedPrefsMgr.getInstance(mContext!!).putString(SharedPrefsConstants.APP_MAC, macAddress)
+
         mAddress = macAddress
         mWidevineIDWithMd5 = widevineIDWithMd5
         if (screenType == 1) { //司机屏
@@ -162,9 +171,13 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
      * 查询app是否需要升级
      */
     fun queryAppUpgrade() {
-        UpgradeAppNetWorkManager.instance
-            ?.getAppUpgradeInfo(mContext, mAddress ?: "", role.toString() + "")
+//        UpgradeAppNetWorkManager.instance
+//            ?.getAppUpgradeInfo(mContext, mAddress ?: "", role.toString() + "")
 
+        (if(!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!).getString(SharedPrefsConstants.APP_MAC))?.let {
+            UpgradeAppNetWorkManager.instance
+                ?.getAppUpgradeInfo(mContext, it, role.toString() + "")
+        }
     }
 
     /**
@@ -174,7 +187,7 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     fun queryObuUpgrade(obuVersionName: String) {
         if (screenType == 1) {
             CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected =  ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress")
-            ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(mContext, mAddress, obuVersionName)
+            ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(mContext, if(!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!).getString(SharedPrefsConstants.APP_MAC), obuVersionName)
         }
     }
 

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt

@@ -458,6 +458,20 @@ enum class EventTypeEnumNew(
         content = "前方%s米交通事故",
         tts = "前方%s米交通事故"
     ),
+    TYPE_ATTENTION_CONFLUENCE(
+        44.toString(),
+        "注意合流",
+        poiTypeSrcVr = R.drawable.v2x_icon_jiaotongshigu_vr,
+        content = "前方%s米注意合流",
+        tts = "前方%s米注意合流"
+    ),
+    TYPE_PEDESTRIAN_CROSSING(
+        114.toString(),
+        "人行横道",
+        poiTypeSrcVr = R.drawable.v2x_icon_jiaotongshigu_vr,
+        content = "前方%s米人行横道",
+        tts = "前方%s米人行横道"
+    ),
     //------------车内标牌 obu end -------------->
 
     TYPE_SOCKET_ROAD_CONGESTION(
@@ -961,6 +975,15 @@ enum class EventTypeEnumNew(
                 TYPE_USECASE_ID_ACCIDENT.poiType ->{
                     TYPE_USECASE_ID_ACCIDENT.poiTypeStr
                 }
+                //注意合流
+                TYPE_ATTENTION_CONFLUENCE.poiType ->{
+                    TYPE_ATTENTION_CONFLUENCE.poiTypeStr
+                }
+                //人行横道
+                TYPE_PEDESTRIAN_CROSSING.poiType ->{
+                    TYPE_PEDESTRIAN_CROSSING.poiTypeStr
+                }
+
                 //紧急制动预警
                 TYPE_USECASE_ID_EBW.poiType ->{
                     TYPE_USECASE_ID_EBW.poiTypeStr
@@ -1162,6 +1185,8 @@ enum class EventTypeEnumNew(
                 TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.poiTypeSrcVr
                 TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr
                 TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.poiTypeSrcVr
+                TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.poiTypeSrcVr
+                TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.poiTypeSrcVr
 
                 TYPE_USECASE_ID_EBW.poiType -> TYPE_USECASE_ID_EBW.poiTypeSrcVr
                 TYPE_USECASE_ID_FCW.poiType -> TYPE_USECASE_ID_FCW.poiTypeSrcVr
@@ -1243,6 +1268,8 @@ enum class EventTypeEnumNew(
                 TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.content
                 TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content
                 TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.content
+                TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.content
+                TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.content
 
                 else -> TYPE_ERROR.content
             }
@@ -1310,6 +1337,8 @@ enum class EventTypeEnumNew(
                 TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.tts
                 TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts
                 TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.tts
+                TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.tts
+                TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.tts
 
                 else -> TYPE_ERROR.tts
             }

foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java

@@ -16,4 +16,6 @@ public class SharedPrefsConstants {
 
     public static final String HOST_ADDRESS = "host_address";
     public static final String APP_UPGRADE_CONTENT = "app_upgrade_content";
+
+    public static final String APP_MAC = "app_mac";
 }