Merge branch 'dev_robotaxi-d-app-module_2110_220915_2.11.0' into dev_robotaxi-d-app-module_2110_yangyakun_2.11.0

# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
#	OCH/mogo-och-bus/src/main/res/values/colors.xml
#	OCH/mogo-och-common-module/src/main/res/values/colors.xml
#	OCH/mogo-och-common-module/src/main/res/values/styles.xml

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt

@@ -570,7 +570,6 @@ class MoGoAutopilotProvider :
 
     override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
         // 乘客屏才监听
-        AppConfigInfo.plateNumber = carConfigResp.plateNumber
         CallerBindingcarManager.getBindingcarProvider()
             .getBindingcarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
         invokeNettyConnResult("乘客屏车牌号:${carConfigResp.plateNumber},Mac地址为：${carConfigResp.macAddress}")

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt

@@ -50,6 +50,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateLi
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.zhidao.support.adas.high.AdasManager
 import com.zhidao.support.adas.high.OnAdasListener
+import com.zhidao.support.adas.high.bean.AutopilotAbility
 import com.zhidao.support.adas.high.common.ProtocolStatus
 import com.zhjt.service.chain.ChainLog
 import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD
@@ -206,6 +207,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
                     autopilotStatusInfo.dockVersion = it.dockVersion
                     AppConfigInfo.dockerVersion = it.dockVersion
                 }
+                AppConfigInfo.isConnectAutopilot = autopilotStatusInfo.connectStatus
+                AppConfigInfo.connectStatusDescribe = autopilotStatusInfo.connectStatusDescribe
                 invokeAutoPilotStatus()
             }
         }
@@ -306,6 +309,9 @@ class MoGoAdasListenerImpl : OnAdasListener {
         carConfigResp: MessagePad.CarConfigResp?
     ) {
         if (HdMapBuildConfig.isMapLoaded && carConfigResp != null) {
+            AppConfigInfo.plateNumber = carConfigResp.plateNumber//车牌号
+            AppConfigInfo.iPCMacAddress = carConfigResp.macAddress//工控机MAC地址
+            AppConfigInfo.protocolVersionNumber = carConfigResp.protocolVersionValue//工控机协议版本
             invokeAutopilotCarConfigData(carConfigResp)
         }
     }
@@ -427,4 +433,11 @@ class MoGoAdasListenerImpl : OnAdasListener {
     override fun onError(status: ProtocolStatus, bytes: ByteArray) {
 
     }
+
+    /**
+     * 是否可以启动自动驾驶
+     * 使用方法查看：app_ipc_monitoring/uiMainActivity/onAutopilotAbility
+     */
+    override fun onAutopilotAbility(ability: AutopilotAbility?) {
+    }
 }

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeApiService.java

