From 17eb1d06e104bc1cd93498fe3a3eaecf14c9d734 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 12 十一月 2020 13:57:35 +0800
Subject: [PATCH] 1. 修复现场整改时，问题状态是‘问题审核通过’而不是“整改未审核”的问题； 2. 修改任意拍照界面的多图片展示方式为Glide，减少内存溢出的可能性； 3. 新增图片类型枚举类，罗列原有的图片类型，并新增“铭牌”和“监测设备”； 4. 修复导航功能可能导致空指针的问题； 5. 任意拍界面新增按分类拍摄功能； 6. 修复现场整改界面打开崩溃问题；
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuProblemListActivity.kt | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuProblemListActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuProblemListActivity.kt
index 61d83ee..66decbc 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuProblemListActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuProblemListActivity.kt
@@ -1,8 +1,12 @@
package cn.flightfeather.thirdapp.module.inspection
+import android.app.Dialog
import android.arch.lifecycle.Observer
+import android.content.Intent
import android.os.Bundle
+import android.view.View
import cn.flightfeather.thirdapp.adapter.ProblemListAdapter
+import cn.flightfeather.thirdapp.util.DialogUtil2
import kotlinx.android.synthetic.main.dialog_problem_list.*
class MenuProblemListActivity : BaseProblemListActivity() {
@@ -31,4 +35,30 @@
viewModel.getProblems(inspection?.guid)
}
+
+ override fun onItemViewLongClick(view: View?, position: Int) {
+ super.onItemViewLongClick(view, position)
+ DialogUtil2.showBottomDialog(this, rootView, listOf("淇敼", "鍒犻櫎"), listOf ({ p->
+ val intent = Intent(this, MenuProblemUpdateActivity::class.java).apply {
+ putExtra("problemlistVo", viewModel.problemList.value?.get(position))
+ putExtra("subTask", subTaskSelected)
+ putExtra("inspection", inspection)
+ putExtra("scene", scene)
+ putExtra("lat", lat)
+ putExtra("lng", lng)
+ }
+ startActivity(intent)
+ p.dismiss()
+ }, {p->
+ p.dismiss()
+ DialogUtil2.showAlertDialog(this, "纭鏄惁鍒犻櫎闂?", { dialog: Dialog ->
+ viewModel.deleteProblem(position) {
+ viewModel.getProblems(inspection?.guid)
+ }
+ dialog.dismiss()
+ }) { dialog: Dialog ->
+ dialog.dismiss()
+ }
+ }))
+ }
}
--
Gitblit v1.9.3