diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java index df2aac0..39ad166 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/internal/InternalSocketManager.java @@ -1,8 +1,6 @@ package com.mogo.cloud.socket.internal; -import static com.mogo.cloud.socket.SocketServicesConstants.getTag; - import android.content.Context; import android.text.TextUtils; @@ -21,6 +19,7 @@ public class InternalSocketManager implements OnSocketReceiveCallback, OnSocketA private static volatile InternalSocketManager mInstance; private static final int MSG_PRODUCT_LINE = MogoCommon.Product.mogoBussiness_VALUE; + private static final String TAG = "InternalSocketManager"; private final MoGoAiCloudClientConfig cloudClientConfig; private SocketConnManager mSocketConnManager; @@ -46,7 +45,7 @@ public class InternalSocketManager implements OnSocketReceiveCallback, OnSocketA mSocketConnManager.addSocketAckCallback(this); String appId = cloudClientConfig.getServiceAppId(); if (TextUtils.isEmpty(appId)) { - Logger.e(getTag(), "需要初始化 Socket AppId"); + Logger.e(TAG, "需要初始化 Socket AppId"); return; } mSocketConnManager.init(appId); @@ -54,22 +53,22 @@ public class InternalSocketManager implements OnSocketReceiveCallback, OnSocketA @Override public void onAck(byte[] headerBytes, byte[] payload) { - Logger.d(getTag(), "InternalSocketManager update ack"); + Logger.d(TAG, "InternalSocketManager update ack"); SocketManager.getInstance().onAck(headerBytes); } @Override public void onMessageReceived(byte[] message) { - Logger.d(getTag(), "InternalSocketManager update message"); + Logger.d(TAG, "InternalSocketManager update message"); SocketManager.getInstance().update(message, 0); } public void sendMsg(byte[] pb, int headerType, boolean isAck, long msgId) { if (mSocketConnManager.isConnected()) { - Logger.d(getTag(), "isConnected."); + Logger.d(TAG, "isConnected."); mSocketConnManager.sendPayload(MSG_PRODUCT_LINE, pb, headerType, isAck, msgId); } else { - Logger.e(getTag(), "sendMsg error, connect is lost."); + Logger.e(TAG, "sendMsg error, connect is lost."); } } diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java index bb97c0e..3e981b1 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketClient.java @@ -1,5 +1,7 @@ package com.mogo.cloud.socket.third.core; +import static com.mogo.cloud.socket.SocketServicesConstants.getTag; + import android.content.Context; import android.text.TextUtils; @@ -16,8 +18,6 @@ import com.zhidao.ptech.connsvr.protocol.MogoConnsvr; public class SocketClient { - private static final String TAG = "SocketClient"; - private Context mAppContext; private volatile boolean mHasStarted; @@ -40,13 +40,13 @@ public class SocketClient { */ public synchronized void start(Context context) { if (mHasStarted) { - Logger.d(TAG, "socket already started"); + Logger.d(getTag(), "socket already started"); return; } if (context == null) { throw new NullPointerException("context cannot be null"); } - Logger.d(TAG, "start socket"); + Logger.d(getTag(), "start socket"); //ensure context be set SocketConfig.instance().setAppContext(mAppContext = context.getApplicationContext()); @@ -60,12 +60,12 @@ public class SocketClient { */ public synchronized void stop() { if (!mHasStarted) { - Logger.d(TAG, "socket already stopped"); + Logger.d(getTag(), "socket already stopped"); return; } ClientSocketManager.getInstance().close(); mHasStarted = false; - Logger.d(TAG, "stop"); + Logger.d(getTag(), "stop"); } /** @@ -139,7 +139,7 @@ public class SocketClient { public void onGetSocketAddressSuccess(SocketAddressData addressData) { if (addressData.result != null && checkHost(addressData.result.ip) && checkPort(addressData.result.port)) { internalStart(addressData.result.ip, addressData.result.port); - Logger.d(TAG, "network--->ip:" + addressData.result.ip + " & port: " + addressData.result.port); + Logger.d(getTag(), "network--->ip:" + addressData.result.ip + " & port: " + addressData.result.port); } else { retryGetAddress(1000L); //todo 时间调整为1秒，后续在重连时增加网络状态验证，以及增加链路日志 } @@ -147,19 +147,19 @@ public class SocketClient { @Override public void onGetSocketAddressFailed(int code, String msg) { - Logger.d(TAG, "onFailed-->" + code + ":" + msg); + Logger.d(getTag(), "onFailed-->" + code + ":" + msg); retryGetAddress(1000L); //todo 时间调整为1秒，后续在重连时增加网络状态验证，以及增加链路日志 } }); } private final Runnable mRequestSocketAddressTask = () -> { - Logger.d(TAG, "get socket address"); + Logger.d(getTag(), "get socket address"); requestSocketAddress(); }; private void internalStart(String host, int port) { - Logger.d(TAG, "internalStart-->host: " + host + " & port: " + port); + Logger.d(getTag(), "internalStart-->host: " + host + " & port: " + port); ClientSocketManager.getInstance().setConnectionLifecycleListener(connectionLifecycleListener); ClientSocketManager.getInstance().start(host, port); } @@ -168,10 +168,10 @@ public class SocketClient { @Override public void onConnectLost(boolean reconnect) { super.onConnectLost(reconnect); - Logger.d(TAG, "---onConnectLost"); + Logger.d(getTag(), "---onConnectLost"); ConnCallbackManager.getInstance().onConnectLost(reconnect); if (reconnect) { - Logger.d(TAG, "---onConnectLost reconnect"); + Logger.d(getTag(), "---onConnectLost reconnect"); retryGetAddress(1000L);//1-7s //todo 时间调整为1秒，后续在重连时增加网络状态验证，以及增加链路日志 } } @@ -179,7 +179,7 @@ public class SocketClient { @Override public void onConnectFailure() { super.onConnectFailure(); - Logger.d(TAG, "---onConnectFailure"); + Logger.d(getTag(), "---onConnectFailure"); ConnCallbackManager.getInstance().onConnectFailure(); retryGetAddress(1000L);//3-6s //todo 时间调整为1秒，后续在重连时增加网络状态验证，以及增加链路日志 } @@ -187,7 +187,7 @@ public class SocketClient { @Override public void onConnectSuccess() { super.onConnectSuccess(); - Logger.d(TAG, "---onConnectSuccess"); + Logger.d(getTag(), "---onConnectSuccess"); ConnCallbackManager.getInstance().onConnectSuccess(); } }; @@ -199,7 +199,7 @@ public class SocketClient { private boolean checkPort(int port) { if (port < 0 || port > 0xFFFF) { - Logger.e(TAG, "port out of range:" + port); + Logger.e(getTag(), "port out of range:" + port); return false; } return true; @@ -207,7 +207,7 @@ public class SocketClient { private boolean checkHost(String hostname) { if (TextUtils.isEmpty(hostname)) { - Logger.e(TAG, "hostname can't be null"); + Logger.e(getTag(), "hostname can't be null"); return false; } return true; diff --git a/gradle.properties b/gradle.properties index 9e4e116..57f9192 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,22 +36,22 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.2.9 +MOGO_UTILS_VERSION=1.3.0 # 网络请求 -MOGO_NETWORK_VERSION=1.2.9 +MOGO_NETWORK_VERSION=1.3.0 # 网络DNS -MOGO_HTTPDNS_VERSION=1.2.9 +MOGO_HTTPDNS_VERSION=1.3.0 # 鉴权 -MOGO_PASSPORT_VERSION=1.2.9 +MOGO_PASSPORT_VERSION=1.3.0 # 常链接 -MOGO_SOCKET_VERSION=1.2.9 +MOGO_SOCKET_VERSION=1.3.0 # 数据采集 -MOGO_REALTIME_VERSION=1.2.9 +MOGO_REALTIME_VERSION=1.3.0 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.2.9 +MOGO_TANLU_VERSION=1.3.0 # 直播推流 -MOGO_LIVE_VERSION=1.2.9 +MOGO_LIVE_VERSION=1.3.0 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.2.9 +MOGO_TRAFFICLIVE_VERSION=1.3.0 # 定位服务 -MOGO_LOCATION_VERSION=1.2.9 +MOGO_LOCATION_VERSION=1.3.0