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/MenuCameraActivity.kt | 128 ++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 38 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraActivity.kt
index cc3dbd4..44ef3d9 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraActivity.kt
@@ -7,6 +7,7 @@
import android.os.Bundle
import android.os.Environment
import android.support.v7.widget.GridLayoutManager
+import android.support.v7.widget.RecyclerView
import android.view.View
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.activity.PhotoViewerActivity
@@ -16,7 +17,7 @@
import cn.flightfeather.thirdapp.bean.Mediafile
import cn.flightfeather.thirdapp.bean.Scense
import cn.flightfeather.thirdapp.bean.Subtask
-import cn.flightfeather.thirdapp.fragment.InspectionFragment.intToByte
+import cn.flightfeather.thirdapp.model.enumreation.MediaFileType
import cn.flightfeather.thirdapp.module.base.BaseActivity
import cn.flightfeather.thirdapp.module.base.BaseTakePicActivity
import cn.flightfeather.thirdapp.module.base.TAKE_PHOTO
@@ -31,11 +32,18 @@
import java.io.IOException
import java.io.Serializable
import java.util.*
+import kotlin.collections.ArrayList
const val BUSINESS_TYPE_CAMERA = 5
class MenuCameraActivity : BaseActivity() {
override fun getLayoutId(): Int = R.layout.dialog_camera
+
+ //椤甸潰鏀寔鐨勬媿鎽勫浘鐗囩被鍨�
+ private val typeList = listOf(MediaFileType.RoutineRecord, MediaFileType.Nameplate, MediaFileType.MonitorDevice)
+
+ //褰撳墠閫夋嫨鐨勬媿鐓х被鍨�
+ private var currentType = MediaFileType.RoutineRecord
lateinit var viewModel: MenuCameraViewModel
@@ -56,15 +64,7 @@
lng = intent.getDoubleExtra("lng", 0.0)
initUI()
-
- viewModel.mediaFileList.observe(this, Observer {
- it?.let {
- rv_photo_list.adapter?.notifyDataSetChanged()
-
- val t = "鍏�${it.size}寮犵収鐗�"
- tv_count.text = t
- }
- })
+ initObserver()
inspection?.guid?.let { viewModel.getMediaFile(it) }
}
@@ -87,45 +87,66 @@
}
try {
FileUtil.copyFile(oldFile, newFile)
- putMediaFile(path, fileName, cal)
+ val mf = putMediaFile(path, fileName, cal)
+ addPhoto(mf)
} catch (e: IOException) {
e.printStackTrace()
application.toast("澶嶅埗鏂囦欢澶辫触")
}
}
}
- inspection?.guid?.let { viewModel.getMediaFile(it) }
}
VIEW_PHOTO -> {
//鏌ョ湅涓存椂鎷嶆憚鍥剧墖鍙互鍒犻櫎
data?.getIntExtra("position", -1)?.let {
- viewModel.mediaFileList.value?.removeAt(it)
- rv_photo_list.adapter?.run {
- notifyDataSetChanged()
- }
+ deletePhoto(it)
}
}
}
}
private fun initUI() {
- rv_photo_list.run {
+ typeList.forEach {
+ getDataSet(it).run {
+ initRecyclerView(first.value, second, it)
+ }
+ }
+ fab_problem_list_close.setOnClickListener {
+ finish()
+ }
+ }
+
+ private fun initRecyclerView(dataList: MutableList<Mediafile>?, recyclerView: RecyclerView, type: MediaFileType) {
+ if (dataList==null) return
+ recyclerView.run {
layoutManager = GridLayoutManager(this@MenuCameraActivity, 4)
- adapter = PhotoListAdapter(viewModel.mediaFileList.value, this@MenuCameraActivity)
+ adapter = PhotoListAdapter(dataList, this@MenuCameraActivity)
addOnItemTouchListener(RecyclerItemClickListener(this@MenuCameraActivity, this, object : RecyclerItemClickListener.OnItemClickListener {
override fun onItemClick(view: View?, position: Int) {
- val files = ArrayList<File>()
- for (m in viewModel.mediaFileList.value!!) {
- val f = File(Environment.getExternalStorageDirectory(), m.path + m.description)
- files.add(f)
+ currentType = type
+ //鎷嶇収
+ if (dataList[position].guid == null) {
+ PhotoUtil.pickPhoto2(this@MenuCameraActivity, TAKE_PHOTO, 9)
}
- val intent = Intent(this@MenuCameraActivity, PhotoViewerActivity::class.java)
- .putExtra(PhotoViewerActivity.PARA_FILES, files as Serializable)
- .putExtra("type", PhotoViewerActivity.CAMERA_PHOTO)
- .putExtra("deletable", true)
- .putExtra("position", position)
- .putExtra(PhotoViewerActivity.PARA_MEDIAS, viewModel.mediaFileList.value as Serializable)
- startActivityForResult(intent, VIEW_PHOTO)
+ //鏌ョ湅鍥剧墖
+ else {
+ val files = ArrayList<File>()
+ val medias = ArrayList<Mediafile>()
+ for (m in dataList) {
+ if (m.guid != null) {
+ val f = File(Environment.getExternalStorageDirectory(), m.path + m.description)
+ files.add(f)
+ medias.add(m)
+ }
+ }
+ val intent = Intent(this@MenuCameraActivity, PhotoViewerActivity::class.java)
+ .putExtra(PhotoViewerActivity.PARA_FILES, files as Serializable)
+ .putExtra("type", PhotoViewerActivity.CAMERA_PHOTO)
+ .putExtra("deletable", true)
+ .putExtra("position", position - 1)
+ .putExtra(PhotoViewerActivity.PARA_MEDIAS, medias as Serializable)
+ startActivityForResult(intent, VIEW_PHOTO)
+ }
}
override fun onItemLongClick(view: View?, position: Int) {
@@ -133,17 +154,21 @@
}))
}
+ }
- iv_new_photo.setOnClickListener {
- PhotoUtil.pickPhoto2(this, TAKE_PHOTO, 9)
- }
-
- fab_problem_list_close.setOnClickListener {
- finish()
+ private fun initObserver() {
+ typeList.forEach {
+ getDataSet(it).run {
+ first.observe(this@MenuCameraActivity, Observer {list->
+ list?.let {
+ second.adapter?.notifyDataSetChanged()
+ }
+ })
+ }
}
}
- private fun putMediaFile(path: String, fileName: String, calendar: Calendar) {
+ private fun putMediaFile(path: String, fileName: String, calendar: Calendar):Mediafile {
val mediaFile = Mediafile()
mediaFile.guid = UUIDGenerator.generate16ShortUUID()
mediaFile.iguid = inspection?.guid
@@ -152,8 +177,8 @@
mediaFile.address = "${scene?.cityname ?: ""} + ${scene?.districtname
?: ""} + ${scene?.townname ?: ""} + ${scene?.location ?: ""}"
mediaFile.filetype = 1
- mediaFile.businesstype = "甯歌璁板綍"
- mediaFile.businesstypeid = intToByte(5)
+ mediaFile.businesstype = currentType.des
+ mediaFile.businesstypeid = currentType.value.toByte()
mediaFile.path = path
mediaFile.description = fileName
mediaFile.savetime = Date()
@@ -163,5 +188,32 @@
mediaFile.remark = "鏈笂浼�"
viewModel.putMediaFile(mediaFile)
+
+ return mediaFile
+ }
+
+ private fun addPhoto(mediaFile: Mediafile) {
+ getDataSet(currentType).run {
+ first.value?.add(mediaFile)
+ second.adapter?.run {
+ notifyDataSetChanged()
+ }
+ }
+ }
+
+ private fun deletePhoto(pos: Int) {
+ getDataSet(currentType).run {
+ first.value?.removeAt(pos + 1)//绗竴涓暟鎹负鎷嶇収鎸夐挳
+ second.adapter?.run {
+ notifyDataSetChanged()
+ }
+ }
+ }
+
+ private fun getDataSet(type: MediaFileType) = when (type) {
+ MediaFileType.RoutineRecord -> Pair(viewModel.routineRecordList, rv_photo_list_1)
+ MediaFileType.Nameplate -> Pair(viewModel.nameplateList, rv_photo_list_2)
+ MediaFileType.MonitorDevice -> Pair(viewModel.monitorDeviceList, rv_photo_list_3)
+ else -> Pair(viewModel.routineRecordList, rv_photo_list_1)
}
}
--
Gitblit v1.9.3