From b2aeb45b0eb5d1c87966e7f40f08458d553aa3ea Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 25 Aug 2023 13:30:43 +0800 Subject: [PATCH] [6.0.0] code opt and update sdk of aicloud , map , plus kotlin union --- OCH/charter/driver/build.gradle | 2 +- OCH/charter/passenger/build.gradle | 2 +- OCH/mogo-och-bus-passenger/build.gradle | 2 +- OCH/mogo-och-bus/build.gradle | 2 +- OCH/mogo-och-common-module/build.gradle | 2 +- OCH/mogo-och-data/build.gradle | 2 +- OCH/shuttle/driver/build.gradle | 2 +- OCH/shuttle/passenger/build.gradle | 2 +- OCH/sweeper/sweeper-cloud/build.gradle | 2 +- OCH/sweeper/sweeper/build.gradle | 2 +- OCH/taxi/driver/build.gradle | 2 +- OCH/taxi/passenger/build.gradle | 2 +- OCH/taxi/unmanned-driver/build.gradle | 2 +- OCH/taxi/unmanned-passenger/build.gradle | 2 +- build.gradle | 2 +- config.gradle | 10 ++-------- .../mogo-core-function-biz/build.gradle | 2 +- .../biz/monitoring/CronTaskManager.kt | 6 ++---- .../function/chat/facade/MoGoChatFacade.kt | 12 +++++------ .../chat/facade/net/ChatServiceModel.kt | 6 ++---- .../mogo-core-function-devatools/build.gradle | 2 +- .../mogo-core-function-hmi/build.gradle | 2 +- .../mogo-core-function-map/build.gradle | 2 +- .../business/MapPointCloudSubscriber.kt | 20 +++++++++---------- .../business/ai/AiCloudIdentifyDataManager.kt | 5 +++++ .../collect/MoGoMapDataCollectProvider.kt | 5 +---- .../eagle/core/function/view/OverMapView.kt | 4 ++-- .../startup/stageone/HttpDnsStartUp.kt | 4 ++-- core/mogo-core-data/build.gradle | 2 +- .../core/data/constants/MogoServicePaths.java | 1 - .../core/data/deva/chain/ChainConstant.kt | 1 + core/mogo-core-function-api/build.gradle | 2 +- core/mogo-core-function-call/build.gradle | 2 +- .../CallerAutopilotIdentifyListenerManager.kt | 3 --- .../CallerAutopilotRecordListenerManager.kt | 3 --- .../CallerChassisGnssListenerManager.kt | 1 - .../CallerPlanningActionsListenerManager.kt | 1 - .../CallerPlanningRottingListenerManager.kt | 1 - ...CallerPlanningTrajectoryListenerManager.kt | 1 - .../function/call/chat/CallerChatManager.kt | 4 ++-- .../call/hmi/CallerHmiListenerManager.kt | 2 -- .../CallerGaoDeMapLocationListenerManager.kt | 1 - .../call/map/CallerMapRomaListener.kt | 1 - .../call/map/CallerMapStyleListenerManager.kt | 0 .../CallerMsgBoxEventListenerManager.kt | 5 ----- .../msgbox/CallerMsgBoxListenerManager.kt | 1 - .../obu/CallerObuConnectListenerManager.kt | 1 - .../CallerObuLocationWGS84ListenerManager.kt | 1 - .../obu/CallerObuMapMathListenerManager.kt | 1 - .../CallerObuSaveMessageListenerManager.kt | 1 - .../obu/CallerObuWarningListenerManager.kt | 1 - .../obu/CallerObuWarningRsiListenerManager.kt | 1 - .../obu/CallerObuWarningRsmListenerManager.kt | 1 - .../obu/CallerObuWarningRvListenerManager.kt | 1 - .../CallerObuWarningSpatListenerManager.kt | 1 - .../call/order/CallerOrderListenerManager.kt | 2 -- .../setting/CallerSkinModeListenerManager.kt | 1 - .../call/v2x/CallVipSetListenerManager.kt | 1 - core/mogo-core-network/build.gradle | 2 +- .../mogo/eagle/core/network/CoroutineDSL.kt | 2 +- core/mogo-core-res/build.gradle | 4 ++-- .../video/NoticeSimpleSmallVideoPlayer.kt | 2 +- .../media/video/NoticeSimpleVideoPlayer.kt | 12 +++++------ .../widget/media/video/SimpleVideoPlayer.kt | 3 --- core/mogo-core-utils/build.gradle | 2 +- foudations/mogo-commons/build.gradle | 2 +- gradle.properties | 20 +++++++++---------- gradle/ext.gradle | 2 +- .../java/com/mogo/map/AMapViewWrapper.java | 0 .../com/mogo/map/location/GDLocationClient.kt | 2 ++ .../wrapper/line/AMapPolylineWrapper.kt | 2 +- 71 files changed, 84 insertions(+), 126 deletions(-) create mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapStyleListenerManager.kt create mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java diff --git a/OCH/charter/driver/build.gradle b/OCH/charter/driver/build.gradle index 550170a67d..3f3e62f1ef 100644 --- 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 diff --git a/OCH/charter/passenger/build.gradle b/OCH/charter/passenger/build.gradle index 6567d5ad7e..63f4398e85 100644 --- 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 diff --git a/OCH/mogo-och-bus-passenger/build.gradle b/OCH/mogo-och-bus-passenger/build.gradle index 9a9371477c..6732195e81 100644 --- 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 diff --git a/OCH/mogo-och-bus/build.gradle b/OCH/mogo-och-bus/build.gradle index 5c75234649..d861cf0864 100644 --- 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 diff --git a/OCH/mogo-och-common-module/build.gradle b/OCH/mogo-och-common-module/build.gradle index 34f152a409..e7d98bb6e2 100644 --- 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 diff --git a/OCH/mogo-och-data/build.gradle b/OCH/mogo-och-data/build.gradle index ae9cbd0b40..91ba454fa1 100644 --- 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 diff --git a/OCH/shuttle/driver/build.gradle b/OCH/shuttle/driver/build.gradle index 07d4756de7..b4f05214d9 100644 --- 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 diff --git a/OCH/shuttle/passenger/build.gradle b/OCH/shuttle/passenger/build.gradle index a871f02aee..fc31c43627 100644 --- 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 diff --git a/OCH/sweeper/sweeper-cloud/build.gradle b/OCH/sweeper/sweeper-cloud/build.gradle index bee9092d59..499a56f6dc 100644 --- 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 diff --git a/OCH/sweeper/sweeper/build.gradle b/OCH/sweeper/sweeper/build.gradle index bee9092d59..499a56f6dc 100644 --- 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 diff --git a/OCH/taxi/driver/build.gradle b/OCH/taxi/driver/build.gradle index 3d5e7a6590..f2013570c2 100644 --- 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 diff --git a/OCH/taxi/passenger/build.gradle b/OCH/taxi/passenger/build.gradle index ec58e06826..50cd35f289 100644 --- 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 diff --git a/OCH/taxi/unmanned-driver/build.gradle b/OCH/taxi/unmanned-driver/build.gradle index 676552ec08..3a25a857ef 100644 --- 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 diff --git a/OCH/taxi/unmanned-passenger/build.gradle b/OCH/taxi/unmanned-passenger/build.gradle index ec58e06826..50cd35f289 100644 --- 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 diff --git a/build.gradle b/build.gradle index 6d57c1e0d8..659aa7752e 100644 --- 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}" diff --git a/config.gradle b/config.gradle index 9fb69b49b3..b0c9a398e8 100644 --- 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}", diff --git a/core/function-impl/mogo-core-function-biz/build.gradle b/core/function-impl/mogo-core-function-biz/build.gradle index 4fbda0dad6..b8c39fa11c 100644 --- 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 diff --git 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 index 421f97626e..500a86a878 100644 --- 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!") } } diff --git 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 index 86fd3cb4c1..c09a9446ae 100644 --- 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().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().also { diff --git 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 index 6a5edf5625..fa86e03170 100644 --- 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) diff --git a/core/function-impl/mogo-core-function-devatools/build.gradle b/core/function-impl/mogo-core-function-devatools/build.gradle index 30d39421ff..ea909edcaa 100644 --- 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 diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 1f12996448..238cd8709e 100644 --- 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 diff --git a/core/function-impl/mogo-core-function-map/build.gradle b/core/function-impl/mogo-core-function-map/build.gradle index b89e18ba7c..98174911b9 100644 --- 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 diff --git 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 index bfc98a25bf..0846dfd8f5 100644 --- 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] + } + } } } } diff --git 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 index 97a38ea325..62556f3f8e 100644 --- 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 -> diff --git 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 index 272239f445..bc88adddbd 100644 --- 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, diff --git 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 index b08bb0505c..4afc267134 100644 --- 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 diff --git 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 index ea9fe2fdf3..3a2f52121b 100644 --- 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() { private val handler = Handler(Looper.getMainLooper()) { if (it.what == 1) { - val value = it.obj as Pair - reConnectSocket(value.first, value.second) + val value = it.obj as Pair<*, *> + reConnectSocket(value.first as String, value.second as String) } true } diff --git a/core/mogo-core-data/build.gradle b/core/mogo-core-data/build.gradle index c205dcd48a..39b80d4537 100644 --- 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 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index 0347bdc138..00f24f1610 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -32,7 +32,6 @@ public class MogoServicePaths { * Float View */ @Keep - @Deprecated public static final String PATH_FLOAT_VIEW_MANAGER = "/floatview/api"; /** diff --git 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 index 79c8ecba8e..17cc9cf1c1 100644 --- 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" diff --git a/core/mogo-core-function-api/build.gradle b/core/mogo-core-function-api/build.gradle index 3cba230563..32f0b56108 100644 --- 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 diff --git a/core/mogo-core-function-call/build.gradle b/core/mogo-core-function-call/build.gradle index be7ede0dad..33e90996e5 100644 --- 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 diff --git 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 index f880e574b5..019a7e1e6e 100644 --- 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?) { M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onAutopilotIdentifyDataUpdate(trafficData) } @@ -31,7 +30,6 @@ object CallerAutopilotIdentifyListenerManager : CallerBase?) { M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onAutopilotIdentifyPlanningObj(planningObjects) } @@ -43,7 +41,6 @@ object CallerAutopilotIdentifyListenerManager : CallerBase() @Synchronized fun invokeChassisGnssListener(gnssInfo: MessagePad.GnssInfo) { M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onChassisGnss(gnssInfo) } diff --git 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 index f7ea104d89..e4f273b8ca 100644 --- 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) { M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onAutopilotTrajectory(trajectoryInfo) } diff --git 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 index 6f427e1e79..134f1da4c1 100644 --- 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() { 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 { diff --git 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 index d8cb8b533e..128adbfe9b 100644 --- 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() { 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() { fun invokeHDDataCacheStatus(isCached: Boolean) { M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.updateHDDataCacheStatus(isCached) } diff --git 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 index 5c0f09e2dd..8be7f1f7fb 100644 --- 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() { fun invokeMapRoma(romaStatus: Boolean) { roma = romaStatus M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.romaStatus(romaStatus) } diff --git 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git 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 index bc761537ec..60ae707c49 100644 --- 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() { */ fun invokeSummaryListener(){ M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onSummaryClickEvent() } @@ -27,7 +26,6 @@ object CallerMsgBoxEventListenerManager: CallerBase() { */ 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() { **/ 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() { */ 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() { */ fun invokeBubbleReportListener(msgBoxBean: MsgBoxBean){ M_LISTENERS.forEach{ - val tag = it.key val listener = it.value listener.onBubbleReportClickEvent(msgBoxBean) } diff --git 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 index ba89cc5e6d..197849bd43 100644 --- 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() { */ fun invokeListener(category: MsgCategory, msgBox: MsgBoxBean) { M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onDataChanged(category, msgBox) } diff --git 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 index b711d70a3c..aa83ff0b9e 100644 --- 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() { fun invokeObuConnectListener(obuStatusInfo: ObuStatusInfo) { mObuStatusInfo = obuStatusInfo M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onConnectStatus(mObuStatusInfo) } diff --git 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 index cc6141b70b..54f584fe3f 100644 --- 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( fun invokeObuMapMath(data: ObuScene.MapMatchData) { M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onMoGoObuMapMath(data) } diff --git 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 index 5a3e69ef2e..0b59970a88 100644 --- 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() { fun invokeDelayTime(delayTime: Long) { M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onObuV2iDelayTime(delayTime) } diff --git 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 index 96fa44df48..60f3592b94 100644 --- 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 fun invokeObuRvWarning(data: MogoObuRvWarningData) { M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onMoGoObuRvWarning(data) } diff --git 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 index 328a74fca6..929824dbcf 100644 --- 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() { 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() { fun invokeOrderRemoval(){ M_LISTENERS.forEach{ - val tag = it.key val listener = it.value listener.onOrderRemoval() } diff --git 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 index 02872486bc..a103e18f3f 100644 --- 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() */ fun invokeListener(skinMode: Int) { M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onSkinModeChange(skinMode) } diff --git 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 index 0383a405ea..dcc84344dc 100644 --- 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() { fun invokeVipSetStatus(vipStatus: Boolean) { vipSet = vipStatus M_LISTENERS.forEach { - val tag = it.key val listener = it.value listener.onVipSet(vipStatus) } diff --git a/core/mogo-core-network/build.gradle b/core/mogo-core-network/build.gradle index 75aee965f1..496510e6cb 100644 --- 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 diff --git 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 index 05bcb850be..d2b2bd8238 100644 --- 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 { } catch (e: Exception) { e.printStackTrace() //数据打点 - if (e == null) { + if (e.message == null) { onError?.invoke(NULL_EXCEPTION) } when (e) { diff --git a/core/mogo-core-res/build.gradle b/core/mogo-core-res/build.gradle index 9c6acffb93..8a87222931 100644 --- 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 diff --git 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 index a21d99d459..0b63e45df9 100644 --- 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) } diff --git 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 index 626c981f03..5aece47920 100644 --- 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 diff --git 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 index 7a6a88917a..c30c2e5f6f 100644 --- 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) { diff --git a/core/mogo-core-utils/build.gradle b/core/mogo-core-utils/build.gradle index 5109996108..d8941ad776 100644 --- 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 diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index 46f765150d..c3353c9883 100644 --- 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 diff --git a/gradle.properties b/gradle.properties index bade7bfa14..29aef5c155 100644 --- 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 diff --git a/gradle/ext.gradle b/gradle/ext.gradle index 9e74ffd3f1..3721f7bc2e 100644 --- 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' diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java new file mode 100644 index 0000000000..e69de29bb2 diff --git 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 index 17c575b0af..dbe7628b09 100644 --- 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 diff --git 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 index 2736849b8f..d588c0d134 100644 --- 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() {