From 3013b813e5df6977c0be921928f73b1a3adde290 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 02 七月 2025 15:52:04 +0800
Subject: [PATCH] ### 一、巡查模块相关
---
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuEvidenceActivity.kt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuEvidenceActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuEvidenceActivity.kt
index 5669fb0..1d9126a 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuEvidenceActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuEvidenceActivity.kt
@@ -17,8 +17,12 @@
import cn.flightfeather.thirdappmodule.module.base.BaseTakePicActivity
import cn.flightfeather.thirdappmodule.util.DateFormatter
import cn.flightfeather.thirdappmodule.util.Domain
+import cn.flightfeather.thirdappmodule.util.SystemServiceUtils
import cn.flightfeather.thirdappmodule.util.UUIDGenerator
import cn.flightfeather.thirdappmodule.util.file.FileUtil
+import cn.flightfeather.thirdappmodule.util.file.FileUtils
+import com.flightfeather.taizhang.common.utils.download.UpDownloadUtil
+import io.reactivex.Observable
import kotlinx.android.synthetic.main.dialog_take_evidence.*
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
@@ -26,7 +30,13 @@
import java.io.File
import java.io.IOException
import java.util.*
+import kotlin.collections.ArrayList
+/**
+ * @author riku
+ * Date: 2019/8/1
+ * 闂鎷嶇収鍙栬瘉
+ */
open class MenuEvidenceActivity : BaseTakePicActivity() {
override fun getLayoutId(): Int = R.layout.dialog_take_evidence
@@ -42,6 +52,7 @@
var scene: Scense? = null
var lat = 0.0
var lng = 0.0
+ var picUrls: ArrayList<String>? = null
protected var submitTime = 0L//鎻愪氦鏃堕棿锛岄槻姝㈣繛缁彁浜わ紝澶氭璁板綍
@@ -56,10 +67,10 @@
getExtra()
initUI()
initObserver()
-
- viewModel.getLocationList()
+ loadOnlinePic()
subTask?.let { t ->
scene?.let { s ->
+ viewModel.getLocationList(s.typeid.toInt())
viewModel.getProblemType(t.typeno, t.citycode, t.districtcode, s.typeid)
}
}
@@ -72,9 +83,11 @@
scene = intent.getSerializableExtra("scene") as Scense?
lat = intent.getDoubleExtra("lat", 0.0)
lng = intent.getDoubleExtra("lng", 0.0)
+ picUrls = intent.getStringArrayListExtra("picUrls")
}
private fun initUI() {
+ // 闂绫诲瀷鍒濆鍖�
sp_take_evidence_select_problem_type.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onNothingSelected(parent: AdapterView<*>?) = Unit
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
@@ -93,6 +106,7 @@
}
}
+ // 鍏蜂綋闂鍒濆鍖�
sp_take_evidence_select_problem.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onNothingSelected(parent: AdapterView<*>?) = Unit
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
@@ -100,6 +114,7 @@
}
}
+ // 鎻愪氦闂鎸夐挳鍒濆鍖�
fab_take_evidence_ok.setOnClickListener {
val now = Date()
if (now.time - submitTime >= 1000) {
@@ -108,8 +123,28 @@
}
}
+ // 鍙栨秷鎻愪氦闂鎸夐挳鍒濆鍖�
fab_take_evidence_close.setOnClickListener {
finish()
+ }
+
+ // 澶囨敞鏍忎竴閿鍒跺叿浣撻棶棰樺姛鑳�
+ listOf(Pair(btn_copy_problem_des, et_take_evidence_problem_des)).forEach {
+ it.first.isSelected = false
+ it.first.setOnClickListener {v ->
+ if (v.isSelected) {
+ // 娓呯┖澶囨敞鏍忔枃鏈�
+ it.second.setText("")
+ v.isSelected = !v.isSelected
+ } else {
+ // 澶嶅埗褰撳墠閫夋嫨鐨勫叿浣撻棶棰�
+ val p = sp_take_evidence_select_problem.selectedItem
+ if (p is Problemtype) {
+ it.second.setText(p.name)
+ v.isSelected = !v.isSelected
+ }
+ }
+ }
}
}
@@ -144,6 +179,17 @@
}
+ private fun loadOnlinePic() {
+ picUrls?.forEach {
+ UpDownloadUtil.download(this, it, FileUtils.getFileName(it), {path ->
+ pathTempList.add(Pair(File(path), true))
+ refreshImageView()
+ }, {
+ toast("闂鍥剧墖涓嬭浇澶辫触")
+ })
+ }
+ }
+
protected fun updateUIByProblemType(visible: Int) {
sp_take_evidence_select_location.visibility = visible
et_take_evidence_location.visibility = visible
--
Gitblit v1.9.3