From 5069f7b425aee70a699df19247f20b1bc9dd0a5b Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 16 Oct 2024 17:22:27 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0][=E5=9C=B0=E5=9B=BEsdk]=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=9C=B0=E5=9B=BEsdk=E7=89=88=E6=9C=AC,=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 7 +- .../mogo/launcher/startup/ConfigStartUp.kt | 77 ++++++++++++++++++- build.gradle | 22 +++++- .../src/main/res/xml/key.xml | 4 +- .../mogo-core-function-map/build.gradle | 3 +- .../core/data/deva/chain/ChainConstant.kt | 1 + gradle.properties | 2 +- .../src/main/assets/shaders/vMogo_Shader.glsl | 4 +- .../com/autonavi/nge/dm/NavigationCore.java | 2 +- .../nge/guidance/GuidanceProvider.java | 2 +- .../com/autonavi/nge/hdmap/HDMapProvider.kt | 77 +++++++++++++++++++ .../map/sdk/inner/abs/IMarkerController.kt | 2 +- .../map/sdk/inner/road/RoadHelper.kt | 3 + .../open/renders/marker/MarkerSimpleData.kt | 2 + .../map/sdk/open/view/MapAutoView.kt | 15 ++-- libraries/mogo-map/build.gradle | 3 +- settings.gradle | 2 +- 17 files changed, 203 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 101a12d2e0..6822f1dff2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -161,6 +161,10 @@ android { packagingOptions { exclude 'META-INF/io.netty.versions.properties' + doNotStrip '*/armeabi-v7a/*.so' + doNotStrip '*/armeabi/*.so' + doNotStrip '*/x86_64/*.so' + doNotStrip '*/x86/*.so' } useLibrary 'android.test.runner' @@ -201,8 +205,7 @@ dependencies { compileOnly rootProject.ext.dependencies.serialport } -// implementation rootProject.ext.dependencies.mogocustommap - implementation project(':libraries:mapmodule') + implementation rootProject.ext.dependencies.mogocustommap implementation project(':core:function-impl:mogo-core-function-startup') implementation project(':core:function-impl:mogo-core-function-devatools') diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index a7cf796c2c..8874aab760 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -1,28 +1,35 @@ package com.mogo.launcher.startup import android.content.Context +import com.autonavi.nge.hdmap.HDMapProvider import com.google.gson.reflect.TypeToken import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.app.UrlConfig import com.mogo.eagle.core.data.config.FunctionBuildConfig -import com.mogo.eagle.core.data.config.HdMapBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.config.JunkConfig +import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ProcessUtils import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.launcher.BuildConfig -import com.mogo.launcher.R import com.shuyu.gsyvideoplayer.player.IjkPlayerManager import com.zhidaoauto.map.sdk.open.MapAutoApi import com.zhidaoauto.map.sdk.open.MapParams import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager +import com.zhjt.service.chain.ChainLog import tv.danmaku.ijk.media.player.IjkMediaPlayer +import java.util.concurrent.atomic.AtomicReference object ConfigStartUp { + private const val TAG = "ConfigStartUp" + + private val redisCallback by lazy { AtomicReference()} + @JvmStatic fun init(context: Context) { initDebugConfig() @@ -118,6 +125,72 @@ object ConfigStartUp { .setIsRecordLogs(false) .setCoordinateType(MapParams.COORDINATETYPE_GCJ02) MapAutoApi.init(context, mapParams) + HDMapProvider.setRedisDataLoadCallback(object : HDMapProvider.IRedisLoadCallback { + override fun onLoginStart(ip: String, port: Int, password: String, dbIndex: Int) { + Logger.d(TAG, "-- onLoginStart --: ip: $ip, port: $port, password: $password, dbIndex: $dbIndex") + onRedisDataLoadRoute(mapOf("onLoginStart" to "ip:$ip, port:$port, password: $password, dbIndex: $dbIndex")) + } + + + override fun onLoginSuccess() { + Logger.d(TAG, "-- onLoginSuccess --") + onRedisDataLoadRoute(mapOf("onLoginSuccess" to "")) + } + + override fun onLoginFailed(error: String?) { + Logger.d(TAG, "-- onLoginFailed($error) --") + onRedisDataLoadRoute(mapOf("onLoginFailed" to "fail_reason:$error")) + } + + override fun onReLogin(isCanRetry: Boolean) { + Logger.d(TAG, "-- onReLogin($isCanRetry) --") + onRedisDataLoadRoute(mapOf("onReLogin" to "isCanRetry:$isCanRetry")) + } + + override fun onTileLoadStart(layerId: String, tileId: String) { + Logger.d(TAG, "-- onTileLoadStart(layerId: $layerId, tileId: $tileId) --") + onRedisDataLoadRoute(mapOf("onTileLoadStart" to "layerId: $layerId, tileId: $tileId")) + } + + override fun onTileLoadFail(layerId: String, tileId: String, error: String) { + Logger.d(TAG, "-- onTileLoadFail(layerId: $layerId, tileId: $tileId, error: $error) --") + onRedisDataLoadRoute(mapOf("onTileLoadFail" to "layerId: $layerId, tileId: $tileId, error: $error")) + } + + override fun onTileLoadSuccess(layerId: String, tileId: String) { + Logger.d(TAG, "-- onTileLoadSuccess(layerId: $layerId, tileId: $tileId) --") + onRedisDataLoadRoute(mapOf("onTileLoadSuccess" to "layerId: $layerId, tileId: $tileId")) + } + + override fun onTilesLoadStart(layerId: String, tileIds: List) { + Logger.d(TAG, "-- onTilesLoadStart(layerId: $layerId, tileIds: ${tileIds.joinToString(",")}) --") + onRedisDataLoadRoute(mapOf("onTilesLoadStart" to "layerId: $layerId, tileIds: ${tileIds.joinToString(",")}")) + } + + override fun onTilesLoadFail(layerId: String, tileIds: List, error: String?) { + Logger.d(TAG, "-- onTilesLoadFail(layerId: $layerId, tileIds: ${tileIds.joinToString(",")}, error: $error) --") + onRedisDataLoadRoute(mapOf("onTilesLoadFail" to "layerId: $layerId, tileIds: ${tileIds.joinToString(",")}, error:$error")) + } + + + override fun onTilesLoadSuccess(layerId: String, tileIds: List) { + Logger.d(TAG, "-- onTilesLoadSuccess(layerId: $layerId, tileIds: ${tileIds.joinToString(",")}) --") + onRedisDataLoadRoute(mapOf("onTilesLoadSuccess" to "layerId: $layerId, tileIds: ${tileIds.joinToString(",")}")) + } + }.also { + redisCallback.set(it) // 将此回调保存起来，只为了在native层的引用不回收，因为native层的引用是全局弱引用 + }) + + // HDMapProvider.toggleSystrace(true) // 开启systrace, 此功能默认关闭，只要在开发阶段定位渲染问题时才打开。(前提需要在地图sdk在关键节点进行手动打点后，再开启，之后使用systrace工具进行抓取trace文件进行分析) + // HDMapProvider.toggleMapDataDebugInfo(true) // 打开地图调试信息的文字展示，此功能也默认关闭，只有在地图测试工具中使用 } + + @ChainLog( + linkChainLog = ChainConstant.CHAIN_TYPE_STATUS, + linkCode = ChainConstant.CHAIN_SOURCE_CLOUD, + nodeAliasCode = ChainConstant.CHAIN_CODE_REDIS_DATA_LOAD, + paramIndexes = [0] + ) + private fun onRedisDataLoadRoute(extra: Map) {} } \ No newline at end of file diff --git a/build.gradle b/build.gradle index fc86454cbf..4b5751b6ab 100644 --- a/build.gradle +++ b/build.gradle @@ -153,6 +153,26 @@ subprojects.each { } } +subprojects.each { + it.afterEvaluate { itx -> + if (itx.plugins.hasPlugin('com.android.library') || itx.plugins.hasPlugin('com.android.application')) { + def android = itx.extensions.findByName("android") + android.buildTypes { + configureEach { buildType -> + def matchingFallbacks = buildType.matchingFallbacks ?: [] + def array = isReleaseBuild() ? ['release', 'debug'] : ['debug', 'release'] + array.each { fallback -> + if (!matchingFallbacks.contains(fallback)) { + matchingFallbacks += fallback + } + } + buildType.matchingFallbacks = matchingFallbacks + } + } + } + } +} + boolean isAndroidTestBuild() { for (String s : gradle.startParameter.taskNames) { if (s.contains("AndroidTest")) { @@ -172,5 +192,5 @@ boolean isReleaseBuild() { } boolean isJunkDetectEnable() { - return !isReleaseBuild() + return false } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/xml/key.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/xml/key.xml index 14d4d7cd13..52440aff37 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/xml/key.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/xml/key.xml @@ -2,7 +2,7 @@ diff --git a/core/function-impl/mogo-core-function-map/build.gradle b/core/function-impl/mogo-core-function-map/build.gradle index fc45801307..3f498788b7 100644 --- a/core/function-impl/mogo-core-function-map/build.gradle +++ b/core/function-impl/mogo-core-function-map/build.gradle @@ -61,8 +61,7 @@ dependencies { exclude group: 'com.zhidaoauto.machine', module: 'map' } -// implementation rootProject.ext.dependencies.mogocustommap - implementation project(':libraries:mapmodule') + implementation rootProject.ext.dependencies.mogocustommap implementation rootProject.ext.dependencies.amapnavi3dmap implementation rootProject.ext.dependencies.androidxroomruntime 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 7d1770f792..ceb4614e52 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 @@ -96,6 +96,7 @@ class ChainConstant { const val CHAIN_CODE_MAIN_BLOCK = "CHAIN_CODE_MAIN_BLOCK" const val CHAIN_CODE_DISPATCH_RECEIVE = "CHAIN_CODE_DISPATCH_RECEIVE" const val CHAIN_CODE_DISPATCH_START = "CHAIN_CODE_DISPATCH_START" + const val CHAIN_CODE_REDIS_DATA_LOAD = "CHAIN_CODE_REDIS_DATA_LOAD" const val CHAIN_CODE_CLOUD_INIT = "CHAIN_CODE_CLOUD_INIT" const val CHAIN_CODE_CLOUD_PASSPORT_TOKEN = "CHAIN_CODE_CLOUD_PASSPORT_TOKEN" diff --git a/gradle.properties b/gradle.properties index 56c7111ef6..8f45f13177 100644 --- a/gradle.properties +++ b/gradle.properties @@ -81,7 +81,7 @@ MOGO_LOCATION_VERSION=1.4.7.42 MOGO_TELEMATIC_VERSION=1.4.7.42 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=3.4.1.2 +MAP_SDK_VERSION=3.4.1.13_alpha_7 MAP_SDK_DATA_VERSION=1.0.0.9 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket diff --git a/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl index 20928bd7ea..fe34a6c685 100644 --- a/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl +++ b/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl @@ -111,10 +111,10 @@ void setLeadLine(){ } void setSignalLine(){ if(signalLineObj==1 && signalLineStep>0){ - _uv.x = (uv.x - 0.5)*signalScale + 0.5; //x方向缩放 + _uv.x = uv.x; _uv.y = uv.y; signalLineTexY = _uv.y; - _uv = _uv + vec2(0.0,1.0)*signalLineTime; + _uv = _uv + vec2(0.0,1.0); } } void setGuideLine(){ diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/dm/NavigationCore.java b/libraries/mapmodule/src/main/java/com/autonavi/nge/dm/NavigationCore.java index 3a7aef377a..1eee05af19 100644 --- a/libraries/mapmodule/src/main/java/com/autonavi/nge/dm/NavigationCore.java +++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/dm/NavigationCore.java @@ -1,4 +1,4 @@ -package com.autonavi.nge.dm;//package com.autonavi.nge.dm; +//package com.autonavi.nge.dm; // //import android.os.RemoteException; //import android.util.Log; diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/guidance/GuidanceProvider.java b/libraries/mapmodule/src/main/java/com/autonavi/nge/guidance/GuidanceProvider.java index bc6c0d1985..92cf6d79de 100644 --- a/libraries/mapmodule/src/main/java/com/autonavi/nge/guidance/GuidanceProvider.java +++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/guidance/GuidanceProvider.java @@ -1,4 +1,4 @@ -package com.autonavi.nge.guidance;//package com.autonavi.nge.guidance; +//package com.autonavi.nge.guidance; // //import android.util.Log; // diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/hdmap/HDMapProvider.kt b/libraries/mapmodule/src/main/java/com/autonavi/nge/hdmap/HDMapProvider.kt index e35e4d45da..8284587670 100644 --- a/libraries/mapmodule/src/main/java/com/autonavi/nge/hdmap/HDMapProvider.kt +++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/hdmap/HDMapProvider.kt @@ -10,11 +10,88 @@ class HDMapProvider { /**f:设置redis源。1,测试redis（42）。非1，正式redis（根据域名访问的）。默认,非1 */ @JvmStatic external fun setDataRedisSource(source: Int) + /** 是否开启地图数据调试信息的展示*/ + @JvmStatic external fun toggleMapDataDebugInfo(open: Boolean) + + /** 是否开启Systrace*/ + @JvmStatic external fun toggleSystrace(open: Boolean) + + /** + * 设置Redis数据加载回调 + */ + @JvmStatic external fun setRedisDataLoadCallback(callback: IRedisLoadCallback) + init { System.loadLibrary("hdmap") } } + interface IRedisLoadCallback { + /** + * 登录开始 + */ + fun onLoginStart(ip: String, port: Int, password: String, dbIndex: Int) { } + + /** + * 登录失败 + */ + fun onLoginFailed(error: String?) { } + + /** + * 登录成功 + */ + fun onLoginSuccess() { } + + /** + * 登录成功之后，重新开始登录 + * @param isCanRetry: true -> 可以再次重试; false-> 不可以再次重试 + */ + fun onReLogin(isCanRetry: Boolean) { } + + /** + * 请求 加载指定瓦片数据 开始 + * @param layerId: redis中指哈希表中的键 + * @param tileId: 要获取的指定瓦片ID的数据 + */ + fun onTileLoadStart(layerId: String, tileId: String) { } + + /** + * 请求加载瓦片数据成功 + * @param layerId: redis中指哈希表中的键 + * @param tileId: 要获取的指定瓦片ID的数据 + */ + fun onTileLoadSuccess(layerId: String, tileId: String) { } + + /** + * 请求加载瓦片数据失败 + * @param layerId: redis中指哈希表中的键 + * @param tileId: 要获取的指定瓦片ID的数据 + */ + fun onTileLoadFail(layerId: String, tileId: String, error: String) { } + + /** + * 请求同时加载多个瓦片数据开始 + * @param layerId: redis中指哈希表中的键 + * @param tileIds: 要获取的指定瓦片ID列表的集合 + */ + fun onTilesLoadStart(layerId: String, tileIds: List) { } + + /** + * 同时加载多个瓦片数据成功 + * @param layerId: redis中指哈希表中的键 + * @param tileIds: 要获取的指定瓦片ID列表的集合 + */ + fun onTilesLoadSuccess(layerId: String, tileIds: List) { } + + /** + * 同时加载多个瓦片数据失败 + * @param layerId: redis中指哈希表中的键 + * @param tileIds: 要获取的指定瓦片ID列表的集合 + * @param error: 加载失败的异常信息 + */ + fun onTilesLoadFail(layerId: String, tileIds: List, error: String?) { } + } + fun getLaneCenterLine(tileId: Int, routeId: Int): ArrayList? { return if (mObj != 0L) { getLaneCenterLineJni(mObj, tileId, routeId) diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMarkerController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMarkerController.kt index f8a0bda092..f742b9b079 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMarkerController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMarkerController.kt @@ -27,7 +27,7 @@ interface IMarkerController { /** * 批量更新他车 */ - fun updateBatchMarkerPositon(batchMarkerOptions: com.zhidaoauto.map.sdk.open.renders.marker.BatchMarkerOptions) + fun updateBatchMarkerPositon(batchMarkerOptions: BatchMarkerOptions) //根据车辆类型预添加车辆模型 fun addPreVehicleModel(type:Int,modelRes:Int):String? //添加普通模型 diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt index 7d4bf40d09..68d0ed0d36 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/road/RoadHelper.kt @@ -93,6 +93,9 @@ class RoadHelper private constructor() { cacheHdDataProgressJob?.cancel() cacheHdDataProgressJob = null + mHdDataDownloadListener?.clear() + mHdDataDownloadListener = null + cancelCacheHDData() hdMapProvider.release() diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/renders/marker/MarkerSimpleData.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/renders/marker/MarkerSimpleData.kt index 9347795496..76c509008e 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/renders/marker/MarkerSimpleData.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/renders/marker/MarkerSimpleData.kt @@ -26,6 +26,8 @@ class MarkerSimpleData { var color: String = "" //颜色设置类型 0 直接替换 1=由原色变为指定色 有方向 * 2=由指定色变为原色 有方向 * 3=由原色变为指定色 无方向 * 4=由指定色变为原色 无方向 var colorType: Int = 0 + // 变色角度 + var colorAngle:Int = 0 //文本 var text: String = "" //状态 diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoView.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoView.kt index fc13a88e29..29e8eee444 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoView.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoView.kt @@ -341,16 +341,17 @@ open class MapAutoView : FrameLayout, LonLatPointListener, ITraffic,ILockLocatio mEventController = MapEventController() } - mMapView?.let { + mMapView?.let { itx -> if (CompileConfig.DEBUG) { Log.i(TAG, "autoop-mapop-create--${mMapView}") } - it.setEventController(mEventController) - addView(it) + itx.setEventController(mEventController) + addView(itx) + Log.d(TAG, "--- controller assign -->") mMapController = - MapController(context, it, this@MapAutoView, mEventController, mMapStyleParams) - + MapController(context, itx, this@MapAutoView, mEventController, mMapStyleParams) + locationClient?.takeIf { it.mMapController == null }?.also { it.mMapController = mMapController } mMapController?.let { mapController -> mMarkerController = MarkerController(mapController) mapController.setMarkerController(mMarkerController) @@ -358,8 +359,8 @@ open class MapAutoView : FrameLayout, LonLatPointListener, ITraffic,ILockLocatio mLocationView = LocationHelper(context, mMarkerController, mMapController,mMapStyleParams) mMapController?.setLocalView(mLocationView) - it.setMapController(mMapController) - it.mITraffic = this@MapAutoView + itx.setMapController(mMapController) + itx.mITraffic = this@MapAutoView // init PanelManager mPanelManager = PanelManager(this@MapAutoView, context, mMapController) } diff --git a/libraries/mogo-map/build.gradle b/libraries/mogo-map/build.gradle index 1569e6c489..0c56f90d69 100644 --- a/libraries/mogo-map/build.gradle +++ b/libraries/mogo-map/build.gradle @@ -51,8 +51,7 @@ dependencies { implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler // 高精地图 -// implementation rootProject.ext.dependencies.mogocustommap - implementation project(':libraries:mapmodule') + implementation rootProject.ext.dependencies.mogocustommap // 高德地图 api rootProject.ext.dependencies.amapnavi3dmap diff --git a/settings.gradle b/settings.gradle index b54bd67017..cc7cc0f618 100644 --- a/settings.gradle +++ b/settings.gradle @@ -44,7 +44,7 @@ include ':libraries:mogo-map' include ':libraries:mogo-adas' include ':libraries:mogo-adas-data' include ':libraries:mogo-obu' -include ':libraries:mapmodule' +//include ':libraries:mapmodule' // 语音 include ':tts:tts-base'