Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0'

Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!657

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt

@@ -14,7 +14,7 @@ interface IDispatchAdasApiService {
      * @return [BaseData]
      */
     @FormUrlEncoded
-    @POST("eagle-eye-dns/eagle-eye-dns/dataService/autoDriver/receiveCarPreSetPath")
+    @POST("eagle-eye-dns/dataService/autoDriver/receiveCarPreSetPath")
     fun uploadAutopilotRoute(@FieldMap parameters: Map<String, String>): Observable<BaseData>
 
     /**

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt

@@ -10,7 +10,7 @@ import retrofit2.http.POST
 interface ILineUploadApi {
 
     @Headers("Content-type:application/json;charset=UTF-8" )
-    @POST( "/yycp-data-center-service/carTrack/receiveCarTrack/" )
+    @POST( "eagle-eye-dns/yycp-data-center-service/carTrack/receiveCarTrack/" )
     fun uploadLineId(@Body lineId: LineUploadData): Observable<BaseData>
 
 }

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt

@@ -3,6 +3,7 @@ package com.mogo.eagle.function.biz.v2x.road
 import android.content.Context
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.constants.HostConst.DATA_CENTER_HOST
+import com.mogo.commons.constants.HostConst.getEagleHost
 import com.mogo.eagle.core.data.v2x.LineUploadData
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -54,7 +55,7 @@ class LineUploadManager private constructor(context: Context) : IMoGoAutopilotSt
 
     private fun uploadLine(lineId: Long) {
         val lineUploadData = LineUploadData(lineId, MoGoAiCloudClientConfig.getInstance().sn)
-        disposable = MoGoRetrofitFactory.getInstance(DATA_CENTER_HOST)
+        disposable = MoGoRetrofitFactory.getInstance(getEagleHost())
             .create(ILineUploadApi::class.java)
             .uploadLineId(lineUploadData)
             .subscribeOn(Schedulers.io())

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

@@ -159,9 +159,6 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
                 handleWarningTargetEvent(event.data)
             }
             is V2XEvent.RoadAI -> {
-                if (FunctionBuildConfig.isV2NFromCar) {
-                    return
-                }
                 handleRoadMarkerEvent(event.data.toRoadMarker())
             }
             is V2XEvent.RoadEventX -> {
@@ -173,12 +170,16 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
         }
     }
 
-    @SuppressLint("NewApi")
+    @ChainLog(
+        linkChainLog = CHAIN_LINK_LOG_CLOUD_V2N,
+        linkCode = CHAIN_LINK_CLOUD,
+        endpoint = TracingConstants.Endpoint.PAD,
+        nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_V2N,
+        paramIndexes = [0],
+        clientPkFileName = "sn"
+    )
     override fun onAutopilotIdentifyPlanningObj(planningObjects: List<MessagePad.PlanningObject>?) {
         super.onAutopilotIdentifyPlanningObj(planningObjects)
-        if (!FunctionBuildConfig.isV2NFromCar) {
-            return
-        }
         planningObjects?.let {
             if (it.isNotEmpty()) {
                 val first = it.stream()

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt

@@ -12,6 +12,7 @@ class AiCloudSocketBizProvider : IMoGoFunctionServerProvider {
         get() = "AiCloudSocketBizProvider"
 
     override fun init(context: Context?) {
+        //todo bus加载
         context?.let {
             SocketManager.getInstance().init(it, 0.0, 0.0)
             SocketManager.getInstance().registerOnMessageListener(401012, V2XMessageListener401012())

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

@@ -134,8 +134,6 @@ class MoGoAdasListenerImpl : OnAdasListener {
 
         if (gnssInfo != null) {
             if (1 == FunctionBuildConfig.gpsProvider) {
-                // 同步给MAP地图
-                //CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map(gnssInfo)
                 // 同步更新经纬度和系统时间至 AutoPilotStatusListener
                 CallerAutoPilotStatusListenerManager.updateAutoPilotLatLon(
                     gnssInfo.satelliteTime,
@@ -146,7 +144,6 @@ class MoGoAdasListenerImpl : OnAdasListener {
         }
     }
 
-
     /**
      * 老底盘信息,透传底盘状态，pb参考底盘
      * TODO 目前由于M1车型不会在新底盘PB添加新的字段 所以临时保留
@@ -369,7 +366,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
         //他车轨迹预测
     }
 
-    override fun onPointCloud(pointCloud: ByteArray?) {
+    override fun onPointCloud(header: MessagePad.Header, pointCloud: ByteArray?) {
         //点云数据透传
         CallerAutopilotPointCloudListenerManager.invokeAutopilotPointCloudDataUpdate(pointCloud)
     }
@@ -596,6 +593,16 @@ class MoGoAdasListenerImpl : OnAdasListener {
 
     }
 
+    /**
+     * 清扫车后部摄像头视频 10Hz
+     *
+     * @param header 头
+     * @param data   数据
+     */
+    override fun onBackCameraVideo(header: MessagePad.Header, data: ByteArray) {
+        CallerSweeperFutianBackCameraVideoListenerManager.invokeSweeperFutianBackCameraVideo(data)
+    }
+
     /**
      * 清扫车指标数据
      *

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt

@@ -50,9 +50,11 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
     private var mContext: Context? = null
 
     //是否有AI获取红绿灯灯态
+    @Volatile
     private var hasAiLightStatus: Boolean = false
 
     //obu数据
+    @Volatile
     private var hasObuLightStatus: Boolean = false
 
     fun initServer(context: Context) {

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

@@ -86,10 +86,18 @@ class BindingCarNetWorkManager private constructor() {
                             SharedPrefsConstants.CAR_INFO,
                             GsonUtils.toJson(info.getData())
                         )
+                    } else {
+                        SharedPrefsMgr.getInstance(context).putString(
+                            SharedPrefsConstants.CAR_INFO, "null")
+                        e(
+                            SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null "
+                        )
                     }
                 }
 
                 override fun onError(e: Throwable) {
+                    SharedPrefsMgr.getInstance(context).putString(
+                        SharedPrefsConstants.CAR_INFO, e.message.toString())
                     e(
                         SceneConstant.M_BINDING + TAG,
                         "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message

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

@@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils
 import mogo_msg.MogoReportMsg
 
@@ -69,29 +70,30 @@ class IPCReportManager : IMoGoAutopilotStatusListener {
      *工控机监控节点上报
      */
     override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
-        guardianInfo?.let{
-            if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE)
-                || it.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED)
-                || it.resultList.contains(RESULT_REMOTEPILOT_DISABLE)
-                || it.resultList.contains(RESULT_AUTOPILOT_INFERIOR)
-                || it.resultList.contains(RESULT_SHOW_WARNING)
-                || it.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)){
-                val reportEntity = ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()),
-                    it.src,it.level,it.msg,it.code,it.resultList,it.actionsList)
-                CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity))
-            }
+        ThreadUtils.runOnUiThread {
+            guardianInfo?.let{
+                if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE)
+                    || it.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED)
+                    || it.resultList.contains(RESULT_REMOTEPILOT_DISABLE)
+                    || it.resultList.contains(RESULT_AUTOPILOT_INFERIOR)
+                    || it.resultList.contains(RESULT_SHOW_WARNING)
+                    || it.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)){
+                    val reportEntity = ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()),
+                        it.src,it.level,it.msg,it.code,it.resultList,it.actionsList)
+                    CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity))
+                }
 
