diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt index 867f11a..7c8fc4f 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt @@ -156,7 +156,7 @@ "指令发送失败，请确认是否处于同一网段".show(this) return@setOnClickListener } - SocketManager.get.send(LocaleConstant.END_ENV_COMMAND) +// SocketManager.get.send(LocaleConstant.END_ENV_COMMAND) navigatePageTo() } } diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt index 867f11a..7c8fc4f 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/EnvironmentActivity.kt @@ -156,7 +156,7 @@ "指令发送失败，请确认是否处于同一网段".show(this) return@setOnClickListener } - SocketManager.get.send(LocaleConstant.END_ENV_COMMAND) +// SocketManager.get.send(LocaleConstant.END_ENV_COMMAND) navigatePageTo() } } diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt index 86044e2..fcdfe88 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/SuppliesActivity.kt @@ -69,6 +69,7 @@ private var isWebSocketConnected = false private var index = 1 private var clickTimes = 1 + private var isUnderHandleImage = false override fun initEvent() { binding.startSuppliesCheckButton.setOnClickListener { @@ -146,7 +147,7 @@ .setPositiveButton("确定").setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - SocketManager.get.send(LocaleConstant.START_VIDEO_COMMAND) +// SocketManager.get.send(LocaleConstant.START_VIDEO_COMMAND) navigatePageTo() } @@ -159,7 +160,7 @@ private fun sendCommand() { lifecycleScope.launch(Dispatchers.IO) { - SocketManager.get.send(LocaleConstant.START_SUPPLIES_COMMAND) +// SocketManager.get.send(LocaleConstant.START_SUPPLIES_COMMAND) delay(2000) constructionCheckViewModel.setCurrentPhase( LocaleConstant.AI_BASE_IP, "before_operation_protection" @@ -229,6 +230,7 @@ map["base64"] = "" RuntimeCache.imageArray.add(map) index++ + isUnderHandleImage = false } } } @@ -241,8 +243,7 @@ params.height = videoHeight.toInt() binding.rtspPlayerView.layoutParams = params VideoPlayerManager.setGSYVideoPlayerOptions( - binding.rtspPlayerView, - LocaleConstant.SUB_RTSP_URL + binding.rtspPlayerView, LocaleConstant.SUB_RTSP_URL ) timer = Timer() @@ -268,47 +269,51 @@ LocaleConstant.WEBSOCKET_MESSAGE_CODE -> { try { - val base64 = msg.obj as String - val bitmapArray = Base64.decode(base64, Base64.DEFAULT) - val bitmap = BitmapFactory.decodeByteArray(bitmapArray, 0, bitmapArray.size) - val imagePath = "/${createImageFileDir()}/IMG${timeFormat.format(Date())}.jpg" - bitmap.saveImage(imagePath) - recyclerViewImages.add(imagePath) - imageAdapter.notifyDataSetChanged() + if (!isUnderHandleImage) { + isUnderHandleImage = true + val base64 = msg.obj as String + val bitmapArray = Base64.decode(base64, Base64.DEFAULT) + val bitmap = BitmapFactory.decodeByteArray(bitmapArray, 0, bitmapArray.size) + val imagePath = + "/${createImageFileDir()}/IMG${timeFormat.format(Date())}.jpg" + bitmap.saveImage(imagePath) + recyclerViewImages.add(imagePath) + imageAdapter.notifyDataSetChanged() - //自动上传到服务器 - imagePath.compressImage(this, object : OnImageCompressListener { - override fun onSuccess(file: File) { - //上传图片 - uploadFileViewModel.uploadImage(context, file) + //自动上传到服务器 + imagePath.compressImage(this, object : OnImageCompressListener { + override fun onSuccess(file: File) { + //上传图片 + uploadFileViewModel.uploadImage(context, file) + } + + override fun onError(e: Throwable) { + e.printStackTrace() + } + }) + + when (recyclerViewImages.size) { + 1 -> binding.stepView.text = "稍后开始检查第二项：安全帽，请准备" + 2 -> binding.stepView.text = "稍后开始检查第三项：灭火器，请准备" + 3 -> binding.stepView.text = "稍后开始检查第四项：鼓风机，请准备" + 4 -> binding.stepView.text = "稍后开始检查第五项：警示牌，请准备" + 5 -> AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("检测到施工前劳保用品准备完毕，是否开始施工？") + .setNegativeButton("取消").setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { +// SocketManager.get.send(LocaleConstant.START_VIDEO_COMMAND) + navigatePageTo() + } + + override fun onCancelClick() { + + } + }).build().show() } - - override fun onError(e: Throwable) { - e.printStackTrace() - } - }) - - when (recyclerViewImages.size) { - 1 -> binding.stepView.text = "稍后开始检查第二项：安全帽，请准备" - 2 -> binding.stepView.text = "稍后开始检查第三项：灭火器，请准备" - 3 -> binding.stepView.text = "稍后开始检查第四项：鼓风机，请准备" - 4 -> binding.stepView.text = "稍后开始检查第五项：警示牌，请准备" - 5 -> AlertControlDialog.Builder() - .setContext(this) - .setTitle("温馨提示") - .setMessage("检测到施工前劳保用品准备完毕，是否开始施工？") - .setNegativeButton("取消").setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - SocketManager.get.send(LocaleConstant.START_VIDEO_COMMAND) - navigatePageTo() - } - - override fun onCancelClick() { - - } - }).build().show() } } catch (e: Exception) { e.printStackTrace()