[map-sdk] 3.4.0.2 他车颜色是相关逻辑更新

libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_day/common.cfg

@@ -50,24 +50,28 @@ road.gradientColor=66B5C8E6;00B5C8E6
 road.gradientColor_morning=66B5C8E6;00B5C8E6
 road.gradientColor_daytime=66B5C8E6;00B5C8E6
 road.gradientColor_evening=00f2c3b1;66f2c3b1
-road.gradientColor_nighttime=004CECFF;004CECFF
+road.gradientColor_nighttime=00365493;b2365493
+road.gradientColor_cloudy=ff9FB5D6;009FB5D6
 greenbelt.isGradient=true
 greenbelt.gradientColor=66E5F0E8;00E5F0E8
 greenbelt.gradientColor_morning=66E5F0E8;00E5F0E8
 greenbelt.gradientColor_daytime=66E5F0E8;00E5F0E8
 greenbelt.gradientColor_evening=00f2c3b1;66f2c3b1
-greenbelt.gradientColor_nighttime=004CECFF;004CECFF
+greenbelt.gradientColor_nighttime=00365493;b2365493
+greenbelt.gradientColor_cloudy=0097B2DB;8097B2DB
 plane.isGradient=true
 plane.gradientColor=66B5C8E6;00B5C8E6
 plane.gradientColor_morning=66B5C8E6;00B5C8E6
 plane.gradientColor_daytime=66B5C8E6;00B5C8E6
 plane.gradientColor_evening=00f2c3b1;66f2c3b1
-plane.gradientColor_nighttime=004CECFF;004CECFF
+plane.gradientColor_nighttime=00365493;b2365493
+plane.gradientColor_cloudy=0097B2DB;8097B2DB
 fog=C4E1FF;20;65;0.9 //雾颜色,起始距离，结束距离，密度
 fog_morning=F0F5F6;20;65;0.4 //雾颜色,起始距离，结束距离，密度
 fog_daytime=C4E1FF;20;65;0.9 //雾颜色,起始距离，结束距离，密度
 fog_evening=D6CFDC;20;65;0.9 //雾颜色,起始距离，结束距离，密度
-fog_nighttime=4CECFF;20;65;0.3 //雾颜色,起始距离，结束距离，密度
+fog_nighttime=4CECFF;20;65;0.14 //雾颜色,起始距离，结束距离，密度
+fog_cloudy=C1D3E9;20;70;0.9 //雾颜色,起始距离，结束距离，密度
 
 
 

libraries/mapmodule/src/main/assets/style/style/normal/vr/taxi_night/common.cfg

@@ -5,7 +5,7 @@ alphaNumeric.color.fac=1.0 //地标颜色因子
 zebra.color.fac=1.0  //斑马线颜色因子
 spotLight=1;0.75;-25 //聚光灯 半径;亮度;偏移
 shadow=18,28,56,180  //阴影颜色
-greenBelt=35,50,75;60,74,105 //绿化带 底部颜色;顶部颜色
+greenBelt=213849;2B4A5A //绿化带 底部颜色;顶部颜色
 dividerLine=102,115,140;230,180,90;1.0  //白色;黄色;颜色因子
 pole=6698B1;335780  //灯杆渐变颜色
 guardBar=344563;273651;506B9A  //隔离带颜色
@@ -50,24 +50,24 @@ road.gradientColor=ffB5C8E6;00B5C8E6
 road.gradientColor_morning=00f2c3b1;fff2c3b1
 road.gradientColor_daytime=ffB5C8E6;00B5C8E6
 road.gradientColor_evening=00f2c3b1;fff2c3b1
-road.gradientColor_nighttime=004CECFF;004CECFF
+road.gradientColor_nighttime=00365493;b2365493
 greenbelt.isGradient=true
 greenbelt.gradientColor=ffE5F0E8;00E5F0E8
 greenbelt.gradientColor_morning=00f2c3b1;fff2c3b1
 greenbelt.gradientColor_daytime=ffE5F0E8;00E5F0E8
 greenbelt.gradientColor_evening=00f2c3b1;fff2c3b1