-            if (reportList.size > 49) {
-                reportList.removeLast()
-            }
-            reportList.add(
-                0,
-                ReportEntity(
-                    TimeUtils.millis2String(System.currentTimeMillis()),
-                    it.src, it.level, it.msg, it.code, it.resultList, it.actionsList
+                if (reportList.size > 49) {
+                    reportList.removeLast()
+                }
+                reportList.add(
+                    0,
+                    ReportEntity(
+                        TimeUtils.millis2String(System.currentTimeMillis()),
+                        it.src, it.level, it.msg, it.code, it.resultList, it.actionsList
+                    )
                 )
-            )
-            reportListFloatWindow?.refreshData(reportList)
+                reportListFloatWindow?.refreshData(reportList)
 
 //            //Error 弹窗并有提示音
 //            if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE)
@@ -128,6 +130,7 @@ class IPCReportManager : IMoGoAutopilotStatusListener {
 //                    }
 //                }
 //            }
+            }
         }
     }
 

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

@@ -83,7 +83,7 @@ class SceneManager {
                 }
             }
             //call back
-            CallerDevaToolsListenerManager.invokeDevaToolsModuleLogChanges(sceneModuleTAG.map)
+//            CallerDevaToolsListenerManager.invokeDevaToolsModuleLogChanges(sceneModuleTAG.map)
         }
     }
 

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

