[Fix]修复日志输出

2021-11-19 20:54:29 +08:00
parent 501dac9e55
commit 26fd50e726
53 changed files with 78 additions and 74 deletions
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java
@@ -7,9 +7,9 @@ import android.content.Context;

 import androidx.annotation.NonNull;

+import com.elegant.network.utils.GsonUtil;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.mogo.cloud.GsonUtil;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.cloud.socket.entity.MsgBody;
@@ -17,7 +17,7 @@ import com.mogo.cloud.socket.entity.SocketDownData;
 import com.mogo.cloud.socket.internal.InternalSocketManager;
 import com.mogo.cloud.socket.third.ThirdSocketManager;
 import com.mogo.cloud.socket.third.core.ConnectionLifecycleListener;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;

 import java.util.ArrayList;
--- 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
@@ -7,7 +7,7 @@ import android.text.TextUtils;
 import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.cloud.socket.SocketManager;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
 import com.zhidao.socketsdk.manager.OnSocketAckCallback;
 import com.zhidao.socketsdk.manager.OnSocketReceiveCallback;
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/ThirdSocketManager.java
@@ -17,7 +17,7 @@ import com.mogo.cloud.socket.third.core.CallbackManager;
 import com.mogo.cloud.socket.third.core.ConnectionLifecycleListener;
 import com.mogo.cloud.socket.third.core.SocketClient;
 import com.mogo.cloud.socket.third.core.SocketConfig;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.locupload.Platform;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;

--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/CallbackManager.java
@@ -3,7 +3,8 @@ package com.mogo.cloud.socket.third.core;
 import androidx.annotation.NonNull;
 import androidx.collection.ArraySet;

-import com.mogo.cloud.utils.logger.Logger;
+
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;

 import java.util.Set;

--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/ConnCallbackManager.java
@@ -3,7 +3,8 @@ package com.mogo.cloud.socket.third.core;

 import androidx.collection.ArraySet;

-import com.mogo.cloud.utils.logger.Logger;
+
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;

 import java.util.Set;

--- 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
@@ -11,7 +11,7 @@ import com.mogo.cloud.socket.third.core.client.ClientSocketManager;
 import com.mogo.cloud.socket.third.core.network.RequestManager;
 import com.mogo.cloud.socket.third.core.network.model.SocketAddressData;
 import com.mogo.cloud.socket.third.utils.RequestUtil;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
 import com.zhidao.ptech.connsvr.payload.protocol.MogoPayload;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/SocketConfig.java
@@ -6,9 +6,9 @@ import static com.mogo.cloud.socket.third.core.SocketConstants.DEFAULT_AUTH_PUB_
 import android.content.Context;
 import android.text.TextUtils;

-import com.mogo.cloud.TelephoneUtil;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
+import com.zhidao.utils.common.TelephoneUtil;

 public class SocketConfig {
    public static final String PROTO_VERSION = "1.0.1";
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientChannelReader.java
@@ -11,7 +11,7 @@ import com.mogo.cloud.socket.third.core.SocketConstants;
 import com.mogo.cloud.socket.third.utils.LoginStatusUtil;
 import com.mogo.cloud.socket.third.utils.RSAUtils;
 import com.mogo.cloud.socket.third.utils.RequestUtil;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
 import com.zhidao.ptech.connsvr.protocol.model.MogoConnsvrPacket;

--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ClientSocketManager.java
@@ -4,7 +4,7 @@ import com.mogo.cloud.socket.third.core.ConnectionLifecycleListener;
 import com.mogo.cloud.socket.third.core.SocketConstants;
 import com.mogo.cloud.socket.third.utils.LoginStatusUtil;
 import com.mogo.cloud.socket.third.utils.RequestUtil;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.protocol.codec.MogoPacketDecoder;
 import com.zhidao.ptech.connsvr.protocol.codec.MogoPacketFrameDecoder;
 import com.zhidao.ptech.connsvr.protocol.codec.MogoPacketFrameEncoder;
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/ConnectionWatchdog.java
@@ -3,7 +3,7 @@ package com.mogo.cloud.socket.third.core.client;
 import com.mogo.cloud.socket.third.analytics.EventRequest;
 import com.mogo.cloud.socket.third.analytics.SocketStatus;
 import com.mogo.cloud.socket.third.core.SocketConstants;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;

 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/client/HeartbeatAlarmManager.java
@@ -7,14 +7,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;

-import com.mogo.cloud.DevicesUtils;
 import com.mogo.cloud.socket.third.analytics.EventRequest;
 import com.mogo.cloud.socket.third.analytics.SocketStatus;
 import com.mogo.cloud.socket.third.core.SocketConfig;
 import com.mogo.cloud.socket.third.core.SocketConstants;
 import com.mogo.cloud.socket.third.utils.LoginStatusUtil;
 import com.mogo.cloud.socket.third.utils.RequestUtil;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.DevicesUtils;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;

 /**
 * Send heartbeats according to network type to keep socket active as well as
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/network/model/SocketSendData.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/core/network/model/SocketSendData.java
@@ -1,6 +1,6 @@
 package com.mogo.cloud.socket.third.core.network.model;

-import com.mogo.cloud.GsonUtil;
+import com.elegant.network.utils.GsonUtil;

 import org.json.JSONObject;

--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/third/utils/RequestUtil.java
@@ -3,15 +3,15 @@ package com.mogo.cloud.socket.third.utils;
 import android.os.Build;
 import android.text.TextUtils;

-import com.mogo.cloud.DevicesUtils;
-import com.mogo.cloud.TelephoneUtil;
 import com.mogo.cloud.socket.third.core.SocketConfig;
 import com.mogo.cloud.socket.third.core.SocketConstants;
 import com.mogo.cloud.socket.third.core.client.ClientSocketManager;
-import com.mogo.cloud.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.DevicesUtils;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
 import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
 import com.zhidao.ptech.connsvr.protocol.model.MogoConnsvrPacket;
+import com.zhidao.utils.common.TelephoneUtil;

 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;