diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index bee668f3ab..7643783a82 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,17 +1,10 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="AUTODETECT_INDENTS" value="false" />
-    <JavaCodeStyleSettings>
-      <option name="FIELD_NAME_PREFIX" value="m" />
-    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <codeStyleSettings language="JAVA">
-      <option name="KEEP_LINE_BREAKS" value="false" />
-      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
-    </codeStyleSettings>
     <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5e334d0770..9f6f97a3a6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,14 +13,19 @@
       <map>
         <entry key="../../../../../../layout/custom_preview.xml" value="0.390625" />
         <entry key="../../../../../layout/custom_preview.xml" value="0.19947916666666668" />
-        <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml" value="0.15572916666666667" />
-        <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="0.5" />
+        <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml" value="0.33" />
+        <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_autopilot_status.xml" value="0.25833333333333336" />
+        <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml" value="1.0" />
+        <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml" value="0.8466666666666667" />
+        <entry key="core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="1.0" />
         <entry key="modules/mogo-module-adas/src/main/res/drawable/module_adas_left_corner_bg.xml" value="0.22125" />
         <entry key="modules/mogo-module-adas/src/main/res/layout/dialog_adas_dispatch_remind.xml" value="0.22658490296325878" />
+        <entry key="modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml" value="1.0" />
         <entry key="modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml" value="0.34427083333333336" />
         <entry key="modules/mogo-module-hmi/src/main/res/layout/module_hmi_warning_v2x.xml" value="0.246875" />
         <entry key="modules/mogo-module-hmi/src/main/res/layout/notification_v2x_msg_vr.xml" value="0.3453125" />
         <entry key="modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="0.25" />
+        <entry key="modules/mogo-module-left-panel/src/main/res/layout/module_left_panel_simple_speed.xml" value="0.3026041666666667" />
         <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.3125" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml" value="0.184" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch_affirm.xml" value="0.19166666666666668" />
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index f605b86aae..410dd3c6fe 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -39,11 +39,13 @@ import com.mogo.utils.ProcessUtils;
 import com.mogo.utils.logger.LogLevel;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.storage.SharedPrefsMgr;
-import com.squareup.leakcanary.LeakCanary;
-import com.squareup.leakcanary.RefWatcher;
+//import com.squareup.leakcanary.LeakCanary;
+//import com.squareup.leakcanary.RefWatcher;
 import com.zhidao.boot.persistent.lib.PersistentManager;
 import com.zhidao.mogo.module.left.panel.LeftPanelConst;
 
