[Change]解除对core中utils的依赖，直接使用已有依赖库中的日志和json解析工具，防止出现插件检查时候出现的重复依赖问题
This commit is contained in:
donghongyu
@@ -7,6 +7,7 @@ import android.content.Context;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
import com.elegant.network.utils.GsonUtil;
|
||||
import com.google.protobuf.ByteString;
|
||||
import com.google.protobuf.InvalidProtocolBufferException;
|
||||
@@ -17,7 +18,6 @@ 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.eagle.core.utilcode.mogo.logger.Logger;
|
||||
import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
@@ -4,10 +4,10 @@ package com.mogo.cloud.socket.internal;
|
||||
import android.content.Context;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
import com.mogo.cloud.passport.MoGoAiCloudClient;
|
||||
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
|
||||
import com.mogo.cloud.socket.SocketManager;
|
||||
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;
|
||||
|
||||
@@ -8,6 +8,7 @@ import android.content.Context;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
import com.mogo.cloud.passport.MoGoAiCloudClient;
|
||||
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
|
||||
import com.mogo.cloud.socket.SocketManager;
|
||||
@@ -17,7 +18,6 @@ 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.eagle.core.utilcode.mogo.logger.Logger;
|
||||
import com.zhidao.locupload.Platform;
|
||||
import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
|
||||
import androidx.collection.ArraySet;
|
||||
|
||||
|
||||
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ package com.mogo.cloud.socket.third.core;
|
||||
import androidx.collection.ArraySet;
|
||||
|
||||
|
||||
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@ import static com.mogo.cloud.socket.SocketServicesConstants.getTag;
|
||||
import android.content.Context;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
import com.elegant.network.NetConfig;
|
||||
import com.elegant.utils.UiThreadHandler;
|
||||
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.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;
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.mogo.cloud.socket.third.core.client;
|
||||
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
import com.mogo.cloud.socket.third.analytics.EventRequest;
|
||||
import com.mogo.cloud.socket.third.analytics.SocketStatus;
|
||||
import com.mogo.cloud.socket.third.core.CallbackManager;
|
||||
@@ -11,7 +12,6 @@ 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.eagle.core.utilcode.mogo.logger.Logger;
|
||||
import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
|
||||
import com.zhidao.ptech.connsvr.protocol.model.MogoConnsvrPacket;
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.mogo.cloud.socket.third.core.client;
|
||||
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
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.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;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.mogo.cloud.socket.third.core.client;
|
||||
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
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.eagle.core.utilcode.mogo.logger.Logger;
|
||||
|
||||
import io.netty.channel.ChannelHandler.Sharable;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
|
||||
@@ -7,14 +7,14 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.ConnectivityManager;
|
||||
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
import com.mogo.cloud.passport.utils.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.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
|
||||
|
||||
@@ -3,11 +3,11 @@ package com.mogo.cloud.socket.third.utils;
|
||||
import android.os.Build;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.elegant.log.simplelog.Logger;
|
||||
import com.mogo.cloud.passport.utils.DevicesUtils;
|
||||
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.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;
|
||||
|
||||
Reference in New Issue
Block a user