diff --git a/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt b/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt index 8a6af84..76cf583 100644 --- a/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt +++ b/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt @@ -95,9 +95,8 @@ } else -> { - Log.d( - kTag, "空状态 ===> ${buffer.copyOf(bytesRead).contentToString()}" - ) + val bytes = buffer.copyOf(bytesRead) + Log.d(kTag, "空状态，不处理 ===> ${bytes.contentToString()}") } } } @@ -108,6 +107,7 @@ } fun writeCommand(vararg command: Char) { + Log.d(kTag, "writeCommand: ${command.contentToString()}") if (command.size == 1) { sendExecutor.submit { outStream.write(command.first().code) diff --git a/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt b/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt index 8a6af84..76cf583 100644 --- a/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt +++ b/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt @@ -95,9 +95,8 @@ } else -> { - Log.d( - kTag, "空状态 ===> ${buffer.copyOf(bytesRead).contentToString()}" - ) + val bytes = buffer.copyOf(bytesRead) + Log.d(kTag, "空状态，不处理 ===> ${bytes.contentToString()}") } } } @@ -108,6 +107,7 @@ } fun writeCommand(vararg command: Char) { + Log.d(kTag, "writeCommand: ${command.contentToString()}") if (command.size == 1) { sendExecutor.submit { outStream.write(command.first().code) diff --git a/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt index 7fd6d00..16f71d9 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt @@ -68,7 +68,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate -import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialog @@ -153,6 +152,7 @@ try { serialPortService = iBinder.getSerialPortService() Log.d(kTag, "onServiceConnected: 服务已绑定") + openSerialPort() } catch (e: Exception) { Log.e(kTag, "onServiceConnected: 绑定服务时发生异常", e) } @@ -180,9 +180,9 @@ Intent(this, SerialPortService::class.java).also { bindService(it, serviceConnection, Context.BIND_AUTO_CREATE) } -// Intent(this, NtripConnectService::class.java).also { -// startService(it) -// } + Intent(this, NtripConnectService::class.java).also { + startService(it) + } soundResourceId = soundPool.load(this, R.raw.ring3, 1) //右上角菜单 @@ -394,44 +394,9 @@ .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { override fun onActionItemClick(position: Int) { val task = tasks[position] - Log.d(kTag, task.toJson()) SaveKeyValues.putValue(LocaleConstant.TASK_ID, task.taskId) SaveKeyValues.putValue(LocaleConstant.TASK_CODE, task.taskCode) - AlertControlDialog.Builder().setContext(context).setTitle("提示") - .setMessage("请选择操作方式").setPositiveButton("执行工单") - .setNegativeButton("提交工单") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - if (task.markerModels.isNotEmpty()) { - //移到Task下属第一个标识器位置 - val firstMarker = task.markerModels.first() - val latLng = LatLng(firstMarker.lat, firstMarker.lng) - aMap.moveCamera( - CameraUpdateFactory.newLatLngZoom(latLng, 16f) - ) - //执行工单 - uploadTask(task.taskId, task.taskCode, "1") - detectRedrawGraphic(task) - isExecuteTask = true - } else { - "此工单下无标识器，将执行自由巡检任务".show(context) - freeTaskId = task.taskId - - binding.stopFreeTaskButton.visibility = View.VISIBLE - isFreeTask = true - RuntimeCache.currentSegment = - CurrentSegment.FreeInspection - serialPortService?.writeCommand('2', '6') - } - } - - override fun onCancelClick() { - //提交工单 - uploadTask(task.taskId, task.taskCode, "2") - isExecuteTask = false - } - }).build().show() + executeTask(task) } }).build().show() } else { @@ -440,7 +405,7 @@ .setPositiveButton("开始自由巡检").setOnDialogButtonClickListener(object : AlertMessageDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - startFreeTask() + executeFreeTask() } }).build().show() } @@ -514,7 +479,41 @@ } } - private fun startFreeTask() { + private fun executeTask(task: TaskDetailLocalModel) { + AlertControlDialog.Builder().setContext(this).setTitle("提示").setMessage("请选择操作方式") + .setPositiveButton("执行工单").setNegativeButton("提交工单") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + if (task.markerModels.isNotEmpty()) { + //移到Task下属第一个标识器位置 + val firstMarker = task.markerModels.first() + val latLng = LatLng(firstMarker.lat, firstMarker.lng) + aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 16f)) + //执行工单 + uploadTask(task.taskId, task.taskCode, "1") + detectRedrawGraphic(task) + isExecuteTask = true + } else { + "此工单下无标识器，将执行自由巡检任务".show(context) + freeTaskId = task.taskId + + binding.stopFreeTaskButton.visibility = View.VISIBLE + isFreeTask = true + RuntimeCache.currentSegment = CurrentSegment.FreeInspection + serialPortService?.writeCommand('2', '6') + } + } + + override fun onCancelClick() { + //提交工单 + uploadTask(task.taskId, task.taskCode, "2") + isExecuteTask = false + } + }).build().show() + } + + private fun executeFreeTask() { AlertInputDialog.Builder().setContext(this).setTitle("新建自由巡检任务") .setHintMessage("请输入自由巡检任务简要描述").setNegativeButton("取消") .setPositiveButton("确定") @@ -864,7 +863,9 @@ override fun onResume() { super.onResume() binding.mapView.onResume() - openSerialPort() + if (serialPortService != null) { + openSerialPort() + } } override fun onPause() { diff --git a/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt b/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt index 8a6af84..76cf583 100644 --- a/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt +++ b/app/src/main/java/com/casic/common/detector/gd/service/SerialPortService.kt @@ -95,9 +95,8 @@ } else -> { - Log.d( - kTag, "空状态 ===> ${buffer.copyOf(bytesRead).contentToString()}" - ) + val bytes = buffer.copyOf(bytesRead) + Log.d(kTag, "空状态，不处理 ===> ${bytes.contentToString()}") } } } @@ -108,6 +107,7 @@ } fun writeCommand(vararg command: Char) { + Log.d(kTag, "writeCommand: ${command.contentToString()}") if (command.size == 1) { sendExecutor.submit { outStream.write(command.first().code) diff --git a/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt index 7fd6d00..16f71d9 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/MainActivity.kt @@ -68,7 +68,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate -import com.pengxh.kt.lite.extensions.toJson import com.pengxh.kt.lite.utils.FileDownloadManager import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialog @@ -153,6 +152,7 @@ try { serialPortService = iBinder.getSerialPortService() Log.d(kTag, "onServiceConnected: 服务已绑定") + openSerialPort() } catch (e: Exception) { Log.e(kTag, "onServiceConnected: 绑定服务时发生异常", e) } @@ -180,9 +180,9 @@ Intent(this, SerialPortService::class.java).also { bindService(it, serviceConnection, Context.BIND_AUTO_CREATE) } -// Intent(this, NtripConnectService::class.java).also { -// startService(it) -// } + Intent(this, NtripConnectService::class.java).also { + startService(it) + } soundResourceId = soundPool.load(this, R.raw.ring3, 1) //右上角菜单 @@ -394,44 +394,9 @@ .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { override fun onActionItemClick(position: Int) { val task = tasks[position] - Log.d(kTag, task.toJson()) SaveKeyValues.putValue(LocaleConstant.TASK_ID, task.taskId) SaveKeyValues.putValue(LocaleConstant.TASK_CODE, task.taskCode) - AlertControlDialog.Builder().setContext(context).setTitle("提示") - .setMessage("请选择操作方式").setPositiveButton("执行工单") - .setNegativeButton("提交工单") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - if (task.markerModels.isNotEmpty()) { - //移到Task下属第一个标识器位置 - val firstMarker = task.markerModels.first() - val latLng = LatLng(firstMarker.lat, firstMarker.lng) - aMap.moveCamera( - CameraUpdateFactory.newLatLngZoom(latLng, 16f) - ) - //执行工单 - uploadTask(task.taskId, task.taskCode, "1") - detectRedrawGraphic(task) - isExecuteTask = true - } else { - "此工单下无标识器，将执行自由巡检任务".show(context) - freeTaskId = task.taskId - - binding.stopFreeTaskButton.visibility = View.VISIBLE - isFreeTask = true - RuntimeCache.currentSegment = - CurrentSegment.FreeInspection - serialPortService?.writeCommand('2', '6') - } - } - - override fun onCancelClick() { - //提交工单 - uploadTask(task.taskId, task.taskCode, "2") - isExecuteTask = false - } - }).build().show() + executeTask(task) } }).build().show() } else { @@ -440,7 +405,7 @@ .setPositiveButton("开始自由巡检").setOnDialogButtonClickListener(object : AlertMessageDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - startFreeTask() + executeFreeTask() } }).build().show() } @@ -514,7 +479,41 @@ } } - private fun startFreeTask() { + private fun executeTask(task: TaskDetailLocalModel) { + AlertControlDialog.Builder().setContext(this).setTitle("提示").setMessage("请选择操作方式") + .setPositiveButton("执行工单").setNegativeButton("提交工单") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + if (task.markerModels.isNotEmpty()) { + //移到Task下属第一个标识器位置 + val firstMarker = task.markerModels.first() + val latLng = LatLng(firstMarker.lat, firstMarker.lng) + aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 16f)) + //执行工单 + uploadTask(task.taskId, task.taskCode, "1") + detectRedrawGraphic(task) + isExecuteTask = true + } else { + "此工单下无标识器，将执行自由巡检任务".show(context) + freeTaskId = task.taskId + + binding.stopFreeTaskButton.visibility = View.VISIBLE + isFreeTask = true + RuntimeCache.currentSegment = CurrentSegment.FreeInspection + serialPortService?.writeCommand('2', '6') + } + } + + override fun onCancelClick() { + //提交工单 + uploadTask(task.taskId, task.taskCode, "2") + isExecuteTask = false + } + }).build().show() + } + + private fun executeFreeTask() { AlertInputDialog.Builder().setContext(this).setTitle("新建自由巡检任务") .setHintMessage("请输入自由巡检任务简要描述").setNegativeButton("取消") .setPositiveButton("确定") @@ -864,7 +863,9 @@ override fun onResume() { super.onResume() binding.mapView.onResume() - openSerialPort() + if (serialPortService != null) { + openSerialPort() + } } override fun onPause() { diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt index 6c3b2db..c7c8bb9 100644 --- a/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt +++ b/app/src/main/java/com/casic/common/detector/gd/view/SearchMarkerActivity.kt @@ -198,7 +198,6 @@ override fun initEvent() { binding.depthButton.setOnClickListener { soundPool.autoPause() -// serialPortService?.closeSerialPort() val result = DataBaseManager.get.queryMarkerById(markerId) if (result.isNotEmpty()) { val tag = when (result.first().markerType) {