From fbae5f3ea74727ccadc48314a864a1ea0099a945 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 17 十月 2025 17:36:17 +0800
Subject: [PATCH] 2025.10.17 1、新增巡查时，修改工地施工阶段功能（待完成）
---
app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt | 211 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 168 insertions(+), 43 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
index 0323bba..5e9ece9 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/InspectionDetailActivity.kt
@@ -75,6 +75,22 @@
//鑿滃崟鎸夐挳鍒楄〃
protected val menuList = ArrayList<LinearLayout>()
+ private lateinit var ln_patrol_problem_recheck :LinearLayout
+ private lateinit var ln_patrol_take_evidence :LinearLayout
+ private lateinit var ln_patrol_problem_list :LinearLayout
+ private lateinit var ln_patrol_change :LinearLayout
+ private lateinit var ln_patrol_camera :LinearLayout
+ private lateinit var ln_patrol_newgit :LinearLayout
+ private lateinit var ln_patrol_promiss :LinearLayout
+ private lateinit var ln_patrol_rate :LinearLayout
+ private lateinit var ln_patrol_navi :LinearLayout
+ private lateinit var ln_patrol_chose_latlng :LinearLayout
+ private lateinit var ln_patrol_edit :LinearLayout
+ private lateinit var ln_patrol_share :LinearLayout
+ private lateinit var ln_patrol_check :LinearLayout
+ private lateinit var ln_patrol_change_check :LinearLayout
+ private lateinit var ln_patrol_pic_evidence :LinearLayout
+
private var problemEditable = false
private var timer = Timer("track")
@@ -260,26 +276,43 @@
val iconPage1 = View.inflate(this, R.layout.page_patrol_icons_first, null)
val iconPage2 = View.inflate(this, R.layout.page_patrol_icons_second, null)
+ ln_patrol_problem_recheck = iconPage1.findViewById(R.id.ln_patrol_problem_recheck)
+ ln_patrol_take_evidence = iconPage1.findViewById(R.id.ln_patrol_take_evidence)
+ ln_patrol_problem_list = iconPage1.findViewById(R.id.ln_patrol_problem_list)
+ ln_patrol_change = iconPage1.findViewById(R.id.ln_patrol_change)
+ ln_patrol_camera = iconPage1.findViewById(R.id.ln_patrol_camera)
+ ln_patrol_newgit = iconPage1.findViewById(R.id.ln_patrol_newgit)
+ ln_patrol_promiss = iconPage1.findViewById(R.id.ln_patrol_promiss)
+ ln_patrol_rate = iconPage1.findViewById(R.id.ln_patrol_rate)
+ ln_patrol_navi = iconPage2.findViewById(R.id.ln_patrol_navi)
+ ln_patrol_chose_latlng = iconPage2.findViewById(R.id.ln_patrol_chose_latlng)
+ ln_patrol_edit = iconPage2.findViewById(R.id.ln_patrol_edit)
+ ln_patrol_share = iconPage2.findViewById(R.id.ln_patrol_share)
+ ln_patrol_check = iconPage2.findViewById(R.id.ln_patrol_check)
+ ln_patrol_change_check = iconPage2.findViewById(R.id.ln_patrol_change_check)
+ ln_patrol_pic_evidence = iconPage2.findViewById(R.id.ln_patrol_pic_evidence)
menuList.apply{
- add(iconPage1.findViewById(R.id.ln_patrol_problem_recheck))
- add(iconPage1.findViewById(R.id.ln_patrol_take_evidence))
- add(iconPage1.findViewById(R.id.ln_patrol_problem_list))
- add(iconPage1.findViewById(R.id.ln_patrol_change))
- add(iconPage1.findViewById(R.id.ln_patrol_camera))
- add(iconPage1.findViewById(R.id.ln_patrol_newgit))
- add(iconPage1.findViewById(R.id.ln_patrol_promiss))
- add(iconPage1.findViewById(R.id.ln_patrol_rate))
- add(iconPage2.findViewById(R.id.ln_patrol_navi))
- add(iconPage2.findViewById(R.id.ln_patrol_chose_latlng))
- add(iconPage2.findViewById(R.id.ln_patrol_edit))
- add(iconPage2.findViewById(R.id.ln_patrol_share))
- add(iconPage2.findViewById(R.id.ln_patrol_check))
- add(iconPage2.findViewById(R.id.ln_patrol_change_check))
- //鍒ゆ柇鐢ㄦ埛鏉冮檺锛屽彧鏈夌鐞嗗憳鍙闂瀹℃牳鍥炬爣
- if (viewModel.userTypeId != Domain.USER_ADMIN.toByte()) {
- menuList[menuList.lastIndex - 1].visibility = View.INVISIBLE
- menuList.last().visibility = View.INVISIBLE
- }
+ add(ln_patrol_problem_recheck)
+ add(ln_patrol_take_evidence)
+ add(ln_patrol_problem_list)
+ add(ln_patrol_change)
+ add(ln_patrol_camera)
+ add(ln_patrol_newgit)
+ add(ln_patrol_promiss)
+ add(ln_patrol_rate)
+ add(ln_patrol_navi)
+ add(ln_patrol_chose_latlng)
+ add(ln_patrol_edit)
+ add(ln_patrol_share)
+ add(ln_patrol_check)
+ add(ln_patrol_change_check)
+ add(ln_patrol_pic_evidence)
+ }
+
+ //鍒ゆ柇鐢ㄦ埛鏉冮檺锛屽彧鏈夌鐞嗗憳鍙闂瀹℃牳鍥炬爣
+ if (viewModel.userTypeId != Domain.USER_ADMIN.toByte()) {
+ ln_patrol_check.visibility = View.INVISIBLE
+ ln_patrol_change_check.visibility = View.INVISIBLE
}
vp_patrol_icons.adapter = IconsPageAdapter(ArrayList<View>().apply {
@@ -453,15 +486,41 @@
menuList.let {m ->
when (status) {
Domain.TASK_STATUS_WAITING -> {
- for (i in m.indices) {
- if (i <= 7 || i == 12 || i == 13) {
- m[i].alpha = 0.2F
- m[i].setOnClickListener(showNeedStartTaskListener())
- } else {
- m[i].alpha = 1F
- m[i].setOnClickListener(this)
- }
+// for (i in m.indices) {
+// if (i <= 7 || i == 12 || i == 13) {
+// m[i].alpha = 0.2F
+// m[i].setOnClickListener(showNeedStartTaskListener())
+// } else {
+// m[i].alpha = 1F
+// m[i].setOnClickListener(this)
+// }
+// }
+ listOf(
+ ln_patrol_problem_recheck,
+ ln_patrol_take_evidence,
+ ln_patrol_problem_list,
+ ln_patrol_change,
+ ln_patrol_camera,
+ ln_patrol_newgit,
+ ln_patrol_promiss,
+ ln_patrol_rate,
+ ln_patrol_check,
+ ln_patrol_change_check,
+ ln_patrol_pic_evidence
+ ).forEach {
+ it.alpha = 0.2F
+ it.setOnClickListener(showNeedStartTaskListener())
}
+ listOf(
+ ln_patrol_navi,
+ ln_patrol_chose_latlng,
+ ln_patrol_edit,
+ ln_patrol_share
+ ).forEach {
+ it.alpha = 1F
+ it.setOnClickListener(this)
+ }
+
}
Domain.TASK_STATUS_RUNNING -> {
m.forEach {
@@ -470,25 +529,80 @@
}
}
Domain.TASK_STATUS_FINISHED -> {
- for (i in m.indices) {
- if (i == 1) {
- m[i].alpha = 0.2F
- m[i].isClickable = false
- } else {
- m[i].alpha = 1F
- m[i].setOnClickListener(this)
- }
+// for (i in m.indices) {
+// if (i == 1) {
+// m[i].alpha = 0.2F
+// m[i].isClickable = false
+// } else {
+// m[i].alpha = 1F
+// m[i].setOnClickListener(this)
+// }
+// }
+ listOf(
+ ln_patrol_take_evidence,
+ ln_patrol_pic_evidence
+ ).forEach {
+ it.alpha = 0.2F
+ it.isClickable = false
}
+ listOf(
+ ln_patrol_problem_recheck,
+ ln_patrol_problem_list,
+ ln_patrol_change,
+ ln_patrol_camera,
+ ln_patrol_newgit,
+ ln_patrol_promiss,
+ ln_patrol_rate,
+ ln_patrol_navi,
+ ln_patrol_chose_latlng,
+ ln_patrol_edit,
+ ln_patrol_share,
+ ln_patrol_check,
+ ln_patrol_change_check
+ ).forEach {
+ it.alpha = 1F
+ it.setOnClickListener(this)
+ }
+
}
}
if (viewModel.userTypeId == Domain.USER_COMPTENT.toByte()) {
- for (i in m.indices) {
- when (i) {
- 1, in 3..4, in 7..11 -> {
- m[i].alpha = 0.2F
- m[i].isClickable = false
- }
- }
+// for (i in m.indices) {
+// when (i) {
+// 1, in 3..4, in 7..11 -> {
+// m[i].alpha = 0.2F
+// m[i].isClickable = false
+// }
+// }
+// }
+// ln_patrol_problem_recheck
+// ln_patrol_take_evidence
+// ln_patrol_problem_list
+// ln_patrol_change
+// ln_patrol_camera
+// ln_patrol_newgit
+// ln_patrol_promiss
+// ln_patrol_rate
+// ln_patrol_navi
+// ln_patrol_chose_latlng
+// ln_patrol_edit
+// ln_patrol_share
+// ln_patrol_check
+// ln_patrol_change_check
+// ln_patrol_pic_evidence
+ listOf(
+ ln_patrol_take_evidence,
+ ln_patrol_change,
+ ln_patrol_camera,
+ ln_patrol_rate,
+ ln_patrol_navi,
+ ln_patrol_chose_latlng,
+ ln_patrol_edit,
+ ln_patrol_share,
+ ln_patrol_pic_evidence
+ ).forEach {
+ it.alpha = 0.2F
+ it.isClickable = false
}
}
}
@@ -834,7 +948,7 @@
// fixme: 2020/8/3 姝ゅ浠ュ緪姹囧尯浣滀负娴嬭瘯锛岄鍏堜娇鐢ㄦ柊鐨勮瘎鍒嗚鍒欙紝涔嬪悗閫愭鏇挎崲
val intentEvaluation = if (viewModel.scene.value?.districtcode == "310104") {
Intent(this, MenuGradeActivity::class.java)
- }else {
+ } else {
Intent(this, GradeActivity::class.java)
}
intentEvaluation.putExtra("inspectionGuid", viewModel.inspection.value?.guid)
@@ -888,6 +1002,17 @@
}
startActivity(intent)
}
+ // 鏍规嵁浠绘剰鍥剧墖鍜岄缇界幆澧冪郴缁熶腑鐨勫彴璐﹀浘鐗囧垱寤洪棶棰�
+ R.id.ln_patrol_pic_evidence -> {
+ val intent = Intent(this, PicEvidenceActivity::class.java).apply {
+ putExtra("subTask", viewModel.subTask.value)
+ putExtra("inspection", viewModel.inspection.value)
+ putExtra("scene", viewModel.scene.value)
+ putExtra("lat", latitudeCurrent)
+ putExtra("lng", longitudeCurrent)
+ }
+ startActivity(intent)
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3