Merge branch 'new_master' into new_for_phone

app/src/main/java/com/bgycc/smartcanteen/socket/SCWebSocketClient.java

@@ -78,7 +78,7 @@ public class SCWebSocketClient extends WebSocketClient {
                 boolean connectResult = connectBlocking(10, TimeUnit.SECONDS);
                 LogUtils.d(TAG, connectResult ? "成功链接服务器" : "链接服务器失败");
             } catch (InterruptedException e) {
-                LogUtils.e(TAG, "服务器链接异常: " + e.getMessage(), e);
+                LogUtils.e(TAG, "服务器链接异常: " + e.getMessage());
             }
         });
     }
@@ -199,7 +199,7 @@ public class SCWebSocketClient extends WebSocketClient {
 
     @Override
     public void onError(Exception e) {
-        LogUtils.e(TAG, "链接异常: " + e.getMessage(), e);
+        LogUtils.e(TAG, "链接异常: " + e.getMessage());
         connectState.postValue(new ConnectState(ConnectState.OFFLINE));
         for (SCWebSocketListener l : listener) {
             l.onError(e);