[6.0.0] code opt and update sdk of aicloud , map , plus kotlin union

2023-08-25 13:30:43 +08:00
parent eff64e72dc
commit b2aeb45b0e
71 changed files with 84 additions and 126 deletions
--- a/OCH/charter/driver/build.gradle
+++ b/OCH/charter/driver/build.gradle
@@ -55,7 +55,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    kapt rootProject.ext.dependencies.aroutercompiler
--- a/OCH/charter/passenger/build.gradle
+++ b/OCH/charter/passenger/build.gradle
@@ -48,7 +48,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    implementation rootProject.ext.dependencies.androidxrecyclerview
--- a/OCH/mogo-och-bus-passenger/build.gradle
+++ b/OCH/mogo-och-bus-passenger/build.gradle
@@ -56,7 +56,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    implementation rootProject.ext.dependencies.androidxrecyclerview
--- a/OCH/mogo-och-bus/build.gradle
+++ b/OCH/mogo-och-bus/build.gradle
@@ -56,7 +56,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    annotationProcessor rootProject.ext.dependencies.aroutercompiler
--- a/OCH/mogo-och-common-module/build.gradle
+++ b/OCH/mogo-och-common-module/build.gradle
@@ -44,7 +44,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxccorektx
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.material
--- a/OCH/mogo-och-data/build.gradle
+++ b/OCH/mogo-och-data/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {

    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxccorektx
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.material
--- a/OCH/shuttle/driver/build.gradle
+++ b/OCH/shuttle/driver/build.gradle
@@ -46,7 +46,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    annotationProcessor rootProject.ext.dependencies.aroutercompiler
--- a/OCH/shuttle/passenger/build.gradle
+++ b/OCH/shuttle/passenger/build.gradle
@@ -62,7 +62,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    implementation rootProject.ext.dependencies.androidxrecyclerview
--- a/OCH/sweeper/sweeper-cloud/build.gradle
+++ b/OCH/sweeper/sweeper-cloud/build.gradle
@@ -45,7 +45,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    annotationProcessor rootProject.ext.dependencies.aroutercompiler
--- a/OCH/sweeper/sweeper/build.gradle
+++ b/OCH/sweeper/sweeper/build.gradle
@@ -45,7 +45,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    annotationProcessor rootProject.ext.dependencies.aroutercompiler
--- a/OCH/taxi/driver/build.gradle
+++ b/OCH/taxi/driver/build.gradle
@@ -45,7 +45,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    implementation rootProject.ext.dependencies.androidxrecyclerview
--- a/OCH/taxi/passenger/build.gradle
+++ b/OCH/taxi/passenger/build.gradle
@@ -45,7 +45,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    implementation rootProject.ext.dependencies.androidxrecyclerview
--- a/OCH/taxi/unmanned-driver/build.gradle
+++ b/OCH/taxi/unmanned-driver/build.gradle
@@ -47,7 +47,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    implementation rootProject.ext.dependencies.androidxrecyclerview
--- a/OCH/taxi/unmanned-passenger/build.gradle
+++ b/OCH/taxi/unmanned-passenger/build.gradle
@@ -45,7 +45,7 @@ android {

 dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
    implementation rootProject.ext.dependencies.androidxrecyclerview
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
    }
    dependencies {
        classpath "com.android.tools.build:gradle:${gradle_version}"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_plugin_version}"
        classpath "com.alibaba:arouter-register:10.0.5_mogo"
        classpath 'com.tencent.bugly:symtabfileuploader:2.2.1'
        classpath "com.bytedance.android.byteX:base-plugin:${plugin_version}"
--- a/config.gradle
+++ b/config.gradle
@@ -1,7 +1,6 @@
 apply from: rootProject.file('gradle/ext.gradle')
 ext {
    time = ""
-//    kotlin_version = "1.4.31"
    kotlin_version = "1.6.21"
    dependencies = [
            // androidx
@@ -21,9 +20,6 @@ ext {
            androidxjunit                : "androidx.test.ext:junit:1.1.2",
            androidxespressocore         : "androidx.test.espresso:espresso-core:3.3.0",
            // 地图
-//            amapnavi3dmap              : "com.amap.api:navi-3dmap:8.0.1_3dmap8.0.1",
-//            amapsearch                 : "com.amap.api:search:7.9.0",
-//            amaplocation               : "com.amap.api:location:5.5.0",
            amapnavi3dmap                : "com.amap.api:navi-3dmap:9.8.1_3dmap9.7.0",
            amapsearch                   : "com.amap.api:search:9.7.0",
            amaplocation                 : "com.amap.api:location:6.3.0",
@@ -72,11 +68,10 @@ ext {
            indicator                    : 'com.github.zhpanvip:viewpagerindicator:1.0.4',
            strategy                     : 'com.zhidaoauto.mic:strategy:1.0.6',

-            //
            jetbrainsannotationsjava5    : "org.jetbrains:annotations-java5:15.0",

-            // crash
-            kotlinstdlibjdk7             : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}",
+            // kotlin
+            kotlinstdlib                 : "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}",

            //探路使用的直播组件
            videoarmv7                   : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2",
@@ -129,7 +124,6 @@ ext {
            // 基础服务实现
            mogowebsocket                : "com.mogo.module.carchatting:module-carchatt-socket:${WEBSOCKET_VERSION}",
            mogologlib                   : "com.mogo.module:module-loglib:${LOGLIB_VERSION}",
-            kotlingradleplugin           : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}",
            crashreport                  : "com.mogo.test:crashreport:${CRASHREPORT_VERSION}",
            crashreportapmbyte           : "com.mogo.test:crashreport-apmbyte:${CRASHREPORT_APMBYTE_VERSION}",
            crashreportnoop              : "com.mogo.test:crashreport-noop:${CRASHREPORT_NOOP_VERSION}",
--- a/core/function-impl/mogo-core-function-biz/build.gradle
+++ b/core/function-impl/mogo-core-function-biz/build.gradle
@@ -52,7 +52,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.arouter
    kapt rootProject.ext.dependencies.aroutercompiler

--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/monitoring/CronTaskManager.kt
@@ -60,7 +60,7 @@ class CronTaskManager {
     * 请求路口一定范围内的设备信息(包含：摄像头、灯)
     */
    private fun requestDeviceList() {
-        CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()?.let { location ->
+        CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().let { location ->
            disposable = MoGoRetrofitFactory.getInstance(HostConst.getEagleHost())
                .create(ICameraListServices::class.java)
                .getDeviceList(location.longitude, location.latitude, 500)
@@ -80,7 +80,7 @@ class CronTaskManager {
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe({
                    cameraList = it
-//                    CallerLogger.d("$M_BIZ$TAG", "requestDeviceList返回结果为：$it")
+    //                    CallerLogger.d("$M_BIZ$TAG", "requestDeviceList返回结果为：$it")
                }, {
                    it.printStackTrace()
                    CallerLogger.e(
@@ -88,8 +88,6 @@ class CronTaskManager {
                        "requestDeviceList:message is:${it.message}, cause is:${it.cause}"
                    )
                })
-        }?: run {
-            CallerLogger.e("$M_BIZ$TAG", "CurrentLocation is null!")
        }
    }

--- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/MoGoChatFacade.kt
+++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/MoGoChatFacade.kt
@@ -589,8 +589,8 @@ object MoGoChatFacade: IMoGoChatFacade {
                    it.cardIdAge = mySelf.get().age
                    it.cardIdSex = mySelf.get().sex
                    it.cityName = mySelf.get().city
-                    it.lat = location?.latitude ?: 0.0
-                    it.lon = location?.longitude ?: 0.0
+                    it.lat = location.latitude
+                    it.lon = location.longitude
                })
                if (response.code != 0 && response.code != 200) {
                    send(AnswerState.Error(AnswerState.CODE_ANSWER_API_REQ_FAIL, "[Answer] - ${response.msg}", mutableMapOf<String, String>().also {
@@ -818,8 +818,8 @@ object MoGoChatFacade: IMoGoChatFacade {
                it.nickName = user.name
                it.headImgUrl = user.icon
                it.carInfo = user.brand
-                it.lat = location?.latitude ?: 0.0
-                it.lon = location?.longitude ?: 0.0
+                it.lat = location.latitude
+                it.lon = location.longitude
            })
            val code = response.code
            if (code != 0 && code != 200) {
@@ -966,8 +966,8 @@ object MoGoChatFacade: IMoGoChatFacade {
                    it.cardIdAge = mySelf.get().age
                    it.cardIdSex = mySelf.get().sex
                    it.cityName = mySelf.get().city
-                    it.lat = location?.latitude ?: 0.0
-                    it.lon = location?.longitude ?: 0.0
+                    it.lat = location.latitude
+                    it.lon = location.longitude
                })
                if (response.code != 0 && response.code != 200) {
                    send(JoinState.Error(AnswerState.CODE_ANSWER_API_REQ_FAIL, "[JoinTeam] - ${response.msg}", mutableMapOf<String, String>().also {
--- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt
+++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/net/ChatServiceModel.kt
@@ -70,10 +70,8 @@ internal class ChatServiceModel {
        val sn = MoGoAiCloudClientConfig.getInstance().sn

        val location = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
-        if (location != null) {
-            params.lon = location.longitude
-            params.lat = location.latitude
-        }
+        params.lon = location.longitude
+        params.lat = location.latitude
        Logger.d(ChatConsts.TAG, "connectStatusParam:$params")
        map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
        map["data"] = Gson().toJson(params)
--- a/core/function-impl/mogo-core-function-devatools/build.gradle
+++ b/core/function-impl/mogo-core-function-devatools/build.gradle
@@ -71,7 +71,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.arouter
    kapt rootProject.ext.dependencies.aroutercompiler
    implementation rootProject.ext.dependencies.mogologlib
--- a/core/function-impl/mogo-core-function-hmi/build.gradle
+++ b/core/function-impl/mogo-core-function-hmi/build.gradle
@@ -50,7 +50,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxccorektx
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.androidxconstraintlayout
--- a/core/function-impl/mogo-core-function-map/build.gradle
+++ b/core/function-impl/mogo-core-function-map/build.gradle
@@ -49,7 +49,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxccorektx
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.androidxconstraintlayout
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/MapPointCloudSubscriber.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/MapPointCloudSubscriber.kt
@@ -84,17 +84,17 @@ class MapPointCloudSubscriber private constructor()
            if (it.size >= 3) {
                for (index in 0 until 3) {
                    dockerVersionCode +=
-                            when (index) {
-                                0 -> {
-                                    it[index].substring(it[index].lastIndex)
-                                }
-                                it.size - 1 -> {
-                                    it[index].substring(0, 1)
-                                }
-                                else -> {
-                                    it[index]
-                                }
+                        when (index) {
+                            0 -> {
+                                it[index].substring(it[index].lastIndex)
                            }
+                            it.size - 1 -> {
+                                it[index].substring(0, 1)
+                            }
+                            else -> {
+                                it[index]
+                            }
+                        }
                }
            }
        }
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt
@@ -19,6 +19,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_RO
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_ERROR
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_START
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST
+import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST_DELAY
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST_ERROR
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST_OK
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_ROUTE_MODE
@@ -209,6 +210,10 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
                if (dataReceive) {
                    // 请求地图开始漫游
                    CallerMapUIServiceManager.getMapUIController()?.setRomaMode(FunctionBuildConfig.romaModeStyle)
+                }else{
+                    // 保底清除策略
+                    MapBizTrace.log("",CHAIN_CODE_ROMA_REQUEST_DELAY,TAG,mutableMapOf("delay" to true),true)
+                    MapIdentifySubscriber.instance.clearAiCloudRoma()
                }
            },
            { errorMsg ->
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/collect/MoGoMapDataCollectProvider.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/collect/MoGoMapDataCollectProvider.kt
@@ -182,10 +182,7 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,
    }

    override fun onChassisLocationWGS84(gnssInfo: MogoLocation) {
-        if (gnssInfo != null
-            && gnssInfo.longitude != 0.0
-            && gnssInfo.latitude != 0.0
-        ) {
+        if (gnssInfo.longitude != 0.0 && gnssInfo.latitude != 0.0) {
            executor.get()?.updateLocation(
                gnssInfo.longitude,
                gnssInfo.latitude,
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
@@ -412,7 +412,7 @@ class OverMapView @JvmOverloads constructor(
            resources.getDrawable(R.drawable.transparent_background, null)
                .toBitmap(AutoSizeUtils.dp2px(context, 32f), AutoSizeUtils.dp2px(context, 230f))
        )
-        initAMapView(context)
+        initAMapView()
        //设置全览模式
        overLayerView?.setOnClickListener { displayCustomOverView() }
        overLayerView?.let {
@@ -426,7 +426,7 @@ class OverMapView @JvmOverloads constructor(
        }
    }

-    private fun initAMapView(context: Context) {
+    private fun initAMapView() {
        Log.d(TAG, "initAMapView")
        mCameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel.toFloat())
        mAMap = mMapView?.map
--- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
+++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
@@ -57,8 +57,8 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {

    private val handler = Handler(Looper.getMainLooper()) {
        if (it.what == 1) {
-            val value = it.obj as Pair<String, String>
-            reConnectSocket(value.first, value.second)
+            val value = it.obj as Pair<*, *>
+            reConnectSocket(value.first as String, value.second as String)
        }
        true
    }
--- a/core/mogo-core-data/build.gradle
+++ b/core/mogo-core-data/build.gradle
@@ -67,7 +67,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxappcompat

    implementation rootProject.ext.dependencies.gson
--- 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
@@ -32,7 +32,6 @@ public class MogoServicePaths {
     * Float View
     */
    @Keep
-    @Deprecated
    public static final String PATH_FLOAT_VIEW_MANAGER = "/floatview/api";

    /**
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
@@ -116,6 +116,7 @@ class ChainConstant {
        const val CHAIN_CODE_ROMA_REQUEST = "CHAIN_CODE_ROMA_REQUEST"
        const val CHAIN_CODE_ROMA_REQUEST_OK = "CHAIN_CODE_ROMA_REQUEST_OK"
        const val CHAIN_CODE_ROMA_REQUEST_ERROR = "CHAIN_CODE_ROMA_REQUEST_ERROR"
+        const val CHAIN_CODE_ROMA_REQUEST_DELAY = "CHAIN_CODE_ROMA_REQUEST_DELAY"
        const val CHAIN_CODE_ROMA_MODE_INVOKE = "CHAIN_CODE_ROMA_MODE_INVOKE"
        const val CHAIN_CODE_ROMA_MAP_START = "CHAIN_CODE_ROMA_MAP_START"
        const val CHAIN_CODE_ROMA_MAP_END = "CHAIN_CODE_ROMA_MAP_END"
--- a/core/mogo-core-function-api/build.gradle
+++ b/core/mogo-core-function-api/build.gradle
@@ -46,7 +46,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib

    implementation rootProject.ext.dependencies.arouter
    kapt rootProject.ext.dependencies.aroutercompiler
--- a/core/mogo-core-function-call/build.gradle
+++ b/core/mogo-core-function-call/build.gradle
@@ -44,7 +44,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib

    implementation rootProject.ext.dependencies.arouter
    kapt rootProject.ext.dependencies.aroutercompiler
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotIdentifyListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotIdentifyListenerManager.kt
@@ -19,7 +19,6 @@ object CallerAutopilotIdentifyListenerManager : CallerBase<IMoGoAutopilotIdentif
    @Synchronized
    fun invokeAutopilotIdentifyDataUpdate(trafficData: List<MessagePad.TrackedObject>?) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onAutopilotIdentifyDataUpdate(trafficData)
        }
@@ -31,7 +30,6 @@ object CallerAutopilotIdentifyListenerManager : CallerBase<IMoGoAutopilotIdentif
    @Synchronized
    fun invokeAutopilotIdentifyPlanningObj(planningObjects: List<MessagePad.PlanningObject>?) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onAutopilotIdentifyPlanningObj(planningObjects)
        }
@@ -43,7 +41,6 @@ object CallerAutopilotIdentifyListenerManager : CallerBase<IMoGoAutopilotIdentif
    @Synchronized
    fun invokeAutopilotPerceptionTrafficLight(trafficLights: TrafficLightOuterClass.TrafficLights?) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onAutopilotPerceptionTrafficLight(trafficLights)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotRecordListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotRecordListenerManager.kt
@@ -18,7 +18,6 @@ object CallerAutopilotRecordListenerManager : CallerBase<IMoGoAutopilotRecordLis
     */
    fun invokeAutopilotRecordResult(recordPanel: RecordPanelOuterClass.RecordPanel) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onAutopilotRecordResult(recordPanel)
        }
@@ -29,7 +28,6 @@ object CallerAutopilotRecordListenerManager : CallerBase<IMoGoAutopilotRecordLis
     */
    fun invokeAutopilotRecordConfig(config: MessagePad.RecordDataConfig) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onAutopilotRecordConfig(config)
        }
@@ -40,7 +38,6 @@ object CallerAutopilotRecordListenerManager : CallerBase<IMoGoAutopilotRecordLis
     */
    fun invokeBagManagerResult(bagManager: BagManagerOuterClass.BagManager){
        M_LISTENERS.forEach{
-            val tag = it.key
            val listener = it.value
            listener.onBagManagerResult(bagManager)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisGnssListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisGnssListenerManager.kt
@@ -18,7 +18,6 @@ object CallerChassisGnssListenerManager : CallerBase<IMoGoChassisGnssListener>()
    @Synchronized
    fun invokeChassisGnssListener(gnssInfo: MessagePad.GnssInfo) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onChassisGnss(gnssInfo)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerPlanningActionsListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerPlanningActionsListenerManager.kt
@@ -16,7 +16,6 @@ object CallerPlanningActionsListenerManager : CallerBase<IMoGoAutopilotPlanningA
    @Synchronized
    fun invokePNCActions(planningActionMsg: MessagePad.PlanningActionMsg) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.pncActions(planningActionMsg)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerPlanningRottingListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerPlanningRottingListenerManager.kt
@@ -34,7 +34,6 @@ object CallerPlanningRottingListenerManager : CallerBase<IMoGoPlanningRottingLis
    fun invokeAutopilotRotting(globalPathResp: MessagePad.GlobalPathResp?) {
        this.globalPathResp = globalPathResp
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onAutopilotRotting(globalPathResp)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerPlanningTrajectoryListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerPlanningTrajectoryListenerManager.kt
@@ -18,7 +18,6 @@ object CallerPlanningTrajectoryListenerManager : CallerBase<IMoGoPlanningTraject
    @Synchronized
    fun invokeAutopilotTrajectory(trajectoryInfo: MutableList<MessagePad.TrajectoryPoint>) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onAutopilotTrajectory(trajectoryInfo)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/chat/CallerChatManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/chat/CallerChatManager.kt
@@ -15,13 +15,13 @@ import org.jetbrains.annotations.TestOnly
 object CallerChatManager: CallerBase<Any>() {

    private val provider by lazy {
-        getApiInstance(IMoGoChatProvider::class.java, ChatConsts.CHAT_PROVIDER_PATH)?.chat()
+        getApiInstance(IMoGoChatProvider::class.java, ChatConsts.CHAT_PROVIDER_PATH).chat()
    }

    @TestOnly
    @OptIn(ExperimentalCoroutinesApi::class)
    fun call(ctx: Context , sn: String) {
-        val facade = provider ?: return
+        val facade = provider
        facade
            .call(ChatParams(sn))
            .onEach {
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiListenerManager.kt
@@ -24,7 +24,6 @@ object CallerHmiListenerManager : CallerBase<IMoGoCheckAutoPilotBtnListener>() {
    fun invokeCheckAutoPilotBtnListener(isChecked: Boolean) {
        mIsChecked = isChecked
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onCheck(mIsChecked)
        }
@@ -32,7 +31,6 @@ object CallerHmiListenerManager : CallerBase<IMoGoCheckAutoPilotBtnListener>() {

    fun invokeHDDataCacheStatus(isCached: Boolean) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.updateHDDataCacheStatus(isCached)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerGaoDeMapLocationListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerGaoDeMapLocationListenerManager.kt
@@ -15,7 +15,6 @@ object CallerGaoDeMapLocationListenerManager : CallerBase<IGaoDeMapLocationListe
    @Synchronized
    fun invokeMoGoLocationChanged(location: MogoLocation) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onMoGoLocationChanged(location)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRomaListener.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRomaListener.kt
@@ -25,7 +25,6 @@ object CallerMapRomaListener : CallerBase<IMoGoRomaListener>() {
    fun invokeMapRoma(romaStatus: Boolean) {
        roma = romaStatus
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.romaStatus(romaStatus)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapStyleListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapStyleListenerManager.kt
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxEventListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxEventListenerManager.kt
@@ -16,7 +16,6 @@ object CallerMsgBoxEventListenerManager: CallerBase<IMsgBoxEventListener>() {
     */
    fun invokeSummaryListener(){
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onSummaryClickEvent()
        }
@@ -27,7 +26,6 @@ object CallerMsgBoxEventListenerManager: CallerBase<IMsgBoxEventListener>() {
     */
    fun invokeUpdateTipListener(isShow: Boolean){
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onUpdateTipEvent(isShow)
        }
@@ -38,7 +36,6 @@ object CallerMsgBoxEventListenerManager: CallerBase<IMsgBoxEventListener>() {
     **/
    fun invokeBubbleOperationListener(msgBoxBean: MsgBoxBean){
        M_LISTENERS.forEach{
-            val tag = it.key
            val listener = it.value
            listener.onBubbleOperationClickEvent(msgBoxBean)
        }
@@ -49,7 +46,6 @@ object CallerMsgBoxEventListenerManager: CallerBase<IMsgBoxEventListener>() {
     */
    fun invokeBubbleV2XListener(msgBoxBean: MsgBoxBean){
        M_LISTENERS.forEach{
-            val tag = it.key
            val listener = it.value
            listener.onBubbleV2XClickEvent(msgBoxBean)
        }
@@ -60,7 +56,6 @@ object CallerMsgBoxEventListenerManager: CallerBase<IMsgBoxEventListener>() {
     */
    fun invokeBubbleReportListener(msgBoxBean: MsgBoxBean){
        M_LISTENERS.forEach{
-            val tag = it.key
            val listener = it.value
            listener.onBubbleReportClickEvent(msgBoxBean)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxListenerManager.kt
@@ -21,7 +21,6 @@ object CallerMsgBoxListenerManager : CallerBase<IMsgBoxListener>() {
     */
    fun invokeListener(category: MsgCategory, msgBox: MsgBoxBean) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onDataChanged(category, msgBox)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuConnectListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuConnectListenerManager.kt
@@ -49,7 +49,6 @@ object CallerObuConnectListenerManager : CallerBase<IMoGoObuConnectListener>() {
    fun invokeObuConnectListener(obuStatusInfo: ObuStatusInfo) {
        mObuStatusInfo = obuStatusInfo
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onConnectStatus(mObuStatusInfo)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuLocationWGS84ListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuLocationWGS84ListenerManager.kt
@@ -11,7 +11,6 @@ object CallerObuLocationWGS84ListenerManager : CallerBase<IMoGoObuLocationWGS84L

    fun invokeObuLocationWGS84(data: MessagePad.GnssInfo) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onObuLocationWGS84(data)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuMapMathListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuMapMathListenerManager.kt
@@ -11,7 +11,6 @@ object CallerObuMapMathListenerManager : CallerBase<IMoGoObuWarningMapListener>(

    fun invokeObuMapMath(data: ObuScene.MapMatchData) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onMoGoObuMapMath(data)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuSaveMessageListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuSaveMessageListenerManager.kt
@@ -13,7 +13,6 @@ object CallerObuSaveMessageListenerManager : CallerBase<IMoGoObuSaveMessageListe

    fun invokeObuSaveMessage(type: String, content: String, tts: String, sourceType: DataSourceType,communicationType: CommunicationType) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onMoGoObuSaveMessage(type, content, tts, sourceType,communicationType)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningListenerManager.kt
@@ -14,7 +14,6 @@ object CallerObuWarningListenerManager : CallerBase<IMoGoObuStatusListener>() {

    fun invokeDelayTime(delayTime: Long) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onObuV2iDelayTime(delayTime)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRsiListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRsiListenerManager.kt
@@ -11,7 +11,6 @@ object CallerObuWarningRsiListenerManager : CallerBase<IMoGoObuWarningRsiListene

    fun invokeObuRsiWarning(data: ObuScene.RsiWarningData) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onMoGoObuRsiWarning(data)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRsmListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRsmListenerManager.kt
@@ -11,7 +11,6 @@ object CallerObuWarningRsmListenerManager : CallerBase<IMoGoObuWarningRsmListene

    fun invokeObuRsmWarning(data: ObuScene.RsmWarningData) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onMoGoObuRsmWarning(data)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRvListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningRvListenerManager.kt
@@ -11,7 +11,6 @@ object CallerObuWarningRvListenerManager : CallerBase<IMoGoObuWarningRvListener>

    fun invokeObuRvWarning(data: MogoObuRvWarningData) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onMoGoObuRvWarning(data)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningSpatListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningSpatListenerManager.kt
@@ -11,7 +11,6 @@ object CallerObuWarningSpatListenerManager : CallerBase<IMoGoObuWarningSpatListe

    fun invokeObuSpatWarning(data: ObuScene.SpatWarningData) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onMoGoObuSpatWarning(data)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/order/CallerOrderListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/order/CallerOrderListenerManager.kt
@@ -12,7 +12,6 @@ object CallerOrderListenerManager: CallerBase<IOrderListener>() {

    fun invokeOrderStatus(inOrder: Boolean){
        M_LISTENERS.forEach{
-            val tag = it.key
            val listener = it.value
            listener.onUpdateOrderStatus(inOrder)
        }
@@ -20,7 +19,6 @@ object CallerOrderListenerManager: CallerBase<IOrderListener>() {

    fun invokeOrderRemoval(){
        M_LISTENERS.forEach{
-            val tag = it.key
            val listener = it.value
            listener.onOrderRemoval()
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/setting/CallerSkinModeListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/setting/CallerSkinModeListenerManager.kt
@@ -20,7 +20,6 @@ object CallerSkinModeListenerManager : CallerBase<IMoGoSkinModeChangeListener>()
     */
    fun invokeListener(skinMode: Int) {
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onSkinModeChange(skinMode)
        }
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallVipSetListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallVipSetListenerManager.kt
@@ -14,7 +14,6 @@ object CallVipSetListenerManager : CallerBase<IMoGoVipSetListener>() {
    fun invokeVipSetStatus(vipStatus: Boolean) {
        vipSet = vipStatus
        M_LISTENERS.forEach {
-            val tag = it.key
            val listener = it.value
            listener.onVipSet(vipStatus)
        }
--- a/core/mogo-core-network/build.gradle
+++ b/core/mogo-core-network/build.gradle
@@ -45,7 +45,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib

    implementation rootProject.ext.dependencies.androidxccorektx
    implementation rootProject.ext.dependencies.androidxappcompat
--- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt
@@ -84,7 +84,7 @@ class Request<T> {
            } catch (e: Exception) {
                e.printStackTrace()
                //数据打点
-                if (e == null) {
+                if (e.message == null) {
                    onError?.invoke(NULL_EXCEPTION)
                }
                when (e) {
--- a/core/mogo-core-res/build.gradle
+++ b/core/mogo-core-res/build.gradle
@@ -59,9 +59,9 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib

-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxccorektx
    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.androidxrecyclerview
--- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt
@@ -112,7 +112,7 @@ class NoticeSimpleSmallVideoPlayer : StandardGSYVideoPlayer {
        super.hideAllWidget()
        mBottomContainer?.visibility = View.VISIBLE
        mProgressBar?.visibility = View.VISIBLE
-        start?.visibility = View.VISIBLE
+        start.visibility = View.VISIBLE
        start.setImageResource(R.drawable.notice_video_pause)
    }

--- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt
@@ -89,11 +89,11 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
        super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange)
        mBottomContainer?.visibility = View.VISIBLE
        mProgressBar?.visibility = View.VISIBLE
-        start?.visibility = View.VISIBLE
-        fullscreen?.visibility = View.GONE
+        start.visibility = View.VISIBLE
+        fullscreen.visibility = View.GONE
        //时间显示
-        currentTimeTextView?.text = TimeTransformUtils.stringForTime(currentTime)
-        totalTimeTextView?.text = TimeTransformUtils.stringForTime(totalTime)
+        currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime)
+        totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime)

        if (progress != 0) {
            mProgressBar?.progress = progress
@@ -112,7 +112,7 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
        super.hideAllWidget()
        mBottomContainer?.visibility = View.VISIBLE
        mProgressBar?.visibility = View.VISIBLE
-        start?.visibility = View.VISIBLE
+        start.visibility = View.VISIBLE
        start.setImageResource(R.drawable.notice_video_pause)
    }

@@ -161,7 +161,7 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
    override fun onCompletion() {
        mBottomContainer?.visibility = View.VISIBLE
        mProgressBar?.visibility = View.VISIBLE
-        start?.visibility = View.VISIBLE
+        start.visibility = View.VISIBLE
        start.setImageResource(R.drawable.notice_video_after_pause)

        isPostBufferUpdate = false
--- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt
+++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt
@@ -152,9 +152,6 @@ class SimpleVideoPlayer : StandardGSYVideoPlayer {

    private var runnable = object :Runnable {
        override fun run() {
-            if(this@SimpleVideoPlayer==null){
-                return
-            }
            updateTimer++
            postDelayed(this, 1000)
            if (updateTimer >= 3) {
--- a/core/mogo-core-utils/build.gradle
+++ b/core/mogo-core-utils/build.gradle
@@ -61,7 +61,7 @@ dependencies {
    api rootProject.ext.dependencies.glide
    kapt rootProject.ext.dependencies.glidecompiler
    api rootProject.ext.dependencies.fresco
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib
    implementation rootProject.ext.dependencies.androidxannotation
    implementation rootProject.ext.dependencies.material
    implementation rootProject.ext.dependencies.guava
--- a/foudations/mogo-commons/build.gradle
+++ b/foudations/mogo-commons/build.gradle
@@ -45,7 +45,7 @@ android {

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.kotlinstdlib

    implementation rootProject.ext.dependencies.androidxappcompat
    implementation rootProject.ext.dependencies.arouter
--- a/gradle.properties
+++ b/gradle.properties
@@ -61,26 +61,26 @@ bytex.ASM_API=ASM7
 LOGLIB_VERSION=1.9.5-SNAPSHOT
 ######## MogoAiCloudSDK Version ########
 # 网络请求LOGLIB_VERSION
-MOGO_NETWORK_VERSION=1.4.7.12
+MOGO_NETWORK_VERSION=1.4.7.13
 # 鉴权
-MOGO_PASSPORT_VERSION=1.4.7.12
+MOGO_PASSPORT_VERSION=1.4.7.13
 # 常链接
-MOGO_SOCKET_VERSION=1.4.7.12
+MOGO_SOCKET_VERSION=1.4.7.13
 # 数据采集
-MOGO_REALTIME_VERSION=1.4.7.12
+MOGO_REALTIME_VERSION=1.4.7.13
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.4.7.12
+MOGO_TANLU_VERSION=1.4.7.13
 # 直播推流
-MOGO_LIVE_VERSION=1.4.7.12
+MOGO_LIVE_VERSION=1.4.7.13
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.4.7.12
+MOGO_TRAFFICLIVE_VERSION=1.4.7.13
 # 定位服务
-MOGO_LOCATION_VERSION=1.4.7.12
+MOGO_LOCATION_VERSION=1.4.7.13
 # 远程通讯模块
-MOGO_TELEMATIC_VERSION=1.4.7.12
+MOGO_TELEMATIC_VERSION=1.4.7.13
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=2.14.2.10
+MAP_SDK_VERSION=2.14.3.1
 MAP_SDK_OPERATION_VERSION=1.1.4.1
 # websocket
 WEBSOCKET_VERSION=1.1.7
--- a/gradle/ext.gradle
+++ b/gradle/ext.gradle
@@ -1,6 +1,6 @@
 ext {
    gradle_version = '3.5.3'
-    kotlin_version = '1.5.30'
+    kotlin_plugin_version = '1.5.30'
    plugin_version = '10.0.0_mogo'
    service_chain_version = '5.3.5'
    lancetx_plugin_version = '10.0.4_mogo'
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
--- a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt
@@ -26,8 +26,10 @@ class GDLocationClient private constructor() : AMapLocationListener,
    IMogoGDLocationClient {
    //声明LocationClient对象
    private lateinit var mLocationClient: AMapLocationClient
+
    @Volatile
    private var mCityCode: String = ""
+
    @Volatile
    private var mapLocation: AMapLocation? = null

--- a/libraries/mogo-map/src/main/java/com/mogo/map/overlay/wrapper/line/AMapPolylineWrapper.kt
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/wrapper/line/AMapPolylineWrapper.kt
@@ -48,7 +48,7 @@ class AMapPolylineWrapper(private val id: String, private val delegate: Polyline
    }

    override fun isVisible(): Boolean {
-        return delegate.isVisible() ?: false
+        return delegate.isVisible()
    }

    override fun setToTop() {