[2.13.0-arch-opt] v2x remove

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

@@ -5,16 +5,13 @@ plugins {
     id 'kotlin-kapt'
     id 'com.alibaba.arouter'
 }
-
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
-
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
         versionCode Integer.valueOf(VERSION_CODE)
         versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
         //ARouter apt 参数
@@ -56,15 +53,23 @@ dependencies {
     implementation rootProject.ext.dependencies.arouter
     kapt rootProject.ext.dependencies.aroutercompiler
 
+    implementation rootProject.ext.dependencies.coroutinescore
+    implementation rootProject.ext.dependencies.coroutinesandroid
+    implementation rootProject.ext.dependencies.androidxccorektx
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.androidxconstraintlayout
+
     implementation rootProject.ext.dependencies.rxandroid
     implementation rootProject.ext.dependencies.androidxroomruntime
     kapt rootProject.ext.dependencies.androidxroomcompiler
     implementation rootProject.ext.dependencies.androidxroomktx
+    implementation rootProject.ext.dependencies.localbroadcastmanager
 
     implementation project(':foudations:mogo-commons')
     implementation project(':core:mogo-core-utils')
     implementation project(':core:mogo-core-network')
     implementation project(':core:mogo-core-function-call')
+    implementation project(':core:mogo-core-res')
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/function-impl/mogo-core-function-biz/src/main/AndroidManifest.xml

@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mogo.eagle.core.function.biz">
-
+    <application>
+        <receiver android:name="com.mogo.eagle.function.biz.v2x.v2n.test.TestV2XReceiver">
+            <intent-filter>
+                <action android:name="com.v2x.test_panel_control" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+    </application>
 </manifest>

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt

@@ -17,6 +17,8 @@ import com.mogo.eagle.function.biz.v2x.overview.OverViewDataManager
 import com.mogo.eagle.function.biz.v2x.overview.db.OverviewDb
 import com.mogo.eagle.function.biz.v2x.road.LineUploadManager
 import com.mogo.eagle.function.biz.v2x.trafficlight.core.MogoTrafficLightManager
+import com.mogo.eagle.function.biz.v2x.v2n.V2XEventManager
+import com.mogo.eagle.function.biz.v2x.v2n.V2XPoiLoader.Companion.v2xPoiLoader
 import com.mogo.eagle.function.biz.v2x.vip.VipCarManager
 
 @Route(path = MogoServicePaths.PATH_FUNC_BIZ)
@@ -35,6 +37,10 @@ class FuncBizProvider : IMoGoFuncBizProvider {
         OverviewDb.getDb(context)
         MogoTrafficLightManager.INSTANCE.initServer(context)
         VipCarManager.INSTANCE.initServer(context)
+        if(!(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+            && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode))){
+            V2XEventManager.init(context)
+        }
         if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
             LineUploadManager.getInstance(context)?.init()
         }
@@ -84,12 +90,21 @@ class FuncBizProvider : IMoGoFuncBizProvider {
         OverViewDataManager.getAllV2XEventsByLineId(MoGoAiCloudClientConfig.getInstance().sn)
     }
 
