diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt index c5bf8fc..cb3d853 100644 --- a/app/src/main/java/com/casic/detector/view/MainActivity.kt +++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt @@ -13,7 +13,6 @@ import android.media.SoundPool import android.os.Bundle import android.os.CountDownTimer -import android.util.Log import android.view.KeyEvent import android.view.View import android.view.animation.Animation @@ -124,7 +123,7 @@ private var latitude: Double = 0.0 private var longitude: Double = 0.0 private var isFreeTask = false - private var ids = ArrayList() + private var ids = HashSet() private var signalTask: TimerTask? = null private var searchMarkerTimer: Timer? = null private var taskId: String? = null @@ -175,7 +174,7 @@ //下载最新的数据 val companyId = SaveKeyValues.getValue(LocaleConstant.USER_COMPANY_ID, "") val downloadUrl = companyId.toString().appendDownloadUrl(FileType.EXCEL) - Log.d(kTag, "downloadUrl => $downloadUrl") +// Log.d(kTag, "downloadUrl => $downloadUrl") FileDownloadManager.Builder().setDownloadFileSource(downloadUrl) .setFileSuffix("xls").setFileSaveDirectory(createDownloadFileDir()) .setOnFileDownloadListener(object : FileDownloadManager.OnFileDownloadListener { @@ -418,6 +417,7 @@ }).build().show() } else { searchDialog.show() + //TODO 新探测界面 // searchNewDialog.show() } } @@ -445,7 +445,7 @@ } taskId?.apply { - taskViewModel.uploadTaskMarker(this, ids) + taskViewModel.uploadTaskMarker(this, ArrayList(ids)) } } }).build().show() @@ -487,7 +487,7 @@ override fun onDataReceived(buffer: ByteArray) { val hex = buffer.toHex() - Log.d(kTag, "$kTag => $hex") +// Log.d(kTag, "$kTag => $hex") if (searchDialog.isDetectMarker) { searchDialog.bindingValue(hex) } else if (searchNewDialog.isDetectMarker) { @@ -504,6 +504,8 @@ soundPool.play(soundResourceId, 1f, 1f, 0, 0, 1f) "标识器${markerId}已探测".show(this) ids.add(markerId) + //添加地图Marker + } } }