+import leakcanary.LeakCanary;
+
 /**
  * @author congtaowang
  * @since 2019-12-18
@@ -55,7 +57,7 @@ public class MogoApplication extends AbsMogoApplication {
     private static final String TAG = "MogoApplication";
 
     private long start;
-    private volatile static RefWatcher refWatcher;
+//    private volatile static RefWatcher refWatcher;
 
     @Override
     public void onCreate() {
@@ -313,9 +315,9 @@ public class MogoApplication extends AbsMogoApplication {
             startService(intent);
         }
 
-        if (refWatcher == null) {
-            refWatcher = LeakCanary.install(this);
-        }
+//        if (refWatcher == null) {
+//            refWatcher = LeakCanary.install(this);
+//        }
 
         // 初始化 bugly 升级
         ARouter.getInstance().navigation(UpgradeReportProvider.class);
diff --git a/build.gradle b/build.gradle
index 74ce66c36c..488fd1b534 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31'
         classpath "com.alibaba:arouter-register:1.0.2"
         classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4'
 
diff --git a/config.gradle b/config.gradle
index 95abac82bc..2478373080 100644
--- a/config.gradle
+++ b/config.gradle
@@ -43,9 +43,9 @@ ext {
             // json 转换
             gson                       : "com.google.code.gson:gson:2.8.4",
             // 内存泄漏检测
-            debugleakcanary            : "com.squareup.leakcanary:leakcanary-android:1.6.1",
-            releaseleakcanary          : "com.squareup.leakcanary:leakcanary-android-no-op:1.6.1",
-            testleakcanary             : "com.squareup.leakcanary:leakcanary-android-no-op:1.6.1",
+            debugleakcanary            : "com.squareup.leakcanary:leakcanary-android:2.7",
+            releaseleakcanary          : "com.squareup.leakcanary:leakcanary-android-no-op:2.7",
+            testleakcanary             : "com.squareup.leakcanary:leakcanary-android-no-op:2.7",
             //rxJava
             rxjava                     : "io.reactivex.rxjava2:rxjava:2.2.2",
             rxandroid                  : "io.reactivex.rxjava2:rxandroid:2.1.1",
@@ -130,7 +130,7 @@ ext {
             // OBU
             moduleobu                  : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_VERSION}",
             moduleobumogo              : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_MOGO_VERSION}",
-            crashwarning               : "com.mogo.module:module-crash-warning:1.1.0",
+            carmanager               : "com.zhidao.carmanager:common:1.0.30@aar",
 
             //
             jetbrainsannotationsjava5  : "org.jetbrains:annotations-java5:15.0",
diff --git a/core/function-impl/mogo-core-function-check/build.gradle b/core/function-impl/mogo-core-function-check/build.gradle
index 5395c43d34..c5b04d441b 100644
--- a/core/function-impl/mogo-core-function-check/build.gradle
+++ b/core/function-impl/mogo-core-function-check/build.gradle
@@ -1,8 +1,10 @@
-apply plugin: 'com.android.library'
-apply plugin: 'com.alibaba.arouter'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'com.alibaba.arouter'
+}
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     defaultConfig {
@@ -11,14 +13,16 @@ android {
         versionCode Integer.valueOf(VERSION_CODE)
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
-            }
-        }
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
+
+        //ARouter apt 参数
+        kapt {
+            useBuildCache = false
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
     }
     buildTypes {
         release {
@@ -45,11 +49,9 @@ dependencies {
     implementation rootProject.ext.dependencies.coroutinescore
     implementation rootProject.ext.dependencies.rxandroid
     implementation rootProject.ext.dependencies.kotlinstdlibjdk7
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation project(':modules:mogo-module-common')
-    implementation project(path: ':modules:mogo-module-service')
+    implementation rootProject.ext.dependencies.material
 
-    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    kapt rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.mogocommons
@@ -58,13 +60,12 @@ dependencies {
         implementation project(":foudations:mogo-commons")
         implementation project(':services:mogo-service-api')
 
+        implementation project(':modules:mogo-module-common')
+        implementation project(':modules:mogo-module-service')
+
         implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-function-call')
     }
-    implementation 'com.tencent.bugly:crashreport_upgrade:latest.release'
-    //其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.1.9
-    implementation 'com.tencent.bugly:nativecrashreport:latest.release'
-    //其中latest.release指代最新Bugly NDK版本号，也可以指定明确的版本号，例如3.0
 
 }
 
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.java
deleted file mode 100644
index ed60b68332..0000000000
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.mogo.eagle.core.function.check;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.util.Log;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.elegant.network.ParamsBuilder;
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.eagle.core.function.call.check.CallerCheckManager;
-import com.mogo.eagle.core.function.check.api.ICheckResultCallBack;
-import com.mogo.eagle.core.function.check.net.CheckApiServiceFactory;
-import com.mogo.eagle.core.function.check.net.CheckResultData;
-import com.mogo.eagle.core.function.check.view.CheckDialog;
-import com.mogo.eagle.core.utilcode.util.ActivityUtils;
-import com.mogo.eagle.core.utilcode.util.AppUtils;
-import com.mogo.eagle.core.utilcode.util.LogUtils;
-import com.mogo.eagle.core.function.api.check.IMogoCheckListener;
-import com.mogo.eagle.core.function.check.view.CheckActivity;
-import com.mogo.eagle.core.utilcode.util.ThreadUtils;
-import com.mogo.module.service.receiver.MogoReceiver;
-import com.mogo.service.MogoServicePaths;
-import com.mogo.eagle.core.function.api.check.ICheckProvider;
-import com.mogo.utils.ActivityLifecycleManager;
-import com.mogo.utils.network.RequestOptions;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
-
-
-/**
- * 鹰眼系统、自动驾驶系统 检测模块
- *
- * @date 4/21/21 3:39 PM
- * 需求地址
- * wiki：http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=58204952
- */
-@Route(path = MogoServicePaths.PATH_CHECK)
-public class VehicleMonitoringManager implements ICheckProvider {
-    private static final String TAG = "VehicleMonitoringManager";
-    private Context mContext;
-    private final Map<String, CopyOnWriteArrayList> mListeners = new ConcurrentHashMap<>();
-    private boolean hasTipShow = false;//是否已经弹框提示
-    CheckDialog dialog;
-
-    @Override
-    public void init(Context context) {
-        LogUtils.dTag(TAG, "初始化 CheckProvider 模块");
-        mContext = context;
-    }
-
-    @Override
-    public void registerVehicleMonitoringListener(String module, IMogoCheckListener listener) {
-        if (listener == null || module == null) {
-            LogUtils.dTag(TAG, "listener == null || intent == null");
-            return;
-        }
-        if (!mListeners.containsKey(module)) {
-            LogUtils.dTag(TAG, "intent==" + module + "listener" + listener);
-            mListeners.put(module, new CopyOnWriteArrayList<>());
-        }
-        mListeners.get(module).add(listener);
-    }
-
-    @Override
-    public void unregisterListener(String module, IMogoCheckListener listener) {
-        if (mListeners.containsKey(module)) {
-            mListeners.get(module).remove(listener);
-        }
-    }
-
-    @Override
-    public void startCheckActivity(Context context) {
-        Intent starter = new Intent(context, CheckActivity.class);
-        starter.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(starter);
-    }
-
-    @Override
-    public void showCheckDialog(Context context) {
-        showDialog(context);
-    }
-
-    @Override
-    public void checkMonitor(Context context) {
-        if (context != null) {
-            CheckActivity.checkMonitor(context, new ICheckResultCallBack() {
-                @Override
-                public void callBackWithErrorState(Integer state) {
-                    updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING, state);
-                    if (state == 1) {
-                        hasTipShow = false;
-                    } else {
-                        if (hasTipShow == false) {
-                            showDialog(context);
-                            hasTipShow = true;//已弹框
-                        }
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * 指标异常弹框
-     */
-    public void showDialog(Context context) {
-        try {
-            if (ActivityLifecycleManager.getInstance().isAppActive() == true &&
-                    AppUtils.isAppRunning(getPackageName(context)) &&
-                    ActivityUtils.getTopActivity() instanceof CheckActivity == false) {
-                if (dialog != null) {
-                    dialog.dismiss();
-                }
-                dialog = new CheckDialog(context, true);
-                dialog.show();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * @param context
-     * @return 当前应用的版本名称
-     */
-    public static synchronized String getPackageName(Context context) {
-        try {
-            PackageManager packageManager = context.getPackageManager();
-            PackageInfo packageInfo = packageManager.getPackageInfo(
-                    context.getPackageName(), 0);
-            return packageInfo.packageName;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return "com.mogo.launcher.f";
-    }
-
-    @Override
-    public void updateMonitoringStatus(String module, Integer state) {
-        List<IMogoCheckListener> listeners = mListeners.get(module);
-        if (listeners != null && !listeners.isEmpty()) {
-            for (IMogoCheckListener listener : listeners) {
-                if (listener != null) {
-                    listener.updateMonitoringStatus(state);
-                }
-            }
-        }
-    }
-}
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt
new file mode 100644
index 0000000000..e01fde4a97
--- /dev/null
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.kt
@@ -0,0 +1,112 @@
+package com.mogo.eagle.core.function.check
+
+import android.content.Context
+import android.content.Intent
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.eagle.core.function.api.check.ICheckProvider
+import com.mogo.eagle.core.function.api.check.IMogoCheckListener
+import com.mogo.eagle.core.function.check.view.CheckActivity
+import com.mogo.eagle.core.function.check.view.CheckDialog
+import com.mogo.eagle.core.utilcode.util.ActivityUtils
+import com.mogo.eagle.core.utilcode.util.AppUtils
+import com.mogo.eagle.core.utilcode.util.LogUtils
+import com.mogo.module.common.MogoApisHandler
+import com.mogo.module.service.receiver.MogoReceiver
+import com.mogo.service.MogoServicePaths
+import com.mogo.service.statusmanager.IMogoStatusChangedListener
+import com.mogo.service.statusmanager.StatusDescriptor
+import com.mogo.utils.ActivityLifecycleManager
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * 鹰眼系统、自动驾驶系统 检测模块
+ *
+ * @date 4/21/21 3:39 PM
+ * 需求地址
+ * wiki：http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=58204952
+ */
+@Route(path = MogoServicePaths.PATH_CHECK)
+class VehicleMonitoringManager : ICheckProvider, IMogoStatusChangedListener {
+    private val TAG = "VehicleMonitoringManager"
+    private var mContext: Context? = null
+    private val mListeners: ConcurrentHashMap<String, IMogoCheckListener> = ConcurrentHashMap()
+    private var hasTipShow = false //是否已经弹框提示
+    var dialog: CheckDialog? = null
+    override fun init(context: Context) {
+        LogUtils.dTag(TAG, "初始化 CheckProvider 模块")
+        mContext = context
+        MogoApisHandler.getInstance().apis.statusManagerApi.registerStatusChangedListener(
+            TAG,
+            StatusDescriptor.MAIN_PAGE_RESUME,
+            this
+        )
+    }
+
+    override fun registerVehicleMonitoringListener(module: String, listener: IMogoCheckListener) {
+        mListeners[module] = listener
+    }
+
+    override fun unregisterListener(module: String) {
+        mListeners.remove(module)
+    }
+
+    override fun startCheckActivity(context: Context) {
+        val starter = Intent(context, CheckActivity::class.java)
+        starter.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        context.startActivity(starter)
+    }
+
+    override fun showCheckDialog(context: Context) {
+        showDialog(context)
+    }
+
+    override fun checkMonitor(context: Context) {
+        CheckActivity.checkMonitor(context) { state ->
+            updateMonitoringStatus(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING, state)
+            if (state == 1) {
+                hasTipShow = false
+            } else {
+                if (!hasTipShow) {
+                    showDialog(context)
+                    hasTipShow = true //已弹框
+                }
+            }
+        }
+    }
+
+    /**
+     * 指标异常弹框
+     */
+    private fun showDialog(context: Context) {
+        try {
+            if (ActivityLifecycleManager.getInstance().isAppActive && AppUtils.isAppRunning(
+                    AppUtils.getAppPackageName()
+                ) && ActivityUtils.getTopActivity() !is CheckActivity
+            ) {
+                if (dialog != null) {
+                    dialog!!.dismiss()
+                }
+                dialog = CheckDialog(context, true)
+                dialog!!.show()
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    override fun updateMonitoringStatus(module: String, state: Int) {
+        for (listener in mListeners) {
+            listener.value.updateMonitoringStatus(state)
+        }
+    }
+
+    override fun onStatusChanged(descriptor: StatusDescriptor, isTrue: Boolean) {
+        if (descriptor == StatusDescriptor.MAIN_PAGE_RESUME) {
+            if (!isTrue) {
+                if (dialog != null && dialog!!.isShowing) {
+                    dialog!!.dismiss()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/api/ICheckResultCallBack.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/api/ICheckResultCallBack.java
index 709f409f11..fbc0e30634 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/api/ICheckResultCallBack.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/api/ICheckResultCallBack.java
@@ -1,7 +1,5 @@
 package com.mogo.eagle.core.function.check.api;
 
-import com.mogo.service.adas.IMogoAdasDataCallback;
-
 /**
  * @author liujing
  * @description 自车检测结果回调
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServices.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServices.java
index 5bd7b0afb7..02338e73fa 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServices.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServices.java
@@ -1,11 +1,9 @@
 package com.mogo.eagle.core.function.check.net;
 
 import java.util.Map;
-import retrofit2.http.FieldMap;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.GET;
-import retrofit2.http.POST;
+
 import io.reactivex.Observable;
+import retrofit2.http.GET;
 import retrofit2.http.QueryMap;
 
 /**
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java
index 213fad60c0..8bb7658383 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java
@@ -6,9 +6,6 @@ import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.util.Log;
@@ -23,17 +20,13 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.elegant.network.ParamsBuilder;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.eagle.core.function.call.check.CallerCheckManager;
 import com.mogo.eagle.core.function.check.R;
 import com.mogo.eagle.core.function.check.api.ICheckResultCallBack;
 import com.mogo.eagle.core.function.check.net.CheckApiServiceFactory;
 import com.mogo.eagle.core.function.check.net.CheckResultData;
-import com.mogo.eagle.core.utilcode.util.ActivityUtils;
-import com.mogo.eagle.core.utilcode.util.AppUtils;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.module.common.view.ImageViewClipBounds;
 import com.mogo.module.common.view.SpacesItemDecoration;
-import com.mogo.module.service.receiver.MogoReceiver;
 import com.mogo.utils.network.RequestOptions;
 import com.mogo.utils.network.utils.NetworkStatusUtil;
 
@@ -51,7 +44,7 @@ import io.reactivex.schedulers.Schedulers;
 public class CheckActivity extends AppCompatActivity {
 
     private static final String TAG = "CheckActivity";
-    private static RecyclerView mRecyclerView;
+    private RecyclerView mRecyclerView;
     private static CheckResultData sCheckResultData;
     private static NetworkStatusUtil.NetWorkStatus sNetWorkStatus;
     private ImageView mImageView;
@@ -71,7 +64,6 @@ public class CheckActivity extends AppCompatActivity {
     private ProgressBar mProgressBar;
     private final static long DURATION_TIME = 1000;
     private static CheckAdapter mCheckAdapter;
-    private static boolean isFront = false;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -90,7 +82,6 @@ public class CheckActivity extends AppCompatActivity {
      * 列表View初始化
      */
     public void initView() {
-        isFront = true;
         setAnimation = new AnimatorSet();
         mImageView = findViewById(R.id.btnBack);
         scanBottomCarImage = findViewById(R.id.scan_car_image);
@@ -107,7 +98,7 @@ public class CheckActivity extends AppCompatActivity {
                 new CheckLinearLayout(this, CheckLinearLayout.VERTICAL, false);
         mRecyclerView.addItemDecoration(new SpacesItemDecoration((int) getResources().getDimension(R.dimen.check_item_space_vr)));
         mRecyclerView.setLayoutManager(linearLayoutManager);
-        mCheckAdapter = new CheckAdapter(this, sCheckResultData);
+        mCheckAdapter = new CheckAdapter(CheckActivity.this, sCheckResultData);
         mRecyclerView.setAdapter(mCheckAdapter);
     }
 
@@ -245,6 +236,9 @@ public class CheckActivity extends AppCompatActivity {
     @Override
     protected void onPause() {
         super.onPause();
+        if (mCheckAdapter!=null){
+            mCheckAdapter.dismissDialog();
+        }
     }
 
     @Override
@@ -260,7 +254,7 @@ public class CheckActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        isFront = false;
+        mCheckAdapter.ondestry();
     }
 
 }
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckAdapter.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckAdapter.java
index ff9029336c..cb6589f6ae 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckAdapter.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckAdapter.java
@@ -8,7 +8,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.CheckResult;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -16,8 +15,6 @@ import com.mogo.eagle.core.function.check.R;
 import com.mogo.eagle.core.function.check.model.CheckItemInfo;
 import com.mogo.eagle.core.function.check.net.CheckResultData;
 
-import java.util.ArrayList;
-
 
 /**
  * @author liujing
@@ -35,7 +32,7 @@ public class CheckAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     public CheckAdapter(@NonNull Context context, @NonNull CheckResultData checkResult) {
         mContext = context;
         mCheckResultData = checkResult;
-        mLayoutInflater = LayoutInflater.from(context);
+        mLayoutInflater = LayoutInflater.from(mContext);
     }
 
     @Override
@@ -62,6 +59,17 @@ public class CheckAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         return holder;
     }
 
+    public void dismissDialog() {
+        if (mCheckInfoListDialog!=null && mCheckInfoListDialog.isShowing()){
+            mCheckInfoListDialog.dismiss();
+        }
+    }
+
+    public void ondestry() {
+        mContext = null;
+        mCheckInfoListDialog = null;
+    }
+
     /**
      * 顶部view列表
      */
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java
index 0282509807..a80c0111ba 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java
@@ -1,7 +1,6 @@
 package com.mogo.eagle.core.function.check.view;
 
 import android.content.Context;
-import android.content.Intent;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoAdapter.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoAdapter.java
index 5d4a1971fd..afad70b474 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoAdapter.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoAdapter.java
@@ -1,8 +1,6 @@
 package com.mogo.eagle.core.function.check.view;
 
 import android.content.Context;
-import android.text.TextPaint;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,7 +13,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.mogo.eagle.core.function.check.R;
 import com.mogo.eagle.core.function.check.net.CheckResultData;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -100,4 +97,8 @@ public class CheckInfoAdapter extends RecyclerView.Adapter {
         }
     }
 
+    @Override
+    public int getItemViewType(int position) {
+        return position;
+    }
 }
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoGridItemDivider.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoGridItemDivider.java
index cbc7bdf1ef..8f6f13edcd 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoGridItemDivider.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoGridItemDivider.java
@@ -3,8 +3,6 @@ package com.mogo.eagle.core.function.check.view;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java
index 5da4a5d2f5..1a170692dc 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckInfoListDialog.java
@@ -1,15 +1,10 @@
 package com.mogo.eagle.core.function.check.view;
 
 import android.content.Context;
-import android.graphics.Color;
-import android.util.AttributeSet;
-import android.util.Log;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.eagle.core.function.check.R;
 import com.mogo.eagle.core.function.check.model.CheckItemInfo;
@@ -79,8 +74,6 @@ public class CheckInfoListDialog extends BaseFloatDialog {
 
     public List showInfoResult() {
 
-//        List<CheckResultData.CheckListItem> test = new ArrayList();//测试数据
-
         if (result.size() > 0) {
             result.clear();
         }
@@ -106,9 +99,6 @@ public class CheckInfoListDialog extends BaseFloatDialog {
         } catch (Exception e) {
 
         }
-//        test.addAll(result);
-//        test.addAll(result);
-//        test.addAll(result);
         return result;
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
index 2054bfb153..903eaebbdb 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
@@ -21,6 +21,7 @@ import com.mogo.utils.logger.Logger
 /**
  * @author donghongyu
  * @date 2021/8/5 5:29 下午
+ * 弹窗Window 管理
  */
 internal class WarningFloatWindowHelper(
     val context: Context,
@@ -62,8 +63,8 @@ internal class WarningFloatWindowHelper(
             // 设置浮窗以外的触摸事件可以传递给后面的窗口、不自动获取焦点
             flags = if (config.immersionStatusBar)
             // 没有边界限制，允许窗口扩展到屏幕外
-                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
-            else WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+            else WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
             width = WindowManager.LayoutParams.WRAP_CONTENT
             height = WindowManager.LayoutParams.WRAP_CONTENT
 
@@ -142,7 +143,7 @@ internal class WarningFloatWindowHelper(
             .enterAnim()?.apply {
                 // 可以延伸到屏幕外，动画结束按需去除该属性，不然旋转屏幕可能置于屏幕外部
                 params.flags =
-                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL  or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
 
                 addListener(object : Animator.AnimatorListener {
                     override fun onAnimationRepeat(animation: Animator?) {}
@@ -152,7 +153,7 @@ internal class WarningFloatWindowHelper(
                         if (!config.immersionStatusBar) {
                             // 不需要延伸到屏幕外了，防止屏幕旋转的时候，浮窗处于屏幕外
                             params.flags =
-                                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
                         }
                     }
 
@@ -187,7 +188,7 @@ internal class WarningFloatWindowHelper(
             if (config.isAnim) return
             config.isAnim = true
             params.flags =
-                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
+                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL  or WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
             animator.addListener(object : Animator.AnimatorListener {
                 override fun onAnimationRepeat(animation: Animator?) {}
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 21458fc6fc..7b9574563c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -4,11 +4,15 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.data.constants.MoGoOBUConfig
 import com.mogo.eagle.core.data.obu.ObuStatusInfo
 import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener
+import com.mogo.eagle.core.function.call.obu.CallerOBUManager
 import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.GsonUtils
+import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.utils.storage.SharedPrefsMgr
 import kotlinx.android.synthetic.main.view_debug_setting.view.*
 
 /**
@@ -43,10 +47,20 @@ class DebugSettingView @JvmOverloads constructor(
 
     private fun initView() {
         tvObuInfo.text = CallerObuListenerManager.getObuStatusInfo()
+        btnSetObuIP.setOnClickListener {
+            val obuIP = etObuIP.text.toString()
+            if (obuIP.isNotEmpty()) {
+                CallerOBUManager.resetObuIpAddress(obuIP)
+            } else {
+                ToastUtils.showShort("请输入正确的IP地址")
+            }
+        }
     }
 
     override fun onObuStatusResponse(obuStatusInfo: ObuStatusInfo) {
         tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
+        etObuIP.setText(obuStatusInfo.connectIP)
+        etObuIP.text?.let { etObuIP.setSelection(it.length) }
     }
 
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
index a64f9d92a8..b4e2be73a1 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
@@ -6,13 +6,16 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.autopilot.AdasOCHData
+import com.mogo.eagle.core.data.autopilot.RemoteControlAutoPilotParameters
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.LogUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.module.common.MogoApisHandler
 import com.mogo.service.adas.IMogoAdasOCHCallback
+import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.view_autopilot_status.view.*
+import java.util.*
 
 /**
  * @author xiaoyuzhou
@@ -20,8 +23,8 @@ import kotlinx.android.synthetic.main.view_autopilot_status.view.*
  * 自动驾驶状态按钮
  */
 class AutoPilotStatusView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet
+        context: Context,
+        attrs: AttributeSet
 ) : ConstraintLayout(context, attrs), View.OnClickListener, IMogoAdasOCHCallback {
 
     private val TAG = "AutopilotStatusView"
@@ -53,7 +56,7 @@ class AutoPilotStatusView @JvmOverloads constructor(
         when (mAutopilotStatus) {
             0 -> {// 不可自动驾驶，adas与工控机没有链接，或工控机异常
                 LogUtils.eTag(TAG, "不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
-                ToastUtils.showShort("不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
+//                ToastUtils.showShort("不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
                 // TODO 这里临时触发自动驾驶能力,测试功过这里删除
                 CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(true)
             }
@@ -64,6 +67,15 @@ class AutoPilotStatusView @JvmOverloads constructor(
                 CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(false)
             }
         }
+//        startAutoPilot();
+    }
+    private fun startAutoPilot() {
+        val currentAutopilot = RemoteControlAutoPilotParameters()
+        currentAutopilot.isSpeakVoice = false
+        currentAutopilot.startLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.194795425,116.724476409);
+        currentAutopilot.endLatLon = RemoteControlAutoPilotParameters.AutoPilotLonLat(40.199730,116.735687);
+        currentAutopilot.vehicleType = 10
+        MogoApisHandler.getInstance().apis.adasControllerApi.aiCloudToAdasData(currentAutopilot)
     }
 
     /**
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckStatusView.kt
new file mode 100644
index 0000000000..af1370e06a
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckStatusView.kt
@@ -0,0 +1,66 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.api.check.IMogoCheckListener
+import com.mogo.eagle.core.function.call.check.CallerCheckManager
+import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+import kotlinx.android.synthetic.main.view_check_status.view.*
+
+/**
+ *@author        xiaoyuzhou
+ *@date          2021/8/6 12:25 下午
+ */
+class CheckStatusView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr), IMogoCheckListener {
+    private val TAG = "CheckStatusView"
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_check_status, this, true)
+
+        setOnClickListener {
+            // 启动检测页面
+            CallerCheckManager.startCheckActivity(getContext())
+        }
+    }
+
+    private fun showErrorIcon() {
+        errorTipImage.visibility = View.VISIBLE
+    }
+
+    private fun dismissErrorIcon() {
+        errorTipImage.visibility = View.GONE
+    }
+
+    override fun updateMonitoringStatus(state: Int?) {
+        Logger.d(TAG, "updateCheckStatus")
+        if (state == 1) {
+            dismissErrorIcon()
+        } else {
+            showErrorIcon()
+        }
+    }
+
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        Logger.d(TAG, "onAttachedToWindow")
+        //车辆监控
+        CallerCheckManager.registerVehicleMonitoringListener(TAG, this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        Logger.d(TAG, "onDetachedFromWindow")
+        //车辆监控
+        CallerCheckManager.unregisterListener(TAG)
+    }
+
+}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
index 3aac290c0c..78a118fc28 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
@@ -61,5 +61,13 @@
         app:layout_goneMarginTop="40px"
         tools:visibility="visible" />
 
+    <com.mogo.eagle.core.function.hmi.ui.widget.CheckStatusView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="40px"
+        android:layout_marginBottom="@dimen/dp_490"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml
new file mode 100644
index 0000000000..035095487c
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_status.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/clAutopilotStatus"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <!--车辆检测入口-->
+    <TextView
+        android:id="@+id/moduleHmiCheck"
+        android:layout_width="@dimen/dp_128"
+        android:layout_height="@dimen/dp_128"
+        android:background="@drawable/module_ext_check"
+        android:gravity="center"
+        android:text="检测"
+        android:textColor="#fff"
+        android:textSize="@dimen/module_hmi_btn_text_size"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <ImageView
+        android:id="@+id/errorTipImage"
+        android:layout_width="@dimen/dp_40"
+        android:layout_height="@dimen/dp_40"
+        android:src="@drawable/check_error_image"
+        android:visibility="invisible"
+        app:layout_constraintRight_toRightOf="@+id/moduleHmiCheck"
+        app:layout_constraintTop_toTopOf="@+id/moduleHmiCheck" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index fccc3f472d..a47576a327 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -9,9 +9,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/tvTitleObu"
@@ -24,6 +25,26 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/etObuIP"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#32009688"
+                android:gravity="center"
+                android:inputType="number"
+                android:padding="@dimen/dp_5"
+                android:text="192.168.1.199"
+                android:textSize="@dimen/dp_34" />
+
+            <Button
+                android:id="@+id/btnSetObuIP"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:padding="@dimen/dp_5"
+                android:text="设置IP"
+                android:textSize="@dimen/dp_34" />
+
             <TextView
                 android:id="@+id/tvObuInfo"
                 android:layout_width="match_parent"
@@ -33,7 +54,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/tvTitleObu" />
 
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
 
     </ScrollView>
 
diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt
index 15f204cf51..5cb8cb8936 100644
--- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt
+++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt
@@ -2,9 +2,11 @@ package com.mogo.eagle.core.function.obu.mogo
 
 import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.eagle.core.data.constants.MoGoOBUConfig
 import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider
 import com.mogo.eagle.core.utilcode.util.LogUtils
 import com.mogo.service.MogoServicePaths
+import com.mogo.utils.storage.SharedPrefsMgr
 
 /**
  * @author xiaoyuzhou
@@ -14,9 +16,22 @@ import com.mogo.service.MogoServicePaths
 class MoGoObuProvider : IMoGoObuProvider {
     private val TAG = "MoGoObuProvider"
 
+    private var mContext: Context? = null
+
     override fun init(context: Context) {
         LogUtils.dTag(TAG, "初始化蘑菇自研OBU……")
-
-        MogoPrivateObuManager.INSTANCE.init(context)
+        mContext = context
+        val ipAddress =
+            SharedPrefsMgr.getInstance(context).getString(MoGoOBUConfig.OBU_IP, "192.168.1.199")
+        MogoPrivateObuManager.INSTANCE.init(context, ipAddress)
     }
+
+    override fun connect(ipAddress: String) {
+        mContext?.let {
+            // 保存本地OBU IP地址
+            SharedPrefsMgr.getInstance(it).putString(MoGoOBUConfig.OBU_IP, ipAddress)
+            MogoPrivateObuManager.INSTANCE.connectObu(it, ipAddress)
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
index 13556f35ce..862be5fb96 100644
--- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
+++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
@@ -41,18 +41,33 @@ class MogoPrivateObuManager private constructor() {
     private var mContext: Context? = null
     private var mObuStatusInfo = ObuStatusInfo()
 
-    fun init(context: Context?) {
+    fun init(context: Context, ipAddress: String) {
         Logger.d(MogoObuConst.TAG_MOGO_OBU, "obuManager初始化--")
         mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
             .navigation(context) as IMogoServiceApis
         mContext = context
         mIMogoMapService = mMogoServiceApis!!.mapServiceApi
 
-        //自研obu
-        MogoObuManager.getInstance().connect(context, mObuStatusInfo.connectIP)
+        connectObu(context, ipAddress)
         MogoObuManager.getInstance().registerListener(mogoObuListener)
     }
 
+    fun connectObu(context: Context, ipAddress: String) {
+        //自研obu初始化
+        mObuStatusInfo.connectIP = ipAddress
+        if (!MogoObuManager.getInstance().isConnected) {
+            MogoObuManager.getInstance().connect(context, mObuStatusInfo.connectIP)
+        } else {
+            MogoObuManager.getInstance().disConnect()
+            try {
+                Thread.sleep(500)
+                MogoObuManager.getInstance().connect(context, mObuStatusInfo.connectIP)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
     private val mogoObuListener: OnMogoObuListener = object : OnMogoObuListener() {
         // OBU连接成功
         override fun onConnected() {
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoOBUConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoOBUConfig.kt
new file mode 100644
index 0000000000..b643234223
--- /dev/null
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoOBUConfig.kt
@@ -0,0 +1,10 @@
+package com.mogo.eagle.core.data.constants
+
+/**
+ * @author xiaoyuzhou
+ * @date 2021/10/11 8:24 下午
+ * OBU 配置常量
+ */
+object MoGoOBUConfig {
+    const val OBU_IP = "OBU_IP"
+}
\ No newline at end of file
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
index 04e8fb422b..0caacad330 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
@@ -373,6 +373,8 @@ public class MogoServicePaths {
     /**
      * 车辆检测 模块
      */
+    @Keep
+    @Deprecated
     public static final String PATH_CHECK = "/check/api";
 
     /**
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/check/ICheckProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/check/ICheckProvider.java
index 57c6d5ef6f..0132954fd9 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/check/ICheckProvider.java
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/check/ICheckProvider.java
@@ -21,7 +21,7 @@ public interface ICheckProvider extends IProvider {
      *
      * @param module
      */
-    void unregisterListener(String module, IMogoCheckListener listener);
+    void unregisterListener(String module);
 
     /**
      * 启动检测模块
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.kt
index 3d29270b93..ae6994c3e5 100644
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.kt
@@ -9,5 +9,6 @@ import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
  */
 interface IMoGoObuProvider : IMoGoFunctionServerProvider {
 
+    fun connect(ipAddress: String)
 
 }
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/check/CallerCheckManager.java b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/check/CallerCheckManager.java
index fd9d82f317..7872fe6290 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/check/CallerCheckManager.java
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/check/CallerCheckManager.java
@@ -35,8 +35,8 @@ public class CallerCheckManager extends CallerBase {
      *
      * @param module
      */
-    public static void unregisterListener(String module, IMogoCheckListener listener) {
-        getCheckProvider().unregisterListener(module, listener);
+    public static void unregisterListener(String module) {
+        getCheckProvider().unregisterListener(module);
     }
 
     /**
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerOBUManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerOBUManager.kt
new file mode 100644
index 0000000000..5258d6b179
--- /dev/null
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerOBUManager.kt
@@ -0,0 +1,28 @@
+package com.mogo.eagle.core.function.call.obu
+
+import com.mogo.eagle.core.data.constants.MogoServicePaths
+import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider
+import com.mogo.eagle.core.function.call.base.CallerBase
+
+/**
+ *@author        xiaoyuzhou
+ *@date          2021/10/11 8:30 下午
+ */
+object CallerOBUManager {
+    private val providerApi: IMoGoObuProvider
+        get() = CallerBase.getApiInstance(
+            IMoGoObuProvider::class.java,
+            MogoServicePaths.PATH_V2X_OBU_MOGO
+        )
+
+
+    /**
+     * 重新设置OBU链接IP
+     *
+     * @param ipAddress      新的IP地址
+     */
+    fun resetObuIpAddress(ipAddress: String) {
+        providerApi.connect(ipAddress)
+    }
+
+}
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/check_error_image.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/check_error_image.png
similarity index 100%
rename from modules/mogo-module-extensions/src/main/res/drawable/check_error_image.png
rename to core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/check_error_image.png
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_check.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml
similarity index 66%
rename from modules/mogo-module-extensions/src/main/res/drawable/module_ext_check.xml
rename to core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml
index 1272a64f7b..fa0dcc73b3 100644
--- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_check.xml
+++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_ext_check.xml
@@ -2,11 +2,11 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size
-        android:width="@dimen/dp_128"
-        android:height="@dimen/dp_128" />
-    //填充
+        android:width="@dimen/module_hmi_check_size"
+        android:height="@dimen/module_hmi_check_size" />
+    <!--//填充-->
     <solid android:color="@color/module_switch_map_bg" />
-    //描边
+    <!--//描边-->
     <stroke
         android:width="2px"
         android:color="@color/module_switch_map_bg" />
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml
similarity index 75%
rename from modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml
rename to core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml
index 5210f310ea..7cb55807e8 100644
--- a/modules/mogo-module-extensions/src/main/res/drawable/module_switch_map_bg.xml
+++ b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_switch_map_bg.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners android:radius="@dimen/module_switch_image_circle" />
+    <corners android:radius="@dimen/module_hmi_btn_size" />
 
     <solid android:color="@color/module_switch_map_bg" />
 
diff --git a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml
index 4fd980836a..a32b5ba646 100644
--- a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -27,5 +27,9 @@
     <dimen name="module_hmi_autopilot_status_bg_sm_radius">30px</dimen>
     <dimen name="module_hmi_autopilot_status_bg_big_radius">70px</dimen>
 
+    <dimen name="module_hmi_check_size">128px</dimen>
+    <dimen name="module_hmi_btn_size">60px</dimen>
+    <dimen name="module_hmi_btn_text_size">44px</dimen>
+
 
 </resources>
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/res/values/color.xml b/core/mogo-core-res/src/main/res/values/color.xml
index 5c0e10bf2e..aa7e6bacf6 100644
--- a/core/mogo-core-res/src/main/res/values/color.xml
+++ b/core/mogo-core-res/src/main/res/values/color.xml
@@ -2,4 +2,7 @@
 <resources>
     <color name="module_mogo_autopilot_status_enable">#FFFFFF</color>
     <color name="module_mogo_autopilot_status_disable">#4DFFFFFF</color>
+
+    <color name="module_switch_map_bg">#323C6F</color>
+
 </resources>
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml
index 3d1a96d9ed..8753a23a7b 100644
--- a/core/mogo-core-res/src/main/res/values/dimens.xml
+++ b/core/mogo-core-res/src/main/res/values/dimens.xml
@@ -26,4 +26,10 @@
 
     <dimen name="module_hmi_autopilot_status_bg_sm_radius">20px</dimen>
     <dimen name="module_hmi_autopilot_status_bg_big_radius">50px</dimen>
+
+    <dimen name="module_hmi_check_size">128px</dimen>
+    <dimen name="module_hmi_btn_size">38px</dimen>
+    <dimen name="module_hmi_btn_text_size">33px</dimen>
+
+
 </resources>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cdc2ce1117..fe371e9cdf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/MogoLauncher.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/MogoLauncher.java
index 293ad08a3e..669a63f78a 100644
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/MogoLauncher.java
+++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/MogoLauncher.java
@@ -17,16 +17,16 @@ public class MogoLauncher implements IMogoLauncher {
 
     @Override
     public void backToLauncher( Context context ) {
-        BackToMainHomeManager.backToLauncher();
+//        BackToMainHomeManager.backToLauncher();
     }
 
     @Override
     public void setFloatButtonVisible( boolean visible ) {
-        if ( visible ) {
-            BackToMainHomeManager.showFloatButton();
-        } else {
-            BackToMainHomeManager.hideFloatButton();
-        }
+//        if ( visible ) {
+//            BackToMainHomeManager.showFloatButton();
+//        } else {
+//            BackToMainHomeManager.hideFloatButton();
+//        }
     }
 
     @Override
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapVrMarkerView.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapVrMarkerView.java
index 82a7c80d2a..2b44871082 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapVrMarkerView.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/marker/MapVrMarkerView.java
@@ -59,7 +59,7 @@ public class MapVrMarkerView implements IMarkerView {
         sRef.put(sceneId, new SoftReference<>(BitmapFactory.decodeResource(AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_taxi)));
         switch (sceneId) {
             case "200001"://后方VIP车辆提示
-//                bitmap = ImageUtil.createBitmap(V2XUtils.getApp(),
+//                bitmap = ImageUtil.createBitmap(Utils.getApp(),
 //                        R.drawable.v2x_duixiang_laiche_che);
                 break;
             case "200002"://前车急刹
@@ -67,7 +67,7 @@ public class MapVrMarkerView implements IMarkerView {
             case "200003"://后方危险车辆预警
                 break;
             case "200004"://逆向车辆路线预判
-//                bitmap = ImageUtil.createBitmap(V2XUtils.getApp(),
+//                bitmap = ImageUtil.createBitmap(Utils.getApp(),
 //                        R.drawable.v2x_duixiang_laiche_che);
                 break;
             case "200005"://VIP变灯通行
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index a6d8f3a39c..825cd22442 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -127,7 +127,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         IMogoStatusChangedListener,
         IMogoIntentListener,
         //        IMogoLocationListener,
-        IMogoCheckListener,
         IMogoCarLocationChangedListener2 {
 
     private static final String TAG = "EntranceFragment";
@@ -240,9 +239,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
     private final AdasNoticeHelper adasNoticeHelper = new AdasNoticeHelper();
     private final CameraLiveNoticeHelper mCameraLiveNoticeHelper = new CameraLiveNoticeHelper();
-    //检测
-    private TextView jumpCheck;
-    private ImageView tipImageView;
 
     @Override
     protected int getLayoutId() {
@@ -394,18 +390,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             enterVrMode();
             localIsVrMode = true;
         }
-        //      //检测入口
-        jumpCheck = findViewById(R.id.module_ext_enter_check);
-        tipImageView = findViewById(R.id.error_tip_image);
-        jumpCheck.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Log.d(TAG, "体检入口");
-                // 启动检测页面
-                CallerCheckManager.startCheckActivity(getContext());
-            }
-        });
-
     }
 
     private int debugPanelClickCount = 0;
@@ -723,9 +707,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
         mMogoRegisterCenter.registerMogoNaviListener(TYPE_ENTRANCE, this);
         mMogoRegisterCenter.registerMogoMapListener(TYPE_ENTRANCE, this);
-        //车辆监控
-        CallerCheckManager.registerVehicleMonitoringListener(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING, this);
-
         mMogoMarkerManager = mService.getMarkerManager(getContext());
 
         mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.UPLOADING, this);
@@ -774,7 +755,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         mCameraLiveNoticeHelper.release();
         MogoApisHandler.getInstance().getApis().getRegisterCenterApi()
                 .unregisterCarLocationChangedListener(TAG, this);
-        CallerCheckManager.unregisterListener(MogoReceiver.ACTION_CHECK_VEHICLE_MONITORING, this);
+
     }
 
     @Override
@@ -1401,14 +1382,4 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
     }
 
-    @Override
-    public void updateMonitoringStatus(Integer state) {
-        Log.d(TAG, "updateCheckStatus");
-        if (state == 1) {
-            tipImageView.setVisibility(View.INVISIBLE);
-        } else {
-            tipImageView.setVisibility(View.VISIBLE);
-        }
-    }
-
 }
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index 4a54127863..87a059af77 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -319,30 +319,6 @@
             android:textStyle="bold" />
     </LinearLayout>
 
-    <!--车辆检测入口-->
-    <TextView
-        android:id="@+id/module_ext_enter_check"
-        android:layout_width="@dimen/dp_128"
-        android:layout_height="@dimen/dp_128"
-        android:layout_marginRight="@dimen/dp_33"
-        android:layout_marginBottom="@dimen/dp_476"
-        android:background="@drawable/module_ext_check"
-        android:gravity="center"
-        android:text="检测"
-        android:textColor="#fff"
-        android:textSize="@dimen/module_ext_enter_vr_mode_text_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
-
-    <ImageView
-        android:id="@+id/error_tip_image"
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:visibility="invisible"
-        android:src="@drawable/check_error_image"
-        app:layout_constraintRight_toRightOf="@+id/module_ext_enter_check"
-        app:layout_constraintTop_toTopOf="@+id/module_ext_enter_check" />
-
     <TextView
         android:id="@+id/module_ext_enter_vr_mode"
         android:layout_width="@dimen/module_ext_operation_panel_share_width"
diff --git a/modules/mogo-module-obu/build.gradle b/modules/mogo-module-obu/build.gradle
index 94a783e44a..85ac0cdd0d 100644
--- a/modules/mogo-module-obu/build.gradle
+++ b/modules/mogo-module-obu/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     implementation rootProject.ext.dependencies.rxjava
     implementation rootProject.ext.dependencies.rxandroid
     implementation rootProject.ext.dependencies.obusdk
-    implementation rootProject.ext.dependencies.crashwarning
+    implementation rootProject.ext.dependencies.carmanager
 
     if (Boolean.valueOf(RELEASE)) {
         implementation rootProject.ext.dependencies.modulecommon
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseActivity.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseActivity.java
deleted file mode 100644
index 907a9685dc..0000000000
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/base/BaseActivity.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.mogo.module.navi.ui.base;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import com.mogo.utils.SoftKeyBoardJobber;
-import com.mogo.utils.statusbar.Eyes;
-
-/**
- * @author congtaowang
- * @since 2019-10-02
- * <p>
- * 地图 activity 基类
- */
-public class BaseActivity extends AppCompatActivity {
-
-    //@Override
-    //public Context getContext() {
-    //    return this;
-    //}
-
-    @Override
-    protected void onCreate( @Nullable Bundle savedInstanceState ) {
-        super.onCreate( savedInstanceState );
-        Eyes.setStatusBarStyle( this, false, Color.parseColor( "#66000000" ), true );
-        getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN );
-        hideSystemUI();
-    }
-
-    protected void hideSystemUI() {
-        //隐藏虚拟按键
-        if ( Build.VERSION.SDK_INT > 11 && Build.VERSION.SDK_INT < 19 ) { // lower api
-            View v = this.getWindow().getDecorView();
-            v.setSystemUiVisibility( View.GONE );
-        } else if ( Build.VERSION.SDK_INT >= 19 ) {
-            //for new api versions.
-            View decorView = getWindow().getDecorView();
-            int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
-            decorView.setSystemUiVisibility( uiOptions );
-        }
-    }
-
-    protected boolean enableDispatchTouchEventToDismissSoftKeyBoard() {
-        return true;
-    }
-
-    @Override
-    public boolean dispatchTouchEvent( MotionEvent ev ) {
-        if ( ev.getAction() == MotionEvent.ACTION_DOWN && enableDispatchTouchEventToDismissSoftKeyBoard() ) {
-            SoftKeyBoardJobber.hideIfNecessary( this, ev );
-            return super.dispatchTouchEvent( ev );
-        }
-        // 必不可少，否则所有的组件都不会有TouchEvent了
-        if ( getWindow().superDispatchTouchEvent( ev ) ) {
-            return true;
-        }
-        return onTouchEvent( ev );
-    }
-}
diff --git a/modules/mogo-module-v2x/build.gradle b/modules/mogo-module-v2x/build.gradle
index 3c8a5b9bb1..0bde78a634 100644
--- a/modules/mogo-module-v2x/build.gradle
+++ b/modules/mogo-module-v2x/build.gradle
@@ -86,6 +86,7 @@ dependencies {
         implementation project(':modules:mogo-module-obu')
 
         implementation project(':core:mogo-core-res')
+        implementation project(':core:mogo-core-utils')
         implementation project(':core:mogo-core-data')
         implementation project(':core:mogo-core-function-call')
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
index f132f98f2e..d9e5e45f51 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
@@ -16,6 +16,8 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.TimeUtils;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.marker.IMogoMarker;
@@ -40,9 +42,7 @@ import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
 import com.mogo.module.v2x.scenario.scene.livecar.V2XVoiceCallLiveBiz;
 import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkWindow;
 import com.mogo.module.v2x.utils.FatigueDrivingUtils;
-import com.mogo.module.v2x.utils.TimeUtils;
 import com.mogo.module.v2x.utils.TrackUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
 import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.module.IMogoModuleProvider;
@@ -137,7 +137,6 @@ public class V2XModuleProvider implements
         TXCLog.setLevel(TXCLog.LOG_NONE);
         TXCLog.setConsoleEnabled(false);
 
-        V2XUtils.init(context);
         V2XServiceManager.init(context);
         V2XVoiceManager.INSTANCE.init(context);
         registerListener();
@@ -165,13 +164,13 @@ public class V2XModuleProvider implements
     private void initData() {
         try {
             // 查询ACC状态
-            SharedPrefsMgr.getInstance(V2XUtils.getApp()).putBoolean("descriptor_ACC_STATUS", isAccOn());
+            SharedPrefsMgr.getInstance(Utils.getApp()).putBoolean("descriptor_ACC_STATUS", isAccOn());
             if (isAccOn()) {
                 // 记录开机时间
                 FatigueDrivingUtils.refreshAccOnTime();
             } else {
                 // 记录关机时间
-                SharedPrefsMgr.getInstance(V2XUtils.getApp())
+                SharedPrefsMgr.getInstance(Utils.getApp())
                         .putString(V2XConst.V2X_ACC_OFF_TIME_STR, TimeUtils.getNowString());
             }
         } catch (Exception e) {
@@ -199,7 +198,7 @@ public class V2XModuleProvider implements
                         V2XStrategyPushRes.ResultBean resultBean = result.getResult();
                         if (resultBean != null) {
                             // 更新本地的v2x提醒策略
-                            SharedPrefsMgr.getInstance(V2XUtils.getApp())
+                            SharedPrefsMgr.getInstance(Utils.getApp())
                                     .putString(V2XConst.V2X_STRATEGY_PUSH, GsonUtil.jsonFromObject(resultBean));
                         }
                     }
@@ -326,7 +325,7 @@ public class V2XModuleProvider implements
     public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
         Logger.d(MODULE_NAME, "状态发生改变\ndescriptor:" + descriptor + "\nisTrue:" + isTrue);
         // 记录状态更改
-        SharedPrefsMgr.getInstance(V2XUtils.getApp()).putBoolean("descriptor_" + descriptor, isTrue);
+        SharedPrefsMgr.getInstance(Utils.getApp()).putBoolean("descriptor_" + descriptor, isTrue);
         if (descriptor == StatusDescriptor.ACC_STATUS) {
             if (isTrue) {
                 // 刷新配置文件
@@ -340,7 +339,7 @@ public class V2XModuleProvider implements
                 }
             } else {
                 // 记录关机时间
-                SharedPrefsMgr.getInstance(V2XUtils.getApp())
+                SharedPrefsMgr.getInstance(Utils.getApp())
                         .putString(V2XConst.V2X_ACC_OFF_TIME_STR, TimeUtils.getNowString());
             }
         } else if (descriptor == StatusDescriptor.SEEK_HELPING) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
index 8285bddf6b..2c16ce0ab9 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
@@ -2,6 +2,7 @@ package com.mogo.module.v2x;
 
 import android.content.Context;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.location.IMogoLocationClient;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.navi.IMogoNavi;
@@ -16,7 +17,6 @@ import com.mogo.module.v2x.manager.IMoGoV2XPolylineManager;
 import com.mogo.module.v2x.manager.IMoGoV2XStatusManager;
 import com.mogo.module.v2x.manager.IMoGoWarnPolylineManager;
 import com.mogo.module.v2x.network.V2XRefreshModel;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.adas.IMogoADASController;
@@ -263,7 +263,7 @@ public class V2XServiceManager {
 
     public static IMoGoV2XStatusManager getMoGoV2XStatusManager() {
         if (moGoV2XStatusManager == null) {
-            moGoV2XStatusManager = (IMoGoV2XStatusManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STATUS_MANAGER).navigation(V2XUtils.getApp());
+            moGoV2XStatusManager = (IMoGoV2XStatusManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STATUS_MANAGER).navigation(Utils.getApp());
         }
         return moGoV2XStatusManager;
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
index f32e6f6cd2..5ea6876be8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
@@ -9,6 +9,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.TimeUtils;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.navi.MogoTraffic;
@@ -20,10 +22,8 @@ import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
 import com.mogo.module.v2x.utils.ChartingUtil;
 import com.mogo.module.v2x.utils.RoadConditionUtils;
-import com.mogo.module.v2x.utils.TimeUtils;
 import com.mogo.module.v2x.utils.TrackUtils;
 import com.mogo.module.v2x.utils.V2XSQLiteUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.carchattingprovider.CallChattingProviderConstant;
@@ -75,7 +75,7 @@ public abstract class V2XBaseViewHolder<T>
      */
     public void triggerZan(MarkerExploreWay noveltyInfo) {
         try {
-            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已点赞", null);
+            AIAssist.getInstance(Utils.getApp()).speakTTSVoice("已点赞", null);
             showTip("已点赞");
             if (noveltyInfo != null) {
                 // 调用网络API接口
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
index 80b8f7aaaf..a56f476a98 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
@@ -18,7 +19,6 @@ import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -120,7 +120,7 @@ public class V2XEventUgcVH extends V2XBaseViewHolder<V2XEventShowEntity> {
 
                 if (ugcTitleStr != null) {
                     tvEventUgcTitle.setText(((String) ugcTitleStr[0]).replace("####", mNoveltyInfo.getAddr()));
-                    AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice((String) ugcTitleStr[1], new IMogoVoiceCmdCallBack() {
+                    AIAssist.getInstance(Utils.getApp()).speakTTSVoice((String) ugcTitleStr[1], new IMogoVoiceCmdCallBack() {
                         @Override
                         public void onSpeakEnd(String speakText) {
                             // 注册语音交互
@@ -188,7 +188,7 @@ public class V2XEventUgcVH extends V2XBaseViewHolder<V2XEventShowEntity> {
             dataStatistics(2);
         }
 
-        AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("谢谢，您的反馈将帮助更多车友。", null);
+        AIAssist.getInstance(Utils.getApp()).speakTTSVoice("谢谢，您的反馈将帮助更多车友。", null);
         V2XServiceManager
                 .getV2XRefreshModel()
                 .manualMarkingTrafficJam(
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java
index d6b8f76e3f..b9af1a1155 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java
@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.SpanUtils;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.V2XEventShowEntity;
@@ -16,7 +17,6 @@ import com.mogo.module.service.Utils;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
 import com.mogo.module.v2x.utils.LocationUtils;
-import com.mogo.module.v2x.utils.SpanUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java
index d75f897427..e986afb070 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XHistoryBaseViewHolder.java
@@ -9,6 +9,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.TimeUtils;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.navi.IMogoNaviListener;
 import com.mogo.map.navi.MogoNaviInfo;
 import com.mogo.map.navi.MogoTraffic;
@@ -19,10 +21,8 @@ import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.utils.ChartingUtil;
 import com.mogo.module.v2x.utils.RoadConditionUtils;
-import com.mogo.module.v2x.utils.TimeUtils;
 import com.mogo.module.v2x.utils.TrackUtils;
 import com.mogo.module.v2x.utils.V2XSQLiteUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.carchattingprovider.CallChattingProviderConstant;
@@ -67,7 +67,7 @@ public abstract class V2XHistoryBaseViewHolder<T>
      */
     public void triggerZan(MarkerExploreWay noveltyInfo) {
         try {
-            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已点赞", null);
+            AIAssist.getInstance(Utils.getApp()).speakTTSVoice("已点赞", null);
             showTip("已点赞");
             if (noveltyInfo != null) {
                 // 调用网络API接口
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
index 86cb6e3363..3fc4042890 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.utilcode.util.SpanUtils;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.MarkerUserInfo;
@@ -21,7 +22,6 @@ import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
 import com.mogo.module.v2x.utils.ChartingUtil;
-import com.mogo.module.v2x.utils.SpanUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRecommendRouteVH.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRecommendRouteVH.kt
index 924d0b0ea0..a6afb1e7e9 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRecommendRouteVH.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRecommendRouteVH.kt
@@ -8,12 +8,12 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.mogo.commons.voice.AIAssist
 import com.mogo.commons.voice.VoicePreemptType
+import com.mogo.eagle.core.utilcode.util.Utils
 import com.mogo.module.common.entity.MarkerExploreWay
 import com.mogo.module.common.entity.MarkerLocation
 import com.mogo.module.common.entity.V2XEventShowEntity
 import com.mogo.module.v2x.R
 import com.mogo.module.v2x.scenario.view.IV2XWindow
-import com.mogo.module.v2x.utils.V2XUtils
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener
 import com.mogo.module.v2x.voice.V2XVoiceConstants
 import com.mogo.module.v2x.voice.V2XVoiceManager.registerUnWakeVoice
@@ -52,7 +52,7 @@ class V2XRecommendRouteVH(viewGroup: ViewGroup, v2XWindow: IV2XWindow<*>) : V2XB
 
             override fun onViewDetachedFromWindow(view: View) {
                 unRegisterUnwakeNavi()
-                AIAssist.getInstance(V2XUtils.getApp()).breakOffSpeak()
+                AIAssist.getInstance(Utils.getApp()).breakOffSpeak()
                 mainScope.cancel()
             }
         })
@@ -67,7 +67,7 @@ class V2XRecommendRouteVH(viewGroup: ViewGroup, v2XWindow: IV2XWindow<*>) : V2XB
             mNoveltyInfo = MarkerExploreWay()
             mNoveltyInfo?.setLocation(markerLocation)
             mTvAddress!!.text = "前往 ${it.getV2XRecommendRouteEntity().formatAddress}"
-            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(it.getV2XRecommendRouteEntity().tts, VoicePreemptType.PREEMPT_TYPE_IMMEADIATELY, null)
+            AIAssist.getInstance(Utils.getApp()).speakTTSVoice(it.getV2XRecommendRouteEntity().tts, VoicePreemptType.PREEMPT_TYPE_IMMEADIATELY, null)
         }
 
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
index 8d93c4ca01..26726df4b3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
@@ -8,6 +8,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.utilcode.util.SpanUtils;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.MarkerUserInfo;
@@ -17,7 +18,6 @@ import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.fragment.V2XEventPanelFragment;
 import com.mogo.module.v2x.utils.ChartingUtil;
-import com.mogo.module.v2x.utils.SpanUtils;
 import com.mogo.module.v2x.utils.V2XSQLiteUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.imageloader.MogoImageView;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
index 964b7c590a..9715e104e2 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
@@ -6,13 +6,13 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.mogo.eagle.core.utilcode.util.TimeUtils;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XHistoryScenarioData;
 import com.mogo.module.common.enums.EventTypeEnum;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.utils.RoadConditionUtils;
-import com.mogo.module.v2x.utils.TimeUtils;
 import com.mogo.module.v2x.utils.V2XSQLiteUtils;
 import com.mogo.module.v2x.view.HeartLikeView;
 import com.mogo.module.v2x.view.HeartUnLikeView;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
index e59a99107b..447f67d811 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
@@ -3,6 +3,8 @@ package com.mogo.module.v2x.alarm;
 import android.text.TextUtils;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.constant.TimeConstants;
+import com.mogo.eagle.core.utilcode.util.TimeUtils;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoGeocodeResult;
@@ -24,9 +26,6 @@ import com.mogo.module.v2x.entity.net.V2XStrategyPushRes;
 import com.mogo.module.v2x.utils.DrivingDirectionUtils;
 import com.mogo.module.v2x.utils.FatigueDrivingUtils;
 import com.mogo.module.v2x.utils.LocationUtils;
-import com.mogo.module.v2x.utils.TimeConstants;
-import com.mogo.module.v2x.utils.TimeUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.utils.ArrayUtils;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
@@ -183,7 +182,7 @@ public class V2XAlarmServer {
             //Logger.i(V2XConst.MODULE_NAME, "车机已经开机: " + drivingTime + " 分钟");
 
             V2XStrategyPushRes.ResultBean strategyPushEntity =
-                    GsonUtil.objectFromJson(SharedPrefsMgr.getInstance(V2XUtils.getApp())
+                    GsonUtil.objectFromJson(SharedPrefsMgr.getInstance(com.mogo.eagle.core.utilcode.util.Utils.getApp())
                             .getString(V2XConst.V2X_STRATEGY_PUSH), V2XStrategyPushRes.ResultBean.class);
 
             V2XPushMessageEntity drivingShowEntity = new V2XPushMessageEntity();
@@ -264,7 +263,7 @@ public class V2XAlarmServer {
                     MogoPoiSearchQuery poiSearchQuery = new MogoPoiSearchQuery(keyword, keyword);
                     poiSearchQuery.setPageSize(5);
                     poiSearchQuery.setLocation(LocationUtils.getCurrentLatLon());
-                    IMogoPoiSearch poiSearch = V2XServiceManager.getMapService().getPoiSearch(V2XUtils.getApp(), poiSearchQuery);
+                    IMogoPoiSearch poiSearch = V2XServiceManager.getMapService().getPoiSearch(com.mogo.eagle.core.utilcode.util.Utils.getApp(), poiSearchQuery);
                     boolean finalIsHighWay = isHighWay;
                     poiSearch.setPoiSearchListener(new IMogoPoiSearchListener() {
                         @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java
index c3b2e07a9c..21ba9df67d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XEarlyWarningServer.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.V2XMessageEntity;
@@ -11,7 +12,6 @@ import com.mogo.module.common.entity.V2XRoadEventEntity;
 import com.mogo.module.common.enums.EventTypeEnum;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.utils.DrivingDirectionUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 
 import java.util.ArrayList;
 import java.util.Set;
@@ -84,7 +84,7 @@ public class V2XEarlyWarningServer {
                                 // 弹出UGC
                                 Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
                                 intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity);
-                                LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
+                                LocalBroadcastManager.getInstance(Utils.getApp()).sendBroadcast(intent);
 
                             }
                             // 移出已经预警的事件列表
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
index c922ca3394..e7e59e067a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
@@ -11,6 +11,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.utilcode.util.ThreadUtils;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XHistoryScenarioData;
 import com.mogo.module.v2x.R;
 import com.mogo.module.common.view.SpacesItemDecoration;
@@ -19,7 +21,6 @@ import com.mogo.module.v2x.adapter.V2XScenarioHistoryAdapter;
 import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener;
 import com.mogo.module.v2x.manager.V2XStatusDescriptor;
 import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter;
-import com.mogo.module.v2x.utils.ThreadUtils;
 import com.mogo.module.v2x.utils.V2XSQLiteUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.view.V2XListEmptyView;
@@ -143,12 +144,12 @@ public class V2XScenarioHistoryFragment
      * */
     private void ttsForHistoryFirstToday() {
         boolean hasBroadTts = V2XUtils.isFirstTodayWithKey("TTS_FOR_HISTORY_SELECTED");
-        if (hasBroadTts == false) {
+        if (!hasBroadTts) {
             if (mV2XHistoryScenarioData.size() > 0) {
-                AIAssist.getInstance(V2XUtils.getApp()).
+                AIAssist.getInstance(Utils.getApp()).
                         speakTTSVoice("小智为您记录了今天的出行事件", null);
             } else {
-                AIAssist.getInstance(V2XUtils.getApp()).
+                AIAssist.getInstance(Utils.getApp()).
                         speakTTSVoice("小智在这里为您记录今天的出行事件", null);
             }
 
@@ -160,10 +161,10 @@ public class V2XScenarioHistoryFragment
      * */
     public void ttsForVoiceCheckout() {
         if (mV2XHistoryScenarioData.size() > 0) {
-            AIAssist.getInstance(V2XUtils.getApp()).
+            AIAssist.getInstance(Utils.getApp()).
                     speakTTSVoice("为您找到以下动态请查看", null);
         } else {
-            AIAssist.getInstance(V2XUtils.getApp()).
+            AIAssist.getInstance(Utils.getApp()).
                     speakTTSVoice("今天暂无出行动态，试试对我说分享拥堵给其他车友吧", null);
         }
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 36358890b3..864cf9a72e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -12,6 +12,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.utilcode.util.ThreadUtils;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.view.LinearLayoutCommonManager;
 import com.mogo.module.v2x.R;
 import com.mogo.module.common.view.SpacesItemDecoration;
@@ -24,7 +26,6 @@ import com.mogo.module.v2x.listener.AdapterCallback;
 import com.mogo.module.v2x.network.V2XRefreshCallback;
 import com.mogo.module.v2x.network.V2XShareNetworkModel;
 import com.mogo.module.v2x.presenter.ShareEventsPresenter;
-import com.mogo.module.v2x.utils.ThreadUtils;
 import com.mogo.module.common.view.NetworkLoadingView;
 import com.mogo.module.v2x.utils.V2XUtils;
 
@@ -158,7 +159,7 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
             ttsString = "您目前已完成" + shareNum + "次分享，获得" + approveNum + "次车友认同，热心指数" + enthusiasm
                     + "颗星，实至名归，老铁你就是大家一直赞扬的热心车友，请继续保持。";
         }
-        AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(ttsString, null);
+        AIAssist.getInstance(Utils.getApp()).speakTTSVoice(ttsString, null);
         fromVoice = false;
     }
 
@@ -237,8 +238,8 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
     private void ttsForSharedFirstToday() {
         boolean hasBroadTts = V2XUtils.isFirstTodayWithKey("TTS_FOR_SHARED_SELECTED");
         Log.d(TAG,"shouldBroadTts"+hasBroadTts);
-        if (hasBroadTts == false) {
-            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("您可以在这里查看历史的分享记录", null);
+        if (!hasBroadTts) {
+            AIAssist.getInstance(Utils.getApp()).speakTTSVoice("您可以在这里查看历史的分享记录", null);
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
index 7e5f145af1..96a6c99fd2 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
@@ -28,6 +28,7 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.anim.OnMarkerAnimationListener;
 import com.mogo.module.common.entity.MarkerExploreWay;
@@ -213,7 +214,7 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
         boolean hasBroadTts = V2XUtils.isFirstTodayWithKey("TTS_FOR_SURROUNDING_SELECTED");
         if (!hasBroadTts) {
             if (eventCount > 0) {
-                AIAssist.getInstance(V2XUtils.getApp()).
+                AIAssist.getInstance(Utils.getApp()).
                         speakTTSVoice("发现周边" + eventCount + "条交通信息", null);
             } else {
                 Logger.e(TAG,"周边没有发现交通信息");
@@ -226,10 +227,10 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
      * */
     public void ttsForVoiceCheckout() {
         if (poiInfosList.size() > 0) {
-            AIAssist.getInstance(V2XUtils.getApp()).
+            AIAssist.getInstance(Utils.getApp()).
                     speakTTSVoice("为您找到周边以下事件请查看", null);
         } else {
-            AIAssist.getInstance(V2XUtils.getApp()).
+            AIAssist.getInstance(Utils.getApp()).
                     speakTTSVoice("周边5公里内无事件，试试对我说分享路况给其他车友吧", null);
         }
     }
@@ -380,10 +381,10 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
                     e.printStackTrace();
                 }
             }
-            /*
+            /**
              * 子类信息tts播报
-             * */
-            AIAssist.getInstance(V2XUtils.getApp()).
+             */
+            AIAssist.getInstance(Utils.getApp()).
                     speakTTSVoice(construction.getTypeNameTTS(construction.getPoiType()), null);
         }
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
index 39d51de21f..13bc1eb85f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
@@ -1,12 +1,12 @@
 package com.mogo.module.v2x.listener;
 
+import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
 import com.mogo.module.v2x.utils.ADASUtils;
 import com.mogo.module.v2x.utils.MarkerUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
@@ -33,7 +33,7 @@ public class V2XMessageListener_401003 implements IMogoOnMessageListener<V2XPush
     @Override
     public void onMsgReceived(V2XPushMessageEntity message) {
         Logger.i(MODULE_NAME, "V2XMessageListener_401003：" + GsonUtil.jsonFromObject(message));
-        V2XUtils.runOnUiThread(() -> {
+        ThreadUtils.runOnUiThread(() -> {
             try {
                 handlerV2XAlarm(message);
             } catch (Exception e) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
index eadd44a9a4..5f3a1a6f9a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java
@@ -1,5 +1,6 @@
 package com.mogo.module.v2x.listener;
 
+import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.enums.EventTypeEnum;
 import com.mogo.module.v2x.V2XConst;
@@ -8,7 +9,6 @@ import com.mogo.module.v2x.entity.net.V2XSpecialCarRes;
 import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
 import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
 import com.mogo.module.v2x.utils.MarkerUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
@@ -35,7 +35,7 @@ public class V2XMessageListener_401005 implements IMogoOnMessageListener<V2XSpec
     public void onMsgReceived(V2XSpecialCarRes message) {
         Logger.i(MODULE_NAME, "V2XMessageListener_401005：" + GsonUtil.jsonFromObject(message));
         if (!V2XServiceManager.getMoGoV2XStatusManager().isRoadEventWindowShow()) {
-            V2XUtils.runOnBackgroundThread(() -> {
+            ThreadUtils.getSinglePool().execute(() -> {
                 try {
                     MarkerUtils.handlerV2XSpecialVehicleMarker(
                             message,
@@ -72,7 +72,7 @@ public class V2XMessageListener_401005 implements IMogoOnMessageListener<V2XSpec
             }
         }
         if (!entityList.isEmpty()) {
-            V2XUtils.runOnUiThread(() -> {
+            ThreadUtils.runOnUiThread(() -> {
                 V2XMessageEntity<List<V2XMarkerEntity>> v2XMessageEntity = new V2XMessageEntity<>();
                 v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING);
                 v2XMessageEntity.setContent(entityList);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401011.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401011.java
index 27f43b6aab..a0d3340f14 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401011.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401011.java
@@ -1,9 +1,9 @@
 package com.mogo.module.v2x.listener;
 
+import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.module.common.entity.MarkerCardResult;
 import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 
 /**
@@ -24,7 +24,7 @@ public class V2XMessageListener_401011 implements IMogoOnMessageListener<MarkerR
     public void onMsgReceived(MarkerResponse response) {
         //Logger.d(MODULE_NAME, "V2XMessageListener_401011==V2X地图气泡数据刷新：\n" + GsonUtil.jsonFromObject(response));
         if (!V2XServiceManager.getMoGoV2XStatusManager().isRoadEventWindowShow()) {
-            V2XUtils.runOnBackgroundThread(() -> {
+            ThreadUtils.getSinglePool().execute(() -> {
                 // 解析不同的Marker类型，然后对应的进行绘制
                 if (response != null && response.getResult() != null) {
                     MarkerCardResult markerCardResult = response.getResult();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
index 6cd710a9cd..3ccac841d5 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401012.java
@@ -1,10 +1,14 @@
 package com.mogo.module.v2x.listener;
 
+import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
+
 import android.content.Intent;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.constant.TimeConstants;
+import com.mogo.eagle.core.utilcode.util.TimeUtils;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.entity.MarkerCardResult;
 import com.mogo.module.common.entity.MarkerExploreWay;
@@ -15,16 +19,11 @@ import com.mogo.module.service.Utils;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.alarm.V2XAlarmServer;
-import com.mogo.module.v2x.utils.TimeConstants;
-import com.mogo.module.v2x.utils.TimeUtils;
 import com.mogo.module.v2x.utils.TrackUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
 
-import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
-
 /**
  * author : donghongyu
  * e-mail : 1358506549@qq.com
@@ -83,7 +82,7 @@ public class V2XMessageListener_401012 implements IMogoOnMessageListener<MarkerC
 
                     Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
                     intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity);
-                    LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
+                    LocalBroadcastManager.getInstance(com.mogo.eagle.core.utilcode.util.Utils.getApp()).sendBroadcast(intent);
                 }
             } else {
                 Logger.e(MODULE_NAME, "V2XMessageListener_401012==V2X服务端下发：消息已过期，大于3分钟了不进行消费");
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java
index 8e1485733a..60e7c61dc2 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java
@@ -5,10 +5,11 @@ import android.util.Log;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.mogo.eagle.core.utilcode.util.ThreadUtils;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XWarningEntity;
 import com.mogo.module.v2x.V2XConst;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 
 /**
@@ -24,7 +25,7 @@ public class V2XMessageListener_401018 implements IMogoOnMessageListener<V2XWarn
     @Override
     public void onMsgReceived(V2XWarningEntity info) {
         Log.d(V2XConst.MODULE_NAME, "V2XWarnMessageListener  onMsgReceived ---11---> ");
-        V2XUtils.runOnBackgroundThread(() -> {
+        ThreadUtils.getSinglePool().execute(() -> {
             // 解析不同的Marker类型，然后对应的进行绘制
             if (info != null) {
                 // 解析存储道路事件
@@ -36,7 +37,7 @@ public class V2XMessageListener_401018 implements IMogoOnMessageListener<V2XWarn
                 v2xMessageEntity.setContent(info);
                 Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
                 intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity);
-                LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
+                LocalBroadcastManager.getInstance(Utils.getApp()).sendBroadcast(intent);
             }
         });
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
index fc5b1d3d63..e062dda858 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402000.java
@@ -4,10 +4,10 @@ import android.content.Intent;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.cloud.socket.IMogoOnMessageListener;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
@@ -43,7 +43,7 @@ public class V2XMessageListener_402000 implements IMogoOnMessageListener<V2XOpti
 
             Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
             intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity);
-            LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
+            LocalBroadcastManager.getInstance(Utils.getApp()).sendBroadcast(intent);
         }
 
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt
index 29f371e622..9a4e9c3a2f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_404000.kt
@@ -2,14 +2,14 @@ package com.mogo.module.v2x.listener
 
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
 import com.mogo.eagle.core.data.traffic.TrafficData
-import com.mogo.service.cloud.socket.IMogoOnMessageListener
 import com.mogo.eagle.core.data.v2x.AdvanceWarningBean
-import com.mogo.module.v2x.V2XConst
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.module.common.drawer.TrafficMarkerDrawer
 import com.mogo.module.common.enums.EventTypeEnum
-import com.mogo.module.v2x.utils.V2XUtils
+import com.mogo.module.v2x.V2XConst
+import com.mogo.service.cloud.socket.IMogoOnMessageListener
 import com.mogo.utils.logger.Logger
 
 /**
@@ -33,7 +33,7 @@ class V2XMessageListener_404000 : IMogoOnMessageListener<AdvanceWarningBean> {
                 message
             )
         )
-        V2XUtils.runOnUiThread {
+        ThreadUtils.runOnUiThread {
             var trafficData = buildTrafficData(message)
             when (message.status) {
                 1 -> {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
index 9435f98835..316e5e203d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
@@ -3,13 +3,13 @@ package com.mogo.module.v2x.marker;
 import android.content.Context;
 import android.graphics.Bitmap;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.MarkerShowEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
 import com.mogo.module.common.enums.EventTypeEnum;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.utils.ImageUtil;
-import com.mogo.module.v2x.utils.V2XUtils;
 
 import java.util.ArrayList;
 
@@ -186,11 +186,11 @@ public class V2XMarkerAdapter {
      * 获取VR道路事件
      */
     public static Bitmap getV2XVRRoadEventViewPng(V2XPushMessageEntity alarmMessage) {
-        Bitmap bitmap = ImageUtil.createBitmap(V2XUtils.getApp(),
+        Bitmap bitmap = ImageUtil.createBitmap(Utils.getApp(),
                 R.drawable.v_to_x_warning_car_orange);
         switch (alarmMessage.getSceneId()) {
             case "200001"://后方VIP车辆提示
-//                bitmap = ImageUtil.createBitmap(V2XUtils.getApp(),
+//                bitmap = ImageUtil.createBitmap(Utils.getApp(),
 //                        R.drawable.v2x_duixiang_laiche_che);
                 break;
             case "200002"://前车急刹
@@ -198,7 +198,7 @@ public class V2XMarkerAdapter {
             case "200003"://后方危险车辆预警
                 break;
             case "200004"://逆向车辆路线预判
-//                bitmap = ImageUtil.createBitmap(V2XUtils.getApp(),
+//                bitmap = ImageUtil.createBitmap(Utils.getApp(),
 //                        R.drawable.v2x_duixiang_laiche_che);
                 break;
             case "200005"://VIP变灯通行
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
index 918222099d..153cc0895c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
@@ -13,6 +13,7 @@ import com.mogo.commons.network.ParamsProvider;
 import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoRegeocodeResult;
@@ -35,7 +36,6 @@ import com.mogo.module.v2x.entity.net.V2XSeekHelpRes;
 import com.mogo.module.v2x.entity.net.V2XStrategyPushRes;
 import com.mogo.module.v2x.entity.net.V2XUserInfoRes;
 import com.mogo.module.v2x.utils.LocationUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.RequestOptions;
 import com.mogo.utils.network.utils.GsonUtil;
@@ -713,7 +713,7 @@ public class V2XRefreshModel {
 
             Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
             intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2xMessageEntity);
-            LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
+            LocalBroadcastManager.getInstance(Utils.getApp()).sendBroadcast(intent);
         }
 
         if (!isSendRecommendRoute && v2XRoadDataRes.getResult().getIllegalParkingData() != null && v2XRoadDataRes.getResult().getIllegalParkingData().size() > 0) {
@@ -736,7 +736,7 @@ public class V2XRefreshModel {
 
                 Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
                 intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-                LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
+                LocalBroadcastManager.getInstance(Utils.getApp()).sendBroadcast(intent);
             } catch (Exception e) {
                 e.printStackTrace();
             }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java
index 95b3b4ea05..43f7cfbd8c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/ScenarioHistoryPresenter.java
@@ -4,7 +4,6 @@ package com.mogo.module.v2x.presenter;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.module.common.entity.V2XHistoryScenarioData;
 import com.mogo.module.v2x.fragment.V2XScenarioHistoryFragment;
-import com.mogo.module.v2x.utils.ThreadUtils;
 import com.mogo.module.v2x.utils.V2XSQLiteUtils;
 import com.mogo.utils.WorkThreadHandler;
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java
index 921254d6b3..0071e5c1a2 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java
@@ -1,23 +1,18 @@
 package com.mogo.module.v2x.scenario.impl;
 
 import android.text.TextUtils;
-import android.util.Log;
 
 import androidx.annotation.Nullable;
 
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.commons.voice.VoicePreemptType;
-import com.mogo.module.common.MogoApisHandler;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.service.receiver.MogoReceiver;
-import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.scenario.IV2XScenario;
 import com.mogo.module.v2x.scenario.view.IV2XButton;
 import com.mogo.module.v2x.scenario.view.IV2XMarker;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
-import com.mogo.module.v2x.utils.V2XUtils;
-import com.mogo.service.v2x.IV2XWindowManagerListener;
 import com.mogo.utils.logger.Logger;
 
 /**
@@ -60,7 +55,7 @@ public abstract class AbsV2XScenario<T> implements IV2XScenario {
     public void speakTTSVoice(@Nullable String msg, IMogoVoiceCmdCallBack callBack) {
         if (!TextUtils.isEmpty(msg)) {
             Logger.d(TAG, "调用TTS播放语音：" + msg);
-            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(msg, VoicePreemptType.PREEMPT_TYPE_IMMEADIATELY, callBack);
+            AIAssist.getInstance(Utils.getApp()).speakTTSVoice(msg, VoicePreemptType.PREEMPT_TYPE_IMMEADIATELY, callBack);
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
index 534fd66f54..6318626f00 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
@@ -4,6 +4,8 @@ import android.content.Intent;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.mogo.eagle.core.utilcode.util.ThreadUtils;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.V2XMessageEntity;
@@ -23,10 +25,8 @@ import com.mogo.module.v2x.scenario.scene.route.V2XOptimalRouteVREventScenario;
 import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpScenario;
 import com.mogo.module.v2x.scenario.scene.ugc.V2XEventUgcScenario;
 import com.mogo.module.v2x.scenario.scene.warning.V2XFrontWarningScenario;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
-import com.mogo.utils.network.utils.GsonUtil;
 
 import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_RECOMMEND_PARKING;
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -63,14 +63,14 @@ public class V2XScenarioManager implements IV2XScenarioManager {
         try {
             synchronized (V2XScenarioManager.class) {
                 // 展示
-                V2XUtils.runOnUiThread(() -> {
+                ThreadUtils.runOnUiThread(() -> {
                     // 提取之前存储的场景
                     if (v2XMessageEntity != null) {
                         sceneChange();
                         // 广播给应用内部其它模块
                         Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION);
                         intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity);
-                        LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
+                        LocalBroadcastManager.getInstance(Utils.getApp()).sendBroadcast(intent);
                         // 如果没有拿到之前的，根据类型分发
                         switch (v2XMessageEntity.getType()) {
                             case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING:
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/V2XRecommendParkingLotScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/V2XRecommendParkingLotScenario.java
deleted file mode 100644
index b3b5cd8daa..0000000000
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/V2XRecommendParkingLotScenario.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.mogo.module.v2x.scenario.scene.destination;
-
-/**
- * 基于目的地违章高发情况的停车推荐
- * http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48958095
- */
-public class V2XRecommendParkingLotScenario {
-}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/V2XRecommendRouteScenario.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/V2XRecommendRouteScenario.kt
index 01b1cb6788..5552db310b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/V2XRecommendRouteScenario.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/destination/V2XRecommendRouteScenario.kt
@@ -1,12 +1,12 @@
 package com.mogo.module.v2x.scenario.scene.destination
 
 import android.view.ViewGroup
+import com.mogo.eagle.core.utilcode.util.Utils
 import com.mogo.module.common.entity.V2XMessageEntity
 import com.mogo.module.common.entity.V2XRecommendRouteEntity
 import com.mogo.module.v2x.R
 import com.mogo.module.v2x.V2XServiceManager
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario
-import com.mogo.module.v2x.utils.V2XUtils
 
 /**
  * created by wujifei on 2020/12/29 17:57
@@ -20,7 +20,7 @@ class V2XRecommendRouteScenario : AbsV2XScenario<V2XRecommendRouteEntity>() {
 
     override fun init(v2XMessageEntity: V2XMessageEntity<V2XRecommendRouteEntity>?) {
         v2XMessageEntity?.content?.let {
-            if (v2XMessageEntity!!.isShowState) {
+            if (v2XMessageEntity.isShowState) {
                 if (!isSameScenario(v2XMessageEntity)) {
                     setV2XMessageEntity(v2XMessageEntity)
                     show()
@@ -43,7 +43,7 @@ class V2XRecommendRouteScenario : AbsV2XScenario<V2XRecommendRouteEntity>() {
     override fun showWindow() {
         v2XWindow?.let {
             val layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                    V2XUtils.getApp().resources.getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground).toInt())
+                    Utils.getApp().resources.getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground).toInt())
             V2XServiceManager.getMogoTopViewManager().addView(it.view, layoutParams)
             it.show(v2XMessageEntity.content)
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
index e7388177c1..3eca175e51 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
@@ -6,13 +6,13 @@ import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -72,7 +72,7 @@ public class V2XFatigueDrivingScenario extends AbsV2XScenario<V2XPushMessageEnti
             ViewGroup.LayoutParams layoutParams =
                     new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
-                            (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
+                            (int) Utils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
             V2XServiceManager
                     .getMogoTopViewManager()
                     .addView(getV2XWindow().getView(), layoutParams, this);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
index 52a0802733..c5a42fd098 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
@@ -3,18 +3,16 @@ package com.mogo.module.v2x.scenario.scene.help;
 import android.content.Intent;
 import android.os.CountDownTimer;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.eagle.core.utilcode.util.ThreadUtils;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
-import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpWindow;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -100,7 +98,7 @@ public class V2XCarForHelpScenario extends AbsV2XScenario<Boolean> implements IM
     public void showButton() {
         Logger.d(TAG, "打开自车求助按钮!");
         // 设置Button的显示
-        V2XUtils.runOnUiThread(() -> {
+        ThreadUtils.runOnUiThread(() -> {
             if (getV2XButton() != null) {
                 getV2XButton().setOnActionListener(this::showDialog);
                 getV2XButton().show();
@@ -117,7 +115,7 @@ public class V2XCarForHelpScenario extends AbsV2XScenario<Boolean> implements IM
             V2XServiceManager.getMoGoStatusManager().setSeekHelping(TAG, false);
             if (getV2XButton() != null) {
                 getV2XButton().close();
-                SharedPrefsMgr.getInstance(V2XUtils.getApp()).putLong(V2XConst.SEEK_HELP_TIME, 0);
+                SharedPrefsMgr.getInstance(Utils.getApp()).putLong(V2XConst.SEEK_HELP_TIME, 0);
             }
 
             mySeekHelpCountDownTimerCancel();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
index 9c7a04a9f3..52e4fae828 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
@@ -1,20 +1,18 @@
 package com.mogo.module.v2x.scenario.scene.help;
 
-import android.app.ActionBar;
 import android.content.Intent;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.mogo.commons.data.BaseData;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.network.V2XRefreshCallback;
 import com.mogo.module.v2x.scenario.view.IV2XButton;
 import com.mogo.module.v2x.scenario.view.IV2XButtonListener;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -84,7 +82,7 @@ public class V2XSeekHelpButton implements IV2XButton {
             doAction();
         });
         ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_car_for_help_window_height));
+                (int) Utils.getApp().getResources().getDimension(R.dimen.module_v2x_car_for_help_window_height));
         V2XServiceManager.getMogoTopViewManager().addView(topView, layoutParams);
     }
 
@@ -95,7 +93,7 @@ public class V2XSeekHelpButton implements IV2XButton {
     @Override
     public void close() {
         if (tv != null) {
-            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已取消", null);
+            AIAssist.getInstance(Utils.getApp()).speakTTSVoice("已取消", null);
             tv.setVisibility(View.GONE);
             closeTopView();
             V2XServiceManager.getV2XRefreshModel().cancelHelpSignal(new V2XRefreshCallback<BaseData>() {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java
index 97821c1f1a..87a263f18f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpDialog.java
@@ -10,14 +10,12 @@ import android.widget.TextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.wm.WindowManagerView;
 import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
-import com.mogo.service.entrance.ButtonIndex;
 import com.mogo.utils.logger.Logger;
 
 /**
@@ -89,12 +87,12 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL
 //                        V2XServiceManager.getMogoEntranceButtonController().getButton(ButtonIndex.BUTTON2).getContext()
 //                ).contentView(this).build();
 //            }
-//            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("确定要解除求助状态吗");
+//            AIAssist.getInstance(Utils.getApp()).speakTTSVoice("确定要解除求助状态吗");
 //            unRegisterVoiceCmd();
 //            registerVoiceCmd();
 //            windowManager.show();
             handleLeft();
-            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已取消");
+            AIAssist.getInstance(Utils.getApp()).speakTTSVoice("已取消");
 
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
index d85fd31184..f9ff903ec6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
@@ -6,13 +6,13 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
 import com.mogo.module.v2x.utils.ADASUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.TipToast;
 
@@ -54,9 +54,9 @@ public class V2XPushLiveCarScenario extends AbsV2XScenario<V2XPushMessageEntity>
     @Override
     public void showWindow() {
         if (getV2XWindow() != null) {
-            int width = (int) V2XUtils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
+            int width = (int) Utils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
                     R.dimen.module_v2x_event_window_width_vr : R.dimen.module_v2x_event_window_width);
-            int height = (int) V2XUtils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
+            int height = (int) Utils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
                     R.dimen.module_v2x_event_see_live_window_height_vr : R.dimen.module_v2x_event_see_live_window_height);
             ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(width, height);
             if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
index a42a33ca8f..2d7ac39be0 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
@@ -4,14 +4,12 @@ import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
-import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventScenario;
-import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventWindow;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.logger.Logger;
 
@@ -73,9 +71,9 @@ public class V2XRoadLiveCarScenario extends AbsV2XScenario<List<V2XEventShowEnti
     public void showWindow() {
         Log.d(TAG, getV2XWindow().toString());
         if (getV2XWindow() != null) {
-            int width = (int) V2XUtils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
+            int width = (int) Utils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
                     R.dimen.module_v2x_event_window_width_vr : R.dimen.module_v2x_event_window_width);
-            int height = (int) V2XUtils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
+            int height = (int) Utils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
                     R.dimen.module_v2x_event_see_live_window_height_vr : R.dimen.module_v2x_event_see_live_window_height);
             ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(width, height);
             V2XServiceManager
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
index c15562e7e7..de29649495 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
@@ -10,6 +10,7 @@ import com.mogo.cloud.trafficlive.api.ITrafficIntersectionLiveCallBack;
 import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
@@ -20,7 +21,6 @@ import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
-import com.mogo.module.v2x.utils.ToastUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
 import com.mogo.service.statusmanager.StatusDescriptor;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java
index fe0d7d6c3f..b198be20e3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveScenario.java
@@ -5,13 +5,13 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
@@ -60,9 +60,9 @@ public class V2XVoiceCallLiveScenario extends AbsV2XScenario<V2XPushMessageEntit
     @Override
     public void showWindow() {
         if (getV2XWindow() != null) {
-            int width = (int) V2XUtils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
+            int width = (int) Utils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
                     R.dimen.module_v2x_event_window_width_vr : R.dimen.module_v2x_event_window_width);
-            int height = (int) V2XUtils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
+            int height = (int) Utils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
                     R.dimen.module_v2x_event_see_live_window_height_vr : R.dimen.module_v2x_event_see_live_window_height);
             ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(width, height);
             if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventWindow.java
index 0bf1a5ed0b..8ac6892f33 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/obu/V2XObuEventWindow.java
@@ -17,7 +17,6 @@ import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.listener.V2XWindowStatusListener;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
-import com.mogo.module.v2x.utils.ToastUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.mogo.module.obu.ObuConstant;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java
index b689aa9ef9..8ba3a65b4d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.PagerSnapHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XMessageEntity;
@@ -21,7 +22,6 @@ import com.mogo.module.v2x.adapter.V2XRoadEventAdapter;
 import com.mogo.module.v2x.listener.V2XWindowStatusListener;
 import com.mogo.module.v2x.scenario.scene.V2XBasWindow;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
-import com.mogo.module.v2x.utils.V2XUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -123,7 +123,7 @@ public class V2XIllegalParkWindow extends V2XBasWindow implements IV2XWindow<Mar
         ViewGroup.LayoutParams layoutParams =
                 new ViewGroup.LayoutParams(
                         ViewGroup.LayoutParams.MATCH_PARENT,
-                        (int) V2XUtils.getApp()
+                        (int) Utils.getApp()
                                 .getResources()
                                 .getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
index 9e6ecead1a..856e95c8b4 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
@@ -5,13 +5,13 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
@@ -62,7 +62,7 @@ public class V2XPushEventScenario extends AbsV2XScenario<V2XPushMessageEntity> i
             ViewGroup.LayoutParams layoutParams =
                     new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
-                            (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_event_window_height_ground));
+                            (int) Utils.getApp().getResources().getDimension(R.dimen.module_v2x_event_window_height_ground));
             V2XServiceManager
                     .getMogoTopViewManager()
                     .addView(getV2XWindow().getView(), layoutParams, this);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
index a979e1d733..d4bea10f77 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
@@ -3,6 +3,7 @@ package com.mogo.module.v2x.scenario.scene.road;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
 import com.mogo.module.v2x.R;
@@ -12,7 +13,6 @@ import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
 import com.mogo.module.v2x.scenario.scene.livecar.V2XRoadLiveCarScenario;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
 import com.mogo.module.v2x.utils.ADASUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
@@ -124,7 +124,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
                 ViewGroup.LayoutParams layoutParams =
                         new ViewGroup.LayoutParams(
                                 ViewGroup.LayoutParams.MATCH_PARENT,
-                                (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_event_window_height));
+                                (int) Utils.getApp().getResources().getDimension(R.dimen.module_v2x_event_window_height));
                 V2XServiceManager
                         .getMogoTopViewManager()
                         .addView(getV2XWindow().getView(), layoutParams, this);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoCarScenario.java
index def8a1c7ac..e338f39e97 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoCarScenario.java
@@ -6,12 +6,12 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 
 import javax.security.auth.DestroyFailedException;
@@ -58,7 +58,7 @@ public class V2XRoadVideoCarScenario extends AbsV2XScenario<V2XEventShowEntity>
             ViewGroup.LayoutParams layoutParams =
                     new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
-                            (int) V2XUtils.getApp().getResources()
+                            (int) Utils.getApp().getResources()
                                     .getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode()? R.dimen.dp_394:R.dimen.v2x_video_window_height));
             V2XServiceManager
                     .getMogoTopViewManager()
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java
index 6e78c3dab1..0e7a62792d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java
@@ -5,13 +5,13 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.net.V2XOptimalRouteDataRes;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.utils.GsonUtil;
@@ -65,7 +65,7 @@ public class V2XOptimalRouteVREventScenario
             ViewGroup.LayoutParams layoutParams =
                     new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
-                            (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_event_window_height_ground));
+                            (int) Utils.getApp().getResources().getDimension(R.dimen.module_v2x_event_window_height_ground));
             V2XServiceManager
                     .getMogoTopViewManager()
                     .addView(getV2XWindow().getView(), layoutParams, this);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
index e09242ba13..0567eb92e3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
@@ -5,6 +5,7 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
@@ -15,7 +16,6 @@ import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
 import com.mogo.module.v2x.utils.ADASUtils;
 import com.mogo.module.v2x.utils.V2XSQLiteUtils;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 
 import java.util.List;
@@ -91,7 +91,7 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
             ViewGroup.LayoutParams layoutParams =
                     new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
-                            (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
+                            (int) Utils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
             V2XServiceManager
                     .getMogoTopViewManager()
                     .addView(getV2XWindow().getView(), layoutParams, this);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java
index 0c811c3067..bc84eba9f9 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/ugc/V2XEventUgcScenario.java
@@ -5,13 +5,13 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.logger.Logger;
 
@@ -57,7 +57,7 @@ public class V2XEventUgcScenario extends AbsV2XScenario<V2XRoadEventEntity> impl
             ViewGroup.LayoutParams layoutParams =
                     new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
-                            (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
+                            (int) Utils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
             V2XServiceManager
                     .getMogoTopViewManager()
                     .addView(getV2XWindow().getView(), layoutParams, this);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XFrontWarningScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XFrontWarningScenario.java
index f63e0c4a31..482b58be7c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XFrontWarningScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XFrontWarningScenario.java
@@ -8,6 +8,7 @@ import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.V2XMessageEntity;
@@ -15,7 +16,6 @@ import com.mogo.module.common.entity.V2XWarningEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 
 /**
@@ -61,7 +61,7 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMogoTopV
             ViewGroup.LayoutParams layoutParams =
                     new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
-                            (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
+                            (int) Utils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
             V2XServiceManager
                     .getMogoTopViewManager()
                     .addView(getV2XWindow().getView(), layoutParams, this);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java
index 22442a2941..6547d40392 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningWindow.java
@@ -9,14 +9,13 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XWarningEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.listener.V2XWindowStatusListener;
 import com.mogo.module.v2x.scenario.scene.V2XBasWindow;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
-import com.mogo.module.v2x.utils.V2XUtils;
 
 /**
  * @author liujing
@@ -77,7 +76,7 @@ public class V2XWarningWindow extends V2XBasWindow implements IV2XWindow {
             }
             distance.setText(String.valueOf(mV2XWarningEntity.getDistance()) + "米");
             warningTextView.setText(mV2XWarningEntity.getWarningContent());//验证云端数据是否
-            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(mV2XWarningEntity.getTts());
+            AIAssist.getInstance(Utils.getApp()).speakTTSVoice(mV2XWarningEntity.getTts());
         }
         //3秒后移除提示弹框
         if (runnableV2XEvent == null) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ADASUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ADASUtils.java
index 26e1e56bd4..41114d54ab 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ADASUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ADASUtils.java
@@ -9,6 +9,7 @@ import androidx.annotation.Nullable;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.commons.voice.VoicePreemptType;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.entity.net.V2XAlarmEventRes;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
@@ -133,7 +134,7 @@ public class ADASUtils {
     public static void speakTTSVoice(@Nullable String msg, IMogoVoiceCmdCallBack callBack) {
         if (!TextUtils.isEmpty(msg)) {
             Logger.w(V2XConst.MODULE_NAME, "调用TTS播放语音：" + msg);
-            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice(msg, VoicePreemptType.PREEMPT_TYPE_IMMEADIATELY, callBack);
+            AIAssist.getInstance(Utils.getApp()).speakTTSVoice(msg, VoicePreemptType.PREEMPT_TYPE_IMMEADIATELY, callBack);
         }
     }
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java
index 79bb3efbf1..23af89cb1c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ChartingUtil.java
@@ -79,7 +79,7 @@ public class ChartingUtil {
             if ( V2XServiceManager.getCarsChattingProvider() != null ) {
                 V2XServiceManager.getCarsChattingProvider().isOnLine(
                         "CAR_CALL_TO_" + V2XConst.MODULE_NAME,
-                        V2XUtils.getApp(),
+                        com.mogo.eagle.core.utilcode.util.Utils.getApp(),
                         sn,
                         new ICallChatResponse() {
                             @Override
@@ -112,7 +112,7 @@ public class ChartingUtil {
             if ( V2XServiceManager.getCarsChattingProvider() != null ) {
                 V2XServiceManager.getCarsChattingProvider().canCall(
                         "CAR_CALL_TO_" + V2XConst.MODULE_NAME,
-                        V2XUtils.getApp(),
+                        com.mogo.eagle.core.utilcode.util.Utils.getApp(),
                         new ICallChatResponse() {
                             @Override
                             public void canCall(boolean onLine) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/FatigueDrivingUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/FatigueDrivingUtils.java
index a14819e68f..8df65dfd1d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/FatigueDrivingUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/FatigueDrivingUtils.java
@@ -2,11 +2,14 @@ package com.mogo.module.v2x.utils;
 
 import android.text.TextUtils;
 
+import com.mogo.eagle.core.utilcode.constant.TimeConstants;
+import com.mogo.eagle.core.utilcode.util.TimeUtils;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.entity.net.V2XStrategyPushRes;
 import com.mogo.utils.logger.Logger;
-import com.mogo.utils.storage.SharedPrefsMgr;
 import com.mogo.utils.network.utils.GsonUtil;
+import com.mogo.utils.storage.SharedPrefsMgr;
 
 /**
  * author : donghongyu
@@ -24,12 +27,12 @@ public class FatigueDrivingUtils {
      */
     public static long getDrivingTime() {
         // 获取 ACC ON 时间
-        String accOnTime = SharedPrefsMgr.getInstance(V2XUtils.getApp())
+        String accOnTime = SharedPrefsMgr.getInstance(Utils.getApp())
                 .getString(V2XConst.V2X_ACC_ON_TIME_STR);
         if (TextUtils.isEmpty(accOnTime)) {
             accOnTime = TimeUtils.getNowString();
             // 记录开机时间
-            SharedPrefsMgr.getInstance(V2XUtils.getApp())
+            SharedPrefsMgr.getInstance(Utils.getApp())
                     .putString(V2XConst.V2X_ACC_ON_TIME_STR, accOnTime);
         }
         return Math.abs(TimeUtils.getTimeSpanByNow(accOnTime, TimeConstants.MIN));
@@ -41,7 +44,7 @@ public class FatigueDrivingUtils {
      */
     public static void refreshAccOnTime() {
         // 获取 ACC ON 时间
-        String localAccONTime = SharedPrefsMgr.getInstance(V2XUtils.getApp())
+        String localAccONTime = SharedPrefsMgr.getInstance(Utils.getApp())
                 .getString(V2XConst.V2X_ACC_ON_TIME_STR);
         Logger.d(V2XConst.MODULE_NAME, "ACC ON时间：" + localAccONTime);
 
@@ -49,13 +52,13 @@ public class FatigueDrivingUtils {
         if (!TextUtils.isEmpty(localAccONTime)) {
             // 获取配置信息
             V2XStrategyPushRes.ResultBean strategyPushEntity =
-                    GsonUtil.objectFromJson(SharedPrefsMgr.getInstance(V2XUtils.getApp())
+                    GsonUtil.objectFromJson(SharedPrefsMgr.getInstance(Utils.getApp())
                             .getString(V2XConst.V2X_STRATEGY_PUSH), V2XStrategyPushRes.ResultBean.class);
             if (strategyPushEntity != null) {
                 // 获取 当前 ACC ON 时间
                 String accOnTime = TimeUtils.getNowString();
                 // 获取 ACC OFF 时间
-                String accOFFTime = SharedPrefsMgr.getInstance(V2XUtils.getApp())
+                String accOFFTime = SharedPrefsMgr.getInstance(Utils.getApp())
                         .getString(V2XConst.V2X_ACC_OFF_TIME_STR);
                 if (!TextUtils.isEmpty(accOFFTime)) {
                     // 比较开关机时间，如果acc of 比 acc on 时间还要靠近说明acc on 时间记录有问题，需要更新同步
@@ -63,18 +66,18 @@ public class FatigueDrivingUtils {
                     Logger.d(V2XConst.MODULE_NAME, "开关机时间间隔：" + timeSpan);
                     if (timeSpan >= strategyPushEntity.getRestIgnoreMinutes()) {
                         // 记录开机时间
-                        SharedPrefsMgr.getInstance(V2XUtils.getApp())
+                        SharedPrefsMgr.getInstance(Utils.getApp())
                                 .putString(V2XConst.V2X_ACC_ON_TIME_STR, accOnTime);
                     }
                 }
             } else {
                 // 记录开机时间
-                SharedPrefsMgr.getInstance(V2XUtils.getApp())
+                SharedPrefsMgr.getInstance(Utils.getApp())
                         .putString(V2XConst.V2X_ACC_ON_TIME_STR, TimeUtils.getNowString());
             }
         } else {
             // 记录开机时间
-            SharedPrefsMgr.getInstance(V2XUtils.getApp())
+            SharedPrefsMgr.getInstance(Utils.getApp())
                     .putString(V2XConst.V2X_ACC_ON_TIME_STR, TimeUtils.getNowString());
         }
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
index 2cc05a8e2a..ebc8cf7720 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/LocationUtils.java
@@ -4,6 +4,7 @@ import android.location.Location;
 import android.util.Log;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoPoiItem;
@@ -44,7 +45,7 @@ public class LocationUtils {
         MogoPoiSearchQuery poiSearchQuery = new MogoPoiSearchQuery(keyword, keyword);
         poiSearchQuery.setPageSize(10);
         poiSearchQuery.setLocation(getCurrentLatLon());
-        IMogoPoiSearch poiSearch = V2XServiceManager.getMapService().getPoiSearch(V2XUtils.getApp(), poiSearchQuery);
+        IMogoPoiSearch poiSearch = V2XServiceManager.getMapService().getPoiSearch(Utils.getApp(), poiSearchQuery);
 
         poiSearch.setPoiSearchListener(new IMogoPoiSearchListener() {
             @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
index 80fe7df039..7b0497d7f7 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
@@ -1,6 +1,7 @@
 package com.mogo.module.v2x.utils;
 
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.utils.TipToast;
 
@@ -34,7 +35,7 @@ public class RoadConditionUtils {
      * 显示Toast
      */
     private static void showTip() {
-        AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已反馈", null);
+        AIAssist.getInstance(Utils.getApp()).speakTTSVoice("已反馈", null);
         TipToast.tip("已反馈");
     }
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/SpanUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/SpanUtils.java
deleted file mode 100644
index 2159535918..0000000000
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/SpanUtils.java
+++ /dev/null
@@ -1,1433 +0,0 @@
-package com.mogo.module.v2x.utils;
-
-import android.annotation.SuppressLint;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.BlurMaskFilter;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Rect;
-import android.graphics.Shader;
-import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-
-import android.text.Layout;
-import android.text.Layout.Alignment;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextPaint;
-import android.text.method.LinkMovementMethod;
-import android.text.style.AbsoluteSizeSpan;
-import android.text.style.AlignmentSpan;
-import android.text.style.BackgroundColorSpan;
-import android.text.style.CharacterStyle;
-import android.text.style.ClickableSpan;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.LeadingMarginSpan;
-import android.text.style.LineHeightSpan;
-import android.text.style.MaskFilterSpan;
-import android.text.style.RelativeSizeSpan;
-import android.text.style.ReplacementSpan;
-import android.text.style.ScaleXSpan;
-import android.text.style.StrikethroughSpan;
-import android.text.style.StyleSpan;
-import android.text.style.SubscriptSpan;
-import android.text.style.SuperscriptSpan;
-import android.text.style.TypefaceSpan;
-import android.text.style.URLSpan;
-import android.text.style.UnderlineSpan;
-import android.text.style.UpdateAppearance;
-import android.util.Log;
-import android.widget.TextView;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.FloatRange;
-import androidx.annotation.IntDef;
-import androidx.annotation.IntRange;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-
-import com.mogo.utils.logger.Logger;
-
-import java.io.InputStream;
-import java.io.Serializable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.ref.WeakReference;
-
-import static android.graphics.BlurMaskFilter.Blur;
-
-/**
- * <pre>
- *     author: Blankj
- *     blog  : http://blankj.com
- *     time  : 16/12/13
- *     desc  : utils about span
- * </pre>
- */
-public final class SpanUtils {
-
-    private static final int COLOR_DEFAULT = 0xFEFFFFFF;
-
-    public static final int ALIGN_BOTTOM   = 0;
-    public static final int ALIGN_BASELINE = 1;
-    public static final int ALIGN_CENTER   = 2;
-    public static final int ALIGN_TOP      = 3;
-
-    @IntDef({ALIGN_BOTTOM, ALIGN_BASELINE, ALIGN_CENTER, ALIGN_TOP})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Align {
-    }
-
-    private static final String LINE_SEPARATOR = System.getProperty("line.separator");
-
-    private TextView      mTextView;
-    private CharSequence  mText;
-    private int           flag;
-    private int           foregroundColor;
-    private int           backgroundColor;
-    private int           lineHeight;
-    private int           alignLine;
-    private int           quoteColor;
-    private int           stripeWidth;
-    private int           quoteGapWidth;
-    private int           first;
-    private int           rest;
-    private int           bulletColor;
-    private int           bulletRadius;
-    private int           bulletGapWidth;
-    private int           fontSize;
-    private boolean       fontSizeIsDp;
-    private float         proportion;
-    private float         xProportion;
-    private boolean       isStrikethrough;
-    private boolean       isUnderline;
-    private boolean       isSuperscript;
-    private boolean       isSubscript;
-    private boolean       isBold;
-    private boolean       isItalic;
-    private boolean       isBoldItalic;
-    private String        fontFamily;
-    private Typeface      typeface;
-    private Alignment     alignment;
-    private int           verticalAlign;
-    private ClickableSpan clickSpan;
-    private String        url;
-    private float         blurRadius;
-    private Blur          style;
-    private Shader        shader;
-    private float         shadowRadius;
-    private float         shadowDx;
-    private float         shadowDy;
-    private int           shadowColor;
-    private Object[]      spans;
-
-    private Bitmap   imageBitmap;
-    private Drawable imageDrawable;
-    private Uri      imageUri;
-    private int      imageResourceId;
-    private int      alignImage;
-
-    private int spaceSize;
-    private int spaceColor;
-
-    private SerializableSpannableStringBuilder mBuilder;
-
-    private       int mType;
-    private final int mTypeCharSequence = 0;
-    private final int mTypeImage        = 1;
-    private final int mTypeSpace        = 2;
-
-    private SpanUtils(TextView textView) {
-        this();
-        mTextView = textView;
-    }
-
-    public SpanUtils() {
-        mBuilder = new SerializableSpannableStringBuilder();
-        mText = "";
-        mType = -1;
-        setDefault();
-    }
-
-    private void setDefault() {
-        flag = Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
-        foregroundColor = COLOR_DEFAULT;
-        backgroundColor = COLOR_DEFAULT;
-        lineHeight = -1;
-        quoteColor = COLOR_DEFAULT;
-        first = -1;
-        bulletColor = COLOR_DEFAULT;
-        fontSize = -1;
-        proportion = -1;
-        xProportion = -1;
-        isStrikethrough = false;
-        isUnderline = false;
-        isSuperscript = false;
-        isSubscript = false;
-        isBold = false;
-        isItalic = false;
-        isBoldItalic = false;
-        fontFamily = null;
-        typeface = null;
-        alignment = null;
-        verticalAlign = -1;
-        clickSpan = null;
-        url = null;
-        blurRadius = -1;
-        shader = null;
-        shadowRadius = -1;
-        spans = null;
-
-        imageBitmap = null;
-        imageDrawable = null;
-        imageUri = null;
-        imageResourceId = -1;
-
-        spaceSize = -1;
-    }
-
-    /**
-     * Set the span of flag.
-     *
-     * @param flag The flag.
-     *             <ul>
-     *             <li>{@link Spanned#SPAN_INCLUSIVE_EXCLUSIVE}</li>
-     *             <li>{@link Spanned#SPAN_INCLUSIVE_INCLUSIVE}</li>
-     *             <li>{@link Spanned#SPAN_EXCLUSIVE_EXCLUSIVE}</li>
-     *             <li>{@link Spanned#SPAN_EXCLUSIVE_INCLUSIVE}</li>
-     *             </ul>
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setFlag(final int flag) {
-        this.flag = flag;
-        return this;
-    }
-
-    /**
-     * Set the span of foreground's color.
-     *
-     * @param color The color of foreground
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setForegroundColor(@ColorInt final int color) {
-        this.foregroundColor = color;
-        return this;
-    }
-
-    /**
-     * Set the span of background's color.
-     *
-     * @param color The color of background
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setBackgroundColor(@ColorInt final int color) {
-        this.backgroundColor = color;
-        return this;
-    }
-
-    /**
-     * Set the span of line height.
-     *
-     * @param lineHeight The line height, in pixel.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setLineHeight(@IntRange(from = 0) final int lineHeight) {
-        return setLineHeight(lineHeight, ALIGN_CENTER);
-    }
-
-    /**
-     * Set the span of line height.
-     *
-     * @param lineHeight The line height, in pixel.
-     * @param align      The alignment.
-     *                   <ul>
-     *                   <li>{@link Align#ALIGN_TOP   }</li>
-     *                   <li>{@link Align#ALIGN_CENTER}</li>
-     *                   <li>{@link Align#ALIGN_BOTTOM}</li>
-     *                   </ul>
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setLineHeight(@IntRange(from = 0) final int lineHeight,
-                                   @Align final int align) {
-        this.lineHeight = lineHeight;
-        this.alignLine = align;
-        return this;
-    }
-
-    /**
-     * Set the span of quote's color.
-     *
-     * @param color The color of quote
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setQuoteColor(@ColorInt final int color) {
-        return setQuoteColor(color, 2, 2);
-    }
-
-    /**
-     * Set the span of quote's color.
-     *
-     * @param color       The color of quote.
-     * @param stripeWidth The width of stripe, in pixel.
-     * @param gapWidth    The width of gap, in pixel.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setQuoteColor(@ColorInt final int color,
-                                   @IntRange(from = 1) final int stripeWidth,
-                                   @IntRange(from = 0) final int gapWidth) {
-        this.quoteColor = color;
-        this.stripeWidth = stripeWidth;
-        this.quoteGapWidth = gapWidth;
-        return this;
-    }
-
-    /**
-     * Set the span of leading margin.
-     *
-     * @param first The indent for the first line of the paragraph.
-     * @param rest  The indent for the remaining lines of the paragraph.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setLeadingMargin(@IntRange(from = 0) final int first,
-                                      @IntRange(from = 0) final int rest) {
-        this.first = first;
-        this.rest = rest;
-        return this;
-    }
-
-    /**
-     * Set the span of bullet.
-     *
-     * @param gapWidth The width of gap, in pixel.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setBullet(@IntRange(from = 0) final int gapWidth) {
-        return setBullet(0, 3, gapWidth);
-    }
-
-    /**
-     * Set the span of bullet.
-     *
-     * @param color    The color of bullet.
-     * @param radius   The radius of bullet, in pixel.
-     * @param gapWidth The width of gap, in pixel.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setBullet(@ColorInt final int color,
-                               @IntRange(from = 0) final int radius,
-                               @IntRange(from = 0) final int gapWidth) {
-        this.bulletColor = color;
-        this.bulletRadius = radius;
-        this.bulletGapWidth = gapWidth;
-        return this;
-    }
-
-    /**
-     * Set the span of font's size.
-     *
-     * @param size The size of font.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setFontSize(@IntRange(from = 0) final int size) {
-        return setFontSize(size, false);
-    }
-
-    /**
-     * Set the span of size of font.
-     *
-     * @param size The size of font.
-     * @param isSp True to use sp, false to use pixel.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setFontSize(@IntRange(from = 0) final int size, final boolean isSp) {
-        this.fontSize = size;
-        this.fontSizeIsDp = isSp;
-        return this;
-    }
-
-    /**
-     * Set the span of proportion of font.
-     *
-     * @param proportion The proportion of font.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setFontProportion(final float proportion) {
-        this.proportion = proportion;
-        return this;
-    }
-
-    /**
-     * Set the span of transverse proportion of font.
-     *
-     * @param proportion The transverse proportion of font.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setFontXProportion(final float proportion) {
-        this.xProportion = proportion;
-        return this;
-    }
-
-    /**
-     * Set the span of strikethrough.
-     *
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setStrikethrough() {
-        this.isStrikethrough = true;
-        return this;
-    }
-
-    /**
-     * Set the span of underline.
-     *
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setUnderline() {
-        this.isUnderline = true;
-        return this;
-    }
-
-    /**
-     * Set the span of superscript.
-     *
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setSuperscript() {
-        this.isSuperscript = true;
-        return this;
-    }
-
-    /**
-     * Set the span of subscript.
-     *
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setSubscript() {
-        this.isSubscript = true;
-        return this;
-    }
-
-    /**
-     * Set the span of bold.
-     *
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setBold() {
-        isBold = true;
-        return this;
-    }
-
-    /**
-     * Set the span of italic.
-     *
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setItalic() {
-        isItalic = true;
-        return this;
-    }
-
-    /**
-     * Set the span of bold italic.
-     *
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setBoldItalic() {
-        isBoldItalic = true;
-        return this;
-    }
-
-    /**
-     * Set the span of font family.
-     *
-     * @param fontFamily The font family.
-     *                   <ul>
-     *                   <li>monospace</li>
-     *                   <li>serif</li>
-     *                   <li>sans-serif</li>
-     *                   </ul>
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setFontFamily(@NonNull final String fontFamily) {
-        this.fontFamily = fontFamily;
-        return this;
-    }
-
-    /**
-     * Set the span of typeface.
-     *
-     * @param typeface The typeface.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setTypeface(@NonNull final Typeface typeface) {
-        this.typeface = typeface;
-        return this;
-    }
-
-    /**
-     * Set the span of horizontal alignment.
-     *
-     * @param alignment The alignment.
-     *                  <ul>
-     *                  <li>{@link Alignment#ALIGN_NORMAL  }</li>
-     *                  <li>{@link Alignment#ALIGN_OPPOSITE}</li>
-     *                  <li>{@link Alignment#ALIGN_CENTER  }</li>
-     *                  </ul>
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setHorizontalAlign(@NonNull final Alignment alignment) {
-        this.alignment = alignment;
-        return this;
-    }
-
-    /**
-     * Set the span of vertical alignment.
-     *
-     * @param align The alignment.
-     *              <ul>
-     *              <li>{@link Align#ALIGN_TOP     }</li>
-     *              <li>{@link Align#ALIGN_CENTER  }</li>
-     *              <li>{@link Align#ALIGN_BASELINE}</li>
-     *              <li>{@link Align#ALIGN_BOTTOM  }</li>
-     *              </ul>
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setVerticalAlign(@Align final int align) {
-        this.verticalAlign = align;
-        return this;
-    }
-
-    /**
-     * Set the span of click.
-     * <p>Must set {@code view.setMovementMethod(LinkMovementMethod.getInstance())}</p>
-     *
-     * @param clickSpan The span of click.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setClickSpan(@NonNull final ClickableSpan clickSpan) {
-        if (mTextView != null && mTextView.getMovementMethod() == null) {
-            mTextView.setMovementMethod(LinkMovementMethod.getInstance());
-        }
-        this.clickSpan = clickSpan;
-        return this;
-    }
-
-    /**
-     * Set the span of url.
-     * <p>Must set {@code view.setMovementMethod(LinkMovementMethod.getInstance())}</p>
-     *
-     * @param url The url.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setUrl(@NonNull final String url) {
-        if (mTextView != null && mTextView.getMovementMethod() == null) {
-            mTextView.setMovementMethod(LinkMovementMethod.getInstance());
-        }
-        this.url = url;
-        return this;
-    }
-
-    /**
-     * Set the span of blur.
-     *
-     * @param radius The radius of blur.
-     * @param style  The style.
-     *               <ul>
-     *               <li>{@link Blur#NORMAL}</li>
-     *               <li>{@link Blur#SOLID}</li>
-     *               <li>{@link Blur#OUTER}</li>
-     *               <li>{@link Blur#INNER}</li>
-     *               </ul>
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setBlur(@FloatRange(from = 0, fromInclusive = false) final float radius,
-                             final Blur style) {
-        this.blurRadius = radius;
-        this.style = style;
-        return this;
-    }
-
-    /**
-     * Set the span of shader.
-     *
-     * @param shader The shader.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setShader(@NonNull final Shader shader) {
-        this.shader = shader;
-        return this;
-    }
-
-    /**
-     * Set the span of shadow.
-     *
-     * @param radius      The radius of shadow.
-     * @param dx          X-axis offset, in pixel.
-     * @param dy          Y-axis offset, in pixel.
-     * @param shadowColor The color of shadow.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setShadow(@FloatRange(from = 0, fromInclusive = false) final float radius,
-                               final float dx,
-                               final float dy,
-                               final int shadowColor) {
-        this.shadowRadius = radius;
-        this.shadowDx = dx;
-        this.shadowDy = dy;
-        this.shadowColor = shadowColor;
-        return this;
-    }
-
-
-    /**
-     * Set the spans.
-     *
-     * @param spans The spans.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils setSpans(@NonNull final Object... spans) {
-        if (spans.length > 0) {
-            this.spans = spans;
-        }
-        return this;
-    }
-
-    /**
-     * Append the text text.
-     *
-     * @param text The text.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils append(@NonNull final CharSequence text) {
-        apply(mTypeCharSequence);
-        mText = text;
-        return this;
-    }
-
-    /**
-     * Append one line.
-     *
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendLine() {
-        apply(mTypeCharSequence);
-        mText = LINE_SEPARATOR;
-        return this;
-    }
-
-    /**
-     * Append text and one line.
-     *
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendLine(@NonNull final CharSequence text) {
-        apply(mTypeCharSequence);
-        mText = text + LINE_SEPARATOR;
-        return this;
-    }
-
-    /**
-     * Append one image.
-     *
-     * @param bitmap The bitmap of image.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendImage(@NonNull final Bitmap bitmap) {
-        return appendImage(bitmap, ALIGN_BOTTOM);
-    }
-
-    /**
-     * Append one image.
-     *
-     * @param bitmap The bitmap.
-     * @param align  The alignment.
-     *               <ul>
-     *               <li>{@link Align#ALIGN_TOP     }</li>
-     *               <li>{@link Align#ALIGN_CENTER  }</li>
-     *               <li>{@link Align#ALIGN_BASELINE}</li>
-     *               <li>{@link Align#ALIGN_BOTTOM  }</li>
-     *               </ul>
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendImage(@NonNull final Bitmap bitmap, @Align final int align) {
-        apply(mTypeImage);
-        this.imageBitmap = bitmap;
-        this.alignImage = align;
-        return this;
-    }
-
-    /**
-     * Append one image.
-     *
-     * @param drawable The drawable of image.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendImage(@NonNull final Drawable drawable) {
-        return appendImage(drawable, ALIGN_BOTTOM);
-    }
-
-    /**
-     * Append one image.
-     *
-     * @param drawable The drawable of image.
-     * @param align    The alignment.
-     *                 <ul>
-     *                 <li>{@link Align#ALIGN_TOP     }</li>
-     *                 <li>{@link Align#ALIGN_CENTER  }</li>
-     *                 <li>{@link Align#ALIGN_BASELINE}</li>
-     *                 <li>{@link Align#ALIGN_BOTTOM  }</li>
-     *                 </ul>
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendImage(@NonNull final Drawable drawable, @Align final int align) {
-        apply(mTypeImage);
-        this.imageDrawable = drawable;
-        this.alignImage = align;
-        return this;
-    }
-
-    /**
-     * Append one image.
-     *
-     * @param uri The uri of image.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendImage(@NonNull final Uri uri) {
-        return appendImage(uri, ALIGN_BOTTOM);
-    }
-
-    /**
-     * Append one image.
-     *
-     * @param uri   The uri of image.
-     * @param align The alignment.
-     *              <ul>
-     *              <li>{@link Align#ALIGN_TOP     }</li>
-     *              <li>{@link Align#ALIGN_CENTER  }</li>
-     *              <li>{@link Align#ALIGN_BASELINE}</li>
-     *              <li>{@link Align#ALIGN_BOTTOM  }</li>
-     *              </ul>
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendImage(@NonNull final Uri uri, @Align final int align) {
-        apply(mTypeImage);
-        this.imageUri = uri;
-        this.alignImage = align;
-        return this;
-    }
-
-    /**
-     * Append one image.
-     *
-     * @param resourceId The resource id of image.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendImage(@DrawableRes final int resourceId) {
-        return appendImage(resourceId, ALIGN_BOTTOM);
-    }
-
-    /**
-     * Append one image.
-     *
-     * @param resourceId The resource id of image.
-     * @param align      The alignment.
-     *                   <ul>
-     *                   <li>{@link Align#ALIGN_TOP     }</li>
-     *                   <li>{@link Align#ALIGN_CENTER  }</li>
-     *                   <li>{@link Align#ALIGN_BASELINE}</li>
-     *                   <li>{@link Align#ALIGN_BOTTOM  }</li>
-     *                   </ul>
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendImage(@DrawableRes final int resourceId, @Align final int align) {
-        apply(mTypeImage);
-        this.imageResourceId = resourceId;
-        this.alignImage = align;
-        return this;
-    }
-
-    /**
-     * Append space.
-     *
-     * @param size The size of space.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendSpace(@IntRange(from = 0) final int size) {
-        return appendSpace(size, Color.TRANSPARENT);
-    }
-
-    /**
-     * Append space.
-     *
-     * @param size  The size of space.
-     * @param color The color of space.
-     * @return the single {@link SpanUtils} instance
-     */
-    public SpanUtils appendSpace(@IntRange(from = 0) final int size, @ColorInt final int color) {
-        apply(mTypeSpace);
-        spaceSize = size;
-        spaceColor = color;
-        return this;
-    }
-
-    private void apply(final int type) {
-        applyLast();
-        mType = type;
-    }
-
-    public SpannableStringBuilder get() {
-        return mBuilder;
-    }
-
-    /**
-     * Create the span string.
-     *
-     * @return the span string
-     */
-    public SpannableStringBuilder create() {
-        applyLast();
-        if (mTextView != null) {
-            mTextView.setText(mBuilder);
-        }
-        return mBuilder;
-    }
-
-    private void applyLast() {
-        if (mType == mTypeCharSequence) {
-            updateCharCharSequence();
-        } else if (mType == mTypeImage) {
-            updateImage();
-        } else if (mType == mTypeSpace) {
-            updateSpace();
-        }
-        setDefault();
-    }
-
-    private void updateCharCharSequence() {
-        if (mText.length() == 0) {
-            return;
-        }
-        int start = mBuilder.length();
-        if (start == 0 && lineHeight != -1) {// bug of LineHeightSpan when first line
-            mBuilder.append(Character.toString((char) 2))
-                    .append("\n")
-                    .setSpan(new AbsoluteSizeSpan(0), 0, 2, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            start = 2;
-        }
-        mBuilder.append(mText);
-        int end = mBuilder.length();
-        if (verticalAlign != -1) {
-            mBuilder.setSpan(new VerticalAlignSpan(verticalAlign), start, end, flag);
-        }
-        if (foregroundColor != COLOR_DEFAULT) {
-            mBuilder.setSpan(new ForegroundColorSpan(foregroundColor), start, end, flag);
-        }
-        if (backgroundColor != COLOR_DEFAULT) {
-            mBuilder.setSpan(new BackgroundColorSpan(backgroundColor), start, end, flag);
-        }
-        if (first != -1) {
-            mBuilder.setSpan(new LeadingMarginSpan.Standard(first, rest), start, end, flag);
-        }
-        if (quoteColor != COLOR_DEFAULT) {
-            mBuilder.setSpan(
-                    new CustomQuoteSpan(quoteColor, stripeWidth, quoteGapWidth),
-                    start,
-                    end,
-                    flag
-            );
-        }
-        if (bulletColor != COLOR_DEFAULT) {
-            mBuilder.setSpan(
-                    new CustomBulletSpan(bulletColor, bulletRadius, bulletGapWidth),
-                    start,
-                    end,
-                    flag
-            );
-        }
-        if (fontSize != -1) {
-            mBuilder.setSpan(new AbsoluteSizeSpan(fontSize, fontSizeIsDp), start, end, flag);
-        }
-        if (proportion != -1) {
-            mBuilder.setSpan(new RelativeSizeSpan(proportion), start, end, flag);
-        }
-        if (xProportion != -1) {
-            mBuilder.setSpan(new ScaleXSpan(xProportion), start, end, flag);
-        }
-        if (lineHeight != -1) {
-            mBuilder.setSpan(new CustomLineHeightSpan(lineHeight, alignLine), start, end, flag);
-        }
-        if (isStrikethrough) {
-            mBuilder.setSpan(new StrikethroughSpan(), start, end, flag);
-        }
-        if (isUnderline) {
-            mBuilder.setSpan(new UnderlineSpan(), start, end, flag);
-        }
-        if (isSuperscript) {
-            mBuilder.setSpan(new SuperscriptSpan(), start, end, flag);
-        }
-        if (isSubscript) {
-            mBuilder.setSpan(new SubscriptSpan(), start, end, flag);
-        }
-        if (isBold) {
-            mBuilder.setSpan(new StyleSpan(Typeface.BOLD), start, end, flag);
-        }
-        if (isItalic) {
-            mBuilder.setSpan(new StyleSpan(Typeface.ITALIC), start, end, flag);
-        }
-        if (isBoldItalic) {
-            mBuilder.setSpan(new StyleSpan(Typeface.BOLD_ITALIC), start, end, flag);
-        }
-        if (fontFamily != null) {
-            mBuilder.setSpan(new TypefaceSpan(fontFamily), start, end, flag);
-        }
-        if (typeface != null) {
-            mBuilder.setSpan(new CustomTypefaceSpan(typeface), start, end, flag);
-        }
-        if (alignment != null) {
-            mBuilder.setSpan(new AlignmentSpan.Standard(alignment), start, end, flag);
-        }
-        if (clickSpan != null) {
-            mBuilder.setSpan(clickSpan, start, end, flag);
-        }
-        if (url != null) {
-            mBuilder.setSpan(new URLSpan(url), start, end, flag);
-        }
-        if (blurRadius != -1) {
-            mBuilder.setSpan(
-                    new MaskFilterSpan(new BlurMaskFilter(blurRadius, style)),
-                    start,
-                    end,
-                    flag
-            );
-        }
-        if (shader != null) {
-            mBuilder.setSpan(new ShaderSpan(shader), start, end, flag);
-        }
-        if (shadowRadius != -1) {
-            mBuilder.setSpan(
-                    new ShadowSpan(shadowRadius, shadowDx, shadowDy, shadowColor),
-                    start,
-                    end,
-                    flag
-            );
-        }
-        if (spans != null) {
-            for (Object span : spans) {
-                mBuilder.setSpan(span, start, end, flag);
-            }
-        }
-    }
-
-    private void updateImage() {
-        int start = mBuilder.length();
-        mText = "<img>";
-        updateCharCharSequence();
-        int end = mBuilder.length();
-        if (imageBitmap != null) {
-            mBuilder.setSpan(new CustomImageSpan(imageBitmap, alignImage), start, end, flag);
-        } else if (imageDrawable != null) {
-            mBuilder.setSpan(new CustomImageSpan(imageDrawable, alignImage), start, end, flag);
-        } else if (imageUri != null) {
-            mBuilder.setSpan(new CustomImageSpan(imageUri, alignImage), start, end, flag);
-        } else if (imageResourceId != -1) {
-            mBuilder.setSpan(new CustomImageSpan(imageResourceId, alignImage), start, end, flag);
-        }
-    }
-
-    private void updateSpace() {
-        int start = mBuilder.length();
-        mText = "< >";
-        updateCharCharSequence();
-        int end = mBuilder.length();
-        mBuilder.setSpan(new SpaceSpan(spaceSize, spaceColor), start, end, flag);
-    }
-
-    static class VerticalAlignSpan extends ReplacementSpan {
-
-        static final int ALIGN_CENTER = 2;
-        static final int ALIGN_TOP    = 3;
-
-        final int mVerticalAlignment;
-
-        VerticalAlignSpan(int verticalAlignment) {
-            mVerticalAlignment = verticalAlignment;
-        }
-
-        @Override
-        public int getSize(@NonNull Paint paint, CharSequence text, int start, int end, @Nullable Paint.FontMetricsInt fm) {
-            text = text.subSequence(start, end);
-            return (int) paint.measureText(text.toString());
-        }
-
-        @Override
-        public void draw(@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, @NonNull Paint paint) {
-            text = text.subSequence(start, end);
-            Paint.FontMetricsInt fm = paint.getFontMetricsInt();
-//            int need = height - (v + fm.descent - fm.ascent - spanstartv);
-//            if (need > 0) {
-//                if (mVerticalAlignment == ALIGN_TOP) {
-//                    fm.descent += need;
-//                } else if (mVerticalAlignment == ALIGN_CENTER) {
-//                    fm.descent += need / 2;
-//                    fm.ascent -= need / 2;
-//                } else {
-//                    fm.ascent -= need;
-//                }
-//            }
-//            need = height - (v + fm.bottom - fm.top - spanstartv);
-//            if (need > 0) {
-//                if (mVerticalAlignment == ALIGN_TOP) {
-//                    fm.bottom += need;
-//                } else if (mVerticalAlignment == ALIGN_CENTER) {
-//                    fm.bottom += need / 2;
-//                    fm.top -= need / 2;
-//                } else {
-//                    fm.top -= need;
-//                }
-//            }
-
-            canvas.drawText(text.toString(), x, y - ((y + fm.descent + y + fm.ascent) / 2 - (bottom + top) / 2), paint);
-        }
-    }
-
-    static class CustomLineHeightSpan implements LineHeightSpan {
-
-        private final int height;
-
-        static final int ALIGN_CENTER = 2;
-        static final int ALIGN_TOP    = 3;
-
-        final  int                  mVerticalAlignment;
-        static Paint.FontMetricsInt sfm;
-
-        CustomLineHeightSpan(int height, int verticalAlignment) {
-            this.height = height;
-            mVerticalAlignment = verticalAlignment;
-        }
-
-        @Override
-        public void chooseHeight(final CharSequence text, final int start, final int end,
-                                 final int spanstartv, final int v, final Paint.FontMetricsInt fm) {
-            if (sfm == null) {
-                sfm = new Paint.FontMetricsInt();
-                sfm.top = fm.top;
-                sfm.ascent = fm.ascent;
-                sfm.descent = fm.descent;
-                sfm.bottom = fm.bottom;
-                sfm.leading = fm.leading;
-            } else {
-                fm.top = sfm.top;
-                fm.ascent = sfm.ascent;
-                fm.descent = sfm.descent;
-                fm.bottom = sfm.bottom;
-                fm.leading = sfm.leading;
-            }
-            int need = height - (v + fm.descent - fm.ascent - spanstartv);
-            if (need > 0) {
-                if (mVerticalAlignment == ALIGN_TOP) {
-                    fm.descent += need;
-                } else if (mVerticalAlignment == ALIGN_CENTER) {
-                    fm.descent += need / 2;
-                    fm.ascent -= need / 2;
-                } else {
-                    fm.ascent -= need;
-                }
-            }
-            need = height - (v + fm.bottom - fm.top - spanstartv);
-            if (need > 0) {
-                if (mVerticalAlignment == ALIGN_TOP) {
-                    fm.bottom += need;
-                } else if (mVerticalAlignment == ALIGN_CENTER) {
-                    fm.bottom += need / 2;
-                    fm.top -= need / 2;
-                } else {
-                    fm.top -= need;
-                }
-            }
-            if (end == ((Spanned) text).getSpanEnd(this)) {
-                sfm = null;
-            }
-        }
-    }
-
-    static class SpaceSpan extends ReplacementSpan {
-
-        private final int   width;
-        private final Paint paint = new Paint();
-
-        private SpaceSpan(final int width) {
-            this(width, Color.TRANSPARENT);
-        }
-
-        private SpaceSpan(final int width, final int color) {
-            super();
-            this.width = width;
-            paint.setColor(color);
-            paint.setStyle(Paint.Style.FILL);
-        }
-
-        @Override
-        public int getSize(@NonNull final Paint paint, final CharSequence text,
-                           @IntRange(from = 0) final int start,
-                           @IntRange(from = 0) final int end,
-                           @Nullable final Paint.FontMetricsInt fm) {
-            return width;
-        }
-
-        @Override
-        public void draw(@NonNull final Canvas canvas, final CharSequence text,
-                         @IntRange(from = 0) final int start,
-                         @IntRange(from = 0) final int end,
-                         final float x, final int top, final int y, final int bottom,
-                         @NonNull final Paint paint) {
-            canvas.drawRect(x, top, x + width, bottom, this.paint);
-        }
-    }
-
-    static class CustomQuoteSpan implements LeadingMarginSpan {
-
-        private final int color;
-        private final int stripeWidth;
-        private final int gapWidth;
-
-        private CustomQuoteSpan(final int color, final int stripeWidth, final int gapWidth) {
-            super();
-            this.color = color;
-            this.stripeWidth = stripeWidth;
-            this.gapWidth = gapWidth;
-        }
-
-        @Override
-        public int getLeadingMargin(final boolean first) {
-            return stripeWidth + gapWidth;
-        }
-
-        @Override
-        public void drawLeadingMargin(final Canvas c, final Paint p, final int x, final int dir,
-                                      final int top, final int baseline, final int bottom,
-                                      final CharSequence text, final int start, final int end,
-                                      final boolean first, final Layout layout) {
-            Paint.Style style = p.getStyle();
-            int color = p.getColor();
-
-            p.setStyle(Paint.Style.FILL);
-            p.setColor(this.color);
-
-            c.drawRect(x, top, x + dir * stripeWidth, bottom, p);
-
-            p.setStyle(style);
-            p.setColor(color);
-        }
-    }
-
-    static class CustomBulletSpan implements LeadingMarginSpan {
-
-        private final int color;
-        private final int radius;
-        private final int gapWidth;
-
-        private Path sBulletPath = null;
-
-        private CustomBulletSpan(final int color, final int radius, final int gapWidth) {
-            this.color = color;
-            this.radius = radius;
-            this.gapWidth = gapWidth;
-        }
-
-        @Override
-        public int getLeadingMargin(final boolean first) {
-            return 2 * radius + gapWidth;
-        }
-
-        @Override
-        public void drawLeadingMargin(final Canvas c, final Paint p, final int x, final int dir,
-                                      final int top, final int baseline, final int bottom,
-                                      final CharSequence text, final int start, final int end,
-                                      final boolean first, final Layout l) {
-            if (((Spanned) text).getSpanStart(this) == start) {
-                Paint.Style style = p.getStyle();
-                int oldColor = 0;
-                oldColor = p.getColor();
-                p.setColor(color);
-                p.setStyle(Paint.Style.FILL);
-                if (c.isHardwareAccelerated()) {
-                    if (sBulletPath == null) {
-                        sBulletPath = new Path();
-                        // Bullet is slightly better to avoid aliasing artifacts on mdpi devices.
-                        sBulletPath.addCircle(0.0f, 0.0f, radius, Path.Direction.CW);
-                    }
-                    c.save();
-                    c.translate(x + dir * radius, (top + bottom) / 2.0f);
-                    c.drawPath(sBulletPath, p);
-                    c.restore();
-                } else {
-                    c.drawCircle(x + dir * radius, (top + bottom) / 2.0f, radius, p);
-                }
-                p.setColor(oldColor);
-                p.setStyle(style);
-            }
-        }
-    }
-
-    @SuppressLint("ParcelCreator")
-    static class CustomTypefaceSpan extends TypefaceSpan {
-
-        private final Typeface newType;
-
-        private CustomTypefaceSpan(final Typeface type) {
-            super("");
-            newType = type;
-        }
-
-        @Override
-        public void updateDrawState(final TextPaint textPaint) {
-            apply(textPaint, newType);
-        }
-
-        @Override
-        public void updateMeasureState(final TextPaint paint) {
-            apply(paint, newType);
-        }
-
-        private void apply(final Paint paint, final Typeface tf) {
-            int oldStyle;
-            Typeface old = paint.getTypeface();
-            if (old == null) {
-                oldStyle = 0;
-            } else {
-                oldStyle = old.getStyle();
-            }
-
-            int fake = oldStyle & ~tf.getStyle();
-            if ((fake & Typeface.BOLD) != 0) {
-                paint.setFakeBoldText(true);
-            }
-
-            if ((fake & Typeface.ITALIC) != 0) {
-                paint.setTextSkewX(-0.25f);
-            }
-
-            paint.getShader();
-
-            paint.setTypeface(tf);
-        }
-    }
-
-    static class CustomImageSpan extends CustomDynamicDrawableSpan {
-        private Drawable mDrawable;
-        private Uri      mContentUri;
-        private int      mResourceId;
-
-        private CustomImageSpan(final Bitmap b, final int verticalAlignment) {
-            super(verticalAlignment);
-            mDrawable = new BitmapDrawable(V2XUtils.getApp().getResources(), b);
-            mDrawable.setBounds(
-                    0, 0, mDrawable.getIntrinsicWidth(), mDrawable.getIntrinsicHeight()
-            );
-        }
-
-        private CustomImageSpan(final Drawable d, final int verticalAlignment) {
-            super(verticalAlignment);
-            mDrawable = d;
-            mDrawable.setBounds(
-                    0, 0, mDrawable.getIntrinsicWidth(), mDrawable.getIntrinsicHeight()
-            );
-        }
-
-        private CustomImageSpan(final Uri uri, final int verticalAlignment) {
-            super(verticalAlignment);
-            mContentUri = uri;
-        }
-
-        private CustomImageSpan(@DrawableRes final int resourceId, final int verticalAlignment) {
-            super(verticalAlignment);
-            mResourceId = resourceId;
-        }
-
-        @Override
-        public Drawable getDrawable() {
-            Drawable drawable = null;
-            if (mDrawable != null) {
-                drawable = mDrawable;
-            } else if (mContentUri != null) {
-                Bitmap bitmap;
-                try {
-                    InputStream is =
-                            V2XUtils.getApp().getContentResolver().openInputStream(mContentUri);
-                    bitmap = BitmapFactory.decodeStream(is);
-                    drawable = new BitmapDrawable(V2XUtils.getApp().getResources(), bitmap);
-                    drawable.setBounds(
-                            0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()
-                    );
-                    if (is != null) {
-                        is.close();
-                    }
-                } catch (Exception e) {
-                    Log.e("sms", "Failed to loaded content " + mContentUri, e);
-                }
-            } else {
-                try {
-                    drawable = ContextCompat.getDrawable(V2XUtils.getApp(), mResourceId);
-                    drawable.setBounds(
-                            0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()
-                    );
-                } catch (Exception e) {
-                    Log.e("sms", "Unable to find resource: " + mResourceId);
-                }
-            }
-            return drawable;
-        }
-    }
-
-    static abstract class CustomDynamicDrawableSpan extends ReplacementSpan {
-
-        static final int ALIGN_BOTTOM = 0;
-
-        static final int ALIGN_BASELINE = 1;
-
-        static final int ALIGN_CENTER = 2;
-
-        static final int ALIGN_TOP = 3;
-
-        final int mVerticalAlignment;
-
-        private CustomDynamicDrawableSpan() {
-            mVerticalAlignment = ALIGN_BOTTOM;
-        }
-
-        private CustomDynamicDrawableSpan(final int verticalAlignment) {
-            mVerticalAlignment = verticalAlignment;
-        }
-
-        public abstract Drawable getDrawable();
-
-        @Override
-        public int getSize(@NonNull final Paint paint, final CharSequence text,
-                           final int start, final int end, final Paint.FontMetricsInt fm) {
-            Drawable d = getCachedDrawable();
-            Rect rect = d.getBounds();
-            if (fm != null) {
-//                LogUtils.d("fm.top: " + fm.top,
-//                        "fm.ascent: " + fm.ascent,
-//                        "fm.descent: " + fm.descent,
-//                        "fm.bottom: " + fm.bottom,
-//                        "lineHeight: " + (fm.bottom - fm.top));
-                int lineHeight = fm.bottom - fm.top;
-                if (lineHeight < rect.height()) {
-                    if (mVerticalAlignment == ALIGN_TOP) {
-                        fm.top = fm.top;
-                        fm.bottom = rect.height() + fm.top;
-                    } else if (mVerticalAlignment == ALIGN_CENTER) {
-                        fm.top = -rect.height() / 2 - lineHeight / 4;
-                        fm.bottom = rect.height() / 2 - lineHeight / 4;
-                    } else {
-                        fm.top = -rect.height() + fm.bottom;
-                        fm.bottom = fm.bottom;
-                    }
-                    fm.ascent = fm.top;
-                    fm.descent = fm.bottom;
-                }
-            }
-            return rect.right;
-        }
-
-        @Override
-        public void draw(@NonNull final Canvas canvas, final CharSequence text,
-                         final int start, final int end, final float x,
-                         final int top, final int y, final int bottom, @NonNull final Paint paint) {
-            Drawable d = getCachedDrawable();
-            Rect rect = d.getBounds();
-            canvas.save();
-            float transY;
-            int lineHeight = bottom - top;
-//            LogUtils.d("rectHeight: " + rect.height(),
-//                    "lineHeight: " + (bottom - top));
-            if (rect.height() < lineHeight) {
-                if (mVerticalAlignment == ALIGN_TOP) {
-                    transY = top;
-                } else if (mVerticalAlignment == ALIGN_CENTER) {
-                    transY = (bottom + top - rect.height()) / 2;
-                } else if (mVerticalAlignment == ALIGN_BASELINE) {
-                    transY = y - rect.height();
-                } else {
-                    transY = bottom - rect.height();
-                }
-                canvas.translate(x, transY);
-            } else {
-                canvas.translate(x, top);
-            }
-            d.draw(canvas);
-            canvas.restore();
-        }
-
-        private Drawable getCachedDrawable() {
-            WeakReference<Drawable> wr = mDrawableRef;
-            Drawable d = null;
-            if (wr != null) {
-                d = wr.get();
-            }
-            if (d == null) {
-                d = getDrawable();
-                mDrawableRef = new WeakReference<>(d);
-            }
-            return d;
-        }
-
-        private WeakReference<Drawable> mDrawableRef;
-    }
-
-    static class ShaderSpan extends CharacterStyle implements UpdateAppearance {
-        private Shader mShader;
-
-        private ShaderSpan(final Shader shader) {
-            this.mShader = shader;
-        }
-
-        @Override
-        public void updateDrawState(final TextPaint tp) {
-            tp.setShader(mShader);
-        }
-    }
-
-    static class ShadowSpan extends CharacterStyle implements UpdateAppearance {
-        private float radius;
-        private float dx, dy;
-        private int shadowColor;
-
-        private ShadowSpan(final float radius,
-                           final float dx,
-                           final float dy,
-                           final int shadowColor) {
-            this.radius = radius;
-            this.dx = dx;
-            this.dy = dy;
-            this.shadowColor = shadowColor;
-        }
-
-        @Override
-        public void updateDrawState(final TextPaint tp) {
-            tp.setShadowLayer(radius, dx, dy, shadowColor);
-        }
-    }
-
-    private static class SerializableSpannableStringBuilder extends SpannableStringBuilder
-            implements Serializable {
-
-        private static final long serialVersionUID = 4909567650765875771L;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // static
-    ///////////////////////////////////////////////////////////////////////////
-
-    public static SpanUtils with(final TextView textView) {
-        return new SpanUtils(textView);
-    }
-}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
index 42ea16a1fd..148b626d9a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java
@@ -1,6 +1,7 @@
 package com.mogo.module.v2x.utils;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerResponse;
 import com.mogo.module.common.entity.V2XMessageEntity;
@@ -31,7 +32,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<List<MarkerExploreWay>> getV2XIllegalParkData() {
         try {
-            InputStream inputStream = V2XUtils.getApp().getResources().openRawResource(R.raw.illegal_park_data);
+            InputStream inputStream = Utils.getApp().getResources().openRawResource(R.raw.illegal_park_data);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             int len = -1;
             byte[] buffer = new byte[1024];
@@ -64,7 +65,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<V2XRoadEventEntity> getV2XScenarioRoadEventData() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.scenario_road_event_data);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -98,7 +99,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<V2XRoadEventEntity> getV2XScenarioRoadEventUGCData() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.scenario_road_event_data);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -131,7 +132,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<V2XPushMessageEntity> getV2XScenarioPushEventData() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.scenario_push_event_data);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -175,7 +176,7 @@ public class TestOnLineCarUtils {
                     break;
                 default:
             }
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(id);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -203,7 +204,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<V2XPushMessageEntity> getV2XScenarioPushLiveEventData() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.scenario_push_live_event_data);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -236,7 +237,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<V2XPushMessageEntity> getV2XScenarioAnimationEventData() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.scenario_push_animation_event_data);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -269,7 +270,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<V2XPushMessageEntity> getV2XScenarioCrossCrash() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.scenario_push_cross_crash);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -302,7 +303,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<V2XPushMessageEntity> getV2XScenarioFatigueDrivingData() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.scenario_fatigue_driving_data);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -336,7 +337,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> getV2XScenarioSeekHelpData() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.scenario_seek_help);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -370,7 +371,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<List<V2XSpecialCarRes.V2XMarkerEntity>> getV2XScenarionVRBehindVIPData() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.scenario_push_vr_hehind_vip_data);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -404,7 +405,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<V2XPushMessageEntity> getV2XScenarionVRReverseCarData() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.scenario_push_vr_reverse_car_data);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -438,7 +439,7 @@ public class TestOnLineCarUtils {
      */
     public static V2XMessageEntity<V2XOptimalRouteDataRes> getV2XOptimalRoute() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.test_data_v2x_zuiyouluxian);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -494,7 +495,7 @@ public class TestOnLineCarUtils {
      */
     public static List<MogoLatLng> getTestCoordinates() {
         try {
-            InputStream inputStream = V2XUtils.getApp()
+            InputStream inputStream = Utils.getApp()
                     .getResources()
                     .openRawResource(R.raw.test_coordinates);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ThreadUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ThreadUtils.java
deleted file mode 100644
index 18ea02e1c8..0000000000
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ThreadUtils.java
+++ /dev/null
@@ -1,1338 +0,0 @@
-package com.mogo.module.v2x.utils;
-
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.IntRange;
-import androidx.annotation.NonNull;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- *
- */
-public final class ThreadUtils {
-
-    private static final Map<Integer, Map<Integer, ExecutorService>> TYPE_PRIORITY_POOLS = new HashMap<>();
-
-    private static final Map<Task, TaskInfo> TASK_TASKINFO_MAP = new ConcurrentHashMap<>();
-
-    private static final int   CPU_COUNT = Runtime.getRuntime().availableProcessors();
-    private static final Timer TIMER     = new Timer();
-
-    private static final byte TYPE_SINGLE = -1;
-    private static final byte TYPE_CACHED = -2;
-    private static final byte TYPE_IO     = -4;
-    private static final byte TYPE_CPU    = -8;
-
-    private static Executor sDeliver;
-
-    /**
-     * Return whether the thread is the main thread.
-     *
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isMainThread() {
-        return Looper.myLooper() == Looper.getMainLooper();
-    }
-
-    public static void runOnUiThread(final Runnable runnable) {
-        V2XUtils.runOnUiThread(runnable);
-    }
-
-    public static void runOnUiThreadDelayed(final Runnable runnable, long delayMillis) {
-        V2XUtils.runOnUiThreadDelayed(runnable, delayMillis);
-    }
-
-    /**
-     * Return a thread pool that reuses a fixed number of threads
-     * operating off a shared unbounded queue, using the provided
-     * ThreadFactory to create new threads when needed.
-     *
-     * @param size The size of thread in the pool.
-     * @return a fixed thread pool
-     */
-    public static ExecutorService getFixedPool(@IntRange(from = 1) final int size) {
-        return getPoolByTypeAndPriority(size);
-    }
-
-    /**
-     * Return a thread pool that reuses a fixed number of threads
-     * operating off a shared unbounded queue, using the provided
-     * ThreadFactory to create new threads when needed.
-     *
-     * @param size     The size of thread in the pool.
-     * @param priority The priority of thread in the poll.
-     * @return a fixed thread pool
-     */
-    public static ExecutorService getFixedPool(@IntRange(from = 1) final int size,
-                                               @IntRange(from = 1, to = 10) final int priority) {
-        return getPoolByTypeAndPriority(size, priority);
-    }
-
-    /**
-     * Return a thread pool that uses a single worker thread operating
-     * off an unbounded queue, and uses the provided ThreadFactory to
-     * create a new thread when needed.
-     *
-     * @return a single thread pool
-     */
-    public static ExecutorService getSinglePool() {
-        return getPoolByTypeAndPriority(TYPE_SINGLE);
-    }
-
-    /**
-     * Return a thread pool that uses a single worker thread operating
-     * off an unbounded queue, and uses the provided ThreadFactory to
-     * create a new thread when needed.
-     *
-     * @param priority The priority of thread in the poll.
-     * @return a single thread pool
-     */
-    public static ExecutorService getSinglePool(@IntRange(from = 1, to = 10) final int priority) {
-        return getPoolByTypeAndPriority(TYPE_SINGLE, priority);
-    }
-
-    /**
-     * Return a thread pool that creates new threads as needed, but
-     * will reuse previously constructed threads when they are
-     * available.
-     *
-     * @return a cached thread pool
-     */
-    public static ExecutorService getCachedPool() {
-        return getPoolByTypeAndPriority(TYPE_CACHED);
-    }
-
-    /**
-     * Return a thread pool that creates new threads as needed, but
-     * will reuse previously constructed threads when they are
-     * available.
-     *
-     * @param priority The priority of thread in the poll.
-     * @return a cached thread pool
-     */
-    public static ExecutorService getCachedPool(@IntRange(from = 1, to = 10) final int priority) {
-        return getPoolByTypeAndPriority(TYPE_CACHED, priority);
-    }
-
-    /**
-     * Return a thread pool that creates (2 * CPU_COUNT + 1) threads
-     * operating off a queue which size is 128.
-     *
-     * @return a IO thread pool
-     */
-    public static ExecutorService getIoPool() {
-        return getPoolByTypeAndPriority(TYPE_IO);
-    }
-
-    /**
-     * Return a thread pool that creates (2 * CPU_COUNT + 1) threads
-     * operating off a queue which size is 128.
-     *
-     * @param priority The priority of thread in the poll.
-     * @return a IO thread pool
-     */
-    public static ExecutorService getIoPool(@IntRange(from = 1, to = 10) final int priority) {
-        return getPoolByTypeAndPriority(TYPE_IO, priority);
-    }
-
-    /**
-     * Return a thread pool that creates (CPU_COUNT + 1) threads
-     * operating off a queue which size is 128 and the maximum
-     * number of threads equals (2 * CPU_COUNT + 1).
-     *
-     * @return a cpu thread pool for
-     */
-    public static ExecutorService getCpuPool() {
-        return getPoolByTypeAndPriority(TYPE_CPU);
-    }
-
-    /**
-     * Return a thread pool that creates (CPU_COUNT + 1) threads
-     * operating off a queue which size is 128 and the maximum
-     * number of threads equals (2 * CPU_COUNT + 1).
-     *
-     * @param priority The priority of thread in the poll.
-     * @return a cpu thread pool for
-     */
-    public static ExecutorService getCpuPool(@IntRange(from = 1, to = 10) final int priority) {
-        return getPoolByTypeAndPriority(TYPE_CPU, priority);
-    }
-
-    /**
-     * Executes the given task in a fixed thread pool.
-     *
-     * @param size The size of thread in the fixed thread pool.
-     * @param task The task to execute.
-     * @param <T>  The type of the task's result.
-     */
-    public static <T> void executeByFixed(@IntRange(from = 1) final int size, final Task<T> task) {
-        execute(getPoolByTypeAndPriority(size), task);
-    }
-
-    /**
-     * Executes the given task in a fixed thread pool.
-     *
-     * @param size     The size of thread in the fixed thread pool.
-     * @param task     The task to execute.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByFixed(@IntRange(from = 1) final int size,
-                                          final Task<T> task,
-                                          @IntRange(from = 1, to = 10) final int priority) {
-        execute(getPoolByTypeAndPriority(size, priority), task);
-    }
-
-    /**
-     * Executes the given task in a fixed thread pool after the given delay.
-     *
-     * @param size  The size of thread in the fixed thread pool.
-     * @param task  The task to execute.
-     * @param delay The time from now to delay execution.
-     * @param unit  The time unit of the delay parameter.
-     * @param <T>   The type of the task's result.
-     */
-    public static <T> void executeByFixedWithDelay(@IntRange(from = 1) final int size,
-                                                   final Task<T> task,
-                                                   final long delay,
-                                                   final TimeUnit unit) {
-        executeWithDelay(getPoolByTypeAndPriority(size), task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in a fixed thread pool after the given delay.
-     *
-     * @param size     The size of thread in the fixed thread pool.
-     * @param task     The task to execute.
-     * @param delay    The time from now to delay execution.
-     * @param unit     The time unit of the delay parameter.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByFixedWithDelay(@IntRange(from = 1) final int size,
-                                                   final Task<T> task,
-                                                   final long delay,
-                                                   final TimeUnit unit,
-                                                   @IntRange(from = 1, to = 10) final int priority) {
-        executeWithDelay(getPoolByTypeAndPriority(size, priority), task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in a fixed thread pool at fix rate.
-     *
-     * @param size   The size of thread in the fixed thread pool.
-     * @param task   The task to execute.
-     * @param period The period between successive executions.
-     * @param unit   The time unit of the period parameter.
-     * @param <T>    The type of the task's result.
-     */
-    public static <T> void executeByFixedAtFixRate(@IntRange(from = 1) final int size,
-                                                   final Task<T> task,
-                                                   final long period,
-                                                   final TimeUnit unit) {
-        executeAtFixedRate(getPoolByTypeAndPriority(size), task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in a fixed thread pool at fix rate.
-     *
-     * @param size     The size of thread in the fixed thread pool.
-     * @param task     The task to execute.
-     * @param period   The period between successive executions.
-     * @param unit     The time unit of the period parameter.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByFixedAtFixRate(@IntRange(from = 1) final int size,
-                                                   final Task<T> task,
-                                                   final long period,
-                                                   final TimeUnit unit,
-                                                   @IntRange(from = 1, to = 10) final int priority) {
-        executeAtFixedRate(getPoolByTypeAndPriority(size, priority), task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in a fixed thread pool at fix rate.
-     *
-     * @param size         The size of thread in the fixed thread pool.
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeByFixedAtFixRate(@IntRange(from = 1) final int size,
-                                                   final Task<T> task,
-                                                   long initialDelay,
-                                                   final long period,
-                                                   final TimeUnit unit) {
-        executeAtFixedRate(getPoolByTypeAndPriority(size), task, initialDelay, period, unit);
-    }
-
-    /**
-     * Executes the given task in a fixed thread pool at fix rate.
-     *
-     * @param size         The size of thread in the fixed thread pool.
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param priority     The priority of thread in the poll.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeByFixedAtFixRate(@IntRange(from = 1) final int size,
-                                                   final Task<T> task,
-                                                   long initialDelay,
-                                                   final long period,
-                                                   final TimeUnit unit,
-                                                   @IntRange(from = 1, to = 10) final int priority) {
-        executeAtFixedRate(getPoolByTypeAndPriority(size, priority), task, initialDelay, period, unit);
-    }
-
-    /**
-     * Executes the given task in a single thread pool.
-     *
-     * @param task The task to execute.
-     * @param <T>  The type of the task's result.
-     */
-    public static <T> void executeBySingle(final Task<T> task) {
-        execute(getPoolByTypeAndPriority(TYPE_SINGLE), task);
-    }
-
-    /**
-     * Executes the given task in a single thread pool.
-     *
-     * @param task     The task to execute.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeBySingle(final Task<T> task,
-                                           @IntRange(from = 1, to = 10) final int priority) {
-        execute(getPoolByTypeAndPriority(TYPE_SINGLE, priority), task);
-    }
-
-    /**
-     * Executes the given task in a single thread pool after the given delay.
-     *
-     * @param task  The task to execute.
-     * @param delay The time from now to delay execution.
-     * @param unit  The time unit of the delay parameter.
-     * @param <T>   The type of the task's result.
-     */
-    public static <T> void executeBySingleWithDelay(final Task<T> task,
-                                                    final long delay,
-                                                    final TimeUnit unit) {
-        executeWithDelay(getPoolByTypeAndPriority(TYPE_SINGLE), task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in a single thread pool after the given delay.
-     *
-     * @param task     The task to execute.
-     * @param delay    The time from now to delay execution.
-     * @param unit     The time unit of the delay parameter.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeBySingleWithDelay(final Task<T> task,
-                                                    final long delay,
-                                                    final TimeUnit unit,
-                                                    @IntRange(from = 1, to = 10) final int priority) {
-        executeWithDelay(getPoolByTypeAndPriority(TYPE_SINGLE, priority), task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in a single thread pool at fix rate.
-     *
-     * @param task   The task to execute.
-     * @param period The period between successive executions.
-     * @param unit   The time unit of the period parameter.
-     * @param <T>    The type of the task's result.
-     */
-    public static <T> void executeBySingleAtFixRate(final Task<T> task,
-                                                    final long period,
-                                                    final TimeUnit unit) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_SINGLE), task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in a single thread pool at fix rate.
-     *
-     * @param task     The task to execute.
-     * @param period   The period between successive executions.
-     * @param unit     The time unit of the period parameter.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeBySingleAtFixRate(final Task<T> task,
-                                                    final long period,
-                                                    final TimeUnit unit,
-                                                    @IntRange(from = 1, to = 10) final int priority) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_SINGLE, priority), task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in a single thread pool at fix rate.
-     *
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeBySingleAtFixRate(final Task<T> task,
-                                                    long initialDelay,
-                                                    final long period,
-                                                    final TimeUnit unit) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_SINGLE), task, initialDelay, period, unit);
-    }
-
-    /**
-     * Executes the given task in a single thread pool at fix rate.
-     *
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param priority     The priority of thread in the poll.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeBySingleAtFixRate(final Task<T> task,
-                                                    long initialDelay,
-                                                    final long period,
-                                                    final TimeUnit unit,
-                                                    @IntRange(from = 1, to = 10) final int priority) {
-        executeAtFixedRate(
-                getPoolByTypeAndPriority(TYPE_SINGLE, priority), task, initialDelay, period, unit
-        );
-    }
-
-    /**
-     * Executes the given task in a cached thread pool.
-     *
-     * @param task The task to execute.
-     * @param <T>  The type of the task's result.
-     */
-    public static <T> void executeByCached(final Task<T> task) {
-        execute(getPoolByTypeAndPriority(TYPE_CACHED), task);
-    }
-
-    /**
-     * Executes the given task in a cached thread pool.
-     *
-     * @param task     The task to execute.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByCached(final Task<T> task,
-                                           @IntRange(from = 1, to = 10) final int priority) {
-        execute(getPoolByTypeAndPriority(TYPE_CACHED, priority), task);
-    }
-
-    /**
-     * Executes the given task in a cached thread pool after the given delay.
-     *
-     * @param task  The task to execute.
-     * @param delay The time from now to delay execution.
-     * @param unit  The time unit of the delay parameter.
-     * @param <T>   The type of the task's result.
-     */
-    public static <T> void executeByCachedWithDelay(final Task<T> task,
-                                                    final long delay,
-                                                    final TimeUnit unit) {
-        executeWithDelay(getPoolByTypeAndPriority(TYPE_CACHED), task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in a cached thread pool after the given delay.
-     *
-     * @param task     The task to execute.
-     * @param delay    The time from now to delay execution.
-     * @param unit     The time unit of the delay parameter.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByCachedWithDelay(final Task<T> task,
-                                                    final long delay,
-                                                    final TimeUnit unit,
-                                                    @IntRange(from = 1, to = 10) final int priority) {
-        executeWithDelay(getPoolByTypeAndPriority(TYPE_CACHED, priority), task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in a cached thread pool at fix rate.
-     *
-     * @param task   The task to execute.
-     * @param period The period between successive executions.
-     * @param unit   The time unit of the period parameter.
-     * @param <T>    The type of the task's result.
-     */
-    public static <T> void executeByCachedAtFixRate(final Task<T> task,
-                                                    final long period,
-                                                    final TimeUnit unit) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_CACHED), task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in a cached thread pool at fix rate.
-     *
-     * @param task     The task to execute.
-     * @param period   The period between successive executions.
-     * @param unit     The time unit of the period parameter.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByCachedAtFixRate(final Task<T> task,
-                                                    final long period,
-                                                    final TimeUnit unit,
-                                                    @IntRange(from = 1, to = 10) final int priority) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_CACHED, priority), task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in a cached thread pool at fix rate.
-     *
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeByCachedAtFixRate(final Task<T> task,
-                                                    long initialDelay,
-                                                    final long period,
-                                                    final TimeUnit unit) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_CACHED), task, initialDelay, period, unit);
-    }
-
-    /**
-     * Executes the given task in a cached thread pool at fix rate.
-     *
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param priority     The priority of thread in the poll.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeByCachedAtFixRate(final Task<T> task,
-                                                    long initialDelay,
-                                                    final long period,
-                                                    final TimeUnit unit,
-                                                    @IntRange(from = 1, to = 10) final int priority) {
-        executeAtFixedRate(
-                getPoolByTypeAndPriority(TYPE_CACHED, priority), task, initialDelay, period, unit
-        );
-    }
-
-    /**
-     * Executes the given task in an IO thread pool.
-     *
-     * @param task The task to execute.
-     * @param <T>  The type of the task's result.
-     */
-    public static <T> void executeByIo(final Task<T> task) {
-        execute(getPoolByTypeAndPriority(TYPE_IO), task);
-    }
-
-    /**
-     * Executes the given task in an IO thread pool.
-     *
-     * @param task     The task to execute.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByIo(final Task<T> task,
-                                       @IntRange(from = 1, to = 10) final int priority) {
-        execute(getPoolByTypeAndPriority(TYPE_IO, priority), task);
-    }
-
-    /**
-     * Executes the given task in an IO thread pool after the given delay.
-     *
-     * @param task  The task to execute.
-     * @param delay The time from now to delay execution.
-     * @param unit  The time unit of the delay parameter.
-     * @param <T>   The type of the task's result.
-     */
-    public static <T> void executeByIoWithDelay(final Task<T> task,
-                                                final long delay,
-                                                final TimeUnit unit) {
-        executeWithDelay(getPoolByTypeAndPriority(TYPE_IO), task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in an IO thread pool after the given delay.
-     *
-     * @param task     The task to execute.
-     * @param delay    The time from now to delay execution.
-     * @param unit     The time unit of the delay parameter.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByIoWithDelay(final Task<T> task,
-                                                final long delay,
-                                                final TimeUnit unit,
-                                                @IntRange(from = 1, to = 10) final int priority) {
-        executeWithDelay(getPoolByTypeAndPriority(TYPE_IO, priority), task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in an IO thread pool at fix rate.
-     *
-     * @param task   The task to execute.
-     * @param period The period between successive executions.
-     * @param unit   The time unit of the period parameter.
-     * @param <T>    The type of the task's result.
-     */
-    public static <T> void executeByIoAtFixRate(final Task<T> task,
-                                                final long period,
-                                                final TimeUnit unit) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_IO), task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in an IO thread pool at fix rate.
-     *
-     * @param task     The task to execute.
-     * @param period   The period between successive executions.
-     * @param unit     The time unit of the period parameter.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByIoAtFixRate(final Task<T> task,
-                                                final long period,
-                                                final TimeUnit unit,
-                                                @IntRange(from = 1, to = 10) final int priority) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_IO, priority), task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in an IO thread pool at fix rate.
-     *
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeByIoAtFixRate(final Task<T> task,
-                                                long initialDelay,
-                                                final long period,
-                                                final TimeUnit unit) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_IO), task, initialDelay, period, unit);
-    }
-
-    /**
-     * Executes the given task in an IO thread pool at fix rate.
-     *
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param priority     The priority of thread in the poll.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeByIoAtFixRate(final Task<T> task,
-                                                long initialDelay,
-                                                final long period,
-                                                final TimeUnit unit,
-                                                @IntRange(from = 1, to = 10) final int priority) {
-        executeAtFixedRate(
-                getPoolByTypeAndPriority(TYPE_IO, priority), task, initialDelay, period, unit
-        );
-    }
-
-    /**
-     * Executes the given task in a cpu thread pool.
-     *
-     * @param task The task to execute.
-     * @param <T>  The type of the task's result.
-     */
-    public static <T> void executeByCpu(final Task<T> task) {
-        execute(getPoolByTypeAndPriority(TYPE_CPU), task);
-    }
-
-    /**
-     * Executes the given task in a cpu thread pool.
-     *
-     * @param task     The task to execute.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByCpu(final Task<T> task,
-                                        @IntRange(from = 1, to = 10) final int priority) {
-        execute(getPoolByTypeAndPriority(TYPE_CPU, priority), task);
-    }
-
-    /**
-     * Executes the given task in a cpu thread pool after the given delay.
-     *
-     * @param task  The task to execute.
-     * @param delay The time from now to delay execution.
-     * @param unit  The time unit of the delay parameter.
-     * @param <T>   The type of the task's result.
-     */
-    public static <T> void executeByCpuWithDelay(final Task<T> task,
-                                                 final long delay,
-                                                 final TimeUnit unit) {
-        executeWithDelay(getPoolByTypeAndPriority(TYPE_CPU), task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in a cpu thread pool after the given delay.
-     *
-     * @param task     The task to execute.
-     * @param delay    The time from now to delay execution.
-     * @param unit     The time unit of the delay parameter.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByCpuWithDelay(final Task<T> task,
-                                                 final long delay,
-                                                 final TimeUnit unit,
-                                                 @IntRange(from = 1, to = 10) final int priority) {
-        executeWithDelay(getPoolByTypeAndPriority(TYPE_CPU, priority), task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in a cpu thread pool at fix rate.
-     *
-     * @param task   The task to execute.
-     * @param period The period between successive executions.
-     * @param unit   The time unit of the period parameter.
-     * @param <T>    The type of the task's result.
-     */
-    public static <T> void executeByCpuAtFixRate(final Task<T> task,
-                                                 final long period,
-                                                 final TimeUnit unit) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_CPU), task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in a cpu thread pool at fix rate.
-     *
-     * @param task     The task to execute.
-     * @param period   The period between successive executions.
-     * @param unit     The time unit of the period parameter.
-     * @param priority The priority of thread in the poll.
-     * @param <T>      The type of the task's result.
-     */
-    public static <T> void executeByCpuAtFixRate(final Task<T> task,
-                                                 final long period,
-                                                 final TimeUnit unit,
-                                                 @IntRange(from = 1, to = 10) final int priority) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_CPU, priority), task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in a cpu thread pool at fix rate.
-     *
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeByCpuAtFixRate(final Task<T> task,
-                                                 long initialDelay,
-                                                 final long period,
-                                                 final TimeUnit unit) {
-        executeAtFixedRate(getPoolByTypeAndPriority(TYPE_CPU), task, initialDelay, period, unit);
-    }
-
-    /**
-     * Executes the given task in a cpu thread pool at fix rate.
-     *
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param priority     The priority of thread in the poll.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeByCpuAtFixRate(final Task<T> task,
-                                                 long initialDelay,
-                                                 final long period,
-                                                 final TimeUnit unit,
-                                                 @IntRange(from = 1, to = 10) final int priority) {
-        executeAtFixedRate(
-                getPoolByTypeAndPriority(TYPE_CPU, priority), task, initialDelay, period, unit
-        );
-    }
-
-    /**
-     * Executes the given task in a custom thread pool.
-     *
-     * @param pool The custom thread pool.
-     * @param task The task to execute.
-     * @param <T>  The type of the task's result.
-     */
-    public static <T> void executeByCustom(final ExecutorService pool, final Task<T> task) {
-        execute(pool, task);
-    }
-
-    /**
-     * Executes the given task in a custom thread pool after the given delay.
-     *
-     * @param pool  The custom thread pool.
-     * @param task  The task to execute.
-     * @param delay The time from now to delay execution.
-     * @param unit  The time unit of the delay parameter.
-     * @param <T>   The type of the task's result.
-     */
-    public static <T> void executeByCustomWithDelay(final ExecutorService pool,
-                                                    final Task<T> task,
-                                                    final long delay,
-                                                    final TimeUnit unit) {
-        executeWithDelay(pool, task, delay, unit);
-    }
-
-    /**
-     * Executes the given task in a custom thread pool at fix rate.
-     *
-     * @param pool   The custom thread pool.
-     * @param task   The task to execute.
-     * @param period The period between successive executions.
-     * @param unit   The time unit of the period parameter.
-     * @param <T>    The type of the task's result.
-     */
-    public static <T> void executeByCustomAtFixRate(final ExecutorService pool,
-                                                    final Task<T> task,
-                                                    final long period,
-                                                    final TimeUnit unit) {
-        executeAtFixedRate(pool, task, 0, period, unit);
-    }
-
-    /**
-     * Executes the given task in a custom thread pool at fix rate.
-     *
-     * @param pool         The custom thread pool.
-     * @param task         The task to execute.
-     * @param initialDelay The time to delay first execution.
-     * @param period       The period between successive executions.
-     * @param unit         The time unit of the initialDelay and period parameters.
-     * @param <T>          The type of the task's result.
-     */
-    public static <T> void executeByCustomAtFixRate(final ExecutorService pool,
-                                                    final Task<T> task,
-                                                    long initialDelay,
-                                                    final long period,
-                                                    final TimeUnit unit) {
-        executeAtFixedRate(pool, task, initialDelay, period, unit);
-    }
-
-    /**
-     * Cancel the given task.
-     *
-     * @param task The task to cancel.
-     */
-    public static void cancel(final Task task) {
-        if (task == null) return;
-        task.cancel();
-    }
-
-    /**
-     * Cancel the given tasks.
-     *
-     * @param tasks The tasks to cancel.
-     */
-    public static void cancel(final Task... tasks) {
-        if (tasks == null || tasks.length == 0) return;
-        for (Task task : tasks) {
-            if (task == null) continue;
-            task.cancel();
-        }
-    }
-
-    /**
-     * Cancel the given tasks.
-     *
-     * @param tasks The tasks to cancel.
-     */
-    public static void cancel(final List<Task> tasks) {
-        if (tasks == null || tasks.size() == 0) return;
-        for (Task task : tasks) {
-            if (task == null) continue;
-            task.cancel();
-        }
-    }
-
-    /**
-     * Cancel the tasks in pool.
-     *
-     * @param executorService The pool.
-     */
-    public static void cancel(ExecutorService executorService) {
-        if (executorService instanceof ThreadPoolExecutor4Util) {
-            for (Map.Entry<Task, TaskInfo> taskTaskInfoEntry : TASK_TASKINFO_MAP.entrySet()) {
-                if (taskTaskInfoEntry.getValue().mService == executorService) {
-                    cancel(taskTaskInfoEntry.getKey());
-                }
-            }
-        } else {
-            Log.e("LogUtils", "The executorService is not ThreadUtils's pool.");
-        }
-    }
-
-    /**
-     * Set the deliver.
-     *
-     * @param deliver The deliver.
-     */
-    public static void setDeliver(final Executor deliver) {
-        sDeliver = deliver;
-    }
-
-    private static <T> void execute(final ExecutorService pool, final Task<T> task) {
-        execute(pool, task, 0, 0, null);
-    }
-
-    private static <T> void executeWithDelay(final ExecutorService pool,
-                                             final Task<T> task,
-                                             final long delay,
-                                             final TimeUnit unit) {
-        execute(pool, task, delay, 0, unit);
-    }
-
-    private static <T> void executeAtFixedRate(final ExecutorService pool,
-                                               final Task<T> task,
-                                               long delay,
-                                               final long period,
-                                               final TimeUnit unit) {
-        execute(pool, task, delay, period, unit);
-    }
-
-    private static <T> void execute(final ExecutorService pool, final Task<T> task,
-                                    long delay, final long period, final TimeUnit unit) {
-        TaskInfo taskInfo;
-        synchronized (TASK_TASKINFO_MAP) {
-            if (TASK_TASKINFO_MAP.get(task) != null) {
-                Log.e("ThreadUtils", "Task can only be executed once.");
-                return;
-            }
-            taskInfo = new TaskInfo(pool);
-            TASK_TASKINFO_MAP.put(task, taskInfo);
-        }
-        if (period == 0) {
-            if (delay == 0) {
-                pool.execute(task);
-            } else {
-                TimerTask timerTask = new TimerTask() {
-                    @Override
-                    public void run() {
-                        pool.execute(task);
-                    }
-                };
-                taskInfo.mTimerTask = timerTask;
-                TIMER.schedule(timerTask, unit.toMillis(delay));
-            }
-        } else {
-            task.setSchedule(true);
-            TimerTask timerTask = new TimerTask() {
-                @Override
-                public void run() {
-                    pool.execute(task);
-                }
-            };
-            taskInfo.mTimerTask = timerTask;
-            TIMER.scheduleAtFixedRate(timerTask, unit.toMillis(delay), unit.toMillis(period));
-        }
-    }
-
-    private static ExecutorService getPoolByTypeAndPriority(final int type) {
-        return getPoolByTypeAndPriority(type, Thread.NORM_PRIORITY);
-    }
-
-    private static ExecutorService getPoolByTypeAndPriority(final int type, final int priority) {
-        synchronized (TYPE_PRIORITY_POOLS) {
-            ExecutorService pool;
-            Map<Integer, ExecutorService> priorityPools = TYPE_PRIORITY_POOLS.get(type);
-            if (priorityPools == null) {
-                priorityPools = new ConcurrentHashMap<>();
-                pool = ThreadPoolExecutor4Util.createPool(type, priority);
-                priorityPools.put(priority, pool);
-                TYPE_PRIORITY_POOLS.put(type, priorityPools);
-            } else {
-                pool = priorityPools.get(priority);
-                if (pool == null) {
-                    pool = ThreadPoolExecutor4Util.createPool(type, priority);
-                    priorityPools.put(priority, pool);
-                }
-            }
-            return pool;
-        }
-    }
-
-    static final class ThreadPoolExecutor4Util extends ThreadPoolExecutor {
-
-        private static ExecutorService createPool(final int type, final int priority) {
-            switch (type) {
-                case TYPE_SINGLE:
-                    return new ThreadPoolExecutor4Util(1, 1,
-                            0L, TimeUnit.MILLISECONDS,
-                            new LinkedBlockingQueue4Util(),
-                            new UtilsThreadFactory("single", priority)
-                    );
-                case TYPE_CACHED:
-                    return new ThreadPoolExecutor4Util(0, 128,
-                            60L, TimeUnit.SECONDS,
-                            new LinkedBlockingQueue4Util(true),
-                            new UtilsThreadFactory("cached", priority)
-                    );
-                case TYPE_IO:
-                    return new ThreadPoolExecutor4Util(2 * CPU_COUNT + 1, 2 * CPU_COUNT + 1,
-                            30, TimeUnit.SECONDS,
-                            new LinkedBlockingQueue4Util(),
-                            new UtilsThreadFactory("io", priority)
-                    );
-                case TYPE_CPU:
-                    return new ThreadPoolExecutor4Util(CPU_COUNT + 1, 2 * CPU_COUNT + 1,
-                            30, TimeUnit.SECONDS,
-                            new LinkedBlockingQueue4Util(true),
-                            new UtilsThreadFactory("cpu", priority)
-                    );
-                default:
-                    return new ThreadPoolExecutor4Util(type, type,
-                            0L, TimeUnit.MILLISECONDS,
-                            new LinkedBlockingQueue4Util(),
-                            new UtilsThreadFactory("fixed(" + type + ")", priority)
-                    );
-            }
-        }
-
-        private final AtomicInteger mSubmittedCount = new AtomicInteger();
-
-        private LinkedBlockingQueue4Util mWorkQueue;
-
-        ThreadPoolExecutor4Util(int corePoolSize, int maximumPoolSize,
-                                long keepAliveTime, TimeUnit unit,
-                                LinkedBlockingQueue4Util workQueue,
-                                ThreadFactory threadFactory) {
-            super(corePoolSize, maximumPoolSize,
-                    keepAliveTime, unit,
-                    workQueue,
-                    threadFactory
-            );
-            workQueue.mPool = this;
-            mWorkQueue = workQueue;
-        }
-
-        private int getSubmittedCount() {
-            return mSubmittedCount.get();
-        }
-
-        @Override
-        protected void afterExecute(Runnable r, Throwable t) {
-            mSubmittedCount.decrementAndGet();
-            super.afterExecute(r, t);
-        }
-
-        @Override
-        public void execute(@NonNull Runnable command) {
-            if (this.isShutdown()) return;
-            mSubmittedCount.incrementAndGet();
-            try {
-                super.execute(command);
-            } catch (RejectedExecutionException ignore) {
-                Log.e("ThreadUtils", "This will not happen!");
-                mWorkQueue.offer(command);
-            } catch (Throwable t) {
-                mSubmittedCount.decrementAndGet();
-            }
-        }
-    }
-
-    private static final class LinkedBlockingQueue4Util extends LinkedBlockingQueue<Runnable> {
-
-        private volatile ThreadPoolExecutor4Util mPool;
-
-        private int mCapacity = Integer.MAX_VALUE;
-
-        LinkedBlockingQueue4Util() {
-            super();
-        }
-
-        LinkedBlockingQueue4Util(boolean isAddSubThreadFirstThenAddQueue) {
-            super();
-            if (isAddSubThreadFirstThenAddQueue) {
-                mCapacity = 0;
-            }
-        }
-
-        LinkedBlockingQueue4Util(int capacity) {
-            super();
-            mCapacity = capacity;
-        }
-
-        @Override
-        public boolean offer(@NonNull Runnable runnable) {
-            if (mCapacity <= size() &&
-                    mPool != null && mPool.getPoolSize() < mPool.getMaximumPoolSize()) {
-                // create a non-core thread
-                return false;
-            }
-            return super.offer(runnable);
-        }
-    }
-
-    private static final class UtilsThreadFactory extends AtomicLong
-            implements ThreadFactory {
-        private static final AtomicInteger POOL_NUMBER      = new AtomicInteger(1);
-        private static final long          serialVersionUID = -9209200509960368598L;
-        private final        String        namePrefix;
-        private final        int           priority;
-        private final        boolean       isDaemon;
-
-        UtilsThreadFactory(String prefix, int priority) {
-            this(prefix, priority, false);
-        }
-
-        UtilsThreadFactory(String prefix, int priority, boolean isDaemon) {
-            namePrefix = prefix + "-pool-" +
-                    POOL_NUMBER.getAndIncrement() +
-                    "-thread-";
-            this.priority = priority;
-            this.isDaemon = isDaemon;
-        }
-
-        @Override
-        public Thread newThread(@NonNull Runnable r) {
-            Thread t = new Thread(r, namePrefix + getAndIncrement()) {
-                @Override
-                public void run() {
-                    try {
-                        super.run();
-                    } catch (Throwable t) {
-                        Log.e("ThreadUtils", "Request threw uncaught throwable", t);
-                    }
-                }
-            };
-            t.setDaemon(isDaemon);
-            t.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
-                @Override
-                public void uncaughtException(Thread t, Throwable e) {
-                    System.out.println(e);
-                }
-            });
-            t.setPriority(priority);
-            return t;
-        }
-    }
-
-    public abstract static class SimpleTask<T> extends Task<T> {
-
-        @Override
-        public void onCancel() {
-            Log.e("ThreadUtils", "onCancel: " + Thread.currentThread());
-        }
-
-        @Override
-        public void onFail(Throwable t) {
-            Log.e("ThreadUtils", "onFail: ", t);
-        }
-
-    }
-
-    public abstract static class Task<T> implements Runnable {
-
-        private static final int NEW         = 0;
-        private static final int RUNNING     = 1;
-        private static final int EXCEPTIONAL = 2;
-        private static final int COMPLETING  = 3;
-        private static final int CANCELLED   = 4;
-        private static final int INTERRUPTED = 5;
-        private static final int TIMEOUT     = 6;
-
-        private final AtomicInteger state = new AtomicInteger(NEW);
-
-        private volatile boolean isSchedule;
-        private volatile Thread  runner;
-
-        private Timer mTimer;
-
-        private Executor deliver;
-
-        public abstract T doInBackground() throws Throwable;
-
-        public abstract void onSuccess(T result);
-
-        public abstract void onCancel();
-
-        public abstract void onFail(Throwable t);
-
-        @Override
-        public void run() {
-            if (isSchedule) {
-                if (runner == null) {
-                    if (!state.compareAndSet(NEW, RUNNING)) return;
-                    runner = Thread.currentThread();
-                } else {
-                    if (state.get() != RUNNING) return;
-                }
-            } else {
-                if (!state.compareAndSet(NEW, RUNNING)) return;
-                runner = Thread.currentThread();
-            }
-            try {
-                final T result = doInBackground();
-                if (isSchedule) {
-                    if (state.get() != RUNNING) return;
-                    getDeliver().execute(new Runnable() {
-                        @Override
-                        public void run() {
-                            onSuccess(result);
-                        }
-                    });
-                } else {
-                    if (!state.compareAndSet(RUNNING, COMPLETING)) return;
-                    getDeliver().execute(new Runnable() {
-                        @Override
-                        public void run() {
-                            onSuccess(result);
-                            onDone();
-                        }
-                    });
-                }
-            } catch (InterruptedException ignore) {
-                state.compareAndSet(CANCELLED, INTERRUPTED);
-            } catch (final Throwable throwable) {
-                if (!state.compareAndSet(RUNNING, EXCEPTIONAL)) return;
-                getDeliver().execute(new Runnable() {
-                    @Override
-                    public void run() {
-                        onFail(throwable);
-                        onDone();
-                    }
-                });
-            }
-        }
-
-        public void cancel() {
-            cancel(true);
-        }
-
-        public void cancel(boolean mayInterruptIfRunning) {
-            synchronized (state) {
-                if (state.get() > RUNNING) return;
-                state.set(CANCELLED);
-            }
-            if (mayInterruptIfRunning) {
-                if (runner != null) {
-                    runner.interrupt();
-                }
-            }
-
-            getDeliver().execute(new Runnable() {
-                @Override
-                public void run() {
-                    onCancel();
-                    onDone();
-                }
-            });
-        }
-
-        private void timeout() {
-            synchronized (state) {
-                if (state.get() > RUNNING) return;
-                state.set(TIMEOUT);
-            }
-            if (runner != null) {
-                runner.interrupt();
-            }
-            onDone();
-        }
-
-
-        public boolean isCanceled() {
-            return state.get() >= CANCELLED;
-        }
-
-        public boolean isDone() {
-            return state.get() > RUNNING;
-        }
-
-        public Task<T> setDeliver(Executor deliver) {
-            this.deliver = deliver;
-            return this;
-        }
-
-        public void setTimeout(final long timeoutMillis, final OnTimeoutListener listener) {
-            mTimer = new Timer();
-            mTimer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    if (!isDone() && listener != null) {
-                        timeout();
-                        listener.onTimeout();
-                    }
-                }
-            }, timeoutMillis);
-        }
-
-        private void setSchedule(boolean isSchedule) {
-            this.isSchedule = isSchedule;
-        }
-
-        private Executor getDeliver() {
-            if (deliver == null) {
-                return getGlobalDeliver();
-            }
-            return deliver;
-        }
-
-        @CallSuper
-        protected void onDone() {
-            TASK_TASKINFO_MAP.remove(this);
-            if (mTimer != null) {
-                mTimer.cancel();
-                mTimer = null;
-            }
-        }
-
-        public interface OnTimeoutListener {
-            void onTimeout();
-        }
-    }
-
-    private static Executor getGlobalDeliver() {
-        if (sDeliver == null) {
-            sDeliver = new Executor() {
-                private final Handler mHandler = new Handler(Looper.getMainLooper());
-
-                @Override
-                public void execute(@NonNull Runnable command) {
-                    mHandler.post(command);
-                }
-            };
-        }
-        return sDeliver;
-    }
-
-    private static class TaskInfo {
-        private TimerTask       mTimerTask;
-        private ExecutorService mService;
-
-        private TaskInfo(ExecutorService service) {
-            mService = service;
-        }
-    }
-}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TimeConstants.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TimeConstants.java
deleted file mode 100644
index 5347f87cd6..0000000000
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TimeConstants.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mogo.module.v2x.utils;
-
-import androidx.annotation.IntDef;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * <pre>
- *     author: Blankj
- *     blog  : http://blankj.com
- *     time  : 2017/03/13
- *     desc  : constants of time
- * </pre>
- */
-public final class TimeConstants {
-
-    public static final int MSEC = 1;
-    public static final int SEC  = 1000;
-    public static final int MIN  = 60000;
-    public static final int HOUR = 3600000;
-    public static final int DAY  = 86400000;
-
-    @IntDef({MSEC, SEC, MIN, HOUR, DAY})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Unit {
-    }
-}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TimeUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TimeUtils.java
deleted file mode 100644
index 7980072b9b..0000000000
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TimeUtils.java
+++ /dev/null
@@ -1,1608 +0,0 @@
-package com.mogo.module.v2x.utils;
-
-import androidx.annotation.NonNull;
-
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-
-/**
- * <pre>
- *     author: Blankj
- *     blog  : http://blankj.com
- *     time  : 2016/08/02
- *     desc  : utils about time
- * </pre>
- */
-public final class TimeUtils {
-
-    private static final ThreadLocal<SimpleDateFormat> SDF_THREAD_LOCAL = new ThreadLocal<>();
-
-    private static SimpleDateFormat getDefaultFormat() {
-        return getDateFormat("yyyy-MM-dd HH:mm:ss");
-    }
-
-    private static SimpleDateFormat getDateFormat(String pattern) {
-        SimpleDateFormat simpleDateFormat = SDF_THREAD_LOCAL.get();
-        if (simpleDateFormat == null) {
-            simpleDateFormat = new SimpleDateFormat(pattern, Locale.getDefault());
-            SDF_THREAD_LOCAL.set(simpleDateFormat);
-        } else {
-            simpleDateFormat.applyPattern(pattern);
-        }
-        return simpleDateFormat;
-    }
-
-    private TimeUtils() {
-        throw new UnsupportedOperationException("u can't instantiate me...");
-    }
-
-    /**
-     * Milliseconds to the formatted time string.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param millis The milliseconds.
-     * @return the formatted time string
-     */
-    public static String millis2String(final long millis) {
-        return millis2String(millis, getDefaultFormat());
-    }
-
-    /**
-     * Milliseconds to the formatted time string.
-     *
-     * @param millis  The milliseconds.
-     * @param pattern The pattern of date format, such as yyyy/MM/dd HH:mm
-     * @return the formatted time string
-     */
-    public static String millis2String(long millis, @NonNull final String pattern) {
-        return millis2String(millis, getDateFormat(pattern));
-    }
-
-    /**
-     * Milliseconds to the formatted time string.
-     *
-     * @param millis The milliseconds.
-     * @param format The format.
-     * @return the formatted time string
-     */
-    public static String millis2String(final long millis, @NonNull final DateFormat format) {
-        return format.format(new Date(millis));
-    }
-
-    /**
-     * Formatted time string to the milliseconds.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return the milliseconds
-     */
-    public static long string2Millis(final String time) {
-        return string2Millis(time, getDefaultFormat());
-    }
-
-    /**
-     * Formatted time string to the milliseconds.
-     *
-     * @param time    The formatted time string.
-     * @param pattern The pattern of date format, such as yyyy/MM/dd HH:mm
-     * @return the milliseconds
-     */
-    public static long string2Millis(final String time, @NonNull final String pattern) {
-        return string2Millis(time, getDateFormat(pattern));
-    }
-
-    /**
-     * Formatted time string to the milliseconds.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return the milliseconds
-     */
-    public static long string2Millis(final String time, @NonNull final DateFormat format) {
-        try {
-            return format.parse(time).getTime();
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return -1;
-    }
-
-    /**
-     * Formatted time string to the date.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return the date
-     */
-    public static Date string2Date(final String time) {
-        return string2Date(time, getDefaultFormat());
-    }
-
-    /**
-     * Formatted time string to the date.
-     *
-     * @param time    The formatted time string.
-     * @param pattern The pattern of date format, such as yyyy/MM/dd HH:mm
-     * @return the date
-     */
-    public static Date string2Date(final String time, @NonNull final String pattern) {
-        return string2Date(time, getDateFormat(pattern));
-    }
-
-    /**
-     * Formatted time string to the date.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return the date
-     */
-    public static Date string2Date(final String time, @NonNull final DateFormat format) {
-        try {
-            return format.parse(time);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * Date to the formatted time string.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param date The date.
-     * @return the formatted time string
-     */
-    public static String date2String(final Date date) {
-        return date2String(date, getDefaultFormat());
-    }
-
-    /**
-     * Date to the formatted time string.
-     *
-     * @param date    The date.
-     * @param pattern The pattern of date format, such as yyyy/MM/dd HH:mm
-     * @return the formatted time string
-     */
-    public static String date2String(final Date date, @NonNull final String pattern) {
-        return getDateFormat(pattern).format(date);
-    }
-
-    /**
-     * Date to the formatted time string.
-     *
-     * @param date   The date.
-     * @param format The format.
-     * @return the formatted time string
-     */
-    public static String date2String(final Date date, @NonNull final DateFormat format) {
-        return format.format(date);
-    }
-
-    /**
-     * Date to the milliseconds.
-     *
-     * @param date The date.
-     * @return the milliseconds
-     */
-    public static long date2Millis(final Date date) {
-        return date.getTime();
-    }
-
-    /**
-     * Milliseconds to the date.
-     *
-     * @param millis The milliseconds.
-     * @return the date
-     */
-    public static Date millis2Date(final long millis) {
-        return new Date(millis);
-    }
-
-    /**
-     * Return the time span, in unit.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time1 The first formatted time string.
-     * @param time2 The second formatted time string.
-     * @param unit  The unit of time span.
-     *              <ul>
-     *              <li>{@link TimeConstants#MSEC}</li>
-     *              <li>{@link TimeConstants#SEC }</li>
-     *              <li>{@link TimeConstants#MIN }</li>
-     *              <li>{@link TimeConstants#HOUR}</li>
-     *              <li>{@link TimeConstants#DAY }</li>
-     *              </ul>
-     * @return the time span, in unit
-     */
-    public static long getTimeSpan(final String time1,
-                                   final String time2,
-                                   @TimeConstants.Unit final int unit) {
-        return getTimeSpan(time1, time2, getDefaultFormat(), unit);
-    }
-
-    /**
-     * Return the time span, in unit.
-     *
-     * @param time1  The first formatted time string.
-     * @param time2  The second formatted time string.
-     * @param format The format.
-     * @param unit   The unit of time span.
-     *               <ul>
-     *               <li>{@link TimeConstants#MSEC}</li>
-     *               <li>{@link TimeConstants#SEC }</li>
-     *               <li>{@link TimeConstants#MIN }</li>
-     *               <li>{@link TimeConstants#HOUR}</li>
-     *               <li>{@link TimeConstants#DAY }</li>
-     *               </ul>
-     * @return the time span, in unit
-     */
-    public static long getTimeSpan(final String time1,
-                                   final String time2,
-                                   @NonNull final DateFormat format,
-                                   @TimeConstants.Unit final int unit) {
-        return millis2TimeSpan(string2Millis(time1, format) - string2Millis(time2, format), unit);
-    }
-
-    /**
-     * Return the time span, in unit.
-     *
-     * @param date1 The first date.
-     * @param date2 The second date.
-     * @param unit  The unit of time span.
-     *              <ul>
-     *              <li>{@link TimeConstants#MSEC}</li>
-     *              <li>{@link TimeConstants#SEC }</li>
-     *              <li>{@link TimeConstants#MIN }</li>
-     *              <li>{@link TimeConstants#HOUR}</li>
-     *              <li>{@link TimeConstants#DAY }</li>
-     *              </ul>
-     * @return the time span, in unit
-     */
-    public static long getTimeSpan(final Date date1,
-                                   final Date date2,
-                                   @TimeConstants.Unit final int unit) {
-        return millis2TimeSpan(date2Millis(date1) - date2Millis(date2), unit);
-    }
-
-    /**
-     * Return the time span, in unit.
-     *
-     * @param millis1 The first milliseconds.
-     * @param millis2 The second milliseconds.
-     * @param unit    The unit of time span.
-     *                <ul>
-     *                <li>{@link TimeConstants#MSEC}</li>
-     *                <li>{@link TimeConstants#SEC }</li>
-     *                <li>{@link TimeConstants#MIN }</li>
-     *                <li>{@link TimeConstants#HOUR}</li>
-     *                <li>{@link TimeConstants#DAY }</li>
-     *                </ul>
-     * @return the time span, in unit
-     */
-    public static long getTimeSpan(final long millis1,
-                                   final long millis2,
-                                   @TimeConstants.Unit final int unit) {
-        return millis2TimeSpan(millis1 - millis2, unit);
-    }
-
-    /**
-     * Return the fit time span.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time1     The first formatted time string.
-     * @param time2     The second formatted time string.
-     * @param precision The precision of time span.
-     *                  <ul>
-     *                  <li>precision = 0, return null</li>
-     *                  <li>precision = 1, return 天</li>
-     *                  <li>precision = 2, return 天, 小时</li>
-     *                  <li>precision = 3, return 天, 小时, 分钟</li>
-     *                  <li>precision = 4, return 天, 小时, 分钟, 秒</li>
-     *                  <li>precision &gt;= 5，return 天, 小时, 分钟, 秒, 毫秒</li>
-     *                  </ul>
-     * @return the fit time span
-     */
-    public static String getFitTimeSpan(final String time1,
-                                        final String time2,
-                                        final int precision) {
-        long delta = string2Millis(time1, getDefaultFormat()) - string2Millis(time2, getDefaultFormat());
-        return millis2FitTimeSpan(delta, precision);
-    }
-
-    /**
-     * Return the fit time span.
-     *
-     * @param time1     The first formatted time string.
-     * @param time2     The second formatted time string.
-     * @param format    The format.
-     * @param precision The precision of time span.
-     *                  <ul>
-     *                  <li>precision = 0, return null</li>
-     *                  <li>precision = 1, return 天</li>
-     *                  <li>precision = 2, return 天, 小时</li>
-     *                  <li>precision = 3, return 天, 小时, 分钟</li>
-     *                  <li>precision = 4, return 天, 小时, 分钟, 秒</li>
-     *                  <li>precision &gt;= 5，return 天, 小时, 分钟, 秒, 毫秒</li>
-     *                  </ul>
-     * @return the fit time span
-     */
-    public static String getFitTimeSpan(final String time1,
-                                        final String time2,
-                                        @NonNull final DateFormat format,
-                                        final int precision) {
-        long delta = string2Millis(time1, format) - string2Millis(time2, format);
-        return millis2FitTimeSpan(delta, precision);
-    }
-
-    /**
-     * Return the fit time span.
-     *
-     * @param date1     The first date.
-     * @param date2     The second date.
-     * @param precision The precision of time span.
-     *                  <ul>
-     *                  <li>precision = 0, return null</li>
-     *                  <li>precision = 1, return 天</li>
-     *                  <li>precision = 2, return 天, 小时</li>
-     *                  <li>precision = 3, return 天, 小时, 分钟</li>
-     *                  <li>precision = 4, return 天, 小时, 分钟, 秒</li>
-     *                  <li>precision &gt;= 5，return 天, 小时, 分钟, 秒, 毫秒</li>
-     *                  </ul>
-     * @return the fit time span
-     */
-    public static String getFitTimeSpan(final Date date1, final Date date2, final int precision) {
-        return millis2FitTimeSpan(date2Millis(date1) - date2Millis(date2), precision);
-    }
-
-    /**
-     * Return the fit time span.
-     *
-     * @param millis1   The first milliseconds.
-     * @param millis2   The second milliseconds.
-     * @param precision The precision of time span.
-     *                  <ul>
-     *                  <li>precision = 0, return null</li>
-     *                  <li>precision = 1, return 天</li>
-     *                  <li>precision = 2, return 天, 小时</li>
-     *                  <li>precision = 3, return 天, 小时, 分钟</li>
-     *                  <li>precision = 4, return 天, 小时, 分钟, 秒</li>
-     *                  <li>precision &gt;= 5，return 天, 小时, 分钟, 秒, 毫秒</li>
-     *                  </ul>
-     * @return the fit time span
-     */
-    public static String getFitTimeSpan(final long millis1,
-                                        final long millis2,
-                                        final int precision) {
-        return millis2FitTimeSpan(millis1 - millis2, precision);
-    }
-
-    /**
-     * Return the current time in milliseconds.
-     *
-     * @return the current time in milliseconds
-     */
-    public static long getNowMills() {
-        return System.currentTimeMillis();
-    }
-
-    /**
-     * Return the current formatted time string.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @return the current formatted time string
-     */
-    public static String getNowString() {
-        return millis2String(System.currentTimeMillis(), getDefaultFormat());
-    }
-
-    /**
-     * Return the current formatted time string.
-     *
-     * @param format The format.
-     * @return the current formatted time string
-     */
-    public static String getNowString(@NonNull final DateFormat format) {
-        return millis2String(System.currentTimeMillis(), format);
-    }
-
-    /**
-     * Return the current date.
-     *
-     * @return the current date
-     */
-    public static Date getNowDate() {
-        return new Date();
-    }
-
-    /**
-     * Return the time span by now, in unit.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @param unit The unit of time span.
-     *             <ul>
-     *             <li>{@link TimeConstants#MSEC}</li>
-     *             <li>{@link TimeConstants#SEC }</li>
-     *             <li>{@link TimeConstants#MIN }</li>
-     *             <li>{@link TimeConstants#HOUR}</li>
-     *             <li>{@link TimeConstants#DAY }</li>
-     *             </ul>
-     * @return the time span by now, in unit
-     */
-    public static long getTimeSpanByNow(final String time, @TimeConstants.Unit final int unit) {
-        return Math.abs(getTimeSpan(time, getNowString(), getDefaultFormat(), unit));
-    }
-
-    /**
-     * Return the time span by now, in unit.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @param unit   The unit of time span.
-     *               <ul>
-     *               <li>{@link TimeConstants#MSEC}</li>
-     *               <li>{@link TimeConstants#SEC }</li>
-     *               <li>{@link TimeConstants#MIN }</li>
-     *               <li>{@link TimeConstants#HOUR}</li>
-     *               <li>{@link TimeConstants#DAY }</li>
-     *               </ul>
-     * @return the time span by now, in unit
-     */
-    public static long getTimeSpanByNow(final String time,
-                                        @NonNull final DateFormat format,
-                                        @TimeConstants.Unit final int unit) {
-        return getTimeSpan(time, getNowString(format), format, unit);
-    }
-
-    /**
-     * Return the time span by now, in unit.
-     *
-     * @param date The date.
-     * @param unit The unit of time span.
-     *             <ul>
-     *             <li>{@link TimeConstants#MSEC}</li>
-     *             <li>{@link TimeConstants#SEC }</li>
-     *             <li>{@link TimeConstants#MIN }</li>
-     *             <li>{@link TimeConstants#HOUR}</li>
-     *             <li>{@link TimeConstants#DAY }</li>
-     *             </ul>
-     * @return the time span by now, in unit
-     */
-    public static long getTimeSpanByNow(final Date date, @TimeConstants.Unit final int unit) {
-        return getTimeSpan(date, new Date(), unit);
-    }
-
-    /**
-     * Return the time span by now, in unit.
-     *
-     * @param millis The milliseconds.
-     * @param unit   The unit of time span.
-     *               <ul>
-     *               <li>{@link TimeConstants#MSEC}</li>
-     *               <li>{@link TimeConstants#SEC }</li>
-     *               <li>{@link TimeConstants#MIN }</li>
-     *               <li>{@link TimeConstants#HOUR}</li>
-     *               <li>{@link TimeConstants#DAY }</li>
-     *               </ul>
-     * @return the time span by now, in unit
-     */
-    public static long getTimeSpanByNow(final long millis, @TimeConstants.Unit final int unit) {
-        return getTimeSpan(millis, System.currentTimeMillis(), unit);
-    }
-
-    /**
-     * Return the fit time span by now.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time      The formatted time string.
-     * @param precision The precision of time span.
-     *                  <ul>
-     *                  <li>precision = 0，返回 null</li>
-     *                  <li>precision = 1，返回天</li>
-     *                  <li>precision = 2，返回天和小时</li>
-     *                  <li>precision = 3，返回天、小时和分钟</li>
-     *                  <li>precision = 4，返回天、小时、分钟和秒</li>
-     *                  <li>precision &gt;= 5，返回天、小时、分钟、秒和毫秒</li>
-     *                  </ul>
-     * @return the fit time span by now
-     */
-    public static String getFitTimeSpanByNow(final String time, final int precision) {
-        return getFitTimeSpan(time, getNowString(), getDefaultFormat(), precision);
-    }
-
-    /**
-     * Return the fit time span by now.
-     *
-     * @param time      The formatted time string.
-     * @param format    The format.
-     * @param precision The precision of time span.
-     *                  <ul>
-     *                  <li>precision = 0，返回 null</li>
-     *                  <li>precision = 1，返回天</li>
-     *                  <li>precision = 2，返回天和小时</li>
-     *                  <li>precision = 3，返回天、小时和分钟</li>
-     *                  <li>precision = 4，返回天、小时、分钟和秒</li>
-     *                  <li>precision &gt;= 5，返回天、小时、分钟、秒和毫秒</li>
-     *                  </ul>
-     * @return the fit time span by now
-     */
-    public static String getFitTimeSpanByNow(final String time,
-                                             @NonNull final DateFormat format,
-                                             final int precision) {
-        return getFitTimeSpan(time, getNowString(format), format, precision);
-    }
-
-    /**
-     * Return the fit time span by now.
-     *
-     * @param date      The date.
-     * @param precision The precision of time span.
-     *                  <ul>
-     *                  <li>precision = 0，返回 null</li>
-     *                  <li>precision = 1，返回天</li>
-     *                  <li>precision = 2，返回天和小时</li>
-     *                  <li>precision = 3，返回天、小时和分钟</li>
-     *                  <li>precision = 4，返回天、小时、分钟和秒</li>
-     *                  <li>precision &gt;= 5，返回天、小时、分钟、秒和毫秒</li>
-     *                  </ul>
-     * @return the fit time span by now
-     */
-    public static String getFitTimeSpanByNow(final Date date, final int precision) {
-        return getFitTimeSpan(date, getNowDate(), precision);
-    }
-
-    /**
-     * Return the fit time span by now.
-     *
-     * @param millis    The milliseconds.
-     * @param precision The precision of time span.
-     *                  <ul>
-     *                  <li>precision = 0，返回 null</li>
-     *                  <li>precision = 1，返回天</li>
-     *                  <li>precision = 2，返回天和小时</li>
-     *                  <li>precision = 3，返回天、小时和分钟</li>
-     *                  <li>precision = 4，返回天、小时、分钟和秒</li>
-     *                  <li>precision &gt;= 5，返回天、小时、分钟、秒和毫秒</li>
-     *                  </ul>
-     * @return the fit time span by now
-     */
-    public static String getFitTimeSpanByNow(final long millis, final int precision) {
-        return getFitTimeSpan(millis, System.currentTimeMillis(), precision);
-    }
-
-    /**
-     * Return the friendly time span by now.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return the friendly time span by now
-     * <ul>
-     * <li>如果小于 1 秒钟内，显示刚刚</li>
-     * <li>如果在 1 分钟内，显示 XXX秒前</li>
-     * <li>如果在 1 小时内，显示 XXX分钟前</li>
-     * <li>如果在 1 小时外的今天内，显示今天15:32</li>
-     * <li>如果是昨天的，显示昨天15:32</li>
-     * <li>其余显示，2016-10-15</li>
-     * <li>时间不合法的情况全部日期和时间信息，如星期六 十月 27 14:21:20 CST 2007</li>
-     * </ul>
-     */
-    public static String getFriendlyTimeSpanByNow(final String time) {
-        return getFriendlyTimeSpanByNow(time, getDefaultFormat());
-    }
-
-    /**
-     * Return the friendly time span by now.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return the friendly time span by now
-     * <ul>
-     * <li>如果小于 1 秒钟内，显示刚刚</li>
-     * <li>如果在 1 分钟内，显示 XXX秒前</li>
-     * <li>如果在 1 小时内，显示 XXX分钟前</li>
-     * <li>如果在 1 小时外的今天内，显示今天15:32</li>
-     * <li>如果是昨天的，显示昨天15:32</li>
-     * <li>其余显示，2016-10-15</li>
-     * <li>时间不合法的情况全部日期和时间信息，如星期六 十月 27 14:21:20 CST 2007</li>
-     * </ul>
-     */
-    public static String getFriendlyTimeSpanByNow(final String time,
-                                                  @NonNull final DateFormat format) {
-        return getFriendlyTimeSpanByNow(string2Millis(time, format));
-    }
-
-    /**
-     * Return the friendly time span by now.
-     *
-     * @param date The date.
-     * @return the friendly time span by now
-     * <ul>
-     * <li>如果小于 1 秒钟内，显示刚刚</li>
-     * <li>如果在 1 分钟内，显示 XXX秒前</li>
-     * <li>如果在 1 小时内，显示 XXX分钟前</li>
-     * <li>如果在 1 小时外的今天内，显示今天15:32</li>
-     * <li>如果是昨天的，显示昨天15:32</li>
-     * <li>其余显示，2016-10-15</li>
-     * <li>时间不合法的情况全部日期和时间信息，如星期六 十月 27 14:21:20 CST 2007</li>
-     * </ul>
-     */
-    public static String getFriendlyTimeSpanByNow(final Date date) {
-        return getFriendlyTimeSpanByNow(date.getTime());
-    }
-
-    /**
-     * Return the friendly time span by now.
-     *
-     * @param millis The milliseconds.
-     * @return the friendly time span by now
-     * <ul>
-     * <li>如果小于 1 秒钟内，显示刚刚</li>
-     * <li>如果在 1 分钟内，显示 XXX秒前</li>
-     * <li>如果在 1 小时内，显示 XXX分钟前</li>
-     * <li>如果在 1 小时外的今天内，显示今天15:32</li>
-     * <li>如果是昨天的，显示昨天15:32</li>
-     * <li>其余显示，2016-10-15</li>
-     * <li>时间不合法的情况全部日期和时间信息，如星期六 十月 27 14:21:20 CST 2007</li>
-     * </ul>
-     */
-    public static String getFriendlyTimeSpanByNow(final long millis) {
-        long now = System.currentTimeMillis();
-        long span = now - millis;
-        if (span < 0)
-            // U can read http://www.apihome.cn/api/java/Formatter.html to understand it.
-            return String.format("%tc", millis);
-        if (span < 1000) {
-            return "刚刚";
-        } else if (span < TimeConstants.MIN) {
-            return String.format(Locale.getDefault(), "%d秒前", span / TimeConstants.SEC);
-        } else if (span < TimeConstants.HOUR) {
-            return String.format(Locale.getDefault(), "%d分钟前", span / TimeConstants.MIN);
-        }
-        // 获取当天 00:00
-        long wee = getWeeOfToday();
-        if (millis >= wee) {
-            return String.format("今天%tR", millis);
-        } else if (millis >= wee - TimeConstants.DAY) {
-            return String.format("昨天%tR", millis);
-        } else {
-            return String.format("%tF", millis);
-        }
-    }
-
-    private static long getWeeOfToday() {
-        Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.HOUR_OF_DAY, 0);
-        cal.set(Calendar.SECOND, 0);
-        cal.set(Calendar.MINUTE, 0);
-        cal.set(Calendar.MILLISECOND, 0);
-        return cal.getTimeInMillis();
-    }
-
-    /**
-     * Return the milliseconds differ time span.
-     *
-     * @param millis   The milliseconds.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the milliseconds differ time span
-     */
-    public static long getMillis(final long millis,
-                                 final long timeSpan,
-                                 @TimeConstants.Unit final int unit) {
-        return millis + timeSpan2Millis(timeSpan, unit);
-    }
-
-    /**
-     * Return the milliseconds differ time span.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time     The formatted time string.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the milliseconds differ time span
-     */
-    public static long getMillis(final String time,
-                                 final long timeSpan,
-                                 @TimeConstants.Unit final int unit) {
-        return getMillis(time, getDefaultFormat(), timeSpan, unit);
-    }
-
-    /**
-     * Return the milliseconds differ time span.
-     *
-     * @param time     The formatted time string.
-     * @param format   The format.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the milliseconds differ time span.
-     */
-    public static long getMillis(final String time,
-                                 @NonNull final DateFormat format,
-                                 final long timeSpan,
-                                 @TimeConstants.Unit final int unit) {
-        return string2Millis(time, format) + timeSpan2Millis(timeSpan, unit);
-    }
-
-    /**
-     * Return the milliseconds differ time span.
-     *
-     * @param date     The date.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the milliseconds differ time span.
-     */
-    public static long getMillis(final Date date,
-                                 final long timeSpan,
-                                 @TimeConstants.Unit final int unit) {
-        return date2Millis(date) + timeSpan2Millis(timeSpan, unit);
-    }
-
-    /**
-     * Return the formatted time string differ time span.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param millis   The milliseconds.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the formatted time string differ time span
-     */
-    public static String getString(final long millis,
-                                   final long timeSpan,
-                                   @TimeConstants.Unit final int unit) {
-        return getString(millis, getDefaultFormat(), timeSpan, unit);
-    }
-
-    /**
-     * Return the formatted time string differ time span.
-     *
-     * @param millis   The milliseconds.
-     * @param format   The format.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the formatted time string differ time span
-     */
-    public static String getString(final long millis,
-                                   @NonNull final DateFormat format,
-                                   final long timeSpan,
-                                   @TimeConstants.Unit final int unit) {
-        return millis2String(millis + timeSpan2Millis(timeSpan, unit), format);
-    }
-
-    /**
-     * Return the formatted time string differ time span.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time     The formatted time string.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the formatted time string differ time span
-     */
-    public static String getString(final String time,
-                                   final long timeSpan,
-                                   @TimeConstants.Unit final int unit) {
-        return getString(time, getDefaultFormat(), timeSpan, unit);
-    }
-
-    /**
-     * Return the formatted time string differ time span.
-     *
-     * @param time     The formatted time string.
-     * @param format   The format.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the formatted time string differ time span
-     */
-    public static String getString(final String time,
-                                   @NonNull final DateFormat format,
-                                   final long timeSpan,
-                                   @TimeConstants.Unit final int unit) {
-        return millis2String(string2Millis(time, format) + timeSpan2Millis(timeSpan, unit), format);
-    }
-
-    /**
-     * Return the formatted time string differ time span.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param date     The date.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the formatted time string differ time span
-     */
-    public static String getString(final Date date,
-                                   final long timeSpan,
-                                   @TimeConstants.Unit final int unit) {
-        return getString(date, getDefaultFormat(), timeSpan, unit);
-    }
-
-    /**
-     * Return the formatted time string differ time span.
-     *
-     * @param date     The date.
-     * @param format   The format.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the formatted time string differ time span
-     */
-    public static String getString(final Date date,
-                                   @NonNull final DateFormat format,
-                                   final long timeSpan,
-                                   @TimeConstants.Unit final int unit) {
-        return millis2String(date2Millis(date) + timeSpan2Millis(timeSpan, unit), format);
-    }
-
-    /**
-     * Return the date differ time span.
-     *
-     * @param millis   The milliseconds.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the date differ time span
-     */
-    public static Date getDate(final long millis,
-                               final long timeSpan,
-                               @TimeConstants.Unit final int unit) {
-        return millis2Date(millis + timeSpan2Millis(timeSpan, unit));
-    }
-
-    /**
-     * Return the date differ time span.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time     The formatted time string.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the date differ time span
-     */
-    public static Date getDate(final String time,
-                               final long timeSpan,
-                               @TimeConstants.Unit final int unit) {
-        return getDate(time, getDefaultFormat(), timeSpan, unit);
-    }
-
-    /**
-     * Return the date differ time span.
-     *
-     * @param time     The formatted time string.
-     * @param format   The format.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the date differ time span
-     */
-    public static Date getDate(final String time,
-                               @NonNull final DateFormat format,
-                               final long timeSpan,
-                               @TimeConstants.Unit final int unit) {
-        return millis2Date(string2Millis(time, format) + timeSpan2Millis(timeSpan, unit));
-    }
-
-    /**
-     * Return the date differ time span.
-     *
-     * @param date     The date.
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the date differ time span
-     */
-    public static Date getDate(final Date date,
-                               final long timeSpan,
-                               @TimeConstants.Unit final int unit) {
-        return millis2Date(date2Millis(date) + timeSpan2Millis(timeSpan, unit));
-    }
-
-    /**
-     * Return the milliseconds differ time span by now.
-     *
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the milliseconds differ time span by now
-     */
-    public static long getMillisByNow(final long timeSpan, @TimeConstants.Unit final int unit) {
-        return getMillis(getNowMills(), timeSpan, unit);
-    }
-
-    /**
-     * Return the formatted time string differ time span by now.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the formatted time string differ time span by now
-     */
-    public static String getStringByNow(final long timeSpan, @TimeConstants.Unit final int unit) {
-        return getStringByNow(timeSpan, getDefaultFormat(), unit);
-    }
-
-    /**
-     * Return the formatted time string differ time span by now.
-     *
-     * @param timeSpan The time span.
-     * @param format   The format.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the formatted time string differ time span by now
-     */
-    public static String getStringByNow(final long timeSpan,
-                                        @NonNull final DateFormat format,
-                                        @TimeConstants.Unit final int unit) {
-        return getString(getNowMills(), format, timeSpan, unit);
-    }
-
-    /**
-     * Return the date differ time span by now.
-     *
-     * @param timeSpan The time span.
-     * @param unit     The unit of time span.
-     *                 <ul>
-     *                 <li>{@link TimeConstants#MSEC}</li>
-     *                 <li>{@link TimeConstants#SEC }</li>
-     *                 <li>{@link TimeConstants#MIN }</li>
-     *                 <li>{@link TimeConstants#HOUR}</li>
-     *                 <li>{@link TimeConstants#DAY }</li>
-     *                 </ul>
-     * @return the date differ time span by now
-     */
-    public static Date getDateByNow(final long timeSpan, @TimeConstants.Unit final int unit) {
-        return getDate(getNowMills(), timeSpan, unit);
-    }
-
-    /**
-     * Return whether it is today.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isToday(final String time) {
-        return isToday(string2Millis(time, getDefaultFormat()));
-    }
-
-    /**
-     * Return whether it is today.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isToday(final String time, @NonNull final DateFormat format) {
-        return isToday(string2Millis(time, format));
-    }
-
-    /**
-     * Return whether it is today.
-     *
-     * @param date The date.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isToday(final Date date) {
-        return isToday(date.getTime());
-    }
-
-    /**
-     * Return whether it is today.
-     *
-     * @param millis The milliseconds.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isToday(final long millis) {
-        long wee = getWeeOfToday();
-        return millis >= wee && millis < wee + TimeConstants.DAY;
-    }
-
-    /**
-     * Return whether it is leap year.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isLeapYear(final String time) {
-        return isLeapYear(string2Date(time, getDefaultFormat()));
-    }
-
-    /**
-     * Return whether it is leap year.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isLeapYear(final String time, @NonNull final DateFormat format) {
-        return isLeapYear(string2Date(time, format));
-    }
-
-    /**
-     * Return whether it is leap year.
-     *
-     * @param date The date.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isLeapYear(final Date date) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(date);
-        int year = cal.get(Calendar.YEAR);
-        return isLeapYear(year);
-    }
-
-    /**
-     * Return whether it is leap year.
-     *
-     * @param millis The milliseconds.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isLeapYear(final long millis) {
-        return isLeapYear(millis2Date(millis));
-    }
-
-    /**
-     * Return whether it is leap year.
-     *
-     * @param year The year.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isLeapYear(final int year) {
-        return year % 4 == 0 && year % 100 != 0 || year % 400 == 0;
-    }
-
-    /**
-     * Return the day of week in Chinese.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return the day of week in Chinese
-     */
-    public static String getChineseWeek(final String time) {
-        return getChineseWeek(string2Date(time, getDefaultFormat()));
-    }
-
-    /**
-     * Return the day of week in Chinese.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return the day of week in Chinese
-     */
-    public static String getChineseWeek(final String time, @NonNull final DateFormat format) {
-        return getChineseWeek(string2Date(time, format));
-    }
-
-    /**
-     * Return the day of week in Chinese.
-     *
-     * @param date The date.
-     * @return the day of week in Chinese
-     */
-    public static String getChineseWeek(final Date date) {
-        return new SimpleDateFormat("E", Locale.CHINA).format(date);
-    }
-
-    /**
-     * Return the day of week in Chinese.
-     *
-     * @param millis The milliseconds.
-     * @return the day of week in Chinese
-     */
-    public static String getChineseWeek(final long millis) {
-        return getChineseWeek(new Date(millis));
-    }
-
-    /**
-     * Return the day of week in US.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return the day of week in US
-     */
-    public static String getUSWeek(final String time) {
-        return getUSWeek(string2Date(time, getDefaultFormat()));
-    }
-
-    /**
-     * Return the day of week in US.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return the day of week in US
-     */
-    public static String getUSWeek(final String time, @NonNull final DateFormat format) {
-        return getUSWeek(string2Date(time, format));
-    }
-
-    /**
-     * Return the day of week in US.
-     *
-     * @param date The date.
-     * @return the day of week in US
-     */
-    public static String getUSWeek(final Date date) {
-        return new SimpleDateFormat("EEEE", Locale.US).format(date);
-    }
-
-    /**
-     * Return the day of week in US.
-     *
-     * @param millis The milliseconds.
-     * @return the day of week in US
-     */
-    public static String getUSWeek(final long millis) {
-        return getUSWeek(new Date(millis));
-    }
-
-    /**
-     * Return whether it is am.
-     *
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isAm() {
-        Calendar cal = Calendar.getInstance();
-        return cal.get(GregorianCalendar.AM_PM) == 0;
-    }
-
-    /**
-     * Return whether it is am.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isAm(final String time) {
-        return getValueByCalendarField(time, getDefaultFormat(), GregorianCalendar.AM_PM) == 0;
-    }
-
-    /**
-     * Return whether it is am.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isAm(final String time,
-                               @NonNull final DateFormat format) {
-        return getValueByCalendarField(time, format, GregorianCalendar.AM_PM) == 0;
-    }
-
-    /**
-     * Return whether it is am.
-     *
-     * @param date The date.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isAm(final Date date) {
-        return getValueByCalendarField(date, GregorianCalendar.AM_PM) == 0;
-    }
-
-    /**
-     * Return whether it is am.
-     *
-     * @param millis The milliseconds.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isAm(final long millis) {
-        return getValueByCalendarField(millis, GregorianCalendar.AM_PM) == 0;
-    }
-
-    /**
-     * Return whether it is am.
-     *
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isPm() {
-        return !isAm();
-    }
-
-    /**
-     * Return whether it is am.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isPm(final String time) {
-        return !isAm(time);
-    }
-
-    /**
-     * Return whether it is am.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isPm(final String time,
-                               @NonNull final DateFormat format) {
-        return !isAm(time, format);
-    }
-
-    /**
-     * Return whether it is am.
-     *
-     * @param date The date.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isPm(final Date date) {
-        return !isAm(date);
-    }
-
-    /**
-     * Return whether it is am.
-     *
-     * @param millis The milliseconds.
-     * @return {@code true}: yes<br>{@code false}: no
-     */
-    public static boolean isPm(final long millis) {
-        return !isAm(millis);
-    }
-
-    /**
-     * Returns the value of the given calendar field.
-     *
-     * @param field The given calendar field.
-     *              <ul>
-     *              <li>{@link Calendar#ERA}</li>
-     *              <li>{@link Calendar#YEAR}</li>
-     *              <li>{@link Calendar#MONTH}</li>
-     *              <li>...</li>
-     *              <li>{@link Calendar#DST_OFFSET}</li>
-     *              </ul>
-     * @return the value of the given calendar field
-     */
-    public static int getValueByCalendarField(final int field) {
-        Calendar cal = Calendar.getInstance();
-        return cal.get(field);
-    }
-
-    /**
-     * Returns the value of the given calendar field.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time  The formatted time string.
-     * @param field The given calendar field.
-     *              <ul>
-     *              <li>{@link Calendar#ERA}</li>
-     *              <li>{@link Calendar#YEAR}</li>
-     *              <li>{@link Calendar#MONTH}</li>
-     *              <li>...</li>
-     *              <li>{@link Calendar#DST_OFFSET}</li>
-     *              </ul>
-     * @return the value of the given calendar field
-     */
-    public static int getValueByCalendarField(final String time, final int field) {
-        return getValueByCalendarField(string2Date(time, getDefaultFormat()), field);
-    }
-
-    /**
-     * Returns the value of the given calendar field.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @param field  The given calendar field.
-     *               <ul>
-     *               <li>{@link Calendar#ERA}</li>
-     *               <li>{@link Calendar#YEAR}</li>
-     *               <li>{@link Calendar#MONTH}</li>
-     *               <li>...</li>
-     *               <li>{@link Calendar#DST_OFFSET}</li>
-     *               </ul>
-     * @return the value of the given calendar field
-     */
-    public static int getValueByCalendarField(final String time,
-                                              @NonNull final DateFormat format,
-                                              final int field) {
-        return getValueByCalendarField(string2Date(time, format), field);
-    }
-
-    /**
-     * Returns the value of the given calendar field.
-     *
-     * @param date  The date.
-     * @param field The given calendar field.
-     *              <ul>
-     *              <li>{@link Calendar#ERA}</li>
-     *              <li>{@link Calendar#YEAR}</li>
-     *              <li>{@link Calendar#MONTH}</li>
-     *              <li>...</li>
-     *              <li>{@link Calendar#DST_OFFSET}</li>
-     *              </ul>
-     * @return the value of the given calendar field
-     */
-    public static int getValueByCalendarField(final Date date, final int field) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(date);
-        return cal.get(field);
-    }
-
-    /**
-     * Returns the value of the given calendar field.
-     *
-     * @param millis The milliseconds.
-     * @param field  The given calendar field.
-     *               <ul>
-     *               <li>{@link Calendar#ERA}</li>
-     *               <li>{@link Calendar#YEAR}</li>
-     *               <li>{@link Calendar#MONTH}</li>
-     *               <li>...</li>
-     *               <li>{@link Calendar#DST_OFFSET}</li>
-     *               </ul>
-     * @return the value of the given calendar field
-     */
-    public static int getValueByCalendarField(final long millis, final int field) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTimeInMillis(millis);
-        return cal.get(field);
-    }
-
-    private static final String[] CHINESE_ZODIAC =
-            {"猴", "鸡", "狗", "猪", "鼠", "牛", "虎", "兔", "龙", "蛇", "马", "羊"};
-
-    /**
-     * Return the Chinese zodiac.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return the Chinese zodiac
-     */
-    public static String getChineseZodiac(final String time) {
-        return getChineseZodiac(string2Date(time, getDefaultFormat()));
-    }
-
-    /**
-     * Return the Chinese zodiac.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return the Chinese zodiac
-     */
-    public static String getChineseZodiac(final String time, @NonNull final DateFormat format) {
-        return getChineseZodiac(string2Date(time, format));
-    }
-
-    /**
-     * Return the Chinese zodiac.
-     *
-     * @param date The date.
-     * @return the Chinese zodiac
-     */
-    public static String getChineseZodiac(final Date date) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(date);
-        return CHINESE_ZODIAC[cal.get(Calendar.YEAR) % 12];
-    }
-
-    /**
-     * Return the Chinese zodiac.
-     *
-     * @param millis The milliseconds.
-     * @return the Chinese zodiac
-     */
-    public static String getChineseZodiac(final long millis) {
-        return getChineseZodiac(millis2Date(millis));
-    }
-
-    /**
-     * Return the Chinese zodiac.
-     *
-     * @param year The year.
-     * @return the Chinese zodiac
-     */
-    public static String getChineseZodiac(final int year) {
-        return CHINESE_ZODIAC[year % 12];
-    }
-
-    private static final int[]    ZODIAC_FLAGS = {20, 19, 21, 21, 21, 22, 23, 23, 23, 24, 23, 22};
-    private static final String[] ZODIAC       = {
-            "水瓶座", "双鱼座", "白羊座", "金牛座", "双子座", "巨蟹座",
-            "狮子座", "处女座", "天秤座", "天蝎座", "射手座", "魔羯座"
-    };
-
-    /**
-     * Return the zodiac.
-     * <p>The pattern is {@code yyyy-MM-dd HH:mm:ss}.</p>
-     *
-     * @param time The formatted time string.
-     * @return the zodiac
-     */
-    public static String getZodiac(final String time) {
-        return getZodiac(string2Date(time, getDefaultFormat()));
-    }
-
-    /**
-     * Return the zodiac.
-     *
-     * @param time   The formatted time string.
-     * @param format The format.
-     * @return the zodiac
-     */
-    public static String getZodiac(final String time, @NonNull final DateFormat format) {
-        return getZodiac(string2Date(time, format));
-    }
-
-    /**
-     * Return the zodiac.
-     *
-     * @param date The date.
-     * @return the zodiac
-     */
-    public static String getZodiac(final Date date) {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(date);
-        int month = cal.get(Calendar.MONTH) + 1;
-        int day = cal.get(Calendar.DAY_OF_MONTH);
-        return getZodiac(month, day);
-    }
-
-    /**
-     * Return the zodiac.
-     *
-     * @param millis The milliseconds.
-     * @return the zodiac
-     */
-    public static String getZodiac(final long millis) {
-        return getZodiac(millis2Date(millis));
-    }
-
-    /**
-     * Return the zodiac.
-     *
-     * @param month The month.
-     * @param day   The day.
-     * @return the zodiac
-     */
-    public static String getZodiac(final int month, final int day) {
-        return ZODIAC[day >= ZODIAC_FLAGS[month - 1]
-                ? month - 1
-                : (month + 10) % 12];
-    }
-
-    private static long timeSpan2Millis(final long timeSpan, @TimeConstants.Unit final int unit) {
-        return timeSpan * unit;
-    }
-
-    private static long millis2TimeSpan(final long millis, @TimeConstants.Unit final int unit) {
-        return millis / unit;
-    }
-
-    private static String millis2FitTimeSpan(long millis, int precision) {
-        if (precision <= 0) return null;
-        precision = Math.min(precision, 5);
-        String[] units = {"天", "小时", "分钟", "秒", "毫秒"};
-        if (millis == 0) return 0 + units[precision - 1];
-        StringBuilder sb = new StringBuilder();
-        if (millis < 0) {
-            sb.append("-");
-            millis = -millis;
-        }
-        int[] unitLen = {86400000, 3600000, 60000, 1000, 1};
-        for (int i = 0; i < precision; i++) {
-            if (millis >= unitLen[i]) {
-                long mode = millis / unitLen[i];
-                millis -= mode * unitLen[i];
-                sb.append(mode).append(units[i]);
-            }
-        }
-        return sb.toString();
-    }
-
-}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ToastUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ToastUtils.java
deleted file mode 100644
index d5ea2cc858..0000000000
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/ToastUtils.java
+++ /dev/null
@@ -1,582 +0,0 @@
-package com.mogo.module.v2x.utils;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.PixelFormat;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.Keep;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.StringRes;
-import androidx.core.app.NotificationManagerCompat;
-
-import java.lang.reflect.Field;
-
-/**
- *
- */
-public final class ToastUtils {
-
-    private static final int    COLOR_DEFAULT = 0xFEFFFFFF;
-    private static final String NULL          = "null";
-
-    private static IToast iToast;
-    private static int    sGravity     = -1;
-    private static int    sXOffset     = -1;
-    private static int    sYOffset     = -1;
-    private static int    sBgColor     = COLOR_DEFAULT;
-    private static int    sBgResource  = -1;
-    private static int    sMsgColor    = COLOR_DEFAULT;
-    private static int    sMsgTextSize = -1;
-
-    private ToastUtils() {
-        throw new UnsupportedOperationException("u can't instantiate me...");
-    }
-
-    /**
-     * Set the gravity.
-     *
-     * @param gravity The gravity.
-     * @param xOffset X-axis offset, in pixel.
-     * @param yOffset Y-axis offset, in pixel.
-     */
-    public static void setGravity(final int gravity, final int xOffset, final int yOffset) {
-        sGravity = gravity;
-        sXOffset = xOffset;
-        sYOffset = yOffset;
-    }
-
-    /**
-     * Set the color of background.
-     *
-     * @param backgroundColor The color of background.
-     */
-    public static void setBgColor(@ColorInt final int backgroundColor) {
-        sBgColor = backgroundColor;
-    }
-
-    /**
-     * Set the resource of background.
-     *
-     * @param bgResource The resource of background.
-     */
-    public static void setBgResource(@DrawableRes final int bgResource) {
-        sBgResource = bgResource;
-    }
-
-    /**
-     * Set the color of message.
-     *
-     * @param msgColor The color of message.
-     */
-    public static void setMsgColor(@ColorInt final int msgColor) {
-        sMsgColor = msgColor;
-    }
-
-    /**
-     * Set the text size of message.
-     *
-     * @param textSize The text size of message.
-     */
-    public static void setMsgTextSize(final int textSize) {
-        sMsgTextSize = textSize;
-    }
-
-    /**
-     * Show the toast for a short period of time.
-     *
-     * @param text The text.
-     */
-    public static void showShort(final CharSequence text) {
-        show(text == null ? NULL : text, Toast.LENGTH_SHORT);
-    }
-
-    /**
-     * Show the toast for a short period of time.
-     *
-     * @param resId The resource id for text.
-     */
-    public static void showShort(@StringRes final int resId) {
-        show(resId, Toast.LENGTH_SHORT);
-    }
-
-    /**
-     * Show the toast for a short period of time.
-     *
-     * @param resId The resource id for text.
-     * @param args  The args.
-     */
-    public static void showShort(@StringRes final int resId, final Object... args) {
-        show(resId, Toast.LENGTH_SHORT, args);
-    }
-
-    /**
-     * Show the toast for a short period of time.
-     *
-     * @param format The format.
-     * @param args   The args.
-     */
-    public static void showShort(final String format, final Object... args) {
-        show(format, Toast.LENGTH_SHORT, args);
-    }
-
-    /**
-     * Show the toast for a long period of time.
-     *
-     * @param text The text.
-     */
-    public static void showLong(final CharSequence text) {
-        show(text == null ? NULL : text, Toast.LENGTH_LONG);
-    }
-
-    /**
-     * Show the toast for a long period of time.
-     *
-     * @param resId The resource id for text.
-     */
-    public static void showLong(@StringRes final int resId) {
-        show(resId, Toast.LENGTH_LONG);
-    }
-
-    /**
-     * Show the toast for a long period of time.
-     *
-     * @param resId The resource id for text.
-     * @param args  The args.
-     */
-    public static void showLong(@StringRes final int resId, final Object... args) {
-        show(resId, Toast.LENGTH_LONG, args);
-    }
-
-    /**
-     * Show the toast for a long period of time.
-     *
-     * @param format The format.
-     * @param args   The args.
-     */
-    public static void showLong(final String format, final Object... args) {
-        show(format, Toast.LENGTH_LONG, args);
-    }
-
-    /**
-     * Show custom toast for a short period of time.
-     *
-     * @param layoutId ID for an XML layout resource to load.
-     */
-    public static View showCustomShort(@LayoutRes final int layoutId) {
-        return showCustomShort(getView(layoutId));
-    }
-
-    /**
-     * Show custom toast for a short period of time.
-     *
-     * @param view The view of toast.
-     */
-    public static View showCustomShort(final View view) {
-        show(view, Toast.LENGTH_SHORT);
-        return view;
-    }
-
-    /**
-     * Show custom toast for a long period of time.
-     *
-     * @param layoutId ID for an XML layout resource to load.
-     */
-    public static View showCustomLong(@LayoutRes final int layoutId) {
-        return showCustomLong(getView(layoutId));
-    }
-
-    /**
-     * Show custom toast for a long period of time.
-     *
-     * @param view The view of toast.
-     */
-    public static View showCustomLong(final View view) {
-        show(view, Toast.LENGTH_LONG);
-        return view;
-    }
-
-    /**
-     * Cancel the toast.
-     */
-    public static void cancel() {
-        if (iToast != null) {
-            iToast.cancel();
-        }
-    }
-
-    private static void show(final int resId, final int duration) {
-        show(resId, duration, (Object) null);
-    }
-
-    private static void show(final int resId, final int duration, final Object... args) {
-        try {
-            CharSequence text = V2XUtils.getApp().getResources().getText(resId);
-            if (args != null) {
-                text = String.format(text.toString(), args);
-            }
-            show(text, duration);
-        } catch (Exception ignore) {
-            show(String.valueOf(resId), duration);
-        }
-    }
-
-    private static void show(final String format, final int duration, final Object... args) {
-        String text = format;
-        if (text == null) {
-            text = NULL;
-        } else {
-            if (args != null) {
-                text = String.format(format, args);
-            }
-        }
-        show(text, duration);
-    }
-
-    private static void show(final CharSequence text, final int duration) {
-        V2XUtils.runOnUiThread(new Runnable() {
-            @SuppressLint("ShowToast")
-            @Override
-            public void run() {
-                cancel();
-                iToast = ToastFactory.makeToast(V2XUtils.getApp(), text, duration);
-                final View toastView = iToast.getView();
-                if (toastView == null) return;
-                final TextView tvMessage = toastView.findViewById(android.R.id.message);
-                if (sMsgColor != COLOR_DEFAULT) {
-                    tvMessage.setTextColor(sMsgColor);
-                }
-                if (sMsgTextSize != -1) {
-                    tvMessage.setTextSize(sMsgTextSize);
-                }
-                if (sGravity != -1 || sXOffset != -1 || sYOffset != -1) {
-                    iToast.setGravity(sGravity, sXOffset, sYOffset);
-                }
-                setBg(tvMessage);
-                iToast.show();
-            }
-        });
-    }
-
-    private static void show(final View view, final int duration) {
-        V2XUtils.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                cancel();
-                iToast = ToastFactory.newToast(V2XUtils.getApp());
-                iToast.setView(view);
-                iToast.setDuration(duration);
-                if (sGravity != -1 || sXOffset != -1 || sYOffset != -1) {
-                    iToast.setGravity(sGravity, sXOffset, sYOffset);
-                }
-                setBg();
-                iToast.show();
-            }
-        });
-    }
-
-    private static void setBg() {
-        if (sBgResource != -1) {
-            final View toastView = iToast.getView();
-            toastView.setBackgroundResource(sBgResource);
-        } else if (sBgColor != COLOR_DEFAULT) {
-            final View toastView = iToast.getView();
-            Drawable background = toastView.getBackground();
-            if (background != null) {
-                background.setColorFilter(
-                        new PorterDuffColorFilter(sBgColor, PorterDuff.Mode.SRC_IN)
-                );
-            } else {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                    toastView.setBackground(new ColorDrawable(sBgColor));
-                } else {
-                    toastView.setBackgroundDrawable(new ColorDrawable(sBgColor));
-                }
-            }
-        }
-    }
-
-    private static void setBg(final TextView tvMsg) {
-        if (sBgResource != -1) {
-            final View toastView = iToast.getView();
-            toastView.setBackgroundResource(sBgResource);
-            tvMsg.setBackgroundColor(Color.TRANSPARENT);
-        } else if (sBgColor != COLOR_DEFAULT) {
-            final View toastView = iToast.getView();
-            Drawable tvBg = toastView.getBackground();
-            Drawable msgBg = tvMsg.getBackground();
-            if (tvBg != null && msgBg != null) {
-                tvBg.setColorFilter(new PorterDuffColorFilter(sBgColor, PorterDuff.Mode.SRC_IN));
-                tvMsg.setBackgroundColor(Color.TRANSPARENT);
-            } else if (tvBg != null) {
-                tvBg.setColorFilter(new PorterDuffColorFilter(sBgColor, PorterDuff.Mode.SRC_IN));
-            } else if (msgBg != null) {
-                msgBg.setColorFilter(new PorterDuffColorFilter(sBgColor, PorterDuff.Mode.SRC_IN));
-            } else {
-                toastView.setBackgroundColor(sBgColor);
-            }
-        }
-    }
-
-    private static View getView(@LayoutRes final int layoutId) {
-        LayoutInflater inflate =
-                (LayoutInflater) V2XUtils.getApp().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        return inflate.inflate(layoutId, null);
-    }
-
-    static class ToastFactory {
-
-        static IToast makeToast(Context context, CharSequence text, int duration) {
-            if (NotificationManagerCompat.from(context).areNotificationsEnabled()) {
-                return new SystemToast(makeNormalToast(context, text, duration));
-            }
-            return new ToastWithoutNotification(makeNormalToast(context, text, duration));
-        }
-
-        static IToast newToast(Context context) {
-            if (NotificationManagerCompat.from(context).areNotificationsEnabled()) {
-                return new SystemToast(new Toast(context));
-            }
-            return new ToastWithoutNotification(new Toast(context));
-        }
-
-        private static Toast makeNormalToast(Context context, CharSequence text, int duration) {
-            @SuppressLint("ShowToast")
-            Toast toast = Toast.makeText(context, "", duration);
-            toast.setText(text);
-            return toast;
-        }
-    }
-
-    static class SystemToast extends AbsToast {
-
-        @Keep
-        SystemToast(Toast toast) {
-            super(toast);
-            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1) {
-                try {
-                    //noinspection JavaReflectionMemberAccess
-                    Field mTNField = Toast.class.getDeclaredField("mTN");
-                    mTNField.setAccessible(true);
-                    Object mTN = mTNField.get(toast);
-                    Field mTNmHandlerField = mTNField.getType().getDeclaredField("mHandler");
-                    mTNmHandlerField.setAccessible(true);
-                    Handler tnHandler = (Handler) mTNmHandlerField.get(mTN);
-                    mTNmHandlerField.set(mTN, new SafeHandler(tnHandler));
-                } catch (Exception ignored) {/**/}
-            }
-        }
-
-        @Override
-        public void show() {
-            mToast.show();
-        }
-
-        @Override
-        public void cancel() {
-            mToast.cancel();
-        }
-
-        static class SafeHandler extends Handler {
-            private Handler impl;
-
-            SafeHandler(Handler impl) {
-                this.impl = impl;
-            }
-
-            @Override
-            public void handleMessage(Message msg) {
-                impl.handleMessage(msg);
-            }
-
-            @Override
-            public void dispatchMessage(Message msg) {
-                try {
-                    impl.dispatchMessage(msg);
-                } catch (Exception e) {
-                    Log.e("ToastUtils", e.toString());
-                }
-            }
-        }
-    }
-
-    static class ToastWithoutNotification extends AbsToast {
-
-        private View          mView;
-        private WindowManager mWM;
-
-        private WindowManager.LayoutParams mParams = new WindowManager.LayoutParams();
-
-        private static final V2XUtils.OnActivityDestroyedListener LISTENER =
-                new V2XUtils.OnActivityDestroyedListener() {
-                    @Override
-                    public void onActivityDestroyed(Activity activity) {
-                        if (iToast == null) return;
-                        activity.getWindow().getDecorView().setVisibility(View.GONE);
-                        iToast.cancel();
-                    }
-                };
-
-        ToastWithoutNotification(Toast toast) {
-            super(toast);
-        }
-
-        @Override
-        public void show() {
-            V2XUtils.runOnUiThreadDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    realShow();
-                }
-            }, 300);
-        }
-
-        private void realShow() {
-            if (mToast == null) return;
-            mView = mToast.getView();
-            if (mView == null) return;
-            final Context context = mToast.getView().getContext();
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
-                mWM = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-                mParams.type = WindowManager.LayoutParams.TYPE_TOAST;
-            } else {
-                Context topActivityOrApp = V2XUtils.getTopActivityOrApp();
-                if (!(topActivityOrApp instanceof Activity)) {
-                    Log.e("ToastUtils", "Couldn't get top Activity.");
-                    return;
-                }
-                Activity topActivity = (Activity) topActivityOrApp;
-                if (topActivity.isFinishing() || topActivity.isDestroyed()) {
-                    Log.e("ToastUtils", topActivity + " is useless");
-                    return;
-                }
-                mWM = topActivity.getWindowManager();
-                mParams.type = WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;
-                V2XUtils.getActivityLifecycle().addOnActivityDestroyedListener(topActivity, LISTENER);
-            }
-
-            mParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
-            mParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
-            mParams.format = PixelFormat.TRANSLUCENT;
-            mParams.windowAnimations = android.R.style.Animation_Toast;
-            mParams.setTitle("ToastWithoutNotification");
-            mParams.flags = WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                    | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-                    | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
-            mParams.packageName = V2XUtils.getApp().getPackageName();
-
-            mParams.gravity = mToast.getGravity();
-            if ((mParams.gravity & Gravity.HORIZONTAL_GRAVITY_MASK) == Gravity.FILL_HORIZONTAL) {
-                mParams.horizontalWeight = 1.0f;
-            }
-            if ((mParams.gravity & Gravity.VERTICAL_GRAVITY_MASK) == Gravity.FILL_VERTICAL) {
-                mParams.verticalWeight = 1.0f;
-            }
-
-            mParams.x = mToast.getXOffset();
-            mParams.y = mToast.getYOffset();
-            mParams.horizontalMargin = mToast.getHorizontalMargin();
-            mParams.verticalMargin = mToast.getVerticalMargin();
-
-            try {
-                if (mWM != null) {
-                    mWM.addView(mView, mParams);
-                }
-            } catch (Exception ignored) {/**/}
-
-            V2XUtils.runOnUiThreadDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    cancel();
-                }
-            }, mToast.getDuration() == Toast.LENGTH_SHORT ? 2000 : 3500);
-        }
-
-        @Override
-        public void cancel() {
-            try {
-                if (mWM != null) {
-                    mWM.removeViewImmediate(mView);
-                }
-            } catch (Exception ignored) {/**/}
-            mView = null;
-            mWM = null;
-            mToast = null;
-        }
-    }
-
-    static abstract class AbsToast implements IToast {
-
-        Toast mToast;
-
-        AbsToast(Toast toast) {
-            mToast = toast;
-        }
-
-        @Override
-        public void setView(View view) {
-            mToast.setView(view);
-        }
-
-        @Override
-        public View getView() {
-            return mToast.getView();
-        }
-
-        @Override
-        public void setDuration(int duration) {
-            mToast.setDuration(duration);
-        }
-
-        @Override
-        public void setGravity(int gravity, int xOffset, int yOffset) {
-            mToast.setGravity(gravity, xOffset, yOffset);
-        }
-
-        @Override
-        public void setText(int resId) {
-            mToast.setText(resId);
-        }
-
-        @Override
-        public void setText(CharSequence s) {
-            mToast.setText(s);
-        }
-    }
-
-    interface IToast {
-
-        void show();
-
-        void cancel();
-
-        void setView(View view);
-
-        View getView();
-
-        void setDuration(int duration);
-
-        void setGravity(int gravity, int xOffset, int yOffset);
-
-        void setText(@StringRes int resId);
-
-        void setText(CharSequence s);
-    }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java
index eb4e1f7e3d..2edd022996 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java
@@ -1,5 +1,7 @@
 package com.mogo.module.v2x.utils;
 
+import com.mogo.eagle.core.utilcode.util.TimeUtils;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.module.common.entity.V2XEventZanData;
 import com.mogo.module.common.entity.V2XHistoryScenarioData;
 import com.mogo.module.v2x.V2XConst;
@@ -35,7 +37,7 @@ public class V2XSQLiteUtils {
             synchronized (V2XSQLiteUtils.class) {
                 if (mScenarioHistoryDao == null) {
                     mScenarioHistoryDao = SQLDaoFactory.Companion.getInstance()
-                            .getBaseDao(V2XUtils.getApp(), V2XHistoryScenarioData.class);
+                            .getBaseDao(Utils.getApp(), V2XHistoryScenarioData.class);
                 }
             }
         }
@@ -50,7 +52,7 @@ public class V2XSQLiteUtils {
             synchronized (V2XSQLiteUtils.class) {
                 if (mV2XEventZanDao == null) {
                     mV2XEventZanDao = SQLDaoFactory.Companion.getInstance()
-                            .getBaseDao(V2XUtils.getApp(), V2XEventZanData.class);
+                            .getBaseDao(Utils.getApp(), V2XEventZanData.class);
                 }
             }
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java
index 3cd697c057..a14d8c5537 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XUtils.java
@@ -1,49 +1,11 @@
 package com.mogo.module.v2x.utils;
 
-import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.Application;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-
-import androidx.annotation.Nullable;
-import androidx.core.content.FileProvider;
-import androidx.fragment.app.FragmentActivity;
-
-import com.mogo.utils.ThreadPoolService;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.utils.storage.SharedPrefsMgr;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.sql.Time;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutorService;
 
 /**
  * author : donghongyu
@@ -54,717 +16,21 @@ import java.util.concurrent.ExecutorService;
  */
 public class V2XUtils {
 
-    private static final ActivityLifecycleImpl ACTIVITY_LIFECYCLE = new ActivityLifecycleImpl();
-    private static final ExecutorService UTIL_POOL = ThreadUtils.getCachedPool();
-    private static final Handler UTIL_HANDLER = new Handler(Looper.getMainLooper());
-
-    @SuppressLint("StaticFieldLeak")
-    private static Application sApplication;
-
-
-    private V2XUtils() {
-        throw new UnsupportedOperationException("u can't instantiate me...");
-    }
-
     /**
-     * Init utils.
-     * <p>Init it in the class of Application.</p>
-     *
-     * @param context context
-     */
-    public static void init(final Context context) {
-        if (context == null) {
-            init(getApplicationByReflect());
-            return;
-        }
-        init((Application) context.getApplicationContext());
-    }
-
-    /**
-     * Init utils.
-     * <p>Init it in the class of Application.</p>
-     *
-     * @param app application
-     */
-    public static void init(final Application app) {
-        if (sApplication == null) {
-            if (app == null) {
-                sApplication = getApplicationByReflect();
-            } else {
-                sApplication = app;
-            }
-            sApplication.registerActivityLifecycleCallbacks(ACTIVITY_LIFECYCLE);
-//            UTIL_POOL.execute(new Runnable() {
-//                @Override
-//                public void run() {
-//                    //AdaptScreenUtils.preLoad();
-//                }
-//            });
-        } else {
-            if (app != null && app.getClass() != sApplication.getClass()) {
-                sApplication.unregisterActivityLifecycleCallbacks(ACTIVITY_LIFECYCLE);
-                ACTIVITY_LIFECYCLE.mActivityList.clear();
-                sApplication = app;
-                sApplication.registerActivityLifecycleCallbacks(ACTIVITY_LIFECYCLE);
-            }
-        }
-    }
-
-    /**
-     * Return the context of Application object.
-     *
-     * @return the context of Application object
-     */
-    public static Application getApp() {
-        if (sApplication != null) return sApplication;
-        Application app = getApplicationByReflect();
-        init(app);
-        return app;
-    }
-
-    static ActivityLifecycleImpl getActivityLifecycle() {
-        return ACTIVITY_LIFECYCLE;
-    }
-
-    static LinkedList<Activity> getActivityList() {
-        return ACTIVITY_LIFECYCLE.mActivityList;
-    }
-
-    static Context getTopActivityOrApp() {
-        if (isAppForeground()) {
-            Activity topActivity = ACTIVITY_LIFECYCLE.getTopActivity();
-            return topActivity == null ? V2XUtils.getApp() : topActivity;
-        } else {
-            return V2XUtils.getApp();
-        }
-    }
-
-    static boolean isAppForeground() {
-        ActivityManager am = (ActivityManager) V2XUtils.getApp().getSystemService(Context.ACTIVITY_SERVICE);
-        if (am == null) return false;
-        List<ActivityManager.RunningAppProcessInfo> info = am.getRunningAppProcesses();
-        if (info == null || info.size() == 0) return false;
-        for (ActivityManager.RunningAppProcessInfo aInfo : info) {
-            if (aInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
-                if (aInfo.processName.equals(V2XUtils.getApp().getPackageName())) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    static <T> Task<T> doAsync(final Task<T> task) {
-        UTIL_POOL.execute(task);
-        return task;
-    }
-
-    public static void runOnUiThread(final Runnable runnable) {
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            runnable.run();
-        } else {
-            V2XUtils.UTIL_HANDLER.post(runnable);
-        }
-    }
-
-    public static void runOnUiThreadDelayed(final Runnable runnable, long delayMillis) {
-        V2XUtils.UTIL_HANDLER.postDelayed(runnable, delayMillis);
-    }
-
-    /**
-     * 运行在子线程
-     *
-     * @param runnable 线程执行
-     */
-    public static void runOnBackgroundThread(Runnable runnable) {
-        if (runnable == null) {
-            return;
-        }
-        ThreadPoolService.execute(runnable);
-    }
-
-    static String getCurrentProcessName() {
-        String name = getCurrentProcessNameByFile();
-        if (!TextUtils.isEmpty(name)) return name;
-        name = getCurrentProcessNameByAms();
-        if (!TextUtils.isEmpty(name)) return name;
-        name = getCurrentProcessNameByReflect();
-        return name;
-    }
-
-    static void fixSoftInputLeaks(final Window window) {
-        InputMethodManager imm =
-                (InputMethodManager) V2XUtils.getApp().getSystemService(Context.INPUT_METHOD_SERVICE);
-        if (imm == null) return;
-        String[] leakViews = new String[]{"mLastSrvView", "mCurRootView", "mServedView", "mNextServedView"};
-        for (String leakView : leakViews) {
-            try {
-                Field leakViewField = InputMethodManager.class.getDeclaredField(leakView);
-                if (!leakViewField.isAccessible()) {
-                    leakViewField.setAccessible(true);
-                }
-                Object obj = leakViewField.get(imm);
-                if (!(obj instanceof View)) continue;
-                View view = (View) obj;
-                if (view.getRootView() == window.getDecorView().getRootView()) {
-                    leakViewField.set(imm, null);
-                }
-            } catch (Throwable ignore) {/**/}
-        }
-    }
-
-
-    static void toastShowShort(final CharSequence text) {
-        ToastUtils.showShort(text);
-    }
-
-    static void toastCancel() {
-        ToastUtils.cancel();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // private method
-    ///////////////////////////////////////////////////////////////////////////
-
-    private static String getCurrentProcessNameByFile() {
-        try {
-            File file = new File("/proc/" + android.os.Process.myPid() + "/" + "cmdline");
-            BufferedReader mBufferedReader = new BufferedReader(new FileReader(file));
-            String processName = mBufferedReader.readLine().trim();
-            mBufferedReader.close();
-            return processName;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "";
-        }
-    }
-
-    private static String getCurrentProcessNameByAms() {
-        ActivityManager am = (ActivityManager) V2XUtils.getApp().getSystemService(Context.ACTIVITY_SERVICE);
-        if (am == null) return "";
-        List<ActivityManager.RunningAppProcessInfo> info = am.getRunningAppProcesses();
-        if (info == null || info.size() == 0) return "";
-        int pid = android.os.Process.myPid();
-        for (ActivityManager.RunningAppProcessInfo aInfo : info) {
-            if (aInfo.pid == pid) {
-                if (aInfo.processName != null) {
-                    return aInfo.processName;
-                }
-            }
-        }
-        return "";
-    }
-
-    private static String getCurrentProcessNameByReflect() {
-        String processName = "";
-        try {
-            Application app = V2XUtils.getApp();
-            Field loadedApkField = app.getClass().getField("mLoadedApk");
-            loadedApkField.setAccessible(true);
-            Object loadedApk = loadedApkField.get(app);
-
-            Field activityThreadField = loadedApk.getClass().getDeclaredField("mActivityThread");
-            activityThreadField.setAccessible(true);
-            Object activityThread = activityThreadField.get(loadedApk);
-
-            Method getProcessName = activityThread.getClass().getDeclaredMethod("getProcessName");
-            processName = (String) getProcessName.invoke(activityThread);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return processName;
-    }
-
-    private static Application getApplicationByReflect() {
-        try {
-            @SuppressLint("PrivateApi")
-            Class<?> activityThread = Class.forName("android.app.ActivityThread");
-            Object thread = activityThread.getMethod("currentActivityThread").invoke(null);
-            Object app = activityThread.getMethod("getApplication").invoke(thread);
-            if (app == null) {
-                throw new NullPointerException("u should init first");
-            }
-            return (Application) app;
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-        throw new NullPointerException("u should init first");
-    }
-
-    /**
-     * Set animators enabled.
-     */
-    private static void setAnimatorsEnabled() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && ValueAnimator.areAnimatorsEnabled()) {
-            return;
-        }
-        try {
-            //noinspection JavaReflectionMemberAccess
-            Field sDurationScaleField = ValueAnimator.class.getDeclaredField("sDurationScale");
-            sDurationScaleField.setAccessible(true);
-            float sDurationScale = (Float) sDurationScaleField.get(null);
-            if (sDurationScale == 0f) {
-                sDurationScaleField.set(null, 1f);
-                Log.i("Utils", "setAnimatorsEnabled: Animators are enabled now!");
-            }
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /*
      * 当天第一次
-     * */
+     */
     public static boolean isFirstTodayWithKey(String key) {
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd", Locale.US);
         String formatString = format.format(new Date());
-        String value = SharedPrefsMgr.getInstance(V2XUtils.getApp()).getString(key);
+        String value = SharedPrefsMgr.getInstance(Utils.getApp()).getString(key);
         if (value.equals(formatString)) {
             return true;
         } else {
-            SharedPrefsMgr.getInstance(V2XUtils.getApp()).putString(key, formatString);
+            SharedPrefsMgr.getInstance(Utils.getApp()).putString(key, formatString);
             return false;
         }
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // TransActivity
-    ///////////////////////////////////////////////////////////////////////////
-
-    public static final class TransActivity extends FragmentActivity {
-
-        private static final Map<TransActivity, TransActivityDelegate> CALLBACK_MAP = new HashMap<>();
-        private static TransActivityDelegate sDelegate;
-
-        public static void start(final Func1<Void, Intent> consumer,
-                                 final TransActivityDelegate delegate) {
-            if (delegate == null) return;
-            Intent starter = new Intent(V2XUtils.getApp(), TransActivity.class);
-            starter.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            if (consumer != null) {
-                consumer.call(starter);
-            }
-            V2XUtils.getApp().startActivity(starter);
-            sDelegate = delegate;
-        }
-
-        @Override
-        protected void onCreate(@Nullable Bundle savedInstanceState) {
-            overridePendingTransition(0, 0);
-            if (sDelegate == null) {
-                super.onCreate(savedInstanceState);
-                finish();
-                return;
-            }
-            CALLBACK_MAP.put(this, sDelegate);
-            sDelegate.onCreateBefore(this, savedInstanceState);
-            super.onCreate(savedInstanceState);
-            sDelegate.onCreated(this, savedInstanceState);
-            sDelegate = null;
-        }
-
-        @Override
-        protected void onStart() {
-            super.onStart();
-            TransActivityDelegate callback = CALLBACK_MAP.get(this);
-            if (callback == null) return;
-            callback.onStarted(this);
-        }
-
-        @Override
-        protected void onResume() {
-            super.onResume();
-            TransActivityDelegate callback = CALLBACK_MAP.get(this);
-            if (callback == null) return;
-            callback.onResumed(this);
-        }
-
-        @Override
-        protected void onPause() {
-            overridePendingTransition(0, 0);
-            super.onPause();
-            TransActivityDelegate callback = CALLBACK_MAP.get(this);
-            if (callback == null) return;
-            callback.onPaused(this);
-        }
-
-        @Override
-        protected void onStop() {
-            super.onStop();
-            TransActivityDelegate callback = CALLBACK_MAP.get(this);
-            if (callback == null) return;
-            callback.onStopped(this);
-        }
-
-        @Override
-        protected void onSaveInstanceState(Bundle outState) {
-            super.onSaveInstanceState(outState);
-            TransActivityDelegate callback = CALLBACK_MAP.get(this);
-            if (callback == null) return;
-            callback.onSaveInstanceState(this, outState);
-        }
-
-        @Override
-        protected void onDestroy() {
-            super.onDestroy();
-            TransActivityDelegate callback = CALLBACK_MAP.get(this);
-            if (callback == null) return;
-            callback.onDestroy(this);
-            CALLBACK_MAP.remove(this);
-        }
-
-        @Override
-        public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-            super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-            TransActivityDelegate callback = CALLBACK_MAP.get(this);
-            if (callback == null) return;
-            callback.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
-        }
-
-        @Override
-        protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-            super.onActivityResult(requestCode, resultCode, data);
-            TransActivityDelegate callback = CALLBACK_MAP.get(this);
-            if (callback == null) return;
-            callback.onActivityResult(this, requestCode, resultCode, data);
-        }
-
-        @Override
-        public boolean dispatchTouchEvent(MotionEvent ev) {
-            TransActivityDelegate callback = CALLBACK_MAP.get(this);
-            if (callback == null) return super.dispatchTouchEvent(ev);
-            if (callback.dispatchTouchEvent(this, ev)) {
-                return true;
-            }
-            return super.dispatchTouchEvent(ev);
-        }
-
-        public abstract static class TransActivityDelegate {
-            public void onCreateBefore(Activity activity, @Nullable Bundle savedInstanceState) {/**/}
-
-            public void onCreated(Activity activity, @Nullable Bundle savedInstanceState) {/**/}
-
-            public void onStarted(Activity activity) {/**/}
-
-            public void onDestroy(Activity activity) {/**/}
-
-            public void onResumed(Activity activity) {/**/}
-
-            public void onPaused(Activity activity) {/**/}
-
-            public void onStopped(Activity activity) {/**/}
-
-            public void onSaveInstanceState(Activity activity, Bundle outState) {/**/}
-
-            public void onRequestPermissionsResult(Activity activity, int requestCode, String[] permissions, int[] grantResults) {/**/}
-
-            public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {/**/}
-
-            public boolean dispatchTouchEvent(Activity activity, MotionEvent ev) {
-                return false;
-            }
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // lifecycle
-    ///////////////////////////////////////////////////////////////////////////
-
-    static class ActivityLifecycleImpl implements Application.ActivityLifecycleCallbacks {
-
-        final LinkedList<Activity> mActivityList = new LinkedList<>();
-        final List<OnAppStatusChangedListener> mStatusListeners = new ArrayList<>();
-        final Map<Activity, List<OnActivityDestroyedListener>> mDestroyedListenerMap = new HashMap<>();
-
-        private int mForegroundCount = 0;
-        private int mConfigCount = 0;
-        private boolean mIsBackground = false;
-
-        @Override
-        public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-            //LanguageUtils.applyLanguage(activity);
-            setAnimatorsEnabled();
-            setTopActivity(activity);
-        }
-
-        @Override
-        public void onActivityStarted(Activity activity) {
-            if (!mIsBackground) {
-                setTopActivity(activity);
-            }
-            if (mConfigCount < 0) {
-                ++mConfigCount;
-            } else {
-                ++mForegroundCount;
-            }
-        }
-
-        @Override
-        public void onActivityResumed(final Activity activity) {
-            setTopActivity(activity);
-            if (mIsBackground) {
-                mIsBackground = false;
-                postStatus(activity, true);
-            }
-            processHideSoftInputOnActivityDestroy(activity, false);
-        }
-
-        @Override
-        public void onActivityPaused(Activity activity) {
-
-        }
-
-        @Override
-        public void onActivityStopped(Activity activity) {
-            if (activity.isChangingConfigurations()) {
-                --mConfigCount;
-            } else {
-                --mForegroundCount;
-                if (mForegroundCount <= 0) {
-                    mIsBackground = true;
-                    postStatus(activity, false);
-                }
-            }
-            processHideSoftInputOnActivityDestroy(activity, true);
-        }
-
-        @Override
-        public void onActivitySaveInstanceState(Activity activity, Bundle outState) {/**/}
-
-        @Override
-        public void onActivityDestroyed(Activity activity) {
-            mActivityList.remove(activity);
-            consumeOnActivityDestroyedListener(activity);
-            fixSoftInputLeaks(activity.getWindow());
-        }
-
-        Activity getTopActivity() {
-            if (!mActivityList.isEmpty()) {
-                for (int i = mActivityList.size() - 1; i >= 0; i--) {
-                    Activity activity = mActivityList.get(i);
-                    if (activity == null
-                            || activity.isFinishing()
-                            || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && activity.isDestroyed())) {
-                        continue;
-                    }
-                    return activity;
-                }
-            }
-            Activity topActivityByReflect = getTopActivityByReflect();
-            if (topActivityByReflect != null) {
-                setTopActivity(topActivityByReflect);
-            }
-            return topActivityByReflect;
-        }
-
-        void addOnAppStatusChangedListener(final OnAppStatusChangedListener listener) {
-            mStatusListeners.add(listener);
-        }
-
-        void removeOnAppStatusChangedListener(final OnAppStatusChangedListener listener) {
-            mStatusListeners.remove(listener);
-        }
-
-        void removeOnActivityDestroyedListener(final Activity activity) {
-            if (activity == null) return;
-            mDestroyedListenerMap.remove(activity);
-        }
-
-        void addOnActivityDestroyedListener(final Activity activity,
-                                            final OnActivityDestroyedListener listener) {
-            if (activity == null || listener == null) return;
-            List<OnActivityDestroyedListener> listeners = mDestroyedListenerMap.get(activity);
-            if (listeners == null) {
-                listeners = new CopyOnWriteArrayList<>();
-                mDestroyedListenerMap.put(activity, listeners);
-            } else {
-                if (listeners.contains(listener)) return;
-            }
-            listeners.add(listener);
-        }
-
-        /**
-         * To solve close keyboard when activity onDestroy.
-         * The preActivity set windowSoftInputMode will prevent
-         * the keyboard from closing when curActivity onDestroy.
-         */
-        private void processHideSoftInputOnActivityDestroy(final Activity activity, boolean isSave) {
-            if (isSave) {
-                final WindowManager.LayoutParams attrs = activity.getWindow().getAttributes();
-                final int softInputMode = attrs.softInputMode;
-                activity.getWindow().getDecorView().setTag(-123, softInputMode);
-                activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-            } else {
-                final Object tag = activity.getWindow().getDecorView().getTag(-123);
-                if (!(tag instanceof Integer)) return;
-                V2XUtils.runOnUiThreadDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        Window window = activity.getWindow();
-                        if (window != null) {
-                            window.setSoftInputMode(((Integer) tag));
-                        }
-                    }
-                }, 100);
-            }
-        }
-
-        private void postStatus(final Activity activity, final boolean isForeground) {
-            if (mStatusListeners.isEmpty()) return;
-            for (OnAppStatusChangedListener statusListener : mStatusListeners) {
-                if (isForeground) {
-                    statusListener.onForeground(activity);
-                } else {
-                    statusListener.onBackground(activity);
-                }
-            }
-        }
-
-        private void setTopActivity(final Activity activity) {
-//            if (TransActivity.class == activity.getClass()) return;
-            if (mActivityList.contains(activity)) {
-                if (!mActivityList.getLast().equals(activity)) {
-                    mActivityList.remove(activity);
-                    mActivityList.addLast(activity);
-                }
-            } else {
-                mActivityList.addLast(activity);
-            }
-        }
-
-        private void consumeOnActivityDestroyedListener(Activity activity) {
-            Iterator<Map.Entry<Activity, List<OnActivityDestroyedListener>>> iterator
-                    = mDestroyedListenerMap.entrySet().iterator();
-            while (iterator.hasNext()) {
-                Map.Entry<Activity, List<OnActivityDestroyedListener>> entry = iterator.next();
-                if (entry.getKey() == activity) {
-                    List<OnActivityDestroyedListener> value = entry.getValue();
-                    for (OnActivityDestroyedListener listener : value) {
-                        listener.onActivityDestroyed(activity);
-                    }
-                    iterator.remove();
-                }
-            }
-        }
-
-        private Activity getTopActivityByReflect() {
-            try {
-                @SuppressLint("PrivateApi")
-                Class<?> activityThreadClass = Class.forName("android.app.ActivityThread");
-                Object currentActivityThreadMethod = activityThreadClass.getMethod("currentActivityThread").invoke(null);
-                Field mActivityListField = activityThreadClass.getDeclaredField("mActivityList");
-                mActivityListField.setAccessible(true);
-                Map activities = (Map) mActivityListField.get(currentActivityThreadMethod);
-                if (activities == null) return null;
-                for (Object activityRecord : activities.values()) {
-                    Class activityRecordClass = activityRecord.getClass();
-                    Field pausedField = activityRecordClass.getDeclaredField("paused");
-                    pausedField.setAccessible(true);
-                    if (!pausedField.getBoolean(activityRecord)) {
-                        Field activityField = activityRecordClass.getDeclaredField("activity");
-                        activityField.setAccessible(true);
-                        return (Activity) activityField.get(activityRecord);
-                    }
-                }
-            } catch (Exception e) {
-                Log.e("Utils", e.getMessage());
-            }
-            return null;
-        }
-    }
-
-    public static final class FileProvider4UtilCode extends FileProvider {
-
-        @Override
-        public boolean onCreate() {
-            V2XUtils.init(getContext());
-            try {
-                Class.forName("com.blankj.utildebug.DebugUtils");
-            } catch (Exception ignore) {
-            }
-            return true;
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // interface
-    ///////////////////////////////////////////////////////////////////////////
-
-    public abstract static class Task<Result> implements Runnable {
-
-        private static final int NEW = 0;
-        private static final int COMPLETING = 1;
-        private static final int CANCELLED = 2;
-        private static final int EXCEPTIONAL = 3;
-
-        private volatile int state = NEW;
-
-        abstract Result doInBackground();
-
-        private Callback<Result> mCallback;
-
-        public Task(final Callback<Result> callback) {
-            mCallback = callback;
-        }
-
-        @Override
-        public void run() {
-            try {
-                final Result t = doInBackground();
-
-                if (state != NEW) return;
-                state = COMPLETING;
-                UTIL_HANDLER.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        mCallback.onCall(t);
-                    }
-                });
-            } catch (Throwable th) {
-                if (state != NEW) return;
-                state = EXCEPTIONAL;
-            }
-        }
-
-        public void cancel() {
-            state = CANCELLED;
-        }
-
-        public boolean isDone() {
-            return state != NEW;
-        }
-
-        public boolean isCanceled() {
-            return state == CANCELLED;
-        }
-    }
-
-    public interface Callback<T> {
-        void onCall(T data);
-    }
-
-    public interface OnAppStatusChangedListener {
-        void onForeground(Activity activity);
-
-        void onBackground(Activity activity);
-    }
-
-    public interface OnActivityDestroyedListener {
-        void onActivityDestroyed(Activity activity);
-    }
-
-    public interface Func1<Ret, Par> {
-        Ret call(Par param);
-    }
-
     // 两次点击间隔不能少于1000ms
     private static final int FAST_CLICK_DELAY_TIME = 1000;
     private static long lastClickTime;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java
index bed10d979a..f51cb3eaa2 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/CarZegoLiveVideoView.java
@@ -17,11 +17,11 @@ import com.mogo.cloud.trafficlive.api.ITrafficCarLiveCallBack;
 import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.eagle.core.widget.RoundLayout;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -123,7 +123,7 @@ public class CarZegoLiveVideoView extends RoundLayout {
                 @Override
                 public void onError(String errorMsg) {
                     refreshStatusToListener(false);
-                    AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("直播获取识败，可以对我说重试", null);
+                    AIAssist.getInstance(Utils.getApp()).speakTTSVoice("直播获取识败，可以对我说重试", null);
                     stopLive();
                     mLoading.setVisibility(GONE);
                     mClLoadError.setVisibility(VISIBLE);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XCarLiveVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XCarLiveVideoView.java
index 82427c0623..09893f0097 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XCarLiveVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XCarLiveVideoView.java
@@ -16,13 +16,13 @@ import androidx.core.content.ContextCompat;
 
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.eagle.core.widget.RoundLayout;
 import com.mogo.module.common.entity.MarkerCarInfo;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.net.V2XLivePushVoRes;
 import com.mogo.module.v2x.network.V2XRefreshCallback;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -180,7 +180,7 @@ public class V2XCarLiveVideoView extends RoundLayout {
                         mClLoadError.setVisibility(GONE);
                     } else if (event < 0) {
                         refreshStatusToListener(false);
-                        AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("直播获取识败，可以对我说重试", null);
+                        AIAssist.getInstance(Utils.getApp()).speakTTSVoice("直播获取识败，可以对我说重试", null);
                         stopLive(mCarLiveInfo);
                         mLoading.setVisibility(GONE);
                         mClLoadError.setVisibility(VISIBLE);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XCrossRoadVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XCrossRoadVideoView.java
index 10a50e823e..884322b370 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XCrossRoadVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XCrossRoadVideoView.java
@@ -15,12 +15,12 @@ import androidx.core.content.ContextCompat;
 import com.mogo.cloud.trafficlive.api.ITrafficIntersectionLiveCallBack;
 import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.eagle.core.widget.RoundLayout;
 import com.mogo.map.location.MogoLocation;
 import com.mogo.module.common.entity.MarkerCarInfo;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -201,7 +201,7 @@ public class V2XCrossRoadVideoView extends RoundLayout {
                     mClLoadError.setVisibility(GONE);
                 } else if (event < 0) {
                     refreshStatusToListener(false);
-                    AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("直播获取识败，可以对我说重试", null);
+                    AIAssist.getInstance(Utils.getApp()).speakTTSVoice("直播获取识败，可以对我说重试", null);
                     stopLive();
                     mLoading.setVisibility(GONE);
                     mClLoadError.setVisibility(VISIBLE);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
index d1259085f3..56ee97e025 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java
@@ -16,10 +16,10 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.eagle.core.widget.RoundLayout;
 import com.mogo.module.common.entity.MarkerCarInfo;
 import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -150,7 +150,7 @@ public class V2XLiveGSYVideoView extends RoundLayout {
                             mLoading.setVisibility(GONE);
                             mClLoadError.setVisibility(GONE);
                         } else if (event < 0) {
-                            AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("直播获取失败，可以对我说重试", null);
+                            AIAssist.getInstance(Utils.getApp()).speakTTSVoice("直播获取失败，可以对我说重试", null);
                             stopLive(mCarLiveInfo);
                             mLoading.setVisibility(GONE);
                             mClLoadError.setVisibility(VISIBLE);
diff --git a/services/mogo-service-api/build.gradle b/services/mogo-service-api/build.gradle
index f7357ba931..992639b8c4 100644
--- a/services/mogo-service-api/build.gradle
+++ b/services/mogo-service-api/build.gradle
@@ -51,7 +51,7 @@ dependencies {
 
     api rootProject.ext.dependencies.mogoaicloudrealtime
     api rootProject.ext.dependencies.fresco
-    api rootProject.ext.dependencies.crashwarning
+    api rootProject.ext.dependencies.carmanager
 
     if (Boolean.valueOf(RELEASE)) {
         api rootProject.ext.dependencies.mogomapapi