@@ -11,7 +11,7 @@ import retrofit2.http.Query;
 
 /**
  * @author lixiaopeng
- * @description 绑定车辆
+ * @description 升级
  * @since: 6/20/22
  */
 public interface UpgradeApiService {
@@ -21,7 +21,8 @@ public interface UpgradeApiService {
      * @return {@link UpgradeAppInfo}
      */
     @Headers("Content-Type:application/json;charset=UTF-8")
-    @POST("unify/selectResources")
-    Observable<UpgradeAppInfo> getUpgradeInfo(@Query("resources") String res, @Body RequestBody requestBody);
+    @POST("/eagleEye-mis/config/versionInfo")
+//    Observable<UpgradeAppInfo> getUpgradeInfo(@Query("resources") String res, @Body RequestBody requestBody);
+    Observable<UpgradeAppInfo> getUpgradeInfo(@Body RequestBody requestBody);
 
 }

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java

@@ -35,7 +35,7 @@ import okhttp3.RequestBody;
 public class UpgradeAppNetWorkManager {
     private static volatile UpgradeAppNetWorkManager requestNoticeManager;
     private final UpgradeApiService mUpgradeApiService;
-    private static final String TAG = "UpgradeAppNetWorkManager";
+    private static final String TAG = "Upgrade";
 
 
     private UpgradeAppNetWorkManager() {
@@ -58,18 +58,16 @@ public class UpgradeAppNetWorkManager {
     /**
      * 获取app升级信息
      */
-    public void getAppUpgradeInfo(Context context, String screenType, String carType) {
+    public void getAppUpgradeInfo(Context context, String mac, String screenType) {
         String sn = "X20202203105S688HZ";
-//        int versionCode = 2070000;
-//        String versionName = "2.7.0";
-
+//        String mac = "48:b0:2d:3a:bc:78";
 //        String sn = MoGoAiCloudClientConfig.getInstance().getSn();
         int versionCode = AppUtils.getAppVersionCode();
-        String versionName = AppUtils.getAppVersionName();
 
-        UpgradeAppRequest request = new UpgradeAppRequest(sn, versionCode, versionName, screenType, carType);
+        //TODO 不能写死
+        UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, screenType);
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
-        mUpgradeApiService.getUpgradeInfo("apps_control", requestBody)
+        mUpgradeApiService.getUpgradeInfo(requestBody)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Observer<UpgradeAppInfo>() {
@@ -79,18 +77,20 @@ public class UpgradeAppNetWorkManager {
 
                     @Override
                     public void onNext(@NonNull UpgradeAppInfo info) {
-                        if (info != null && info.getData() != null && info.getData().size() > 0) {
-                            CallerLogger.INSTANCE.d(TAG, "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code());
-//                            if (info.getData().get(0).getVersion_code() > versionCode) {
-
-                                CallerHmiManager.INSTANCE.showUpgradeDialog(info.getData().get(0).getApp_url().substring(info.getData().get(0).getApp_url().lastIndexOf("/")+1), info.getData().get(0).getApp_url());
-//                            }
+                        if (info != null && info.result != null) {
+                            CallerLogger.INSTANCE.d(TAG, "UpgradeAppInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode());
+                            Log.d(TAG, "UpgradeAppInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode() + "--versionCode =" + versionCode + "--info.result = " + info.result);
+                            if (info.result.getVersionCode() > versionCode) {
+                                CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl());
+                            }
+                        } else {
+                            Log.e(TAG, "onNext info == null");
                         }
                     }
 
                     @Override
-                    public void onError(@NonNull Throwable e) {
-                        CallerLogger.INSTANCE.e(TAG, "UpgradeAppInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
+                    public void onError(Throwable e) {
+
                     }
 
                     @Override

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppRequest.java

@@ -6,18 +6,15 @@ package com.mogo.eagle.core.function.appupgrade.network;
  * @since: 11/15/21
  */
 public class UpgradeAppRequest {
+    private String mac;
     private String sn;
-    private int version_code;
-    private String version_name;
-    private String screen_type;
-    private String car_type;
+    private String screenType;
 
-    public UpgradeAppRequest( String sn, int versionCode, String versionName, String type, String carType) {
+
+    public UpgradeAppRequest( String sn, String mac, String screenType) {
         this.sn = sn;
-        this.version_code = versionCode;
-        this.version_name = versionName;
-        this.screen_type = type;
-        this.car_type = carType;
+        this.mac = mac;
+        this.screenType = screenType;
     }
 
     public String getSn() {
@@ -28,46 +25,20 @@ public class UpgradeAppRequest {
         this.sn = sn;
     }
 
-    public int getVersion_code() {
-        return version_code;
+    public String getMac() {
+        return mac;
     }
 
-    public void setVersion_code(int version_code) {
-        this.version_code = version_code;
+    public void setMac(String mac) {
+        this.mac = mac;
     }
 
-    public String getVersion_name() {
-        return version_name;
+    public String getScreenType() {
+        return screenType;
     }
 
-    public void setVersion_name(String version_name) {
-        this.version_name = version_name;
+    public void setScreenType(String screenType) {
+        this.screenType = screenType;
     }
 
-    public String getScreen_type() {
-        return screen_type;
-    }
-
-    public void setScreen_type(String screen_type) {
-        this.screen_type = screen_type;
-    }
-
-    public String getCar_type() {
-        return car_type;
-    }
-
-    public void setCar_type(String car_type) {
-        this.car_type = car_type;
-    }
-
-    @Override
-    public String toString() {
-        return "UpgradeAppRequest{" +
-                "sn='" + sn + '\'' +
-                ", version_code=" + version_code +
-                ", version_name='" + version_name + '\'' +
-                ", screen_type='" + screen_type + '\'' +
-                ", car_type='" + car_type + '\'' +
-                '}';
-    }
 }

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java

@@ -116,6 +116,10 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
         }
     }
 
+    /**
+     * 以后可能废弃
+     * @return
+     */
     private int getScreenType() {
         int screenType = -1;
         if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
@@ -142,12 +146,34 @@ public class BindingcarProvider implements IMoGoBindingcarProvider {
 
     }
 
+    private String getCarScreenType() {
+        String screenType = "";
+        if(AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            screenType = "1"; //taxi乘客端
+        }
+
+        if(AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            screenType = "2"; //taxi司机端
+        }
+
+        if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            screenType = "3"; //bus 乘客端
+        }
+
+        if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            screenType = "4"; //bus 司机端
+        }
+
+        return screenType;
+    }
+
     /**
      * 查询app是否需要升级
      */
     @Override
     public void queryAppUpgrade() {
-        UpgradeAppNetWorkManager.getInstance().getAppUpgradeInfo(mContext, String.valueOf(getScreenType()), String.valueOf(getCarType()));
+        Log.d("Upgrade", "mac = " + mAddress + "---type = " + getCarScreenType() );
+        UpgradeAppNetWorkManager.getInstance().getAppUpgradeInfo(mContext, mAddress, getCarScreenType());
     }
 
 }

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

@@ -11,6 +11,8 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule
 import com.mogo.eagle.core.data.deva.scene.SceneTAG
 import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
 import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager
+import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigCenter.Companion.bizConfigCenter
+import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigImpl
 import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchManager
 import com.zhjt.mogo_core_function_devatools.monitor.MonitorManager
 import com.zhjt.mogo_core_function_devatools.scene.SceneManager.Companion.sceneManager
@@ -30,8 +32,13 @@ class DevaToolsProvider : IDevaToolsProvider {
 
     override fun init(context: Context) {
         mContext = context
-        traceManager.init(context)
-        MogoLogCatchManager.init(context)
+    }
+
+    override fun initBiz() {
+        bizConfigCenter.init(mContext!!)
+        FuncConfigImpl.init()
+        traceManager.init(mContext!!)
+        MogoLogCatchManager.init(mContext!!)
     }
 
     override fun startLogCatch() {

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/record/RecordHelper.java

@@ -6,7 +6,6 @@ import android.os.Environment;
 import android.util.Log;
 
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.utilcode.util.FileUtils;
 import com.zhjt.mogo_core_function_devatools.badcase.record.fft.FftFactory;
 import com.zhjt.mogo_core_function_devatools.badcase.record.listener.RecordListener;
@@ -177,14 +176,14 @@ public class RecordHelper {
         AudioRecordThread() {
             bufferSize = AudioRecord.getMinBufferSize(currentConfig.getSampleRate(),
                     currentConfig.getChannelConfig(), currentConfig.getEncodingConfig()) * RECORD_AUDIO_BUFFER_TIMES;
-            Logger.d(TAG, "record buffer size = %s", bufferSize);
+            CallerLogger.INSTANCE.d("$M_DEVA$TAG", "record buffer size = %s", bufferSize);
             audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, currentConfig.getSampleRate(),
                     currentConfig.getChannelConfig(), currentConfig.getEncodingConfig(), bufferSize);
             if (currentConfig.getFormat() == RecordConfig.RecordFormat.MP3) {
                 if (mp3EncodeThread == null) {
                     initMp3EncoderThread(bufferSize);
                 } else {
-                    Logger.e(TAG, "mp3EncodeThread != null, 请检查代码");
+                    CallerLogger.INSTANCE.e("$M_DEVA$TAG", "mp3EncodeThread != null, 请检查代码");
                 }
             }
         }
@@ -206,7 +205,7 @@ public class RecordHelper {
         private void startPcmRecorder() {
             state = RecordState.RECORDING;
             notifyState();
-            Logger.d(TAG, "开始录制 Pcm");
+            CallerLogger.INSTANCE.d("$M_DEVA$TAG", "开始录制 Pcm");
             FileOutputStream fos = null;
             try {
                 fos = new FileOutputStream(tmpFile);
@@ -224,7 +223,7 @@ public class RecordHelper {
                 if (state == RecordState.STOP) {
                     makeFile();
                 } else {
-                    Logger.i(TAG, "暂停！");
+                    CallerLogger.INSTANCE.i("$M_DEVA$TAG", "暂停！");
                 }
             } catch (Exception e) {
                 notifyError("录音失败");
@@ -240,7 +239,7 @@ public class RecordHelper {
             if (state != RecordState.PAUSE) {
                 state = RecordState.IDLE;
                 notifyState();
-                Logger.d(TAG, "录音结束");
+                CallerLogger.INSTANCE.d("$M_DEVA$TAG", "录音结束");
             }
         }
 
@@ -268,7 +267,7 @@ public class RecordHelper {
                 notifyState();
                 stopMp3Encoded();
             } else {
-                Logger.d(TAG, "暂停");
+                CallerLogger.INSTANCE.d("$M_DEVA$TAG", "暂停");
             }
         }
     }
@@ -283,7 +282,7 @@ public class RecordHelper {
                 }
             });
         } else {
-            Logger.e(TAG, "mp3EncodeThread is null, 代码业务流程有误，请检查！！ ");
+            CallerLogger.INSTANCE.e("$M_DEVA$TAG", "mp3EncodeThread is null, 代码业务流程有误，请检查！！ ");
         }
     }
 
@@ -302,7 +301,7 @@ public class RecordHelper {
                 break;
         }
         notifyFinish();
-        Logger.i(TAG, "录音完成！ path: %s ； 大小：%s", resultFile.getAbsoluteFile(), resultFile.length());
+        CallerLogger.INSTANCE.i("$M_DEVA$TAG", "录音完成！ path: %s ； 大小：%s", resultFile.getAbsoluteFile(), resultFile.length());
     }
 
     /**
@@ -377,7 +376,7 @@ public class RecordHelper {
 
     private String getFilePath(String fileName) {
         if (!FileUtils.createOrExistsDir(ROOT_PATH)) {
-            Logger.w(TAG, "文件夹创建失败：%s", ROOT_PATH);
+            CallerLogger.INSTANCE.w("$M_DEVA$TAG", "文件夹创建失败：%s", ROOT_PATH);
             return null;
         }
 
@@ -388,7 +387,7 @@ public class RecordHelper {
 
     private String getTempFilePath() {
         if (!FileUtils.createOrExistsDir(TEMP_PATH)) {
-            Logger.e(TAG, "文件夹创建失败：%s", TEMP_PATH);
+            CallerLogger.INSTANCE.e("$M_DEVA$TAG", "文件夹创建失败：%s", TEMP_PATH);
         }
         String fileName = String.format(Locale.getDefault(), "tmp_%s", FileUtils.getNowString(new SimpleDateFormat("yyyyMMddHHmmssSSS", Locale.SIMPLIFIED_CHINESE)));
         return String.format(Locale.getDefault(), "%s%s.pcm", TEMP_PATH, fileName);

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt

@@ -0,0 +1,84 @@
+package com.zhjt.mogo_core_function_devatools.funcconfig
+
+import android.content.Context
+import com.mogo.aicloud.services.socket.IMogoOnMessageListener
+import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
+import com.mogo.commons.AbsMogoApplication
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CLOUD_SHOW
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager
+import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.mogo.eagle.core.utilcode.util.SPUtils
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigConst.Companion.FUNC_CONFIG_TYPE
+import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigConst.Companion.defaultFuncConfig
+import com.zhjt.mogo_core_function_devatools.funcconfig.network.FuncConfigNetWorkModel
+import com.zhjt.service.chain.ChainLog
+import com.zhjt.service.chain.TracingConstants
+import com.zhjt.service_biz.BizManager
+import com.zhjt.service_biz.FuncConfig
+
+class FuncConfigCenter : IMogoOnMessageListener<FuncConfig> {
+
+    companion object {
+        val bizConfigCenter by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
+            FuncConfigCenter()
+        }
+    }
+
+    private var mContext: Context? = null
+    private val funcConfigNetWorkModel = FuncConfigNetWorkModel()
+
+    fun init(context: Context) {
+        mContext = context
+        MogoAiCloudSocketManager.getInstance(AbsMogoApplication.getApp().applicationContext)
+            .registerOnMessageListener(FUNC_CONFIG_TYPE, this)
+        UiThreadHandler.postDelayed({
+            funcConfigNetWorkModel.requestFuncConfig({
+                SPUtils.getInstance("biz_config").put("config", GsonUtils.toJson(it))
+                refreshConfig(it)
+            }, {
+                val bizJson = SPUtils.getInstance("biz_config")
+                    .getString("config", GsonUtils.toJson(defaultFuncConfig()))
+                refreshConfig(GsonUtils.fromJson(bizJson, FuncConfig::class.java))
+            })
+        }, 1000L * 5)
+
+    }
+
+    override fun target(): Class<FuncConfig> {
+        return FuncConfig::class.java
+    }
+
+    override fun onMsgReceived(obj: FuncConfig?) {
+        obj?.let {
+            refreshConfig(it)
+        }
+    }
+
+    @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
+        linkCode = CHAIN_LINK_CLOUD_SHOW,
+        endpoint = TracingConstants.Endpoint.PAD,
+        nodeAliasCode = CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED,
+        paramIndexes = [0],
+        clientPkFileName = "sn"
+    )
+    private fun refreshConfig(funcConfig: FuncConfig) {
+        BizManager.updateBizConfigData(funcConfig)
+        funcConfig.business.forEach { business ->
+            CallerDevaToolsFuncConfigListenerManager.invokeDevaToolsFuncConfigBizUpdate(
+                business.biz,
+                business.data
+            )
+        }
+    }
+
+    fun onDestroy() {
+        MogoAiCloudSocketManager.getInstance(AbsMogoApplication.getApp().applicationContext)
+            .unregisterLifecycleListener(FUNC_CONFIG_TYPE)
+        mContext = null
+    }
+
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt

@@ -0,0 +1,119 @@
+package com.zhjt.mogo_core_function_devatools.funcconfig
+
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_AUTOPILOT_LANE_SELECTION
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_AVW
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BAG_RECORD
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BEAUTY_MODE
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BSW
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BYPASS
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_CLW
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_DNPW
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_EBW
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_FCW
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_FULL_LOG
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_HLW
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_IVP
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_IVP_GREEN
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_IVS
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_LCW
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_LIMIT_SPEED_SET
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_LTA
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_OPT_LINE
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RAIN_MODE
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RTS
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_SLW
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_TJW
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_TRACE_LOG
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_VIP
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_VRU
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_VRU_RI
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_WARNING_UPLOAD
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.FOUNDATION
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2N
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2V
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.util.AppUtils
+import com.zhjt.mogo_core_function_devatools.BuildConfig
+import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager
+import com.zhjt.service_biz.Business
+import com.zhjt.service_biz.FuncConfig
+import com.zhjt.service_biz.SubBiz
+
+class FuncConfigConst {
+
+    companion object{
+
+        const val FUNC_CONFIG_TYPE = 500001
+
+        fun defaultFuncConfig(): FuncConfig {
+            val businessList = mutableListOf<Business>()
+
+            val v2nSubList = mutableListOf<SubBiz>()
+            v2nSubList.add(SubBiz(BIZ_VIP, lock = false, state = true, dependNode = "", data = ""))
+            v2nSubList.add(SubBiz(BIZ_OPT_LINE, lock = false, state = false, dependNode = "", data = ""))
+            v2nSubList.add(SubBiz(BIZ_VRU, lock = false, state = true, dependNode = "", data = ""))
+            v2nSubList.add(SubBiz(BIZ_VRU_RI, lock = false, state = true, dependNode = "", data = ""))
+            v2nSubList.add(SubBiz(BIZ_HLW, lock = false, state = true, dependNode = "", data = ""))
+            businessList.add(Business(V2N, v2nSubList))
+
+            val v2iSubList = mutableListOf<SubBiz>()
+            v2iSubList.add(SubBiz(BIZ_IVP_GREEN, lock = false, state = true, dependNode = "", data = ""))
+            v2iSubList.add(SubBiz(BIZ_IVP, lock = false, state = true, dependNode = "", data = ""))
+            v2iSubList.add(SubBiz(BIZ_RTS, lock = false, state = true, dependNode = "", data = ""))
+            v2iSubList.add(SubBiz(BIZ_SLW, lock = false, state = true, dependNode = "", data = ""))
+            v2iSubList.add(SubBiz(BIZ_IVS, lock = false, state = true, dependNode = "", data = ""))
+            v2iSubList.add(SubBiz(BIZ_TJW, lock = false, state = true, dependNode = "", data = ""))
+            businessList.add(Business(V2I,v2iSubList))
+
+            val v2vSubList = mutableListOf<SubBiz>()
+            v2vSubList.add(SubBiz(BIZ_AVW, lock = false, state = true, dependNode = "", data = ""))
+            v2vSubList.add(SubBiz(BIZ_LCW, lock = false, state = true, dependNode = "", data = ""))
+            v2vSubList.add(SubBiz(BIZ_BSW, lock = false, state = true, dependNode = "", data = ""))
+            v2vSubList.add(SubBiz(BIZ_EBW, lock = false, state = true, dependNode = "", data = ""))
+            v2vSubList.add(SubBiz(BIZ_FCW, lock = false, state = true, dependNode = "", data = ""))
+            v2vSubList.add(SubBiz(BIZ_LTA, lock = false, state = true, dependNode = "", data = ""))
+            v2vSubList.add(SubBiz(BIZ_CLW, lock = false, state = true, dependNode = "", data = ""))
+            v2vSubList.add(SubBiz(BIZ_DNPW, lock = false, state = true, dependNode = "", data = ""))
+            businessList.add(Business(V2V,v2vSubList))
+
+            val foundationSubList = mutableListOf<SubBiz>()
+            foundationSubList.add(SubBiz(BIZ_BEAUTY_MODE, lock = true, state = false, dependNode = "", data = ""))
+            foundationSubList.add(SubBiz(BIZ_RAIN_MODE, lock = true, state = false, dependNode = "", data = ""))
+            foundationSubList.add(SubBiz(BIZ_FULL_LOG, lock = false, state = false, dependNode = "", data = ""))
+            foundationSubList.add(SubBiz(BIZ_TRACE_LOG, lock = false, state = true, dependNode = "", data = ""))
+            foundationSubList.add(SubBiz(BIZ_BAG_RECORD, lock = true, state = true, dependNode = "", data = ""))
+            foundationSubList.add(SubBiz(BIZ_WARNING_UPLOAD, lock = true, state = true, dependNode = "", data = ""))
+            foundationSubList.add(SubBiz(BIZ_LIMIT_SPEED_SET, lock = false, state = true, dependNode = "", data = ""))
+            foundationSubList.add(SubBiz(BIZ_BYPASS, lock = false, state = true, dependNode = "", data = ""))
+            foundationSubList.add(SubBiz(BIZ_AUTOPILOT_LANE_SELECTION, lock = false, state = true, dependNode = "", data = ""))
+            businessList.add(Business(FOUNDATION,foundationSubList))
+
+            return FuncConfig(0, AppUtils.getAppVersionCode(), getChannelCode(), getEnv(), businessList)
+        }
+
+        private fun getEnv():Int{
+            return if(EnvChangeManager.getEnvConfig()!= null){
+                 EnvChangeManager.getEnvConfig()!!.netMode
+            }else {
+                 0
+            }
+        }
+
+        // todo 新增车型需要更新(清扫车)
+        fun getChannelCode(): Int{
+            return when{
+                AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)
+                        && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) -> 1
+                AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)
+                        && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) -> 2
+                AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+                        && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) -> 3
+                AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+                        && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) -> 4
+                else -> 0
+            }
+        }
+    }
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigImpl.kt

@@ -0,0 +1,30 @@
+package com.zhjt.mogo_core_function_devatools.funcconfig
+
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BEAUTY_MODE
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RAIN_MODE
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_WARNING_UPLOAD
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.FOUNDATION
+import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager
+
+object FuncConfigImpl : IMoGoDevaToolsFuncConfigListener {
+
+    private const val TAG = "FuncConfigImpl"
+
+    fun init() {
+        CallerDevaToolsFuncConfigListenerManager.registerDevaToolsFuncConfigListener(
+            FOUNDATION,
+            TAG,
+            this
+        )
+    }
+
+    override fun updateBizData(type: String, state: Boolean, lock: Boolean, data: String?) {
+        when (type) {
+            BIZ_BEAUTY_MODE -> FunctionBuildConfig.isDemoMode = state
+            BIZ_RAIN_MODE -> FunctionBuildConfig.isRainMode = state
+            BIZ_WARNING_UPLOAD -> FunctionBuildConfig.isReportWarning = state
+        }
+    }
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigApiService.kt

@@ -0,0 +1,16 @@
+package com.zhjt.mogo_core_function_devatools.funcconfig.network
+
+import com.mogo.eagle.core.data.BaseResponse
+import com.zhjt.service_biz.FuncConfig
+import retrofit2.http.Body
+import retrofit2.http.Headers
+import retrofit2.http.POST
+
+interface FuncConfigApiService {
+
+    //FuncConfig
+    @Headers("Content-Type:application/json;charset=UTF-8")
+    @POST("eagleEye-mis/config/abilityInfo")
+    suspend fun funcConfig(@Body map: MutableMap<String, Any>): BaseResponse<FuncConfig>
+
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigHost.kt

@@ -0,0 +1,22 @@
+package com.zhjt.mogo_core_function_devatools.funcconfig.network
+
+import com.mogo.commons.debug.DebugConfig
+
+class FuncConfigHost {
+
+    companion object{
+        private const val HOST_DEV = "https://eagle-qa.zhidaozhixing.com"
+        private const val HOST_RELEASE = "https://eagle.zhidaozhixing.com"
+
+        fun get(): String{
+            return when (DebugConfig.getNetMode()) {
+                DebugConfig.NET_MODE_DEV -> HOST_DEV
+                DebugConfig.NET_MODE_QA -> HOST_DEV
+                DebugConfig.NET_MODE_DEMO -> HOST_RELEASE
+                DebugConfig.NET_MODE_RELEASE -> HOST_RELEASE
+                else -> HOST_RELEASE
+            }
+        }
+    }
+
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt

@@ -0,0 +1,75 @@
+package com.zhjt.mogo_core_function_devatools.funcconfig.network
+
+import android.util.Log
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.eagle.core.data.BaseResponse
+import com.mogo.eagle.core.network.MoGoRetrofitFactory
+import com.mogo.eagle.core.network.apiCall
+import com.mogo.eagle.core.network.request
+import com.mogo.eagle.core.utilcode.util.DeviceUtils
+import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigConst
+import com.zhjt.service_biz.FuncConfig
+
+class FuncConfigNetWorkModel {
+
+    private fun getNetWorkApi(baseUrl: String = FuncConfigHost.get()): FuncConfigApiService {
+        return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl)
+            .create(FuncConfigApiService::class.java)
+    }
+
+    private var retryTime = 0
+    private var success: ((FuncConfig) -> Unit)? = null
+    private var error: ((String) -> Unit)? = null
+
+    fun requestFuncConfig(
+        onSuccess: ((FuncConfig) -> Unit)? = null,
+        onError: ((String) -> Unit)? = null
+    ) {
+        request<BaseResponse<FuncConfig>> {
+            val map = mutableMapOf<String, Any>()
+            start {
+                if (success == null) {
+                    success = onSuccess
+                }
+                if (error == null) {
+                    error = onError
+                }
+                //todo test
+//                map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
+                map["sn"] = "X20202203105S688HZ"
+//                map["mac"] = DeviceUtils.getMacAddress()
+                map["mac"] = "48:b0:2d:3a:bc:78"
+//                map["channelVersion"] = FuncConfigConst.getChannelCode()
+                map["channelVersion"] = 1
+            }
+            loader {
+                apiCall {
+                    getNetWorkApi().funcConfig(map)
+                }
+            }
+            onSuccess {
+                if (it.result != null) {
+                    success?.invoke(it.result)
+                } else {
+                    if (retryTime < 3) {
+                        retryTime += 1
+                        requestFuncConfig()
+                    } else {
+                        error?.invoke("FuncConfig error msg is null")
+                    }
+                }
+            }
+            onError {
+                if (retryTime < 3) {
+                    retryTime += 1
+                    requestFuncConfig()
+                } else if (it.message != null) {
+                    error?.invoke(it.message ?: "FuncConfig error msg is null")
+                }
+
+            }
+
+        }
+    }
+
+}

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt

@@ -5,7 +5,6 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule
 import com.mogo.eagle.core.data.deva.scene.SceneModuleTAG
 import com.mogo.eagle.core.data.deva.scene.SceneTAG
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.Scene.Companion.scene
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
@@ -71,7 +70,6 @@ class SceneManager {
 
         //默认未创建的，符合scene tag，首次初始化logger=true
         scene.addChangeListener { change ->
-            Logger.i("emArrow","scene change : $change")
             sceneModuleTAG.map.iterator().forEach { map ->
                 val sceneModule = map.value
                 sceneModule.name?.let {

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/StatusManager.kt

@@ -12,6 +12,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.*
 import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.logger.*
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.util.*
 import com.zhjt.mogo_core_function_devatools.status.entity.CanStatus
 import com.zhjt.mogo_core_function_devatools.status.entity.GpsStatus
@@ -50,10 +51,10 @@ object StatusManager {
         override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
             super.onAutopilotGuardian(guardianInfo)
             guardianInfo?.code?.takeIf {
-                Logger.d(TAG, "-- onAutopilotGuardian ---: code: $it")
+                CallerLogger.d("$M_DEVA$TAG", "-- onAutopilotGuardian ---: code: $it")
                 it.contains("RTK_STATUS", true) || it.contains("CAN", true) || it == "ILCT_RTK_OR_SLAM_CHANGE"
             }?.run {
-                Logger.d(TAG, "-- onAutopilotGuardian trigger req ---: code: $this")
+                CallerLogger.d("$M_DEVA$TAG", "-- onAutopilotGuardian trigger req ---: code: $this")
                 req()
             }
         }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/rtk/RTKImpl.kt

@@ -4,7 +4,8 @@ import android.content.*
 import android.util.*
 import com.mogo.eagle.core.function.api.autopilot.*
 import com.mogo.eagle.core.function.call.autopilot.*
-import com.mogo.eagle.core.utilcode.mogo.logger.*
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.zhjt.mogo_core_function_devatools.status.entity.RTKStatus
 import com.zhjt.mogo_core_function_devatools.status.flow.IFlow
 import kotlinx.coroutines.*
@@ -31,7 +32,7 @@ internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatu
 
     override fun onCreate() {
         send(RTKStatus(getDesc(), getCode()))
-        Logger.d(TAG, "-- onCreate --")
+        CallerLogger.d("$M_DEVA$TAG", "-- onCreate --")
         CallerAutoPilotStatusListenerManager.addListener(TAG, this)
         CallerAutopilotCarStatusListenerManager.addListener(TAG, this)
         if (CallerAutoPilotManager.isConnected()) {
@@ -67,7 +68,7 @@ internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatu
     override fun onAutopilotIpcConnectStatusChanged(status: Int, reason: String?) {
         super.onAutopilotIpcConnectStatusChanged(status, reason)
         if (!CallerAutoPilotManager.isConnected()) {
-            Logger.d(TAG, "工控机断开了....")
+            CallerLogger.d("$M_DEVA$TAG", "工控机断开了....")
             healthInfo.set(null)
             send(RTKStatus("", -1))
         }
@@ -114,7 +115,7 @@ internal class RTKImpl(ctx: Context): IFlow<RTKStatus>(ctx), IMoGoAutopilotStatu
     override fun onDestroy() {
         super.onDestroy()
         isOldVersion.set(false)
-        Logger.d(TAG, "-- onDestroy --")
+        CallerLogger.d("$M_DEVA$TAG", "-- onDestroy --")
         CallerAutoPilotStatusListenerManager.removeListener(TAG)
         CallerAutopilotCarStatusListenerManager.removeListener(TAG)
     }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/adapter/StatusAdapter.kt

@@ -7,8 +7,8 @@ import androidx.core.content.*
 import androidx.recyclerview.widget.*
 import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.logger.*
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.util.*
-import com.zhjt.mogo_core_function_devatools.*
 import com.zhjt.mogo_core_function_devatools.R
 import com.zhjt.mogo_core_function_devatools.R.drawable
 import com.zhjt.mogo_core_function_devatools.status.entity.*
@@ -16,7 +16,6 @@ import com.zhjt.mogo_core_function_devatools.status.entity.IpcStatus
 import com.zhjt.mogo_core_function_devatools.status.entity.Status
 import com.zhjt.mogo_core_function_devatools.status.entity.TracingStatus.Tracing.*
 import com.zhjt.mogo_core_function_devatools.status.ui.adapter.StatusAdapter.StatusViewHolder
-import kotlinx.coroutines.*
 
 internal class StatusAdapter(val ctx: Context, var data: ArrayList<Status>): RecyclerView.Adapter<StatusViewHolder>() {
 
@@ -124,7 +123,7 @@ internal class StatusAdapter(val ctx: Context, var data: ArrayList<Status>): Rec
             is TracingStatus -> {
                 val extra = status.state.extra
                 val extraDesc = if (extra != null && extra.isNotEmpty()) extra.values.joinToString(",") else ""
-                Logger.d(TAG, "traceing_state: $status -> extra: $extraDesc :: extra: $extra")
+                CallerLogger.d("$M_DEVA$TAG", "traceing_state: $status -> extra: $extraDesc :: extra: $extra")
                 when(status.state) {
                     //"轨迹类型:${ if (status.state == TRACK_LOADED) "循迹" else if (status.state == ROUTE_LOADED) "自主算路" else "暂无轨迹" }"
                     MAP_TRA_TYPE -> {

core/function-impl/mogo-core-function-hmi/build.gradle

@@ -139,6 +139,7 @@ dependencies {
         api project(':core:mogo-core-function-call')
         api project(':core:mogo-core-function-api')
 
+        api project(':libraries:mogo-adas')
         api project(':libraries:map-usbcamera')
         api project(':libraries:mogo-adas-other')
     }

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

@@ -20,15 +20,22 @@ import androidx.core.view.*
 import androidx.lifecycle.lifecycleScope
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
+import com.kwai.koom.base.postOnMainThread
+import com.mogo.cloud.passport.MoGoAiCloudClient
+import com.mogo.commons.AbsMogoApplication
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.mvp.BaseFragment
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.commons.voice.*
+import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.bindingcar.AdUpgradeStateHelper
 import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.camera.CameraEntity
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RTS
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I
 import com.mogo.eagle.core.data.enums.SidePattern
 import com.mogo.eagle.core.data.enums.SidePattern.*
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
@@ -46,6 +53,7 @@ import com.mogo.eagle.core.function.api.hmi.view.IViewNotification
 import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
@@ -54,6 +62,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager
+import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.eagle.core.function.hmi.notification.WarningFloat
@@ -81,13 +90,13 @@ import com.mogo.eagle.core.utilcode.reminder.*
 import com.mogo.eagle.core.utilcode.reminder.api.*
 import com.mogo.eagle.core.utilcode.reminder.api.IReminder.IStateChangeListener
 import com.mogo.eagle.core.utilcode.reminder.api.impl.*
-import com.mogo.eagle.core.utilcode.util.SoundUtils
-import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.mogo.eagle.core.utilcode.util.TimeUtils
+import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String
-import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.map.MogoMap
 import com.mogo.module.common.enums.*
+import com.zhidao.support.adas.high.common.MogoReport.Code.Error.EMAP.*
 import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
+import com.zhjt.service_biz.BizConfig
 import kotlinx.android.synthetic.main.fragment_hmi.*
 import kotlinx.android.synthetic.main.view_auto_pilot_check.view.*
 import kotlinx.android.synthetic.main.view_och_bus_operation.view.*
@@ -104,12 +113,12 @@ import java.util.*
  * 预警图层
  */
 @Route(path = MoGoFragmentPaths.PATH_FRAGMENT_HMI)
- class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
-        IMoGoWaringProvider,
-        IMoGoHmiViewProxy,
-        MoGoHmiContract.View,
-        IMoGoAutopilotRecordListener,
-        IMoGoAutopilotStatusListener, IViewNotificationProvider {
+class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
+    IMoGoWaringProvider,
+    IMoGoHmiViewProxy,
+    MoGoHmiContract.View,
+    IMoGoAutopilotRecordListener,
+    IMoGoAutopilotStatusListener, IViewNotificationProvider {
     private val TAG = "MoGoHmiFragment"
 
     // DebugSettingView
@@ -145,11 +154,12 @@ import java.util.*
 
     //工控机节点上报列表
     private var reportList = arrayListOf<ReportEntity>()
-    //工控机上报列表悬浮窗
-    private var reportListFloatWindow: ReportListFloatWindow?=null
-    private var ipcReportWindow: IPCReportWindow?=null
 
-    private var adUpgradeDialog: AdUpgradeDialog?=null
+    //工控机上报列表悬浮窗
+    private var reportListFloatWindow: ReportListFloatWindow? = null
+    private var ipcReportWindow: IPCReportWindow? = null
+
+    private var adUpgradeDialog: AdUpgradeDialog? = null
 
     private var lastSpeakJob: Job? = null
 
@@ -183,8 +193,8 @@ import java.util.*
         }
 
         /**ivCameraIcon?.setOnLongClickListener {
-            activity?.let { it1 -> CarcorderPreviewView.show(it1) }
-            true
+        activity?.let { it1 -> CarcorderPreviewView.show(it1) }
+        true
         }*/
 
         ivToolsIcon?.setOnClickListener {
@@ -198,7 +208,50 @@ import java.util.*
             true
         }
 
+        // init appConfigInfo
+        AppConfigInfo.appName = AppUtils.getAppName()
+        if (AppConfigInfo.appVersionCode == 0) {
+            AppConfigInfo.appVersionCode = AppUtils.getAppVersionCode()
+        }
+        if (AppConfigInfo.appVersionName.isNullOrEmpty()) {
+            AppConfigInfo.appVersionName = AppUtils.getAppVersionName()
+        }
+        if (AppConfigInfo.appPackageName.isNullOrEmpty()) {
+            AppConfigInfo.appPackageName = AppUtils.getAppPackageName()
+        }
+        if (AppConfigInfo.uniqueDeviceId.isNullOrEmpty()) {
+            AppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
+        }
+        if (AppConfigInfo.widevineIDMd5.isNullOrEmpty()) {
+            AppConfigInfo.widevineIDMd5 =
+                DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
+        }
+        if (MoGoAiCloudClient.getInstance().aiCloudClientConfig != null) {
+            AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
+            AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
+        }
 
+        AppConfigInfo.netMode = DebugConfig.getNetMode()
+        if (MogoMap.getInstance().mogoMap != null) {
+            AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
+        }
+        AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
+        AppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot()
+
+        when {
+            AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) -> {// 司机端
+                AppConfigInfo.isDriver = true
+                AppConfigInfo.isConnectedNetty = CallerTelematicManager.getServerStarted()
+            }
+            AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) -> {
+                AppConfigInfo.isDriver = false
+                AppConfigInfo.isConnectedNetty = CallerTelematicManager.getClientConnStatus()
+                AppConfigInfo.serverSn = CallerTelematicManager.getServerToken()
+            }
+            else -> {
+            }
+        }
+        AppConfigInfo.teleTimeStamp = CallerAutoPilotManager.getTeleTimeStamp()
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
@@ -221,45 +274,62 @@ import java.util.*
         }
     }
 
-    override fun getNotificationView(): IViewNotification? = context?.let { V2XNotificationView(it) }
+    override fun getNotificationView(): IViewNotification? =
+        context?.let { V2XNotificationView(it) }
 
     override fun onAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) {
         CallerLogger.d("$M_HMI$TAG", "recordKey=${recordPanel.key},stat=${recordPanel.stat}")
-        if(BadCaseConfig.recordKeyList.contains(recordPanel.key)){
-            if(recordPanel.stat == 100 || recordPanel.stat == 101){
+        if (BadCaseConfig.recordKeyList.contains(recordPanel.key)) {
+            if (recordPanel.stat == 100 || recordPanel.stat == 101) {
                 //成功结束录制
-                TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())} bag录制成功")
+                TipToast.shortTip(
+                    "${
+                        millis2String(
+                            System.currentTimeMillis(),
+                            TimeUtils.getHourMinSecondFormat()
+                        )
+                    } bag录制成功"
+                )
             }
-            if(recordPanel.stat == 200){
+            if (recordPanel.stat == 200) {
                 //录制失败
-                TipToast.shortTip("${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())} bag录制失败")
+                TipToast.shortTip(
+                    "${
+                        millis2String(
+                            System.currentTimeMillis(),
+                            TimeUtils.getHourMinSecondFormat()
+                        )
+                    } bag录制失败"
+                )
             }
             return
         }
         //在工控机taxi2.3.0版本和Bus2.4.0版本上不支持被动录包，不进行被动录包的弹窗
         BadCaseConfig.dockerVersion?.let {
-            if(it.contains("taxi") && it.contains("2.3.0")){
+            if (it.contains("taxi") && it.contains("2.3.0")) {
                 return
             }
-            if(it.contains("bus") && it.contains("2.4.0")){
+            if (it.contains("bus") && it.contains("2.4.0")) {
                 return
             }
         }
         //处于非美化模式下弹窗；是地图数据采集任务时即type=2时，不弹窗
-        if (!FunctionBuildConfig.isDemoMode && (recordPanel.stat == 100 || recordPanel.stat == 101) && recordPanel.type!=2) {
+        if (!FunctionBuildConfig.isDemoMode && (recordPanel.stat == 100 || recordPanel.stat == 101) && recordPanel.type != 2) {
             //只在司机屏生效，乘客屏不生效
-            if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
                 activity?.let { CallerDevaToolsManager.onReceiveBadCaseRecord(recordPanel, it) }
             }
         }
         if (!FunctionBuildConfig.isDemoMode && recordPanel.type == 2 && (
-                        recordPanel.stat == 101 || //工控机采集完成-被动完成
-                                recordPanel.stat == 100 || //工控机采集完成-主动完成
-                                recordPanel.stat == 102 || //工控机达到最大采集时长
-                                recordPanel.stat == 103)   //工控机磁盘满了
+                    recordPanel.stat == 101 || //工控机采集完成-被动完成
+                            recordPanel.stat == 100 || //工控机采集完成-主动完成
+                            recordPanel.stat == 102 || //工控机达到最大采集时长
+                            recordPanel.stat == 103)   //工控机磁盘满了
         ) {
-            CallerMapDataCollectorManager.finish(recordPanel.id, recordPanel.stat, "", recordPanel.filename
-                    ?: "", recordPanel.note ?: "")
+            CallerMapDataCollectorManager.finish(
+                recordPanel.id, recordPanel.stat, "", recordPanel.filename
+                    ?: "", recordPanel.note ?: ""
+            )
         }
     }
 
@@ -303,15 +373,19 @@ import java.util.*
      * @param warningReportList 提醒级别上报数据列表
      * @param reportLevel 1:error级别  2:warning级别
      */
-    override fun showIPCReportWindow(errorReportList: ArrayList<ReportEntity>,warningReportList: ArrayList<ReportEntity>,reportLevel: Int) {
-        ThreadUtils.runOnUiThread{
-            if(reportLevel == 1){
-                if(ipcReportWindow==null){
-                    ipcReportWindow= activity?.let { IPCReportWindow(it) }
-                    ipcReportWindow?.setClickListener(object: IPCReportWindow.ClickListener{
+    override fun showIPCReportWindow(
+        errorReportList: ArrayList<ReportEntity>,
+        warningReportList: ArrayList<ReportEntity>,
+        reportLevel: Int
+    ) {
+        ThreadUtils.runOnUiThread {
+            if (reportLevel == 1) {
+                if (ipcReportWindow == null) {
+                    ipcReportWindow = activity?.let { IPCReportWindow(it) }
+                    ipcReportWindow?.setClickListener(object : IPCReportWindow.ClickListener {
                         override fun closeWindow() {
                             ipcReportWindow?.hideFloatWindow()
-                            ipcReportWindow =null
+                            ipcReportWindow = null
                         }
                     })
                     ipcReportWindow?.let {
@@ -320,7 +394,7 @@ import java.util.*
                 }
                 ipcReportWindow?.showFloatWindow()
             }
-            ipcReportWindow?.refreshData(errorReportList,warningReportList,reportLevel)
+            ipcReportWindow?.refreshData(errorReportList, warningReportList, reportLevel)
         }
     }
 
@@ -328,14 +402,6 @@ import java.util.*
         mViewNotificationProvider = provider
     }
 
-    override fun showVideoDialog(infList: List<Infrastructure>) {
-        context?.let {
-            if (roadVideoDialog == null) {
-                roadVideoDialog = RoadVideoDialog(it)
-            }
-            roadVideoDialog?.show(infList)
-        }
-    }
 
     override fun changeBusOperationStatus(isOut: Boolean) {
         busOperationStatus?.changerOperationStatus(isOut)
@@ -387,41 +453,41 @@ import java.util.*
                     })
                 }
                 toolsViewFloat = WarningFloat.with(it)
-                        .setTag("ToolsViewFloat")
-                        .setLayout(toolsView!!)
-                        .setSidePattern(SidePattern.LEFT)
-                        .setGravity(Gravity.LEFT)
-                        .setImmersionStatusBar(true)
-                        .setWindowHeight(LayoutParams.MATCH_PARENT)
-                        .setAnimator(object : DefaultAnimator() {
-                            override fun enterAnim(
-                                    view: View,
-                                    params: LayoutParams,
-                                    windowManager: WindowManager,
-                                    sidePattern: SidePattern
-                            ): Animator? =
-                                    super.enterAnim(view, params, windowManager, sidePattern)
-                                            ?.apply {
-                                                interpolator = OvershootInterpolator()
-                                            }
+                    .setTag("ToolsViewFloat")
+                    .setLayout(toolsView!!)
+                    .setSidePattern(SidePattern.LEFT)
+                    .setGravity(Gravity.LEFT)
+                    .setImmersionStatusBar(true)
+                    .setWindowHeight(LayoutParams.MATCH_PARENT)
+                    .setAnimator(object : DefaultAnimator() {
+                        override fun enterAnim(
+                            view: View,
+                            params: LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.enterAnim(view, params, windowManager, sidePattern)
+                                ?.apply {
+                                    interpolator = OvershootInterpolator()
+                                }
 
-                            override fun exitAnim(
-                                    view: View,
-                                    params: LayoutParams,
-                                    windowManager: WindowManager,
-                                    sidePattern: SidePattern
-                            ): Animator? =
-                                    super.exitAnim(view, params, windowManager, sidePattern)
-                                            ?.setDuration(200)
-                        })
-                        .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                            override fun onDismiss() {
-                                toolsViewFloat = null
-                                toolsView = null
-                                // TODO:("")
-                            }
-                        })
-                        .show()
+                        override fun exitAnim(
+                            view: View,
+                            params: LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.exitAnim(view, params, windowManager, sidePattern)
+                                ?.setDuration(200)
+                    })
+                    .addWarningStatusListener(object : IMoGoWarningStatusListener {
+                        override fun onDismiss() {
+                            toolsViewFloat = null
+                            toolsView = null
+                            // TODO:("")
+                        }
+                    })
+                    .show()
             } else {
                 toolsViewFloat?.show()
             }
@@ -466,7 +532,7 @@ import java.util.*
             ivAiCollectTools.visibility = View.VISIBLE
             CallerDevaToolsManager.initBadCase(ivBadCaseTools)
             CallerDevaToolsManager.initAiCollect(ivAiCollectTools)
-        }else{
+        } else {
             ivBadCaseTools.visibility = View.GONE
             ivAiCollectTools.visibility = View.GONE
         }
@@ -543,20 +609,20 @@ import java.util.*
                     mDebugSettingView = DebugSettingView(it)
                     Log.i("DebugViewSwitchLog", "new DebugSettingView")
                     mDebugSettingView?.reportInit(reportList)
-                    mDebugSettingView?.setClickListener(object: DebugSettingView.ClickListener{
+                    mDebugSettingView?.setClickListener(object : DebugSettingView.ClickListener {
                         override fun showReportListWindow(show: Boolean) {
-                            if(show){
+                            if (show) {
                                 //打开工控机上报列表
                                 reportListFloatWindow = ReportListFloatWindow(it)
                                 reportListFloatWindow?.showFloatWindow()
                                 reportListFloatWindow?.refreshData(reportList)
-                            }else{
+                            } else {
                                 //关闭工控机上报列表
                                 reportListFloatWindow?.hideFloatWindow()
                             }
                         }
                     })
-                    if(mDebugSettingView!=null){
+                    if (mDebugSettingView != null) {
                         Log.i("DebugViewSwitchLog", "new DebugSettingView success")
                     }
                 }
@@ -564,38 +630,39 @@ import java.util.*
                 var gravity = Gravity.RIGHT
                 //调试窗默认靠右显示，Bus的乘客端右端有视图覆盖，调试窗靠左显示
                 if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) &&
-                        AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+                    AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+                ) {
                     side = SidePattern.LEFT
                     gravity = Gravity.LEFT
                 }
                 mDebugSettingViewFloat = WarningFloat.with(it)
-                        .setTag("DebugSettingView")
-                        .setLayout(mDebugSettingView!!)
-                        .setSidePattern(side)
-                        .setGravity(gravity, offsetY = 70)
-                        .setImmersionStatusBar(true)
-                        .setAnimator(object : DefaultAnimator() {
-                            override fun enterAnim(
-                                    view: View,
-                                    params: LayoutParams,
-                                    windowManager: WindowManager,
-                                    sidePattern: SidePattern
-                            ): Animator? =
-                                    super.enterAnim(view, params, windowManager, sidePattern)
-                                            ?.apply {
-                                                interpolator = OvershootInterpolator()
-                                            }
+                    .setTag("DebugSettingView")
+                    .setLayout(mDebugSettingView!!)
+                    .setSidePattern(side)
+                    .setGravity(gravity, offsetY = 70)
+                    .setImmersionStatusBar(true)
+                    .setAnimator(object : DefaultAnimator() {
+                        override fun enterAnim(
+                            view: View,
+                            params: LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.enterAnim(view, params, windowManager, sidePattern)
+                                ?.apply {
+                                    interpolator = OvershootInterpolator()
+                                }
 
-                            override fun exitAnim(
-                                    view: View,
-                                    params: LayoutParams,
-                                    windowManager: WindowManager,
-                                    sidePattern: SidePattern
-                            ): Animator? =
-                                    super.exitAnim(view, params, windowManager, sidePattern)
-                                            ?.setDuration(200)
-                        })
-                        .show()
+                        override fun exitAnim(
+                            view: View,
+                            params: LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.exitAnim(view, params, windowManager, sidePattern)
+                                ?.setDuration(200)
+                    })
+                    .show()
             }
         }
     }
@@ -610,15 +677,16 @@ import java.util.*
      */
     @Synchronized
     override fun showWarningV2X(
-            v2xType: String,
-            alertContent: CharSequence?,
-            ttsContent: String?,
-            tag: String?,
-            listener: IMoGoWarningStatusListener?,
-            playTts: Boolean,
-            expireTime: Long
+        v2xType: String,
+        alertContent: CharSequence?,
+        ttsContent: String?,
+        tag: String?,
+        listener: IMoGoWarningStatusListener?,
+        playTts: Boolean,
+        expireTime: Long
     ) {
-        val playTTS = playTts && !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
+        val playTTS =
+            playTts && !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
         activity?.let {
             val warningContent = alertContent
                 ?: EventTypeEnum.getWarningContent(v2xType)
@@ -629,70 +697,87 @@ import java.util.*
             val content = mViewNotificationProvider?.getNotificationView() ?: return
             content.setWarningIcon(EventTypeEnum.getWarningIcon(v2xType))
             content.setWarningContent(warningContent)
-            Log.d("$M_HMI$TAG", "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime")
-            Reminder.enqueue(this@MoGoHmiFragment, object : PopupWindowReminder(PopupWindow(content, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT).also { itx ->
-                itx.isTouchable = false
-                itx.isFocusable = false
-                itx.isClippingEnabled = false
-                itx.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-                val transition = Slide(when(content.sidePattern) {
-                    LEFT, RESULT_LEFT-> Gravity.LEFT
-                    RIGHT, RESULT_RIGHT -> Gravity.RIGHT
-                    TOP, RESULT_TOP -> Gravity.TOP
-                    BOTTOM, RESULT_BOTTOM -> Gravity.BOTTOM
-                    else -> Gravity.TOP
-                }).also { t ->
-                    t.interpolator = AccelerateDecelerateInterpolator()
-                    t.duration = 200
-                }
-                if (VERSION.SDK_INT >= VERSION_CODES.M) {
-                    itx.enterTransition = transition
-                    itx.exitTransition = transition
-                }
-            }) {
-                override fun show() {
-                    val parent = it.window.decorView
-                    parent.doOnAttach {
-                        Log.d("$M_HMI$TAG", "--- show v2x dialog 2 ---: info -> v2x-type: $v2xType : expireTime: $expireTime")
-                        popupWindow.showAtLocation(parent, content.layoutGravity, 0, 0)
-                    }
-                }
-                override fun isOverride(): Boolean {
-                    return true
-                }
-
-                override fun key(): String {
-                    return v2xType
-                }
-            }, object : IStateChangeListener {
-
-                override fun onShow(reminder: IReminder) {
-                    listener?.onShow()
-                    lastShowV2XJob?.safeCancel()
-                    lastSpeakJob?.safeCancel()
-                    showingV2XTip = reminder
-                    lifecycleScope.launch {
-                        delay(expireTime)
-                    }.also { itx ->
-                        lastShowV2XJob = itx
-                    }.invokeOnCompletion { _ ->
-                        reminder.hide()
-                    }
-                    if (ttsContent != null && !TextUtils.isEmpty(ttsContent) && playTTS) {
-                        lifecycleScope.launch {
-                            speak(it, ttsContent)
-                        }.also { itx ->
-                            lastSpeakJob = itx
+            Log.d(
+                "$M_HMI$TAG",
+                "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime"
+            )
+            Reminder.enqueue(
+                this@MoGoHmiFragment,
+                object : PopupWindowReminder(
+                    PopupWindow(
+                        content,
+                        LayoutParams.WRAP_CONTENT,
+                        LayoutParams.WRAP_CONTENT
+                    ).also { itx ->
+                        itx.isTouchable = false
+                        itx.isFocusable = false
+                        itx.isClippingEnabled = false
+                        itx.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+                        val transition = Slide(
+                            when (content.sidePattern) {
+                                LEFT, RESULT_LEFT -> Gravity.LEFT
+                                RIGHT, RESULT_RIGHT -> Gravity.RIGHT
+                                TOP, RESULT_TOP -> Gravity.TOP
+                                BOTTOM, RESULT_BOTTOM -> Gravity.BOTTOM
+                                else -> Gravity.TOP
+                            }
+                        ).also { t ->
+                            t.interpolator = AccelerateDecelerateInterpolator()
+                            t.duration = 200
+                        }
+                        if (VERSION.SDK_INT >= VERSION_CODES.M) {
+                            itx.enterTransition = transition
+                            itx.exitTransition = transition
+                        }
+                    }) {
+                    override fun show() {
+                        val parent = it.window.decorView
+                        parent.doOnAttach {
+                            Log.d(
+                                "$M_HMI$TAG",
+                                "--- show v2x dialog 2 ---: info -> v2x-type: $v2xType : expireTime: $expireTime"
+                            )
+                            popupWindow.showAtLocation(parent, content.layoutGravity, 0, 0)
                         }
                     }
-                }
 
-                override fun onHide(reminder: IReminder) {
-                    listener?.onDismiss()
-                    showingV2XTip = null
-                    showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
-                }
-            })
+                    override fun isOverride(): Boolean {
+                        return true
+                    }
+
+                    override fun key(): String {
+                        return v2xType
+                    }
+                },
+                object : IStateChangeListener {
+
+                    override fun onShow(reminder: IReminder) {
+                        listener?.onShow()
+                        lastShowV2XJob?.safeCancel()
+                        lastSpeakJob?.safeCancel()
+                        showingV2XTip = reminder
+                        lifecycleScope.launch {
+                            delay(expireTime)
+                        }.also { itx ->
+                            lastShowV2XJob = itx
+                        }.invokeOnCompletion { _ ->
+                            reminder.hide()
+                        }
+                        if (ttsContent != null && !TextUtils.isEmpty(ttsContent) && playTTS) {
+                            lifecycleScope.launch {
+                                speak(it, ttsContent)
+                            }.also { itx ->
+                                lastSpeakJob = itx
+                            }
+                        }
+                    }
+
+                    override fun onHide(reminder: IReminder) {
+                        listener?.onDismiss()
+                        showingV2XTip = null
+                        showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                    }
+                })
         }
     }
 
@@ -739,8 +824,8 @@ import java.util.*
      * @param checkLightId 0-都是默认不亮起，1-红，2-黄，3-绿
      * @param lightSource 1:云端下发；2:自车感知
      */
-    override fun showWarningTrafficLight(checkLightId: Int,lightSource: Int) {
-        mViewTrafficLight?.showWarningTrafficLight(checkLightId,lightSource)
+    override fun showWarningTrafficLight(checkLightId: Int, lightSource: Int) {
+        mViewTrafficLight?.showWarningTrafficLight(checkLightId, lightSource)
     }
 
     override fun isWarningTrafficLightShow(): Boolean {
@@ -814,7 +899,7 @@ import java.util.*
      * @see WarningDirectionEnum
      */
     override fun showWarning(direction: WarningDirectionEnum) {
-        Log.d(TAG,"showWarning====")
+        Log.d(TAG, "showWarning====")
         flV2XWarningView?.showWarning(direction)
         flicker(flV2XWarningView)
     }
@@ -863,42 +948,42 @@ import java.util.*
                 mNoticeFloat = it?.let { it1 ->
                     noticeBannerView?.let { it2 ->
                         WarningFloat.with(it1)
-                                .setTag(WaringConst.NOTICE_FOR_TRAFFIC_KEY)
-                                .setLayout(it2)
-                                .setSidePattern(SidePattern.TOP)
-                                .setCountDownTime(60 * 1000 * 3)
-                                .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
-                                .setImmersionStatusBar(true)
-                                .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                                    override fun onShow() {
-                                        // 创建弹窗成功才进行TTS播报
+                            .setTag(WaringConst.NOTICE_FOR_TRAFFIC_KEY)
+                            .setLayout(it2)
+                            .setSidePattern(SidePattern.TOP)
+                            .setCountDownTime(60 * 1000 * 3)
+                            .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
+                            .setImmersionStatusBar(true)
+                            .addWarningStatusListener(object : IMoGoWarningStatusListener {
+                                override fun onShow() {
+                                    // 创建弹窗成功才进行TTS播报
 //                                    AIAssist.getInstance(activity)
 //                                            .speakTTSVoice("")
-                                    }
+                                }
 
-                                })
-                                .setAnimator(object : DefaultAnimator() {
-                                    override fun enterAnim(
-                                            view: View,
-                                            params: LayoutParams,
-                                            windowManager: WindowManager,
-                                            sidePattern: SidePattern
-                                    ): Animator? =
-                                            super.enterAnim(view, params, windowManager, sidePattern)
-                                                    ?.apply {
-                                                        interpolator = OvershootInterpolator()
-                                                    }
+                            })
+                            .setAnimator(object : DefaultAnimator() {
+                                override fun enterAnim(
+                                    view: View,
+                                    params: LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
+                                ): Animator? =
+                                    super.enterAnim(view, params, windowManager, sidePattern)
+                                        ?.apply {
+                                            interpolator = OvershootInterpolator()
+                                        }
 
-                                    override fun exitAnim(
-                                            view: View,
-                                            params: LayoutParams,
-                                            windowManager: WindowManager,
-                                            sidePattern: SidePattern
-                                    ): Animator? =
-                                            super.exitAnim(view, params, windowManager, sidePattern)
-                                                    ?.setDuration(200)
-                                })
-                                .show()
+                                override fun exitAnim(
+                                    view: View,
+                                    params: LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
+                                ): Animator? =
+                                    super.exitAnim(view, params, windowManager, sidePattern)
+                                        ?.setDuration(200)
+                            })
+                            .show()
                     }
                 }
             }
@@ -913,41 +998,41 @@ import java.util.*
                 mNoticeFloat = it.let { it1 ->
                     noticeBannerView?.let { it2 ->
                         WarningFloat.with(it1)
-                                .setTag(WaringConst.NOTICE_FOR_NORMAL_KEY)
-                                .setLayout(it2)
-                                .setSidePattern(SidePattern.TOP)
-                                .setCountDownTime(10000)
-                                .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
-                                .setImmersionStatusBar(true)
-                                .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                                    override fun onShow() {
-                                        // 创建弹窗成功才进行TTS播报
-                                        //                                    AIAssist.getInstance(activity)
-                                        //                                            .speakTTSVoice("")
-                                    }
-                                })
-                                .setAnimator(object : DefaultAnimator() {
-                                    override fun enterAnim(
-                                            view: View,
-                                            params: LayoutParams,
-                                            windowManager: WindowManager,
-                                            sidePattern: SidePattern
-                                    ): Animator? =
-                                            super.enterAnim(view, params, windowManager, sidePattern)
-                                                    ?.apply {
-                                                        interpolator = OvershootInterpolator()
-                                                    }
+                            .setTag(WaringConst.NOTICE_FOR_NORMAL_KEY)
+                            .setLayout(it2)
+                            .setSidePattern(SidePattern.TOP)
+                            .setCountDownTime(10000)
+                            .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
+                            .setImmersionStatusBar(true)
+                            .addWarningStatusListener(object : IMoGoWarningStatusListener {
+                                override fun onShow() {
+                                    // 创建弹窗成功才进行TTS播报
+                                    //                                    AIAssist.getInstance(activity)
+                                    //                                            .speakTTSVoice("")
+                                }
+                            })
+                            .setAnimator(object : DefaultAnimator() {
+                                override fun enterAnim(
+                                    view: View,
+                                    params: LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
+                                ): Animator? =
+                                    super.enterAnim(view, params, windowManager, sidePattern)
+                                        ?.apply {
+                                            interpolator = OvershootInterpolator()
+                                        }
 
-                                    override fun exitAnim(
-                                            view: View,
-                                            params: LayoutParams,
-                                            windowManager: WindowManager,
-                                            sidePattern: SidePattern
-                                    ): Animator? =
-                                            super.exitAnim(view, params, windowManager, sidePattern)
-                                                    ?.setDuration(200)
-                                })
-                                .show()
+                                override fun exitAnim(
+                                    view: View,
+                                    params: LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
+                                ): Animator? =
+                                    super.exitAnim(view, params, windowManager, sidePattern)
+                                        ?.setDuration(200)
+                            })
+                            .show()
                     }
                 }
             }
@@ -1034,6 +1119,17 @@ import java.util.*
         dismissToolsFloatView()
     }
 
+    @BizConfig(V2I, "", BIZ_RTS)
+    override fun showVideoDialog(infList: List<Infrastructure>) {
+        context?.let {
+            if (roadVideoDialog == null) {
+                roadVideoDialog = RoadVideoDialog(it)
+            }
+            roadVideoDialog?.show(infList)
+        }
+    }
+
+    @BizConfig(V2I, "", BIZ_RTS)
     private fun showCameraList(cameraList: List<CameraEntity>?) {
         context?.let {
             if (cameraViewFloat == null) {
@@ -1062,40 +1158,40 @@ import java.util.*
                     }
                 })
                 cameraViewFloat = WarningFloat.with(it)
-                        .setTag("CameraListFloat")
-                        .setLayout(cameraListView!!)
-                        .setSidePattern(SidePattern.RIGHT)
-                        .setGravity(Gravity.RIGHT, -40, 255)
-                        .setImmersionStatusBar(true)
-                        .setAnimator(object : DefaultAnimator() {
-                            override fun enterAnim(
-                                    view: View,
-                                    params: LayoutParams,
-                                    windowManager: WindowManager,
-                                    sidePattern: SidePattern
-                            ): Animator? =
-                                    super.enterAnim(view, params, windowManager, sidePattern)
-                                            ?.apply {
-                                                interpolator = OvershootInterpolator()
-                                            }
+                    .setTag("CameraListFloat")
+                    .setLayout(cameraListView!!)
+                    .setSidePattern(SidePattern.RIGHT)
+                    .setGravity(Gravity.RIGHT, -40, 255)
+                    .setImmersionStatusBar(true)
+                    .setAnimator(object : DefaultAnimator() {
+                        override fun enterAnim(
+                            view: View,
+                            params: LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.enterAnim(view, params, windowManager, sidePattern)
+                                ?.apply {
+                                    interpolator = OvershootInterpolator()
+                                }
 
-                            override fun exitAnim(
-                                    view: View,
-                                    params: LayoutParams,
-                                    windowManager: WindowManager,
-                                    sidePattern: SidePattern
-                            ): Animator? =
-                                    super.exitAnim(view, params, windowManager, sidePattern)
-                                            ?.setDuration(200)
-                        })
-                        .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                            override fun onDismiss() {
-                                cameraViewFloat = null
-                                cameraListView = null
-                                ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_nor)
-                            }
-                        })
-                        .show()
+                        override fun exitAnim(
+                            view: View,
+                            params: LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.exitAnim(view, params, windowManager, sidePattern)
+                                ?.setDuration(200)
+                    })
+                    .addWarningStatusListener(object : IMoGoWarningStatusListener {
+                        override fun onDismiss() {
+                            cameraViewFloat = null
+                            cameraListView = null
+                            ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_nor)
+                        }
+                    })
+                    .show()
             } else {
                 cameraViewFloat?.show()
             }
@@ -1126,9 +1222,9 @@ import java.util.*
         }
     }
 
-    private var isLeftLight :Boolean = false
-    private var isRightLight :Boolean = false
-    private var isDisappare :Boolean = false
+    private var isLeftLight: Boolean = false
+    private var isRightLight: Boolean = false
+    private var isDisappare: Boolean = false
 
     /**
      * 显示转向灯效果 if (HmiBuildConfig.isShowBadCaseView) {
@@ -1233,13 +1329,14 @@ import java.util.*
         padSn: String,
         releaseId: String
     ) {
-        ThreadUtils.runOnUiThread{
-            if(adUpgradeDialog == null){
-                adUpgradeDialog = AdUpgradeDialog(requireContext(),images, padSn, releaseId)
-                adUpgradeDialog?.setClickListener(object: AdUpgradeDialog.ClickListener{
+        ThreadUtils.runOnUiThread {
+            if (adUpgradeDialog == null) {
+                adUpgradeDialog = AdUpgradeDialog(requireContext(), images, padSn, releaseId)
+                adUpgradeDialog?.setClickListener(object : AdUpgradeDialog.ClickListener {
                     override fun confirm() {
                         //确认升级
-                        CallerBindingcarManager.getBindingcarProvider().upgradeConfirm(images, padSn, releaseId)
+                        CallerBindingcarManager.getBindingcarProvider()
+                            .upgradeConfirm(images, padSn, releaseId)
                         AdUpgradeStateHelper.setConfirmUpgrade(true)
                         ToastUtils.showLong("最新版本下载中...")
                         adUpgradeDialog?.dismiss()
@@ -1258,10 +1355,10 @@ import java.util.*
     }
 
     override fun showAdUpgradeStatus(ipcUpgradeStateInfo: IPCUpgradeStateInfo) {
-        ThreadUtils.runOnUiThread{
+        ThreadUtils.runOnUiThread {
             toolsView?.showAdUpgradeStatus(ipcUpgradeStateInfo)
             ipcUpgradeStateInfo.status.let {
-                if(AdUpgradeStateHelper.isUpgradeSuccess(it)){
+                if (AdUpgradeStateHelper.isUpgradeSuccess(it)) {
                     ToastUtils.showLong("升级成功")
                     AdUpgradeStateHelper.setConfirmUpgrade(false)
                 }
@@ -1287,17 +1384,45 @@ import java.util.*
      * 工控机监控节点上报
      */
     override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
-        guardianInfo?.let {
-            if(reportList.size>49){
-                reportList.removeLast()
-            }
-            reportList.add(0,
-                ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()),
-                    it.src,it.level,it.msg,it.code,it.resultList,it.actionsList))
-        }
-        reportListFloatWindow?.let {
-            ThreadUtils.runOnUiThread{
-                it.refreshData(reportList)
+        ThreadUtils.runOnUiThread {
+            guardianInfo?.let {
+                when (it.code) {
+                    EXIT_AUTOPILOT_FOR_PLANNING,
+                    EXIT_AUTOPILOT_FOR_LOCATION,
+                    EXIT_AUTOPILOT_FOR_CHASSIS,
+                    EXIT_AUTOPILOT_FOR_DISTANCE -> {
+                        showWarningV2X(
+                            EventTypeEnum.TAKE_OVER_EVENT.poiType,
+                            EventTypeEnum.TAKE_OVER_EVENT.content,
+                            EventTypeEnum.TAKE_OVER_EVENT.tts,
+                            EventTypeEnum.TAKE_OVER_EVENT.poiType,
+                            object : IMoGoWarningStatusListener {
+                                override fun onShow() {
+                                    clTakeOverView.visibility = View.VISIBLE
+                                }
+
+                                override fun onDismiss() {
+                                    clTakeOverView.visibility = View.GONE
+                                }
+                            },
+                            true,
+                            6000L
+                        )
+                    }
+                }
+
+                if (reportList.size > 49) {
+                    reportList.removeLast()
+                }
+                reportList.add(
+                    0,
+                    ReportEntity(
+                        TimeUtils.millis2String(System.currentTimeMillis()),
+                        it.src, it.level, it.msg, it.code, it.resultList, it.actionsList
+                    )
+                )
+                reportListFloatWindow?.refreshData(reportList)
+
             }
         }
     }
@@ -1308,12 +1433,16 @@ import java.util.*
             .navigation() as BaseFragment
         activity?.supportFragmentManager?.beginTransaction()
             ?.setCustomAnimations(R.anim.slide_in, R.anim.fade_out)?.apply {
-            if (!fragmentOverview.isAdded) {
-                    add(R.id.module_main_id_smp_fragment, fragmentOverview, fragmentOverview.tagName)
-            } else {
+                if (!fragmentOverview.isAdded) {
+                    add(
+                        R.id.module_main_id_smp_fragment,
+                        fragmentOverview,
+                        fragmentOverview.tagName
+                    )
+                } else {
                     show(fragmentOverview)
-            }.commitAllowingStateLoss()
-        }
+                }.commitAllowingStateLoss()
+            }
         CallerDevaToolsManager.hideStatusBar()
     }
 

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

