1.将socket日志输出修改为LogUtils

app/src/main/java/com/xhly/manageapp/ManageApplication.kt

@@ -16,6 +16,7 @@ import com.kongzue.dialogx.DialogX
 import com.tencent.bugly.crashreport.CrashReport
 import com.xhly.corelib.Const
 import com.xhly.corelib.utils.LogShow
+import com.xhly.corelib.utils.LogUtils
 import com.xhly.corelib.utils.ModelNameUtils
 import com.xhly.corelib.utils.SharedPreferencesUtils
 import com.xhly.corelib.utils.SystemUtil
@@ -703,6 +704,7 @@ class ManageApplication : MultiDexApplication() {
         super.onCreate()
         val processName = SystemUtil.getProcessName(this, android.os.Process.myPid())
         if (processName != null && processName.equals(packageName)) {
+            LogUtils.DEBUG=com.xhkjedu.manageapp.BuildConfig.IS_DEBUG
             Const.setBaseUrl(com.xhkjedu.manageapp.BuildConfig.IS_DEBUG)
             CrashReport.initCrashReport(applicationContext, "37c72ff74c", false);
             instance = this

corelib/src/main/java/com/xhly/corelib/utils/LogUtils.java

@@ -4,11 +4,14 @@ import android.util.Log;
 
 public class LogUtils {
     public static String TAG = "LogUtils";
-    private static final boolean DEBUG = true;
+  /*  private static final boolean DEBUG = true;*/
+    public static  boolean DEBUG = true;
 
     private static final int D = 745;
     private static final int E = 421;
     private static final int V = 674;
+
+    private static final int I = 679;
     private static final String CUT_OFF = "------------------------";
     private static final String CUT_OFF_END = "----------------------" +
             "--------------------------------------------------------";
@@ -27,6 +30,10 @@ public class LogUtils {
         printf(V, tag, values);
     }
 
+    public static void i(String tag, String... values) {
+        printf(I, tag, values);
+    }
+
     private static void printf(int mark, String tag, String... values) {
         if (!DEBUG) {
             return;
@@ -105,6 +112,11 @@ public class LogUtils {
                 Log.v(tag, " ");
                 Log.v(tag, startLine);
                 break;
+
+            case I:
+                Log.i(tag, " ");
+                Log.i(tag, startLine);
+                break;
         }
 
 

websocket/src/main/java/com/xhly/websocket/service/LongConnService.java

@@ -15,6 +15,7 @@ import com.neovisionaries.ws.client.WebSocketAdapter;
 import com.neovisionaries.ws.client.WebSocketException;
 import com.neovisionaries.ws.client.WebSocketFactory;
 import com.neovisionaries.ws.client.WebSocketFrame;
+import com.xhly.corelib.utils.LogUtils;
 import com.xhly.corelib.utils.NetworkUtils;
 
 import java.io.IOException;
@@ -99,13 +100,13 @@ public abstract class LongConnService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
-        Log.i(TAG, "onCreate()............");
+        LogUtils.i(TAG, "onCreate()............");
         mListener = new WsListener();
     }
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.i(TAG, "onStartCommand()............");
+        LogUtils.i(TAG, "onStartCommand()............");
         closeWebsocket = false;
         if (mListener == null) {
             mListener = new WsListener();
@@ -116,7 +117,7 @@ public abstract class LongConnService extends Service {
 
     @Override
     public void onDestroy() {
-        Log.i(TAG, "onDestroy()............");
+        LogUtils.i(TAG, "onDestroy()............");
         if (heartSubscription != null) {
             heartSubscription.dispose();
         }
@@ -194,7 +195,7 @@ public abstract class LongConnService extends Service {
                 webSocket = null;
             }
             try {
-                Log.i(TAG, "第一次连接: " + connectUrl);
+                LogUtils.i(TAG, "第一次连接: " + connectUrl);
                 // 异步连接
                 webSocket = createWebSocket();
                 setStatus(WsStatus.CONNECTING);
@@ -214,7 +215,7 @@ public abstract class LongConnService extends Service {
     }
 
     private WebSocket createWebSocket() throws IOException {
-        Log.i(TAG, "创建连接：createWebSocket()");
+        LogUtils.i(TAG, "创建连接：createWebSocket()");
         return new WebSocketFactory().createSocket(connectUrl, CONNECT_TIMEOUT)
                 //设置帧队列最大值为5
                 .setFrameQueueSize(FRAME_QUEUE_SIZE)
@@ -232,7 +233,7 @@ public abstract class LongConnService extends Service {
             reconnectCount = 0;
             isReConnect = false;
             closeWebsocket = true;
-            Log.i(TAG, "重连失败网络不可用，当前closeWebsocket==" + closeWebsocket);
+            LogUtils.i(TAG, "重连失败网络不可用，当前closeWebsocket==" + closeWebsocket);
             return;
         }
         if (HAS_HEART_RECEIVE) {
@@ -314,7 +315,7 @@ public abstract class LongConnService extends Service {
         @Override
         public void onConnected(final WebSocket websocket, Map<String, List<String>> headers) throws Exception {
             super.onConnected(websocket, headers);
-            Log.i(TAG, "连接成功：" + headers.toString());
+            LogUtils.i(TAG, "连接成功：" + headers.toString());
             connected = true;
             setStatus(WsStatus.CONNECT_SUCCESS);
             cancelReconnect();// 连接成功的时候取消重连,初始化连接次数
@@ -325,13 +326,13 @@ public abstract class LongConnService extends Service {
                 Observable.interval(HEART_INTERVAL, TimeUnit.SECONDS).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<Long>() {
                     @Override
                     public void onSubscribe(Disposable d) {
-                        Log.d(TAG, "订阅开始");
+                        LogUtils.d(TAG,"订阅开始");
                         heartSubscription = d;
                     }
 
                     @Override
                     public void onNext(Long aLong) {
-                        Log.v(TAG, "发送心跳");
+                        LogUtils.d(TAG,"发送心跳");
                         startHeartInterval(websocket);
                     }
 
@@ -352,7 +353,7 @@ public abstract class LongConnService extends Service {
         public void onConnectError(WebSocket websocket, WebSocketException exception) throws Exception {
             super.onConnectError(websocket, exception);
             exception.printStackTrace();
-            Log.i(TAG, "连接错误: " + exception.getMessage());
+            LogUtils.i(TAG, "连接错误: " + exception.getMessage());
             HAS_HEART_RECEIVE = false;
             setStatus(WsStatus.CONNECT_FAIL);
             connected = false;
@@ -364,7 +365,7 @@ public abstract class LongConnService extends Service {
         @Override
         public void onDisconnected(WebSocket websocket, WebSocketFrame serverCloseFrame, WebSocketFrame clientCloseFrame, boolean closedByServer) throws Exception {
             super.onDisconnected(websocket, serverCloseFrame, clientCloseFrame, closedByServer);
-            Log.i(TAG, "断开连接,是否重连" + isReConnect + ",当前closeWebsocket==" + closeWebsocket);
+            LogUtils.i(TAG, "断开连接,是否重连" + isReConnect + ",当前closeWebsocket==" + closeWebsocket);
             HAS_HEART_RECEIVE = false;
             connected = false;
             if (heartSubscription != null) {

websocket/src/main/java/com/xhly/websocket/service/SocketClient.java

@@ -11,6 +11,7 @@ import com.neovisionaries.ws.client.WebSocketAdapter;
 import com.neovisionaries.ws.client.WebSocketException;
 import com.neovisionaries.ws.client.WebSocketFactory;
 import com.neovisionaries.ws.client.WebSocketFrame;
+import com.xhly.corelib.utils.LogUtils;
 import com.xhly.corelib.utils.NetworkUtils;
 
 import org.w3c.dom.Text;
@@ -98,7 +99,7 @@ public abstract class SocketClient {
 
     public void startSocket(Context context) {
         this.context=context;
-        Log.i(TAG, "startSocket............");
+        LogUtils.i(TAG, "startSocket............");
         closeWebsocket = false;
         if (mListener == null) {
             mListener = new WsListener();
@@ -108,7 +109,7 @@ public abstract class SocketClient {
 
 
     public void onDestroy() {
-        Log.i(TAG, "onDestroy()............");
+        LogUtils.i(TAG, "onDestroy()............");
         if (heartSubscription != null) {
             heartSubscription.dispose();
         }
@@ -177,7 +178,7 @@ public abstract class SocketClient {
                 webSocket = null;
             }
             try {
-                Log.i(TAG, "第一次连接: " + connectUrl);
+                LogUtils.i(TAG, "第一次连接: " + connectUrl);
                 // 异步连接
                 webSocket = createWebSocket();
                 setStatus(WsStatus.CONNECTING);
@@ -197,7 +198,7 @@ public abstract class SocketClient {
     }
 
     private WebSocket createWebSocket() throws IOException {
-        Log.i(TAG, "创建连接：createWebSocket()");
+        LogUtils.i(TAG, "创建连接：createWebSocket()");
         return new WebSocketFactory().createSocket(connectUrl, CONNECT_TIMEOUT)
                 //设置帧队列最大值为5
                 .setFrameQueueSize(FRAME_QUEUE_SIZE)
@@ -215,7 +216,7 @@ public abstract class SocketClient {
             reconnectCount = 0;
             isReConnect = false;
             closeWebsocket = true;
-            Log.i(TAG, "重连失败网络不可用，当前closeWebsocket==" + closeWebsocket);
+            LogUtils.i(TAG, "重连失败网络不可用，当前closeWebsocket==" + closeWebsocket);
             return;
         }
         if (HAS_HEART_RECEIVE) {
@@ -297,7 +298,7 @@ public abstract class SocketClient {
         @Override
         public void onConnected(final WebSocket websocket, Map<String, List<String>> headers) throws Exception {
             super.onConnected(websocket, headers);
-            Log.i(TAG, "连接成功：" + headers.toString());
+            LogUtils.i(TAG, "连接成功：" + headers.toString());
             connected = true;
             setStatus(WsStatus.CONNECT_SUCCESS);
             cancelReconnect();// 连接成功的时候取消重连,初始化连接次数
@@ -308,13 +309,13 @@ public abstract class SocketClient {
                 Observable.interval(HEART_INTERVAL, TimeUnit.SECONDS).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<Long>() {
                     @Override
                     public void onSubscribe(Disposable d) {
-                        Log.d(TAG, "订阅开始");
+                        LogUtils.d(TAG, "订阅开始");
                         heartSubscription = d;
                     }
 
                     @Override
                     public void onNext(Long aLong) {
-                        Log.v(TAG, "发送心跳");
+                        LogUtils.d(TAG, "发送心跳");
                         startHeartInterval(websocket);
                     }
 
@@ -335,7 +336,7 @@ public abstract class SocketClient {
         public void onConnectError(WebSocket websocket, WebSocketException exception) throws Exception {
             super.onConnectError(websocket, exception);
             exception.printStackTrace();
-            Log.i(TAG, "连接错误: " + exception.getMessage());
+            LogUtils.i(TAG, "连接错误: " + exception.getMessage());
             HAS_HEART_RECEIVE = false;
             setStatus(WsStatus.CONNECT_FAIL);
             connected = false;
@@ -347,7 +348,7 @@ public abstract class SocketClient {
         @Override
         public void onDisconnected(WebSocket websocket, WebSocketFrame serverCloseFrame, WebSocketFrame clientCloseFrame, boolean closedByServer) throws Exception {
             super.onDisconnected(websocket, serverCloseFrame, clientCloseFrame, closedByServer);
-            Log.i(TAG, "断开连接,是否重连" + isReConnect + ",当前closeWebsocket==" + closeWebsocket);
+            LogUtils.i(TAG, "断开连接,是否重连" + isReConnect + ",当前closeWebsocket==" + closeWebsocket);
             HAS_HEART_RECEIVE = false;
             connected = false;
             if (heartSubscription != null) {