-greenbelt.gradientColor_nighttime=004CECFF;004CECFF
+greenbelt.gradientColor_nighttime=00365493;b2365493
 plane.isGradient=true
 plane.gradientColor=ffB5C8E6;00B5C8E6
 plane.gradientColor_morning=00f2c3b1;fff2c3b1
 plane.gradientColor_daytime=ffB5C8E6;00B5C8E6
 plane.gradientColor_evening=00f2c3b1;fff2c3b1
-plane.gradientColor_nighttime=004CECFF;004CECFF
+plane.gradientColor_nighttime=00365493;b2365493
 fog=C4E1FF;20;65;0.9 //雾颜色,起始距离，结束距离，密度
 fog_morning=F0F5F6;20;65;0.4 //雾颜色,起始距离，结束距离，密度
 fog_daytime=C4E1FF;20;65;0.9 //雾颜色,起始距离，结束距离，密度
 fog_evening=D6CFDC;20;65;0.9 //雾颜色,起始距离，结束距离，密度
-fog_nighttime=4CECFF;20;65;0.3 //雾颜色,起始距离，结束距离，密度
+fog_nighttime=4CECFF;20;65;0.14 //雾颜色,起始距离，结束距离，密度
 
 
 

libraries/mapmodule/src/main/java/com/autonavi/nge/map/MapEngine.kt

