diff --git a/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt
index a64b71b..3981f5d 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt
@@ -7,9 +7,11 @@
import android.util.Log
import androidx.activity.result.contract.ActivityResultContracts
import androidx.lifecycle.ViewModelProvider
+import com.bumptech.glide.Glide
import com.casic.br.operationsite.R
import com.casic.br.operationsite.callback.OnImageCompressListener
import com.casic.br.operationsite.databinding.ActivityConstructionCheckBinding
+import com.casic.br.operationsite.extensions.combineImagePath
import com.casic.br.operationsite.extensions.compressImage
import com.casic.br.operationsite.extensions.initImmersionBar
import com.casic.br.operationsite.utils.LocaleConstant
@@ -53,6 +55,13 @@
private var isCompletedSecond = false
private var isCompletedThird = false
+ /**
+ * 1 - 确认现场
+ * 2 - 确认鼓风机
+ * 3 -
+ * */
+ private var type = 1
+
override fun initEvent() {
binding.connectTcpButton.setOnClickListener {
SocketManager.get.connectTcpServer("192.168.154.158", LocaleConstant.TCP_PORT)
@@ -68,6 +77,7 @@
}
binding.captureDisclosureImageButton.setOnClickListener {
+ type = 1
captureImage()
}
@@ -100,6 +110,7 @@
"请先完成交底".show(this)
return@setOnClickListener
}
+ type = 2
captureImage()
}
@@ -228,9 +239,14 @@
uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java]
uploadFileViewModel.resultModel.observe(this) {
if (it.code == 200) {
- val url = it.data.toString()
- if (url.isNotBlank()) {
+ val path = it.data.toString()
+ if (path.isNotBlank()) {
+ val url = path.combineImagePath()
Log.d(kTag, "url: $url")
+ when (type) {
+ 1 -> Glide.with(this).load(url).into(binding.disclosureImageView)
+ 2 -> Glide.with(this).load(url).into(binding.envImageView)
+ }
"完成确认".show(this)
}
}
diff --git a/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt
index a64b71b..3981f5d 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt
@@ -7,9 +7,11 @@
import android.util.Log
import androidx.activity.result.contract.ActivityResultContracts
import androidx.lifecycle.ViewModelProvider
+import com.bumptech.glide.Glide
import com.casic.br.operationsite.R
import com.casic.br.operationsite.callback.OnImageCompressListener
import com.casic.br.operationsite.databinding.ActivityConstructionCheckBinding
+import com.casic.br.operationsite.extensions.combineImagePath
import com.casic.br.operationsite.extensions.compressImage
import com.casic.br.operationsite.extensions.initImmersionBar
import com.casic.br.operationsite.utils.LocaleConstant
@@ -53,6 +55,13 @@
private var isCompletedSecond = false
private var isCompletedThird = false
+ /**
+ * 1 - 确认现场
+ * 2 - 确认鼓风机
+ * 3 -
+ * */
+ private var type = 1
+
override fun initEvent() {
binding.connectTcpButton.setOnClickListener {
SocketManager.get.connectTcpServer("192.168.154.158", LocaleConstant.TCP_PORT)
@@ -68,6 +77,7 @@
}
binding.captureDisclosureImageButton.setOnClickListener {
+ type = 1
captureImage()
}
@@ -100,6 +110,7 @@
"请先完成交底".show(this)
return@setOnClickListener
}
+ type = 2
captureImage()
}
@@ -228,9 +239,14 @@
uploadFileViewModel = ViewModelProvider(this)[UploadFileViewModel::class.java]
uploadFileViewModel.resultModel.observe(this) {
if (it.code == 200) {
- val url = it.data.toString()
- if (url.isNotBlank()) {
+ val path = it.data.toString()
+ if (path.isNotBlank()) {
+ val url = path.combineImagePath()
Log.d(kTag, "url: $url")
+ when (type) {
+ 1 -> Glide.with(this).load(url).into(binding.disclosureImageView)
+ 2 -> Glide.with(this).load(url).into(binding.envImageView)
+ }
"完成确认".show(this)
}
}
diff --git a/app/src/main/res/layout/activity_construction_check.xml b/app/src/main/res/layout/activity_construction_check.xml
index 8d56ffa..6ac7c74 100644
--- a/app/src/main/res/layout/activity_construction_check.xml
+++ b/app/src/main/res/layout/activity_construction_check.xml
@@ -87,32 +87,53 @@
android:background="#CCCCCC" />
-
+ android:orientation="horizontal">
-
+
-
+
+
+
+
+
+
+
+
+
-
+ android:orientation="horizontal">
-
+
-
+
+
+
+
+
+
+
+
+