From 6210d20432863acc1693dd698a72e4ef81f06785 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 14 Dec 2021 17:28:11 +0800 Subject: [PATCH 01/13] fix bug of vip loc --- .../core/function/v2x/vip/VipCarManager.kt | 33 ++++++++----------- .../impl/custom/location/ALocationClient.java | 2 +- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index dd79d5f32c..a60f127288 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -6,7 +6,6 @@ import android.os.Handler import android.os.Looper import android.os.Message import com.mogo.cloud.commons.utils.CoordinateUtils -import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.eagle.core.data.trafficlight.* import com.mogo.eagle.core.data.v2x.VipMessage import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener @@ -16,7 +15,6 @@ import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightListenerMa import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager import com.mogo.eagle.core.function.v2x.trafficlight.core.MogoTrafficLightManager import com.mogo.eagle.core.function.v2x.vip.network.VipNetWorkModel -import com.mogo.map.navi.IMogoCarLocationChangedListener2 import com.mogo.module.common.MogoApisHandler import com.mogo.module.common.enums.EventTypeEnum import com.mogo.service.cloud.socket.IMogoOnMessageListener @@ -25,7 +23,7 @@ import com.mogo.utils.logger.Logger import kotlin.math.abs class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListener, - IMogoCarLocationChangedListener2, Handler.Callback { + Handler.Callback { companion object { @@ -55,8 +53,6 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe fun initServer(context: Context) { mContext = context - MogoApisHandler.getInstance() - .apis.registerCenterApi.registerCarLocationChangedListener(TAG, this) MogoApisHandler.getInstance() .apis.getSocketManagerApi(context) .registerOnMessageListener(401025, this) @@ -109,7 +105,10 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe return } if (trafficLightResult.currentRoadTrafficLight() == null) { - Logger.d(TAG, "vip 获取到灯态，但没找到对应车道数据 result : $trafficLightResult , then resetConditions") + Logger.d( + TAG, + "vip 获取到灯态，但没找到对应车道数据 result : $trafficLightResult , then resetConditions" + ) resetConditions() return } @@ -132,7 +131,7 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe lastResult?.let { //如果上次结果和本次灯态结果变化比较大，则已变灯，控制HMI展示弹窗 if (abs(currentResult!!.remain - it.remain) > 5) { - Logger.d(TAG,"调用showWarningV2X to show") + Logger.d(TAG, "调用showWarningV2X to show") CallerHmiManager.showWarningV2X(EventTypeEnum.TYPE_VIP_IDENTIFICATION.poiType.toInt(), EventTypeEnum.TYPE_VIP_IDENTIFICATION.content, EventTypeEnum.TYPE_VIP_IDENTIFICATION.tts, @@ -233,12 +232,15 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe private fun turnLight(controlTime: Int) { result?.let { + val bearing = + MogoApisHandler.getInstance().apis.mapServiceApi.getSingletonLocationClient(mContext).lastKnowLocation.bearing.toDouble() + Logger.d(TAG, "turnLight -- bearing : $bearing") MogoTrafficLightManager.INSTANCE.turnLightToGreen( - it.lightId, - it.crossId, - mLocation!!.bearing.toDouble(), controlTime, { + it.lightId, it.crossId, bearing, controlTime, + { Logger.d(TAG, "变灯请求成功") - }, { errorMsg -> + }, + { errorMsg -> Logger.e(TAG, "变灯请求失败 msg : $errorMsg") }) } @@ -250,13 +252,4 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe mContext = null } - override fun onCarLocationChanged(latLng: MogoLatLng?) { - } - - override fun onCarLocationChanged2(latLng: Location?) { - latLng?.let { - mLocation = it - } - } - } \ No newline at end of file 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 fce687b201..c07448e51f 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 @@ -32,7 +32,7 @@ public class ALocationClient implements IMogoLocationClient { private static final String TAG = "ALocationClient"; private MogoLocation mLastLocation; - private LocationListener mListener = new InternalLocationListener(); + private final LocationListener mListener = new InternalLocationListener(); private boolean mIsDestroyed = false; From 3970b7cbca17a2ea5336452bae5f2041f83ac3ec Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 14 Dec 2021 17:40:56 +0800 Subject: [PATCH 02/13] fix ui bug --- .../src/main/res/layout/fragment_hmi.xml | 7 ++++--- .../src/main/res/values-xhdpi-2560x1440/dimens.xml | 3 ++- core/mogo-core-res/src/main/res/values/dimens.xml | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml index 599d5fc18c..0759c0cf14 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml @@ -37,10 +37,11 @@ android:id="@+id/flVipIdentificationView" android:layout_width="@dimen/module_vip_width" android:layout_height="@dimen/module_vip_height" - android:layout_marginLeft="@dimen/module_vip_margin_left" + android:layout_marginStart="@dimen/module_vip_margin_left" + android:layout_marginTop="@dimen/module_vip_margin_top" android:visibility="gone" - app:layout_constraintLeft_toRightOf="@+id/viewSpeedChart" - app:layout_constraintTop_toTopOf="@+id/viewSpeedChart" /> + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> 104px 104px - 40px + 380px + 40px 30px 130px diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index ea0737eca0..9ed1ff483c 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -11,7 +11,8 @@ 104px 104px - 40px + 380px + 40px 20px 110px From a8af0ca462b62575f0ce115f76cc15d06e83eafb Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 15 Dec 2021 18:16:26 +0800 Subject: [PATCH 03/13] =?UTF-8?q?[Update]=20=E4=BF=AE=E5=A4=8Dbug=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=BB=99210=E7=89=88=E6=9C=AC=E7=BD=91=E7=BA=A6?= =?UTF-8?q?=E8=BD=A6=E4=BD=BF=E7=94=A8=200.0.45.1=202.1.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- gradle.properties | 160 +++++++++++++++++++++++----------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7405745991..68a17acb1a 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.3-fix.aar +android.jetifier.blacklist=module-service-2.1.3.1.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.14 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45-fix -MOGO_CORE_DATA_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_API_VERSION=0.0.45-fix -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45-fix -MOGO_CORE_RES_VERSION=0.0.45-fix -MOGO_CORE_UTILS_VERSION=0.0.45-fix -MOGO_CORE_NETWORK_VERSION=0.0.45-fix +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.1 +MOGO_CORE_DATA_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_API_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.1 +MOGO_CORE_RES_VERSION=0.0.45.1 +MOGO_CORE_UTILS_VERSION=0.0.45.1 +MOGO_CORE_NETWORK_VERSION=0.0.45.1 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.3-fix -MOGO_UTILS_VERSION=2.1.3-fix -MAP_AMAP_VERSION=2.1.3-fix -MAP_AUTONAVI_VERSION=2.1.3-fix -MOGO_MAP_VERSION=2.1.3-fix -MOGO_MAP_API_VERSION=2.1.3-fix -MOGO_SERVICE_VERSION=2.1.3-fix -MOGO_SERVICE_API_VERSION=2.1.3-fix -MOGO_CONNECTION_VERSION=2.1.3-fix -MOGO_MODULE_APPS_VERSION=2.1.3-fix -MOGO_MODULE_NAVI_VERSION=2.1.3-fix -MOGO_MODULE_SHARE_VERSION=2.1.3-fix -MOGO_MODULE_COMMON_VERSION=2.1.3-fix -MOGO_MODULE_MAIN_VERSION=2.1.3-fix -MOGO_MODULE_MAP_VERSION=2.1.3-fix -MOGO_MODULE_SERVICE_VERSION=2.1.3-fix -MOGO_MODULE_EXTENSIONS_VERSION=2.1.3-fix -MOGO_MODULE_SEARCH_VERSION=2.1.3-fix -MOGO_MODULE_BACK_VERSION=2.1.3-fix -MOGO_MODULE_V2X_VERSION=2.1.3-fix +MOGO_COMMONS_VERSION=2.1.3.1 +MOGO_UTILS_VERSION=2.1.3.1 +MAP_AMAP_VERSION=2.1.3.1 +MAP_AUTONAVI_VERSION=2.1.3.1 +MOGO_MAP_VERSION=2.1.3.1 +MOGO_MAP_API_VERSION=2.1.3.1 +MOGO_SERVICE_VERSION=2.1.3.1 +MOGO_SERVICE_API_VERSION=2.1.3.1 +MOGO_CONNECTION_VERSION=2.1.3.1 +MOGO_MODULE_APPS_VERSION=2.1.3.1 +MOGO_MODULE_NAVI_VERSION=2.1.3.1 +MOGO_MODULE_SHARE_VERSION=2.1.3.1 +MOGO_MODULE_COMMON_VERSION=2.1.3.1 +MOGO_MODULE_MAIN_VERSION=2.1.3.1 +MOGO_MODULE_MAP_VERSION=2.1.3.1 +MOGO_MODULE_SERVICE_VERSION=2.1.3.1 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.1 +MOGO_MODULE_SEARCH_VERSION=2.1.3.1 +MOGO_MODULE_BACK_VERSION=2.1.3.1 +MOGO_MODULE_V2X_VERSION=2.1.3.1 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.3-fix +MOGO_MODULE_TANLU_VERSION=2.1.3.1 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.3-fix -MOGO_MODULE_PUSH_BASE_VERSION=2.1.3-fix -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3-fix +MOGO_MODULE_PUSH_VERSION=2.1.3.1 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.1 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.1 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.3-fix -MOGO_TANLU_API_VERSION=2.1.3-fix +TANLULIB_VERSION=2.1.3.1 +MOGO_TANLU_API_VERSION=2.1.3.1 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3-fix -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3-fix +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.1 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.1 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.3-fix +MOGO_MODULE_WIDGETS_VERSION=2.1.3.1 # obu -MOGO_MODULE_OBU_VERSION=2.1.3-fix -MOGO_MODULE_OBU_MOGO_VERSION=2.1.3-fix +MOGO_MODULE_OBU_VERSION=2.1.3.1 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.1 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.3-fix +MOGO_MODULE_MONITOR_VERSION=2.1.3.1 # bugly -CRASHREPORT_VERSION=2.1.3-fix -CRASHREPORT_BUGLY_VERSION=2.1.3-fix -CRASHREPORT_NOOP_VERSION=2.1.3-fix -CRASHREPORT_UPGRADE_VERSION=2.1.3-fix +CRASHREPORT_VERSION=2.1.3.1 +CRASHREPORT_BUGLY_VERSION=2.1.3.1 +CRASHREPORT_NOOP_VERSION=2.1.3.1 +CRASHREPORT_UPGRADE_VERSION=2.1.3.1 ## tts -TTS_BASE_VERSION=2.1.3-fix -TTS_DI_VERSION=2.1.3-fix -TTS_ZHI_VERSION=2.1.3-fix -TTS_PAD_VERSION=2.1.3-fix -TTS_NOOP_VERSION=2.1.3-fix +TTS_BASE_VERSION=2.1.3.1 +TTS_DI_VERSION=2.1.3.1 +TTS_ZHI_VERSION=2.1.3.1 +TTS_PAD_VERSION=2.1.3.1 +TTS_NOOP_VERSION=2.1.3.1 # 自研地图 -MAP_CUSTOM_VERSION=2.1.3-fix -MOGO_MODULE_ADAS_VERSION=2.1.3-fix +MAP_CUSTOM_VERSION=2.1.3.1 +MOGO_MODULE_ADAS_VERSION=2.1.3.1 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3-fix -MOGO_BASE_SERVICES_APK_VERSION=2.1.3-fix -MOGO_BASE_SERVICES_SDK_VERSION=2.1.3-fix -MOGO_MODULE_CHAT_VERSION=2.1.3-fix +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.1 +MOGO_BASE_SERVICES_APK_VERSION=2.1.3.1 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.1 +MOGO_MODULE_CHAT_VERSION=2.1.3.1 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.3-fix +MOGO_MODULE_CARCHATTING_VERSION=2.1.3.1 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3-fix +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.1 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.3-fix -MOGO_SKIN_LIGHT_VERSION=2.1.3-fix -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3-fix -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3-fix -SKIN_SUPPORT_VERSION=2.1.3-fix -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3-fix -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3-fix -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3-fix -SKIN_SUPPORT_DESIGN_VERSION=2.1.3-fix +MOGO_SKIN_SUPPORT_VERSION=2.1.3.1 +MOGO_SKIN_LIGHT_VERSION=2.1.3.1 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.1 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.1 +SKIN_SUPPORT_VERSION=2.1.3.1 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.1 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.1 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.1 +SKIN_SUPPORT_DESIGN_VERSION=2.1.3.1 # OCH -MOGO_OCH_VERSION=2.1.3-fix-test -MOGO_OCH_BUS_VERSION=2.1.3-fix-test -MOGO_OCH_NOOP_VERSION=2.1.3-fix-test -MOGO_OCH_TAXI_VERSION=2.1.3-fix-test +MOGO_OCH_VERSION=2.1.3.1-test +MOGO_OCH_BUS_VERSION=2.1.3.1-test +MOGO_OCH_NOOP_VERSION=2.1.3.1-test +MOGO_OCH_TAXI_VERSION=2.1.3.1-test # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3-fix +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.1 ################# 旧版本架构模块版本 ################# From 3c50dc8c9ffa03a57005817a2a78e8693af637f1 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 15 Dec 2021 19:32:58 +0800 Subject: [PATCH 04/13] =?UTF-8?q?[Change]=E4=BF=AE=E6=94=B9=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 68a17acb1a..64513995a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -USE_MAVEN_PACKAGE=true +USE_MAVEN_PACKAGE=false ##plugin 插件 android.enableR8.libraries=false android.enableR8=false @@ -127,6 +127,7 @@ MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.1 MOGO_MODULE_SEARCH_VERSION=2.1.3.1 MOGO_MODULE_BACK_VERSION=2.1.3.1 MOGO_MODULE_V2X_VERSION=2.1.3.1 + # 探路 MOGO_MODULE_TANLU_VERSION=2.1.3.1 # 推送 From 9abdffb087b0822f0d13ed40a31c347d215d4b62 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 15 Dec 2021 19:48:35 +0800 Subject: [PATCH 05/13] =?UTF-8?q?[Fix]=E5=AF=B9=E4=BA=8EwarningContent?= =?UTF-8?q?=E5=92=8Ctts=E4=B8=BAnull=E6=88=96=E7=A9=BA=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E6=97=B6=E4=B8=8D=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 ca8a5bf68d..69d03baac8 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 @@ -209,12 +209,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) From 416e0ab69310c9eb4d35e8c08c8663a35dbf17c2 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 15 Dec 2021 20:07:50 +0800 Subject: [PATCH 06/13] =?UTF-8?q?[Upload]=20=E7=BB=992.1.0=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=A9=BA=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=BC=B9=E7=AA=97bug=200.0.45.2=202.1.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- gradle.properties | 162 +++++++++++++++++++++++----------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/gradle.properties b/gradle.properties index 64513995a6..bb386b5a61 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,14 +37,14 @@ 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.3.1.aar +android.jetifier.blacklist=module-service-2.1.3.2.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -USE_MAVEN_PACKAGE=false +USE_MAVEN_PACKAGE=true ##plugin 插件 android.enableR8.libraries=false android.enableR8=false @@ -89,103 +89,103 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.14 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.1 -MOGO_CORE_DATA_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_API_VERSION=0.0.45.1 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.1 -MOGO_CORE_RES_VERSION=0.0.45.1 -MOGO_CORE_UTILS_VERSION=0.0.45.1 -MOGO_CORE_NETWORK_VERSION=0.0.45.1 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.2 +MOGO_CORE_DATA_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_API_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.2 +MOGO_CORE_RES_VERSION=0.0.45.2 +MOGO_CORE_UTILS_VERSION=0.0.45.2 +MOGO_CORE_NETWORK_VERSION=0.0.45.2 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.3.1 -MOGO_UTILS_VERSION=2.1.3.1 -MAP_AMAP_VERSION=2.1.3.1 -MAP_AUTONAVI_VERSION=2.1.3.1 -MOGO_MAP_VERSION=2.1.3.1 -MOGO_MAP_API_VERSION=2.1.3.1 -MOGO_SERVICE_VERSION=2.1.3.1 -MOGO_SERVICE_API_VERSION=2.1.3.1 -MOGO_CONNECTION_VERSION=2.1.3.1 -MOGO_MODULE_APPS_VERSION=2.1.3.1 -MOGO_MODULE_NAVI_VERSION=2.1.3.1 -MOGO_MODULE_SHARE_VERSION=2.1.3.1 -MOGO_MODULE_COMMON_VERSION=2.1.3.1 -MOGO_MODULE_MAIN_VERSION=2.1.3.1 -MOGO_MODULE_MAP_VERSION=2.1.3.1 -MOGO_MODULE_SERVICE_VERSION=2.1.3.1 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.1 -MOGO_MODULE_SEARCH_VERSION=2.1.3.1 -MOGO_MODULE_BACK_VERSION=2.1.3.1 -MOGO_MODULE_V2X_VERSION=2.1.3.1 +MOGO_COMMONS_VERSION=2.1.3.2 +MOGO_UTILS_VERSION=2.1.3.2 +MAP_AMAP_VERSION=2.1.3.2 +MAP_AUTONAVI_VERSION=2.1.3.2 +MOGO_MAP_VERSION=2.1.3.2 +MOGO_MAP_API_VERSION=2.1.3.2 +MOGO_SERVICE_VERSION=2.1.3.2 +MOGO_SERVICE_API_VERSION=2.1.3.2 +MOGO_CONNECTION_VERSION=2.1.3.2 +MOGO_MODULE_APPS_VERSION=2.1.3.2 +MOGO_MODULE_NAVI_VERSION=2.1.3.2 +MOGO_MODULE_SHARE_VERSION=2.1.3.2 +MOGO_MODULE_COMMON_VERSION=2.1.3.2 +MOGO_MODULE_MAIN_VERSION=2.1.3.2 +MOGO_MODULE_MAP_VERSION=2.1.3.2 +MOGO_MODULE_SERVICE_VERSION=2.1.3.2 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.2 +MOGO_MODULE_SEARCH_VERSION=2.1.3.2 +MOGO_MODULE_BACK_VERSION=2.1.3.2 +MOGO_MODULE_V2X_VERSION=2.1.3.2 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.3.1 +MOGO_MODULE_TANLU_VERSION=2.1.3.2 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.3.1 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.1 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.1 +MOGO_MODULE_PUSH_VERSION=2.1.3.2 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.2 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.2 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.3.1 -MOGO_TANLU_API_VERSION=2.1.3.1 +TANLULIB_VERSION=2.1.3.2 +MOGO_TANLU_API_VERSION=2.1.3.2 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.1 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.1 +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.2 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.2 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.3.1 +MOGO_MODULE_WIDGETS_VERSION=2.1.3.2 # obu -MOGO_MODULE_OBU_VERSION=2.1.3.1 -MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.1 +MOGO_MODULE_OBU_VERSION=2.1.3.2 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.2 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.3.1 +MOGO_MODULE_MONITOR_VERSION=2.1.3.2 # bugly -CRASHREPORT_VERSION=2.1.3.1 -CRASHREPORT_BUGLY_VERSION=2.1.3.1 -CRASHREPORT_NOOP_VERSION=2.1.3.1 -CRASHREPORT_UPGRADE_VERSION=2.1.3.1 +CRASHREPORT_VERSION=2.1.3.2 +CRASHREPORT_BUGLY_VERSION=2.1.3.2 +CRASHREPORT_NOOP_VERSION=2.1.3.2 +CRASHREPORT_UPGRADE_VERSION=2.1.3.2 ## tts -TTS_BASE_VERSION=2.1.3.1 -TTS_DI_VERSION=2.1.3.1 -TTS_ZHI_VERSION=2.1.3.1 -TTS_PAD_VERSION=2.1.3.1 -TTS_NOOP_VERSION=2.1.3.1 +TTS_BASE_VERSION=2.1.3.2 +TTS_DI_VERSION=2.1.3.2 +TTS_ZHI_VERSION=2.1.3.2 +TTS_PAD_VERSION=2.1.3.2 +TTS_NOOP_VERSION=2.1.3.2 # 自研地图 -MAP_CUSTOM_VERSION=2.1.3.1 -MOGO_MODULE_ADAS_VERSION=2.1.3.1 +MAP_CUSTOM_VERSION=2.1.3.2 +MOGO_MODULE_ADAS_VERSION=2.1.3.2 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.1 -MOGO_BASE_SERVICES_APK_VERSION=2.1.3.1 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.1 -MOGO_MODULE_CHAT_VERSION=2.1.3.1 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.2 +MOGO_BASE_SERVICES_APK_VERSION=2.1.3.2 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.2 +MOGO_MODULE_CHAT_VERSION=2.1.3.2 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.3.1 +MOGO_MODULE_CARCHATTING_VERSION=2.1.3.2 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.1 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.2 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.3.1 -MOGO_SKIN_LIGHT_VERSION=2.1.3.1 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.1 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.1 -SKIN_SUPPORT_VERSION=2.1.3.1 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.1 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.1 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.1 -SKIN_SUPPORT_DESIGN_VERSION=2.1.3.1 +MOGO_SKIN_SUPPORT_VERSION=2.1.3.2 +MOGO_SKIN_LIGHT_VERSION=2.1.3.2 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.2 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.2 +SKIN_SUPPORT_VERSION=2.1.3.2 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.2 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.2 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.2 +SKIN_SUPPORT_DESIGN_VERSION=2.1.3.2 # OCH -MOGO_OCH_VERSION=2.1.3.1-test -MOGO_OCH_BUS_VERSION=2.1.3.1-test -MOGO_OCH_NOOP_VERSION=2.1.3.1-test -MOGO_OCH_TAXI_VERSION=2.1.3.1-test +MOGO_OCH_VERSION=2.1.3.2-test +MOGO_OCH_BUS_VERSION=2.1.3.2-test +MOGO_OCH_NOOP_VERSION=2.1.3.2-test +MOGO_OCH_TAXI_VERSION=2.1.3.2-test # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.1 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.2 ################# 旧版本架构模块版本 ################# From 46f21fdb82c58b249cdc36ea0aa269068a6f7410 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 16 Dec 2021 14:07:16 +0800 Subject: [PATCH 07/13] fix ui bug --- .../src/main/res/values-xhdpi-2560x1440/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 95b446bb3f71809dd565b9999f8bbe672fe38fbb Mon Sep 17 00:00:00 2001 From: donghongyu Date: Thu, 16 Dec 2021 14:29:25 +0800 Subject: [PATCH 08/13] =?UTF-8?q?[Upload]=20=E7=BB=992.1.0=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86VIP=E6=A0=87?= =?UTF-8?q?=E5=BF=97=E4=BD=8D=E7=BD=AE=200.0.45.3=202.1.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- gradle.properties | 160 +++++++++++++++++++++++----------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/gradle.properties b/gradle.properties index bb386b5a61..86a37c5e88 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.3.2.aar +android.jetifier.blacklist=module-service-2.1.3.3.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -89,103 +89,103 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.14 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.2 -MOGO_CORE_DATA_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_API_VERSION=0.0.45.2 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.2 -MOGO_CORE_RES_VERSION=0.0.45.2 -MOGO_CORE_UTILS_VERSION=0.0.45.2 -MOGO_CORE_NETWORK_VERSION=0.0.45.2 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.3 +MOGO_CORE_DATA_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_API_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.3 +MOGO_CORE_RES_VERSION=0.0.45.3 +MOGO_CORE_UTILS_VERSION=0.0.45.3 +MOGO_CORE_NETWORK_VERSION=0.0.45.3 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.3.2 -MOGO_UTILS_VERSION=2.1.3.2 -MAP_AMAP_VERSION=2.1.3.2 -MAP_AUTONAVI_VERSION=2.1.3.2 -MOGO_MAP_VERSION=2.1.3.2 -MOGO_MAP_API_VERSION=2.1.3.2 -MOGO_SERVICE_VERSION=2.1.3.2 -MOGO_SERVICE_API_VERSION=2.1.3.2 -MOGO_CONNECTION_VERSION=2.1.3.2 -MOGO_MODULE_APPS_VERSION=2.1.3.2 -MOGO_MODULE_NAVI_VERSION=2.1.3.2 -MOGO_MODULE_SHARE_VERSION=2.1.3.2 -MOGO_MODULE_COMMON_VERSION=2.1.3.2 -MOGO_MODULE_MAIN_VERSION=2.1.3.2 -MOGO_MODULE_MAP_VERSION=2.1.3.2 -MOGO_MODULE_SERVICE_VERSION=2.1.3.2 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.2 -MOGO_MODULE_SEARCH_VERSION=2.1.3.2 -MOGO_MODULE_BACK_VERSION=2.1.3.2 -MOGO_MODULE_V2X_VERSION=2.1.3.2 +MOGO_COMMONS_VERSION=2.1.3.3 +MOGO_UTILS_VERSION=2.1.3.3 +MAP_AMAP_VERSION=2.1.3.3 +MAP_AUTONAVI_VERSION=2.1.3.3 +MOGO_MAP_VERSION=2.1.3.3 +MOGO_MAP_API_VERSION=2.1.3.3 +MOGO_SERVICE_VERSION=2.1.3.3 +MOGO_SERVICE_API_VERSION=2.1.3.3 +MOGO_CONNECTION_VERSION=2.1.3.3 +MOGO_MODULE_APPS_VERSION=2.1.3.3 +MOGO_MODULE_NAVI_VERSION=2.1.3.3 +MOGO_MODULE_SHARE_VERSION=2.1.3.3 +MOGO_MODULE_COMMON_VERSION=2.1.3.3 +MOGO_MODULE_MAIN_VERSION=2.1.3.3 +MOGO_MODULE_MAP_VERSION=2.1.3.3 +MOGO_MODULE_SERVICE_VERSION=2.1.3.3 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.3 +MOGO_MODULE_SEARCH_VERSION=2.1.3.3 +MOGO_MODULE_BACK_VERSION=2.1.3.3 +MOGO_MODULE_V2X_VERSION=2.1.3.3 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.3.2 +MOGO_MODULE_TANLU_VERSION=2.1.3.3 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.3.2 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.2 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.2 +MOGO_MODULE_PUSH_VERSION=2.1.3.3 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.3 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.3 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.3.2 -MOGO_TANLU_API_VERSION=2.1.3.2 +TANLULIB_VERSION=2.1.3.3 +MOGO_TANLU_API_VERSION=2.1.3.3 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.2 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.2 +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.3 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.3 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.3.2 +MOGO_MODULE_WIDGETS_VERSION=2.1.3.3 # obu -MOGO_MODULE_OBU_VERSION=2.1.3.2 -MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.2 +MOGO_MODULE_OBU_VERSION=2.1.3.3 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.3 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.3.2 +MOGO_MODULE_MONITOR_VERSION=2.1.3.3 # bugly -CRASHREPORT_VERSION=2.1.3.2 -CRASHREPORT_BUGLY_VERSION=2.1.3.2 -CRASHREPORT_NOOP_VERSION=2.1.3.2 -CRASHREPORT_UPGRADE_VERSION=2.1.3.2 +CRASHREPORT_VERSION=2.1.3.3 +CRASHREPORT_BUGLY_VERSION=2.1.3.3 +CRASHREPORT_NOOP_VERSION=2.1.3.3 +CRASHREPORT_UPGRADE_VERSION=2.1.3.3 ## tts -TTS_BASE_VERSION=2.1.3.2 -TTS_DI_VERSION=2.1.3.2 -TTS_ZHI_VERSION=2.1.3.2 -TTS_PAD_VERSION=2.1.3.2 -TTS_NOOP_VERSION=2.1.3.2 +TTS_BASE_VERSION=2.1.3.3 +TTS_DI_VERSION=2.1.3.3 +TTS_ZHI_VERSION=2.1.3.3 +TTS_PAD_VERSION=2.1.3.3 +TTS_NOOP_VERSION=2.1.3.3 # 自研地图 -MAP_CUSTOM_VERSION=2.1.3.2 -MOGO_MODULE_ADAS_VERSION=2.1.3.2 +MAP_CUSTOM_VERSION=2.1.3.3 +MOGO_MODULE_ADAS_VERSION=2.1.3.3 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.2 -MOGO_BASE_SERVICES_APK_VERSION=2.1.3.2 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.2 -MOGO_MODULE_CHAT_VERSION=2.1.3.2 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.3 +MOGO_BASE_SERVICES_APK_VERSION=2.1.3.3 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.3 +MOGO_MODULE_CHAT_VERSION=2.1.3.3 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.3.2 +MOGO_MODULE_CARCHATTING_VERSION=2.1.3.3 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.2 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.3 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.3.2 -MOGO_SKIN_LIGHT_VERSION=2.1.3.2 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.2 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.2 -SKIN_SUPPORT_VERSION=2.1.3.2 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.2 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.2 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.2 -SKIN_SUPPORT_DESIGN_VERSION=2.1.3.2 +MOGO_SKIN_SUPPORT_VERSION=2.1.3.3 +MOGO_SKIN_LIGHT_VERSION=2.1.3.3 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.3 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.3 +SKIN_SUPPORT_VERSION=2.1.3.3 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.3 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.3 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.3 +SKIN_SUPPORT_DESIGN_VERSION=2.1.3.3 # OCH -MOGO_OCH_VERSION=2.1.3.2-test -MOGO_OCH_BUS_VERSION=2.1.3.2-test -MOGO_OCH_NOOP_VERSION=2.1.3.2-test -MOGO_OCH_TAXI_VERSION=2.1.3.2-test +MOGO_OCH_VERSION=2.1.3.3-test +MOGO_OCH_BUS_VERSION=2.1.3.3-test +MOGO_OCH_NOOP_VERSION=2.1.3.3-test +MOGO_OCH_TAXI_VERSION=2.1.3.3-test # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.2 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.3 ################# 旧版本架构模块版本 ################# From 375e3fbf457651ecd11a62d58df6e8330c6b7d32 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 17 Dec 2021 12:03:46 +0800 Subject: [PATCH 09/13] =?UTF-8?q?[Fix]=20=E4=BF=AE=E5=A4=8D=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E5=9D=90=E6=A0=87=E7=B3=BB=E7=AA=81=E7=84=B6=E4=BB=8E?= =?UTF-8?q?GPS=E5=8F=98=E6=88=90WGS84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E6=98=AF=E5=9B=A0=E4=B8=BAALocationClient.mLastLocati?= =?UTF-8?q?on=E8=A2=ABupdateLocation=E4=BF=AE=E6=94=B9=E4=BA=86=E6=88=90?= =?UTF-8?q?=E4=BA=86WGS84=E5=9D=90=E6=A0=87=E7=B3=BB=E7=9A=84=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6=E4=BA=86=EF=BC=8C=E6=88=91=E4=BB=AC=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=B8=AD=E4=BD=BF=E7=94=A8=E7=9A=84=E6=98=AFLocationL?= =?UTF-8?q?istener.onLocationChanged=E5=9B=9E=E6=8E=89=E7=9A=84GPS?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E7=B3=BB=EF=BC=8C=E6=89=80=E4=BB=A5=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=9C=89=E6=97=B6=E5=80=99IMoGoMapLocationListener?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E7=9A=84onLocationChanged=EF=BC=8C=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../call/map/CallerMapLocationListenerManager.kt | 7 ++++++- .../com/mogo/map/impl/custom/AMapViewWrapper.java | 3 ++- .../map/impl/custom/location/ALocationClient.java | 12 ++---------- 3 files changed, 10 insertions(+), 12 deletions(-) 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/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 4d2703d868..acbe388f3e 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); } From fea4b104cb20e9d490a57668ccf1aa595893fd9e Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 17 Dec 2021 12:13:23 +0800 Subject: [PATCH 10/13] =?UTF-8?q?[Upload]=200.0.45.4=202.1.3.4=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=87=AA=E8=BD=A6=E4=BD=8D=E7=BD=AE=E5=9B=9E=E6=8E=89?= =?UTF-8?q?=E7=AA=81=E7=84=B6=E5=8F=98=E6=88=90wgs84bug=20=E7=BB=99210?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- gradle.properties | 162 +++++++++++++++++++++++----------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/gradle.properties b/gradle.properties index 86a37c5e88..e8edb5fdba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,14 +37,14 @@ 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.3.3.aar +android.jetifier.blacklist=module-service-2.1.3.4.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -USE_MAVEN_PACKAGE=true +USE_MAVEN_PACKAGE=false ##plugin 插件 android.enableR8.libraries=false android.enableR8=false @@ -89,103 +89,103 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.14 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.3 -MOGO_CORE_DATA_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_API_VERSION=0.0.45.3 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.3 -MOGO_CORE_RES_VERSION=0.0.45.3 -MOGO_CORE_UTILS_VERSION=0.0.45.3 -MOGO_CORE_NETWORK_VERSION=0.0.45.3 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.4 +MOGO_CORE_DATA_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_API_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.4 +MOGO_CORE_RES_VERSION=0.0.45.4 +MOGO_CORE_UTILS_VERSION=0.0.45.4 +MOGO_CORE_NETWORK_VERSION=0.0.45.4 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.3.3 -MOGO_UTILS_VERSION=2.1.3.3 -MAP_AMAP_VERSION=2.1.3.3 -MAP_AUTONAVI_VERSION=2.1.3.3 -MOGO_MAP_VERSION=2.1.3.3 -MOGO_MAP_API_VERSION=2.1.3.3 -MOGO_SERVICE_VERSION=2.1.3.3 -MOGO_SERVICE_API_VERSION=2.1.3.3 -MOGO_CONNECTION_VERSION=2.1.3.3 -MOGO_MODULE_APPS_VERSION=2.1.3.3 -MOGO_MODULE_NAVI_VERSION=2.1.3.3 -MOGO_MODULE_SHARE_VERSION=2.1.3.3 -MOGO_MODULE_COMMON_VERSION=2.1.3.3 -MOGO_MODULE_MAIN_VERSION=2.1.3.3 -MOGO_MODULE_MAP_VERSION=2.1.3.3 -MOGO_MODULE_SERVICE_VERSION=2.1.3.3 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.3 -MOGO_MODULE_SEARCH_VERSION=2.1.3.3 -MOGO_MODULE_BACK_VERSION=2.1.3.3 -MOGO_MODULE_V2X_VERSION=2.1.3.3 +MOGO_COMMONS_VERSION=2.1.3.4 +MOGO_UTILS_VERSION=2.1.3.4 +MAP_AMAP_VERSION=2.1.3.4 +MAP_AUTONAVI_VERSION=2.1.3.4 +MOGO_MAP_VERSION=2.1.3.4 +MOGO_MAP_API_VERSION=2.1.3.4 +MOGO_SERVICE_VERSION=2.1.3.4 +MOGO_SERVICE_API_VERSION=2.1.3.4 +MOGO_CONNECTION_VERSION=2.1.3.4 +MOGO_MODULE_APPS_VERSION=2.1.3.4 +MOGO_MODULE_NAVI_VERSION=2.1.3.4 +MOGO_MODULE_SHARE_VERSION=2.1.3.4 +MOGO_MODULE_COMMON_VERSION=2.1.3.4 +MOGO_MODULE_MAIN_VERSION=2.1.3.4 +MOGO_MODULE_MAP_VERSION=2.1.3.4 +MOGO_MODULE_SERVICE_VERSION=2.1.3.4 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.4 +MOGO_MODULE_SEARCH_VERSION=2.1.3.4 +MOGO_MODULE_BACK_VERSION=2.1.3.4 +MOGO_MODULE_V2X_VERSION=2.1.3.4 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.3.3 +MOGO_MODULE_TANLU_VERSION=2.1.3.4 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.3.3 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.3 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.3 +MOGO_MODULE_PUSH_VERSION=2.1.3.4 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.4 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.4 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.3.3 -MOGO_TANLU_API_VERSION=2.1.3.3 +TANLULIB_VERSION=2.1.3.4 +MOGO_TANLU_API_VERSION=2.1.3.4 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.3 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.3 +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.4 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.4 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.3.3 +MOGO_MODULE_WIDGETS_VERSION=2.1.3.4 # obu -MOGO_MODULE_OBU_VERSION=2.1.3.3 -MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.3 +MOGO_MODULE_OBU_VERSION=2.1.3.4 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.4 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.3.3 +MOGO_MODULE_MONITOR_VERSION=2.1.3.4 # bugly -CRASHREPORT_VERSION=2.1.3.3 -CRASHREPORT_BUGLY_VERSION=2.1.3.3 -CRASHREPORT_NOOP_VERSION=2.1.3.3 -CRASHREPORT_UPGRADE_VERSION=2.1.3.3 +CRASHREPORT_VERSION=2.1.3.4 +CRASHREPORT_BUGLY_VERSION=2.1.3.4 +CRASHREPORT_NOOP_VERSION=2.1.3.4 +CRASHREPORT_UPGRADE_VERSION=2.1.3.4 ## tts -TTS_BASE_VERSION=2.1.3.3 -TTS_DI_VERSION=2.1.3.3 -TTS_ZHI_VERSION=2.1.3.3 -TTS_PAD_VERSION=2.1.3.3 -TTS_NOOP_VERSION=2.1.3.3 +TTS_BASE_VERSION=2.1.3.4 +TTS_DI_VERSION=2.1.3.4 +TTS_ZHI_VERSION=2.1.3.4 +TTS_PAD_VERSION=2.1.3.4 +TTS_NOOP_VERSION=2.1.3.4 # 自研地图 -MAP_CUSTOM_VERSION=2.1.3.3 -MOGO_MODULE_ADAS_VERSION=2.1.3.3 +MAP_CUSTOM_VERSION=2.1.3.4 +MOGO_MODULE_ADAS_VERSION=2.1.3.4 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.3 -MOGO_BASE_SERVICES_APK_VERSION=2.1.3.3 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.3 -MOGO_MODULE_CHAT_VERSION=2.1.3.3 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.4 +MOGO_BASE_SERVICES_APK_VERSION=2.1.3.4 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.4 +MOGO_MODULE_CHAT_VERSION=2.1.3.4 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.3.3 +MOGO_MODULE_CARCHATTING_VERSION=2.1.3.4 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.3 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.4 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.3.3 -MOGO_SKIN_LIGHT_VERSION=2.1.3.3 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.3 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.3 -SKIN_SUPPORT_VERSION=2.1.3.3 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.3 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.3 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.3 -SKIN_SUPPORT_DESIGN_VERSION=2.1.3.3 +MOGO_SKIN_SUPPORT_VERSION=2.1.3.4 +MOGO_SKIN_LIGHT_VERSION=2.1.3.4 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.4 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.4 +SKIN_SUPPORT_VERSION=2.1.3.4 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.4 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.4 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.4 +SKIN_SUPPORT_DESIGN_VERSION=2.1.3.4 # OCH -MOGO_OCH_VERSION=2.1.3.3-test -MOGO_OCH_BUS_VERSION=2.1.3.3-test -MOGO_OCH_NOOP_VERSION=2.1.3.3-test -MOGO_OCH_TAXI_VERSION=2.1.3.3-test +MOGO_OCH_VERSION=2.1.3.4-test +MOGO_OCH_BUS_VERSION=2.1.3.4-test +MOGO_OCH_NOOP_VERSION=2.1.3.4-test +MOGO_OCH_TAXI_VERSION=2.1.3.4-test # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.3 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.4 ################# 旧版本架构模块版本 ################# From ea9c350164db878957bf8875985e9b031c666cab Mon Sep 17 00:00:00 2001 From: martindhy Date: Sun, 19 Dec 2021 00:18:28 +0800 Subject: [PATCH 11/13] =?UTF-8?q?[Upload]=20=E5=8D=87=E7=BA=A7=E9=AB=98?= =?UTF-8?q?=E7=B2=BE=E5=9C=B0=E5=9B=BE=E7=89=88=E6=9C=AC=EF=BC=8C2.0.0.16?= =?UTF-8?q?=20=E6=97=A5=E5=BF=97=201.=E4=BF=AE=E6=94=B9bug=202.=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E8=BD=A6=E5=8A=A8=E7=94=BB=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=88=E9=BB=98=E8=AE=A4=E5=85=B3=E9=97=AD=EF=BC=89?= =?UTF-8?q?=20=E5=8F=91=E5=B8=83Maven=E7=89=88=E6=9C=AC=E4=BE=9B=20210=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=200.0.45.5=202.1.3.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 164 +++++++++++++++++++++++----------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/gradle.properties b/gradle.properties index e8edb5fdba..3ef900d78c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,14 +37,14 @@ 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.3.4.aar +android.jetifier.blacklist=module-service-2.1.3.5.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -USE_MAVEN_PACKAGE=false +USE_MAVEN_PACKAGE=true ##plugin 插件 android.enableR8.libraries=false android.enableR8=false @@ -80,7 +80,7 @@ MOGO_TRAFFICLIVE_VERSION=1.3.13 MOGO_LOCATION_VERSION=1.3.13 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.0.0.12 +MAP_SDK_VERSION=2.0.0.16 # websocket WEBSOCKET_VERSION=1.1.7 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 @@ -89,103 +89,103 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.14 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.4 -MOGO_CORE_DATA_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_API_VERSION=0.0.45.4 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.4 -MOGO_CORE_RES_VERSION=0.0.45.4 -MOGO_CORE_UTILS_VERSION=0.0.45.4 -MOGO_CORE_NETWORK_VERSION=0.0.45.4 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.5 +MOGO_CORE_DATA_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_API_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.5 +MOGO_CORE_RES_VERSION=0.0.45.5 +MOGO_CORE_UTILS_VERSION=0.0.45.5 +MOGO_CORE_NETWORK_VERSION=0.0.45.5 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.3.4 -MOGO_UTILS_VERSION=2.1.3.4 -MAP_AMAP_VERSION=2.1.3.4 -MAP_AUTONAVI_VERSION=2.1.3.4 -MOGO_MAP_VERSION=2.1.3.4 -MOGO_MAP_API_VERSION=2.1.3.4 -MOGO_SERVICE_VERSION=2.1.3.4 -MOGO_SERVICE_API_VERSION=2.1.3.4 -MOGO_CONNECTION_VERSION=2.1.3.4 -MOGO_MODULE_APPS_VERSION=2.1.3.4 -MOGO_MODULE_NAVI_VERSION=2.1.3.4 -MOGO_MODULE_SHARE_VERSION=2.1.3.4 -MOGO_MODULE_COMMON_VERSION=2.1.3.4 -MOGO_MODULE_MAIN_VERSION=2.1.3.4 -MOGO_MODULE_MAP_VERSION=2.1.3.4 -MOGO_MODULE_SERVICE_VERSION=2.1.3.4 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.4 -MOGO_MODULE_SEARCH_VERSION=2.1.3.4 -MOGO_MODULE_BACK_VERSION=2.1.3.4 -MOGO_MODULE_V2X_VERSION=2.1.3.4 +MOGO_COMMONS_VERSION=2.1.3.5 +MOGO_UTILS_VERSION=2.1.3.5 +MAP_AMAP_VERSION=2.1.3.5 +MAP_AUTONAVI_VERSION=2.1.3.5 +MOGO_MAP_VERSION=2.1.3.5 +MOGO_MAP_API_VERSION=2.1.3.5 +MOGO_SERVICE_VERSION=2.1.3.5 +MOGO_SERVICE_API_VERSION=2.1.3.5 +MOGO_CONNECTION_VERSION=2.1.3.5 +MOGO_MODULE_APPS_VERSION=2.1.3.5 +MOGO_MODULE_NAVI_VERSION=2.1.3.5 +MOGO_MODULE_SHARE_VERSION=2.1.3.5 +MOGO_MODULE_COMMON_VERSION=2.1.3.5 +MOGO_MODULE_MAIN_VERSION=2.1.3.5 +MOGO_MODULE_MAP_VERSION=2.1.3.5 +MOGO_MODULE_SERVICE_VERSION=2.1.3.5 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.5 +MOGO_MODULE_SEARCH_VERSION=2.1.3.5 +MOGO_MODULE_BACK_VERSION=2.1.3.5 +MOGO_MODULE_V2X_VERSION=2.1.3.5 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.3.4 +MOGO_MODULE_TANLU_VERSION=2.1.3.5 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.3.4 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.4 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.4 +MOGO_MODULE_PUSH_VERSION=2.1.3.5 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.5 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.5 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.3.4 -MOGO_TANLU_API_VERSION=2.1.3.4 +TANLULIB_VERSION=2.1.3.5 +MOGO_TANLU_API_VERSION=2.1.3.5 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.4 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.4 +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.5 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.5 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.3.4 +MOGO_MODULE_WIDGETS_VERSION=2.1.3.5 # obu -MOGO_MODULE_OBU_VERSION=2.1.3.4 -MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.4 +MOGO_MODULE_OBU_VERSION=2.1.3.5 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.5 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.3.4 +MOGO_MODULE_MONITOR_VERSION=2.1.3.5 # bugly -CRASHREPORT_VERSION=2.1.3.4 -CRASHREPORT_BUGLY_VERSION=2.1.3.4 -CRASHREPORT_NOOP_VERSION=2.1.3.4 -CRASHREPORT_UPGRADE_VERSION=2.1.3.4 +CRASHREPORT_VERSION=2.1.3.5 +CRASHREPORT_BUGLY_VERSION=2.1.3.5 +CRASHREPORT_NOOP_VERSION=2.1.3.5 +CRASHREPORT_UPGRADE_VERSION=2.1.3.5 ## tts -TTS_BASE_VERSION=2.1.3.4 -TTS_DI_VERSION=2.1.3.4 -TTS_ZHI_VERSION=2.1.3.4 -TTS_PAD_VERSION=2.1.3.4 -TTS_NOOP_VERSION=2.1.3.4 +TTS_BASE_VERSION=2.1.3.5 +TTS_DI_VERSION=2.1.3.5 +TTS_ZHI_VERSION=2.1.3.5 +TTS_PAD_VERSION=2.1.3.5 +TTS_NOOP_VERSION=2.1.3.5 # 自研地图 -MAP_CUSTOM_VERSION=2.1.3.4 -MOGO_MODULE_ADAS_VERSION=2.1.3.4 +MAP_CUSTOM_VERSION=2.1.3.5 +MOGO_MODULE_ADAS_VERSION=2.1.3.5 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.4 -MOGO_BASE_SERVICES_APK_VERSION=2.1.3.4 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.4 -MOGO_MODULE_CHAT_VERSION=2.1.3.4 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.5 +MOGO_BASE_SERVICES_APK_VERSION=2.1.3.5 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.5 +MOGO_MODULE_CHAT_VERSION=2.1.3.5 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.3.4 +MOGO_MODULE_CARCHATTING_VERSION=2.1.3.5 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.4 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.5 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.3.4 -MOGO_SKIN_LIGHT_VERSION=2.1.3.4 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.4 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.4 -SKIN_SUPPORT_VERSION=2.1.3.4 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.4 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.4 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.4 -SKIN_SUPPORT_DESIGN_VERSION=2.1.3.4 +MOGO_SKIN_SUPPORT_VERSION=2.1.3.5 +MOGO_SKIN_LIGHT_VERSION=2.1.3.5 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.5 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.5 +SKIN_SUPPORT_VERSION=2.1.3.5 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.5 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.5 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.5 +SKIN_SUPPORT_DESIGN_VERSION=2.1.3.5 # OCH -MOGO_OCH_VERSION=2.1.3.4-test -MOGO_OCH_BUS_VERSION=2.1.3.4-test -MOGO_OCH_NOOP_VERSION=2.1.3.4-test -MOGO_OCH_TAXI_VERSION=2.1.3.4-test +MOGO_OCH_VERSION=2.1.3.5-test +MOGO_OCH_BUS_VERSION=2.1.3.5-test +MOGO_OCH_NOOP_VERSION=2.1.3.5-test +MOGO_OCH_TAXI_VERSION=2.1.3.5-test # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.4 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.5 ################# 旧版本架构模块版本 ################# From 59270d70c77a4bb4c800d7ae43014cb9040a6530 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 22 Dec 2021 15:20:23 +0800 Subject: [PATCH 12/13] =?UTF-8?q?[Update]=20Maven=20=E7=89=88=E6=9C=AC=200?= =?UTF-8?q?.0.45.7=202.1.3.8=20#=20=E8=87=AA=E7=A0=94=E5=9C=B0=E5=9B=BE=20?= =?UTF-8?q?MAP=5FSDK=5FVERSION=3D2.0.0.18=20=E6=97=A5=E5=BF=97=EF=BC=9A=20?= =?UTF-8?q?1.log=E9=BB=98=E8=AE=A4=E5=BC=80=E5=85=B3false=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=BB=98=E8=AE=A4=E8=88=AA=E5=90=91=E8=A7=92=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=203.=E9=99=90=E9=80=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- gradle.properties | 162 +++++++++++++++++++++++----------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3ef900d78c..0b0b878f9c 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.3.5.aar +android.jetifier.blacklist=module-service-2.1.3.7.aar ## maven 配置 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ @@ -80,7 +80,7 @@ MOGO_TRAFFICLIVE_VERSION=1.3.13 MOGO_LOCATION_VERSION=1.3.13 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.0.0.16 +MAP_SDK_VERSION=2.0.0.18 # websocket WEBSOCKET_VERSION=1.1.7 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 @@ -89,103 +89,103 @@ applicationName=IntelligentPilot versionCode=80007 versionName=8.0.14 ################# 新架构模块Maven版本管理 ################# -MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.5 -MOGO_CORE_DATA_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_API_VERSION=0.0.45.5 -MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.5 -MOGO_CORE_RES_VERSION=0.0.45.5 -MOGO_CORE_UTILS_VERSION=0.0.45.5 -MOGO_CORE_NETWORK_VERSION=0.0.45.5 +MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_HMI_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_MAP_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_SMP_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_V2X_VERSION=0.0.45.7 +MOGO_CORE_DATA_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_API_VERSION=0.0.45.7 +MOGO_CORE_FUNCTION_CALL_VERSION=0.0.45.7 +MOGO_CORE_RES_VERSION=0.0.45.7 +MOGO_CORE_UTILS_VERSION=0.0.45.7 +MOGO_CORE_NETWORK_VERSION=0.0.45.7 ################# 旧版本架构模块版本 ################# ## 工程内模块 -MOGO_COMMONS_VERSION=2.1.3.5 -MOGO_UTILS_VERSION=2.1.3.5 -MAP_AMAP_VERSION=2.1.3.5 -MAP_AUTONAVI_VERSION=2.1.3.5 -MOGO_MAP_VERSION=2.1.3.5 -MOGO_MAP_API_VERSION=2.1.3.5 -MOGO_SERVICE_VERSION=2.1.3.5 -MOGO_SERVICE_API_VERSION=2.1.3.5 -MOGO_CONNECTION_VERSION=2.1.3.5 -MOGO_MODULE_APPS_VERSION=2.1.3.5 -MOGO_MODULE_NAVI_VERSION=2.1.3.5 -MOGO_MODULE_SHARE_VERSION=2.1.3.5 -MOGO_MODULE_COMMON_VERSION=2.1.3.5 -MOGO_MODULE_MAIN_VERSION=2.1.3.5 -MOGO_MODULE_MAP_VERSION=2.1.3.5 -MOGO_MODULE_SERVICE_VERSION=2.1.3.5 -MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.5 -MOGO_MODULE_SEARCH_VERSION=2.1.3.5 -MOGO_MODULE_BACK_VERSION=2.1.3.5 -MOGO_MODULE_V2X_VERSION=2.1.3.5 +MOGO_COMMONS_VERSION=2.1.3.8 +MOGO_UTILS_VERSION=2.1.3.8 +MAP_AMAP_VERSION=2.1.3.8 +MAP_AUTONAVI_VERSION=2.1.3.8 +MOGO_MAP_VERSION=2.1.3.8 +MOGO_MAP_API_VERSION=2.1.3.8 +MOGO_SERVICE_VERSION=2.1.3.8 +MOGO_SERVICE_API_VERSION=2.1.3.8 +MOGO_CONNECTION_VERSION=2.1.3.8 +MOGO_MODULE_APPS_VERSION=2.1.3.8 +MOGO_MODULE_NAVI_VERSION=2.1.3.8 +MOGO_MODULE_SHARE_VERSION=2.1.3.8 +MOGO_MODULE_COMMON_VERSION=2.1.3.8 +MOGO_MODULE_MAIN_VERSION=2.1.3.8 +MOGO_MODULE_MAP_VERSION=2.1.3.8 +MOGO_MODULE_SERVICE_VERSION=2.1.3.8 +MOGO_MODULE_EXTENSIONS_VERSION=2.1.3.8 +MOGO_MODULE_SEARCH_VERSION=2.1.3.8 +MOGO_MODULE_BACK_VERSION=2.1.3.8 +MOGO_MODULE_V2X_VERSION=2.1.3.8 # 探路 -MOGO_MODULE_TANLU_VERSION=2.1.3.5 +MOGO_MODULE_TANLU_VERSION=2.1.3.8 # 推送 -MOGO_MODULE_PUSH_VERSION=2.1.3.5 -MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.5 -MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.5 +MOGO_MODULE_PUSH_VERSION=2.1.3.8 +MOGO_MODULE_PUSH_BASE_VERSION=2.1.3.8 +MOGO_MODULE_PUSH_NOOP_VERSION=2.1.3.8 # 探路上报和分享模块 -TANLULIB_VERSION=2.1.3.5 -MOGO_TANLU_API_VERSION=2.1.3.5 +TANLULIB_VERSION=2.1.3.8 +MOGO_TANLU_API_VERSION=2.1.3.8 #左侧面板模块 -MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.5 -MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.5 +MOGO_MODULE_LEFT_PANEL_VERSION=2.1.3.8 +MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.3.8 # 小控件 -MOGO_MODULE_WIDGETS_VERSION=2.1.3.5 +MOGO_MODULE_WIDGETS_VERSION=2.1.3.8 # obu -MOGO_MODULE_OBU_VERSION=2.1.3.5 -MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.5 +MOGO_MODULE_OBU_VERSION=2.1.3.8 +MOGO_MODULE_OBU_MOGO_VERSION=2.1.3.8 # monitor -MOGO_MODULE_MONITOR_VERSION=2.1.3.5 +MOGO_MODULE_MONITOR_VERSION=2.1.3.8 # bugly -CRASHREPORT_VERSION=2.1.3.5 -CRASHREPORT_BUGLY_VERSION=2.1.3.5 -CRASHREPORT_NOOP_VERSION=2.1.3.5 -CRASHREPORT_UPGRADE_VERSION=2.1.3.5 +CRASHREPORT_VERSION=2.1.3.8 +CRASHREPORT_BUGLY_VERSION=2.1.3.8 +CRASHREPORT_NOOP_VERSION=2.1.3.8 +CRASHREPORT_UPGRADE_VERSION=2.1.3.8 ## tts -TTS_BASE_VERSION=2.1.3.5 -TTS_DI_VERSION=2.1.3.5 -TTS_ZHI_VERSION=2.1.3.5 -TTS_PAD_VERSION=2.1.3.5 -TTS_NOOP_VERSION=2.1.3.5 +TTS_BASE_VERSION=2.1.3.8 +TTS_DI_VERSION=2.1.3.8 +TTS_ZHI_VERSION=2.1.3.8 +TTS_PAD_VERSION=2.1.3.8 +TTS_NOOP_VERSION=2.1.3.8 # 自研地图 -MAP_CUSTOM_VERSION=2.1.3.5 -MOGO_MODULE_ADAS_VERSION=2.1.3.5 +MAP_CUSTOM_VERSION=2.1.3.8 +MOGO_MODULE_ADAS_VERSION=2.1.3.8 # 基础服务实现：passport、socket、location -MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.5 -MOGO_BASE_SERVICES_APK_VERSION=2.1.3.5 -MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.5 -MOGO_MODULE_CHAT_VERSION=2.1.3.5 +MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.3.8 +MOGO_BASE_SERVICES_APK_VERSION=2.1.3.8 +MOGO_BASE_SERVICES_SDK_VERSION=2.1.3.8 +MOGO_MODULE_CHAT_VERSION=2.1.3.8 # 车聊聊 -MOGO_MODULE_CARCHATTING_VERSION=2.1.3.5 +MOGO_MODULE_CARCHATTING_VERSION=2.1.3.8 # 车聊聊接口 -MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.5 +MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.3.8 # 皮肤 -MOGO_SKIN_SUPPORT_VERSION=2.1.3.5 -MOGO_SKIN_LIGHT_VERSION=2.1.3.5 -MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.5 -MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.5 -SKIN_SUPPORT_VERSION=2.1.3.5 -SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.5 -SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.5 -SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.5 -SKIN_SUPPORT_DESIGN_VERSION=2.1.3.5 +MOGO_SKIN_SUPPORT_VERSION=2.1.3.8 +MOGO_SKIN_LIGHT_VERSION=2.1.3.8 +MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.3.8 +MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.3.8 +SKIN_SUPPORT_VERSION=2.1.3.8 +SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.3.8 +SKIN_SUPPORT_CARDVIEW_VERSION=2.1.3.8 +SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.3.8 +SKIN_SUPPORT_DESIGN_VERSION=2.1.3.8 # OCH -MOGO_OCH_VERSION=2.1.3.5-test -MOGO_OCH_BUS_VERSION=2.1.3.5-test -MOGO_OCH_NOOP_VERSION=2.1.3.5-test -MOGO_OCH_TAXI_VERSION=2.1.3.5-test +MOGO_OCH_VERSION=2.1.3.8-test +MOGO_OCH_BUS_VERSION=2.1.3.8-test +MOGO_OCH_NOOP_VERSION=2.1.3.8-test +MOGO_OCH_TAXI_VERSION=2.1.3.8-test # mogoAiCloud sdk services -MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.5 +MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.3.8 ################# 旧版本架构模块版本 ################# From 15d8fc71cb5c9796babd08485089add85872ccf2 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 22 Dec 2021 19:30:18 +0800 Subject: [PATCH 13/13] fix bug of vip tip, changed the logic of enter cross road change to exit cross road to avoid showWarning --- .../java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index a60f127288..1099384b47 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -99,7 +99,7 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe if (!vip) { return } - if (enter) { + if (!enter) { Logger.d(TAG, "驶入路口，返回 , then resetConditions") resetConditions() return