@@ -532,7 +532,7 @@ class MapEngine {
 
     fun setHDTypeVisible(type: IntArray?) {
         if (mObj != 0L) {
-            setHDTypeVisibileJni(mObj, type)
+            setHDTypeVisibleJni(mObj, type)
         }
     }
 
@@ -1295,7 +1295,7 @@ class MapEngine {
     private external fun setPointCloudColorJni(obj:Long,color: String)
 
     //更新高精地图显示元素
-    private external fun setHDTypeVisibileJni(obj:Long,type: IntArray?)
+    private external fun setHDTypeVisibleJni(obj:Long,type: IntArray?)
 
     private external fun unloadJni(obj:Long)
 

libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/abs/IMapController.kt

@@ -14,9 +14,9 @@ import com.zhidaoauto.map.sdk.open.logics.circle.CircleController
 import com.zhidaoauto.map.sdk.open.logics.circle.CircleOptions
 import com.zhidaoauto.map.sdk.open.logics.deadzone.DeadZone
 import com.zhidaoauto.map.sdk.open.logics.deadzone.DeadZoneOptions
+import com.zhidaoauto.map.sdk.open.logics.weather.WeatherResult
 import com.zhidaoauto.map.sdk.open.renders.poyline.Polyline
 import com.zhidaoauto.map.sdk.open.renders.poyline.PolylineOptions
-import com.zhidaoauto.map.sdk.open.logics.weather.WeatherResult
 import kotlinx.coroutines.CoroutineScope
 
 interface IMapController {

libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/MapController.kt

@@ -21,6 +21,7 @@ import com.zhidaoauto.map.sdk.inner.abs.IMapController
 import com.zhidaoauto.map.sdk.inner.abs.IMapView
 import com.zhidaoauto.map.sdk.inner.abs.IMarkerCall
 import com.zhidaoauto.map.sdk.inner.abs.IMarkerController
+import com.zhidaoauto.map.sdk.inner.cloud.weather.WeatherModel
 import com.zhidaoauto.map.sdk.inner.common.ConstantExt
 import com.zhidaoauto.map.sdk.inner.element.M3DCar
 import com.zhidaoauto.map.sdk.inner.element.MapCoordinate
@@ -28,18 +29,20 @@ import com.zhidaoauto.map.sdk.inner.marker.RecycleController
 import com.zhidaoauto.map.sdk.inner.panel.PolyLineView
 import com.zhidaoauto.map.sdk.inner.road.RoadHelper
 import com.zhidaoauto.map.sdk.inner.use.Clerk
-import com.zhidaoauto.map.sdk.inner.utils.*
+import com.zhidaoauto.map.sdk.inner.utils.GisGeomTool
+import com.zhidaoauto.map.sdk.inner.utils.LogHelper
+import com.zhidaoauto.map.sdk.inner.utils.MathUtils
+import com.zhidaoauto.map.sdk.inner.utils.TransformUtils
 import com.zhidaoauto.map.sdk.open.abs.IResult
 import com.zhidaoauto.map.sdk.open.abs.view.IMapStyleParams
+import com.zhidaoauto.map.sdk.open.common.tools.MapTools
 import com.zhidaoauto.map.sdk.open.logics.circle.CircleController
 import com.zhidaoauto.map.sdk.open.logics.circle.CircleOptions
 import com.zhidaoauto.map.sdk.open.logics.deadzone.DeadZone
 import com.zhidaoauto.map.sdk.open.logics.deadzone.DeadZoneOptions
+import com.zhidaoauto.map.sdk.open.logics.weather.WeatherResult
 import com.zhidaoauto.map.sdk.open.renders.poyline.Polyline
 import com.zhidaoauto.map.sdk.open.renders.poyline.PolylineOptions
-import com.zhidaoauto.map.sdk.open.common.tools.MapTools
-import com.zhidaoauto.map.sdk.inner.cloud.weather.WeatherModel
-import com.zhidaoauto.map.sdk.open.logics.weather.WeatherResult
 import io.netty.util.internal.StringUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/inner/map/WeatherController.kt

@@ -33,7 +33,6 @@ class WeatherController(mapAutoView: MapAutoView): IWeatherController {
         "阵雨", "雷阵雨" ,"雷阵雨并伴有冰雹", "强阵雨", "强雷阵雨", "极端降雨", "毛毛雨/细雨", "小雨-中雨", "中雨-大雨",
         "大雨-暴雨","暴雨-大暴雨","大暴雨-特大暴雨","雨雪天气","雨夹雪","阵雨夹雪","冻雨","雾","浓雾","强浓雾","大雾","特强浓雾")
 
-
     private val mWeatherRepository by lazy { WeatherRepository() }
     private var mLastUpdateTime: Long = 0
     private var mWeatherEnable: Boolean = true

libraries/mapmodule/src/main/java/com/zhidaoauto/map/sdk/open/view/MapAutoViewHelper.kt

@@ -10,6 +10,8 @@ import com.zhidaoauto.map.sdk.inner.proxy.CommonProxy
 import com.zhidaoauto.map.sdk.inner.utils.TransformUtils
 import com.zhidaoauto.map.sdk.open.MapAutoApi
 import com.zhidaoauto.map.sdk.open.abs.marker.InfoWindowAdapter
+import com.zhidaoauto.map.sdk.open.common.exception.NotImplementException
+import com.zhidaoauto.map.sdk.open.common.tools.MapTools
 import com.zhidaoauto.map.sdk.open.logics.camera.CameraPosition
 import com.zhidaoauto.map.sdk.open.logics.camera.CameraUpdate
 import com.zhidaoauto.map.sdk.open.logics.camera.MapCameraMessage
@@ -17,15 +19,13 @@ import com.zhidaoauto.map.sdk.open.logics.circle.CircleController
 import com.zhidaoauto.map.sdk.open.logics.circle.CircleOptions
 import com.zhidaoauto.map.sdk.open.logics.deadzone.DeadZone
 import com.zhidaoauto.map.sdk.open.logics.deadzone.DeadZoneOptions
-import com.zhidaoauto.map.sdk.open.common.exception.NotImplementException
 import com.zhidaoauto.map.sdk.open.logics.location.MogoLocation
 import com.zhidaoauto.map.sdk.open.logics.location.MyLocationStyle
+import com.zhidaoauto.map.sdk.open.logics.weather.WeatherResult
 import com.zhidaoauto.map.sdk.open.renders.marker.Marker
 import com.zhidaoauto.map.sdk.open.renders.marker.MarkerOptions
 import com.zhidaoauto.map.sdk.open.renders.poyline.Polyline
 import com.zhidaoauto.map.sdk.open.renders.poyline.PolylineOptions
-import com.zhidaoauto.map.sdk.open.common.tools.MapTools
-import com.zhidaoauto.map.sdk.open.logics.weather.WeatherResult
 
 class MapAutoViewHelper(mapAutoView: MapAutoView) {
     private val mMapAutoView: MapAutoView