1. 调整了数控实体的存储位置； 2. 新增数据表“媒体文件类型别名表”； 3. 修改任意拍模块，将图片分类改为根据场景类型动态生成，同时新增修改分类...

riku

2020-12-22 a5d862051462a5fcc2717b405896a6d424002e54

 app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuCameraActivity.kt

@@ -1,5 +1,6 @@
package cn.flightfeather.thirdapp.module.inspection

import android.annotation.SuppressLint
import android.app.Activity
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
@@ -8,15 +9,18 @@
import android.os.Environment
import android.support.v7.widget.GridLayoutManager
import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater
import android.view.View
import android.widget.ImageView
import android.widget.TextView
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.activity.PhotoViewerActivity
import cn.flightfeather.thirdapp.adapter.PhotoListAdapter
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener
import cn.flightfeather.thirdapp.bean.Inspection
import cn.flightfeather.thirdapp.bean.Mediafile
import cn.flightfeather.thirdapp.bean.Scense
import cn.flightfeather.thirdapp.bean.Subtask
import cn.flightfeather.thirdapp.bean.entity.Inspection
import cn.flightfeather.thirdapp.bean.entity.Mediafile
import cn.flightfeather.thirdapp.bean.entity.Scense
import cn.flightfeather.thirdapp.bean.entity.Subtask
import cn.flightfeather.thirdapp.model.enumreation.MediaFileType
import cn.flightfeather.thirdapp.module.base.BaseActivity
import cn.flightfeather.thirdapp.module.base.BaseTakePicActivity
@@ -26,7 +30,10 @@
import cn.flightfeather.thirdapp.util.UUIDGenerator
import cn.flightfeather.thirdapp.util.file.FileUtil
import cn.flightfeather.thirdapp.util.photo.PhotoUtil
import cn.flightfeather.thirdapp.view.SearchView
import kotlinx.android.synthetic.main.dialog_camera.*
import kotlinx.android.synthetic.main.dialog_camera.fab_problem_list_close
import kotlinx.android.synthetic.main.dialog_camera_3.*
import org.jetbrains.anko.toast
import java.io.File
import java.io.IOException
@@ -37,7 +44,7 @@
const val BUSINESS_TYPE_CAMERA = 5

class MenuCameraActivity : BaseActivity() {
    override fun getLayoutId(): Int = R.layout.dialog_camera
    override fun getLayoutId(): Int = R.layout.dialog_camera_3

    //页面支持的拍摄图片类型
    private val typeList = listOf(MediaFileType.RoutineRecord, MediaFileType.Nameplate, MediaFileType.MonitorDevice)
@@ -46,6 +53,8 @@
    private var currentType = MediaFileType.RoutineRecord

    lateinit var viewModel: MenuCameraViewModel

    private val viewList = mutableListOf<View>()

    var subTask: Subtask? = null
    var inspection: Inspection? = null
@@ -66,7 +75,11 @@
        initUI()
        initObserver()

        inspection?.guid?.let { viewModel.getMediaFile(it) }
        inspection?.guid?.let {guid ->
            scene?.typeid?.let { typeId ->
                viewModel.getMediaFile(guid, typeId.toInt())
            }
        }
    }

    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -106,19 +119,34 @@
    }

    private fun initUI() {
        typeList.forEach {
            getDataSet(it).run {
                initRecyclerView(first.value, second, it)
            }
        }
//        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) {
    @SuppressLint("SetTextI18n")
    private fun initRecyclerView(dataList: List<Mediafile>?, type: MediaFileType, alias: String?) {
        if (dataList==null) return
        recyclerView.run {
        val view = LayoutInflater.from(this).inflate(R.layout.item_take_photo, null)
        val searchView = view.findViewById<SearchView>(R.id.search_view)
        val title = view.findViewById<TextView>(R.id.txt_title)
        searchView.onConfirm = { str ->
            scene?.typeid?.let {
                viewModel.updateAlias(it.toInt(), type, str) { alias ->
                    title.text = if (alias.isBlank())  type.des else "${alias}(${type.des})"
                }
            }
        }
        title.text = if (alias.isNullOrBlank())  type.des else "${alias}(${type.des})"
        view.findViewById<ImageView>(R.id.img_edit).setOnClickListener {
            searchView.show(type.des, alias ?: "")
        }
        view.findViewById<RecyclerView>(R.id.rv_photo_list).run {
            layoutManager = GridLayoutManager(this@MenuCameraActivity, 4)
            adapter = PhotoListAdapter(dataList, this@MenuCameraActivity)
            addOnItemTouchListener(RecyclerItemClickListener(this@MenuCameraActivity, this, object : RecyclerItemClickListener.OnItemClickListener {
@@ -154,18 +182,28 @@

            }))
        }

        viewList.add(view)
    }

    private fun initObserver() {
        typeList.forEach {
            getDataSet(it).run {
                first.observe(this@MenuCameraActivity, Observer {list->
                    list?.let {
                        second.adapter?.notifyDataSetChanged()
        viewModel.fileList.observe(this, Observer {
            it?.forEach { m ->
                initRecyclerView(m.dataList, m.type ?: MediaFileType.Others, m.alias)
            }
            if (viewList.isNotEmpty()) {
                banner.dataList = viewList
                    }
                })
            }
        }
//        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):Mediafile {