+    override fun queryV2XEvents() {
+        v2xPoiLoader.queryWholeRoadEvents()
+    }
+
     override fun onDestroy() {
         noticeSocketManager.release()
         dispatchAutoPilotManager.release()
         cronTaskManager.release()
 
         VipCarManager.INSTANCE.destroy()
+
+        if(!(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)
+                    && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode))){
+            V2XEventManager.onDestroy()
+        }
         if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
             mContext?.let {
                 LineUploadManager.getInstance(it)?.onDestroy()

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

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events
+package com.mogo.eagle.function.biz.v2x.v2n
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -33,25 +33,25 @@ import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.core.function.v2x.events.alarm.V2XAlarmServer
-import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi
-import com.mogo.eagle.core.function.v2x.events.consts.V2XConst.BROADCAST_SCENE_EXTRA_KEY
-import com.mogo.eagle.core.function.v2x.events.consts.V2XConst.BROADCAST_SCENE_HANDLER_ACTION
-import com.mogo.eagle.core.function.v2x.events.receiver.SceneBroadcastReceiver
-import com.mogo.eagle.core.function.v2x.events.scenario.impl.V2XScenarioManager
-import com.mogo.eagle.core.function.v2x.events.utils.toRoadMarker
-import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback
+import com.mogo.eagle.function.biz.v2x.v2n.alarm.V2XAlarmServer
+import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi
+import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst.BROADCAST_SCENE_EXTRA_KEY
+import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst.BROADCAST_SCENE_HANDLER_ACTION
+import com.mogo.eagle.function.biz.v2x.v2n.receiver.SceneBroadcastReceiver
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.V2XScenarioManager
+import com.mogo.eagle.function.biz.v2x.v2n.utils.toRoadMarker
 import com.mogo.eagle.core.data.v2x.V2XEvent
 import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult
 import com.mogo.eagle.core.data.v2x.V2XWarningTarget
 import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener
 import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
-import com.mogo.eagle.core.function.v2x.events.V2XPoiLoader.Companion.v2xPoiLoader
-import com.mogo.eagle.core.function.v2x.events.utils.toV2XRoadEventEntity
+import com.mogo.eagle.function.biz.v2x.v2n.V2XPoiLoader.Companion.v2xPoiLoader
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import com.mogo.eagle.core.utilcode.util.Utils
+import com.mogo.eagle.function.biz.v2x.v2n.network.callback.IV2XCallback
+import com.mogo.eagle.function.biz.v2x.v2n.utils.toV2XRoadEventEntity
 import com.zhjt.service.chain.ChainLog
 import com.zhjt.service.chain.TracingConstants
 import kotlinx.coroutines.CoroutineScope
@@ -378,10 +378,6 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
         }
     }
 
-    fun queryWholeRoadEvents() {
-        v2xPoiLoader.queryWholeRoadEvents()
-    }
-
     override fun onFail(msg: String) {
         CallerLogger.e("$M_V2X$TAG", "Error: $msg")
     }

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events
+package com.mogo.eagle.function.biz.v2x.v2n
 
 import android.os.Handler
 import android.os.Looper
@@ -11,13 +11,13 @@ import com.mogo.eagle.core.data.v2x.V2XEvent
 import com.mogo.eagle.core.data.v2x.V2XMarkerResponse
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback
-import com.mogo.eagle.core.function.v2x.internal.http.V2XRefreshModel
-import com.mogo.eagle.core.function.v2x.internal.http.callback.IV2XRefreshCallback
-import com.mogo.eagle.core.function.v2x.internal.utils.DistanceUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.eagle.function.biz.v2x.v2n.network.V2XRefreshModel
+import com.mogo.eagle.function.biz.v2x.v2n.network.callback.IV2XCallback
+import com.mogo.eagle.function.biz.v2x.v2n.network.callback.IV2XRefreshCallback
+import com.mogo.eagle.function.biz.v2x.v2n.utils.DistanceUtils
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicReference

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/alarm/V2XAlarmServer.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.alarm;
+package com.mogo.eagle.function.biz.v2x.v2n.alarm;
 
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
 import com.mogo.eagle.core.data.map.MogoLocation;

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/bridge/BridgeApi.kt

@@ -1,11 +1,14 @@
-package com.mogo.eagle.core.function.v2x.events.bridge
+package com.mogo.eagle.function.biz.v2x.v2n.bridge
 
 import android.content.Context
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.eagle.core.data.map.MogoLocation
-import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths
-import com.mogo.eagle.core.function.v2x.events.manager.*
+import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths
 import com.mogo.eagle.core.utilcode.util.Utils
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoPersonWarnPolylineManager
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoStopPolylineManager
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoV2XMarkerManager
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoWarnPolylineManager
 import java.lang.ref.WeakReference
 import java.util.concurrent.atomic.AtomicReference
 
