diff --git a/app/build.gradle b/app/build.gradle index 608f707c2b..c035cc6a4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -224,7 +224,7 @@ dependencies { implementation rootProject.ext.dependencies.android_start_up implementation rootProject.ext.dependencies.lancetx_runtime - if (!rootProject.isReleaseBuild()) { + if (!rootProject.isJunkDetectEnable()) { implementation rootProject.ext.dependencies.lancetx_compiler_lib implementation rootProject.ext.dependencies.handler_proxy_runtime @@ -236,6 +236,8 @@ dependencies { kapt rootProject.ext.dependencies.google_auto_service compileOnly rootProject.ext.dependencies.google_auto_service + + compileOnly rootProject.ext.dependencies.apm_insight } // implementation rootProject.ext.dependencies.mogocustommap diff --git a/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java b/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java index a553067f38..14c0adcd81 100644 --- a/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java +++ b/app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java @@ -2,7 +2,7 @@ package com.mogo.launcher.lancet.jank.spi; import android.app.Activity; import android.os.Looper; import android.os.SystemClock; -import android.util.Log; +import com.apm.insight.log.VLog; import com.google.auto.service.AutoService; import com.mogo.core.lancetx.compiler.lib.generator.Type; import com.mogo.core.lancetx.compiler.lib.hook.IHookInvoker; @@ -167,7 +167,7 @@ public class HookInvokerImpl implements IHookInvoker { } builder.setLength(builder.length() - 1); } - Log.w("HookHandler", "Junk Detected:" + builder); + VLog.w("HookHandler", "Junk Detected:" + builder); linkedLog(type, builder.toString()); if (flag) { extra.setLength(0); diff --git a/build.gradle b/build.gradle index bbf5ede900..92588d34d0 100644 --- a/build.gradle +++ b/build.gradle @@ -171,3 +171,7 @@ boolean isReleaseBuild() { } return false } + +boolean isJunkDetectEnable() { + return isReleaseBuild() +} \ No newline at end of file diff --git a/config.gradle b/config.gradle index 25d1b30550..e07012c62a 100644 --- a/config.gradle +++ b/config.gradle @@ -228,7 +228,7 @@ ext { passport_secret : "com.zhidaoauto:sdk-java:1.0.5-SNAPSHOT", // 主线程卡顿监测 - block_detector : "com.mogo.eagle.core.block:runtime:10.90.10", + block_detector : "com.mogo.eagle.core.block:runtime:10.90.20", //======================== google auto-service =============== google_auto_service : "com.google.auto.service:auto-service:1.0-rc7", diff --git a/core/function-impl/mogo-core-function-devatools/build.gradle b/core/function-impl/mogo-core-function-devatools/build.gradle index dd29601f0e..e3ea1d2cc6 100644 --- a/core/function-impl/mogo-core-function-devatools/build.gradle +++ b/core/function-impl/mogo-core-function-devatools/build.gradle @@ -102,6 +102,10 @@ dependencies { implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-call') implementation project(':core:mogo-core-res') + + if (!rootProject.isJunkDetectEnable()) { + compileOnly rootProject.ext.dependencies.apm_insight + } } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt index 41174b3d7e..0f3340cf49 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt @@ -4,6 +4,7 @@ import android.content.* import android.util.* import android.view.* import androidx.metrics.performance.* +import com.apm.insight.log.VLog import com.mogo.eagle.core.block.runtime.* import com.mogo.eagle.core.block.runtime.config.* import com.mogo.eagle.core.block.runtime.config.recorder.* @@ -17,6 +18,10 @@ import java.util.concurrent.TimeUnit.SECONDS internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener { + companion object { + private const val TAG = "BLOCK_REPORT" + } + @Volatile private var hasInit = false @@ -28,7 +33,7 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener { .multiplier(2.0f) .isDebug(false) .period(5, SECONDS) - .junkRateThreshold(0.2f) + .junkRateThreshold(0.6f) .recorder(null, 500, 500) .build()) hasInit = true @@ -64,7 +69,13 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener { } } } - linkedLog.record(GsonUtils.toJson(map)) + val msg = GsonUtils.toJson(map) + try { + VLog.w(TAG, msg) + } catch (t: Throwable) { + Log.e(TAG, "onDumped error", t) + } + linkedLog.record(msg) } }) } diff --git a/gradle.properties b/gradle.properties index 9ecea4764a..6da4957238 100644 --- a/gradle.properties +++ b/gradle.properties @@ -81,8 +81,8 @@ MOGO_LOCATION_VERSION=1.4.7.19 MOGO_TELEMATIC_VERSION=1.4.7.19 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=3.2.1.4 -MAP_SDK_DATA_VERSION=1.0.0.3 +MAP_SDK_VERSION=3.3.0.10 +MAP_SDK_DATA_VERSION=1.0.0.7 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket WEBSOCKET_VERSION=1.1.7 diff --git a/gradle/bytex/bytex_handler_proxy.gradle b/gradle/bytex/bytex_handler_proxy.gradle index d39dc3b0b9..ef50728d6a 100644 --- a/gradle/bytex/bytex_handler_proxy.gradle +++ b/gradle/bytex/bytex_handler_proxy.gradle @@ -1,6 +1,6 @@ apply plugin: 'bytex.handler_proxy' handler_proxy { - enable !rootProject.isReleaseBuild() - enableInDebug !rootProject.isReleaseBuild() + enable !rootProject.isJunkDetectEnable() + enableInDebug !rootProject.isJunkDetectEnable() } diff --git a/gradle/bytex/bytex_lancetx.gradle b/gradle/bytex/bytex_lancetx.gradle index 7f1ff9efe7..0d6e97431e 100644 --- a/gradle/bytex/bytex_lancetx.gradle +++ b/gradle/bytex/bytex_lancetx.gradle @@ -8,7 +8,7 @@ LancetX { "com.zhjt.mogo_core_function_devatools.perf" ] synchronizedLock { - enabled !rootProject.isReleaseBuild() + enabled !rootProject.isJunkDetectEnable() blackList = [ "okio.AsyncTimeout\$Watchdog" ] @@ -28,7 +28,7 @@ LancetX { enable true } main_block_check { - enable !rootProject.isReleaseBuild() + enable !rootProject.isJunkDetectEnable() } } } diff --git a/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl index c8a3c71eb3..fb09ea5922 100644 --- a/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl +++ b/libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl @@ -155,8 +155,8 @@ void setSignalLine(){ } fragColor = texture(texId,_uv); // fragColor *= 1.0-0.5*smoothstep(0.0,signalLineCnt,signalLineTexY); - if(signalLineObj==1) - fragColor *= clamp(smoothstep(0.0,signalLineCnt,signalLineTexY)+0.5,0.0,1.0); +// if(signalLineObj==1) +// fragColor *= clamp(smoothstep(0.0,signalLineCnt,signalLineTexY)+0.5,0.0,1.0); } void setText(){ fragColor = vec4(vec3(textColor),texture(texId,_uv).a); diff --git a/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl index 9e6714163a..20b8270e9e 100644 --- a/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl +++ b/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl @@ -8,6 +8,8 @@ uniform vec4 specularColor; //高光颜色 uniform float specularPow; //高光光泽度 uniform vec4 replacedColor; //把元素替换为另外一种颜色 uniform bool isReplaceColor; //是否把元素替换为另外一种颜色 +uniform int isMixColor;//是否混合颜色 + in vec2 fragTexCoord; in vec3 fragEyeNormal; in vec3 fragEyePos; @@ -37,9 +39,13 @@ layout(location = 0) out vec4 fragColor; vec4 changeColorMethod(vec4 texColor){ vec4 retColor = vec4(0.0); if(_changeColorCmd==0.0){ - if(isReplaceColor) - retColor = mix(texColor,replacedColor,1.0); //s1 - else + if(isReplaceColor){ + if(isMixColor == 0){ + retColor = mix(texColor,replacedColor,1.0); //s1 + }else{ + retColor = mix(texColor,replacedColor,0.5); //s1 + } + }else retColor = texColor; //s0 }else if(_changeColorRatio==0.0){ if(_changeColorCmd==1.0) diff --git a/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl index eec579dea5..ca308e4525 100644 --- a/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl +++ b/libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl @@ -20,6 +20,7 @@ uniform bool isRenderSignalLine; //信号线 uniform float signalLineTime; //信号线时间 uniform int signalLineStep; //信号线阶段 uniform int signalLineObj; //信号线对象 +uniform float signalScale; //信号线x方向缩放 uniform bool isWater; //水系 uniform float waterTime; //水系滚动时间 uniform bool isRenderDivider; @@ -44,17 +45,17 @@ void setZebra(){ float d = distance(pos0.xy/pos0.w,pos1.xy/pos1.w); //求出斑马线长边的长度 int cnt = 0; //根据长边的长度决定画几根斑马线 if(d<0.03) - cnt = 1; + cnt = 1; else if(d<0.1) - cnt = 3; + cnt = 3; else if(d<0.3) - cnt = 5; + cnt = 5; else if(d<0.5) - cnt = 15; + cnt = 15; else if(d < 1.4) - cnt = 30; + cnt = 30; else - cnt = 30; + cnt = 30; _uv = uv*float(cnt); } void setColor(){ @@ -77,11 +78,11 @@ void setWater(){ _uv.x = _uv.x + waterTime; } void setWave(){ - waveOff = pos.y / 1000.0; + waveOff = pos.y / 1000.0 /2.0; } void setSignalLine(){ if(signalLineObj==1 && signalLineStep>0){ - _uv.x = (uv.x - 0.5)*3.0 + 0.5; //x方向缩放 + _uv.x = (uv.x - 0.5)*signalScale + 0.5; //x方向缩放 _uv.y = uv.y; signalLineTexY = _uv.y; _uv = _uv + vec2(0.0,1.0)*signalLineTime; @@ -112,18 +113,18 @@ void main() setPosInEye(); } if(isTex) - setTex(); + setTex(); else - setColor(); + setColor(); if(isRenderZebra) - setZebra(); + setZebra(); if(isWave) - setWave(); + setWave(); if(isWater) - setWater(); + setWater(); if(isRenderSignalLine) - setSignalLine(); + setSignalLine(); if(isGuideLine) - setGuideLine(); + setGuideLine(); gl_Position = projMat*viewMat*modelMat * pos; } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/building/mogo.png b/libraries/mapmodule/src/main/assets/style/building/mogo.png new file mode 100644 index 0000000000..71d92c7aaf Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/mogo.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/加油站.png b/libraries/mapmodule/src/main/assets/style/building/加油站.png new file mode 100644 index 0000000000..614b2cf84c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/加油站.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/动物园.png b/libraries/mapmodule/src/main/assets/style/building/动物园.png new file mode 100644 index 0000000000..a7dd81fcf2 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/动物园.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/医院.png b/libraries/mapmodule/src/main/assets/style/building/医院.png new file mode 100644 index 0000000000..e8e3ef46c2 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/医院.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/博物馆.png b/libraries/mapmodule/src/main/assets/style/building/博物馆.png new file mode 100644 index 0000000000..1f92708f31 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/博物馆.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/历史遗迹.png b/libraries/mapmodule/src/main/assets/style/building/历史遗迹.png new file mode 100644 index 0000000000..51918ebe83 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/历史遗迹.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/商业设施.png b/libraries/mapmodule/src/main/assets/style/building/商业设施.png new file mode 100644 index 0000000000..6b2c1d453f Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/商业设施.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/展览馆.png b/libraries/mapmodule/src/main/assets/style/building/展览馆.png new file mode 100644 index 0000000000..111b3b87b5 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/展览馆.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/市政府.png b/libraries/mapmodule/src/main/assets/style/building/市政府.png new file mode 100644 index 0000000000..068b4e63bf Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/市政府.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/政务机构.png b/libraries/mapmodule/src/main/assets/style/building/政务机构.png new file mode 100644 index 0000000000..173fd4ba13 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/政务机构.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/景点.png b/libraries/mapmodule/src/main/assets/style/building/景点.png new file mode 100644 index 0000000000..cf95c045aa Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/景点.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/游乐场.png b/libraries/mapmodule/src/main/assets/style/building/游乐场.png new file mode 100644 index 0000000000..4430e14087 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/游乐场.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/火车站.png b/libraries/mapmodule/src/main/assets/style/building/火车站.png new file mode 100644 index 0000000000..cfce1c1ab7 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/火车站.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/码头.png b/libraries/mapmodule/src/main/assets/style/building/码头.png new file mode 100644 index 0000000000..dd4b255f84 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/码头.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/紧急医疗服务.png b/libraries/mapmodule/src/main/assets/style/building/紧急医疗服务.png new file mode 100644 index 0000000000..0ca6c99cee Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/紧急医疗服务.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/购物中心.png b/libraries/mapmodule/src/main/assets/style/building/购物中心.png new file mode 100644 index 0000000000..99c164a485 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/购物中心.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/银行.png b/libraries/mapmodule/src/main/assets/style/building/银行.png new file mode 100644 index 0000000000..3dca1d2f51 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/银行.png differ diff --git a/libraries/mapmodule/src/main/assets/style/building/飞机场.png b/libraries/mapmodule/src/main/assets/style/building/飞机场.png new file mode 100644 index 0000000000..10c8657c5c Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/building/飞机场.png differ diff --git a/libraries/mapmodule/src/main/assets/style/connector_lineDay.png b/libraries/mapmodule/src/main/assets/style/connector_lineDay.png new file mode 100644 index 0000000000..d34e6ebfcd Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/connector_lineDay.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/100-120-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/100-120-speed.png index ec5054b5ce..1fd3c9f330 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/100-120-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/100-120-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_white.png index 558bc23266..5e50920596 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_yellow.png index c33000b391..0400f30a9d 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16-19_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16_18.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16_18.png index 3781dd6740..4d044f127e 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16_18.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/16_18.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_white.png index 15b1b42d40..f62406b25c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_yellow.png index d3e41b6ccd..53dc75a8ee 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-19_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_white.png index 9c088de47b..606e43065e 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_yellow.png index 5c4425af71..911786b709 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/17-20_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-white.png index 4895fc30ce..7c64d0a127 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-yellow.png index 248e737821..0241761507 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/1730-1930-yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-white.png index bb0a246575..ca096832b3 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-yellow.png index 6bdd37f989..535ae318af 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/40-speed-yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/415_1.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/415_1.png index 1119936e5a..5a918bf8ba 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/415_1.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/415_1.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-20_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-20_white.png index 91100d8ec2..74ad75864f 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-20_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-20_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-22_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-22_white.png index b210f0a54a..d2029b049a 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-22_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/6-22_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-100-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-100-speed.png index 1416657c66..81d619019f 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-100-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-100-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-80-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-80-speed.png index 2ac13d6028..bf7c679a28 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-80-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-80-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-speed.png index 6f49d09568..260705aac1 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/60-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-10-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-10-speed.png index 619a89fe7c..9290ca01aa 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-10-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-10-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-22.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-22.png index 1e771e45de..c946836c79 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-22.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-22.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_white.png index c0c1698851..f5f0cb19ac 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_yellow.png index c72e383182..7e70040803 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/7-9_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-100-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-100-speed.png index 8469614925..da18e38eb8 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-100-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-100-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-speed.png index f764ae51d6..63ce8a3a77 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/80-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/90-120-speed.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/90-120-speed.png index e11daa89be..87eb4fc538 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/90-120-speed.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/90-120-speed.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/AcrossLane.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/AcrossLane.png index adf58d144a..fe875320b2 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/AcrossLane.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/AcrossLane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigRectForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigRectForbidArea.png index cb65fa5828..04447381b3 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigRectForbidArea.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigRectForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigSquareForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigSquareForbidArea.png index 028fd4f105..e2f2a92483 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigSquareForbidArea.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/BigSquareForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidArea.png index b4e5bbb09e..27f445ac45 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidArea.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidLogo.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidLogo.png new file mode 100644 index 0000000000..6893589c22 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ForbidLogo.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ParkingLotSign.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ParkingLotSign.png index 7416165e3d..1c5cc64aa0 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ParkingLotSign.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ParkingLotSign.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ReversibleLane.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ReversibleLane.png index 10aee51edb..5208543c33 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ReversibleLane.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ReversibleLane.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Rhombus.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Rhombus.png index 3b9cd2432b..ed94fe9a6f 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Rhombus.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Rhombus.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/School.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/School.png index 10b1981c47..04bfa62d02 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/School.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/School.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaRectForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaRectForbidArea.png index a413245d89..a044ad9433 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaRectForbidArea.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaRectForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaSquareForbidArea.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaSquareForbidArea.png index e86d4702a8..569fe3ae25 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaSquareForbidArea.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SmaSquareForbidArea.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_red.png index 8eb59e4286..af6dbf4c2c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_white.png index 639c5503a1..5a73e24cf2 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_yellow.png index 970a9b97fd..0ea9262d51 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump1_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_red.png index 471ad03b6e..d43e23fd0e 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_white.png index a340429b36..8451237091 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_yellow.png index f9c2ffeb99..f1cee41f04 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump2_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_red.png index 9fd95da302..5f20b6a8da 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_white.png index fee7cf6166..3cc073dabd 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_yellow.png index 55e8fe663a..fc2270ea91 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump3_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_red.png index 752f41eeb9..e250587648 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_white.png index b558db79da..651a76806c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_yellow.png index 3d59690706..555c991250 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump4_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_red.png index ad5aa7c5ce..d58e6d164b 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_white.png index 780fe3edbd..6d0c11f2c8 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_yellow.png index 0900c8e46f..bcf978f155 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/SpeedBump5_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Triangle.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Triangle.png index 19d58e3bb7..6fc527ea32 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Triangle.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/Triangle.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_red.png index 26540f589f..7c53c387ac 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_white.png index 369ad00b66..b53564c0ce 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_yellow.png index 2eaffd3e21..a08b371913 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump1_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_red.png index 057c835059..74167571c2 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_white.png index 4910f0e515..9e945dc79f 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_yellow.png index bcd0be6bf5..2d1ef43055 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump2_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_red.png index dedb2a8b81..37359f300c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_white.png index da9591f15d..4a12b27854 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_yellow.png index feda70ed7d..8837b6499d 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump3_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_red.png index 70f8f5aa61..063cc71ee5 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_white.png index 792a4e7e8c..c0f27d8068 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_yellow.png index 85552e04e0..3d1f394ba0 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump4_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_red.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_red.png index 71845fb3aa..15310a0b17 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_red.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_red.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_white.png index 53dcf20baf..a7b290422a 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_yellow.png index 0bece0e9ba..be61174e4c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/UnSpeedBump5_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusAcross.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusAcross.png index 1440d94f9f..d55a5c2564 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusAcross.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusAcross.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusVertical.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusVertical.png index 16b5b21bae..ff5ebd1413 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusVertical.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/WithBusVertical.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_left.png index 185407aa47..575f2290f8 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_left.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_right.png index 2163faa775..2c54317a64 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_right.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_cross_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_LL.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_LL.png index 804a18b616..001ce5b514 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_LL.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_LL.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_left.png index adc906ced7..fd29f99c8e 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_left.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right.png index 1f1a172071..4a8df3c400 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right_down.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right_down.png index 55ada63c09..71417e0ebd 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right_down.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bicycle_vertical_right_down.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus.png index 6300f3af11..b60b511792 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneAcross.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneAcross.png index 366c7f38c6..dca55e8210 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneAcross.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneAcross.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneVertical.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneVertical.png index dc545cf304..0686b377bf 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneVertical.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busLaneVertical.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStation.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStation.png index 8176386662..b0431009df 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStation.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStation.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStop.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStop.png index efc25574af..c591fc0c55 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStop.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busStop.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busTransitLaneV.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busTransitLaneV.png index 7ae2cb3d64..560b1be926 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busTransitLaneV.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/busTransitLaneV.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_white.png index 702d22ba8c..f25a1ebd15 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_yellow.png index fc851ceb4d..729f2fa9fa 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/bus_Rapid_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/carpeople.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/carpeople.png index 4d00789ad6..cf5865ca74 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/carpeople.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/carpeople.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianC.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianC.png index a4f1ccbb3c..067e1e375a 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianC.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianC.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianCShu.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianCShu.png index 03d5b0fa79..a77f811fec 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianCShu.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comityPedestrianCShu.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_Pedestrian.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_Pedestrian.png index 061d909dbe..44e6a74cd0 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_Pedestrian.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_Pedestrian.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_PedestrianShu.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_PedestrianShu.png index a2883290dc..6cac49cefb 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_PedestrianShu.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/comity_PedestrianShu.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_left.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_left.png index f4c9b68ac0..5fe9cd25c4 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_left.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_left.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_right.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_right.png index a69defc03c..94ff2048d4 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_right.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/divider15_right.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/exit.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/exit.png index 26d8002ddb..b98f961eb4 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/exit.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/exit.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/goStraightTurnRightLeft.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/goStraightTurnRightLeft.png index 5f18e4c678..eb705a71cc 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/goStraightTurnRightLeft.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/goStraightTurnRightLeft.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraight.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraight.png index e47c770a7e..fa143c3896 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraight.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraight.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleft.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleft.png index e76913f9fd..87a76d7904 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleft.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleft.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftright.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftright.png index ce81a74093..80ef043cc5 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftright.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftright.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftround.png index fdfa403376..69dbc91545 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightleftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightround.png index 5536c5297b..167ef816d0 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightturn.png index ddc069fdb0..022044ae62 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/gostraightrightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/hov.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/hov.png index 9557865592..9daf485e4e 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/hov.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/hov.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ice.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ice.png new file mode 100644 index 0000000000..cf7e6376af Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/ice.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftleftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftleftround.png index 122a006c85..299d6b9a95 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftleftround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftleftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftrightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftrightturn.png index d4b5a24ac9..52b8a360df 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftrightturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftrightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftround.png index 95b4536dfc..87db9a4e2f 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftturn.png index 45613cece0..d1666de043 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftwaitturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftwaitturn.png index 67dd20451f..699fffc733 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftwaitturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/leftwaitturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/motorVehiclesC.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/motorVehiclesC.png index 380c6b1815..aa812adf18 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/motorVehiclesC.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/motorVehiclesC.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noCrossLine.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noCrossLine.png index e7e6798085..f8d2cfa9c3 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noCrossLine.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noCrossLine.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noLeftOrTurn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noLeftOrTurn.png index 739b43768c..c9e074222c 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noLeftOrTurn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noLeftOrTurn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noStopMarking.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noStopMarking.png index 4f4794b68d..a011c3bc51 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noStopMarking.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noStopMarking.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noTurn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noTurn.png index b63d967ce5..698a9641c5 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noTurn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noTurn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noleftturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noleftturn.png index b0fbb66ce1..d3931d8c86 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noleftturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/noleftturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/onlyTaxi.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/onlyTaxi.png index 18b6616da2..ef0f9b5760 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/onlyTaxi.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/onlyTaxi.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/policeSpecialV.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/policeSpecialV.png index a04ff59982..c15499af04 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/policeSpecialV.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/policeSpecialV.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightrightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightrightround.png index 228546513d..c427571f0a 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightrightround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightrightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightround.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightround.png index 07d5c7699d..9609e214c8 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightround.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightround.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightturn.png index 5c2e751ddf..6d1746ea0a 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightwaitturn.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightwaitturn.png index 27be89f406..ecb4ad75bc 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightwaitturn.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/rightwaitturn.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_white.png index 10b1981c47..7e591c2002 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_yellow.png index 398b418e05..7f25f23219 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/schoolZone_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/stop.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/stop.png index 5705cf6c46..add8223248 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/stop.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/stop.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_white.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_white.png index 6926910472..efeab068f2 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_white.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_white.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_yellow.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_yellow.png index 744374c5c6..0ef9187b90 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_yellow.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/throughWordsV_yellow.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/waternormals.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/waternormals.png new file mode 100644 index 0000000000..a3bd6f74fb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/waternormals.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/zebra.png b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/zebra.png index dbb2c139dd..3e83e0793a 100644 Binary files a/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/zebra.png and b/libraries/mapmodule/src/main/assets/style/hd_res/day_mode/zebra.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/hd_n3d/night_mode/bus_station.nt3d b/libraries/mapmodule/src/main/assets/style/hd_res/hd_n3d/night_mode/bus_station.nt3d new file mode 100644 index 0000000000..28641982a4 Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/hd_n3d/night_mode/bus_station.nt3d differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/night_mode/ice.png b/libraries/mapmodule/src/main/assets/style/hd_res/night_mode/ice.png new file mode 100644 index 0000000000..cf7e6376af Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/night_mode/ice.png differ diff --git a/libraries/mapmodule/src/main/assets/style/hd_res/night_mode/waternormals.png b/libraries/mapmodule/src/main/assets/style/hd_res/night_mode/waternormals.png new file mode 100644 index 0000000000..a3bd6f74fb Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/hd_res/night_mode/waternormals.png differ diff --git a/libraries/mapmodule/src/main/assets/style/mogo.png b/libraries/mapmodule/src/main/assets/style/mogo.png new file mode 100644 index 0000000000..71d92c7aaf Binary files /dev/null and b/libraries/mapmodule/src/main/assets/style/mogo.png differ diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/alpha.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/alpha.cfg new file mode 100644 index 0000000000..9b2be6b5e4 --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/alpha.cfg @@ -0,0 +1,50 @@ +alpha.tex.path.11.出口.0=/hd_res/day_mode/exit.png +alpha.tex.path.11.前方学校.1=/hd_res/day_mode/schoolZone_white.png +alpha.tex.path.11.前方学校.2=/hd_res/day_mode/schoolZone_yellow.png +alpha.tex.path.11.公交专用.0=/hd_res/day_mode/WithBusVertical.png +alpha.tex.path.11.潮汐车道.0=/hd_res/day_mode/ReversibleLane.png +alpha.tex.path.11.公交车道.0=/hd_res/day_mode/busLaneVertical.png +alpha.tex.path.11.公交车.0=/hd_res/day_mode/bus.png +alpha.tex.path.11.快速公交专用线.1=/hd_res/day_mode/bus_Rapid_white.png +alpha.tex.path.11.快速公交专用线.2=/hd_res/day_mode/bus_Rapid_yellow.png +alpha.tex.path.11.借道区.1=/hd_res/day_mode/throughWordsV_white.png +alpha.tex.path.11.借道区.2=/hd_res/day_mode/throughWordsV_yellow.png +alpha.tex.path.11.公交停靠.0=/hd_res/day_mode/busStop.png +alpha.tex.path.11.警务专用.0=/hd_res/day_mode/policeSpecialV.png +alpha.tex.path.11.礼让行人.1=/hd_res/day_mode/comity_PedestrianShu.png +alpha.tex.path.11.礼让行人.2=/hd_res/day_mode/comityPedestrianCShu.png +alpha.tex.path.11.人行道.0=/hd_res/day_mode/sideRoad.png +alpha.tex.path.11.观光车专用道.0=/hd_res/day_mode/tourRoad.png +alpha.tex.path.12.BATTERY.0=/hd_res/day_mode/battery.png +alpha.tex.path.12.WALK.0=/hd_res/day_mode/walk.png +alpha.tex.path.12.车让人.0=/hd_res/day_mode/carpeople.png +alpha.tex.path.12.公交专用.0=/hd_res/day_mode/WithBusAcross.png +alpha.tex.path.12.公交车道.0=/hd_res/day_mode/busLaneAcross.png +alpha.tex.path.12.礼让行人.1=/hd_res/day_mode/comity_Pedestrian.png +alpha.tex.path.12.礼让行人.2=/hd_res/day_mode/comityPedestrianC.png +alpha.tex.path.12.停.0=/hd_res/day_mode/stop.png +alpha.tex.path.12.请勿越线.2=/hd_res/day_mode/noCrossLine.png +alpha.tex.path.22.7-22.0=/hd_res/day_mode/7-22.png +alpha.tex.path.22.7-9.1=/hd_res/day_mode/7-9_white.png +alpha.tex.path.22.7-9.2=/hd_res/day_mode/7-9_yellow.png +alpha.tex.path.22.17-19.1=/hd_res/day_mode/17-19_white.png +alpha.tex.path.22.17-19.2=/hd_res/day_mode/17-19_yellow.png +alpha.tex.path.22.16-19.1=/hd_res/day_mode/16-19_white.png +alpha.tex.path.22.16-19.2=/hd_res/day_mode/16-19_yellow.png +alpha.tex.path.22.17-20.1=/hd_res/day_mode/17-20_white.png +alpha.tex.path.22.17-20.2=/hd_res/day_mode/17-20_yellow.png +alpha.tex.path.22.6-20.0=/hd_res/day_mode/6-20_white.png +alpha.tex.path.22.6-22.0=/hd_res/day_mode/6-22_white.png +alpha.tex.path.22.7:30-9:30.1=/hd_res/day_mode/1730-1930-white.png +alpha.tex.path.22.7:30-9:30.2=/hd_res/day_mode/1730-1930-yellow.png +alpha.tex.path.22.7-10.0=/hd_res/day_mode/7-10-speed.png +alpha.tex.path.22.16:00-18:00.1=/hd_res/day_mode/16_18.png +alpha.tex.path.31.60-80.0=/hd_res/day_mode/60-80-speed.png +alpha.tex.path.31.80-100.0=/hd_res/day_mode/80-100-speed.png +alpha.tex.path.31.100-120.0=/hd_res/day_mode/100-120-speed.png +alpha.tex.path.31.60-100.0=/hd_res/day_mode/60-100-speed.png +alpha.tex.path.31.90-120.0=/hd_res/day_mode/90-120-speed.png +alpha.tex.path.32.80.0=/hd_res/day_mode/80-speed.png +alpha.tex.path.32.60.0=/hd_res/day_mode/60-speed.png +alpha.tex.path.32.40.1=/hd_res/day_mode/40-speed-white.png +alpha.tex.path.32.40.2=/hd_res/day_mode/40-speed-yellow.png \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/arrow.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/arrow.cfg new file mode 100644 index 0000000000..e29fc389ce --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/arrow.cfg @@ -0,0 +1,65 @@ +arrow.tex.path.201=/hd_res/day_mode/gostraight.png +arrow.tex.path.202=/hd_res/day_mode/gostraightleft.png +arrow.tex.path.203=/hd_res/day_mode/gostraightrightturn.png +arrow.tex.path.204=/hd_res/day_mode/gostraightleftround.png +arrow.tex.path.220=/hd_res/day_mode/gostraightrightround.png +arrow.tex.path.205=/hd_res/day_mode/leftturn.png +arrow.tex.path.206=/hd_res/day_mode/leftleftround.png +arrow.tex.path.207=/hd_res/day_mode/leftwaitturn.png +arrow.tex.path.208=/hd_res/day_mode/rightturn.png +arrow.tex.path.209=/hd_res/day_mode/rightwaitturn.png +arrow.tex.path.210=/hd_res/day_mode/leftrightturn.png +arrow.tex.path.211=/hd_res/day_mode/leftround.png +arrow.tex.path.212=/hd_res/day_mode/noleftturn.png +arrow.tex.path.215=/hd_res/day_mode/gostraightleftright.png +arrow.tex.path.402=/hd_res/day_mode/bicycle_cross_right.png +arrow.tex.path.412=/hd_res/day_mode/bicycle_vertical_right.png +arrow.tex.path.408=/hd_res/day_mode/bicycle_vertical_left.png +arrow.tex.path.410=/hd_res/day_mode/bicycle_cross_left.png +arrow.tex.path.411=/hd_res/day_mode/motorVehiclesC.png +arrow.tex.path.413=/hd_res/day_mode/bicycle_vertical_LL.png +arrow.tex.path.404=/hd_res/day_mode/bicycle_vertical_right_down.png +arrow.tex.path.508=/hd_res/day_mode/Rhombus.png +arrow.tex.path.509=/hd_res/day_mode/Triangle.png +arrow.tex.path.511.1=/hd_res/day_mode/SpeedBump1_white.png +arrow.tex.path.511.2=/hd_res/day_mode/SpeedBump1_yellow.png +arrow.tex.path.511.4=/hd_res/day_mode/SpeedBump1_red.png +arrow.tex.path.501.1=/hd_res/day_mode/SpeedBump2_white.png +arrow.tex.path.501.2=/hd_res/day_mode/SpeedBump2_yellow.png +arrow.tex.path.501.4=/hd_res/day_mode/SpeedBump2_red.png +arrow.tex.path.502.1=/hd_res/day_mode/SpeedBump3_white.png +arrow.tex.path.502.2=/hd_res/day_mode/SpeedBump3_yellow.png +arrow.tex.path.502.4=/hd_res/day_mode/SpeedBump3_red.png +arrow.tex.path.512.1=/hd_res/day_mode/SpeedBump4_white.png +arrow.tex.path.512.2=/hd_res/day_mode/SpeedBump4_yellow.png +arrow.tex.path.512.4=/hd_res/day_mode/SpeedBump4_red.png +arrow.tex.path.517.4=/hd_res/day_mode/SpeedBump5_red.png +arrow.tex.path.517.1=/hd_res/day_mode/SpeedBump5_white.png +arrow.tex.path.517.2=/hd_res/day_mode/SpeedBump5_yellow.png +arrow.tex.path.603=/hd_res/day_mode/BigSquareForbidArea.png +arrow.tex.path.604=/hd_res/day_mode/SmaSquareForbidArea.png +arrow.tex.path.605=/hd_res/day_mode/BigRectForbidArea.png +arrow.tex.path.606=/hd_res/day_mode/SmaRectForbidArea.png +arrow.tex.path.513.1=/hd_res/day_mode/UnSpeedBump1_white.png +arrow.tex.path.513.2=/hd_res/day_mode/UnSpeedBump1_yellow.png +arrow.tex.path.513.4=/hd_res/day_mode/UnSpeedBump1_red.png +arrow.tex.path.514.1=/hd_res/day_mode/UnSpeedBump2_white.png +arrow.tex.path.514.2=/hd_res/day_mode/UnSpeedBump2_yellow.png +arrow.tex.path.514.4=/hd_res/day_mode/UnSpeedBump2_red.png +arrow.tex.path.515.1=/hd_res/day_mode/UnSpeedBump3_white.png +arrow.tex.path.515.2=/hd_res/day_mode/UnSpeedBump3_yellow.png +arrow.tex.path.515.4=/hd_res/day_mode/UnSpeedBump3_red.png +arrow.tex.path.516.1=/hd_res/day_mode/UnSpeedBump4_white.png +arrow.tex.path.516.2=/hd_res/day_mode/UnSpeedBump4_yellow.png +arrow.tex.path.516.4=/hd_res/day_mode/UnSpeedBump4_red.png +arrow.tex.path.518.4=/hd_res/day_mode/UnSpeedBump5_red.png +arrow.tex.path.518.1=/hd_res/day_mode/UnSpeedBump5_white.png +arrow.tex.path.518.2=/hd_res/day_mode/UnSpeedBump5_yellow.png +arrow.tex.path.719=/hd_res/day_mode/busTransitLaneV.png +arrow.tex.path.721=/hd_res/day_mode/hov.png +arrow.tex.path.608=/hd_res/day_mode/noStopMarking.png +arrow.tex.path.219=/hd_res/day_mode/noLeftOrTurn.png +arrow.tex.path.722=/hd_res/day_mode/ParkingLotSign.png +arrow.tex.path.415=/hd_res/day_mode/415_1.png +arrow.tex.path.416=/hd_res/day_mode/416.png +arrow.tex.path.214=/hd_res/day_mode/noTurn.png \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/building.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/building.cfg new file mode 100644 index 0000000000..642c8e9660 --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/building.cfg @@ -0,0 +1,18 @@ + +building.icon.path.type.6=/building/加油站.png;555555 //路径;颜色 +building.icon.path.type.30=/building/医院.png;555555 +building.icon.path.type.35=/building/警察局.png;555555 +building.icon.path.type.36=/building/邮局.png;555555 +building.icon.path.type.37=/building/市政府.png;555555 +building.icon.path.type.39=/building/法院.png;555555 +building.icon.path.type.40=/building/政府机构.png;555555 +building.icon.path.type.41=/building/社区活动中心.png;555555 +building.icon.path.type.42=/building/购物中心.png;555555 +building.icon.path.type.44=/building/银行.png;555555 +building.icon.path.type.66=/building/商业设施.png;555555 +building.icon.path.type.67=/building/展览馆.png;555555 +building.icon.path.type.68=/building/火车站.png;555555 +building.icon.path.type.69=/building/公交站.png;555555 +building.icon.path.type.71=/building/飞机场.png;555555 +building.icon.path.type.75=/building/紧急医疗服务.png;555555 +building.icon.path.type.99=/building/mogo.png;555555 \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg index 57919ed493..7592f56c0a 100644 --- a/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/day/common.cfg @@ -1,32 +1,54 @@ -backGround=B0BED1 //背景色 -road=80,92,112 //路面颜色 +backGround=D9E9FF //背景色 +road=C4D8F5 //路面颜色 arrow.color.fac=0.95 //箭头颜色因子 alphaNumeric.color.fac=1.0 //地标颜色因子 zebra.color.fac=0.98 //斑马线颜色因子 -spotLight=2.5;0.5;1 //聚光灯 半径;亮度;偏移 -shadow=70,85,107,200 //阴影颜色 -greenBelt=6C8C86;9EBDB4 //绿化带 底部颜色;顶部颜色 -dividerLine=228,233,250;228,233,250;1.0 //白色;黄色;颜色因子 -pole=8999B0;4E617E //灯杆渐变颜色 -guardBar=9FB4C8;7C8EA5;B8C8E1 //隔离带颜色 +spotLight=2.5;0;1 //聚光灯 半径;亮度;偏移 +shadow=4C7793AB //阴影颜色 +greenBelt=D0E6EC;D9EAF4 //绿化带 底部颜色;顶部颜色 +dividerLine=E3F2FF;E1E2C4;1.0 //白色;黄色;颜色因子 +pole=9FB6D6;9FB6D6 //灯杆渐变颜色 +guardBar=CCE0FA;C4D9F7;CEE1FB //隔离带颜色 底，中， 顶 roadPile=1.0,0.84,0.23;0.18,0.18,0.18;0.25,0.25,0.25 //路桩颜色 bridgePier=d2d6e4;979aa4 //桥墩颜色 -cable=5cd3ff;1e79d6;65f3ff;48b3bc //电缆颜色1;电缆颜色2;光缆颜色1;光缆颜色2 +cable=D2E3FC;D2E3FC;D2E3FC;D2E3FC //电缆颜色1;电缆颜色2;光缆颜色1;光缆颜色2 area.type.2=D0E7DD //绿地颜色 -area.type.3=99C0E7 //水系颜色 -area.type.4=37485E //路面铺装颜色 -area.type.101=B0BED1 //区域块颜色 -regional=889DB5 //人行步道颜色 -building=7fA3B7D0;D0E3FB //建筑物底部颜色;顶部颜色 -camera=BCC3D0 //摄像头颜色 -trafficLight=BCC3D0 //交通灯颜色 -rsu.type.1=BCC3D0 //雷达颜色 -rsu.type.2=BCC3D0 //mec颜色 -rsu.type.3=BCC3D0 //rsu颜色 +area.type.3.color.pure=99C0E7 //水系颜色 +area.type.3.color.gradient=C5E5FE;7CB0E2 //水系颜色,渐变 +area.type.3.ring.width=50 //水系环宽度 +area.type.4=D1E1F8 //路面铺装颜色 +area.type.101=D9E9FF //区域块颜色 +regional=D1E1F8 //人行步道颜色 +building=BBCEE9;E0EDFC //建筑物底部颜色;顶部颜色 +camera=9FB6D6 //摄像头颜色 +trafficLight=9FB6D6 //交通灯颜色 +rsu.type.1=9FB6D6 //雷达颜色 +rsu.type.2=9FB6D6 //mec颜色 +rsu.type.3=9FB6D6 //rsu颜色 //光照 环境光;漫反射;高光;高光的光泽度 selfCar.light=0.8,0.8,0.8;0.2,0.2,0.2;0.8,0.8,0.8;100.0 //自车 -otherCar.light=0.7,0.7,0.7;0.1,0.1,0.1;0.3,0.3,0.3;11.0 //他车 +otherCar.light=0.7,0.7,0.7;0.02,0.02,0.02;0.15,0.15,0.15;11.0 //他车 others.light=0.7,0.7,0.7;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //除自车和他车外的其他3d锚点 -fog=BFD9FD;50;300;0.8 //雾颜色,起始距离，结束距离，密度 -skybox.lookat=0;-16;12; 0;0;5; 0;1;0 //天空盒lookat参数 -skybox.proj=60;0.1;300 //天空盒fov,近平面，远平面 \ No newline at end of file +fog=BFD9FD;30;70;0.8 //雾颜色,起始距离，结束距离，密度 +skybox.lookat=0;-13;10; 0;0;5; 0;1;0 //天空盒lookat参数 +skybox.proj=60;0.1;100 //天空盒fov,近平面，远平面 +grayscale=#9EC1DFFF +building.text.color=555555 +building.text.size=100 +station.text.color=0.0,0.0,1.0,1.0 +station.text.size=150 +cable.wave.color=0.5,0.8,1.0,1.0 +cable.wave.vel=1.8 +road.tex.path=/hd_res/day_mode/road.png +zebra.tex.path=/hd_res/day_mode/zebra.png +plane.tex.path=/hd_res/day_mode/plane.png +building.tex.path=/hd_res/day_mode/zhuan.png +divider.15.left.tex.path=/hd_res/day_mode/divider15_left.png +divider.15.right.tex.path=/hd_res/day_mode/divider15_right.png +skybox.2d.tex.path=/skyDay.png + + + + + + diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/alpha.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/alpha.cfg new file mode 100644 index 0000000000..ca942f4727 --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/alpha.cfg @@ -0,0 +1,50 @@ +alpha.tex.path.11.出口.0=/hd_res/night_mode/exit.png +alpha.tex.path.11.前方学校.1=/hd_res/night_mode/schoolZone_white.png +alpha.tex.path.11.前方学校.2=/hd_res/night_mode/schoolZone_yellow.png +alpha.tex.path.11.公交专用.0=/hd_res/night_mode/WithBusVertical.png +alpha.tex.path.11.潮汐车道.0=/hd_res/night_mode/ReversibleLane.png +alpha.tex.path.11.公交车道.0=/hd_res/night_mode/busLaneVertical.png +alpha.tex.path.11.公交车.0=/hd_res/night_mode/bus.png +alpha.tex.path.11.快速公交专用线.1=/hd_res/night_mode/bus_Rapid_white.png +alpha.tex.path.11.快速公交专用线.2=/hd_res/night_mode/bus_Rapid_yellow.png +alpha.tex.path.11.借道区.1=/hd_res/night_mode/throughWordsV_white.png +alpha.tex.path.11.借道区.2=/hd_res/night_mode/throughWordsV_yellow.png +alpha.tex.path.11.公交停靠.0=/hd_res/night_mode/busStop.png +alpha.tex.path.11.警务专用.0=/hd_res/night_mode/policeSpecialV.png +alpha.tex.path.11.礼让行人.1=/hd_res/night_mode/comity_PedestrianShu.png +alpha.tex.path.11.礼让行人.2=/hd_res/night_mode/comityPedestrianCShu.png +alpha.tex.path.11.人行道.0=/hd_res/night_mode/sideRoad.png +alpha.tex.path.11.观光车专用道.0=/hd_res/night_mode/tourRoad.png +alpha.tex.path.12.BATTERY.0=/hd_res/night_mode/battery.png +alpha.tex.path.12.WALK.0=/hd_res/night_mode/walk.png +alpha.tex.path.12.车让人.0=/hd_res/night_mode/carpeople.png +alpha.tex.path.12.公交专用.0=/hd_res/night_mode/WithBusAcross.png +alpha.tex.path.12.公交车道.0=/hd_res/night_mode/busLaneAcross.png +alpha.tex.path.12.礼让行人.1=/hd_res/night_mode/comity_Pedestrian.png +alpha.tex.path.12.礼让行人.2=/hd_res/night_mode/comityPedestrianC.png +alpha.tex.path.12.停.0=/hd_res/night_mode/stop.png +alpha.tex.path.12.请勿越线.2=/hd_res/night_mode/noCrossLine.png +alpha.tex.path.22.7-22.0=/hd_res/night_mode/7-22.png +alpha.tex.path.22.7-9.1=/hd_res/night_mode/7-9_white.png +alpha.tex.path.22.7-9.2=/hd_res/night_mode/7-9_yellow.png +alpha.tex.path.22.17-19.1=/hd_res/night_mode/17-19_white.png +alpha.tex.path.22.17-19.2=/hd_res/night_mode/17-19_yellow.png +alpha.tex.path.22.16-19.1=/hd_res/night_mode/16-19_white.png +alpha.tex.path.22.16-19.2=/hd_res/night_mode/16-19_yellow.png +alpha.tex.path.22.17-20.1=/hd_res/night_mode/17-20_white.png +alpha.tex.path.22.17-20.2=/hd_res/night_mode/17-20_yellow.png +alpha.tex.path.22.6-20.0=/hd_res/night_mode/6-20_white.png +alpha.tex.path.22.6-22.0=/hd_res/night_mode/6-22_white.png +alpha.tex.path.22.7:30-9:30.1=/hd_res/night_mode/1730-1930-white.png +alpha.tex.path.22.7:30-9:30.2=/hd_res/night_mode/1730-1930-yellow.png +alpha.tex.path.22.7-10.0=/hd_res/night_mode/7-10-speed.png +alpha.tex.path.22.16:00-18:00.1=/hd_res/night_mode/16_18.png +alpha.tex.path.31.60-80.0=/hd_res/night_mode/60-80-speed.png +alpha.tex.path.31.80-100.0=/hd_res/night_mode/80-100-speed.png +alpha.tex.path.31.100-120.0=/hd_res/night_mode/100-120-speed.png +alpha.tex.path.31.60-100.0=/hd_res/night_mode/60-100-speed.png +alpha.tex.path.31.90-120.0=/hd_res/night_mode/90-120-speed.png +alpha.tex.path.32.80.0=/hd_res/night_mode/80-speed.png +alpha.tex.path.32.60.0=/hd_res/night_mode/60-speed.png +alpha.tex.path.32.40.1=/hd_res/night_mode/40-speed-white.png +alpha.tex.path.32.40.2=/hd_res/night_mode/40-speed-yellow.png \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/arrow.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/arrow.cfg new file mode 100644 index 0000000000..66327274dc --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/arrow.cfg @@ -0,0 +1,65 @@ +arrow.tex.path.201=/hd_res/night_mode/gostraight.png +arrow.tex.path.202=/hd_res/night_mode/gostraightleft.png +arrow.tex.path.203=/hd_res/night_mode/gostraightrightturn.png +arrow.tex.path.204=/hd_res/night_mode/gostraightleftround.png +arrow.tex.path.220=/hd_res/night_mode/gostraightrightround.png +arrow.tex.path.205=/hd_res/night_mode/leftturn.png +arrow.tex.path.206=/hd_res/night_mode/leftleftround.png +arrow.tex.path.207=/hd_res/night_mode/leftwaitturn.png +arrow.tex.path.208=/hd_res/night_mode/rightturn.png +arrow.tex.path.209=/hd_res/night_mode/rightwaitturn.png +arrow.tex.path.210=/hd_res/night_mode/leftrightturn.png +arrow.tex.path.211=/hd_res/night_mode/leftround.png +arrow.tex.path.212=/hd_res/night_mode/noleftturn.png +arrow.tex.path.215=/hd_res/night_mode/gostraightleftright.png +arrow.tex.path.402=/hd_res/night_mode/bicycle_cross_right.png +arrow.tex.path.412=/hd_res/night_mode/bicycle_vertical_right.png +arrow.tex.path.408=/hd_res/night_mode/bicycle_vertical_left.png +arrow.tex.path.410=/hd_res/night_mode/bicycle_cross_left.png +arrow.tex.path.411=/hd_res/night_mode/motorVehiclesC.png +arrow.tex.path.413=/hd_res/night_mode/bicycle_vertical_LL.png +arrow.tex.path.404=/hd_res/night_mode/bicycle_vertical_right_down.png +arrow.tex.path.508=/hd_res/night_mode/Rhombus.png +arrow.tex.path.509=/hd_res/night_mode/Triangle.png +arrow.tex.path.511.1=/hd_res/night_mode/SpeedBump1_white.png +arrow.tex.path.511.2=/hd_res/night_mode/SpeedBump1_yellow.png +arrow.tex.path.511.4=/hd_res/night_mode/SpeedBump1_red.png +arrow.tex.path.501.1=/hd_res/night_mode/SpeedBump2_white.png +arrow.tex.path.501.2=/hd_res/night_mode/SpeedBump2_yellow.png +arrow.tex.path.501.4=/hd_res/night_mode/SpeedBump2_red.png +arrow.tex.path.502.1=/hd_res/night_mode/SpeedBump3_white.png +arrow.tex.path.502.2=/hd_res/night_mode/SpeedBump3_yellow.png +arrow.tex.path.502.4=/hd_res/night_mode/SpeedBump3_red.png +arrow.tex.path.512.1=/hd_res/night_mode/SpeedBump4_white.png +arrow.tex.path.512.2=/hd_res/night_mode/SpeedBump4_yellow.png +arrow.tex.path.512.4=/hd_res/night_mode/SpeedBump4_red.png +arrow.tex.path.517.4=/hd_res/night_mode/SpeedBump5_red.png +arrow.tex.path.517.1=/hd_res/night_mode/SpeedBump5_white.png +arrow.tex.path.517.2=/hd_res/night_mode/SpeedBump5_yellow.png +arrow.tex.path.603=/hd_res/night_mode/BigSquareForbidArea.png +arrow.tex.path.604=/hd_res/night_mode/SmaSquareForbidArea.png +arrow.tex.path.605=/hd_res/night_mode/BigRectForbidArea.png +arrow.tex.path.606=/hd_res/night_mode/SmaRectForbidArea.png +arrow.tex.path.513.1=/hd_res/night_mode/UnSpeedBump1_white.png +arrow.tex.path.513.2=/hd_res/night_mode/UnSpeedBump1_yellow.png +arrow.tex.path.513.4=/hd_res/night_mode/UnSpeedBump1_red.png +arrow.tex.path.514.1=/hd_res/night_mode/UnSpeedBump2_white.png +arrow.tex.path.514.2=/hd_res/night_mode/UnSpeedBump2_yellow.png +arrow.tex.path.514.4=/hd_res/night_mode/UnSpeedBump2_red.png +arrow.tex.path.515.1=/hd_res/night_mode/UnSpeedBump3_white.png +arrow.tex.path.515.2=/hd_res/night_mode/UnSpeedBump3_yellow.png +arrow.tex.path.515.4=/hd_res/night_mode/UnSpeedBump3_red.png +arrow.tex.path.516.1=/hd_res/night_mode/UnSpeedBump4_white.png +arrow.tex.path.516.2=/hd_res/night_mode/UnSpeedBump4_yellow.png +arrow.tex.path.516.4=/hd_res/night_mode/UnSpeedBump4_red.png +arrow.tex.path.518.4=/hd_res/night_mode/UnSpeedBump5_red.png +arrow.tex.path.518.1=/hd_res/night_mode/UnSpeedBump5_white.png +arrow.tex.path.518.2=/hd_res/night_mode/UnSpeedBump5_yellow.png +arrow.tex.path.719=/hd_res/night_mode/busTransitLaneV.png +arrow.tex.path.721=/hd_res/night_mode/hov.png +arrow.tex.path.608=/hd_res/night_mode/noStopMarking.png +arrow.tex.path.219=/hd_res/night_mode/noLeftOrTurn.png +arrow.tex.path.722=/hd_res/night_mode/ParkingLotSign.png +arrow.tex.path.415=/hd_res/night_mode/415_1.png +arrow.tex.path.416=/hd_res/night_mode/416.png +arrow.tex.path.214=/hd_res/night_mode/noTurn.png \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/building.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/building.cfg new file mode 100644 index 0000000000..642c8e9660 --- /dev/null +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/building.cfg @@ -0,0 +1,18 @@ + +building.icon.path.type.6=/building/加油站.png;555555 //路径;颜色 +building.icon.path.type.30=/building/医院.png;555555 +building.icon.path.type.35=/building/警察局.png;555555 +building.icon.path.type.36=/building/邮局.png;555555 +building.icon.path.type.37=/building/市政府.png;555555 +building.icon.path.type.39=/building/法院.png;555555 +building.icon.path.type.40=/building/政府机构.png;555555 +building.icon.path.type.41=/building/社区活动中心.png;555555 +building.icon.path.type.42=/building/购物中心.png;555555 +building.icon.path.type.44=/building/银行.png;555555 +building.icon.path.type.66=/building/商业设施.png;555555 +building.icon.path.type.67=/building/展览馆.png;555555 +building.icon.path.type.68=/building/火车站.png;555555 +building.icon.path.type.69=/building/公交站.png;555555 +building.icon.path.type.71=/building/飞机场.png;555555 +building.icon.path.type.75=/building/紧急医疗服务.png;555555 +building.icon.path.type.99=/building/mogo.png;555555 \ No newline at end of file diff --git a/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/common.cfg b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/common.cfg index 2a8a35b3b5..036b6994cd 100644 --- a/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/common.cfg +++ b/libraries/mapmodule/src/main/assets/style/style/normal/vr/night/common.cfg @@ -13,7 +13,9 @@ roadPile=0.9,0.7,0.35;0.16,0.16,0.16;0.24,0.24,0.24 //路桩颜色 bridgePier=384f76;1e2636 //桥墩颜色 cable=5cd3ff;1e79d6;65f3ff;48b3bc //电缆颜色1;电缆颜色2;光缆颜色1;光缆颜色2 area.type.2=456A63 //绿地颜色 -area.type.3=426798 //水系颜色 +area.type.3.color.pure=426798 //水系颜色 +area.type.3.color.gradient=426700;426798 //水系渐变颜色 +area.type.3.ring.width=50 //水系环宽度 area.type.4=37485E //路面铺装颜色 area.type.101=3C4A69 //区域块颜色 regional=323E58 //人行步道颜色 @@ -27,6 +29,25 @@ rsu.type.3=0 //rsu颜色 selfCar.light=0.6,0.6,0.6;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //自车 otherCar.light=0.4,0.4,0.4;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //他车 others.light=0.4,0.4,0.4;0.1,0.1,0.1;0.6,0.6,0.6;12.0 //除自车和他车外的其他3d锚点 -fog=BFD9FD;50;300;0.8 //雾颜色,起始距离，结束距离，密度 -skybox.lookat=0;-16;12; 0;0;5; 0;1;0 //天空盒lookat参数 -skybox.proj=60;0.1;300 //天空盒fov,近平面，远平面 \ No newline at end of file +fog=BFD9FD;35;70;0.8 //雾颜色,起始距离，结束距离，密度 +skybox.lookat=0;-13;8; 0;0;5; 0;1;0 //天空盒lookat参数 +skybox.proj=60;0.1;100 //天空盒fov,近平面，远平面 +grayscale=#9EC1DFFF +building.text.color=0.8,0.8,0.8,1.0 +building.text.size=100 +station.text.color=0.0,0.0,1.0,1.0 +station.text.size=150 +cable.wave.color=1.0,1.0,1.0,0.6 +cable.wave.vel=1.0 +road.tex.path=/hd_res/night_mode/road.png +zebra.tex.path=/hd_res/night_mode/zebra.png +plane.tex.path=/hd_res/night_mode/plane.png +building.tex.path=/hd_res/night_mode/zhuan.png +divider.15.left.tex.path=/hd_res/night_mode/divider15_left.png +divider.15.right.tex.path=/hd_res/night_mode/divider15_right.png +skybox.2d.tex.path=/skyNight.png + + + + + diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/MapBox.kt b/libraries/mapmodule/src/main/java/com/autonavi/nge/MapBox.kt index fb65e6e3af..a857128ba6 100644 --- a/libraries/mapmodule/src/main/java/com/autonavi/nge/MapBox.kt +++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/MapBox.kt @@ -45,6 +45,7 @@ class MapBox { dis: Float, isCancel: Boolean = false ) + external fun llaGetRoutePath(trajectorys : DoubleArray,isCancel: Boolean = false) external fun updateCacheFile(isCancel: Boolean = false) external fun modifyRedisFileVersion(version: Int, isCancel: Boolean = false) diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapEngine.kt b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapEngine.kt index f2c1ec374a..fbc8938589 100644 --- a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapEngine.kt +++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapEngine.kt @@ -2,6 +2,7 @@ package com.autonavi.nge.map import android.content.res.AssetManager import android.util.Log +import com.zhidaoauto.map.sdk.open.MapAutoApi class MapEngine { @@ -1014,6 +1015,17 @@ class MapEngine { setTextureJni(mObj,name,ba) } } + fun setStyleName(name:String){ + if (mObj != 0L) { + setPainterCmdJni(mObj,"style",name) + } + } + fun onChangeStyle(styleMode:Int){ + if(styleMode== MapAutoApi.MAP_STYLE_NIGHT_VR) + setStyleName("night") + else if(styleMode== MapAutoApi.MAP_STYLE_DAY_VR) + setStyleName("day") + } private external fun loadJni(projectDir: String, mapView: MapView?,assetManager: AssetManager?): Long private external fun resizeJni(obj:Long,newWidth: Int, newHeight: Int) diff --git a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt index 4916e74e4f..9b169862a5 100644 --- a/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt +++ b/libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapView.kt @@ -149,7 +149,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr mHandler = object : Handler(mapViewThread.looper) { override fun handleMessage(msg: Message) { when (msg.what) { - ZOOM_CHANGE -> mMapController?.dispatchZoomChanged() + ZOOM_CHANGE -> mMapController?.dispatchZoomChanged(msg.obj as Float) // ROTATE_CHANGE ->mMapController?.dispatchRotationAngleChanged((msg.obj as Float)) // DAngle_CHANGE -> mMapController?.dispatchDAngleChanged() // FOCUS_CHANGE -> mMapController?.dispatchFocusChanged() @@ -183,41 +183,8 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr } } -// private val Hndler: Handler = object : Handler(Looper.getMainLooper()) { -// override fun handleMessage(msg: Message) { -// when (msg.what) { -// ZOOM_CHANGE -> mMapController?.dispatchZoomChanged() -// ROTATE_CHANGE ->mMapController?.dispatchRotationAngleChanged((msg.obj as Float)) -// DAngle_CHANGE -> mMapController?.dispatchDAngleChanged() -// FOCUS_CHANGE -> mMapController?.dispatchFocusChanged() -// RENDER_CHANGE -> { -// mEventController?.dispatchRenderListener(msg.arg1) -// } -// RENDER_COMPLETE -> { -// if (DEBUG) { -// Log.i(TAG, "mapop--load render complete-start") -// } -//// CommonEventController.instance?.dispatchCameraChangeFinishListener(CommonController.instance.mapAutoView?.getMapAutoViewHelper()?.getCameraPosition() ?: null) -// if (DEBUG) { -// Log.i(TAG, "mapop--load render complete-end") -// } -// } -// LOAD_COMPLETE -> { -// if (DEBUG) { -// Log.i(TAG, "mapop--load complete-start") -// } -// mEventController?.dispatchMapLoadedListener() -// } -// -// INIT_COMPLETE -> { -// if (DEBUG) { -// Log.i(TAG, "mapop--init complete-start") -// } -// mEventController?.dispatchMapLoadedInitListener() -// } -// } -// } -// } + + override fun getMapEngine(): MapEngine { return mMapEngine @@ -747,6 +714,7 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr // setStyleDir("sdcard/shmdata/style") val styleMode = mMapStyleParams.getStyleMode() val dir = Constant.nDSDataPath + if(!loadP(dir)){ return } @@ -1115,13 +1083,13 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr private var isScroll = true //可以斜滑 - private var isFling = true + private var isFling = false //可以旋转 - private var isRotate = true + private var isRotate = false //可以缩放 - private var isCanZoom = true + private var isCanZoom = false private var isVr = true @@ -1189,11 +1157,14 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr // mHandler.sendEmptyMessage(FOCUS_CHANGE) } - fun onMapZoomChanging() { + fun onMapZoomChanging(zoomIndex: Float) { if (DEBUG) { - Log.i(TAG, "mapop--onMapZoomChanging") + Log.i(TAG, "mapop--onMapZoomChanging--:${zoomIndex}") } - mHandler.sendEmptyMessage(ZOOM_CHANGE) + val msg = Message.obtain() + msg.what = ZOOM_CHANGE + msg.obj = zoomIndex + mHandler.sendMessage(msg) } fun onMapRAngleChanging(angle:Float) { @@ -1206,11 +1177,14 @@ class MapView(context: Context, private val mMapStyleParams: IMapStyleParams, pr // mHandler.sendMessage(msg) } - fun onMapDAngleChanging() { + fun onMapDAngleChanging(angle:Float) { // if (DEBUG) { -// Log.i(TAG, "mapop--onMapDAngleChanging") +// Log.i(TAG, "mapop--onMapDAngleChanging:${angle}") // } -// mHandler.sendEmptyMessage(DAngle_CHANGE) +// val msg = Message.obtain() +// msg.what = DAngle_CHANGE +// msg.obj = angle +// mHandler.sendMessage(msg) } override fun loadP( diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IEventController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IEventController.kt index 256c955d46..1bb01e55f9 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IEventController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IEventController.kt @@ -30,7 +30,7 @@ interface IEventController { fun exit() fun addCameraChangeListener(cameraChangeListener: OnCameraChangeListener) fun removeCameraChangeListener(cameraChangeListener: OnCameraChangeListener) - fun dispatchCameraChangeListener(type: Int, value: Int) + fun dispatchCameraChangeListener(type: Int, value: Float) fun dispatchCameraChangeFinishListener(position: CameraPosition?) fun addMapTouchListener(mapTouchListener: OnMapTouchListener) fun removeMapTouchListener(mapTouchListener: OnMapTouchListener) @@ -67,7 +67,7 @@ interface IEventController { fun isMarkClickListenerListEmpty():Boolean fun addMapStatusListener(mapStatusListener: MapStatusListener, type: Int) fun removeMapStatusListener(mapStatusListener: MapStatusListener, type: Int) - fun dispatchMapStatusListener(type:Int, value: Int) + fun dispatchMapStatusListener(type:Int, value: Float) fun addRenderListener(renderListener : OnRenderListener) fun removeRenderListener(renderListener : OnRenderListener) fun dispatchRenderListener(duration:Int) @@ -89,4 +89,8 @@ interface IEventController { fun addRoadSideFenceRegionListener(onRoadSideFenceRegionListener: OnRoadSideFenceRegionListener) fun removeRoadSideFenceRegionListener(onRoadSideFenceRegionListener: OnRoadSideFenceRegionListener) fun dispatchRoadSideFenceRegionListener(status: Int) + + fun getRoadInfoListenerList(): ArrayList? + + fun getRoadSideFenceRegionListener(): ArrayList? } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt index 5c7ceaec01..b20f626d9e 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt @@ -54,9 +54,9 @@ interface IMapController { fun setCenter(lon: Double, lat: Double) fun animateTo(lon: Double, lat: Double, alt: Float, rotateAngle: Float, mDuration: Int) fun dispatchFocusChanged() - fun dispatchZoomChanged() + fun dispatchZoomChanged(zoomIndex: Float) fun dispatchRotationAngleChanged(rotateAngle: Float) - fun dispatchDAngleChanged() + fun dispatchDAngleChanged(dAngle: Float) fun getMapScreenShot(var1: OnMapScreenShotListener) //NaviController相关 diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt index 71ea76d336..d8e4c79f82 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/common/ConstantExt.kt @@ -29,6 +29,9 @@ object ConstantExt { //天空盒模式 const val MAP_STYLE_VR_SKY_BOX = 10 + //高程数据模式 + const val MAP_STYLE_VR_BRIDGE= 100 + //漫游距离1公里 const val ROAM_DIS_1KM = 1000f //漫游距离3公里 @@ -54,11 +57,11 @@ object ConstantExt { const val MAP_STYLE_VR_ZOOM: Int = 20 //VR模式下的远视角 角度 - const val MAP_STYLE_VR_OVER_LOOK_ANGLE_FAR = 11.5f + const val MAP_STYLE_VR_OVER_LOOK_ANGLE_FAR = 13.5f //VR模式下的远视角 缩放值 const val MAP_STYLE_VR_ZOOM_VAL_FAR = 1f //VR模式下的远视角 高度 - const val MAP_STYLE_VR_EYE_HEIGHT_FAR = 40f + const val MAP_STYLE_VR_EYE_HEIGHT_FAR = 30f //VR模式下的近视角 角度 @@ -132,7 +135,7 @@ object ConstantExt { const val MAP_STYLE_VR_EYE_HEIGHT_TRANS = 30f //天空盒模式 - const val MAP_STYLE_VR_OVER_LOOK_ANGLE_SKYBOX = 28f//视角 + const val MAP_STYLE_VR_OVER_LOOK_ANGLE_SKYBOX = 13f//视角 const val MAP_STYLE_VR_ZOOM_VAL_SKYBOX = 0.8f//缩放 const val MAP_STYLE_VR_EYE_HEIGHT_SKYBOX = 12f//高度 @@ -155,6 +158,12 @@ object ConstantExt { //VR模式下的中视角视域 const val MAP_STYLE_VR_VIEW_FIELD_ANGLE_MIDDLE = 20f + //VR模式下的高程数据视角 + const val MAP_STYLE_VR_POSITION_BRIDGE = 2.6f + const val MAP_STYLE_VR_OVER_LOOK_ANGLE_BRIDGE = 12.3f + const val MAP_STYLE_VR_ZOOM_VAL_BRIDGE = 0.8f + const val MAP_STYLE_VR_EYE_HEIGHT_BRIDGE = 20f + //设置天气 const val WEATHER = "wheatherType" @@ -173,6 +182,7 @@ object ConstantExt { const val PLANE = "planeUseTex" const val BLUR = "blur" const val STREET_LIGHT = "isStreetLightEffectEnable" + const val BRIDGE = "show_bridge" //地图视角测试 //地图测试视角角度 diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/controller/MapEventController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/controller/MapEventController.kt index 6c5aee2306..ba6563c47b 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/controller/MapEventController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/controller/MapEventController.kt @@ -104,7 +104,7 @@ class MapEventController(): IEventController { mCameraChangeListenerList?.remove(cameraChangeListener) } - override fun dispatchCameraChangeListener(type: Int, value: Int){ + override fun dispatchCameraChangeListener(type: Int, value: Float){ mCameraChangeListenerList?.let { for(listener in it){ listener.onCameraChange(type, value) @@ -404,7 +404,7 @@ class MapEventController(): IEventController { } - override fun dispatchMapStatusListener(type:Int, value: Int){ + override fun dispatchMapStatusListener(type:Int, value: Float){ when(type){ MapAutoApi.LISTENER_TYPE_FOCUS->{ mFocusListenerList?.let { @@ -566,4 +566,12 @@ class MapEventController(): IEventController { } } } + + override fun getRoadInfoListenerList(): ArrayList? { + return mRoadInfoListenerList + } + + override fun getRoadSideFenceRegionListener(): ArrayList? { + return mRoamRegionListenerList + } } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/location/LocationHelper.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/location/LocationHelper.kt index 800c243ace..0792686626 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/location/LocationHelper.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/location/LocationHelper.kt @@ -50,7 +50,7 @@ class LocationHelper( ) } else { it.setAnimMarkerRes( - R.raw.guangquan_day, + R.raw.guangquan, MyLocationStyle.ANIM_WAIT_FRAME_DAY, MyLocationStyle.ANIM_PERIOD_DAY ) diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt index 815dcdfe3c..28bd02a954 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt @@ -83,6 +83,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie private var roadLineTimeJob: Job? = null private var roamJob: Job? = null private var transJob: Job? = null + private var skyJob: Job? = null private var zoomJob: Job? = null private var styleJob: Job? = null private var destLonLatPoint: LonLatPoint? = null @@ -262,7 +263,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } override fun lookUpDown() { - dispatchDAngleChanged() + dispatchDAngleChanged(getDAngle()) } override fun zoomIn() { @@ -681,8 +682,11 @@ class MapController(private var context: Context?, private val mMapView: IMapVie // lis.onMapStatusChangeListener(LISTENER_TYPE_ROTATE, rotateAngle.toInt()) // } // } - mEventController?.dispatchMapStatusListener(LISTENER_TYPE_ROTATE, rotateAngle.toInt()) - mEventController?.dispatchCameraChangeListener(LISTENER_TYPE_ROTATE, rotateAngle.toInt()) + if (DEBUG) { + Log.d(TAG, "styleop-dispatchRotationAngleChanged: $rotateAngle") + } + mEventController?.dispatchMapStatusListener(LISTENER_TYPE_ROTATE, rotateAngle) + mEventController?.dispatchCameraChangeListener(LISTENER_TYPE_ROTATE, rotateAngle) } //焦点变化时的事件 @@ -693,24 +697,27 @@ class MapController(private var context: Context?, private val mMapView: IMapVie // lis.onMapStatusChangeListener(LISTENER_TYPE_FOCUS, 0) // } // } - mEventController?.dispatchMapStatusListener(LISTENER_TYPE_FOCUS, 0) - mEventController?.dispatchCameraChangeListener(LISTENER_TYPE_FOCUS, 0) + if (DEBUG) { + Log.d(TAG, "styleop-dispatchFocusChanged") + } + mEventController?.dispatchMapStatusListener(LISTENER_TYPE_FOCUS, 0f) + mEventController?.dispatchCameraChangeListener(LISTENER_TYPE_FOCUS, 0f) } - override fun dispatchZoomChanged() { + override fun dispatchZoomChanged(zoomIndex: Float) { if(!isSurfaceCreated()) { return } setMarkerScale() - val currentZoom = getZoom() + val currentZoom = zoomIndex if (DEBUG) { Log.d(TAG, "styleop--dispatchZoomChanged: currentZoom:${currentZoom},lastZoom:${lastZoom} ${mMapView.isTouching()}") } - if (currentZoom == lastZoom) { + if (currentZoom.toInt() == lastZoom) { return }else{ - lastZoom = currentZoom + lastZoom = currentZoom.toInt() //TODO 暂时去掉无用的逻辑 // mMapView.ClearAllTmcLines() } @@ -763,8 +770,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } //车辆摆动变化事件 - override fun dispatchDAngleChanged() { - val angle = getDAngle().toInt() + override fun dispatchDAngleChanged(angle: Float) { if (DEBUG) { Log.d(TAG, "styleop-DAngle: $angle") } @@ -916,6 +922,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie withContext(Dispatchers.Main) { mEventController?.dispatchMapStyleListener(stylemode) } + mMapView.getMapEngine().onChangeStyle(stylemode); } } @@ -986,7 +993,15 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } mMapStyleParams.setVrPerspectiveMode(arrays[0]) mMapStyleParams.setVrEyeHeight(arrays[1]) + if(mMapStyleParams.getVrAngleMode()==ConstantExt.MAP_STYLE_VR_BRIDGE){ + var fac = 100.0f/(arrays[0]*8f)/20f + var lookAtZ = alt + 5.0f + var cameraHeight = arrays[2] + lookAtZ + arrays[2]=cameraHeight*fac; + mMapView.getMapEngine().setScreenToOriginDis(lookAtZ*fac) + } if (lastAnimZoom == arrays[0] && lastOverLookAngle == arrays[1] && lastEyeHeight == arrays[2]) { + mMapView.getMapEngine() .animateTo(lon, lat, alt, -1f, rotateAngle, -1f, -1f, mDuration, -1f) } else { @@ -1302,6 +1317,7 @@ class MapController(private var context: Context?, private val mMapView: IMapVie mEventController?.dispatchRoamStatusListener(3, "切换视角结束漫游：$type") } transJob?.cancel() + skyJob?.cancel() //还原漫游模式状态结束 if (!mLockLocation.getLockCar() && type != ConstantExt.MAP_STYLE_VR_ROAM) { mLockLocation.setLockCar(true) @@ -1310,6 +1326,9 @@ class MapController(private var context: Context?, private val mMapView: IMapVie mMapView.getMapEngine().setCfgKeyVal(ConstantExt.FOG, "disable") mMapView.getMapEngine().setCfgKeyVal(ConstantExt.SKYBOX, "disable") } + if(type != ConstantExt.MAP_STYLE_VR_BRIDGE){ + mMapView.getMapEngine().setCfgKeyVal(ConstantExt.BRIDGE, "disable") + } // mMapView.setIsFarViewAngel(false) when (type) { ConstantExt.MAP_STYLE_VR_ANGLE_MIDDLE -> { @@ -1343,9 +1362,20 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } ConstantExt.MAP_STYLE_VR_SKY_BOX -> { -// mMapView.getMapEngine().setCfgKeyVal("isSkyBoxFastChange", "disable") - mMapView.getMapEngine().setCfgKeyVal(ConstantExt.FOG, "enable") - mMapView.getMapEngine().setCfgKeyVal(ConstantExt.SKYBOX, "enable") + skyJob = getDemaningScope()?.launch(Dispatchers.IO) { + interpolation( + ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_SKYBOX, + ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_SKYBOX, + ConstantExt.MAP_STYLE_VR_ZOOM_VAL_SKYBOX, + ConstantExt.MAP_STYLE_VR_SKY_BOX, + -1 + ) + delay(1000) + mMapView.getMapEngine().setCfgKeyVal("isSkyBoxFastChange", "disable") + mMapView.getMapEngine().setCfgKeyVal(ConstantExt.FOG, "enable") + mMapView.getMapEngine().setCfgKeyVal(ConstantExt.SKYBOX, "enable") + } +// } ConstantExt.MAP_STYLE_VR_ANGLE_FAR -> { @@ -1466,6 +1496,18 @@ class MapController(private var context: Context?, private val mMapView: IMapVie } } + + ConstantExt.MAP_STYLE_VR_BRIDGE->{ + mMapView.getMapEngine().setCfgKeyVal(ConstantExt.BRIDGE, "enable") + interpolation( + ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_BRIDGE, + ConstantExt.MAP_STYLE_VR_OVER_LOOK_ANGLE_BRIDGE, + ConstantExt.MAP_STYLE_VR_ZOOM_VAL_BRIDGE, + ConstantExt.MAP_STYLE_VR_BRIDGE, + -1 + ) + + } } if(type != ConstantExt.MAP_STYLE_VR_ROAM) { mEventController?.dispatchMapViewVisualAngleChangeListener(type) @@ -1982,6 +2024,9 @@ class MapController(private var context: Context?, private val mMapView: IMapVie zoomJob?.cancel() zoomJob = null + skyJob?.cancel() + skyJob = null + isRoam.set(false) roamDis = 0.0 diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapStyleHelper.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapStyleHelper.kt index f67451a500..e0d6331781 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapStyleHelper.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapStyleHelper.kt @@ -19,7 +19,7 @@ object MapStyleHelper { private val TAG = javaClass.simpleName //更新样式时版本+1 - val currentStyleVersion = 65 + val currentStyleVersion = 66 private var copyJob:Job? = null diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapZoomAdjuster.java b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapZoomAdjuster.java index 2125d14809..5eafb6642b 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapZoomAdjuster.java +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapZoomAdjuster.java @@ -42,14 +42,14 @@ public class MapZoomAdjuster implements MapStatusListener { } @Override - public void onMapStatusChanged(int type, int value) { + public void onMapStatusChanged(int type, float value) { if (MapController.LISTENER_TYPE_ZOOM == type) { adjustZoomChange(value, 10); } } - void adjustZoomChange(int value, int delaysecond) { + void adjustZoomChange(float value, int delaysecond) { if (mMapMode >= NAVMODE && mFollowCarMode && value != NAVZOOMLEVEL) { cancelAdjustZoomChange(); mNaviControllerHandler.sendEmptyMessageDelayed(MSG_ZOOM_CHANGED, 1000*delaysecond); /* delay 10s */ diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/DirectionLayer.java b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/DirectionLayer.java index 985a9eb154..ce15abe9ca 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/DirectionLayer.java +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/DirectionLayer.java @@ -112,7 +112,7 @@ public class DirectionLayer extends ImageView implements MapStatusListener { return true; } @Override - public void onMapStatusChanged(int type, int value) { + public void onMapStatusChanged(int type, float value) { postInvalidate(); } diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelBtnScale.java b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelBtnScale.java index b82e4d6338..926b61f630 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelBtnScale.java +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PanelBtnScale.java @@ -84,7 +84,7 @@ public class PanelBtnScale extends Panel implements MapStatusListener { if(mMapController.getEventController() != null){ mMapController.getEventController().addMapStatusListener(this, MapController.LISTENER_TYPE_ZOOM); } - mMapController.dispatchZoomChanged(); + mMapController.dispatchZoomChanged(mMapController.getZoom()); } @@ -145,7 +145,7 @@ public class PanelBtnScale extends Panel implements MapStatusListener { } @Override - public void onMapStatusChanged(int type, int value) { + public void onMapStatusChanged(int type, float value) { if(mMapController ==null){ return; } diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PolyLineView.java b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PolyLineView.java index 94add385d7..7c6c341c02 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PolyLineView.java +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/panel/PolyLineView.java @@ -175,7 +175,7 @@ public class PolyLineView extends View implements MapStatusListener { @Override - public void onMapStatusChanged(int type, int value) { + public void onMapStatusChanged(int type, float value) { invalidate(); } } 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 3cee1dd301..3fe85ab91f 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 @@ -12,6 +12,15 @@ import com.zhidaoauto.map.data.road.RoadRect import com.zhidaoauto.map.data.road.RoadRectInfos import com.zhidaoauto.map.data.road.RoadSign import com.zhidaoauto.map.data.road.RoadSignPostion +import com.zhidaoauto.map.data.road.RouteCamera +import com.zhidaoauto.map.data.road.RouteLane +import com.zhidaoauto.map.data.road.RouteLine +import com.zhidaoauto.map.data.road.RoutePath +import com.zhidaoauto.map.data.road.RouteRsu +import com.zhidaoauto.map.data.road.RouteStep +import com.zhidaoauto.map.data.road.RouteStopLine +import com.zhidaoauto.map.data.road.RouteTrafficLight +import com.zhidaoauto.map.data.road.RouteZebraLine import com.zhidaoauto.map.data.road.SinglePointRoadInfo import com.zhidaoauto.map.data.road.StopLine import com.zhidaoauto.map.data.road.ZebraLine @@ -31,6 +40,7 @@ import com.zhidaoauto.map.sdk.open.city.CityCodeModel import com.zhidaoauto.map.sdk.open.city.CityCodeResult import com.zhidaoauto.map.sdk.open.data.CityInfo import com.zhidaoauto.map.sdk.open.data.MapDataApi +import com.zhidaoauto.map.sdk.open.tools.MapTools import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.delay @@ -1118,7 +1128,6 @@ class RoadHelper private constructor() { return } - cancelCacheHDData() cacheList.add(id) cacheHDDataByCity(id,false,object : IResult { @@ -1239,6 +1248,168 @@ class RoadHelper private constructor() { } } + fun getRouteInfo(routeList : ArrayList , call:IResult){ + var key = StringBuffer("llaGetRoutePath_") + for(lonlat in routeList){ + key.append("${lonlat.longitude.toTenDecimalsStr()}_${lonlat.latitude.toTenDecimalsStr()}_") + + } + key.append("${RoadResultController.CANCELTAG}false") + RoadResultController.instance.addRoadResultListener(key.toString(),object :IRoadData{ + override fun result(code: Int, result: ByteArray?) { + if (CompileConfig.DEBUG) { + Log.d(TAG, "roadop--getRouteInfo--code:${code},result: $result") + } + if (result?.isEmpty() == true) { + call.result(1, null) + return + } + result?.let { + val buf = ByteBufferHelper.bytes2ByteBuffer(result) + buf?.let { + val routePath = RoutePath() + val list = ArrayList() + val size = buf.int + for(i in 0 until size){ + val routeStep = RouteStep() + routeStep.id = buf.long.toInt() + routeStep.tileId = buf.int + routeStep.type = buf.int + routeStep.name = ByteBufferHelper.buf2Str(buf)?:"" + routeStep.limitSpeed = buf.int + val routeLane = RouteLane() + routeLane.laneId = buf.int + routeLane.laneWidth = buf.long/1e8.toFloat() + val lonLatSize = buf.int + val lonlats = ArrayList() + for(j in 0 until lonLatSize step 2){ + val lonLatPoint = LonLatPoint(buf.long /1e8, buf.long /1e8) + lonlats.add(lonLatPoint) + } + routeLane.lanePoints = lonlats + routeStep.lanes = routeLane + val crossSize = buf.int + val crossPoints = ArrayList() + for(k in 0 until crossSize step 2){ + val lonLatPoint = LonLatPoint(buf.long /1e8, buf.long /1e8) + crossPoints.add(lonLatPoint) + } + routeStep.points = crossPoints + val stopLines = ArrayList() + val stopLines_size = buf.int + for(m in 0 until stopLines_size) { + val stopLine = RouteStopLine() + stopLine.length = buf.long / 1e8 + val stopSize = buf.int + val stopPoints = ArrayList() + for (l in 0 until stopSize step 2) { + val lonLatPoint = LonLatPoint(buf.long / 1e8, buf.long / 1e8) + stopPoints.add(lonLatPoint) + } + stopLine.stopLinePoints = stopPoints + stopLines.add(stopLine) + } + routeStep.stopLine = stopLines + + var zebraLines = ArrayList() + val zebraLine_size = buf.int + for(m in 0 until zebraLine_size){ + val routeZebraLine = RouteZebraLine() + routeZebraLine.id = buf.int + routeZebraLine.dis = buf.long/1e8.toFloat() + val zebraLine_pts = buf.int + val zebraLinePoints = ArrayList() + for(n in 0 until zebraLine_pts step 2){ + val lonLatPoint = LonLatPoint(buf.long /1e8, buf.long /1e8) + zebraLinePoints.add(lonLatPoint) + } + routeZebraLine.zebraLinePoints = zebraLinePoints + zebraLines.add(routeZebraLine) + } + routeStep.zebraLines = zebraLines + + var trafficLights = ArrayList() + val trafficLight_size = buf.int + for(o in 0 until trafficLight_size){ + val routeTrafficLight = RouteTrafficLight() + routeTrafficLight.id = buf.int + routeTrafficLight.type = buf.int + routeTrafficLight.shape = buf.int + val trafficLight_pts = buf.int + val trafficLightPoints = ArrayList() + for(p in 0 until trafficLight_pts step 2){ + val lonLatPoint = LonLatPoint(buf.long /1e8, buf.long /1e8) + trafficLightPoints.add(lonLatPoint) + } + routeTrafficLight.trafficLightPoints = trafficLightPoints + trafficLights.add(routeTrafficLight) + } + routeStep.trafficLights = trafficLights + + var cameras = ArrayList() + val camera_size = buf.int + for(q in 0 until camera_size){ + val routeCamera = RouteCamera() + routeCamera.id = buf.int + routeCamera.type = buf.int + routeCamera.shape = buf.int + val camera_pts = buf.int + val cameraPoints = ArrayList() + for(r in 0 until camera_pts step 2){ + val lonLatPoint = LonLatPoint(buf.long /1e8, buf.long /1e8) + cameraPoints.add(lonLatPoint) + } + routeCamera.cameraPoints = cameraPoints + cameras.add(routeCamera) + } + routeStep.cameras = cameras + + var rsus = ArrayList() + val rsu_size = buf.int + for(s in 0 until rsu_size){ + val routeRsu = RouteRsu() + routeRsu.id = buf.long.toInt() + routeRsu.type = buf.int + routeRsu.shape = buf.int + val routeRsu_pts = buf.int + val routeRsuPoints = ArrayList() + for(t in 0 until routeRsu_pts step 2){ + val lonLatPoint = LonLatPoint(buf.long /1e8, buf.long /1e8) + routeRsuPoints.add(lonLatPoint) + } + routeRsu.rsuPoints = routeRsuPoints + rsus.add(routeRsu) + } + routeStep.rsus = rsus + list.add(routeStep) + } + + if(list.isNotEmpty()){ + routePath.steps = list + if (CompileConfig.DEBUG) { + Log.d(TAG, "roadop--getRouteInfo--routePath:${routePath}") + } + call.result(0, routePath) + return + } + } + } + call.result(1,null) + + } + + }) + val data = MapTools.listToArray(routeList,false) + try { + mapBox.llaGetRoutePath(data) + }catch (e: Exception){ + if (CompileConfig.DEBUG) { + Log.e(TAG, e.toString()) + } + } + + } + fun isInRoadSideFenceRegion(lon: Double, lat: Double, call: IResult){ val time = System.currentTimeMillis() diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/HDTypes.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/HDTypes.kt index 9f4efab3c6..bc2d9a8daa 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/HDTypes.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/HDTypes.kt @@ -24,6 +24,7 @@ enum class HDTypes( area(19), //景点区域 regional(20), //人行步道 geometricLinear(21), //线区域，路测智能体等 - geometricSurface(22); //面区域，自行 + geometricSurface(22), //面区域，自行 + poi(23), } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt index a58df64a4c..88170ef2b1 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/MapAutoApi.kt @@ -31,7 +31,6 @@ import com.zhidaoauto.map.sdk.open.view.MapAutoView import io.netty.buffer.Unpooled import java.math.BigDecimal import java.nio.charset.Charset -import java.nio.charset.StandardCharsets import kotlin.math.abs import kotlin.math.pow @@ -57,6 +56,7 @@ object MapAutoApi { const val MAP_STYLE_VR_ROAM = 7 //漫游模式 const val MAP_STYLE_VR_TRANS = 8//过渡模式 const val MAP_STYLE_VR_ERHAI_B2 = 9//洱海模式 + const val MAP_STYLE_VR_SKY_BOX = 10 //天空盒模式 const val MAP_STYLE_VR_ANGLE_NEAR = 0 const val MAP_STYLE_VR_ANGLE_MIDDLE = 1 @@ -521,13 +521,13 @@ object MapAutoApi { val byteBuffer = Unpooled.buffer() val str = "1111112345678sjkfdhdkb" byteBuffer.writeInt(str.length) - byteBuffer.writeCharSequence(str, StandardCharsets.UTF_8) + byteBuffer.writeCharSequence(str, Charset.forName("utf-8")) byteBuffer.writeBoolean(true) byteBuffer.writeInt(999) byteBuffer.writeInt(12) val length = byteBuffer.readInt() println("$length") - println("${byteBuffer.readCharSequence(length, StandardCharsets.UTF_8)}") + println("${byteBuffer.readCharSequence(length, Charset.forName("utf-8"))}") println("${byteBuffer.readBoolean()}") println("${byteBuffer.readInt()}") diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/NavAutoApi.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/NavAutoApi.kt index 50364bbdad..c0457b824d 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/NavAutoApi.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/NavAutoApi.kt @@ -12,7 +12,6 @@ import com.zhidaoauto.map.sdk.inner.utils.Recorder import io.netty.buffer.Unpooled import java.math.BigDecimal import java.nio.charset.Charset -import java.nio.charset.StandardCharsets import kotlin.math.pow object NavAutoApi { @@ -168,13 +167,13 @@ object NavAutoApi { val byteBuffer = Unpooled.buffer() val str = "1111112345678sjkfdhdkb" byteBuffer.writeInt(str.length) - byteBuffer.writeCharSequence(str, StandardCharsets.UTF_8) + byteBuffer.writeCharSequence(str, Charset.forName("utf-8")) byteBuffer.writeBoolean(true) byteBuffer.writeInt(999) byteBuffer.writeInt(12) val length = byteBuffer.readInt() println("$length") - println("${byteBuffer.readCharSequence(length, StandardCharsets.UTF_8)}") + println("${byteBuffer.readCharSequence(length, Charset.forName("utf-8"))}") println("${byteBuffer.readBoolean()}") println("${byteBuffer.readInt()}") } diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/abs/MapStatusListener.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/abs/MapStatusListener.kt index be2ff38858..e71eb06695 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/abs/MapStatusListener.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/abs/MapStatusListener.kt @@ -7,5 +7,5 @@ package com.zhidaoauto.map.sdk.open.abs * @param value 当前状态值 */ interface MapStatusListener { - fun onMapStatusChanged(type: Int, value: Int) + fun onMapStatusChanged(type: Int, value: Float) } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/abs/OnCameraChangeListener.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/abs/OnCameraChangeListener.kt index c1d314f36a..8511b66536 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/abs/OnCameraChangeListener.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/abs/OnCameraChangeListener.kt @@ -4,7 +4,7 @@ import com.zhidaoauto.map.sdk.open.camera.CameraPosition interface OnCameraChangeListener { - fun onCameraChange(type:Int,value:Int) + fun onCameraChange(type:Int,value:Float) fun onCameraChangeFinish(position: CameraPosition?) } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/data/MapDataApi.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/data/MapDataApi.kt index c920c014a7..6f2c99e798 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/data/MapDataApi.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/data/MapDataApi.kt @@ -13,6 +13,7 @@ import com.zhidaoauto.map.data.road.Lane import com.zhidaoauto.map.data.road.RoadCross import com.zhidaoauto.map.data.road.RoadNameInfo import com.zhidaoauto.map.data.road.RoadRectInfos +import com.zhidaoauto.map.data.road.RoutePath import com.zhidaoauto.map.data.road.SinglePointRoadInfo import com.zhidaoauto.map.data.road.StopLine import com.zhidaoauto.map.data.road.ZebraLine @@ -83,13 +84,6 @@ object MapDataApi { } - fun getRouteInfo( - centerLon: Float, - centerLat: Float, coor: Int, type: Int - ): String { - Recorder.add("roadop-getRouteInfo:$centerLon,$centerLat,$coor,$type") - return RoadHelper.getInstance()?.getRoadInfo(centerLon, centerLat, coor, type)?:"" - } /** * 获取道路关键点数据 @@ -394,6 +388,10 @@ object MapDataApi { } + fun getRouteInfo(routeList : ArrayList,call:IResult ){ + RoadHelper.getInstance()?.getRouteInfo(routeList,call) + } + diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/exception/MapException.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/exception/MapException.kt index e574d31a05..6c27fecd6d 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/exception/MapException.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/exception/MapException.kt @@ -41,7 +41,7 @@ class MapException : Exception { } private fun init(msg: String) { - if ("用户签名未通过" == msg) { + if ("用户签名错误" == msg) { errorCode = 1001 } else if ("用户key不正确或过期" == msg) { errorCode = 1002 @@ -146,7 +146,7 @@ class MapException : Exception { companion object { const val CODE_AMAP_SUCCESS = 1000 - const val AMAP_SIGNATURE_ERROR = "用户签名未通过" + const val AMAP_SIGNATURE_ERROR = "用户签名错误" const val AMAP_INVALID_USER_KEY = "用户key不正确或过期" const val AMAP_SERVICE_NOT_AVAILBALE = "请求服务不存在" const val AMAP_DAILY_QUERY_OVER_LIMIT = "访问已超出日访问量" diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerCacheController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerCacheController.kt index cc5f5f70e2..889d42f666 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerCacheController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerCacheController.kt @@ -222,6 +222,7 @@ class MarkerCacheController(private val mapAutoView: MapAutoView) { markerSimpleData.color = markerOptions.color markerSimpleData.text = markerOptions.text markerSimpleData.status = markerOptions.status + markerSimpleData.grayScale = markerOptions.grayScale if (preMarkerMap.containsKey(id)) { // pre data @@ -275,6 +276,7 @@ class MarkerCacheController(private val mapAutoView: MapAutoView) { tempSimpleData.color = markerSimpleData.color tempSimpleData.text = markerSimpleData.text tempSimpleData.status = markerSimpleData.status + tempSimpleData.grayScale = markerSimpleData.grayScale var tempList = interpolationDataSetMap[time] if (tempList == null) { tempList = ArrayList() diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerController.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerController.kt index 3b4dc16aec..4af81a5992 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerController.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerController.kt @@ -165,6 +165,7 @@ class MarkerController(mapController: IMapController) : IMarkerController { .append(markerOption.color).append(",") .append(markerOption.text.trim()).append(",") .append(markerOption.status).append(",") + .append(markerOption.grayScale).append(",") } if(otherBuffer.length>1){ otherBuffer.deleteCharAt(otherBuffer.length-1) diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerOptions.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerOptions.kt index 9bb2870e28..61cba0d860 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerOptions.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerOptions.kt @@ -114,6 +114,8 @@ class MarkerOptions { var changeColorAngle: Float = 0f + var mixColor = 0 //是否混合颜色 0 不混合 1 混合 + private var icons: ArrayList = ArrayList() var averageFlag: Int = 1 @@ -194,6 +196,11 @@ class MarkerOptions { return this } + fun setMixColor(isMixColor: Int): MarkerOptions{ + this.mixColor = isMixColor + return this + } + fun updateInfowindowBitmap(markerInfoBitmap: BitmapDescriptor,mapController: IMapController?): MarkerOptions { val markerInfoView = markerInfoBitmap.getBytes() diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerSimpleData.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerSimpleData.kt index f59775ebbd..fd59cefb33 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerSimpleData.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/marker/MarkerSimpleData.kt @@ -26,6 +26,8 @@ class MarkerSimpleData { var text: String = "" //状态 var status: Int = 0 + //置灰 + var grayScale: Int = 0 diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/nav/view/DirectionView.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/nav/view/DirectionView.kt index 3ae74ea0a6..f7acdbfa72 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/nav/view/DirectionView.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/nav/view/DirectionView.kt @@ -45,7 +45,7 @@ class DirectionView: ImageView, MapStatusListener { } - override fun onMapStatusChanged(type: Int, value: Int) { + override fun onMapStatusChanged(type: Int, value: Float) { postInvalidate() } 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 337ce4756b..2b07edd8db 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 @@ -955,100 +955,114 @@ open class MapAutoView : FrameLayout, LonLatPointListener, ITraffic,ILockLocatio } private fun getRoadInfo(mogoLocation: MogoLocation) { - if (System.currentTimeMillis() - mLastTimeRoadInfo > mIntervalTimeRoadInfo) { - mLastTimeRoadInfo = System.currentTimeMillis() - mLastRoadLonLatPoint?.let { - if(CompileConfig.DEBUG){ - Log.i(TAG, "roadop--cancelTask last: $mLastRoadLonLatPoint") - } - //发现有任务堆积时（100米为超参，按照常识5秒内未返回数据），取消之前道路相关任务 - if(MapTools.getDistance(it.latitude,it.longitude,mogoLocation.lat,mogoLocation.lon) > 100.0){ - if(CompileConfig.DEBUG){ - Log.i(TAG, "roadop--cancelTask:distance>200 : $mLastRoadLonLatPoint") + if(mEventController?.getRoadInfoListenerList()?.size?:0 > 0) { + if (System.currentTimeMillis() - mLastTimeRoadInfo > mIntervalTimeRoadInfo) { + mLastTimeRoadInfo = System.currentTimeMillis() + mLastRoadLonLatPoint?.let { + if (CompileConfig.DEBUG) { + Log.i(TAG, "roadop--cancelTask last: $mLastRoadLonLatPoint") + } + //发现有任务堆积时（100米为超参，按照常识5秒内未返回数据），取消之前道路相关任务 + if (MapTools.getDistance( + it.latitude, + it.longitude, + mogoLocation.lat, + mogoLocation.lon + ) > 100.0 + ) { + if (CompileConfig.DEBUG) { + Log.i(TAG, "roadop--cancelTask:distance>200 : $mLastRoadLonLatPoint") + } + // 取消任务 + RoadHelper.getInstance()?.cancelTask() } - // 取消任务 - RoadHelper.getInstance()?.cancelTask() } - } // mLastRoadLonLatPoint = LonLatPoint(mogoLocation.lon,mogoLocation.lat) - // 获取车道中心线数据 - RoadHelper.getInstance()?.getCenterLine( - mogoLocation.lon, - mogoLocation.lat, - mogoLocation.heading.toFloat(), - true, - object : - IResult { - override fun result(code: Int, result: CenterLine?) { - mLastRoadLonLatPoint = LonLatPoint(mogoLocation.lon,mogoLocation.lat) - mEventController?.dispatchRoadIdInfo( - result?.road_id, - result?.lane_id - ) - } - }) - RoadHelper.getInstance()?.getStopLine( - mogoLocation.lon, - mogoLocation.lat, - mogoLocation.heading.toFloat(), - true, - object : IResult { - override fun result(code: Int, result: StopLine?) { - mEventController?.dispatchStopLineInfo(result) - } + // 获取车道中心线数据 + RoadHelper.getInstance()?.getCenterLine( + mogoLocation.lon, + mogoLocation.lat, + mogoLocation.heading.toFloat(), + true, + object : + IResult { + override fun result(code: Int, result: CenterLine?) { + mLastRoadLonLatPoint = LonLatPoint(mogoLocation.lon, mogoLocation.lat) + mEventController?.dispatchRoadIdInfo( + result?.road_id, + result?.lane_id + ) + } + }) + RoadHelper.getInstance()?.getStopLine( + mogoLocation.lon, + mogoLocation.lat, + mogoLocation.heading.toFloat(), + true, + object : IResult { + override fun result(code: Int, result: StopLine?) { + mEventController?.dispatchStopLineInfo(result) + } - }) - RoadHelper.getInstance()?.getCrossRoad( - mogoLocation.lon, - mogoLocation.lat, - mogoLocation.heading.toFloat(), - true, - object : IResult { - override fun result(code: Int, result: RoadCross?) { - mEventController?.dispatchRoadCrossInfo(result) - } + }) + RoadHelper.getInstance()?.getCrossRoad( + mogoLocation.lon, + mogoLocation.lat, + mogoLocation.heading.toFloat(), + true, + object : IResult { + override fun result(code: Int, result: RoadCross?) { + mEventController?.dispatchRoadCrossInfo(result) + } - }) + }) + } } } private fun isInRoadSideFenceRegion(mogoLocation: MogoLocation) { - if (System.currentTimeMillis() - mLastTimeRoadSideFence > mIntervalTimeRoadSideFence) { - mLastTimeRoadSideFence = System.currentTimeMillis() - mLastRoadSideFenceLonLatPoint?.let { - if (CompileConfig.DEBUG) { - Log.i(TAG, "roadSideFence--op--cancelTask last: $mLastRoadSideFenceLonLatPoint") - } - //发现有任务堆积时（100米为超参，按照常识5秒内未返回数据），取消之前道路相关任务 - if (MapTools.getDistance( - it.latitude, - it.longitude, - mogoLocation.lat, - mogoLocation.lon - ) > 100.0 - ) { + if(mEventController?.getRoadSideFenceRegionListener()?.size?:0 > 0) { + if (System.currentTimeMillis() - mLastTimeRoadSideFence > mIntervalTimeRoadSideFence) { + mLastTimeRoadSideFence = System.currentTimeMillis() + mLastRoadSideFenceLonLatPoint?.let { if (CompileConfig.DEBUG) { - Log.i(TAG, "roadop--cancelTask:distance>200 : $mLastRoadLonLatPoint") + Log.i( + TAG, + "roadSideFence--op--cancelTask last: $mLastRoadSideFenceLonLatPoint" + ) } - // 取消任务 - RoadHelper.getInstance()?.cancelTask() - } - } - RoadHelper.getInstance()?.isInRoadSideFenceRegion( - mogoLocation.lon, - mogoLocation.lat, - object : IResult { - override fun result(code: Int, result: Int?) { - mLastRoadSideFenceLonLatPoint = LonLatPoint(mogoLocation.lon,mogoLocation.lat) - result?.let { - mEventController?.dispatchRoadSideFenceRegionListener(it) + //发现有任务堆积时（100米为超参，按照常识5秒内未返回数据），取消之前道路相关任务 + if (MapTools.getDistance( + it.latitude, + it.longitude, + mogoLocation.lat, + mogoLocation.lon + ) > 100.0 + ) { + if (CompileConfig.DEBUG) { + Log.i(TAG, "roadop--cancelTask:distance>200 : $mLastRoadLonLatPoint") } + // 取消任务 + RoadHelper.getInstance()?.cancelTask() } - }) + } + RoadHelper.getInstance()?.isInRoadSideFenceRegion( + mogoLocation.lon, + mogoLocation.lat, + object : IResult { + override fun result(code: Int, result: Int?) { + mLastRoadSideFenceLonLatPoint = + LonLatPoint(mogoLocation.lon, mogoLocation.lat) + result?.let { + mEventController?.dispatchRoadSideFenceRegionListener(it) + } + } + }) + } } } override fun getCurrentLonLatPoint(): LonLatPoint { diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt index 5c973e3cf9..4e939c21a9 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt @@ -42,10 +42,10 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置地图的刷新状态以及频率 * @param enableSync */ - fun setRenderFrequency(enableSync: Boolean,renderTimePer:Int){ + fun setRenderFrequency(enableSync: Boolean, renderTimePer: Int) { mMapAutoView.getClerk()?.add("$enableSync,$renderTimePer") mMapAutoView.getMapController()?.setRenderFrequency( - enableSync,renderTimePer + enableSync, renderTimePer ) } @@ -53,9 +53,9 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置在车在屏幕的相对位置 * @param param defult = 4 range (1..6) 设置自车位置 offset 1.0-6.0， <4.0车向上，>4.0车向下 */ - fun setSelfCarPosition(param:Float){ + fun setSelfCarPosition(param: Float) { mMapAutoView.getClerk()?.add("$param") - var overAngle = (getMapDAngle())?:6.5f + var overAngle = (getMapDAngle()) ?: 6.5f mMapAutoView.getMapController()?.setScreenToOriginDis(param) overAngle += 0.01f setMapDAngle(overAngle) @@ -70,7 +70,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * @param screenToOrigin defult = 4 */ @Deprecated(message = "dead") - fun setEyePosition(eyeToOrigin:Float,screenToOrigin:Float){ + fun setEyePosition(eyeToOrigin: Float, screenToOrigin: Float) { mMapAutoView.getClerk()?.add("$eyeToOrigin,$screenToOrigin") mMapAutoView.getMapController()?.setEyeToOriginDis(eyeToOrigin) mMapAutoView.getMapController()?.setScreenToOriginDis(screenToOrigin) @@ -186,7 +186,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { } mMapAutoView.getClerk()?.add() mMapAutoView.getMapController()?.zoomIn() - mMapAutoView.getMapController()?.dispatchZoomChanged() + mMapAutoView.getMapController()?.dispatchZoomChanged(getZoom().toFloat()) } /** @@ -196,7 +196,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { */ fun getZoom(): Int { mMapAutoView.getClerk()?.add() - return mMapAutoView.getMapController()?.getZoom()?: 16 + return mMapAutoView.getMapController()?.getZoom() ?: 16 } @@ -233,7 +233,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { */ fun setVrEyeHeight(eyeHeight: Float) { mMapAutoView.getClerk()?.add() - mMapAutoView.getMapController()?.interpolation(eyeHeight,-1f, -1f, -1, -1) + mMapAutoView.getMapController()?.interpolation(eyeHeight, -1f, -1f, -1, -1) } @@ -248,24 +248,31 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * @param mDuration 动画时长 * @param isGPS 是否wgs84坐标系 */ - fun animateTo( lon: Double, - lat: Double, - zoom: Float, - rotateAngle: Float, - overlookAngle: Float, - eyeHeight: Float, - mDuration:Int, - isGPS: Boolean) { - if(CompileConfig.DEBUG){ - Log.i(TAG,"animateTo:lon:${lon},lat:${lat},zoom:${zoom},rotateAngle:${rotateAngle},overlookAngle:${overlookAngle},mDuration:${mDuration}") + fun animateTo( + lon: Double, + lat: Double, + zoom: Float, + rotateAngle: Float, + overlookAngle: Float, + eyeHeight: Float, + mDuration: Int, + isGPS: Boolean + ) { + if (CompileConfig.DEBUG) { + Log.i( + TAG, + "animateTo:lon:${lon},lat:${lat},zoom:${zoom},rotateAngle:${rotateAngle},overlookAngle:${overlookAngle},mDuration:${mDuration}" + ) } mMapAutoView.getClerk()?.add() mMapAutoView.getMapController()?.setStartFrame(zoom, overlookAngle, eyeHeight) - if(!isGPS) { - val lonLat = CommonProxy.getInstance().getLonLatProxy().switchLonLat(LonLatPoint(lon, lat)) - mMapAutoView.getMapController()?.animateTo(lonLat.lon, lonLat.lat, 0f,rotateAngle, mDuration) - }else{ - mMapAutoView.getMapController()?.animateTo(lon, lat, 0f,rotateAngle, mDuration) + if (!isGPS) { + val lonLat = + CommonProxy.getInstance().getLonLatProxy().switchLonLat(LonLatPoint(lon, lat)) + mMapAutoView.getMapController() + ?.animateTo(lonLat.lon, lonLat.lat, 0f, rotateAngle, mDuration) + } else { + mMapAutoView.getMapController()?.animateTo(lon, lat, 0f, rotateAngle, mDuration) } } @@ -278,18 +285,22 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * @param mDuration 动画时长 * @param isGPS 是否wgs84坐标系 */ - fun animateTo( lon: Double, - lat: Double, - rotateAngle: Float, - mDuration:Int, - isGPS: Boolean) { + fun animateTo( + lon: Double, + lat: Double, + rotateAngle: Float, + mDuration: Int, + isGPS: Boolean + ) { mMapAutoView.getClerk()?.add() mMapAutoView.getMapController()?.setStartFrame(-1f, -1f, -1f) - if(!isGPS) { - val lonLat = CommonProxy.getInstance().getLonLatProxy().switchLonLat(LonLatPoint(lon, lat)) - mMapAutoView.getMapController()?.animateTo(lonLat.lon, lonLat.lat, 0f, rotateAngle, mDuration) - }else{ - mMapAutoView.getMapController()?.animateTo(lon, lat, 0f, rotateAngle, mDuration) + if (!isGPS) { + val lonLat = + CommonProxy.getInstance().getLonLatProxy().switchLonLat(LonLatPoint(lon, lat)) + mMapAutoView.getMapController() + ?.animateTo(lonLat.lon, lonLat.lat, 0f, rotateAngle, mDuration) + } else { + mMapAutoView.getMapController()?.animateTo(lon, lat, 0f, rotateAngle, mDuration) } } @@ -300,7 +311,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * @param eyeHeight 眼睛高度 * @param mDuration 动画时长 */ - fun animateTo(zoom: Float, overlookAngle: Float, eyeHeight: Float, mDuration:Int) { + fun animateTo(zoom: Float, overlookAngle: Float, eyeHeight: Float, mDuration: Int) { mMapAutoView.getClerk()?.add() mMapAutoView.getMapController()?.interpolation(eyeHeight, overlookAngle, zoom, -1, -1) } @@ -317,7 +328,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { mMapAutoView.getMapController()?.setDAngle(angle) } - fun getMapDAngle(): Float?{ + fun getMapDAngle(): Float? { mMapAutoView.getClerk()?.add() return mMapAutoView.getMapController()?.getDAngle() } @@ -334,8 +345,14 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { mMapAutoView.getClerk()?.add() val center = getCenter() val lonLat = CommonProxy.getInstance().getLonLatProxy().switchLonLat(center) - mMapAutoView.getMapController()?.setStartFrame(-1f,-1f,-1f) - mMapAutoView.getMapController()?.animateTo(lonLat.lon, lonLat.lat, 0f, rotateAngle,ConstantExt.MAP_ANIM_DEFAULT_DURATION) + mMapAutoView.getMapController()?.setStartFrame(-1f, -1f, -1f) + mMapAutoView.getMapController()?.animateTo( + lonLat.lon, + lonLat.lat, + 0f, + rotateAngle, + ConstantExt.MAP_ANIM_DEFAULT_DURATION + ) } /** @@ -358,7 +375,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { */ fun getMapViewRotation(): Float { mMapAutoView.getClerk()?.add() - return mMapAutoView.getMapController()?.getRotateAngle() ?: 0.0f + return mMapAutoView.getMapController()?.getRotateAngle() ?: 0.0f } @@ -368,7 +385,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * @param mapPerspective 视图模式 1： 2D模式 2： 3D模式 3:车头向上 4:正北模式 * @param deviationAngle 正北模式地图偏转角度 默认0f */ - fun setMapViewPerspective(mapPerspective: Int,deviationAngle:Float = 0f) { + fun setMapViewPerspective(mapPerspective: Int, deviationAngle: Float = 0f) { mMapAutoView.getClerk()?.add() mMapAutoView.setDeviationAngle(deviationAngle) mMapAutoView.getMapController()?.getMapStyleParams()?.setPerspectiveMode(mapPerspective) @@ -383,7 +400,8 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { */ fun getMapViewPerspective(): Float { mMapAutoView.getClerk()?.add() - return mMapAutoView.getMapController()?.getMapViewPerspective() ?: MapAutoApi.MAP_PERSPECTIVE_2D.toFloat() + return mMapAutoView.getMapController()?.getMapViewPerspective() + ?: MapAutoApi.MAP_PERSPECTIVE_2D.toFloat() } /** @@ -393,7 +411,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { */ fun getRulerInfo(): Float { mMapAutoView.getClerk()?.add() - return mMapAutoView.getMapController()?.getRulerInfo() ?: 0.0f + return mMapAutoView.getMapController()?.getRulerInfo() ?: 0.0f } /** @@ -402,7 +420,8 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { fun clearSearchPoi() { mMapAutoView.getClerk()?.add() mMapAutoView.getMapController()?.clearSearchResult() - mMapAutoView.getPanelManager()?.setPanel(PanelManager.PANEL_WHAT_RESET, PanelManager.PANEL_MODE_PANEL_BTN_LEFT) + mMapAutoView.getPanelManager() + ?.setPanel(PanelManager.PANEL_WHAT_RESET, PanelManager.PANEL_MODE_PANEL_BTN_LEFT) } /** @@ -426,7 +445,8 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { */ fun getMapStyle(): Int { mMapAutoView.getClerk()?.add() - return mMapAutoView.getMapController()?.getMapStyleParams()?.getStyleMode()?:MapAutoApi.MAP_STYLE_NIGHT_VR + return mMapAutoView.getMapController()?.getMapStyleParams()?.getStyleMode() + ?: MapAutoApi.MAP_STYLE_NIGHT_VR } @@ -437,7 +457,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { fun getMyLocationEnabled(): Boolean { mMapAutoView.getClerk()?.add() - return mMapAutoView.getLocationView()?.getMyLocationEnabled()?:false + return mMapAutoView.getLocationView()?.getMyLocationEnabled() ?: false } /** @@ -614,7 +634,8 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { //隐藏缩放按钮 fun hiddenZoom() { mMapAutoView.getClerk()?.add() - mMapAutoView.getPanelManager()?.setPanel(PanelManager.PANEL_WHAT_HID, PanelManager.PANEL_BTN_ZOOM) + mMapAutoView.getPanelManager() + ?.setPanel(PanelManager.PANEL_WHAT_HID, PanelManager.PANEL_BTN_ZOOM) } /** @@ -748,7 +769,6 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { } - /** * 地图截屏 */ @@ -781,23 +801,30 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { } } } + MapCameraMessage.Type.zoomTo -> { mMapAutoView.getMapController()?.setZoom(mapCameraMessage.zoom.toInt()) } + MapCameraMessage.Type.zoomOut -> { mMapAutoView.getMapController()?.zoomOut() } + MapCameraMessage.Type.newLatLngBounds -> { val latLngBounds = mapCameraMessage.bounds if (latLngBounds != null && latLngBounds.isLegal()) { val zoomIndex = autoZoom(latLngBounds.southwest!!, latLngBounds.northeast!!) if (CompileConfig.DEBUG) { - Log.i(TAG, "mapop-moveCamera-newLatLngBounds:,${latLngBounds},zoom:${zoomIndex}") + Log.i( + TAG, + "mapop-moveCamera-newLatLngBounds:,${latLngBounds},zoom:${zoomIndex}" + ) } mMapAutoView.getMapController()?.setZoom(zoomIndex) } } + else -> { throw NotImplementException() } @@ -846,6 +873,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { mMapAutoView.getClerk()?.add() return mMapAutoView.getMapController()?.drawThickLine(polylineOptions) } + /** * 绘制圆 */ @@ -902,7 +930,10 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { Log.i(TAG, "mapop-custommap--setPointToCenter") } mMapAutoView.getClerk()?.add() - mMapAutoView.getMapController()?.setOffset((MapTools.viewWidth*(x-0.5f)).toInt(), ((MapTools.viewWidth*(y-0.5f)).toInt())) + mMapAutoView.getMapController()?.setOffset( + (MapTools.viewWidth * (x - 0.5f)).toInt(), + ((MapTools.viewWidth * (y - 0.5f)).toInt()) + ) // mMapAutoView.getPanelManager()?.setPanelPos(PanelManager.PANEL_MODE_MAP,0,0,0,0) } @@ -921,7 +952,8 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { Log.i(TAG, "mapop-custommap--clearPanel") } mMapAutoView.getClerk()?.add() - mMapAutoView.getPanelManager()?.setPanel(PanelManager.PANEL_WHAT_HID, PanelManager.PANEL_MODE_VIEW_MAIN) + mMapAutoView.getPanelManager() + ?.setPanel(PanelManager.PANEL_WHAT_HID, PanelManager.PANEL_MODE_VIEW_MAIN) } // 自动切换夜间模式开关 @@ -948,7 +980,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { Log.i(TAG, "mapop-custommap--getIsUseExtraGPSData") } mMapAutoView.getClerk()?.add() - return mMapAutoView.getLocationClient()?.isUseExtraGPSData()?:false + return mMapAutoView.getLocationClient()?.isUseExtraGPSData() ?: false } //传入外部数据 @@ -1023,7 +1055,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { Log.i(TAG, "mapop-custommap--getScalePerPixel") } mMapAutoView.getClerk()?.add() - return mMapAutoView.getMapController()?.getResulation() ?: 0.0f + return mMapAutoView.getMapController()?.getResulation() ?: 0.0f } //自动缩放 @@ -1034,7 +1066,8 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { mMapAutoView.getClerk()?.add() val minLonLat = CommonProxy.getInstance().getLonLatProxy().switchLonLat(minLonLatPoint) val maxLonLat = CommonProxy.getInstance().getLonLatProxy().switchLonLat(maxLonLatPoint) - return mMapAutoView.getMapController()?.getSuitableZoom(minLonLat.lon, minLonLat.lat, maxLonLat.lon, maxLonLat.lat) ?: 16 + return mMapAutoView.getMapController() + ?.getSuitableZoom(minLonLat.lon, minLonLat.lat, maxLonLat.lon, maxLonLat.lat) ?: 16 } @@ -1050,7 +1083,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { fun isTrafficOn(): Boolean { mMapAutoView.getClerk()?.add() - return mMapAutoView.getMapController()?.isTrafficOn()?: false + return mMapAutoView.getMapController()?.isTrafficOn() ?: false } //设置是否打开交通路况图层 @@ -1104,7 +1137,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { /** * 修改锚点的变形比例 */ - fun setAnchorScale(wRate: Float,hRate: Float) { + fun setAnchorScale(wRate: Float, hRate: Float) { mMapAutoView.getClerk()?.add() // mMapAutoView.getMapController()?.setAnchorScale(wRate, hRate) } @@ -1113,21 +1146,21 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置缩放 * @param zoomVal */ - fun setZoomVal(zoomVal:Float){ + fun setZoomVal(zoomVal: Float) { mMapAutoView.getClerk()?.add("$zoomVal") mMapAutoView.getMapController()?.setZoomValue(zoomVal) } - //获取眼睛高度 - fun getEyeHeight(): Float{ + fun getEyeHeight(): Float { mMapAutoView.getClerk()?.add() - return mMapAutoView.getMapController()?.getEyeHeight()?: ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_MIDDLE + return mMapAutoView.getMapController()?.getEyeHeight() + ?: ConstantExt.MAP_STYLE_VR_EYE_HEIGHT_MIDDLE } //设置眼睛高度 - fun setEyeHeight(eyeHeight: Float){ + fun setEyeHeight(eyeHeight: Float) { mMapAutoView.getClerk()?.add("$eyeHeight") mMapAutoView.getMapController()?.setEyeHeight(eyeHeight) } @@ -1135,28 +1168,28 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { /** * 设置视阈 */ - fun setVerticalViewFieldAngle(r: Float){ + fun setVerticalViewFieldAngle(r: Float) { mMapAutoView.getClerk()?.add("$r") mMapAutoView.getMapController()?.setVerticalViewFieldAngle(r) } - fun getVerticalViewFieldAngle(): Float?{ + fun getVerticalViewFieldAngle(): Float? { mMapAutoView.getClerk()?.add() - return mMapAutoView.getMapController()?.getVerticalViewFieldAngle() + return mMapAutoView.getMapController()?.getVerticalViewFieldAngle() } /** * 设置是否自动切换视角 */ - fun setSwitchViewAngle(isSwitchViewAngle: Boolean){ + fun setSwitchViewAngle(isSwitchViewAngle: Boolean) { mMapAutoView.getClerk()?.add("$isSwitchViewAngle") mMapAutoView.getMapController()?.getMapStyleParams()?.setSwitchViewAngle(isSwitchViewAngle) } - fun isSwitchViewAngle(): Boolean{ + fun isSwitchViewAngle(): Boolean { mMapAutoView.getClerk()?.add() - return mMapAutoView.getMapController()?.getMapStyleParams()?.isSwitchViewAngle()?:false + return mMapAutoView.getMapController()?.getMapStyleParams()?.isSwitchViewAngle() ?: false } /** @@ -1172,7 +1205,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * const val MAP_STYLE_VR_ROAM = 7 * const val MAP_STYLE_VR_TRANS = 8 */ - fun setMapViewVisualAngle(type: Int){ + fun setMapViewVisualAngle(type: Int) { mMapAutoView.getClerk()?.add("$type") if (CompileConfig.DEBUG) { Log.i(TAG, "setMapViewVisualAngle:${type}") @@ -1185,7 +1218,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置是否只在高精地图缩放 * @param isScaleVr */ - fun setScaleVRMode(isScaleVr: Boolean){ + fun setScaleVRMode(isScaleVr: Boolean) { mMapAutoView.getClerk()?.add("$isScaleVr") mMapAutoView.getMapController()?.setVrMode(isScaleVr) } @@ -1196,12 +1229,12 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * @param lonLatPoint * @param isGps */ - fun setNearViewAnglePosition(lonLatPoint: LonLatPoint, isGps: Boolean){ + fun setNearViewAnglePosition(lonLatPoint: LonLatPoint, isGps: Boolean) { mMapAutoView.getClerk()?.add("$lonLatPoint,$isGps") val lonLat: LonLat - if(!isGps) { + if (!isGps) { lonLat = CommonProxy.getInstance().getLonLatProxy().switchLonLat(lonLatPoint) - }else{ + } else { lonLat = LonLat(lonLatPoint.longitude, lonLatPoint.latitude) } mMapAutoView.getMapController()?.setNearViewAnglePosition(lonLat) @@ -1209,7 +1242,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { } - fun testMapViewAngle(type: Int){ + fun testMapViewAngle(type: Int) { mMapAutoView.getClerk()?.add("$type") mMapAutoView.getMapController()?.testMapViewAngle(type) } @@ -1219,10 +1252,10 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * @param type 0=默认 1=左黄 2=右黄 3=双黄 4=双红 * @param time 闪烁时间 */ - fun setTailLightsType(type: Int, time: Int){ + fun setTailLightsType(type: Int, time: Int) { mMapAutoView.getClerk()?.add("$type,$time") var flashTime = time - if(flashTime < 500) { + if (flashTime < 500) { flashTime = 500 } mMapAutoView.getMapController()?.setTailLightsType(type, flashTime) @@ -1231,29 +1264,36 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { /** * 设置锚点渐变色 */ - fun setAnchorGradientColor(startColor: String, endColor: String, startDistance: Float, endDistance: Float){ + fun setAnchorGradientColor( + startColor: String, + endColor: String, + startDistance: Float, + endDistance: Float + ) { mMapAutoView.getClerk()?.add("$startColor,$endColor,$startDistance,$endDistance") - mMapAutoView.getMapController()?.setAnchorGradientColor(startColor, endColor, startDistance, endDistance) + mMapAutoView.getMapController() + ?.setAnchorGradientColor(startColor, endColor, startDistance, endDistance) } + /** * @param isUseTrace 1：使用轨迹 0：自有漫游模式 * @param dis: 漫游长度 * @param speed: 速度 */ - fun setRoamStyle(isUseTrace: Int, dis: Float, speed: Float){ + fun setRoamStyle(isUseTrace: Int, dis: Float, speed: Float) { mMapAutoView.getClerk()?.add("$isUseTrace,$dis,$speed") var roamDis = dis - if(roamDis > ConstantExt.ROAM_DIS_MAX){ + if (roamDis > ConstantExt.ROAM_DIS_MAX) { roamDis = ConstantExt.ROAM_DIS_MAX - } else if(roamDis < 0){ + } else if (roamDis < 0) { roamDis = ConstantExt.ROAM_DIS_1KM } var roamSpeed = speed - if(roamSpeed > ConstantExt.ROAM_SPEED_80){ + if (roamSpeed > ConstantExt.ROAM_SPEED_80) { roamSpeed = ConstantExt.ROAM_SPEED_80 - } else if(roamSpeed < ConstantExt.ROAM_SPEED_30){ + } else if (roamSpeed < ConstantExt.ROAM_SPEED_30) { roamSpeed = ConstantExt.ROAM_SPEED_30 } mMapAutoView.getMapController()?.setRoamStyle(isUseTrace, roamDis, roamSpeed) @@ -1262,19 +1302,17 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { /** * @param travelList 轨迹路径 */ - fun setRoamTrajectory(travelList: ArrayList?){ + fun setRoamTrajectory(travelList: ArrayList?) { mMapAutoView.getClerk()?.add() mMapAutoView.getMapController()?.setRoamTrajectory(travelList) } - - /** * 设置锁车后的恢复时间 * @param time 等待时间 */ - fun setLockCarRecycleWaitTime(time: Long){ + fun setLockCarRecycleWaitTime(time: Long) { mMapAutoView.getClerk()?.add("$time") mMapAutoView.getMapController()?.setWaitTime(time) } @@ -1282,7 +1320,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { /** * 设置锁车状态 */ - fun setIsAutoLockCar(isLockCar: Boolean){ + fun setIsAutoLockCar(isLockCar: Boolean) { mMapAutoView.getClerk()?.add("$isLockCar") mMapAutoView.getMapController()?.setIsAutoLockCar(isLockCar) } @@ -1290,15 +1328,15 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { /** * 转换UTM坐标和经纬度坐标数据 */ - fun switchData(x: Double, y: Double, isWgs84: Boolean): DoubleArray?{ + fun switchData(x: Double, y: Double, isWgs84: Boolean): DoubleArray? { mMapAutoView.getClerk()?.add("$x,$y,$isWgs84") - return mMapAutoView.getMapController()?.switchData(x,y,isWgs84) + return mMapAutoView.getMapController()?.switchData(x, y, isWgs84) } /** * 设置漫游模式 */ - fun setTransitionStyle(){ + fun setTransitionStyle() { mMapAutoView.getClerk()?.add() setMapViewVisualAngle(MapAutoApi.MAP_STYLE_VR_TRANS) } @@ -1315,7 +1353,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 是否显示盲区 * @param visible true 显示 false 隐藏 */ - fun setDeadZoneVisible(visible: Boolean){ + fun setDeadZoneVisible(visible: Boolean) { mMapAutoView.getMapController()?.setDeadZoneVisible(visible) } @@ -1324,8 +1362,8 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置天气接口 * @param type 0:没有天气效果 1:雨天 2:雪天 */ - fun setWeatherType(type: String){ - if (CompileConfig.DEBUG){ + fun setWeatherType(type: String) { + if (CompileConfig.DEBUG) { Log.i(TAG, "setWeatherType:${type}") } mMapAutoView.getMapController()?.setWeatherType(type) @@ -1335,8 +1373,8 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置是否启用天气渲染 * @param isEnable */ - fun setWeatherEnable(isEnable: Boolean){ - if (CompileConfig.DEBUG){ + fun setWeatherEnable(isEnable: Boolean) { + if (CompileConfig.DEBUG) { Log.i(TAG, "setWeatherEnable:${isEnable}") } mMapAutoView.setWeatherEnable(isEnable) @@ -1348,28 +1386,19 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * @param lat 纬度 * @param call 回调 */ - fun getWeatherInfo(lon: Double, lat: Double, call: WeatherResult){ - if (CompileConfig.DEBUG){ + fun getWeatherInfo(lon: Double, lat: Double, call: WeatherResult) { + if (CompileConfig.DEBUG) { Log.i(TAG, "getWeatherInfo:${lon},$lat") } - mMapAutoView.getMapController()?.getWeatherInfo(lon,lat,call) + mMapAutoView.getMapController()?.getWeatherInfo(lon, lat, call) } - /** - * 设置启用天空盒模式 - */ - fun setSkyBoxMode(){ - if (CompileConfig.DEBUG){ - Log.i(TAG, "setSkyBoxMode") - } - mMapAutoView.getMapController()?.setSkyBoxMode() - } /** * 设置是否启用大雾 * @param isEnable */ - fun setFogMode(isEnable: Boolean){ - if (CompileConfig.DEBUG){ + fun setFogMode(isEnable: Boolean) { + if (CompileConfig.DEBUG) { Log.i(TAG, "setFogMode") } mMapAutoView.getMapController()?.setFogMode(isEnable) @@ -1382,7 +1411,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * @param width 宽度 * @param duration 动画时长 */ - fun setLightWave(list: List, width: Double, duration: Double){ + fun setLightWave(list: List, width: Double, duration: Double) { mMapAutoView.getMapController()?.setLightWave(list, width, duration) } @@ -1390,7 +1419,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置引导线 * @param list 引导线轨迹 */ - fun setGuideLine(list: List?, drawEleLength:Float){ + fun setGuideLine(list: List?, drawEleLength: Float) { mMapAutoView.getMapController()?.setGuideLine(list, drawEleLength) } @@ -1398,9 +1427,9 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置道路纹理带下 * @param size 纹理大小 取值范围？ */ - fun setRoadTexSize(size: Float){ + fun setRoadTexSize(size: Float) { mMapAutoView.getClerk()?.add("$size") - if (CompileConfig.DEBUG){ + if (CompileConfig.DEBUG) { Log.i(TAG, "setRoadTexSize") } mMapAutoView.getMapController()?.setRoadTexSize(size) @@ -1410,9 +1439,9 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置是否启用纹理绘制路面 * @param isEnable */ - fun setRoadUseTexture(isEnable: Boolean){ + fun setRoadUseTexture(isEnable: Boolean) { mMapAutoView.getClerk()?.add("$isEnable") - if (CompileConfig.DEBUG){ + if (CompileConfig.DEBUG) { Log.i(TAG, "setRoadUseTexture") } mMapAutoView.getMapController()?.setRoadUseTexture(isEnable) @@ -1422,16 +1451,21 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置是否启用纹理绘制地面 * @param isEnable */ - fun setPlaneUseTexture(isEnable: Boolean){ + fun setPlaneUseTexture(isEnable: Boolean) { mMapAutoView.getClerk()?.add("$isEnable") - if (CompileConfig.DEBUG){ + if (CompileConfig.DEBUG) { Log.i(TAG, "setPlaneUseTexture") } mMapAutoView.getMapController()?.setPlaneUseTexture(isEnable) } - fun addImagetoImageManager(imageKey: String, imageByteArray: ByteArray, width: Int, height: Int):Int?{ + fun addImagetoImageManager( + imageKey: String, + imageByteArray: ByteArray, + width: Int, + height: Int + ): Int? { return mMapAutoView.getMapController()?.addImage( imageKey, imageByteArray, @@ -1439,6 +1473,7 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { height ) } + /** * 地图中心点周围模糊属性 * @param isEnable 是否开启 @@ -1447,7 +1482,13 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * @param endDis 结束距离 * @param density 密度 */ - fun setMapCenterBlur(isEnable: Boolean, color: String?, starDis: Float?, endDis: Float?, density: Float?) { + fun setMapCenterBlur( + isEnable: Boolean, + color: String?, + starDis: Float?, + endDis: Float?, + density: Float? + ) { mMapAutoView.getClerk()?.add("$isEnable,$color,$starDis,$endDis,$density") mMapAutoView.getMapController()?.setMapCenterBlur(isEnable, color, starDis, endDis, density) } @@ -1457,8 +1498,30 @@ class MapAutoViewHelper(mapAutoView: MapAutoView) { * 设置是否启用夜间路灯效果 * @param isEnable */ - fun setStreetLightNightEffectIsEnable(isEnable: Boolean){ + fun setStreetLightNightEffectIsEnable(isEnable: Boolean) { mMapAutoView.getClerk()?.add("$isEnable") mMapAutoView.getMapController()?.setStreetLightEffectIsEnable(isEnable) } + + /** + * 切换默认视角 + */ + fun switchDefaultPerspective() { + if (CompileConfig.DEBUG) { + Log.i(TAG, "switchDefaultPerspective") + } + mMapAutoView.getMapController()?.setMapViewVisualAngle(mMapAutoView.getMapStyleParams()?.getVrAngleDefaultMode()?:MapStyleParams.MAP_STYLE_VR_ANGLE_MIDDLE) + } + + /** + * 设置默认视角 + */ + fun setDefaultPerspective(mode: Int) { + if (CompileConfig.DEBUG) { + Log.i(TAG, "setDefaultPerspective: mode：${mode}") + } + mMapAutoView.getMapStyleParams()?.setVrAngleDefaultMode(mode) + } + + } \ No newline at end of file diff --git a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapStyleParams.kt b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapStyleParams.kt index acadeb64fb..27aaa3710c 100644 --- a/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapStyleParams.kt +++ b/libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapStyleParams.kt @@ -46,6 +46,7 @@ class MapStyleParams: IMapStyleParams { HDTypes.regional.type, HDTypes.geometricLinear.type, HDTypes.geometricSurface.type, + HDTypes.poi.type, // HDTypes.TREE.type, ) /** @@ -56,7 +57,6 @@ class MapStyleParams: IMapStyleParams { * const val MAP_STYLE_DAY_NAV = 3 //日间导航模式 * const val MAP_STYLE_NIGHT_NAV = 4 //夜间导航模式 */ - @Volatile private var styleMode: Int = MapAutoApi.MAP_STYLE_NIGHT_VR /** @@ -98,7 +98,7 @@ class MapStyleParams: IMapStyleParams { private var isSkyBoxEnable = false // 是否开启天气 - private var isWeatherEnable = true + private var isWeatherEnable = false //是否使用光圈 private var isDisplayAnim = false diff --git a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java index b0c6964cfa..15053e52cf 100644 --- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java +++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java @@ -288,7 +288,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { ApmInsight.getInstance().init(context, builder.build()); //初始化自定日志，配置自定义日志最大占用磁盘，内部一般配置20,代表最大20M磁盘占用。1.4.1版本开始存在这个api - VLog.init(context, 20); + VLog.init(context, 50); } }