diff --git a/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt b/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt index 955a096..7336337 100644 --- a/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt +++ b/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt @@ -10,7 +10,6 @@ import com.casic.br.ar.app.model.SceneCheckManifestModel import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.CheckManifestViewModel -import com.casic.br.ar.app.vm.ConfigViewModel import com.casic.br.ar.app.widgets.CheckStandardSheet import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -19,7 +18,6 @@ class CheckManifestFragment : KotlinBaseFragment() { private val kTag = "CheckManifestFragment" - private lateinit var configViewModel: ConfigViewModel private lateinit var checkManifestViewModel: CheckManifestViewModel override fun initEvent() { diff --git a/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt b/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt index 955a096..7336337 100644 --- a/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt +++ b/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt @@ -10,7 +10,6 @@ import com.casic.br.ar.app.model.SceneCheckManifestModel import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.CheckManifestViewModel -import com.casic.br.ar.app.vm.ConfigViewModel import com.casic.br.ar.app.widgets.CheckStandardSheet import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -19,7 +18,6 @@ class CheckManifestFragment : KotlinBaseFragment() { private val kTag = "CheckManifestFragment" - private lateinit var configViewModel: ConfigViewModel private lateinit var checkManifestViewModel: CheckManifestViewModel override fun initEvent() { diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt index 178898d..a784141 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt @@ -21,6 +21,7 @@ import com.casic.br.ar.app.external.YoloResult import com.casic.br.ar.app.external.Yolov8ncnn import com.casic.br.ar.app.model.DictionaryModel +import com.casic.br.ar.app.model.SceneCheckManifestModel import com.casic.br.ar.app.utils.LocaleConstant import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.AlarmViewModel @@ -64,6 +65,7 @@ private lateinit var alarmViewModel: AlarmViewModel private lateinit var checkManifestViewModel: CheckManifestViewModel private var mainDicModels: MutableList = ArrayList() + private var checkManifestArray: MutableList = ArrayList() private var isDetectTarget = false private var alarmCode = "" private var checkItemCount = 0 @@ -122,6 +124,7 @@ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] checkManifestViewModel.sceneManifestResult.observe(this) { if (it.code == 200) { + checkManifestArray = it.data checkItemCount = it.data.size binding.noCheckCountView.text = "${checkItemCount}项" } @@ -506,7 +509,7 @@ } if (mat.width() > 0 || mat.height() > 0) { - detectResultDialog.updateDialogContentView(target, mat, + detectResultDialog.updateDialogContentView(checkManifestArray, target, mat, object : DetectResultDialog.OnDialogButtonClickListener { override fun onCheckPassClick(file: File) { imageFileViewModel.uploadImage(file) @@ -514,6 +517,8 @@ checkPassCount++ binding.checkedCountView.text = "${checkPassCount}项" + binding.noCheckCountView.text = + "${checkItemCount - checkPassCount}项" if (checkItemCount - checkPassCount == 0) { stopCheck() } @@ -524,7 +529,8 @@ detectedTargetSet.add(target) troubleCount++ - binding.noCheckCountView.text = "${troubleCount}项" + binding.troubleCountView.text = "${troubleCount}项" + binding.noCheckCountView.text = "${checkItemCount - troubleCount}项" } }).show() } diff --git a/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt b/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt index 955a096..7336337 100644 --- a/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt +++ b/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt @@ -10,7 +10,6 @@ import com.casic.br.ar.app.model.SceneCheckManifestModel import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.CheckManifestViewModel -import com.casic.br.ar.app.vm.ConfigViewModel import com.casic.br.ar.app.widgets.CheckStandardSheet import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -19,7 +18,6 @@ class CheckManifestFragment : KotlinBaseFragment() { private val kTag = "CheckManifestFragment" - private lateinit var configViewModel: ConfigViewModel private lateinit var checkManifestViewModel: CheckManifestViewModel override fun initEvent() { diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt index 178898d..a784141 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt @@ -21,6 +21,7 @@ import com.casic.br.ar.app.external.YoloResult import com.casic.br.ar.app.external.Yolov8ncnn import com.casic.br.ar.app.model.DictionaryModel +import com.casic.br.ar.app.model.SceneCheckManifestModel import com.casic.br.ar.app.utils.LocaleConstant import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.AlarmViewModel @@ -64,6 +65,7 @@ private lateinit var alarmViewModel: AlarmViewModel private lateinit var checkManifestViewModel: CheckManifestViewModel private var mainDicModels: MutableList = ArrayList() + private var checkManifestArray: MutableList = ArrayList() private var isDetectTarget = false private var alarmCode = "" private var checkItemCount = 0 @@ -122,6 +124,7 @@ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] checkManifestViewModel.sceneManifestResult.observe(this) { if (it.code == 200) { + checkManifestArray = it.data checkItemCount = it.data.size binding.noCheckCountView.text = "${checkItemCount}项" } @@ -506,7 +509,7 @@ } if (mat.width() > 0 || mat.height() > 0) { - detectResultDialog.updateDialogContentView(target, mat, + detectResultDialog.updateDialogContentView(checkManifestArray, target, mat, object : DetectResultDialog.OnDialogButtonClickListener { override fun onCheckPassClick(file: File) { imageFileViewModel.uploadImage(file) @@ -514,6 +517,8 @@ checkPassCount++ binding.checkedCountView.text = "${checkPassCount}项" + binding.noCheckCountView.text = + "${checkItemCount - checkPassCount}项" if (checkItemCount - checkPassCount == 0) { stopCheck() } @@ -524,7 +529,8 @@ detectedTargetSet.add(target) troubleCount++ - binding.noCheckCountView.text = "${troubleCount}项" + binding.troubleCountView.text = "${troubleCount}项" + binding.noCheckCountView.text = "${checkItemCount - troubleCount}项" } }).show() } diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt index c4dc638..c74e141 100644 --- a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt +++ b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt @@ -6,6 +6,7 @@ import android.os.Bundle import com.casic.br.ar.app.databinding.DialogDetectResultBinding import com.casic.br.ar.app.extensions.compressImage +import com.casic.br.ar.app.model.SceneCheckManifestModel import com.casic.br.ar.app.utils.LocaleConstant import com.casic.br.operationsite.test.callback.OnImageCompressListener import com.pengxh.kt.lite.extensions.binding @@ -71,6 +72,7 @@ } fun updateDialogContentView( + checkManifestArray: MutableList, target: String, mat: Mat, listener: OnDialogButtonClickListener ): DetectResultDialog { this.target = target @@ -79,6 +81,14 @@ if (target.isNumber()) { binding.messageView.text = LocaleConstant.CLASS_NAMES_ARRAY[target.toInt()] + + //查询目标的检查标准 + for (rule in checkManifestArray) { + if (rule.type == target) { + binding.standardRuleView.text = rule.checkItem + break + } + } } else { binding.messageView.text = target } diff --git a/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt b/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt index 955a096..7336337 100644 --- a/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt +++ b/app/src/main/java/com/casic/br/ar/app/fragment/CheckManifestFragment.kt @@ -10,7 +10,6 @@ import com.casic.br.ar.app.model.SceneCheckManifestModel import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.CheckManifestViewModel -import com.casic.br.ar.app.vm.ConfigViewModel import com.casic.br.ar.app.widgets.CheckStandardSheet import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder @@ -19,7 +18,6 @@ class CheckManifestFragment : KotlinBaseFragment() { private val kTag = "CheckManifestFragment" - private lateinit var configViewModel: ConfigViewModel private lateinit var checkManifestViewModel: CheckManifestViewModel override fun initEvent() { diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt index 178898d..a784141 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt @@ -21,6 +21,7 @@ import com.casic.br.ar.app.external.YoloResult import com.casic.br.ar.app.external.Yolov8ncnn import com.casic.br.ar.app.model.DictionaryModel +import com.casic.br.ar.app.model.SceneCheckManifestModel import com.casic.br.ar.app.utils.LocaleConstant import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.AlarmViewModel @@ -64,6 +65,7 @@ private lateinit var alarmViewModel: AlarmViewModel private lateinit var checkManifestViewModel: CheckManifestViewModel private var mainDicModels: MutableList = ArrayList() + private var checkManifestArray: MutableList = ArrayList() private var isDetectTarget = false private var alarmCode = "" private var checkItemCount = 0 @@ -122,6 +124,7 @@ checkManifestViewModel = ViewModelProvider(this)[CheckManifestViewModel::class.java] checkManifestViewModel.sceneManifestResult.observe(this) { if (it.code == 200) { + checkManifestArray = it.data checkItemCount = it.data.size binding.noCheckCountView.text = "${checkItemCount}项" } @@ -506,7 +509,7 @@ } if (mat.width() > 0 || mat.height() > 0) { - detectResultDialog.updateDialogContentView(target, mat, + detectResultDialog.updateDialogContentView(checkManifestArray, target, mat, object : DetectResultDialog.OnDialogButtonClickListener { override fun onCheckPassClick(file: File) { imageFileViewModel.uploadImage(file) @@ -514,6 +517,8 @@ checkPassCount++ binding.checkedCountView.text = "${checkPassCount}项" + binding.noCheckCountView.text = + "${checkItemCount - checkPassCount}项" if (checkItemCount - checkPassCount == 0) { stopCheck() } @@ -524,7 +529,8 @@ detectedTargetSet.add(target) troubleCount++ - binding.noCheckCountView.text = "${troubleCount}项" + binding.troubleCountView.text = "${troubleCount}项" + binding.noCheckCountView.text = "${checkItemCount - troubleCount}项" } }).show() } diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt index c4dc638..c74e141 100644 --- a/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt +++ b/app/src/main/java/com/casic/br/ar/app/widgets/DetectResultDialog.kt @@ -6,6 +6,7 @@ import android.os.Bundle import com.casic.br.ar.app.databinding.DialogDetectResultBinding import com.casic.br.ar.app.extensions.compressImage +import com.casic.br.ar.app.model.SceneCheckManifestModel import com.casic.br.ar.app.utils.LocaleConstant import com.casic.br.operationsite.test.callback.OnImageCompressListener import com.pengxh.kt.lite.extensions.binding @@ -71,6 +72,7 @@ } fun updateDialogContentView( + checkManifestArray: MutableList, target: String, mat: Mat, listener: OnDialogButtonClickListener ): DetectResultDialog { this.target = target @@ -79,6 +81,14 @@ if (target.isNumber()) { binding.messageView.text = LocaleConstant.CLASS_NAMES_ARRAY[target.toInt()] + + //查询目标的检查标准 + for (rule in checkManifestArray) { + if (rule.type == target) { + binding.standardRuleView.text = rule.checkItem + break + } + } } else { binding.messageView.text = target } diff --git a/app/src/main/res/layout/dialog_detect_result.xml b/app/src/main/res/layout/dialog_detect_result.xml index e22b9c9..eb94ff1 100644 --- a/app/src/main/res/layout/dialog_detect_result.xml +++ b/app/src/main/res/layout/dialog_detect_result.xml @@ -21,12 +21,20 @@ android:id="@+id/messageView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingVertical="@dimen/dp_5" android:layout_marginVertical="15dp" + android:fontFamily="sans-serif-black" + android:paddingVertical="@dimen/dp_5" android:textColor="@color/white" - android:textColorHint="@color/white" android:textSize="@dimen/sp_16" /> + +