修改广播收到usb设备时判断是打印机类型在进行连接

log/src/main/java/com/qimai/log/LogInit.kt

@@ -13,6 +13,7 @@ import com.tencent.mars.xlog.Xlog
 class LogInit private constructor() {
     private lateinit var mLogConfig: QmLogConfig
 
+    @JvmOverloads
     fun init(application: Context) {
         init(QmLogConfig(application))
     }
@@ -26,13 +27,11 @@ class LogInit private constructor() {
         System.loadLibrary("c++_shared")
         System.loadLibrary("marsxlog")
         var logPath = ""
-        if (BuildConfig.DEBUG){
-           logPath = config.logDebugPath
-        }else{
+        if (BuildConfig.DEBUG) {
+            logPath = config.logDebugPath
+        } else {
             logPath = config.logReleasePath
-
         }
-
         val logConfig = Xlog.XLogConfig()
         logConfig.mode = Xlog.AppednerModeAsync
         logConfig.logdir = logPath
@@ -42,18 +41,18 @@ class LogInit private constructor() {
         logConfig.compresslevel = 0
         logConfig.cachedays = 0
         logConfig.cachedir = ""
-     //   if (BuildConfig.DEBUG) {
-            logConfig.level = Xlog.LEVEL_DEBUG
-            Xlog.setConsoleLogOpen(true)
-     //   } else {
-           // logConfig.level = Xlog.LEVEL_ALL
-          //  Xlog.setConsoleLogOpen(true)
+        //   if (BuildConfig.DEBUG) {
+        logConfig.level = Xlog.LEVEL_DEBUG
+        Xlog.setConsoleLogOpen(true)
+        //   } else {
+        // logConfig.level = Xlog.LEVEL_ALL
+        //  Xlog.setConsoleLogOpen(true)
         //}
         Xlog.appenderOpen(logConfig)
         Log.setLogImp(Xlog())
         //检查是否有过期的通知数据
-       // val intent = Intent(getConfig().app, ScheduledExecutionService::class.java)
-      //  getConfig().app.startService(intent)
+        // val intent = Intent(getConfig().app, ScheduledExecutionService::class.java)
+        //  getConfig().app.startService(intent)
 
 
     }

log/src/main/java/com/qimai/log/QmLog.kt

@@ -2,7 +2,6 @@ package com.qimai.log
 
 import android.content.Intent
 import com.tencent.mars.xlog.Log
-import java.lang.IllegalArgumentException
 
 object QmLog {
 
@@ -46,7 +45,25 @@ object QmLog {
         if (config == null) {
             throw IllegalArgumentException("please call LogInit.init() first")
         } else {
-            return config!!
+            return config
         }
     }
+
+    //上传log
+    /***
+     * filePath 保存logo的路径
+     */
+    fun uploadXog(config: (filePath: String) -> Unit) {
+        //刷新下
+        Log.appenderFlush(false)
+        // final String logPath = SDCARD + "/ptcy/log";
+        val logPath: String = if (BuildConfig.DEBUG) {
+            getConfig().logDebugPath
+        } else {
+            getConfig().logReleasePath
+        }
+        config(logPath)
+        // val intent = Intent(getConfig().app, UploadService::class.java)
+        // getConfig().app.startService(intent)
+    }
 }
\ No newline at end of file

printer/build.gradle

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

printer/src/main/java/zs/qimai/com/printer2/receiver/UsbDetachReceiver.kt

@@ -18,14 +18,18 @@ class UsbDetachReceiver : BroadcastReceiver() {
         if (intent.action == UsbManager.ACTION_USB_DEVICE_DETACHED) {
             val mUsbDevice = intent.getParcelableExtra<UsbDevice?>(UsbManager.EXTRA_DEVICE)
             Log.d(TAG, "onReceive:  ACTION_USB_DEVICE_DETACHED mUsbDevice = ${mUsbDevice}")
+            //判断是打印机类型
             mUsbDevice?.let {
-                DeviceManagerUtils.getInstance().removeUsbDevice(it)
+                if (mUsbDevice?.interfaceCount != 0 && mUsbDevice?.getInterface(0)?.interfaceClass == 7) {
+                    DeviceManagerUtils.getInstance().removeUsbDevice(it)
+                }
             }
 
         }
         if (intent.action == UsbManager.ACTION_USB_DEVICE_ATTACHED) {
             val mUsbDevice = intent.getParcelableExtra<UsbDevice?>(UsbManager.EXTRA_DEVICE)
-            if (PrintManagerUtils.getInstance().detachUsbDeviceAutoConn) {
+            //判断是打印机类型
+            if (mUsbDevice?.interfaceCount != 0 && mUsbDevice?.getInterface(0)?.interfaceClass == 7 && PrintManagerUtils.getInstance().detachUsbDeviceAutoConn) {
                 PrintManagerUtils.getInstance().usbConnect(mUsbDevice?.deviceName!!, mUsbDevice)
             }
         }