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/MenuCameraActivity.kt | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraActivity.kt b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraActivity.kt
index 6fd1f5c..6e4af15 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/module/inspection/MenuCameraActivity.kt
@@ -22,6 +22,7 @@
import cn.flightfeather.thirdappmodule.bean.entity.Scense
import cn.flightfeather.thirdappmodule.bean.entity.Subtask
import cn.flightfeather.thirdappmodule.model.enumreation.MediaFileType
+import cn.flightfeather.thirdappmodule.model.enumreation.MediaFileType_Backup
import cn.flightfeather.thirdappmodule.module.base.BaseActivity
import cn.flightfeather.thirdappmodule.module.base.BaseTakePicActivity
import cn.flightfeather.thirdappmodule.module.base.TAKE_PHOTO
@@ -43,14 +44,19 @@
const val BUSINESS_TYPE_CAMERA = 5
+/**
+ * @author riku
+ * Date: 2019/8/1
+ * 浠绘剰鎷嶇収
+ */
class MenuCameraActivity : BaseActivity() {
override fun getLayoutId(): Int = R.layout.dialog_camera_3
//椤甸潰鏀寔鐨勬媿鎽勫浘鐗囩被鍨�
- private val typeList = listOf(MediaFileType.RoutineRecord, MediaFileType.Nameplate, MediaFileType.MonitorDevice)
+ private val typeList = listOf<MediaFileType>()
//褰撳墠閫夋嫨鐨勬媿鐓х被鍨�
- private var currentType = MediaFileType.RoutineRecord
+ private var currentType = MediaFileType(MediaFileType_Backup.RoutineRecord.value, MediaFileType_Backup.RoutineRecord.des)
private var currentTypeName = currentType.des
lateinit var viewModel: MenuCameraViewModel
@@ -160,7 +166,7 @@
currentTypeName = title.text.toString()
//鎷嶇収
if (dataList[position].guid == null) {
- PhotoUtil.pickPhoto2(this@MenuCameraActivity, TAKE_PHOTO, 9)
+ PhotoUtil.pickPhoto(this@MenuCameraActivity, TAKE_PHOTO, 9)
}
//鏌ョ湅鍥剧墖
else {
@@ -199,10 +205,14 @@
private fun initObserver() {
viewModel.fileList.observe(this, Observer {
it?.forEach { m ->
- initRecyclerView(m.dataList, m.type ?: MediaFileType.Others, m.alias)
+ initRecyclerView(m.dataList, m.type ?: MediaFileType.defaultType, m.alias)
+ }
+ val menus = it?.map { m->
+ m.type?.des ?: ""
}
if (viewList.isNotEmpty()) {
banner.dataList = viewList
+ menus?.let { m->banner.menus = m }
}
})
// typeList.forEach {
@@ -230,8 +240,8 @@
mediaFile.description = fileName
mediaFile.savetime = Date()
mediaFile.ischanged = false
- val exetension1 = scene?.citycode + "/" + scene?.districtcode + "/" + DateFormatter.dateFormat2.format(calendar.time) + "/" + scene?.guid + "/"
- mediaFile.extension1 = exetension1
+ val extension1 = scene?.citycode + "/" + scene?.districtcode + "/" + DateFormatter.dateFormat2.format(calendar.time) + "/" + scene?.guid + "/"
+ mediaFile.extension1 = extension1
mediaFile.remark = "鏈笂浼�"
viewModel.putMediaFile(mediaFile)
@@ -271,12 +281,5 @@
// 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