diff --git a/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt b/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt index 9c5dff4..147258f 100644 --- a/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt +++ b/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt @@ -146,6 +146,7 @@ object OfflineCmdServiceHelper { add(OfflineCmdBean("重拍", "chong pai")) add(OfflineCmdBean("重新拍", "chong xin pai")) add(OfflineCmdBean("再拍一次", "zai pai yi ci")) + add(OfflineCmdBean("继续拍摄", "ji xu pai she")) } fun init(){ val service = GlassSdk.getGlassOfflineCmdService() diff --git a/app/src/main/java/com/nova/brain/glass/ui/SprayingResultActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/SprayingResultActivity.kt index 329c51c..792a0cf 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/SprayingResultActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/SprayingResultActivity.kt @@ -39,7 +39,7 @@ class SprayingResultActivity : finish() } - "开始", "拍照", "开始拍照", "开始任务" -> { + "重拍", "重新拍", "继续拍照", "再拍一次", "继续拍摄" -> { runOnUiThread { binding.hint.text = "拍照中,请稍后..." } @@ -109,6 +109,9 @@ class SprayingResultActivity : super.onDestroy() OfflineCmdServiceHelper.removeOnLineListener(listener) GlassSdk.getGlassMediaService()?.removePhotoCallback(mPhotoFileCallback) + intent.getStringExtra("path")?.apply { + binding.iv.setImageBitmap(BitmapFactory.decodeFile(this)) + } } private var isPhoto = false diff --git a/app/src/main/res/layout/activity_spraying_result.xml b/app/src/main/res/layout/activity_spraying_result.xml index db887fe..ff5e988 100644 --- a/app/src/main/res/layout/activity_spraying_result.xml +++ b/app/src/main/res/layout/activity_spraying_result.xml @@ -14,8 +14,8 @@ android:layout_height="wrap_content" android:layout_marginTop="67dp" android:background="@drawable/bg_item" - android:text="OCR识别结果:合格" android:gravity="center" + android:text="OCR识别结果:合格" android:textColor="#ff40FF5E" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" @@ -23,8 +23,8 @@ app:layout_constraintTop_toTopOf="parent" /> - - - - + + + + + + + + + + + + + + + - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + + android:textSize="14sp" + app:layout_constraintTop_toBottomOf="@+id/baseRecyclerView" />