diff --git a/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt b/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt index e522224..ec57ebc 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt @@ -7,7 +7,6 @@ import androidx.lifecycle.lifecycleScope import com.google.gson.Gson import com.google.gson.JsonObject -import com.pengxh.kt.lite.utils.Constant import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -101,9 +100,9 @@ interceptor.setLevel(HttpLoggingInterceptor.Level.BODY) val client = OkHttpClient.Builder() .addInterceptor(interceptor) - .readTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) - .connectTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) - .writeTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) + .readTimeout(10, TimeUnit.SECONDS) + .connectTimeout(30, TimeUnit.SECONDS) + .writeTimeout(10, TimeUnit.SECONDS) .build() try { val response = client.newCall(request).execute() diff --git a/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt b/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt index e522224..ec57ebc 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt @@ -7,7 +7,6 @@ import androidx.lifecycle.lifecycleScope import com.google.gson.Gson import com.google.gson.JsonObject -import com.pengxh.kt.lite.utils.Constant import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -101,9 +100,9 @@ interceptor.setLevel(HttpLoggingInterceptor.Level.BODY) val client = OkHttpClient.Builder() .addInterceptor(interceptor) - .readTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) - .connectTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) - .writeTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) + .readTimeout(10, TimeUnit.SECONDS) + .connectTimeout(30, TimeUnit.SECONDS) + .writeTimeout(10, TimeUnit.SECONDS) .build() try { val response = client.newCall(request).execute() diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt index 24bef6b..36583ef 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt @@ -77,7 +77,7 @@ private lateinit var imageAdapter: EditableImageAdapter private val imagePaths: ArrayList = ArrayList() //服务器返回的拍照数据集 private val recyclerViewImages: ArrayList = ArrayList() //真实图片路径 - private var isStart = false +// private var isStart = false private var index = 1 override fun initEvent() { @@ -88,23 +88,23 @@ } //发送指令 SocketManager.get.send(LocaleConstant.START_CONSTRUCTION_COMMAND) - isStart = true +// isStart = true } binding.captureImageButton.setOnClickListener { - if (!isStart) { - "请先进行交底操作".show(this) - return@setOnClickListener - } +// if (!isStart) { +// "请先进行交底操作".show(this) +// return@setOnClickListener +// } takePhoto() } imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { override fun onAddImageClick() { - if (!isStart) { - "请先进行交底操作".show(context) - return - } +// if (!isStart) { +// "请先进行交底操作".show(context) +// return +// } PictureSelector.create(context).openGallery(SelectMimeType.ofImage()) .isGif(false).isMaxSelectEnabledMask(true).setFilterMinFileSize(100) .setMaxSelectNum(3).isDisplayCamera(false) @@ -141,11 +141,10 @@ }) binding.endCheckButton.setOnClickListener { - if (!isStart) { - "请先进行交底操作".show(this) - return@setOnClickListener - } - +// if (!isStart) { +// "请先进行交底操作".show(this) +// return@setOnClickListener +// } if (!SocketManager.get.nettyClient.connectStatus) { "指令发送失败，请确认是否处于同一网段".show(this) return@setOnClickListener diff --git a/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt b/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt index e522224..ec57ebc 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/util/HttpRequestHelper.kt @@ -7,7 +7,6 @@ import androidx.lifecycle.lifecycleScope import com.google.gson.Gson import com.google.gson.JsonObject -import com.pengxh.kt.lite.utils.Constant import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -101,9 +100,9 @@ interceptor.setLevel(HttpLoggingInterceptor.Level.BODY) val client = OkHttpClient.Builder() .addInterceptor(interceptor) - .readTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) - .connectTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) - .writeTimeout(Constant.HTTP_TIMEOUT, TimeUnit.SECONDS) + .readTimeout(10, TimeUnit.SECONDS) + .connectTimeout(30, TimeUnit.SECONDS) + .writeTimeout(10, TimeUnit.SECONDS) .build() try { val response = client.newCall(request).execute() diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt index 24bef6b..36583ef 100644 --- a/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/test/view/DisclosureActivity.kt @@ -77,7 +77,7 @@ private lateinit var imageAdapter: EditableImageAdapter private val imagePaths: ArrayList = ArrayList() //服务器返回的拍照数据集 private val recyclerViewImages: ArrayList = ArrayList() //真实图片路径 - private var isStart = false +// private var isStart = false private var index = 1 override fun initEvent() { @@ -88,23 +88,23 @@ } //发送指令 SocketManager.get.send(LocaleConstant.START_CONSTRUCTION_COMMAND) - isStart = true +// isStart = true } binding.captureImageButton.setOnClickListener { - if (!isStart) { - "请先进行交底操作".show(this) - return@setOnClickListener - } +// if (!isStart) { +// "请先进行交底操作".show(this) +// return@setOnClickListener +// } takePhoto() } imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { override fun onAddImageClick() { - if (!isStart) { - "请先进行交底操作".show(context) - return - } +// if (!isStart) { +// "请先进行交底操作".show(context) +// return +// } PictureSelector.create(context).openGallery(SelectMimeType.ofImage()) .isGif(false).isMaxSelectEnabledMask(true).setFilterMinFileSize(100) .setMaxSelectNum(3).isDisplayCamera(false) @@ -141,11 +141,10 @@ }) binding.endCheckButton.setOnClickListener { - if (!isStart) { - "请先进行交底操作".show(this) - return@setOnClickListener - } - +// if (!isStart) { +// "请先进行交底操作".show(this) +// return@setOnClickListener +// } if (!SocketManager.get.nettyClient.connectStatus) { "指令发送失败，请确认是否处于同一网段".show(this) return@setOnClickListener 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 2fa7b4a..92bb1c0 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 @@ -65,6 +65,7 @@ private var webSocket: WebSocket? = null private var isWebSocketConnected = false private var index = 1 + private var clickTimes = 1 override fun initEvent() { binding.startSuppliesCheckButton.setOnClickListener { @@ -72,15 +73,44 @@ "指令发送失败，请确认是否处于同一网段".show(this) return@setOnClickListener } - lifecycleScope.launch(Dispatchers.IO) { - SocketManager.get.send(LocaleConstant.START_SUPPLIES_COMMAND) - delay(2000) - constructionCheckViewModel.setCurrentPhase( - LocaleConstant.AI_BASE_IP, "before_operation_protection" - ) - withContext(Dispatchers.Main) { - binding.stepView.text = "稍后开始检查第一项：四合一，请准备" - } + + if (clickTimes > 1) { + AlertControlDialog.Builder() + .setContext(this) + .setTitle("温馨提示") + .setMessage("请确定是否需要重新发送指令？") + .setNegativeButton("取消") + .setPositiveButton("确定").setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + recyclerViewImages.clear() + imageAdapter.notifyDataSetChanged() + + //将属于此阶段的数据暂时缓存起来 + val temp = ArrayList>() + RuntimeCache.imageArray.forEach { + if (it.values.contains("before_operation_protection")) { + temp.add(it) + } + } + + //将缓存的数据从源数据中分别剔除 + temp.forEach { + RuntimeCache.imageArray.remove(it) + } + + //本地角标重置 + index = 1 + + sendCommand() + } + + override fun onCancelClick() { + + } + }).build().show() + } else { + sendCommand() } } @@ -124,6 +154,20 @@ } } + private fun sendCommand() { + lifecycleScope.launch(Dispatchers.IO) { + SocketManager.get.send(LocaleConstant.START_SUPPLIES_COMMAND) + delay(2000) + constructionCheckViewModel.setCurrentPhase( + LocaleConstant.AI_BASE_IP, "before_operation_protection" + ) + withContext(Dispatchers.Main) { + binding.stepView.text = "稍后开始检查第一项：四合一，请准备" + clickTimes++ + } + } + } + //TODO 效果不好，暂时去掉 private val startVideoLauncher = registerForActivityResult( ActivityResultContracts.StartActivityForResult()