蓝牙测试页新增长按下发解锁工作票功能

app/src/main/java/com/grkj/iscs/view/activity/test/BleActivity.kt

@@ -185,27 +185,39 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                     holder.setOnClickListener(R.id.ticketStatus) {
                         BleCmdManager.getTicketStatus(item?.bleDevice!!, object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                                println("getTicketStatus success")}
+                                LogUtil.i("getTicketStatus success")}
                             override fun onWriteFailure(exception: BleException?) {
-                                println("getTicketStatus fail")}
+                                LogUtil.e("getTicketStatus fail")}
                         })
                     }
 
+                    // 上锁工作票
                     holder.setOnClickListener(R.id.sendTicket) {
-//                        val testStr = "{\"cardNo\":\"ACB13E0B\",\"data\":[{\"taskCode\":\"87654321110\",\"taskId\":\"587aa6cfcce940778836e512a10c330e\",\"dataList\":[{\"dataId\":1,\"target\":0,\"status\":0,\"closed\":1,\"equipRfidNo\":\"1DA0C66D031080\",\"infoRfidNo\":\"206BD295\"},{\"dataId\":2,\"target\":0,\"status\":0,\"closed\":1,\"equipRfidNo\":\"1DCAD26D031080\",\"infoRfidNo\":\"D074D295\"}],\"closed\":1}]}"
-//                        val testStr = "{\"cardNo\":\"80A8C0F4EA\",\"password\":\"12345678\",\"effectiveTime\":24,\"data\":[{\"taskCode\":\"202401020001\",\"taskId\":\"71b49baa49b343bc84d7e6b829ac1bdc\",\"codeId\":1,\"dataList\":[{\"dataId\":1,\"equipRfidNo\":\"049648B2E31690\",\"infoRfidNo\":\"04E3BCCA201290\",\"target\":1},{\"dataId\":2,\"equipRfidNo\":\"0405982414C563\",\"target\":0,\"prevId\":1}]},{\"taskCode\":\"202401020002\",\"taskId\":\"145b5a4cc38c41e19943f4c8b48d12b0\",\"codeId\":2,\"dataList\":[{\"dataId\":1,\"equipRfidNo\":\"045460F7F4F438\",\"infoRfidNo\":\"04BC6584C65009\",\"target\":1},{\"dataId\":2,\"equipRfidNo\":\"042B99E449E795\",\"target\":0,\"prevId\":1},{\"dataId\":3,\"equipRfidNo\":\"04A312EE848B62\",\"infoRfidNo\":\"04220E86831289\",\"target\":1,\"prevId\":2}]}],\"lockList\":[{\"lockId\":\"1\",\"rfid\":\"040E21443010E9\"},{\"lockId\":\"2\",\"rfid\":\"0457505E5861C2\"}]}"
-//                        val testStr = "{\"cardNo\":\"267747D5\",\"data\":[{\"codeId\":1,\"dataList\":[{\"dataId\":0,\"equipRfidNo\":\"1DA0C66D031080\",\"target\":0},{\"dataId\":1,\"equipRfidNo\":\"1DCAD26D031080\",\"prevId\":0,\"target\":0}],\"taskCode\":\"202410290918\",\"taskId\":\"123456\"}],\"effectiveTime\":24,\"lockList\":[{\"lockId\":\"1\",\"rfid\":\"706BD295\"},{\"lockId\":\"2\",\"rfid\":\"6CD295\"}]}"
+                        val testStr = "{\"cardNo\":\"267747D5\",\"data\":[{\"codeId\":1,\"dataList\":[{\"dataId\":17,\"equipName\":\"E-17\",\"equipRfidNo\":\"1DCAD26D031080\",\"target\":0},{\"dataId\":18,\"equipName\":\"E-18\",\"equipRfidNo\":\"1DA0C66D031080\",\"target\":0}],\"taskCode\":\"243\"}],\"lockList\":[{\"lockId\":1,\"rfid\":\"0089D495\"},{\"lockId\":2,\"rfid\":\"B05AD495\"}],\"password\":\"123456\"}"
+                        BleCmdManager.sendWorkTicket(testStr, bleDevice = item?.bleDevice!!, callback = object : CustomBleWriteCallback() {
+                            override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
+                                LogUtil.i("sendTicket lock success")
+                            }
+
+                            override fun onWriteFailure(exception: BleException?) {
+                                LogUtil.e("sendTicket lock fail")
+                            }
+                        })
+                    }
 
-                        val testStr = "{\"cardNo\":\"267747D5\",\"data\":[{\"codeId\":1,\"dataList\":[{\"dataId\":11,\"equipName\":\"E-11\",\"equipRfidNo\":\"1DA0C66D031080\",\"target\":0},{\"dataId\":12,\"equipName\":\"E-12\",\"equipRfidNo\":\"1DCAD26D031080\",\"target\":0}],\"taskCode\":\"291\",\"taskId\":\"291\"}],\"effectiveTime\":24,\"lockList\":[{\"lockId\":1,\"rfid\":\"0089D495\"},{\"lockId\":2,\"rfid\":\"B05AD495\"}]}"
+                    // 解锁工作票
+                    holder.setOnLongClickListener(R.id.sendTicket) {
+                        val testStr = "{\"cardNo\":\"267747D5\",\"data\":[{\"codeId\":1,\"dataList\":[{\"dataId\":17,\"equipName\":\"E-17\",\"equipRfidNo\":\"1DCAD26D031080\",\"target\":1,\"infoRfidNo\":\"0089D495\"},{\"dataId\":18,\"equipName\":\"E-18\",\"equipRfidNo\":\"1DA0C66D031080\",\"target\":1,\"infoRfidNo\":\"B05AD495\"}],\"taskCode\":\"243\"}],\"password\":\"123456\"}"
                         BleCmdManager.sendWorkTicket(testStr, bleDevice = item?.bleDevice!!, callback = object : CustomBleWriteCallback() {
                             override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                                println("sendTicket success")
+                                LogUtil.i("sendTicket unlock success")
                             }
 
                             override fun onWriteFailure(exception: BleException?) {
-                                println("sendTicket fail")
+                                LogUtil.e("sendTicket unlock fail")
                             }
                         })
+                        return@setOnLongClickListener true
                     }
 
                     holder.setOnClickListener(R.id.sendFile) {
@@ -237,11 +249,11 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
                     }
                     BleCmdManager.sendFile(2, File(list[0]), mac = fileMac, callback = object : CustomBleWriteCallback() {
                         override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {
-                            println("sendFile success")
+                            LogUtil.i("sendFile success")
                         }
 
                         override fun onWriteFailure(exception: BleException?) {
-                            println("sendFile fail")
+                            LogUtil.e("sendFile fail")
                         }
                     })
                 }