diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2be176..0c514bc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -92,7 +92,7 @@ + android:theme="@style/ActivityOnDialogStyle" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2be176..0c514bc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -92,7 +92,7 @@ + android:theme="@style/ActivityOnDialogStyle" /> diff --git a/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt index 03826c5..d012f3d 100644 --- a/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt @@ -11,7 +11,6 @@ import com.bumptech.glide.Glide import com.casic.br.app.R import com.casic.br.app.databinding.ActivityBigImageBinding -import com.casic.br.app.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant @@ -22,8 +21,7 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.black) - binding.leftBackView.setOnClickListener { finish() } + } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -35,13 +33,11 @@ } override fun initEvent() { - val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) + val index = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) if (urls == null || urls.size == 0) { return } - val imageSize = urls.size - binding.pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") binding.imagePagerView.adapter = BigImageAdapter(this, urls) binding.imagePagerView.currentItem = index binding.imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { @@ -51,8 +47,7 @@ } override fun onPageSelected(position: Int) { - binding.pageNumberView.text = - String.format("(" + (position + 1) + "/" + imageSize + ")") + } override fun onPageScrollStateChanged(state: Int) {} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2be176..0c514bc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -92,7 +92,7 @@ + android:theme="@style/ActivityOnDialogStyle" /> diff --git a/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt index 03826c5..d012f3d 100644 --- a/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt @@ -11,7 +11,6 @@ import com.bumptech.glide.Glide import com.casic.br.app.R import com.casic.br.app.databinding.ActivityBigImageBinding -import com.casic.br.app.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant @@ -22,8 +21,7 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.black) - binding.leftBackView.setOnClickListener { finish() } + } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -35,13 +33,11 @@ } override fun initEvent() { - val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) + val index = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) if (urls == null || urls.size == 0) { return } - val imageSize = urls.size - binding.pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") binding.imagePagerView.adapter = BigImageAdapter(this, urls) binding.imagePagerView.currentItem = index binding.imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { @@ -51,8 +47,7 @@ } override fun onPageSelected(position: Int) { - binding.pageNumberView.text = - String.format("(" + (position + 1) + "/" + imageSize + ")") + } override fun onPageScrollStateChanged(state: Int) {} diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt index 99839c8..f1e1e31 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt @@ -19,7 +19,6 @@ import com.casic.br.app.extensions.convert2YoloResult import com.casic.br.app.extensions.getSceneByTarget import com.casic.br.app.extensions.initImmersionBar -import com.casic.br.app.extensions.isInScene import com.casic.br.app.external.INativeCallback import com.casic.br.app.external.YoloResult import com.casic.br.app.external.Yolov8ncnn @@ -278,21 +277,23 @@ } }) - detectResults.forEach { - val label = LocaleConstant.CLASS_NAMES_ARRAY[it.type] - if (label.isInScene(detectedScene)) { + runOnUiThread { + detectResults.forEach { + val label = LocaleConstant.CLASS_NAMES_ARRAY[it.type] targetSet.add(label) - } + binding.tipsTagView.visibility = View.VISIBLE + binding.tipsTagView.text = "${targetSet.size}" - when (it.type) { - 37 -> RuntimeCache.detectResult.add(0) - 5, 14, 24 -> RuntimeCache.detectResult.add(1) - 0 -> RuntimeCache.detectResult.add(2) - 50, 51 -> RuntimeCache.detectResult.add(3) - 25 -> RuntimeCache.detectResult.add(4) - 9 -> RuntimeCache.detectResult.add(5) - 18 -> RuntimeCache.detectResult.add(6) - 33 -> RuntimeCache.detectResult.add(7) + when (it.type) { + 37 -> RuntimeCache.detectResult.add(0) + 5, 14, 24 -> RuntimeCache.detectResult.add(1) + 0 -> RuntimeCache.detectResult.add(2) + 50, 51 -> RuntimeCache.detectResult.add(3) + 25 -> RuntimeCache.detectResult.add(4) + 9 -> RuntimeCache.detectResult.add(5) + 18 -> RuntimeCache.detectResult.add(6) + 33 -> RuntimeCache.detectResult.add(7) + } } } } @@ -356,16 +357,13 @@ } 2024082902 -> { - binding.tipsTagView.visibility = View.VISIBLE - binding.tipsTagView.text = "${targetSet.size}" - - val target = msg.obj as HiddenTroubleResult - if (detectedTargetSet.contains(target.warning)) { + //弹框 + if (detectResultDialog.isShowing) { return true } - //弹框 - if (detectResultDialog.isShowing) { + val target = msg.obj as HiddenTroubleResult + if (detectedTargetSet.contains(target.warning)) { return true } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2be176..0c514bc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -92,7 +92,7 @@ + android:theme="@style/ActivityOnDialogStyle" /> diff --git a/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt index 03826c5..d012f3d 100644 --- a/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/BigImageActivity.kt @@ -11,7 +11,6 @@ import com.bumptech.glide.Glide import com.casic.br.app.R import com.casic.br.app.databinding.ActivityBigImageBinding -import com.casic.br.app.extensions.initImmersionBar import com.luck.picture.lib.photoview.PhotoView import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant @@ -22,8 +21,7 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.black) - binding.leftBackView.setOnClickListener { finish() } + } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -35,13 +33,11 @@ } override fun initEvent() { - val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) + val index = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) if (urls == null || urls.size == 0) { return } - val imageSize = urls.size - binding.pageNumberView.text = String.format("(" + (index + 1) + "/" + imageSize + ")") binding.imagePagerView.adapter = BigImageAdapter(this, urls) binding.imagePagerView.currentItem = index binding.imagePagerView.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { @@ -51,8 +47,7 @@ } override fun onPageSelected(position: Int) { - binding.pageNumberView.text = - String.format("(" + (position + 1) + "/" + imageSize + ")") + } override fun onPageScrollStateChanged(state: Int) {} diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt index 99839c8..f1e1e31 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckByYoloActivity.kt @@ -19,7 +19,6 @@ import com.casic.br.app.extensions.convert2YoloResult import com.casic.br.app.extensions.getSceneByTarget import com.casic.br.app.extensions.initImmersionBar -import com.casic.br.app.extensions.isInScene import com.casic.br.app.external.INativeCallback import com.casic.br.app.external.YoloResult import com.casic.br.app.external.Yolov8ncnn @@ -278,21 +277,23 @@ } }) - detectResults.forEach { - val label = LocaleConstant.CLASS_NAMES_ARRAY[it.type] - if (label.isInScene(detectedScene)) { + runOnUiThread { + detectResults.forEach { + val label = LocaleConstant.CLASS_NAMES_ARRAY[it.type] targetSet.add(label) - } + binding.tipsTagView.visibility = View.VISIBLE + binding.tipsTagView.text = "${targetSet.size}" - when (it.type) { - 37 -> RuntimeCache.detectResult.add(0) - 5, 14, 24 -> RuntimeCache.detectResult.add(1) - 0 -> RuntimeCache.detectResult.add(2) - 50, 51 -> RuntimeCache.detectResult.add(3) - 25 -> RuntimeCache.detectResult.add(4) - 9 -> RuntimeCache.detectResult.add(5) - 18 -> RuntimeCache.detectResult.add(6) - 33 -> RuntimeCache.detectResult.add(7) + when (it.type) { + 37 -> RuntimeCache.detectResult.add(0) + 5, 14, 24 -> RuntimeCache.detectResult.add(1) + 0 -> RuntimeCache.detectResult.add(2) + 50, 51 -> RuntimeCache.detectResult.add(3) + 25 -> RuntimeCache.detectResult.add(4) + 9 -> RuntimeCache.detectResult.add(5) + 18 -> RuntimeCache.detectResult.add(6) + 33 -> RuntimeCache.detectResult.add(7) + } } } } @@ -356,16 +357,13 @@ } 2024082902 -> { - binding.tipsTagView.visibility = View.VISIBLE - binding.tipsTagView.text = "${targetSet.size}" - - val target = msg.obj as HiddenTroubleResult - if (detectedTargetSet.contains(target.warning)) { + //弹框 + if (detectResultDialog.isShowing) { return true } - //弹框 - if (detectResultDialog.isShowing) { + val target = msg.obj as HiddenTroubleResult + if (detectedTargetSet.contains(target.warning)) { return true } diff --git a/app/src/main/res/layout/activity_big_image.xml b/app/src/main/res/layout/activity_big_image.xml index b0b948c..493e85a 100644 --- a/app/src/main/res/layout/activity_big_image.xml +++ b/app/src/main/res/layout/activity_big_image.xml @@ -1,41 +1,12 @@ - - - - - - - - - - - + android:layout_height="match_parent" /> \ No newline at end of file