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 91d042a..f730f6d 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 @@ -77,7 +77,6 @@ override fun initEvent() { //返回 binding.titleInclude.leftBackView.setOnClickListener { - soundPool.autoPause() finish() } @@ -250,7 +249,6 @@ 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) { @@ -261,9 +259,10 @@ override fun onDataReceived(buffer: ByteArray) { val hex = buffer.toHex() Log.d(kTag, hex) - cancelLoadingView() - binding.readMarkerButton.isEnabled = true + LoadingDialogHub.dismiss() countDownTimer.cancel() + binding.readMarkerButton.isEnabled = true + serialPortService?.closeSerialPort() val markerId = hex.take(20).hexToString() if (markerId.isNumber()) { @@ -279,22 +278,17 @@ * */ private val countDownTimer = object : CountDownTimer(10 * 1000, 1000) { override fun onTick(millisUntilFinished: Long) { - + soundPool.play(soundResourceId, 1f, 1f, 0, 0, 1f) } override fun onFinish() { - cancelLoadingView() + LoadingDialogHub.dismiss() "读取此标识器ID超时,请重试".show(context) binding.readMarkerButton.isEnabled = true + serialPortService?.closeSerialPort() } } - private fun cancelLoadingView() { - LoadingDialogHub.dismiss() - soundPool.autoPause() - serialPortService?.closeSerialPort() - } - private fun saveMarkerInLocal() { val objectId = SaveKeyValues.getValue(LocaleConstant.OBJECT_ID, "") as String