diff --git a/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt b/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt index 143e287..b1e937a 100644 --- a/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt +++ b/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt @@ -1,14 +1,12 @@ package com.casic.br.ar.app.utils import com.casic.br.ar.app.model.DictionaryModel -import org.opencv.core.Mat object RuntimeCache { - //TODO 未引用未赋值 + //TODO 未赋值 var scene = "" var sceneName = "" var inspectionId = "" var mainDicModels: MutableList = ArrayList() - lateinit var mat: Mat } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt b/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt index 143e287..b1e937a 100644 --- a/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt +++ b/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt @@ -1,14 +1,12 @@ package com.casic.br.ar.app.utils import com.casic.br.ar.app.model.DictionaryModel -import org.opencv.core.Mat object RuntimeCache { - //TODO 未引用未赋值 + //TODO 未赋值 var scene = "" var sceneName = "" var inspectionId = "" var mainDicModels: MutableList = ArrayList() - lateinit var mat: Mat } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/AddHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/AddHiddenTroubleActivity.kt index 989b751..6a9e240 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/AddHiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/AddHiddenTroubleActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.ar.app.view -import android.graphics.Bitmap import android.os.Bundle import android.util.Log import android.view.View @@ -8,36 +7,19 @@ import android.widget.ArrayAdapter import androidx.lifecycle.ViewModelProvider import com.casic.br.ar.app.databinding.ActivityAddHiddenTroubleBinding -import com.casic.br.ar.app.extensions.combineFilePath -import com.casic.br.ar.app.extensions.compressImage import com.casic.br.ar.app.model.DictionaryModel import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.ConfigViewModel import com.casic.br.ar.app.vm.HiddenTroubleViewModel -import com.casic.br.ar.app.vm.ImageFileViewModel -import com.casic.br.operationsite.test.callback.OnImageCompressListener -import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets -import com.pengxh.kt.lite.extensions.createImageFileDir -import com.pengxh.kt.lite.extensions.dp2px -import com.pengxh.kt.lite.extensions.getScreenWidth -import com.pengxh.kt.lite.extensions.saveImage import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub -import org.opencv.android.Utils -import java.io.File class AddHiddenTroubleActivity : KotlinBaseActivity() { private val kTag = "AddHiddenTroubleActivity" - private val context = this private val imagePaths = ArrayList>() - private val recyclerViewImages = ArrayList() - private val marginOffset by lazy { 1.dp2px(this) } - private lateinit var imageAdapter: EditableImageAdapter - private lateinit var imageFileViewModel: ImageFileViewModel private lateinit var configViewModel: ConfigViewModel private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel private var mainDicModels: MutableList = ArrayList() @@ -63,12 +45,6 @@ "隐患添加成功".show(this) } } - - imageFileViewModel.loadState.observe(this) { - if (it == LoadState.Loading) { - "图片上传中，请稍后...".show(this) - } - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -97,28 +73,6 @@ } } - //左外边距，左内边距，TextView宽度，内间距，右内边距，右外边距 - val viewWidth = getScreenWidth() - (15 + 15 + 65 + 10 + 15 + 15).dp2px(this) - imageAdapter = EditableImageAdapter(this, recyclerViewImages, viewWidth, 3, 3) - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) - ) - binding.recyclerView.adapter = imageAdapter - - imageFileViewModel = ViewModelProvider(this)[ImageFileViewModel::class.java] - imageFileViewModel.resultModel.observe(this) { - if (it.code == 200) { - val url = it.data.toString() - val map = HashMap() - map["alarmImage"] = url - map["id"] = "" - map["inspectionAlarmId"] = "" - imagePaths.add(map) - recyclerViewImages.add(url.combineFilePath()) - imageAdapter.notifyDataSetChanged() - } - } - hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.addTroubleResult.observe(this) { if (it.code == 200) { @@ -156,22 +110,6 @@ } } - imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { - override fun onAddImageClick() { - addImage() - } - - override fun onItemClick(position: Int) { - - } - - override fun onItemLongClick(view: View?, position: Int) { - imagePaths.removeAt(position) - recyclerViewImages.removeAt(position) - imageAdapter.notifyDataSetChanged() - } - }) - binding.confirmButton.setOnClickListener { hiddenTroubleViewModel.addHiddenTrouble( this, @@ -193,25 +131,4 @@ binding.cancelButton.setOnClickListener { finish() } } - - private fun addImage() { - //mat转图片 - val bitmap = Bitmap.createBitmap( - RuntimeCache.mat.width(), - RuntimeCache.mat.height(), - Bitmap.Config.ARGB_8888 - ) - Utils.matToBitmap(RuntimeCache.mat, bitmap, true) - val imagePath = "${createImageFileDir()}/${System.currentTimeMillis()}.png" - bitmap.saveImage(imagePath) - imagePath.compressImage(this, object : OnImageCompressListener { - override fun onSuccess(file: File) { - imageFileViewModel.uploadImage(file) - } - - override fun onError(e: Throwable) { - e.printStackTrace() - } - }) - } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt b/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt index 143e287..b1e937a 100644 --- a/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt +++ b/app/src/main/java/com/casic/br/ar/app/utils/RuntimeCache.kt @@ -1,14 +1,12 @@ package com.casic.br.ar.app.utils import com.casic.br.ar.app.model.DictionaryModel -import org.opencv.core.Mat object RuntimeCache { - //TODO 未引用未赋值 + //TODO 未赋值 var scene = "" var sceneName = "" var inspectionId = "" var mainDicModels: MutableList = ArrayList() - lateinit var mat: Mat } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/AddHiddenTroubleActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/AddHiddenTroubleActivity.kt index 989b751..6a9e240 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/AddHiddenTroubleActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/AddHiddenTroubleActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.ar.app.view -import android.graphics.Bitmap import android.os.Bundle import android.util.Log import android.view.View @@ -8,36 +7,19 @@ import android.widget.ArrayAdapter import androidx.lifecycle.ViewModelProvider import com.casic.br.ar.app.databinding.ActivityAddHiddenTroubleBinding -import com.casic.br.ar.app.extensions.combineFilePath -import com.casic.br.ar.app.extensions.compressImage import com.casic.br.ar.app.model.DictionaryModel import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.ConfigViewModel import com.casic.br.ar.app.vm.HiddenTroubleViewModel -import com.casic.br.ar.app.vm.ImageFileViewModel -import com.casic.br.operationsite.test.callback.OnImageCompressListener -import com.pengxh.kt.lite.adapter.EditableImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets -import com.pengxh.kt.lite.extensions.createImageFileDir -import com.pengxh.kt.lite.extensions.dp2px -import com.pengxh.kt.lite.extensions.getScreenWidth -import com.pengxh.kt.lite.extensions.saveImage import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialogHub -import org.opencv.android.Utils -import java.io.File class AddHiddenTroubleActivity : KotlinBaseActivity() { private val kTag = "AddHiddenTroubleActivity" - private val context = this private val imagePaths = ArrayList>() - private val recyclerViewImages = ArrayList() - private val marginOffset by lazy { 1.dp2px(this) } - private lateinit var imageAdapter: EditableImageAdapter - private lateinit var imageFileViewModel: ImageFileViewModel private lateinit var configViewModel: ConfigViewModel private lateinit var hiddenTroubleViewModel: HiddenTroubleViewModel private var mainDicModels: MutableList = ArrayList() @@ -63,12 +45,6 @@ "隐患添加成功".show(this) } } - - imageFileViewModel.loadState.observe(this) { - if (it == LoadState.Loading) { - "图片上传中，请稍后...".show(this) - } - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -97,28 +73,6 @@ } } - //左外边距，左内边距，TextView宽度，内间距，右内边距，右外边距 - val viewWidth = getScreenWidth() - (15 + 15 + 65 + 10 + 15 + 15).dp2px(this) - imageAdapter = EditableImageAdapter(this, recyclerViewImages, viewWidth, 3, 3) - binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) - ) - binding.recyclerView.adapter = imageAdapter - - imageFileViewModel = ViewModelProvider(this)[ImageFileViewModel::class.java] - imageFileViewModel.resultModel.observe(this) { - if (it.code == 200) { - val url = it.data.toString() - val map = HashMap() - map["alarmImage"] = url - map["id"] = "" - map["inspectionAlarmId"] = "" - imagePaths.add(map) - recyclerViewImages.add(url.combineFilePath()) - imageAdapter.notifyDataSetChanged() - } - } - hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.addTroubleResult.observe(this) { if (it.code == 200) { @@ -156,22 +110,6 @@ } } - imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { - override fun onAddImageClick() { - addImage() - } - - override fun onItemClick(position: Int) { - - } - - override fun onItemLongClick(view: View?, position: Int) { - imagePaths.removeAt(position) - recyclerViewImages.removeAt(position) - imageAdapter.notifyDataSetChanged() - } - }) - binding.confirmButton.setOnClickListener { hiddenTroubleViewModel.addHiddenTrouble( this, @@ -193,25 +131,4 @@ binding.cancelButton.setOnClickListener { finish() } } - - private fun addImage() { - //mat转图片 - val bitmap = Bitmap.createBitmap( - RuntimeCache.mat.width(), - RuntimeCache.mat.height(), - Bitmap.Config.ARGB_8888 - ) - Utils.matToBitmap(RuntimeCache.mat, bitmap, true) - val imagePath = "${createImageFileDir()}/${System.currentTimeMillis()}.png" - bitmap.saveImage(imagePath) - imagePath.compressImage(this, object : OnImageCompressListener { - override fun onSuccess(file: File) { - imageFileViewModel.uploadImage(file) - } - - override fun onError(e: Throwable) { - e.printStackTrace() - } - }) - } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_hidden_trouble.xml b/app/src/main/res/layout/activity_add_hidden_trouble.xml index 844b05b..b1c8ea5 100644 --- a/app/src/main/res/layout/activity_add_hidden_trouble.xml +++ b/app/src/main/res/layout/activity_add_hidden_trouble.xml @@ -1,6 +1,5 @@ - - - - - - -