发布printer,keyboard新版本

KeyBoardView/build.gradle

@@ -37,7 +37,7 @@ repositories {
 }
 
 group 'com.qmai.android.widget'
-version '1.1.43-SNAPSHOT'
+version '1.1.44-SNAPSHOT'
 
 gradlePublish {
 

KeyBoardView/src/main/java/com/qmai/android/keyboard/NumberKeyBoard.kt

@@ -77,7 +77,10 @@ class NumberKeyBoard : QmKeyboardView {
         }
 
         override fun onKey(primaryCode: Int, keyCodes: IntArray?) {
-
+            //判断没有初始化
+            if (!::editWidget.isInitialized) {
+                return
+            }
             val editable = editWidget.editableText
             when (primaryCode) {
                 Code.CLEAR.code -> {

app/src/main/AndroidManifest.xml

@@ -4,6 +4,8 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
 
+
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <application
         android:name=".App"
             android:allowBackup="true"

app/src/main/java/com/qimai/android/widget/MainActivityPtinter.kt

@@ -43,6 +43,8 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack {
         setContentView(R.layout.activity_main_printer)
         DeviceManagerUtils.getInstance().addConnectStatusCallBack(this)
         initUsbPrinter()
+        val value = Utils.getSN()
+        Log.d(TAG, "onCreate: value= $value")
         tv_connect_bt.setOnClickListener {
             startActivity(Intent(this, BtListActivity::class.java))
         }

app/src/main/java/com/qimai/android/widget/Utils.java

+package com.qimai.android.widget;
+
+import android.os.Build;
+
+import java.lang.reflect.Method;
+
+/**
+ * <pre>
+ *     author : leiwang
+ *     e-mail : xxx@xx
+ *     time   : 2021/08/12
+ *     desc   :
+ *     version: 1.0
+ * </pre>
+ */
+public class Utils {
+
+    /**
+     * 获取SN
+     * @return
+     */
+    public static String getSN()
+    {
+        String serial = "";
+        //通过android.os获取sn号
+        try {
+            serial = android.os.Build.SERIAL;
+            if (!serial.equals("") && !serial.equals("unknown")) {
+                return serial;
+            }
+        } catch (Exception e) {
+            serial = "";
+        }
+
+        //通过反射获取sn号
+        try {
+            Class<?> c = Class . forName ("android.os.SystemProperties");
+            Method get = c . getMethod ("get", String.class);
+            serial = (String) get . invoke (c, "ro.serialno");
+            if (!serial.equals("") && !serial.equals("unknown")) return serial;
+
+            //9.0及以上无法获取到sn，此方法为补充，能够获取到多数高版本手机 sn
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) serial = Build.getSerial();
+        } catch (Exception e) {
+            serial = "";
+        }
+        return serial;
+
+    }
+}

printer/build.gradle

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

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

@@ -34,6 +34,7 @@ class BlueDeviceManager(override var mType: Int = BT) : DeviceManager() {
     private var disposable: Disposable? = null
     private val uuid = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB")//蓝牙打印UUID
     private var job: Job? = null
+
     @RequiresApi(Build.VERSION_CODES.KITKAT)
     override fun openPort() {
         mOnBtConnectCallBack?.onConnectStart()
@@ -57,10 +58,8 @@ class BlueDeviceManager(override var mType: Int = BT) : DeviceManager() {
         mBlueToothDevice?.let { it ->
             //这里判断是否需要弹出密码输入弹窗
             var isVerify: Boolean = it.createBond()
-            //如果不需要就直接去连接
-            if (!isVerify) {
-                connectBt(it)
-            } else {
+            //如果不需要就直接去连接 同时是未配对状态
+            if (isVerify && (it.bondState != BluetoothDevice.BOND_BONDED)) {
                 //获取顶部Activity
                 ActivityManagers.getInstance().getTopActivity()?.let { activity ->
                     //去广播中等待状态
@@ -86,6 +85,8 @@ class BlueDeviceManager(override var mType: Int = BT) : DeviceManager() {
                         }
                     }
                 } ?: mOnBtConnectCallBack?.onConnectError(ACTIVITY_NOT_FOUND, "获取不到Activity实例")
+            } else {
+                connectBt(it)
             }
             //mOnBtConnectCallBack?.onConnectError(DEVICE_NOT_FIND, "根据地址获取不到设备")
         }
@@ -144,88 +145,67 @@ class BlueDeviceManager(override var mType: Int = BT) : DeviceManager() {
      * ***/
     private fun connectBt(it: BluetoothDevice) {
         GlobalScope.launch(Dispatchers.Main) {
-            mBluetoothSocket = getBtSocket(it)
-            if (mBluetoothSocket != null) {
-                try {
-                    withContext(Dispatchers.IO) {
-                        mBluetoothSocket!!.connect()
-                    }
-                    mOutPutStream = mBluetoothSocket!!.outputStream
-                    mInPutStream = mBluetoothSocket!!.inputStream
-                    //到这里说明配对并连接成功 判断打印机模式
-                    PrinterStatusUtils(this@BlueDeviceManager).apply {
-                        mPrintStatusCallBack = object : PrintStatusCallBack {
-                            override fun searchResult(status: Int?) {
-                                mPrintMode = status ?: ESC
-                                mStatus = true
-                            //    name = it.productName
-                                name = it.name
-                               /* if (name.isNullOrEmpty()) {
-                                    name = if (mPrintMode == ESC) "小票打印机" else "杯贴打印机"
-                                }*/
-                                DeviceManagerUtils.getInstance().addDevice(this@BlueDeviceManager)
-                                mOnBtConnectCallBack?.onConnectSuccess(this@BlueDeviceManager)
-                                //mUsbPrintConnCallBack?.onConnSucess(this@UsbDeviceManager)
-
-                                Log.d(TAG, "searchResult: status= $status")
-                              /*  status?.let {
-                                    handleConnectSuccess(status)
-                                } ?: handleUnknownStatus()*/
+            try {
+                withContext(Dispatchers.IO) {
+                    mBluetoothSocket = it.createRfcommSocketToServiceRecord(uuid)
+                }
+                if (mBluetoothSocket != null) {
+                    try {
+                        withContext(Dispatchers.IO) {
+                            if (mBluetoothSocket!!.isConnected) {
+                                mBluetoothSocket!!.close()
+                            }
+                            mBluetoothSocket!!.connect()
+                        }
+                        mOutPutStream = mBluetoothSocket!!.outputStream
+                        mInPutStream = mBluetoothSocket!!.inputStream
+                        //到这里说明配对并连接成功 判断打印机模式
+                        PrinterStatusUtils(this@BlueDeviceManager).apply {
+                            mPrintStatusCallBack = object : PrintStatusCallBack {
+                                override fun searchResult(status: Int?) {
+                                    mPrintMode = status ?: ESC
+                                    mStatus = true
+                                    //    name = it.productName
+                                    name = it.name
+                                    /* if (name.isNullOrEmpty()) {
+                                         name = if (mPrintMode == ESC) "小票打印机" else "杯贴打印机"
+                                     }*/
+                                    DeviceManagerUtils.getInstance()
+                                        .addDevice(this@BlueDeviceManager)
+                                    mOnBtConnectCallBack?.onConnectSuccess(this@BlueDeviceManager)
+                                    //mUsbPrintConnCallBack?.onConnSucess(this@UsbDeviceManager)
+
+                                    Log.d(TAG, "searchResult: status= $status")
+                                    /*  status?.let {
+                                          handleConnectSuccess(status)
+                                      } ?: handleUnknownStatus()*/
+                                }
                             }
+                            queryStatus()
                         }
-                        queryStatus()
+                    } catch (e: IOException) {
+                        Log.d(TAG, "connectBt: e= $e")
+                        mOnBtConnectCallBack?.onConnectError(
+                            PrintManagerUtils.SOCKET_ERROR,
+                            "socket连接异常"
+                        )
+                        closePort()
+                        mStatus = false
                     }
-                } catch (e: IOException) {
-                    Log.d(TAG, "connectBt: e= $e")
+                } else {
                     mOnBtConnectCallBack?.onConnectError(
-                        PrintManagerUtils.SOCKET_ERROR,
-                        "socket连接异常"
+                        PrintManagerUtils.SOCKET_NOT_FOUND,
+                        "获取不到socket"
                     )
-                    closePort()
-                    mStatus = false
                 }
-            } else {
+            } catch (e: Exception) {
                 mOnBtConnectCallBack?.onConnectError(
-                    PrintManagerUtils.SOCKET_NOT_FOUND,
-                    "获取不到socket"
+                    PrintManagerUtils.SOCKET_ERROR,
+                    "${e.message}"
                 )
             }
+
         }
-        /* mBluetoothSocket = it.createRfcommSocketToServiceRecord(uuid)
-         mBluetoothSocket?.let {
-             try {
-                 //发起连接
-                 it.connect()
-                 try {
-                     mOutPutStream = it.outputStream
-                     mInPutStream = it.inputStream
-                 } catch (e: IOException) {
-                     mOnBtConnectCallBack?.onConnectError(PrintManagerUtils.IO_ERROR, "获取流失败")
-                     closePort()
-                     mStatus = false
-                 }
-
-             } catch (e: IOException) {
-                 mOnBtConnectCallBack?.onConnectError(PrintManagerUtils.SOCKET_ERROR, "socket连接异常")
-                 closePort()
-                 mStatus = false
-             }
-
-             //到这里说明配对并连接成功 判断打印机模式
-             PrinterStatusUtils(this).apply {
-                 mPrintStatusCallBack = object : PrintStatusCallBack {
-                     override fun searchResult(status: Int?) {
-                         Log.d(TAG, "searchResult: status= $status")
-                         status?.let {
-                             handleConnectSuccess(status)
-                         } ?: handleUnknownStatus()
-                     }
-                 }
-                 queryStatus()
-             }
-
-
-         } ?: mOnBtConnectCallBack?.onConnectError(PrintManagerUtils.SOCKET_NOT_FOUND, "获取不到socket")*/
     }
 
 

printer/src/main/java/zs/qimai/com/printer2/utils/PrintManagerUtils.kt

@@ -263,9 +263,10 @@ class PrintManagerUtils {
     fun connectSunmiInnerBluePrint(onBtConnectCallBack: OnBtConnectCallBack? = null) {
         val brand = Build.BRAND
         val model = Build.MODEL
+        Log.d(TAG, "connectSunmiInnerBluePrint: model= ${model}")
         //商米品牌&&（T系列||D2s系列 D2mini)）
         if (brand == "SUNMI" &&
-            (model.contains("T2") || model.contains("T1") || model.contains("D2s") || model.contains(
+            (model.contains("T2") ||model.contains("t2")|| model.contains("t1host") || model.contains("D2s") || model.contains(
                 "D2mini"
             ))
         ) {