[3.3.0]merge

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java

@@ -54,7 +54,6 @@ import com.zhjt.mogo.adas.data.sweeper.task.SweeperTaskSuspendResume;
 import com.zhjt.mogo.adas.data.sweeper.task.confirm.SweeperTaskConfirm;
 import com.zhjt.mogo.adas.data.sweeper.task.stop.SweeperTaskStop;
 import com.zhjt.service.chain.ChainLog;
-import com.zhjt.service.chain.TracingConstants;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -278,10 +277,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
 
     @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
             linkCode = CHAIN_LINK_ADAS,
-            endpoint = TracingConstants.Endpoint.PAD,
             nodeAliasCode = CHAIN_ALIAS_CODE_INIT,
-            paramIndexes = {-1},
-            clientPkFileName = "sn")
+            paramIndexes = {-1})
     private void initSocket() {
         mSocket = new FpgaSocket();
         mSocket.setWebSocketListener(this);
@@ -296,10 +293,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
 
     @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
             linkCode = CHAIN_LINK_ADAS,
-            endpoint = TracingConstants.Endpoint.PAD,
             nodeAliasCode = CHAIN_ALIAS_CODE_CONNECT_ADDRESS,
-            paramIndexes = {0},
-            clientPkFileName = "sn")
+            paramIndexes = {0,1})
     private void connectSocket(String address, int port) {
         if (mSocket != null) {
             mSocket.connectWebSocket(address, port);
@@ -645,10 +640,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
      */
     @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
             linkCode = CHAIN_LINK_ADAS,
-            endpoint = TracingConstants.Endpoint.PAD,
             nodeAliasCode = CHAIN_ALIAS_CODE_STATUS_CHANGE_REASON,
-            paramIndexes = {1},
-            clientPkFileName = "sn")
+            paramIndexes = {0, 1})
     private void updateConnectStatus(@Define.IPCConnectionStatus int status, @Nullable String reason) {
         ipcConnectionStatus.set(status);
         if (status == Constants.IPC_CONNECTION_STATUS.CONNECTED) {
@@ -845,10 +838,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
     @ChainLog(
             linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
             linkCode = CHAIN_LINK_ADAS,
-            endpoint = TracingConstants.Endpoint.PAD,
             nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT,
-            paramIndexes = {2},
-            clientPkFileName = "sn"
+            paramIndexes = {0, 1, 2}
     )
     @Override
     public boolean sendAutoPilotModeReq(int mode, int source, MessagePad.RouteInfo routeInfo) {
@@ -1017,10 +1008,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
     @ChainLog(
             linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
             linkCode = CHAIN_LINK_ADAS,
-            endpoint = TracingConstants.Endpoint.PAD,
             nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH,
-            paramIndexes = {-1},
-            clientPkFileName = "sn"
+            paramIndexes = {-1}
     )
     @Override
     public boolean sendGlobalPathReq() {
@@ -1089,10 +1078,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
     @ChainLog(
             linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
             linkCode = CHAIN_LINK_ADAS,
-            endpoint = TracingConstants.Endpoint.PAD,
             nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD,
-            paramIndexes = {0},
-            clientPkFileName = "sn"
+            paramIndexes = {0}
     )
     @Override
     public boolean sendSystemCmdReq(@NonNull MessagePad.SystemCmdType type) {
@@ -1111,10 +1098,8 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
     @ChainLog(
             linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
             linkCode = CHAIN_LINK_ADAS,
-            endpoint = TracingConstants.Endpoint.PAD,
             nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD,
-            paramIndexes = {0},
-            clientPkFileName = "sn"
+            paramIndexes = {0}
     )
     @Override
     public boolean sendTrajectoryDownloadReq(MessagePad.Line line) {

libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java

@@ -23,7 +23,6 @@ import com.zhidao.support.adas.high.common.ReconnectManager;
 import com.zhidao.support.adas.high.queue.WSByteQueueManager;
 import com.zhidao.support.adas.high.queue.WebSocketQueueManager;
 import com.zhjt.service.chain.ChainLog;
-import com.zhjt.service.chain.TracingConstants;
 
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@@ -201,10 +200,8 @@ public class FpgaSocket implements IWebSocket {
 
         @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
                 linkCode = CHAIN_LINK_ADAS,
-                endpoint = TracingConstants.Endpoint.PAD,
                 nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_OPEN,
-                paramIndexes = {1},
-                clientPkFileName = "sn")
+                paramIndexes = {1})
         @Override
         public void onOpen(@NonNull WebSocket webSocket, @NonNull Response response) {
             super.onOpen(webSocket, response);
@@ -224,10 +221,8 @@ public class FpgaSocket implements IWebSocket {
 
         @ChainLog(linkChainLog = -1,
                 linkCode = CHAIN_LINK_ADAS,
-                endpoint = TracingConstants.Endpoint.PAD,
                 nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_JSON,
-                paramIndexes = {1},
-                clientPkFileName = "sn")
+                paramIndexes = {1})
         @Override
         public void onMessage(@NonNull WebSocket webSocket, @NonNull String text) {
             super.onMessage(webSocket, text);
@@ -255,10 +250,8 @@ public class FpgaSocket implements IWebSocket {
 
         @ChainLog(linkChainLog = -1,
                 linkCode = CHAIN_LINK_ADAS,
-                endpoint = TracingConstants.Endpoint.PAD,
                 nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_BYTE,
-                paramIndexes = {-1},
-                clientPkFileName = "sn")
+                paramIndexes = {-1})
         @Override
         public void onMessage(@NonNull WebSocket webSocket, @NonNull ByteString bytes) {
             super.onMessage(webSocket, bytes);

libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt

@@ -17,7 +17,6 @@ import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.CoordinateTransform
 import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.zhjt.service.chain.ChainLog
-import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD
 
 /**
  * 封装高德地图通过设备GPS获取到的位置信息，频率1s一次，坐标系为CJC20
@@ -150,10 +149,8 @@ class GDLocationClient private constructor(context: Context) : AMapLocationListe
     @ChainLog(
         linkChainLog = ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS,
         linkCode = ChainConstant.CHAIN_LINK_CLOUD,
-        endpoint = PAD,
         nodeAliasCode = CHAIN_ALIAS_CODE_HTTP_DNS_CITY_CODE,
         paramIndexes = [0],
-        clientPkFileName = "sn"
     )
     private fun setCityCode(code: String) {
         mCityCode = code