@@ -27,6 +27,11 @@ import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.autopilot.*
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MoGoConfig
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BAG_RECORD
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BEAUTY_MODE
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RAIN_MODE
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_WARNING_UPLOAD
 import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.data.deva.scene.SceneModule
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
@@ -36,10 +41,12 @@ import com.mogo.eagle.core.data.obu.ObuStatusInfo
 import com.mogo.eagle.core.data.report.ReportEntity
 import com.mogo.eagle.core.data.upgrade.UpgradeVersionEntity
 import com.mogo.eagle.core.function.api.autopilot.*
+import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener
 import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener
 import com.mogo.eagle.core.function.call.autopilot.*
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
@@ -93,8 +100,8 @@ class DebugSettingView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoObuStatusListener,
     IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener,
     IMoGoMapLocationListener, IMoGoAutopilotIdentifyListener,
-    IMoGoAutopilotPlanningListener, IMoGoAutopilotCarConfigListener,
-    IMoGoAutopilotVehicleStateListener {
+    IMoGoAutopilotPlanningListener,
+    IMoGoAutopilotVehicleStateListener, IMoGoDevaToolsFuncConfigListener {
 
     private val TAG = "DebugSettingView"
 
@@ -185,10 +192,16 @@ class DebugSettingView @JvmOverloads constructor(
         CallerAutopilotIdentifyListenerManager.addListener(TAG, this)
         // 添加 规划路径相关回调 监听
         CallerAutopilotPlanningListenerManager.addListener(TAG, this)
-        // 添加 工控机基础信息回调 监听
-        CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
         //添加 车辆底盘数据回调 监听
         CallerAutopilotVehicleStateListenerManager.addListener(TAG, this)
+
+        //添加 业务配置监听
+        CallerDevaToolsFuncConfigListenerManager.registerDevaToolsFuncConfigListener(
+            FuncBizConfig.FOUNDATION,
+            TAG,
+            this
+        )
+
         if (logInfoView != null) {
             logInfoView!!.onEnterForeground()
         }
@@ -214,11 +227,12 @@ class DebugSettingView @JvmOverloads constructor(
         CallerAutopilotIdentifyListenerManager.removeListener(TAG)
         // 移除 规划路径相关回调 监听
         CallerAutopilotPlanningListenerManager.removeListener(TAG)
-        // 移除 工控机基础信息回调 监听
-        CallerAutopilotCarConfigListenerManager.removeListener(TAG)
-        //移除 车辆底盘数据回调 监听
+        // 移除 车辆底盘数据回调 监听
         CallerAutopilotVehicleStateListenerManager.removeListener(TAG)
 
+        // 移除 业务配置监听
+        CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(this)
+
         if (logInfoView != null) {
             logInfoView!!.onEnterBackground()
         }
@@ -561,7 +575,7 @@ class DebugSettingView @JvmOverloads constructor(
         // 演示模式
         tbIsDemoMode.setOnCheckedChangeListener { _, isChecked ->
             CallerAutoPilotManager.setDemoMode(isChecked)
-            if(!isChecked){
+            if (!isChecked) {
                 //关闭美化模式时，通知工控机
                 CallerAutoPilotManager.setIPCDemoMode(isChecked)
             }
@@ -574,7 +588,7 @@ class DebugSettingView @JvmOverloads constructor(
         }
 
         //只在司机端设置美化模式开关功能
-        if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
+        if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
             tbIsDemoMode.visibility = View.GONE
         }
 
@@ -652,12 +666,8 @@ class DebugSettingView @JvmOverloads constructor(
         // 初始化 tracker感知数据源 数据
         trackerProvider.check(
             when (FunctionBuildConfig.debugTrackerProvider) {
-                0 -> {
-                    R.id.trackerProviderOrigin
-                }
-                1 -> {
-                    R.id.trackerProviderObu
-                }
+                0 -> R.id.trackerProviderOrigin
+                1 -> R.id.trackerProviderObu
                 else -> R.id.trackerProviderOrigin
             }
         )
@@ -666,14 +676,38 @@ class DebugSettingView @JvmOverloads constructor(
                 R.id.trackerProviderOrigin -> {
                     FunctionBuildConfig.debugTrackerProvider = 0
                     // update tracker provider view
+                    trackerIPCProvider.visibility = View.VISIBLE
                 }
                 R.id.trackerProviderObu -> {
                     FunctionBuildConfig.debugTrackerProvider = 1
                     // update tracker provider view
+                    trackerIPCProvider.visibility = View.GONE
                 }
             }
         }
 
+        // 初始化 trackerIPC 感知数据源 数据
+        trackerIPCProvider.check(
+            when (FunctionBuildConfig.trackerIPCProvider) {
+                0 -> R.id.trackerIPCUnion
+                1 -> R.id.trackerIPCObu
+                2 -> R.id.trackerIPCV2N
+                else -> R.id.trackerIPCUnion
+            }
+        )
+        trackerProvider.setOnCheckedChangeListener{ _, checkedId ->
+            when(checkedId){
+                R.id.trackerIPCUnion -> {
+                    FunctionBuildConfig.trackerIPCProvider = 0
+                }
+                R.id.trackerIPCObu -> {
+                    FunctionBuildConfig.trackerIPCProvider = 1
+                }
+                R.id.trackerIPCV2N -> {
+                    FunctionBuildConfig.trackerIPCProvider = 2
+                }
+            }
+        }
 
         // 初始化 ADAS感知数据是否绘制 选择情况
         tbIsDrawIdentifyData.isChecked = FunctionBuildConfig.isDrawIdentifyData
@@ -810,20 +844,21 @@ class DebugSettingView @JvmOverloads constructor(
         }
 
         //状态中心-后台优化状态
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             val backgroundStatus = "后台运行：" + if (BackgrounderPermission.getInstance()
                     .isPermissionLongBackgroundRunning(context)
             ) "<font color='green'>已优化</font>" else "<font color='red'>未优化</font>"
             tvBackgroundOperation.text = Html.fromHtml(backgroundStatus, Html.FROM_HTML_MODE_LEGACY)
             tvBackgroundOperation.setOnClickListener {
-                BackgrounderPermission.getInstance().showPermissionLongBackgroundRunningDialog(context)
+                BackgrounderPermission.getInstance()
+                    .showPermissionLongBackgroundRunningDialog(context)
             }
             BackgrounderPermission.getInstance().setListener {
                 val str =
                     "后台运行：" + if (it) "<font color='green'>已优化</font>" else "<font color='red'>未优化</font>"
                 tvBackgroundOperation.text = Html.fromHtml(str, Html.FROM_HTML_MODE_LEGACY)
             }
-        }else {
+        } else {
             tvBackgroundOperation.visibility = GONE
         }
         //设置工控机连接状态
@@ -833,7 +868,8 @@ class DebugSettingView @JvmOverloads constructor(
     /**
      * 设置鹰眼本地参数配置监听
      */
-    @SuppressLint("SetTextI18n") private fun setEagleEyeConfigListener() {
+    @SuppressLint("SetTextI18n")
+    private fun setEagleEyeConfigListener() {
         //初始化刹车加速度阈值信息
         val brakeThreshold = SharedPrefsMgr.getInstance(context)
             .getFloat(MoGoConfig.BRAKE_ACCELERATION_THRESHOLD, -2.5F)
@@ -885,7 +921,7 @@ class DebugSettingView @JvmOverloads constructor(
             FunctionBuildConfig.isReportWarning = isChecked
         }
         //异常上报开关只在司机端展示
-        if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
+        if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
             tbReportWarning.visibility = GONE
         }
 
@@ -896,7 +932,7 @@ class DebugSettingView @JvmOverloads constructor(
                 p.menuInflater.inflate(R.menu.menu_env_pop, p.menu)
                 MenuCompat.setGroupDividerEnabled(p.menu, true)
                 p.setOnMenuItemClickListener { item ->
-                    when(item.itemId) {
+                    when (item.itemId) {
                         R.id.group_hy -> {
                             return@setOnMenuItemClickListener false
                         }
@@ -1104,7 +1140,10 @@ class DebugSettingView @JvmOverloads constructor(
             accelerationIsShow = isChecked
         }
 
-        tbRouteDynamicEffect.isChecked = AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) && !AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+        tbRouteDynamicEffect.isChecked =
+            AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) && !AppIdentityModeUtils.isBus(
+                FunctionBuildConfig.appIdentityMode
+            )
 
         tbRouteDynamicEffect.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
@@ -1586,50 +1625,6 @@ class DebugSettingView @JvmOverloads constructor(
      */
     @SuppressLint("SetTextI18n")
     private fun drawAppInfo() {
-        AppConfigInfo.appName = AppUtils.getAppName()
-        if (AppConfigInfo.appVersionCode == 0) {
-            AppConfigInfo.appVersionCode = AppUtils.getAppVersionCode()
-        }
-        if (AppConfigInfo.appVersionName.isNullOrEmpty()) {
-            AppConfigInfo.appVersionName = AppUtils.getAppVersionName()
-        }
-        if (AppConfigInfo.appPackageName.isNullOrEmpty()) {
-            AppConfigInfo.appPackageName = AppUtils.getAppPackageName()
-        }
-        if (AppConfigInfo.uniqueDeviceId.isNullOrEmpty()) {
-            AppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
-        }
-        if (AppConfigInfo.widevineIDMd5.isNullOrEmpty()) {
-            AppConfigInfo.widevineIDMd5 =
-                DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
-        }
-        if (MoGoAiCloudClient.getInstance().aiCloudClientConfig != null) {
-            AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
-            AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
-        }
-
-        AppConfigInfo.netMode = DebugConfig.getNetMode()
-        if (MogoMap.getInstance().mogoMap != null) {
-            AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
-        }
-        AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
-        AppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot()
-
-        when {
-            AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) -> {// 司机端
-                AppConfigInfo.isDriver = true
-                AppConfigInfo.isConnectedNetty = CallerTelematicManager.getServerStarted()
-            }
-            AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) -> {
-                AppConfigInfo.isDriver = false
-                AppConfigInfo.isConnectedNetty = CallerTelematicManager.getClientConnStatus()
-                AppConfigInfo.serverSn = CallerTelematicManager.getServerToken()
-            }
-            else -> {
-            }
-        }
-        AppConfigInfo.teleTimeStamp = CallerAutoPilotManager.getTeleTimeStamp()
-
         /**
          * 设备绑定关系
          */
@@ -1825,16 +1820,14 @@ class DebugSettingView @JvmOverloads constructor(
      */
     override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
         mAutoPilotStatusInfo = autoPilotStatusInfo
-        AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
-        AppConfigInfo.connectStatusDescribe = autoPilotStatusInfo.connectStatusDescribe
         setAutopilotConnectStatus()
     }
 
     /**
      * 设置工控机连接状态
      */
-    private fun setAutopilotConnectStatus(){
-        ThreadUtils.runOnUiThread{
+    private fun setAutopilotConnectStatus() {
+        ThreadUtils.runOnUiThread {
             tvAutopilotConnectStatus.text = Html.fromHtml(
                 "工控机连接状态：${
                     if (AppConfigInfo.isConnectAutopilot) {
@@ -1880,6 +1873,22 @@ class DebugSettingView @JvmOverloads constructor(
         }
     }
 
+    override fun updateBizData(type: String, state: Boolean, lock: Boolean, data: String?) {
+        when (type) {
+            BIZ_BEAUTY_MODE -> tbIsDemoMode.isClickable = !lock
+            BIZ_RAIN_MODE -> tbIsRainMode.isClickable = !lock
+            BIZ_WARNING_UPLOAD -> tbReportWarning.isClickable = !lock
+            BIZ_BAG_RECORD -> {
+                if (lock) {
+                    btnRecordBag.isClickable = false
+                } else {
+                    btnRecordBag.isClickable = true
+                    btnRecordBag.requestFocus()
+                }
+            }
+        }
+    }
+
     override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {
         mGnssInfo = gnssInfo
         //实时加速度列表
@@ -1945,18 +1954,6 @@ class DebugSettingView @JvmOverloads constructor(
         mRouteInfoSize = globalPathResp?.wayPointsList?.size ?: 0
     }
 
-    /**
-     * 工控机基础信息回调
-     */
-    override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
-        carConfigResp.let {
-            AppConfigInfo.plateNumber = it.plateNumber//车牌号
-            AppConfigInfo.iPCMacAddress = it.macAddress//工控机MAC地址
-            AppConfigInfo.protocolVersionNumber = it.protocolVersionValue//工控机协议版本
-        }
-
-    }
-
     /**
      * 工控机异常回调
      */
@@ -2077,7 +2074,8 @@ class DebugSettingView @JvmOverloads constructor(
     private fun toastMsg(msg: String) {
         //当司机屏处于美化（演示）模式、msg为空时不弹吐司
         if (!FunctionBuildConfig.isDemoMode && msg.isNotEmpty()
-            && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)
+        ) {
             ToastUtils.showLong(msg)
         }
     }
@@ -2135,4 +2133,5 @@ class DebugSettingView @JvmOverloads constructor(
         fun showReportListWindow(show: Boolean)
     }
 
+
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/takeover/TakeOverView.kt

@@ -0,0 +1,18 @@
+package com.mogo.eagle.core.function.hmi.ui.takeover
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.hmi.R
+
+class TakeOverView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_take_over, this, true)
+    }
+}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt

@@ -231,9 +231,6 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
                 speedLimit = carConfigResp.speedLimit
                 tvAcceleration.text = "加速度 ${carConfigResp.maxAcceleration} m/s²"
                 etInputSpeed.setText((carConfigResp.speedLimit * 3.6).toInt().toString())
-                AppConfigInfo.plateNumber = carConfigResp.plateNumber//车牌号
-                AppConfigInfo.iPCMacAddress = carConfigResp.macAddress//工控机MAC地址
-                AppConfigInfo.protocolVersionNumber = carConfigResp.protocolVersionValue//工控机协议版本
             }
         }
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java

@@ -114,7 +114,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         }
         SocketBuildConfig.isPrintLog = false;
         // 初始化DevaTools,开始链路记录
-        CallerDevaToolsManager.INSTANCE.init(this);
+        CallerDevaToolsManager.INSTANCE.init();
     }
 
     private void initOverviewDb() {

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

@@ -48,6 +48,16 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <com.mogo.eagle.core.function.hmi.ui.takeover.TakeOverView
+            android:id="@+id/clTakeOverView"
+            android:visibility="gone"
+            android:layout_width="@dimen/hmi_take_over_request_width"
+            android:layout_height="@dimen/hmi_take_over_request_height"
+            android:layout_marginTop="@dimen/hmi_take_over_request_m_top"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <!--自动驾驶按钮及状态-->
         <com.mogo.eagle.core.function.hmi.ui.widget.AutoPilotStatusView
             android:id="@+id/viewAutopilotStatus"
@@ -186,8 +196,8 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/dp_110"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
         <!--APP、MAP版本-->
         <com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
@@ -203,10 +213,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="30px"
-            app:layout_constraintTop_toTopOf="@+id/viewLimitingVelocity"
             app:layout_constraintEnd_toStartOf="@+id/viewLimitingVelocity"
-            app:layout_goneMarginTop="30px"
-            app:layout_goneMarginEnd="40px"/>
+            app:layout_constraintTop_toTopOf="@+id/viewLimitingVelocity"
+            app:layout_goneMarginEnd="40px"
+            app:layout_goneMarginTop="30px" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <!--    app:layout_constraintBottom_toBottomOf="parent"-->

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

@@ -1783,6 +1783,44 @@
 
                     </RadioGroup>
 
+                    <RadioGroup
+                        android:id="@+id/trackerIPCProvider"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        app:layout_constraintTop_toBottomOf="@id/trackerProvider">
+
+                        <RadioButton
+                            android:id="@+id/trackerIPCUnion"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:padding="@dimen/dp_10"
+                            android:text="融合感知数据"
+                            android:textColor="#000"
+                            android:textSize="@dimen/dp_24" />
+
+                        <RadioButton
+                            android:id="@+id/trackerIPCObu"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:padding="@dimen/dp_10"
+                            android:text="融合OBU感知数据"
+                            android:textColor="#000"
+                            android:textSize="@dimen/dp_24" />
+
+                        <RadioButton
+                            android:id="@+id/trackerIPCV2N"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:padding="@dimen/dp_10"
+                            android:text="融合V2N感知数据"
+                            android:textColor="#000"
+                            android:textSize="@dimen/dp_24" />
+
+                    </RadioGroup>
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="@dimen/hmi_take_over_request_width"
+    android:layout_height="@dimen/hmi_take_over_request_height">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/icon_take_over_request"
+        tools:ignore="ContentDescription" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml

@@ -66,4 +66,7 @@
     <dimen name="module_mogo_och_margin_left">40px</dimen>
     <dimen name="module_mogo_och_margin_bottom">46px</dimen>
 
+    <dimen name="hmi_take_over_request_width">810px</dimen>
+    <dimen name="hmi_take_over_request_height">560px</dimen>
+    <dimen name="hmi_take_over_request_m_top">524px</dimen>
 </resources>

core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml

@@ -65,4 +65,8 @@
     <dimen name="module_mogo_och_autopilot_status_text_size">42px</dimen>
     <dimen name="module_mogo_och_margin_left">40px</dimen>
     <dimen name="module_mogo_och_margin_bottom">46px</dimen>
+
+    <dimen name="hmi_take_over_request_width">810px</dimen>
+    <dimen name="hmi_take_over_request_height">560px</dimen>
+    <dimen name="hmi_take_over_request_m_top">524px</dimen>
 </resources>

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

@@ -153,7 +153,7 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,
         executor.get()?.updateLocation(
                 location.longitude,
                 location.latitude,
-                location.altitude,
+            location.altitude,
             location.bearing,
             location.speed,
             location.provider == "GPS_RTK")

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

@@ -5,7 +5,8 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPointCloudListener
 import com.mogo.eagle.core.function.api.base.IMoGoSubscriber
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPointCloudListenerManager
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
 import com.zhidaoauto.map.sdk.open.business.PointCloudHelper
 import java.math.BigDecimal
 
@@ -44,7 +45,7 @@ class MapPointCloudSubscriber private constructor()
         try {// 根据配置动态控制点云是否绘制
             if (FunctionBuildConfig.isDrawPointCloudData && isDrawCloudPointDockerVersion()) {
                 if (!isDrawPointCloud) {
-                    Logger.d(TAG, "====开启点云渲染====")
+                    CallerLogger.d(M_MAP + TAG, "====开启点云渲染====")
                     isDrawPointCloud = true
                     PointCloudHelper.setIsDrawPointCloud(true)//打开点云绘制
                 }
@@ -58,12 +59,12 @@ class MapPointCloudSubscriber private constructor()
                  * @param isStrong 是否加粗显示
                  * @return 是否执行
                  */
-                Logger.d(TAG, "====开始传入地图点云数据====")
+                CallerLogger.d(M_MAP + TAG, "====开始传入地图点云数据====")
                 val result = PointCloudHelper.updatePointCloudDataByPb(pointCloud, true, false, false)
-                Logger.d(TAG, "====结束传入地图点云数据=====$result")
+                CallerLogger.d(M_MAP + TAG, "====结束传入地图点云数据=====$result")
             } else {
                 if (isDrawPointCloud) {
-                    Logger.d(TAG, "====停止点云绘制====")
+                    CallerLogger.d(M_MAP + TAG, "====停止点云绘制====")
                     isDrawPointCloud = false
                     PointCloudHelper.setIsDrawPointCloud(false)//停止点云绘制
                 }

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

@@ -21,6 +21,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.module.common.drawer.TrafficMarkerDrawer
 import com.mogo.module.common.enums.EventTypeEnum
+import com.mogo.module.common.enums.EventTypeHelper
 import com.mogo.service.IMogoServiceApis
 import com.zhidao.support.obu.MogoObuManager
 import com.zhidao.support.obu.OnMogoObuListener
@@ -53,7 +54,8 @@ class MogoPrivateObuManager private constructor() {
         mContext = context
         connectObu(context, ipAddress)
         //控制日志输出
-        MogoObuManager.getInstance().init(MoGoAiCloudClientConfig.getInstance().getSn(), AppConfigInfo.toString())
+        MogoObuManager.getInstance()
+            .init(MoGoAiCloudClientConfig.getInstance().getSn(), AppConfigInfo.toString())
         MogoObuManager.getInstance().registerListener(mogoObuListener)
     }
 
@@ -111,7 +113,10 @@ class MogoPrivateObuManager private constructor() {
         // 接收到的原始数据
         override fun onReceiveOriginData(data: String) {
             super.onReceiveOriginData(data)
-            CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onReceiveOriginData ------> data = $data")
+            CallerLogger.d(
+                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                "onReceiveOriginData ------> data = $data"
+            )
 
         }
 
@@ -124,7 +129,10 @@ class MogoPrivateObuManager private constructor() {
         // CV2X系统信息
         override fun onCvxAppInitIndInfo(info: CvxAppInitIndInfo) {
             super.onCvxAppInitIndInfo(info)
-            CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onCvxAppInitIndInfo ------> $info")
+            CallerLogger.d(
+                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                "onCvxAppInitIndInfo ------> $info"
+            )
             if (info != null) {
                 if (!info.stack_info.isNullOrEmpty()) {
                     mObuStatusInfo.stackInfo = info.stack_info
@@ -176,7 +184,11 @@ class MogoPrivateObuManager private constructor() {
                         // 同步给MAP地图
                         CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map(data)
                         // 同步更新经纬度和系统时间至 AutoPilotStatusListener
-                        CallerAutoPilotStatusListenerManager.updateAutoPilotLatLon(System.currentTimeMillis()/1000.0,position.longitude, position.latitude)
+                        CallerAutoPilotStatusListenerManager.updateAutoPilotLatLon(
+                            System.currentTimeMillis() / 1000.0,
+                            position.longitude,
+                            position.latitude
+                        )
                     }
 
                 } catch (e: Exception) {
@@ -200,7 +212,10 @@ class MogoPrivateObuManager private constructor() {
 
         // (3) 道路事件预警信息：CVX_RTI_THREAT_IND
         override fun onCvxRtiThreatIndInfo(info: CvxRtiThreatIndInfo?) {
-            CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onCvxRtiThreatIndInfo ------> $info")
+            CallerLogger.d(
+                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                "onCvxRtiThreatIndInfo ------> $info"
+            )
 
             if (info != null && info.threat_info != null && info.ext_info != null) {
                 var alertContent = ""
@@ -211,12 +226,12 @@ class MogoPrivateObuManager private constructor() {
                 val direction =
                     getMessageDirection(if (info.ext_info != null) info.ext_info.pos_classification else -1)
                 CallerLogger.d(
-                        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                        "onCvxRtiThreatIndInfo direction = $direction -- pos_classification = ${info.ext_info.pos_classification}"
+                    "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                    "onCvxRtiThreatIndInfo direction = $direction -- pos_classification = ${info.ext_info.pos_classification}"
                 )
                 CallerLogger.d(
-                        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                        "onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- handleDirection = $direction --rtiType = ${info.ext_info.rti_type} --direction = $direction -- pos_classification = ${info.ext_info.pos_classification} "
+                    "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                    "onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- handleDirection = $direction --rtiType = ${info.ext_info.rti_type} --direction = $direction -- pos_classification = ${info.ext_info.pos_classification} "
                 )
                 when (appId) {
                     // 道路危险情况预警
@@ -232,13 +247,13 @@ class MogoPrivateObuManager private constructor() {
                                     WarningDirectionEnum.ALERT_WARNING_TOP_LEFT,
                                     WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT -> {
                                         appId =
-                                                EventTypeEnum.TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType
+                                            EventTypeEnum.TYPE_USECASE_ID_ROAD_TURN_LEFT_SHARP.poiType
                                     }
                                     WarningDirectionEnum.ALERT_WARNING_RIGHT,
                                     WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT,
                                     WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT -> {
                                         appId =
-                                                EventTypeEnum.TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType
+                                            EventTypeEnum.TYPE_USECASE_ID_ROAD_TURN_RIGHT_SHARP.poiType
                                     }
                                 }
                             }
@@ -253,7 +268,7 @@ class MogoPrivateObuManager private constructor() {
                             //事故
                             0xC -> {
                                 appId =
-                                        EventTypeEnum.TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType
+                                    EventTypeEnum.TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType
                             }
                             //拥堵
                             0xD -> {
@@ -262,7 +277,7 @@ class MogoPrivateObuManager private constructor() {
                             //行人
                             0xF -> {
                                 appId =
-                                        EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType
+                                    EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType
                             }
                             //禁止停车
                             0x13 -> {
@@ -271,7 +286,7 @@ class MogoPrivateObuManager private constructor() {
                             //学校
                             0x14 -> {
                                 appId =
-                                        EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType
+                                    EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType
                             }
                             //桥梁
                             0x17 -> {
@@ -284,7 +299,7 @@ class MogoPrivateObuManager private constructor() {
                             //人行横道
                             0x19 -> {
                                 appId =
-                                        EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType
+                                    EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType
                             }
                             //减速慢行
                             0x1A -> {
@@ -315,13 +330,13 @@ class MogoPrivateObuManager private constructor() {
                         ttsContent = EventTypeEnum.getWarningTts(appId)
                         if (info.threat_info != null) {
                             CallerLogger.d(
-                                    "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                                    "ttsContent = $ttsContent --alertContent = $alertContent ---info.threat_info.distance = ${info.threat_info.distance} "
+                                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                                "ttsContent = $ttsContent --alertContent = $alertContent ---info.threat_info.distance = ${info.threat_info.distance} "
                             )
                             if (info.threat_info.distance.toInt() != 0) {
                                 alertContent = String.format(
-                                        EventTypeEnum.getWarningContent(appId),
-                                        info.threat_info.distance.toInt()
+                                    EventTypeEnum.getWarningContent(appId),
+                                    info.threat_info.distance.toInt()
                                 )
                             } else {
                                 alertContent = "前方拥堵，减速慢行"
@@ -329,8 +344,8 @@ class MogoPrivateObuManager private constructor() {
                         }
 
                         CallerLogger.d(
-                                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                                "ttsContent = $ttsContent --alertContent = $alertContent"
+                            "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                            "ttsContent = $ttsContent --alertContent = $alertContent"
                         )
                     }
                 }
@@ -344,18 +359,19 @@ class MogoPrivateObuManager private constructor() {
 //                        CallerHmiManager.showWarning(direction)
 
                         //显示弹框，语音提示
-                        CallerHmiManager.showWarningV2X(appId,
-                                alertContent,
-                                ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                                (appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
-                                object : IMoGoWarningStatusListener {
-                                    override fun onDismiss() {
-                                        // 关闭警告红边
-                                        CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
-                                    }
-                                },
-                                true,
-                                5000L
+                        CallerHmiManager.showWarningV2X(
+                            appId,
+                            alertContent,
+                            ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+                            (appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
+                            object : IMoGoWarningStatusListener {
+                                override fun onDismiss() {
+                                    // 关闭警告红边
+                                    CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                                }
+                            },
+                            true,
+                            5000L
                         )
                         // 更新数据
                         TrafficDataConvertUtils.cvxRtiThreatIndInfo2TrafficData(info)?.let {
@@ -384,7 +400,10 @@ class MogoPrivateObuManager private constructor() {
 
         // (4) V2I预警信息：CVX_IVP_THREAT_IND，红绿灯
         override fun onCvxIvpThreatIndInfo(info: CvxIvpThreatIndInfo?) {
-            CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "CvxIvpThreatIndInfo ------> $info")
+            CallerLogger.d(
+                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                "CvxIvpThreatIndInfo ------> $info"
+            )
             if (info != null && info.ext_info != null
                 && info.threat_info != null
                 && info.ext_info.lights != null
@@ -404,17 +423,20 @@ class MogoPrivateObuManager private constructor() {
 //                )
 
                 handlerTrafficLight(
-                        info.threat_info.app_id,
-                        info.status,
-                        info.ext_info.lights,
-                        info.ext_info.index
+                    info.threat_info.app_id,
+                    info.status,
+                    info.ext_info.lights,
+                    info.ext_info.index
                 )
             }
         }
 
         // (2) 弱势交通参与者预警信息：CVX_PTC_THREAT_IND
         override fun onCvxPtcThreatIndInfo(info: CvxPtcThreatIndInfo?) {
-            CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onCvxPtcInfoIndInfo ------> $info")
+            CallerLogger.d(
+                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                "onCvxPtcInfoIndInfo ------> $info"
+            )
             // 交通参与者类型 0x0:未知 UNKNOWN | 0x1:非机动车 NON_MOTOR | 0x2:行人 PEDESTRIAN 0x3:RSU
             if (info != null && (info.ptc_type == 1 || info.ptc_type == 2)) {
                 //v2i数据传输延迟
@@ -431,8 +453,8 @@ class MogoPrivateObuManager private constructor() {
 //                )
 
                 CallerLogger.d(
-                        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                        "onCvxPtcInfoIndInfo ---status---> ${info.status}"
+                    "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                    "onCvxPtcInfoIndInfo ---status---> ${info.status}"
                 )
                 var v2xType = ""
                 if (info.ptc_type == 1) { //摩托车
@@ -454,18 +476,19 @@ class MogoPrivateObuManager private constructor() {
 //                        if (level == 2 || level == 3) { //不考虑level
                         //显示警告红边
                         CallerHmiManager.showWarning(direction)
-                        CallerHmiManager.showWarningV2X(v2xType,
-                                alertContent,
-                                ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                                (v2xType + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
-                                object : IMoGoWarningStatusListener {
-                                    override fun onDismiss() {
-                                        // 关闭警告红边
-                                        CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
-                                    }
-                                },
-                                true,
-                                5000L
+                        CallerHmiManager.showWarningV2X(
+                            v2xType,
+                            alertContent,
+                            ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+                            (v2xType + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
+                            object : IMoGoWarningStatusListener {
+                                override fun onDismiss() {
+                                    // 关闭警告红边
+                                    CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                                }
+                            },
+                            true,
+                            5000L
                         )
 //                        }
                         // 更新数据
@@ -523,22 +546,26 @@ class MogoPrivateObuManager private constructor() {
 
         // (1) V2V预警信息：CVX_V2V_THREAT_IND
         override fun onCvxV2vThreatIndInfo(info: CvxV2vThreatIndInfo?) {
-            CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onCvxV2vThreatIndInfo ------> $info")
+            CallerLogger.d(
+                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                "onCvxV2vThreatIndInfo ------> $info"
+            )
             info?.let {
                 //预警信息,预警类型 threat_level 2、3
                 info.threat_info?.let {
                     //预警方位
-                    val direction = getMessageDirection(if (info.ext_info != null) info.ext_info.target_classification else -1)
+                    val direction =
+                        getMessageDirection(if (info.ext_info != null) info.ext_info.target_classification else -1)
                     //处理预警类型
                     val appId = info.threat_info.app_id
                     val level = info.threat_info.threat_level
                     val status = info.status
                     if (info.ext_info != null) {
                         CallerLogger.d(
-                                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                                "onCvxV2vThreatIndInfo target_classification =  ${
-                                    getMessageDirection(info.ext_info.target_classification)
-                                } --- direction = $direction --- appId = $appId ---level = $level -- status = $status"
+                            "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                            "onCvxV2vThreatIndInfo target_classification =  ${
+                                getMessageDirection(info.ext_info.target_classification)
+                            } --- direction = $direction --- appId = $appId ---level = $level -- status = $status"
                         )
                     }
 
@@ -604,8 +631,8 @@ class MogoPrivateObuManager private constructor() {
      */
     private fun handlerTrafficLight(appId: Int, status: Int, lights: List<Light>, index: Int) {
         CallerLogger.d(
-                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                "handlerTrafficLight appId = $appId --- status = $status ---index = $index ---lights.size = ${lights.size} ---lights = $lights "
+            "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+            "handlerTrafficLight appId = $appId --- status = $status ---index = $index ---lights.size = ${lights.size} ---lights = $lights "
         )
         when (status) {
             // 添加
@@ -631,9 +658,9 @@ class MogoPrivateObuManager private constructor() {
      */
     @Synchronized
     private fun changeTrafficLightStatus(
-            appId: Int,
-            lights: List<Light>,
-            index: Int
+        appId: Int,
+        lights: List<Light>,
+        index: Int
     ) {
         var ttsContent = ""
         var alertContent = ""
@@ -641,8 +668,8 @@ class MogoPrivateObuManager private constructor() {
         if (index != -1 && lights.size >= index) {
             val currentLight = lights[index]
             CallerLogger.d(
-                    "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                    "currentLight = $currentLight ---currentLight.phase = ${currentLight.phase} ---rlvw_violation_type = ${currentLight.rlvw_violation_type} --- index = $index ---appId = $appId ---appId = $appId"
+                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                "currentLight = $currentLight ---currentLight.phase = ${currentLight.phase} ---rlvw_violation_type = ${currentLight.rlvw_violation_type} --- index = $index ---appId = $appId ---appId = $appId"
             )
             // 闯红灯预警
             when (currentLight.rlvw_violation_type) {
@@ -655,8 +682,8 @@ class MogoPrivateObuManager private constructor() {
                     ttsContent = EventTypeEnum.getWarningTts(appId.toString())
                     alertContent = EventTypeEnum.getWarningContent(appId.toString())
                     CallerHmiManager.showWarningV2X(
-                            appId.toString(), alertContent, ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                            appId.toString(), null, true, 5000L
+                        appId.toString(), alertContent, ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+                        appId.toString(), null, true, 5000L
                     )
                 }
                 0x3 -> {//闯黄灯 V2I_RLVW_VIOLATION_TYPE_RUNNING_YELLOW_LIGHT
@@ -666,7 +693,7 @@ class MogoPrivateObuManager private constructor() {
             when (currentLight.phase) {
                 // 灯光不可用
                 0x0 -> {
-                    CallerHmiManager.showWarningTrafficLight(0,2)
+                    CallerHmiManager.showWarningTrafficLight(0, 2)
                 }
                 // 红灯
                 0x1 -> {
@@ -675,7 +702,7 @@ class MogoPrivateObuManager private constructor() {
                         isRedLight = true
                     }
                     isGreenLight = false
-                    CallerHmiManager.showWarningTrafficLight(1,2)
+                    CallerHmiManager.showWarningTrafficLight(1, 2)
 
                     val red = currentLight.count_down.toInt()
                     CallerHmiManager.changeCountdownRed(red)
@@ -690,7 +717,7 @@ class MogoPrivateObuManager private constructor() {
                         isGreenLight = true
                     }
                     isRedLight = false
-                    CallerHmiManager.showWarningTrafficLight(3,2)
+                    CallerHmiManager.showWarningTrafficLight(3, 2)
                     val green = currentLight.count_down.toInt()
                     CallerHmiManager.changeCountdownGreen(green)
                     //防止数据出现问题的容错
@@ -698,44 +725,44 @@ class MogoPrivateObuManager private constructor() {
                     CallerHmiManager.changeCountdownYellow(0)
                     // 拼接建议速度
                     CallerLogger.d(
-                            "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                            "speed_min = ${currentLight.glosa_suggested_speed_min} --speed_max = ${currentLight.glosa_suggested_speed_max.toInt()}"
+                        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                        "speed_min = ${currentLight.glosa_suggested_speed_min} --speed_max = ${currentLight.glosa_suggested_speed_max.toInt()}"
                     )
                     val adviceSpeed =
-                            "${currentLight.glosa_suggested_speed_min.toInt()} - ${currentLight.glosa_suggested_speed_max.toInt()}"
+                        "${currentLight.glosa_suggested_speed_min.toInt()} - ${currentLight.glosa_suggested_speed_max.toInt()}"
 
                     val adviceSpeedTts =
-                            "${currentLight.glosa_suggested_speed_min.toInt()}到${currentLight.glosa_suggested_speed_max.toInt()}"
+                        "${currentLight.glosa_suggested_speed_min.toInt()}到${currentLight.glosa_suggested_speed_max.toInt()}"
 
                     ttsContent =
-                            String.format(
-                                    EventTypeEnum.getWarningTts(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),
-                                    adviceSpeedTts
-                            )
+                        String.format(
+                            EventTypeEnum.getWarningTts(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),
+                            adviceSpeedTts
+                        )
 
                     alertContent =
-                            String.format(
-                                    EventTypeEnum.getWarningContent(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),
-                                    adviceSpeed
-                            )
+                        String.format(
+                            EventTypeEnum.getWarningContent(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType),
+                            adviceSpeed
+                        )
 
                     val maxSpeed = currentLight.glosa_suggested_speed_max.toInt()
                     if (maxSpeed > 0) {
                         CallerHmiManager.showWarningV2X(
-                                EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType,
-                                alertContent,
-                                ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                                appId.toString(),
-                                null,
-                                true,
-                                5000L
+                            EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType,
+                            alertContent,
+                            ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+                            appId.toString(),
+                            null,
+                            true,
+                            5000L
                         )
                     }
                 }
                 // 黄灯
                 0x3 -> {
                     CallerHmiManager.disableWarningV2X(appId.toString())
-                    CallerHmiManager.showWarningTrafficLight(2,2)
+                    CallerHmiManager.showWarningTrafficLight(2, 2)
                     val yellow = currentLight.count_down.toInt()
                     CallerHmiManager.changeCountdownYellow(yellow)
                     CallerHmiManager.changeCountdownGreen(0)
@@ -747,6 +774,7 @@ class MogoPrivateObuManager private constructor() {
     }
 
 
+    //todo 二期优化此处内容,注解参数
     /**
      * 构造对应展示数据和场景 根据obu的场景，add change delete确定是否展示
      *
@@ -755,86 +783,76 @@ class MogoPrivateObuManager private constructor() {
      * @see com.mogo.module.common.enums.EventTypeEnum
      */
     private fun handleSdkObu(
-            appId: Int,
-            direction: WarningDirectionEnum,
-            status: Int,
-            level: Int,
-            info: CvxV2vThreatIndInfo
+        appId: Int,
+        direction: WarningDirectionEnum,
+        status: Int,
+        level: Int,
+        info: CvxV2vThreatIndInfo
     ) {
         //  这里排除需要特殊定制的语音及文案外,其余的都可以使用 EventTypeEnum 提供的
         CallerLogger.d(
-                "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                "handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
+            "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+            "handleSdkObu appId = $appId --- handleDirection = $direction ---level = $level ---status = $status"
         )
-        var alertContent: String
-        var ttsContent: String
+        var alertContent: String? = null
+        var ttsContent: String? = null
         var changeVisualAngle = false
         when (appId.toString()) {
             // 变道预警,注意左后车辆/注意右后车辆
             EventTypeEnum.TYPE_USECASE_ID_LCW.poiType -> {
-                alertContent = EventTypeEnum.getWarningContent(appId.toString())
-                ttsContent = EventTypeEnum.getWarningTts(appId.toString())
-                if (
-                        direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
-                        direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
-                        direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
-                ) {
-                    ttsContent = String.format(ttsContent, "左")
-                    alertContent = String.format(alertContent, "左")
-                } else if (
-                        direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
-                        direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
-                        direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
-                ) {
-                    ttsContent = String.format(ttsContent, "右")
-                    alertContent = String.format(alertContent, "右")
+                EventTypeHelper.getLCW(appId, direction) { alert, tts ->
+                    alertContent = alert
+                    ttsContent = tts
                 }
             }
-
             //车辆失控预警
             EventTypeEnum.TYPE_USECASE_ID_CLW.poiType -> {
-                alertContent = EventTypeEnum.getWarningContent(appId.toString())
-                ttsContent = EventTypeEnum.getWarningTts(appId.toString())
-
-                alertContent = String.format(alertContent, direction.desc)
-                ttsContent = String.format(ttsContent, direction.desc)
+                EventTypeHelper.getCLW(appId, direction) { alert, tts ->
+                    alertContent = alert
+                    ttsContent = tts
+                }
             }
-
             //左转辅助
             EventTypeEnum.TYPE_USECASE_ID_LTA.poiType -> {
-                alertContent = EventTypeEnum.getWarningContent(appId.toString())
-                ttsContent = EventTypeEnum.getWarningTts(appId.toString())
+                EventTypeHelper.getLTA(appId) { alert, tts ->
+                    alertContent = alert
+                    ttsContent = tts
+                }
             }
-
             //异常车辆提醒
             EventTypeEnum.TYPE_USECASE_ID_AVW.poiType -> {
-                alertContent = EventTypeEnum.getWarningContent(appId.toString())
-                ttsContent = EventTypeEnum.getWarningTts(appId.toString())
-                alertContent = String.format(alertContent, direction.desc)
-                ttsContent = String.format(ttsContent, direction.desc)
+                EventTypeHelper.getAVW(appId, direction) { alert, tts ->
+                    alertContent = alert
+                    ttsContent = tts
+                }
             }
-
             //盲区预警
             EventTypeEnum.TYPE_USECASE_ID_BSW.poiType -> {
-                ttsContent = EventTypeEnum.getWarningTts(appId.toString())
-                alertContent = EventTypeEnum.getWarningContent(appId.toString())
-
-                if (
-                        direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
-                        direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
-                        direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
-                ) { //左后
-                    changeVisualAngle = true
-                    ttsContent = String.format(ttsContent, "左")
-                    alertContent = String.format(alertContent, "左")
-                } else if (
-                        direction == WarningDirectionEnum.ALERT_WARNING_RIGHT ||
-                        direction == WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT ||
-                        direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
-                ) { //右后
-                    changeVisualAngle = true
-                    ttsContent = String.format(ttsContent, "右")
-                    alertContent = String.format(alertContent, "右")
+                EventTypeHelper.getBSW(appId, direction) { alert, tts, visualAngle ->
+                    alertContent = alert
+                    ttsContent = tts
+                    changeVisualAngle = visualAngle
+                }
+            }
+            //前车急刹预警
+            EventTypeEnum.TYPE_USECASE_ID_EBW.poiType -> {
+                EventTypeHelper.getEBW(appId){ alert ,tts ->
+                    alertContent = alert
+                    ttsContent = tts
+                }
+            }
+            //前向碰撞预警
+            EventTypeEnum.TYPE_USECASE_ID_FCW.poiType -> {
+                EventTypeHelper.getFCW(appId){ alert ,tts ->
+                    alertContent = alert
+                    ttsContent = tts
+                }
+            }
+            //逆向超车预警
+            EventTypeEnum.TYPE_USECASE_ID_DNPW.poiType -> {
+                EventTypeHelper.getDNPW(appId){ alert ,tts ->
+                    alertContent = alert
+                    ttsContent = tts
                 }
             }
 
@@ -850,34 +868,35 @@ class MogoPrivateObuManager private constructor() {
             ObuConstants.STATUS.ADD,
             ObuConstants.STATUS.UPDATE -> {
                 CallerLogger.d(
-                        "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
-                        "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
+                    "$M_OBU${MogoObuConst.TAG_MOGO_OBU}",
+                    "appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction"
                 )
                 if (level == 2 || level == 3) {
                     //显示弹框，语音提示
-                    CallerHmiManager.showWarningV2X(appId.toString(),
-                            alertContent,
-                            ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-                            (appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
-                            object : IMoGoWarningStatusListener {
+                    CallerHmiManager.showWarningV2X(
+                        appId.toString(),
+                        alertContent,
+                        ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
+                        (appId + direction.direction).toString(),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
+                        object : IMoGoWarningStatusListener {
 
-                                override fun onShow() {
-                                    super.onShow()
-                                    if (changeVisualAngle) {
-                                        CallerVisualAngleManager.changeVisualAngle(TooClose)
-                                    }
+                            override fun onShow() {
+                                super.onShow()
+                                if (changeVisualAngle) {
+                                    CallerVisualAngleManager.changeVisualAngle(TooClose)
                                 }
+                            }
 
-                                override fun onDismiss() {
-                                    // 关闭警告红边
-                                    CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
-                                    if (changeVisualAngle) {
-                                        CallerVisualAngleManager.changeVisualAngle(Default())
-                                    }
+                            override fun onDismiss() {
+                                // 关闭警告红边
+                                CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
+                                if (changeVisualAngle) {
+                                    CallerVisualAngleManager.changeVisualAngle(Default())
                                 }
-                            },
-                            true,
-                            5000L
+                            }
+                        },
+                        true,
+                        5000L
                     )
                     //显示警告红边
                     CallerHmiManager.showWarning(direction)

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

@@ -59,6 +59,7 @@ import com.mogo.module.common.entity.*
 import com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum
 import com.mogo.module.common.enums.EventTypeEnum
 import com.mogo.module.common.enums.EventTypeEnum.FOURS_BLOCK_UP
+import com.mogo.module.common.enums.EventTypeHelper
 import com.mogo.service.statusmanager.IMogoStatusChangedListener
 import com.mogo.service.statusmanager.StatusDescriptor
 import com.mogo.service.statusmanager.StatusDescriptor.ACC_STATUS
@@ -525,70 +526,78 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb
             var changeVisualAngle = false
             when (message.status) {
                 1 -> {
-                    var tts = ""
-                    var content = ""
-                    var appId = 0
+                    var tempAppId = 0
+                    var tempTts = ""
+                    var tempContent = ""
                     when (message.typeId) {
                         1001 -> {
                             // 弱势交通碰撞预警
-                            appId = EventTypeEnum.TYPE_USECASE_ID_VRUCW_PERSON.poiType.toInt()
-                            tts = EventTypeEnum.TYPE_USECASE_ID_VRUCW_PERSON.tts
-                            content = EventTypeEnum.TYPE_USECASE_ID_VRUCW_PERSON.content
+                            EventTypeHelper.getVRU{ appId, tts, content ->
+                                tempAppId = appId
+                                tempTts = tts
+                                tempContent = content
+                            }
                         }
                         1002 -> {
                             // 弱势交通逆行预警
-                            appId = EventTypeEnum.TYPE_USECASE_ID_VRUCW_PERSON.poiType.toInt()
-                            tts = "行人逆行预警"
-                            content = "行人逆行预警"
+                            EventTypeHelper.getVRURI { appId, tts, content ->
+                                tempAppId = appId
+                                tempTts = tts
+                                tempContent = content
+                            }
                         }
                         1003 -> {
                             // 交叉路口碰撞预警
                             changeVisualAngle = true
-                            appId = EventTypeEnum.TYPE_USECASE_ID_ICW.poiType.toInt()
-                            tts = EventTypeEnum.TYPE_USECASE_ID_ICW.tts
-                            content = EventTypeEnum.TYPE_USECASE_ID_ICW.content
+                            tempAppId = EventTypeEnum.TYPE_USECASE_ID_ICW.poiType.toInt()
+                            tempTts = EventTypeEnum.TYPE_USECASE_ID_ICW.tts
+                            tempContent = EventTypeEnum.TYPE_USECASE_ID_ICW.content
                         }
                         1004 -> {
                             // 交叉路口碰撞预警
                             changeVisualAngle = true
-                            appId = EventTypeEnum.TYPE_USECASE_ID_BSW.poiType.toInt()
-                            tts = String.format(
+                            tempAppId = EventTypeEnum.TYPE_USECASE_ID_BSW.poiType.toInt()
+                            tempTts = String.format(
                                 EventTypeEnum.TYPE_USECASE_ID_BSW.tts,
                                 getWarningDirection()
                             )
-                            content = EventTypeEnum.TYPE_USECASE_ID_BSW.content
+                            tempContent = EventTypeEnum.TYPE_USECASE_ID_BSW.content
                         }
                         1006 -> {
                             // 逆向超车预警
-                            appId = EventTypeEnum.TYPE_USECASE_ID_DNPW.poiType.toInt()
-                            tts = EventTypeEnum.TYPE_USECASE_ID_DNPW.tts
-                            content = EventTypeEnum.TYPE_USECASE_ID_DNPW.content
+                            tempAppId = EventTypeEnum.TYPE_USECASE_ID_DNPW.poiType.toInt()
+                            tempTts = EventTypeEnum.TYPE_USECASE_ID_DNPW.tts
+                            tempContent = EventTypeEnum.TYPE_USECASE_ID_DNPW.content
                         }
                         1005 -> {
                             // 闯红灯预警
-                            appId = EventTypeEnum.TYPE_USECASE_ID_IVP.poiType.toInt()
-                            tts = EventTypeEnum.TYPE_USECASE_ID_IVP.tts
-                            content = EventTypeEnum.TYPE_USECASE_ID_IVP.content
+                            tempAppId = EventTypeEnum.TYPE_USECASE_ID_IVP.poiType.toInt()
+                            tempTts = EventTypeEnum.TYPE_USECASE_ID_IVP.tts
+                            tempContent = EventTypeEnum.TYPE_USECASE_ID_IVP.content
                         }
                         2001 -> {
                             // 最优车道
-                            appId = EventTypeEnum.TYPE_USECASE_OPTIMAL_LANE.poiType.toInt()
-                            tts = EventTypeEnum.TYPE_USECASE_OPTIMAL_LANE.tts
-                            content = EventTypeEnum.TYPE_USECASE_OPTIMAL_LANE.content
+                            EventTypeHelper.getOptLine{ appId, tts, content ->
+                                tempAppId = appId
+                                tempTts = tts
+                                tempContent = content
+                            }
                         }
                         3001 -> {
                             // 前方道路拥堵预警
-                            appId = FOURS_BLOCK_UP.poiType.toInt()
-                            tts = FOURS_BLOCK_UP.tts
-                            content = FOURS_BLOCK_UP.content
+                            EventTypeHelper.getTJW{ appId, tts, content ->
+                                tempAppId = appId
+                                tempTts = tts
+                                tempContent = content
+                            }
                         }
                     }
                     // 显示弹框，语音提示
                     CallerHmiManager.showWarningV2X(
-                        appId.toString(),
-                        content,
-                        tts,
-                        "$appId",
+                        tempAppId.toString(),
+                        tempContent,
+                        tempTts,
+                        "$tempAppId",
                         object : IMoGoWarningStatusListener {
                             val change = changeVisualAngle
                             override fun onShow() {

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java

@@ -12,7 +12,7 @@ import com.mogo.eagle.core.function.v2x.events.manager.V2XStatusManager;
 import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario;
 import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
 import com.mogo.eagle.core.network.utils.GsonUtil;
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
@@ -41,7 +41,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
     @Override
     public void init(V2XMessageEntity<V2XRoadEventEntity> v2XMessageEntity) {
         try {
-            Logger.d(M_V2X + TAG, "v2XMessageEntity:" + GsonUtil.jsonFromObject(v2XMessageEntity));
+            CallerLogger.INSTANCE.d(M_V2X + TAG, "v2XMessageEntity:" + GsonUtil.jsonFromObject(v2XMessageEntity));
             V2XRoadEventEntity v2XRoadEventEntity = v2XMessageEntity.getContent();
             if (v2XRoadEventEntity != null) {
                 if (v2XMessageEntity.isShowState()) {

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

@@ -1,6 +1,9 @@
 package com.mogo.eagle.core.function.v2x.redlightwarning
 
 import android.location.Location
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_IVP
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_IVP_GREEN
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.data.trafficlight.*
@@ -16,6 +19,7 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.map.navi.IMogoCarLocationChangedListener2
 import com.mogo.module.common.MogoApisHandler
 import com.mogo.module.common.enums.EventTypeEnum
+import com.zhjt.service_biz.BizConfig
 import kotlin.math.abs
 import kotlin.math.ceil
 import kotlin.math.floor
@@ -162,6 +166,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener,
     /**
      * 闯红灯预警
      */
+    @BizConfig(V2I,"",BIZ_IVP)
     private fun redLightWarning() {
         CallerLogger.d("$M_V2X$TAG", "=====闯红灯预警=====")
         ThreadUtils.runOnUiThread {
@@ -172,6 +177,7 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener,
     /**
      * 绿灯通行提示
      */
+    @BizConfig(V2I,"",BIZ_IVP_GREEN)
     private fun greenLightWarning(speed: String = "50") {
         CallerLogger.d("$M_V2X$TAG", "=====绿灯通行预警=====")
         ThreadUtils.runOnUiThread {

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

@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.v2x.trafficlight
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.constants.MogoServicePaths
+import com.mogo.eagle.core.data.trafficlight.TrafficLightControl
 import com.mogo.eagle.core.data.trafficlight.TrafficLightDetail
 import com.mogo.eagle.core.function.api.trafficlight.ITrafficLightProvider
 import com.mogo.eagle.core.function.v2x.trafficlight.TrafficLightConst.Companion.MODULE_NAME
@@ -31,7 +32,7 @@ class TrafficLightProvider : ITrafficLightProvider {
         crossingNo: String,
         heading: Double,
         controlTime: Int,
-        onSuccess: (() -> Unit),
+        onSuccess: ((TrafficLightControl) -> Unit),
         onError: ((String) -> Unit)
     ) {
         return MogoTrafficLightManager.INSTANCE.turnLightToGreen(

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

@@ -4,11 +4,8 @@ import android.content.Context
 import android.location.Location
 import android.os.Handler
 import android.os.Looper
+import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
-import com.mogo.eagle.core.data.trafficlight.RoadIDResult
-import com.mogo.eagle.core.data.trafficlight.TrafficLightDetail
-import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
-import com.mogo.eagle.core.data.trafficlight.isInRange
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
@@ -159,7 +156,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
         crossingNo: String,
         heading: Double,
         controlTime: Int,
-        onSuccess: (() -> Unit),
+        onSuccess: ((TrafficLightControl) -> Unit),
         onError: ((String) -> Unit)
     ) {
         trafficLightNetWorkModel.turnLightToGreen(

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightApiService.kt

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.v2x.trafficlight.network
 
 import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.data.trafficlight.RoadIDResult
+import com.mogo.eagle.core.data.trafficlight.TrafficLightControl
 import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
 import retrofit2.http.FieldMap
 import retrofit2.http.FormUrlEncoded
@@ -22,6 +23,6 @@ interface TrafficLightApiService {
     //变灯
     @FormUrlEncoded
     @POST("mec-etl-server/light/bdg/newTask")
-    suspend fun changeLight(@FieldMap turnLight: Map<String, String>): BaseResponse<Any>
+    suspend fun changeLight(@FieldMap turnLight: Map<String, String>): BaseResponse<TrafficLightControl>
 
 }

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt

@@ -107,10 +107,10 @@ class TrafficLightNetWorkModel {
         crossingNo: String,
         heading: Double,
         controlTime: Int,
-        onSuccess: (() -> Unit),
+        onSuccess: ((TrafficLightControl) -> Unit),
         onError: ((String) -> Unit)
     ) {
-        request<BaseResponse<Any>> {
+        request<BaseResponse<TrafficLightControl>> {
             val map = hashMapOf<String, String>()
             start {
                 val trafficLightRequestData =
@@ -124,7 +124,7 @@ class TrafficLightNetWorkModel {
                 }
             }
             onSuccess {
-                onSuccess.invoke()
+                onSuccess.invoke(it.result)
             }
             onError {
                 if (it.message != null) {

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

@@ -1,28 +1,32 @@
 package com.mogo.eagle.core.function.v2x.vip
 
 import android.content.Context
-import android.location.Location
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
+import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
-import com.mogo.cloud.commons.utils.CoordinateUtils
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
-import com.mogo.eagle.core.data.trafficlight.*
+import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_VIP
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2N
+import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
+import com.mogo.eagle.core.data.trafficlight.currentRoadTrafficLight
+import com.mogo.eagle.core.data.trafficlight.isGreen
 import com.mogo.eagle.core.data.v2x.VipMessage
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager
 import com.mogo.eagle.core.function.v2x.trafficlight.core.MogoTrafficLightManager
 import com.mogo.eagle.core.function.v2x.vip.network.VipNetWorkModel
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
+import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.module.common.enums.EventTypeEnum
-import com.mogo.aicloud.services.socket.IMogoOnMessageListener
-import kotlin.math.abs
+import com.zhjt.service_biz.BizConfig
 
 class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListener,
     Handler.Callback {
@@ -39,16 +43,13 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
     }
 
     private var mContext: Context? = null
-    private var mLocation: Location? = null
-    private var turnLightFirst = false
-    private var turnLightEnd = true
+    private var turnLight = false
     private var vip: Boolean = false
 
     @Volatile
     private var exit: Boolean = false
 
     private var result: TrafficLightResult? = null
-    private var lastResult: TrafficLightStatus? = null
 
     private val vipNetWorkModel = VipNetWorkModel()
     private val handler = Handler(Looper.getMainLooper(), this)
@@ -78,6 +79,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         return VipMessage::class.java
     }
 
+    @BizConfig(V2N, "", BIZ_VIP)
     override fun onMsgReceived(vipMessage: VipMessage?) {
         CallerLogger.d("$M_V2X$TAG", "onMsgReceived vipMessage : ${vipMessage.toString()}")
         vipMessage?.let {
@@ -111,68 +113,34 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         if (trafficLightResult.currentRoadTrafficLight() == null) {
             CallerLogger.d(
                 "$M_V2X$TAG",
-                "vip 获取到灯态，但没找到对应车道数据 result : $trafficLightResult , then resetConditions"
+                "vip 获取到灯态，但没找到对应车道数据 trafficLightResult : $trafficLightResult , then resetConditions"
             )
             resetConditions()
             return
         }
 
         val currentResult = trafficLightResult.currentRoadTrafficLight()
-        lastResult = result?.currentRoadTrafficLight()
+        val lastResult = result?.currentRoadTrafficLight()
         CallerLogger.d(
             "$M_V2X$TAG",
-            "检查是否变灯 last.remain  : ${lastResult?.remain} , color : ${lastResult?.color} , current.remain : ${currentResult?.remain} , color : ${currentResult?.color}, turnLightFirst : $turnLightFirst"
+            "检查是否变灯 last.remain  : ${lastResult?.remain} , color : ${lastResult?.color} , current.remain : ${currentResult?.remain} , color : ${currentResult?.color}, turnLight : $turnLight"
         )
 
         this.result = trafficLightResult
 
-        lastResult?.let {
-            //如果上次结果和本次灯态结果变化比较大，则已变灯，控制HMI展示弹窗
-            if (abs(currentResult!!.remain - it.remain) > 5 && currentResult.isGreen()) {
-                CallerLogger.d("$M_V2X$TAG", "调用showWarningV2X to show")
-                CallerHmiManager.showWarningV2X(
-                    EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType,
-                    EventTypeEnum.TYPE_VIP_IDENTIFICATION.content,
-                    EventTypeEnum.TYPE_VIP_IDENTIFICATION.tts,
-                    EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType,
-                    object : IMoGoWarningStatusListener {
-                        override fun onShow() {}
-                        override fun onDismiss() {
-                            CallerLogger.d(
-                                "$M_V2X$TAG",
-                                "showWarningV2X vip dismiss , resetConditions"
-                            )
-                            resetConditions()
-                        }
-                    },
-                    true,
-                    5000L
-                )
-            }
-        }
-
-
-        if (!turnLightFirst) {
+        if (!turnLight) {
             // 首次判断，变灯
-            turnLightFirst = true
+            turnLight = true
             val controlTime = if (currentResult!!.isGreen()) 45 - currentResult.remain else 45
             CallerLogger.d("$M_V2X$TAG", "触发变灯 , controlTime : $controlTime")
             turnLight(controlTime)
         }
 
-        //可作为补偿措施，暂不启用
-//        mLocation?.let {
-//            if (canGetThroughCross(it, trafficLightResult)) {
-//                turnLight()
-//            }
-//        }
     }
 
     private fun resetConditions() {
-        turnLightFirst = false
-        turnLightEnd = true
+        turnLight = false
         result = null
-        lastResult = null
     }
 
     private fun setVip(cancelDelayTime: Long) {
@@ -192,32 +160,13 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         if (handler.hasMessages(MSG_WHAT_VIP_CANCEL)) {
             handler.removeMessages(MSG_WHAT_VIP_CANCEL)
         }
+        resetConditions()
         CallerHmiManager.vipIdentification(false)
         CallVipSetListenerManager.invokeVipSetStatus(false)
         CallerTrafficLightListenerManager.unRegisterTrafficLightListener(TAG)
         CallerTrafficLightListenerManager.unRegisterEnterCrossRoadListener(TAG)
     }
 
-    private fun canGetThroughCross(
-        it: Location,
-        trafficLightResult: TrafficLightResult
-    ): Boolean {
-        return if (CoordinateUtils.calculateLineDistance(
-                it.longitude,
-                it.latitude,
-                trafficLightResult.lon,
-                trafficLightResult.lat
-            ) < 20
-            && turnLightEnd
-            && trafficLightResult.laneList.mid.turnRedAtOnce()
-        ) {
-            turnLightEnd = false
-            false
-        } else {
-            true
-        }
-    }
-
     private fun requestVip() {
         vipNetWorkModel.requestVip({
             if (handler.hasMessages(MSG_WHAT_VIP_SEARCH)) {
@@ -245,20 +194,65 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         if (result == null || mContext == null) return
         val locationClient = CallerMapUIServiceManager.getSingletonLocationClient(mContext!!)
         if (locationClient != null) {
-            var bearing =
+            val bearing =
                 locationClient.lastKnowLocation.bearing.toDouble()
-            CallerLogger.d("$M_V2X$TAG", "turnLight -- bearing : $bearing")
+            CallerLogger.d("$M_V2X$TAG", "-- turnLight -- ")
             MogoTrafficLightManager.INSTANCE.turnLightToGreen(
                 result!!.lightId, result!!.crossId, bearing, controlTime,
                 {
-                    CallerLogger.d("$M_V2X$TAG", "变灯请求成功")
+                    if (it.sn == MoGoAiCloudClientConfig.getInstance().sn && it.code == 0) {
+                        CallerLogger.d("$M_V2X$TAG", "变灯请求成功")
+                        showWarning(
+                            EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType,
+                            EventTypeEnum.TYPE_VIP_IDENTIFICATION.content,
+                            EventTypeEnum.TYPE_VIP_IDENTIFICATION.tts,
+                            EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType
+                        )
+                    } else {
+                        val time = if (it.countDown / 60 >= 1) {
+                            "${it.countDown / 60}分${it.countDown % 60}秒后重试"
+                        } else {
+                            val temp = if (it.countDown == 0) {
+                                1
+                            } else {
+                                it.countDown
+                            }
+                            "${temp}秒后重试"
+                        }
+                        showWarning(
+                            EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.poiType,
+                            EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.content + time,
+                            EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.tts,
+                            EventTypeEnum.TYPE_VIP_ERROR_IDENTIFICATION.poiType
+                        )
+                    }
                 },
                 { errorMsg ->
                     CallerLogger.e("$M_V2X$TAG", "变灯请求失败 msg : $errorMsg")
+                    ToastUtils.showLong("服务异常，请稍后重试")
                 })
         }
     }
 
+    private fun showWarning(
+        v2xType: String,
+        alertContent: CharSequence,
+        ttsContent: String,
+        tag: String
+    ) {
+        CallerHmiManager.showWarningV2X(
+            v2xType, alertContent, ttsContent, tag,
+            object : IMoGoWarningStatusListener {
+                override fun onShow() {}
+                override fun onDismiss() {
+                    resetConditions()
+                }
+            },
+            true,
+            5000L
+        )
+    }
+
     fun destroy() {
         MogoAiCloudSocketManager.getInstance(mContext)
             .unregisterLifecycleListener(401025)