diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index c91828e58e..fb28a0da14 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -279,12 +279,13 @@ class MoGoHmiFragment : MvpFragment val notificationView = V2XNotificationView(it) notificationView.setWarningIcon(EventTypeEnum.getWarningIcon(v2xType.toString())) - - notificationView.setWarningContent( - alertContent ?: EventTypeEnum.getWarningContent( - v2xType.toString() - ) - ) + val warningContent = alertContent ?: EventTypeEnum.getWarningContent(v2xType.toString()) + if (warningContent.isNullOrEmpty()) { + Logger.e(TAG, "Show warningContent is null or empty!") + return + } else { + notificationView.setWarningContent(warningContent) + } if (mWarningFloat != null && mWarningFloat!!.config.floatTag != tag) { WarningFloat.dismiss(mWarningFloat!!.config.floatTag, true) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapLocationListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapLocationListenerManager.kt index fcbb46228a..a9cab5a89e 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapLocationListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapLocationListenerManager.kt @@ -88,7 +88,12 @@ object CallerMapLocationListenerManager : CallerBase() { */ fun invokeMapLocationChangeListener(location: MogoLocation?) { //LogUtils.dTag(TAG, "mapStyleMode:$location") - Log.w("DHY-location", "${location?.longitude},${location?.latitude} CallerMapLocationListenerManager-invokeMapLocationChangeListener") + val longitude = "${location?.longitude}" + if (longitude.length>12){ + Log.e("DHY-location", "${location?.longitude},${location?.latitude} CallerMapLocationListenerManager-invokeMapLocationChangeListener") + }else{ + Log.w("DHY-location", "${location?.longitude},${location?.latitude} CallerMapLocationListenerManager-invokeMapLocationChangeListener") + } mLocation = location mMapStyleChangeListeners.forEach { val tag = it.key diff --git a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml index 5ee91aa1e7..b2b69f3973 100644 --- a/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/mogo-core-res/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -6,7 +6,7 @@ 104px 104px - 380px + 540px 40px 30px diff --git a/gradle.properties b/gradle.properties index 247807c179..d34762abbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ kapt.include.compile.classpath=false android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -android.jetifier.blacklist=module-service-2.1.14.aar +android.jetifier.blacklist=module-service-2.1.14.4.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -89,102 +89,102 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.15 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.56 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.56 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.56 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.56 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.56 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.56 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.56 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.56 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.56 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.56 -MOGO_CORE_DATA_VERSION=0.0.56 -MOGO_CORE_FUNCTION_API_VERSION=0.0.56 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.56 -MOGO_CORE_RES_VERSION=0.0.56 -MOGO_CORE_UTILS_VERSION=0.0.56 -MOGO_CORE_NETWORK_VERSION=0.0.56 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.56.4 +MOGO_CORE_DATA_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_API_VERSION=0.0.56.4 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.56.4 +MOGO_CORE_RES_VERSION=0.0.56.4 +MOGO_CORE_UTILS_VERSION=0.0.56.4 +MOGO_CORE_NETWORK_VERSION=0.0.56.4 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.14 -MOGO_UTILS_VERSION=2.1.14 -MAP_AMAP_VERSION=2.1.14 -MAP_AUTONAVI_VERSION=2.1.14 -MOGO_MAP_VERSION=2.1.14 -MOGO_MAP_API_VERSION=2.1.14 -MOGO_SERVICE_VERSION=2.1.14 -MOGO_SERVICE_API_VERSION=2.1.14 -MOGO_CONNECTION_VERSION=2.1.14 -MOGO_MODULE_APPS_VERSION=2.1.14 -MOGO_MODULE_NAVI_VERSION=2.1.14 -MOGO_MODULE_SHARE_VERSION=2.1.14 -MOGO_MODULE_COMMON_VERSION=2.1.14 -MOGO_MODULE_MAIN_VERSION=2.1.14 -MOGO_MODULE_MAP_VERSION=2.1.14 -MOGO_MODULE_SERVICE_VERSION=2.1.14 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.14 -MOGO_MODULE_SEARCH_VERSION=2.1.14 -MOGO_MODULE_BACK_VERSION=2.1.14 -MOGO_MODULE_V2X_VERSION=2.1.14 +MOGO_COMMONS_VERSION=2.1.14.4 +MOGO_UTILS_VERSION=2.1.14.4 +MAP_AMAP_VERSION=2.1.14.4 +MAP_AUTONAVI_VERSION=2.1.14.4 +MOGO_MAP_VERSION=2.1.14.4 +MOGO_MAP_API_VERSION=2.1.14.4 +MOGO_SERVICE_VERSION=2.1.14.4 +MOGO_SERVICE_API_VERSION=2.1.14.4 +MOGO_CONNECTION_VERSION=2.1.14.4 +MOGO_MODULE_APPS_VERSION=2.1.14.4 +MOGO_MODULE_NAVI_VERSION=2.1.14.4 +MOGO_MODULE_SHARE_VERSION=2.1.14.4 +MOGO_MODULE_COMMON_VERSION=2.1.14.4 +MOGO_MODULE_MAIN_VERSION=2.1.14.4 +MOGO_MODULE_MAP_VERSION=2.1.14.4 +MOGO_MODULE_SERVICE_VERSION=2.1.14.4 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.14.4 +MOGO_MODULE_SEARCH_VERSION=2.1.14.4 +MOGO_MODULE_BACK_VERSION=2.1.14.4 +MOGO_MODULE_V2X_VERSION=2.1.14.4 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.14 +MOGO_MODULE_TANLU_VERSION=2.1.14.4 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.14 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.14 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.14 +MOGO_MODULE_PUSH_VERSION=2.1.14.4 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.14.4 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.14.4 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.14 -MOGO_TANLU_API_VERSION=2.1.14 +TANLULIB_VERSION=2.1.14.4 +MOGO_TANLU_API_VERSION=2.1.14.4 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.14 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.14 +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.14.4 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.14.4 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.14 +MOGO_MODULE_WIDGETS_VERSION=2.1.14.4 # obu -MOGO_MODULE_OBU_VERSION=2.1.14 -MOGO_MODULE_OBU_MOGO_VERSION=2.1.14 +MOGO_MODULE_OBU_VERSION=2.1.14.4 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.14.4 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.14 +MOGO_MODULE_MONITOR_VERSION=2.1.14.4 # bugly -CRASHREPORT_VERSION=2.1.14 -CRASHREPORT_BUGLY_VERSION=2.1.14 -CRASHREPORT_NOOP_VERSION=2.1.14 -CRASHREPORT_UPGRADE_VERSION=2.1.14 +CRASHREPORT_VERSION=2.1.14.4 +CRASHREPORT_BUGLY_VERSION=2.1.14.4 +CRASHREPORT_NOOP_VERSION=2.1.14.4 +CRASHREPORT_UPGRADE_VERSION=2.1.14.4 ## tts -TTS_BASE_VERSION=2.1.14 -TTS_DI_VERSION=2.1.14 -TTS_ZHI_VERSION=2.1.14 -TTS_PAD_VERSION=2.1.14 -TTS_NOOP_VERSION=2.1.14 +TTS_BASE_VERSION=2.1.14.4 +TTS_DI_VERSION=2.1.14.4 +TTS_ZHI_VERSION=2.1.14.4 +TTS_PAD_VERSION=2.1.14.4 +TTS_NOOP_VERSION=2.1.14.4 # 自研地图 -MAP_CUSTOM_VERSION=2.1.14 -MOGO_MODULE_ADAS_VERSION=2.1.14 +MAP_CUSTOM_VERSION=2.1.14.4 +MOGO_MODULE_ADAS_VERSION=2.1.14.4 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.14 -MOGO_BASE_SERVICES_APK_VERSION=2.1.14 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.14 -MOGO_MODULE_CHAT_VERSION=2.1.14 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.14.4 +MOGO_BASE_SERVICES_APK_VERSION=2.1.14.4 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.14.4 +MOGO_MODULE_CHAT_VERSION=2.1.14.4 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.14 +MOGO_MODULE_CARCHATTING_VERSION=2.1.14.4 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.14 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.14.4 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.14 -MOGO_SKIN_LIGHT_VERSION=2.1.14 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.14 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.14 -SKIN_SUPPORT_VERSION=2.1.14 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.14 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.14 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.14 -SKIN_SUPPORT_DESIGN_VERSION=2.1.14 +MOGO_SKIN_SUPPORT_VERSION=2.1.14.4 +MOGO_SKIN_LIGHT_VERSION=2.1.14.4 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.14.4 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.14.4 +SKIN_SUPPORT_VERSION=2.1.14.4 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.14.4 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.14.4 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.14.4 +SKIN_SUPPORT_DESIGN_VERSION=2.1.14.4 # OCH -MOGO_OCH_VERSION=2.1.14-test +MOGO_OCH_VERSION=2.1.14.4-test MOGO_OCH_BUS_VERSION=2.0.66 MOGO_OCH_NOOP_VERSION=2.0.66 MOGO_OCH_TAXI_VERSION=2.0.66 # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.14 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.14.4 ################# 旧版本架构模块版本 ################# diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 7fd6d9c359..0a4009ddef 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -751,8 +751,9 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) { - Log.w("DHY-location", location.getLon() + "," + location.getLat() + " AMapViewWrapper-onLocationChanged："); + Log.w("DHY-location", location.getLon() + "," + location.getLat() + " AMapViewWrapper-onLocationChanged：location"); MogoLocation mLastLocation = ObjectUtils.fromLocation(location); + Log.w("DHY-location", mLastLocation.getLongitude() + "," + mLastLocation.getLatitude() + " AMapViewWrapper-onLocationChanged：mLastLocation"); UiThreadHandler.post(() -> CallerMapLocationListenerManager.INSTANCE.invokeMapLocationChangeListener(mLastLocation)); Location sysLocation = new Location(location.getProvider()); diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java index c07448e51f..00910d457c 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/location/ALocationClient.java @@ -114,7 +114,7 @@ public class ALocationClient implements IMogoLocationClient { @Override public void onLocationChanged( @NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location ) { - Log.w("DHY-location", location.getLon() + "," + location.getLat() + " ALocationClient-onLocationChanged"); + Log.w("DHY-location", location.getLon() + "," + location.getLat() + " ALocationClient-onLocationChanged:location"); if ( mIsDestroyed ) { destroyWarming(); return; @@ -126,6 +126,7 @@ public class ALocationClient implements IMogoLocationClient { } Trace.beginSection( "timer.onLocationChanged" ); mLastLocation = ObjectUtils.fromLocation( location ); + Log.w("DHY-location", mLastLocation.getLongitude() + "," + mLastLocation.getLatitude() + " ALocationClient-onLocationChanged:mLastLocation"); UiThreadHandler.post(() -> CallerMapLocationListenerManager.INSTANCE.invokeMapLocationChangeListener(mLastLocation)); Set< IMogoLocationListener > listeners = MogoLocationListenerRegister.getInstance().getListeners(); @@ -152,16 +153,7 @@ public class ALocationClient implements IMogoLocationClient { return; } if (locationToUpdate instanceof RTKAutopilotLocationBean) { - MogoLocation last = getLastKnowLocation(); RTKAutopilotLocationBean current = (RTKAutopilotLocationBean) locationToUpdate; - boolean isNeedUpdate = (last == null || last.getLatitude() != current.getLat() || last.getLongitude() != current.getLon()); - if (!isNeedUpdate) { - return; - } - if (last != null) { - last.setLatitude(current.getLat()); - last.setLongitude(current.getLon()); - } if (mClient != null) { mClient.updateRTKAutoPilotLocation(current); }