@@ -24,22 +27,28 @@ internal object BridgeApi {
     }
 
     private val v2xWarnPolyline by lazy {
-        ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_WARN_POLYLINE_MANAGER).navigation(context()) as? IMoGoWarnPolylineManager
+        ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_WARN_POLYLINE_MANAGER).navigation(
+            context()
+        ) as? IMoGoWarnPolylineManager
     }
 
     private val v2xPersonWarnPolyline by lazy {
-        ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_PERSON_WARN_POLYLINE_MANAGER).navigation(context()) as? IMoGoPersonWarnPolylineManager
+        ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_PERSON_WARN_POLYLINE_MANAGER).navigation(
+            context()
+        ) as? IMoGoPersonWarnPolylineManager
     }
 
     private val v2xStopPolyline by lazy {
-        ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STOP_POLYLINE_MANAGER).navigation(context()) as? IMoGoStopPolylineManager
+        ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STOP_POLYLINE_MANAGER).navigation(
+            context()
+        ) as? IMoGoStopPolylineManager
     }
 
     fun init(context: Context) {
-        this.context.set(WeakReference(context))
+        BridgeApi.context.set(WeakReference(context))
     }
 
-    fun context(): Context = this.context.get()?.get() ?: Utils.getApp()
+    fun context(): Context = context.get()?.get() ?: Utils.getApp()
 
     fun v2xMarker() = v2xMarker
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/MoGoV2XServicePaths.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.consts;
+package com.mogo.eagle.function.biz.v2x.v2n.consts;
 
 import androidx.annotation.Keep;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/V2XConst.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.consts;
