diff --git a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt index cca9e8b..91d042a 100644 --- a/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt +++ b/app/src/main/java/com/casic/detector/common/view/InstallMarkerActivity.kt @@ -250,23 +250,23 @@ binding.readMarkerButton.setOnClickListener { LoadingDialogHub.show(this, "标识器读取中,请稍后...") countDownTimer.start() + soundPool.play(soundResourceId, 1f, 1f, 0, -1, 1f) + binding.readMarkerButton.isEnabled = false serialPortService?.openSerialPort(object : OnSerialPortDataListener { override fun write(outStream: OutputStream) { outStream.write('2'.code) outStream.flush() - - soundPool.play(soundResourceId, 1f, 1f, 0, -1, 1f) - binding.readMarkerButton.isEnabled = false } override fun onDataReceived(buffer: ByteArray) { val hex = buffer.toHex() Log.d(kTag, hex) + cancelLoadingView() + binding.readMarkerButton.isEnabled = true + countDownTimer.cancel() + val markerId = hex.take(20).hexToString() if (markerId.isNumber()) { - countDownTimer.cancel() - cancelLoadingView() - binding.readMarkerButton.isEnabled = true binding.identifierInclude.identifierIdView.text = markerId } }