隐藏部分打印

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -351,7 +351,8 @@ object BusinessManager {
     @AfterPermissionGranted(PERMISSION_REQUEST_CODE)
     fun doScanBle(mac: String, loadingCallBack: ((Boolean, String?, Boolean?) -> Unit)?, prepareDoneCallBack: ((Boolean, BleBean?) -> Unit)?) {
         LogUtil.d("扫描开始：$mac")
-        loadingCallBack?.invoke(true, MyApplication.instance?.getString(R.string.start_scanning_for_devices), null)
+//        loadingCallBack?.invoke(true, MyApplication.instance?.getString(R.string.start_scanning_for_devices), null)
+        loadingCallBack?.invoke(true, "", null)
         BleUtil.instance?.scan(object : CustomBleScanCallback() {
             override fun onPrompt(promptStr: String?) {
                 BleManager.getInstance().enableBluetooth()
@@ -402,18 +403,21 @@ object BusinessManager {
         loadingCallBack: ((Boolean, String?, Boolean?) -> Unit)?,
         prepareDoneCallBack: ((Boolean, BleBean?) -> Unit)?
     ) {
-        loadingCallBack?.invoke(true, CommonUtils.getStr(R.string.ble_connecting), null)
+//        loadingCallBack?.invoke(true, CommonUtils.getStr(R.string.ble_connecting), null)
+        loadingCallBack?.invoke(true, "", null)
         BleManager.getInstance().disconnect(bleDevice)
         BleUtil.instance?.connectBySelect(bleDevice,
             object : CustomBleGattCallback() {
                 override fun onPrompt(promptStr: String?) {
-                    loadingCallBack?.invoke(false, promptStr, false)
+//                    loadingCallBack?.invoke(false, promptStr, false)
+                    loadingCallBack?.invoke(false, "", false)
                 }
 
                 override fun onStartConnect() {}
 
                 override fun onConnectFail(bleDevice: BleDevice?, exception: BleException?) {
-                    loadingCallBack?.invoke(false, CommonUtils.getStr(R.string.ble_connect_fail), false)
+//                    loadingCallBack?.invoke(false, CommonUtils.getStr(R.string.ble_connect_fail), false)
+                    loadingCallBack?.invoke(false, "", false)
                     prepareDoneCallBack?.invoke(false, null)
                 }
 
@@ -422,7 +426,7 @@ object BusinessManager {
                     LogUtil.i("onConnectSuccess : $bleDevice")
                     bleDevice?.let {
                         val bleBean = BleBean(it)
-                        ToastUtils.tip(R.string.connect_success)
+//                        ToastUtils.tip(R.string.connect_success)
                         BleUtil.instance?.deviceList?.add(bleBean)
                         // 设置MTU
                         Executor.delayOnMain(200) {
@@ -437,7 +441,7 @@ object BusinessManager {
 
                 override fun onDisConnected(isActiveDisConnected: Boolean, device: BleDevice?, gatt: BluetoothGatt?, status: Int) {
                     loadingCallBack?.invoke(false, null, false)
-                    ToastUtils.tip(CommonUtils.getStr(R.string.ble_disconnect))
+//                    ToastUtils.tip(CommonUtils.getStr(R.string.ble_disconnect))
                     BleUtil.instance?.getBleDeviceByMac(device?.mac)?.let {
                         BleUtil.instance?.deviceList?.remove(it)
                     }
@@ -453,7 +457,8 @@ object BusinessManager {
         loadingCallBack: ((Boolean, String?, Boolean?) -> Unit)?,
         prepareDoneCallBack: ((Boolean, BleBean?) -> Unit)?
     ) {
-        loadingCallBack?.invoke(true, MyApplication.instance?.getString(R.string.start_indicating), null)
+//        loadingCallBack?.invoke(true, MyApplication.instance?.getString(R.string.start_indicating), null)
+        loadingCallBack?.invoke(true, "", null)
         bleBean?.let {
             BleUtil.instance?.indicate(it.bleDevice, indicateCallback = object : CustomBleIndicateCallback() {
                 override fun onPrompt(promptStr: String?) {
@@ -477,7 +482,7 @@ object BusinessManager {
 
                 override fun onIndicateFailure(exception: BleException?) {
                     loadingCallBack?.invoke(false, null, false)
-                    ToastUtils.tip(MyApplication.instance?.getString(R.string.indicate_fail))
+//                    ToastUtils.tip(MyApplication.instance?.getString(R.string.indicate_fail))
                     LogUtil.i("监听失败")
                     prepareDoneCallBack?.invoke(false, null)
                 }
@@ -500,17 +505,20 @@ object BusinessManager {
         loadingCallBack: ((Boolean, String?, Boolean?) -> Unit)?,
         prepareDoneCallBack: ((Boolean, BleBean?) -> Unit)?
     ) {
-        loadingCallBack?.invoke(true, MyApplication.instance?.getString(R.string.start_getting_token), null)
+//        loadingCallBack?.invoke(true, MyApplication.instance?.getString(R.string.start_getting_token), null)
+        loadingCallBack?.invoke(true, "", null)
         bleBean?.let {
             BleCmdManager.getToken(it.bleDevice.mac, object : CustomBleWriteCallback() {
                 override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                    loadingCallBack?.invoke(false, MyApplication.instance?.getString(R.string.get_token_success), null)
+//                    loadingCallBack?.invoke(false, MyApplication.instance?.getString(R.string.get_token_success), null)
+                    loadingCallBack?.invoke(false, "", null)
                     LogUtil.i("getToken success : ${bleBean.bleDevice.mac}")
                     prepareDoneCallBack?.invoke(true, bleBean)
                 }
 
                 override fun onWriteFailure(exception: BleException?) {
-                    loadingCallBack?.invoke(false, MyApplication.instance?.getString(R.string.get_token_fail), false)
+//                    loadingCallBack?.invoke(false, MyApplication.instance?.getString(R.string.get_token_fail), false)
+                    loadingCallBack?.invoke(false, "", false)
                     LogUtil.e("getToken fail : ${bleBean.bleDevice.mac}")
                     prepareDoneCallBack?.invoke(false, null)
                 }
@@ -598,16 +606,19 @@ object BusinessManager {
 
     private fun sendTicket(jsonStr: String, bleDevice: BleDevice, loadingCallBack: ((Boolean, String?, Boolean?) -> Unit)?) {
         val ctx = MyApplication.instance!!
-        loadingCallBack?.invoke(true, ctx.getString(R.string.simple_start_send_ticket), null)
+//        loadingCallBack?.invoke(true, ctx.getString(R.string.simple_start_send_ticket), null)
+        loadingCallBack?.invoke(true, "", null)
         BleCmdManager.sendWorkTicket(jsonStr, bleDevice = bleDevice, callback = object : CustomBleWriteCallback() {
             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
                 println("sendTicket success")
-                loadingCallBack?.invoke(true, ctx.getString(R.string.simple_sending_ticket), null)
+//                loadingCallBack?.invoke(true, ctx.getString(R.string.simple_sending_ticket), null)
+                loadingCallBack?.invoke(true, "", null)
             }
 
             override fun onWriteFailure(exception: BleException?) {
                 LogUtil.e("sendTicket fail : ${bleDevice.mac}")
-                loadingCallBack?.invoke(false, ctx.getString(R.string.simple_send_ticket_fail), null)
+//                loadingCallBack?.invoke(false, ctx.getString(R.string.simple_send_ticket_fail), null)
+                loadingCallBack?.invoke(false, "", null)
             }
         })
     }
@@ -706,11 +717,13 @@ object BusinessManager {
         val res = byteArray[5]
         loadingCallBack?.invoke(false, null, null)
         if (res == 0x01.toByte() && job == 0x01.toByte()) {
-            loadingCallBack?.invoke(false, ctx.getString(R.string.simple_switch_work_mode_success), null)
+//            loadingCallBack?.invoke(false, ctx.getString(R.string.simple_switch_work_mode_success), null)
+            loadingCallBack?.invoke(false, "", null)
             // TODO 切成工作模式断开，待机模式不断开
 //            BleManager.getInstance().disconnectAllDevice()
         } else if (res == 0x02.toByte() && job == 0x01.toByte()) {
-            loadingCallBack?.invoke(false, ctx.getString(R.string.simple_switch_standby_mode_success), null)
+//            loadingCallBack?.invoke(false, ctx.getString(R.string.simple_switch_standby_mode_success), null)
+            loadingCallBack?.invoke(false, "", null)
         }
     }
 
@@ -742,7 +755,8 @@ object BusinessManager {
         } else {
             LogUtil.i("Work ticket is done")
             // 下发完毕，切换工作模式
-            loadingCallBack?.invoke(true, ctx.getString(R.string.simple_switch_work_mode), null)
+//            loadingCallBack?.invoke(true, ctx.getString(R.string.simple_switch_work_mode), null)
+            loadingCallBack?.invoke(true, "", null)
             BleCmdManager.switchMode(STATUS_WORK, bleBean.bleDevice, object : CustomBleWriteCallback() {
                 override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
                     println("switch mode 1 success")
@@ -755,7 +769,8 @@ object BusinessManager {
             // 打开钥匙卡扣
             val keyBean = ModBusController.getKeyByMac(bleBean.bleDevice.mac)
             if (keyBean == null) {
-                loadingCallBack?.invoke(false, ctx.getString(R.string.simple_key_not_found), false)
+//                loadingCallBack?.invoke(false, ctx.getString(R.string.simple_key_not_found), false)
+                loadingCallBack?.invoke(false, "", false)
                 ToastUtils.tip(R.string.simple_key_not_exists)
             } else {
                 loadingCallBack?.invoke(false, null, true)
@@ -784,7 +799,8 @@ object BusinessManager {
         }
         // TODO 缺少res处理
         if (idx != total - 1) {
-            loadingCallBack?.invoke(true, ctx.getString(R.string.simple_get_ticket_part), null)
+//            loadingCallBack?.invoke(true, ctx.getString(R.string.simple_get_ticket_part), null)
+            loadingCallBack?.invoke(true, "", null)
             getTicketStatusPart((idx + 1).toByteArray(), total.toByteArray(), byteArrayOf(0x01.toByte()), bleDevice, object : CustomBleWriteCallback() {
                 override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
                     println("getTicketStatusPart success")
@@ -795,7 +811,8 @@ object BusinessManager {
                 }
             })
         } else {
-            loadingCallBack?.invoke(false, ctx.getString(R.string.simple_get_ticket_status_done), null)
+//            loadingCallBack?.invoke(false, ctx.getString(R.string.simple_get_ticket_status_done), null)
+            loadingCallBack?.invoke(false, "", null)
             BleUtil.instance?.getBleDeviceByMac(bleDevice.mac)?.let {
                 println("工作票完成接收 ： ${String(it.ticketStatus)}")
                 // TD:Ticket Done
@@ -860,13 +877,16 @@ object BusinessManager {
      * 获取工作票完成情况
      */
     private fun getTicketStatus(bleDevice: BleDevice, loadingCallBack: ((Boolean, String?, Boolean?) -> Unit)?) {
-        loadingCallBack?.invoke(true, MyApplication.instance?.getString(R.string.start_getting_ticket), null)
+//        loadingCallBack?.invoke(true, MyApplication.instance?.getString(R.string.start_getting_ticket), null)
+        loadingCallBack?.invoke(true, "", null)
         BleCmdManager.getTicketStatus(bleDevice, object : CustomBleWriteCallback() {
             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                loadingCallBack?.invoke(false, MyApplication.instance?.getString(R.string.get_ticket_success), null)
+//                loadingCallBack?.invoke(false, MyApplication.instance?.getString(R.string.get_ticket_success), null)
+                loadingCallBack?.invoke(false, "", null)
                 println("getTicketStatus success")}
             override fun onWriteFailure(exception: BleException?) {
-                loadingCallBack?.invoke(false, MyApplication.instance?.getString(R.string.get_ticket_fail), false)
+//                loadingCallBack?.invoke(false, MyApplication.instance?.getString(R.string.get_ticket_fail), false)
+                loadingCallBack?.invoke(false, "", false)
                 println("getTicketStatus fail")}
         })
     }