+package com.mogo.eagle.function.biz.v2x.v2n.consts;
 
 /**
  * author : donghongyu

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoPersonWarnPolylineManager.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.manager;
+package com.mogo.eagle.function.biz.v2x.v2n.manager;
 
 import android.content.Context;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoStopPolylineManager.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.manager;
+package com.mogo.eagle.function.biz.v2x.v2n.manager;
 
 import android.content.Context;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoV2XMarkerManager.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.manager;
+package com.mogo.eagle.function.biz.v2x.v2n.manager;
 
 import android.content.Context;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoWarnPolylineManager.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.manager;
+package com.mogo.eagle.function.biz.v2x.v2n.manager;
 
 import android.content.Context;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoPersonWarnPolylineManager.java

@@ -1,18 +1,17 @@
-package com.mogo.eagle.core.function.v2x.events.manager.impl;
+package com.mogo.eagle.function.biz.v2x.v2n.manager.impl;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
 
 import android.content.Context;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths;
-import com.mogo.eagle.core.function.v2x.events.consts.V2XConst;
+import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths;
+import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst;
 import com.mogo.eagle.core.data.v2x.DrawLineInfo;
-import com.mogo.eagle.core.function.v2x.events.manager.IMoGoPersonWarnPolylineManager;
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoPersonWarnPolylineManager;
 import com.mogo.map.overlay.IMogoOverlayManager;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoStopPolylineManager.java

@@ -1,18 +1,17 @@
-package com.mogo.eagle.core.function.v2x.events.manager.impl;
+package com.mogo.eagle.function.biz.v2x.v2n.manager.impl;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
 
 import android.content.Context;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths;
-import com.mogo.eagle.core.function.v2x.events.consts.V2XConst;
+import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths;
+import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst;
 import com.mogo.eagle.core.data.v2x.DrawLineInfo;
-import com.mogo.eagle.core.function.v2x.events.manager.IMoGoStopPolylineManager;
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoStopPolylineManager;
 import com.mogo.map.overlay.IMogoOverlayManager;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.manager.impl;
+package com.mogo.eagle.function.biz.v2x.v2n.manager.impl;
 
 import static com.mogo.commons.module.ServiceConst.CARD_TYPE_NOVELTY;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
@@ -16,10 +16,10 @@ import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths;
-import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XMarkerManager;
-import com.mogo.eagle.core.function.v2x.events.marker.V2XMarkerAdapter;
-import com.mogo.eagle.core.function.v2x.events.utils.MapUtils;
+import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths;
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoV2XMarkerManager;
+import com.mogo.eagle.function.biz.v2x.v2n.marker.V2XMarkerAdapter;
+import com.mogo.eagle.function.biz.v2x.v2n.utils.MapUtils;
 import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.map.marker.IMogoMarker;

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoWarnPolylineManager.java

@@ -1,17 +1,16 @@
-package com.mogo.eagle.core.function.v2x.events.manager.impl;
+package com.mogo.eagle.function.biz.v2x.v2n.manager.impl;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
 
 import android.content.Context;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths;
+import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths;
 import com.mogo.eagle.core.data.v2x.DrawLineInfo;
-import com.mogo.eagle.core.function.v2x.events.manager.IMoGoWarnPolylineManager;
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoWarnPolylineManager;
 import com.mogo.map.overlay.IMogoOverlayManager;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java

@@ -1,11 +1,11 @@
-package com.mogo.eagle.core.function.v2x.events.marker;
+package com.mogo.eagle.function.biz.v2x.v2n.marker;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
 import com.mogo.eagle.core.function.v2x.R;
-import com.mogo.eagle.core.function.v2x.events.view.V2XMarkerRoadEventView;
+import com.mogo.eagle.function.biz.v2x.v2n.view.V2XMarkerRoadEventView;
 import java.util.ArrayList;
 
 /**

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/V2XRefreshModel.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.internal.http
+package com.mogo.eagle.function.biz.v2x.v2n.network
 
 import com.elegant.network.utils.GsonUtil
 import com.elegant.network.utils.SignUtil
@@ -8,18 +8,12 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.constants.HostConst
 import com.mogo.commons.network.ParamsUtil
-import com.mogo.eagle.core.data.enums.DataSourceType
-import com.mogo.eagle.core.data.msgbox.MsgBoxBean
-import com.mogo.eagle.core.data.msgbox.MsgBoxType
-import com.mogo.eagle.core.data.msgbox.V2XMsg
 import com.mogo.eagle.core.data.v2x.V2XEventData
 import com.mogo.eagle.core.data.v2x.V2XLocation
 import com.mogo.eagle.core.data.v2x.V2XMarkerResponse
-import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.core.function.v2x.events.V2XPoiLoader
-import com.mogo.eagle.core.function.v2x.internal.http.api.V2XApiService
-import com.mogo.eagle.core.function.v2x.internal.http.body.V2XRefreshEntity
-import com.mogo.eagle.core.function.v2x.internal.http.callback.IV2XRefreshCallback
+import com.mogo.eagle.function.biz.v2x.v2n.network.api.V2XApiService
+import com.mogo.eagle.function.biz.v2x.v2n.network.body.V2XRefreshEntity
+import com.mogo.eagle.function.biz.v2x.v2n.network.callback.IV2XRefreshCallback
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/api/V2XApiService.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.internal.http.api
+package com.mogo.eagle.function.biz.v2x.v2n.network.api
 
 import com.mogo.eagle.core.data.v2x.V2XEventResult
 import com.mogo.eagle.core.data.v2x.V2XMarkerResponse

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/body/V2XRefreshEntity.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.internal.http.body
+package com.mogo.eagle.function.biz.v2x.v2n.network.body
 
 import androidx.annotation.Keep
 import com.mogo.eagle.core.data.v2x.V2XLocation

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/callback/IV2XCallback.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.internal.callback
+package com.mogo.eagle.function.biz.v2x.v2n.network.callback
 
 import com.mogo.eagle.core.data.v2x.V2XEvent
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/callback/IV2XRefreshCallback.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.internal.http.callback
+package com.mogo.eagle.function.biz.v2x.v2n.network.callback
 
 /**
  * 刷新回调

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/receiver/SceneBroadcastReceiver.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.receiver
+package com.mogo.eagle.function.biz.v2x.v2n.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -6,8 +6,8 @@ import android.content.Intent
 import android.content.IntentFilter
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.mogo.eagle.core.data.map.entity.V2XMessageEntity
-import com.mogo.eagle.core.function.v2x.events.consts.V2XConst
-import com.mogo.eagle.core.function.v2x.events.scenario.impl.V2XScenarioManager
+import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.V2XScenarioManager
 
 class SceneBroadcastReceiver : BroadcastReceiver() {
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.remove
+package com.mogo.eagle.function.biz.v2x.v2n.remove
 
 import android.os.Handler
 import android.os.HandlerThread

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/IV2XScenario.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.scenario;
+package com.mogo.eagle.function.biz.v2x.v2n.scenario;
 
 import com.mogo.eagle.core.data.map.entity.V2XMessageEntity;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/IV2XScenarioManager.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.scenario;
+package com.mogo.eagle.function.biz.v2x.v2n.scenario;
 
 
 import com.mogo.eagle.core.data.map.entity.V2XMessageEntity;

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/AbsV2XScenario.java

@@ -1,11 +1,11 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.impl;
+package com.mogo.eagle.function.biz.v2x.v2n.scenario.impl;
 
 
 import androidx.annotation.Nullable;
 
 import com.mogo.eagle.core.data.map.entity.V2XMessageEntity;
-import com.mogo.eagle.core.function.v2x.events.scenario.IV2XScenario;
-import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.IV2XScenario;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker;
 
 import java.util.concurrent.atomic.AtomicReference;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java

@@ -1,22 +1,18 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.impl;
+package com.mogo.eagle.function.biz.v2x.v2n.scenario.impl;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
 
-import android.content.Intent;
-
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.eagle.core.data.config.HmiBuildConfig;
 import com.mogo.eagle.core.data.map.entity.V2XMessageEntity;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.function.v2x.events.consts.V2XConst;
-import com.mogo.eagle.core.function.v2x.events.scenario.IV2XScenarioManager;
-import com.mogo.eagle.core.function.v2x.events.scenario.scene.road.V2XRoadEventScenario;
-import com.mogo.eagle.core.function.v2x.events.scenario.scene.warning.V2XFrontWarningScenario;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.IV2XScenarioManager;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road.V2XRoadEventScenario;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.warning.V2XFrontWarningScenario;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
-import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.VisualAngleMode;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad
+package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad
 
 import android.animation.ArgbEvaluator
 import android.graphics.Color
@@ -11,7 +11,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
 import com.mogo.eagle.core.function.call.autopilot.*
 import com.mogo.eagle.core.function.call.map.*
-import com.mogo.eagle.core.function.v2x.events.scenario.scene.road.V2XAiRoadEventMarker
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road.V2XAiRoadEventMarker
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils
 import com.mogo.map.MogoMap
@@ -20,8 +20,8 @@ import com.mogo.map.overlay.MogoPolylineOptions
 import java.util.*
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.ConcurrentHashMap
-import com.mogo.eagle.core.function.v2x.events.remove.MarkerRemoveManager
-import com.mogo.eagle.core.function.v2x.events.remove.MarkerWrapper
+import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerRemoveManager
+import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper
 
 /**
  * Ai云道路施工事件，道路颜色标记类

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt

@@ -1,14 +1,13 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.scene.road
+package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road
 
 import android.graphics.Color
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.map.MogoLatLng
-import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
-import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi.context
-import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi.v2xMarker
-import com.mogo.eagle.core.function.v2x.events.remove.MarkerWrapper
+import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi.context
+import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi.v2xMarker
+import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper
 import com.mogo.map.marker.IMogoMarker
 import com.mogo.map.overlay.IMogoPolyline
 import com.mogo.map.overlay.MogoPolylineOptions

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.scene.road;
+package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road;
 
 import android.util.Log;
 import androidx.core.util.Pair;
@@ -6,12 +6,12 @@ import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
 import com.mogo.eagle.core.data.map.entity.MarkerExploreWay;
 import com.mogo.eagle.core.data.map.entity.MarkerLocation;
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
-import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi;
-import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XMarkerManager;
-import com.mogo.eagle.core.function.v2x.events.remove.MarkerWrapper;
-import com.mogo.eagle.core.function.v2x.events.remove.MarkerRemoveManager;
-import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.AiRoadMarker;
-import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
+import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi;
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoV2XMarkerManager;
+import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper;
+import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerRemoveManager;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad.AiRoadMarker;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker;
 import com.mogo.map.marker.IMogoMarker;
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.scene.road;
+package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road;
 
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew;
@@ -17,8 +17,8 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager;
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager;
-import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario;
-import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.AbsV2XScenario;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker;
 import com.mogo.eagle.core.network.utils.GsonUtil;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.scene.warning;
+package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.warning;
 
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
 
@@ -21,8 +21,8 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager;
-import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario;
-import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.AbsV2XScenario;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker;
 import com.mogo.eagle.core.data.v2x.V2XWarningTarget;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.scene.warning;
+package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.warning;
 
 import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA;
 import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA;
@@ -13,11 +13,11 @@ import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.data.v2x.DrawLineInfo;
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi;
-import com.mogo.eagle.core.function.v2x.events.manager.IMoGoPersonWarnPolylineManager;
-import com.mogo.eagle.core.function.v2x.events.manager.IMoGoStopPolylineManager;
-import com.mogo.eagle.core.function.v2x.events.manager.IMoGoWarnPolylineManager;
-import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker;
+import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi;
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoPersonWarnPolylineManager;
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoStopPolylineManager;
+import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoWarnPolylineManager;
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker;
 import com.mogo.eagle.core.data.v2x.V2XLocation;
 import com.mogo.eagle.core.data.v2x.V2XWarningTarget;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/view/IV2XMarker.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.view;
+package com.mogo.eagle.function.biz.v2x.v2n.scenario.view;
 
 /**
  * author : donghongyu

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestConsts.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.test
+package com.mogo.eagle.function.biz.v2x.v2n.test
 
 class TestConsts {
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestOnLineCarUtils.java

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.test;
+package com.mogo.eagle.function.biz.v2x.v2n.test;
 
 import static com.mogo.eagle.core.data.map.entity.V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING;
 

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

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.test;
+package com.mogo.eagle.function.biz.v2x.v2n.test;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -10,7 +10,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.entity.V2XMessageEntity;
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
 import com.mogo.eagle.core.data.v2x.V2XOptimalRouteDataRes;
-import com.mogo.eagle.core.function.v2x.events.consts.V2XConst;
+import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst;
 
 import java.util.List;
 

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/DistanceUtils.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.internal.utils
+package com.mogo.eagle.function.biz.v2x.v2n.utils
 
 import kotlin.math.asin
 import kotlin.math.cos

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/EntityUtils.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.utils
+package com.mogo.eagle.function.biz.v2x.v2n.utils
 
 import androidx.core.util.Pair
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew.Companion.isRoadEvent
@@ -7,7 +7,7 @@ import com.mogo.eagle.core.data.map.entity.MarkerLocation
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
 import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult
 import com.mogo.eagle.core.data.v2x.V2XRoadXData
-import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.AiRoadMarker
+import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad.AiRoadMarker
 import com.mogo.eagle.core.utilcode.util.CoordinateTransform
 import mogo.telematics.pad.MessagePad
 import roadwork.Road

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/MapUtils.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.utils
+package com.mogo.eagle.function.biz.v2x.v2n.utils
 
 import android.content.Context
 import android.graphics.Rect

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/view/V2XMarkerRoadEventView.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.v2x.events.view
+package com.mogo.eagle.function.biz.v2x.v2n.view
 
 
 import android.content.Context
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity
-import com.mogo.eagle.core.function.v2x.R
+import com.mogo.eagle.core.function.biz.R
 import com.mogo.eagle.core.utilcode.util.ViewUtils
 import kotlinx.android.synthetic.main.view_marker_event_car.view.*