@@ -1,8 +1,6 @@
 package com.zhjt.mogo_core_function_devatools.upgrade
 
-import android.app.NotificationManager
 import android.content.Context
-import androidx.core.app.NotificationCompat
 import com.elegant.utils.UiThreadHandler
 import com.mogo.eagle.core.data.obu.MogoObuConst
 import com.mogo.eagle.core.function.api.devatools.IMogoDevaToolsUpgradeListener
@@ -128,31 +126,20 @@ class UpgradeManager : IDownload {
     }
 
     /**
-     * 鹰眼app下载监听 liyz
+     * 鹰眼app下载监听
      */
     fun updateUpgradeProgress(context: Context) {
-        val builder = NotificationCompat.Builder(context)
-        //        builder.setSmallIcon(R.mipmap.icon1001);//todo emArrow 更换图标，去除地图下载图标的依赖关系
-        builder.setContentTitle("下载")
-        builder.setContentText("正在下载")
-        val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         CallerDevaToolsUpgradeListenerManager.addListener(
             TAG,
             object : IMogoDevaToolsUpgradeListener {
                 override fun onStart(url: String?) {}
                 override fun onPause(url: String?) {}
                 override fun onProgress(url: String?, length: Int) {
-                    builder.setProgress(100, length, false)
-                    manager.notify(0x3, builder.build())
-                    //下载进度提示
-                    builder.setContentText("已下载$length%")
                     updateStatusBarDownloadView(true, "download", length)
                 }
 
                 override fun onFinished(url: String?) {
-                    builder.setContentText("已下载" + 100 + "%")
                     UiThreadHandler.postDelayed({
-                        manager.cancel(0x3)
                         updateStatusBarDownloadView(false, "download", 100)
                     }, 1000)
                 }

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

@@ -98,20 +98,20 @@
 
         </activity>
 
-        <activity
-            android:name="com.mogo.eagle.core.function.main.VideoAdAtc"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:enabled="true"
-            android:exported="true"
-            android:process=":video_ad"
-            android:resizeableActivity="false"
-            android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
-            android:stateNotNeeded="true"
-            android:theme="@style/Main"
-            android:windowSoftInputMode="adjustPan|stateHidden">
+<!--        <activity-->
+<!--            android:name="com.mogo.eagle.core.function.main.VideoAdAtc"-->
+<!--            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"-->
+<!--            android:enabled="true"-->
+<!--            android:exported="true"-->
+<!--            android:process=":video_ad"-->
+<!--            android:resizeableActivity="false"-->
+<!--            android:resumeWhilePausing="true"-->
+<!--            android:screenOrientation="landscape"-->
+<!--            android:stateNotNeeded="true"-->
+<!--            android:theme="@style/Main"-->
+<!--            android:windowSoftInputMode="adjustPan|stateHidden">-->
 
-        </activity>
+<!--        </activity>-->
 
         <activity
             android:name="com.mogo.eagle.core.function.main.AppListActivity"

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

@@ -21,6 +21,7 @@ import chassis.Chassis
 import chassis.ChassisStatesOuterClass
 import com.mogo.cloud.passport.MoGoAiCloudClient
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.constants.SharedPrefsConstants
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.data.app.AppConfigInfo
@@ -117,6 +118,7 @@ internal class DebugSettingView @JvmOverloads constructor(
     private var logInfoView: LogInfoView? = null
     private var logViewAttach = false
 
+    @Volatile
     private var mAutoPilotStatusInfo: AutopilotStatusInfo? = null
     private var mGnssInfo: MogoLocation? = null
 
@@ -126,15 +128,19 @@ internal class DebugSettingView @JvmOverloads constructor(
     private var accelerationThresholdNum: Double = 0.0
 
     // 感知识别「已知类型」数据个数
+    @Volatile
     private var mIdentifyDataSize = 0
 
     // 感知识别「未知类型」数据个数
+    @Volatile
     private var mUnknownIdentifyDataSize = 0
 
     // 引导线点个数
+    @Volatile
     private var mTrajectoryInfoSize = 0
 
     // 全局路径规划点个数
+    @Volatile
     private var mRouteInfoSize = 0
 
     //日志过滤标签集合
@@ -202,7 +208,6 @@ internal class DebugSettingView @JvmOverloads constructor(
         CallerChassisGearStateListenerManager.addListener(TAG, this)
         CallerChassisSteeringStateListenerManager.addListener(TAG, this)
         CallerChassisThrottleStateListenerManager.addListener(TAG, this)
-
         //添加 开发套件工具接口 监听
         CallerDevaToolsListenerManager.addListener(TAG, this)
         //添加 底盘灯光数据 监听
@@ -253,6 +258,7 @@ internal class DebugSettingView @JvmOverloads constructor(
         CallerChassisLamplightListenerManager.removeListener(TAG)
         // 移除 obu获取信息 监听
         CallerObuInfoListenerManager.removeListener(TAG)
+
         // 移除 业务配置监听
         CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(
             FuncBizConfig.FOUNDATION,
@@ -365,6 +371,7 @@ internal class DebugSettingView @JvmOverloads constructor(
                 swDevelopMode.visibility = View.GONE
             }
         }
+
         /**
          * 开发者模式
          */
@@ -638,12 +645,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             FunctionBuildConfig.isBeautyMode = isChecked
         }
 
-        tbV2NFromCar.isChecked = FunctionBuildConfig.isV2NFromCar
-        //v2n车端预警
-        tbV2NFromCar.setOnCheckedChangeListener { _, isChecked ->
-            FunctionBuildConfig.isV2NFromCar = isChecked
-        }
-
         tbDrawAiCloudFusion.isChecked = FunctionBuildConfig.isDrawAiCloudFusion
         //云端感知绘制
         tbDrawAiCloudFusion.setOnCheckedChangeListener { _, isChecked ->
@@ -1601,6 +1602,7 @@ internal class DebugSettingView @JvmOverloads constructor(
         tvAutopilotInfo.text = autopilotJson
         tvIpcInfo.text = autopilotJson
         tvIpcInfoKey.text = autopilotJson
+        tvCmdbCarInfoContent.text = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.CAR_INFO)
 
         tvCarInfo.text =
             "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))?.toLong()}\n" +
@@ -2058,4 +2060,5 @@ internal class DebugSettingView @JvmOverloads constructor(
     override fun onObuDeviceId(obuDeviceId: String) {
         mObuDeviceId = obuDeviceId
     }
+
 }

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

@@ -27,6 +27,7 @@ class SpeedPanelView @JvmOverloads constructor(
 
     var mContext: Context
     var mSpeedChartView: SpeedChartView
+    @Volatile
     var mLatLng: MogoLocation? = null
 
     init {

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

@@ -11,19 +11,19 @@ import com.mogo.eagle.core.widget.TextureVideoView
  */
 class VideoAdAtc : AppCompatActivity() {
 
-    private lateinit var svpFrame: TextureVideoView
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_video_ad_atc)
-
-        svpFrame = findViewById(R.id.svp_frame)
-
-        val url = "android.resource://" + packageName + "/" + R.raw.mogo_ad
-        svpFrame.videoPath = url
-        svpFrame.start()
-
-        BarUtils.hideStatusBarAndSticky(this.window)
-    }
+//    private lateinit var svpFrame: TextureVideoView
+//
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//        setContentView(R.layout.activity_video_ad_atc)
+//
+//        svpFrame = findViewById(R.id.svp_frame)
+//
+//        val url = "android.resource://" + packageName + "/" + R.raw.mogo_ad
+//        svpFrame.videoPath = url
+//        svpFrame.start()
+//
+//        BarUtils.hideStatusBarAndSticky(this.window)
+//    }
 
 }

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

@@ -207,6 +207,29 @@
                 android:layout_height="1dp"
                 android:background="#F0F0F0" />
 
+            <TextView
+                android:id="@+id/tvCmdbCarInfo"
+                style="@style/DebugSettingText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="车辆信息: " />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#F0F0F0" />
+            <TextView
+                android:id="@+id/tvCmdbCarInfoContent"
+                style="@style/DebugSettingText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minLines="5" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#F0F0F0" />
+
             <ToggleButton
                 android:id="@+id/tbIsDemoMode"
                 android:layout_width="match_parent"
@@ -243,18 +266,6 @@
                 android:textOn="关闭感知优化模式"
                 android:textSize="@dimen/dp_24" />
 
-            <ToggleButton
-                android:id="@+id/tbV2NFromCar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                android:background="@drawable/radio_button_normal_background_right"
-                android:textColor="#000"
-                android:textOff="开启车端V2N预警"
-                android:textOn="关闭车端V2N预警"
-                android:textSize="@dimen/dp_24" />
-
             <ToggleButton
                 android:id="@+id/tbDrawAiCloudFusion"
                 android:layout_width="match_parent"

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

@@ -217,8 +217,8 @@
         android:scaleY="1.2"
         android:scaleX="1.2"
         app:layout_constraintTop_toBottomOf="@id/tbObuWeaknessTrafficSop"
-        app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
+        app:layout_constraintLeft_toLeftOf="parent"
         />
 
     <TextView
@@ -226,7 +226,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop"
+        app:layout_constraintTop_toBottomOf="@id/tbIPCReport"
         android:text="变道速度阈值："
         android:textSize="@dimen/dp_36"
         android:textColor="#1A1A1A"

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java

@@ -23,7 +23,7 @@ public class SpeedLimitDataManager implements IMoGoChassisLocationGCJ02Listener
 
     private final static String TAG = "SpeedLimitDataManager";
     private static volatile SpeedLimitDataManager instance;
-    private MogoLocation mLocation;
+    private volatile MogoLocation mLocation;
 
     private SpeedLimitDataManager() {
     }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt

@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.business.ai.net
 
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.constants.HostConst
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.END_METRE
@@ -27,7 +28,7 @@ class AiCloudIdentifyNetWorkModel {
         return host
     }
 
-    private fun getNetWorkApi(baseUrl: String = getHost()): IAiCloudIdentifyApiService {
+    private fun getNetWorkApi(baseUrl: String = HostConst.getEagleHost()): IAiCloudIdentifyApiService {
         return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl)
             .create(IAiCloudIdentifyApiService::class.java)
     }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt

@@ -8,6 +8,6 @@ import retrofit2.http.POST
 interface IAiCloudIdentifyApiService {
 
     @Headers("Content-type:application/json;charset=UTF-8")
-    @POST("yycp-c-v2x-service/dataFusion/remoteDrivingSet")
+    @POST("eagle-eye-dns/yycp-c-v2x-service/dataFusion/remoteDrivingSet")
     suspend fun identifyRange(@Body map: MutableMap<String, Any>): BaseResponse<Any>
 }