修改socket的内存泄漏

printer/build.gradle

@@ -51,7 +51,7 @@ repositories {
 }
 
 group 'com.qmai.android.print'
-version '1.1.43-SNAPSHOT'
+version '1.1.45-SNAPSHOT'
 
 gradlePublish {
 

printer/src/main/java/zs/qimai/com/printer2/manager/DeviceManager.kt

@@ -17,7 +17,7 @@ abstract class DeviceManager {
     abstract var mType: Int
     var name: String? = null
     @Deprecated("后续用 mPrintSize 代替打印杯贴大小")
-    var maxLineChars: Int = 55
+    var maxLineChars: Int = 80
     var mPrintSize:Int = -1
     companion object {
         //小票模式

websocket/build.gradle

@@ -22,7 +22,7 @@ android {
 }
 
 group 'com.qmai.android.sdk'
-version '2.1.2-SNAPSHOT'
+version '2.1.3-SNAPSHOT'
 
 gradlePublish {
 

websocket/src/main/java/com/zhimai/websocket/util/BaseMsgWebSocket.java

@@ -171,6 +171,7 @@ public class BaseMsgWebSocket {
         openTimingGetMessage = isOpen;
         return mBaseMsgWebSocket;
     }
+
     /**
      * 设置是否打印日志
      *
@@ -305,7 +306,7 @@ public class BaseMsgWebSocket {
                 Logger.e(TAG, "onMessage;;" + text);
                 if (mWebSocketSubscriberListener != null) {
                     mWebSocketSubscriberListener.onMessage(text);
-                }else {
+                } else {
 //                    checkMessage(text);
                 }
             }
@@ -382,8 +383,8 @@ public class BaseMsgWebSocket {
      * 根据接收的消息，进行相应的处理，这里随便写的，要根据自己定的规则进行处理
      */
 //    private void checkMessage (String message) {
-        // 这里需要去调整，最好是调整成，任意结构的解析。
-        // 思路： 1、外部传入一个类型，T ，2、判断的条件是什么？能否传入或者注解。
+    // 这里需要去调整，最好是调整成，任意结构的解析。
+    // 思路： 1、外部传入一个类型，T ，2、判断的条件是什么？能否传入或者注解。
 //        try {
 //            Log.d(TAG, "checkMessage: message= " + message);
 //            JSONObject jsonObject = new JSONObject(message);
@@ -431,6 +432,7 @@ public class BaseMsgWebSocket {
 //
 //        }
 //    }
+
     /**
      * 发送绑定/验证 请求
      */
@@ -441,7 +443,7 @@ public class BaseMsgWebSocket {
     /**
      * 入队操作
      */
-    public void joinMessageQueue(String message){
+    public void joinMessageQueue(String message) {
         if (useQueue) {//如果开启队列，消息加入队列---------------------------------------------
             Logger.e(TAG, "------消息加入队列 ");
             MessageQueue.getInstance().enQueue(message);
@@ -539,14 +541,14 @@ public class BaseMsgWebSocket {
                 if (openTimingGetMessage) {
                     if (number * pingRate % getMessageInterval == 0) {
                         //定时拉取服务端打印消息
-                        if (mSocketTimerMessageListener!=null){
+                        if (mSocketTimerMessageListener != null) {
                             mSocketTimerMessageListener.timerMessage();
                         }
                     } else {
                         Logger.e(TAG, "number = " + number + "  ;; pingRate = " + pingRate + "  ;; getMessageInterval = " + getMessageInterval);
                     }
                 } else {
-                    Logger.e(TAG, "isSocket2 = "  + "  ;; openTimingGetMessage = " + openTimingGetMessage);
+                    Logger.e(TAG, "isSocket2 = " + "  ;; openTimingGetMessage = " + openTimingGetMessage);
                 }
             }
         });
@@ -561,6 +563,14 @@ public class BaseMsgWebSocket {
         Logger.e(TAG, "socket心跳已关闭...");
     }
 
+    public void cancelListener() {
+        this.mWebSocketSubscriberListener = null;
+        this.mSocketTimerMessageListener = null;
+        this.queueMessageListener = null;
+        this.socketMessageListener = null;
+        this.socketConnectListener = null;
+    }
+
     public BaseMsgWebSocket setWebSocketSubscriberListener(WebSocketSubscriberListener mWebSocketSubscriberListener) {
         this.mWebSocketSubscriberListener = mWebSocketSubscriberListener;
         return this;

widgetlib/build.gradle

@@ -39,6 +39,7 @@ dependencies {
     implementation project(path: ':tools')
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
+    api 'com.blankj:utilcodex:1.30.6'
 
 
 //    implementation 'com.qmai.android.tools:tools:1.1.1-SNAPSHOT'
@@ -49,7 +50,7 @@ repositories {
 
 
 group 'com.qmai.android.sdk'
-version '1.1.36-SNAPSHOT'
+version '1.1.37-SNAPSHOT'
 
 gradlePublish {
 

widgetlib/src/main/java/com/qimai/android/widgetlib/toast/ToastUtils.java

@@ -12,14 +12,16 @@ import android.widget.Toast;
 
 import androidx.annotation.MainThread;
 
+import kotlin.Deprecated;
+
 /**
  * created by wangwei   ON 2019-11-04  email:wangwei_5521@163.com
  *
  * @version 1.1.1
  * @Description
  **/
+@Deprecated(message = "废弃用  com.blankj.utilcode.util.ToastUtils" )
 public class ToastUtils {
-
     private static volatile ToastUtils instance;
     private static final int COLOR_DEFAULT = 0xFEFFFFFF;
 
@@ -45,14 +47,17 @@ public class ToastUtils {
 
     @MainThread
     public void showCenter(String msg) {
-        getToast().setText(msg);
+        com.blankj.utilcode.util.ToastUtils.showShort(msg);
+        /*getToast().setText(msg);
         mToast.setGravity(Gravity.CENTER, 0, 0);
-        mToast.show();
+        mToast.show();*/
     }
 
     @MainThread
     public void showToast(CharSequence msg) {
-        getToast();
+        com.blankj.utilcode.util.ToastUtils.showShort(msg);
+
+      /*  getToast();
         View toastView = mToast.getView();
         TextView message = toastView.findViewById(android.R.id.message);
         message.setText(msg);
@@ -82,7 +87,7 @@ public class ToastUtils {
                 }
             }
         }
-        mToast.show();
+        mToast.show();*/
     }
 
     public ToastUtils setsMsgTextSize(int msgTextSize) {