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 08730e4..93577d8 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 @@ -58,7 +58,6 @@ private lateinit var imageAdapter: EditableImageAdapter private var index = 1 private var clickTimes = 1 - private var isUnderHandleImage = false override fun initEvent() { binding.startSuppliesCheckButton.setOnClickListener { @@ -171,7 +170,6 @@ map["base64"] = "" map.upload() index++ - isUnderHandleImage = false } } } @@ -199,48 +197,44 @@ override fun handleMessage(msg: Message): Boolean { if (msg.what == LocaleConstant.WEBSOCKET_MESSAGE_CODE) { - if (!isUnderHandleImage) { - isUnderHandleImage = true + val imagePath = msg.obj as String + recyclerViewImages.add(imagePath) + imageAdapter.notifyDataSetChanged() - val imagePath = msg.obj as String - recyclerViewImages.add(imagePath) - imageAdapter.notifyDataSetChanged() - - //自动上传到服务器 - imagePath.compressImage(this, object : OnImageCompressListener { - override fun onSuccess(file: File) { - Log.d(kTag, "absolutePath: ${file.absolutePath}") - //上传图片 - 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 -> binding.stepView.text = "五必须检测完成" - 6 -> AlertControlDialog.Builder() - .setContext(this) - .setTitle("温馨提示") - .setMessage("检测到施工前劳保用品准备完毕,是否开始施工交底?") - .setNegativeButton("取消").setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - intentActivity() - } - - override fun onCancelClick() { - - } - }).build().show() + //自动上传到服务器 + imagePath.compressImage(this, object : OnImageCompressListener { + override fun onSuccess(file: File) { + Log.d(kTag, "absolutePath: ${file.absolutePath}") + //上传图片 + 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 -> binding.stepView.text = "五必须检测完成" + 6 -> AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("检测到施工前劳保用品准备完毕,是否开始施工交底?") + .setNegativeButton("取消").setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + intentActivity() + } + + override fun onCancelClick() { + + } + }).build().show() } } return true