,padSn: String,releaseId: String){
+ waringProviderApi?.showAdUpgradeDialog(images, padSn, releaseId)
+ }
+
+ /**
+ * 更新工控机下载、升级状态
+ */
+ fun showAdUpgradeStatus(ipcUpgradeStateInfo: IPCUpgradeStateInfo){
+ waringProviderApi?.showAdUpgradeStatus(ipcUpgradeStateInfo)
+ }
+
fun showNoSignalView() {
waringProviderApi?.showNoSignView()
}
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/trafficlight/CallTrafficLightListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/trafficlight/CallTrafficLightListenerManager.kt
index dc3cf89bc8..a520edaf98 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/trafficlight/CallTrafficLightListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/trafficlight/CallTrafficLightListenerManager.kt
@@ -82,6 +82,32 @@ object CallTrafficLightListenerManager {
M_TRAFFIC_LIGHT_LISTENER.remove(tag)
}
+ /**
+ * 添加监听
+ * @param tag 标记，用来注销监听使用
+ * @param listener 监听回调
+ */
+ fun registerTrafficRequestErrorListener(
+ @Nullable tag: String,
+ @Nullable listener: IMoGoTrafficLightListener
+ ) {
+ if (M_TRAFFIC_LIGHT_LISTENER.containsKey(tag)) {
+ return
+ }
+ M_TRAFFIC_LIGHT_LISTENER[tag] = listener
+ }
+
+ /**
+ * 删除监听
+ * @param tag 标记，用来注销监听使用
+ */
+ fun unRegisterTrafficRequestErrorListener(@Nullable tag: String) {
+ if (!M_TRAFFIC_LIGHT_LISTENER.containsKey(tag)) {
+ return
+ }
+ M_TRAFFIC_LIGHT_LISTENER.remove(tag)
+ }
+
/**
* 删除监听
* @param listener 要删除的监听对象
@@ -113,6 +139,13 @@ object CallTrafficLightListenerManager {
}
}
+ fun invokeTrafficRequestError(){
+ M_TRAFFIC_LIGHT_LISTENER.forEach{
+ val listener = it.value
+ listener.onTrafficRequestError()
+ }
+ }
+
fun resetTrafficLightData() {
trafficLightResult = null
}
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/StringUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/StringUtils.java
index 227131ccd1..8f61041770 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/StringUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/StringUtils.java
@@ -6,6 +6,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import java.util.IllegalFormatException;
+import java.util.regex.Pattern;
/**
*
@@ -259,4 +260,17 @@ public final class StringUtils {
}
return text;
}
+
+ /**
+ * Ip校验
+ * @param ipAddress 单个ip
+ * @return
+ */
+ public static boolean isValidIPAddress(String ipAddress) {
+ if ((ipAddress != null) && (!ipAddress.isEmpty())) {
+ return Pattern.matches("^([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}$", ipAddress);
+ }
+ return false;
+ }
+
}
diff --git a/gradle.properties b/gradle.properties
index b9b2f173f9..fcfc0cc7c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -63,26 +63,26 @@ SERVICE_CHAIN_VERSION=1.1.0
LOGLIB_VERSION=1.3.0
######## MogoAiCloudSDK Version ########
# 网络请求LOGLIB_VERSION
-MOGO_NETWORK_VERSION=1.3.58
+MOGO_NETWORK_VERSION=1.3.59
# 鉴权
-MOGO_PASSPORT_VERSION=1.3.58
+MOGO_PASSPORT_VERSION=1.3.59
# 常链接
-MOGO_SOCKET_VERSION=1.3.58
+MOGO_SOCKET_VERSION=1.3.59
# 数据采集
-MOGO_REALTIME_VERSION=1.3.58
+MOGO_REALTIME_VERSION=1.3.59
# 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.3.58
+MOGO_TANLU_VERSION=1.3.59
# 直播推流
-MOGO_LIVE_VERSION=1.3.58
+MOGO_LIVE_VERSION=1.3.59
# 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.3.58
+MOGO_TRAFFICLIVE_VERSION=1.3.59
# 定位服务
-MOGO_LOCATION_VERSION=1.3.58
+MOGO_LOCATION_VERSION=1.3.59
# 远程通讯模块
-MOGO_TELEMATIC_VERSION=1.3.58
+MOGO_TELEMATIC_VERSION=1.3.59
######## MogoAiCloudSDK Version ########
# 自研地图
-MAP_SDK_VERSION=2.1.1.2
+MAP_SDK_VERSION=2.2.0.1
MAP_SDK_OPERATION_VERSION=1.0.13
# websocket
WEBSOCKET_VERSION=1.1.7
@@ -90,8 +90,8 @@ WEBSOCKET_VERSION=1.1.7
applicationId=com.mogo.launcer
applicationName=IntelligentPilot
# RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0
-versionCode=2060600
-versionName=2.6.6
+versionCode=2070000
+versionName=2.7.0
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.10
@@ -155,7 +155,7 @@ MOGO_OCH_TAXI_VERSION=2.0.66
# mogoAiCloud sdk services
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10
# v2x-sdk
-MOGO_V2X_SDK_VERSION=1.3.58
+MOGO_V2X_SDK_VERSION=1.3.59
################# 旧版本架构模块版本 #################
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
index 7c38637a76..d136cdc65b 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
@@ -1,5 +1,9 @@
package com.mogo.map;
+import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_INIT_ON_MAP_INIT;
+import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED;
+import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_INIT;
+import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP;
import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_300;
import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS;
@@ -79,6 +83,8 @@ import com.zhidaoauto.map.sdk.open.road.StopLine;
import com.zhidaoauto.map.sdk.open.tools.MapTools;
import com.zhidaoauto.map.sdk.open.view.MapAutoView;
import com.zhidaoauto.map.sdk.open.view.MapAutoViewHelper;
+import com.zhjt.service.chain.ChainLog;
+import com.zhjt.service.chain.TracingConstants;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -768,12 +774,28 @@ public class AMapViewWrapper implements IMogoMapView,
}
+ @ChainLog(
+ linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
+ linkCode = CHAIN_LINK_INIT,
+ endpoint = TracingConstants.Endpoint.PAD,
+ nodeAliasCode = CHAIN_ALIAS_CODE_INIT_ON_MAP_INIT,
+ paramIndexes = {-1},
+ clientPkFileName = "sn"
+ )
@Override
public void onMapInit() {
CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--onMapInit: ");
MogoMapListenerHandler.getInstance().onMapLoaded();
}
+ @ChainLog(
+ linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
+ linkCode = CHAIN_LINK_INIT,
+ endpoint = TracingConstants.Endpoint.PAD,
+ nodeAliasCode = CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED,
+ paramIndexes = {-1},
+ clientPkFileName = "sn"
+ )
@Override
public void onMapLoaded() {
CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--onMapLoaded: ");