diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c9c9c0..f329398 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -84,6 +84,9 @@
+
+ android:value="640" />
diff --git a/app/src/main/java/com/nova/brain/glass/ui/SprayingOCRActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/SprayingOCRActivity.kt
index fd65ae8..6c8d51c 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/SprayingOCRActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/SprayingOCRActivity.kt
@@ -1,12 +1,12 @@
package com.nova.brain.glass.ui
-import android.R.attr.path
+import android.content.Intent
import android.graphics.BitmapFactory
+import android.os.CountDownTimer
import android.os.Environment
import android.view.WindowManager
import androidx.recyclerview.widget.RecyclerView
import com.nova.brain.glass.R
-import com.nova.brain.glass.databinding.ActivitySprayingBinding
import com.nova.brain.glass.databinding.ActivitySprayingOcrBinding
import com.nova.brain.glass.helper.OfflineCmdListener
import com.nova.brain.glass.helper.OfflineCmdServiceHelper
@@ -18,7 +18,6 @@ import com.rokid.security.system.server.media.callback.PhotoFileCallback
import com.xuqm.base.adapter.BasePagedAdapter
import com.xuqm.base.adapter.CommonPagedAdapter
import com.xuqm.base.adapter.ViewHolder
-import com.xuqm.base.common.FileHelper
import com.xuqm.base.common.LogHelper
import com.xuqm.base.extensions.showMessage
import com.xuqm.base.ui.BaseListFormLayoutNormalActivity
@@ -59,6 +58,7 @@ class SprayingOCRActivity :
GlassSdk.getGlassMediaService()?.takePhoto(PhotoResolution.RESOLUTION_480P, file.absolutePath)
}
private val photoCallbackId = UUID.randomUUID().toString()
+ private var resultCountdown: CountDownTimer? = null
private val mPhotoFileCallback = object : PhotoFileCallback.Stub() {
override fun onTakePhoto(path: String) {
@@ -84,7 +84,7 @@ class SprayingOCRActivity :
} else {
runOnUiThread {
binding.hint.text = "单击或语音输入“重拍”,可重新拍摄"
- binding.content.setImageBitmap(BitmapFactory.decodeFile(path))
+ showPhoto(path)
}
}
}
@@ -97,12 +97,13 @@ class SprayingOCRActivity :
OfflineCmdServiceHelper.addOnLineListener(listener)
GlassSdk.getGlassMediaService()?.addPhotoCallback(mPhotoFileCallback)
intent.getStringExtra("path")?.apply {
- binding.content.setImageBitmap(BitmapFactory.decodeFile(this))
+ showPhoto(this)
}
}
override fun onDestroy() {
super.onDestroy()
+ resultCountdown?.cancel()
OfflineCmdServiceHelper.removeOnLineListener(listener)
GlassSdk.getGlassMediaService()?.removePhotoCallback(mPhotoFileCallback)
}
@@ -126,4 +127,23 @@ class SprayingOCRActivity :
}
override fun adapter(): BasePagedAdapter = adapter
+
+ private fun showPhoto(path: String) {
+ binding.content.setImageBitmap(BitmapFactory.decodeFile(path))
+ restartResultCountdown(path)
+ }
+
+ private fun restartResultCountdown(path: String) {
+ resultCountdown?.cancel()
+ resultCountdown = object : CountDownTimer(10_000, 1_000) {
+ override fun onTick(millisUntilFinished: Long) {
+ }
+
+ override fun onFinish() {
+ startActivity(Intent(this@SprayingOCRActivity, SprayingResultActivity::class.java).apply {
+ putExtra("path", path)
+ })
+ }
+ }.start()
+ }
}
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 792a0cf..b52f86c 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
@@ -89,10 +89,6 @@ class SprayingResultActivity :
putExtra("path", path)
})
finish()
-// runOnUiThread {
-// binding.hint.text = "单击或语音输入“开始”,进入下一步"
-// binding.iv.setImageBitmap(BitmapFactory.decodeFile(path))
-// }
}
}
}
@@ -103,15 +99,15 @@ class SprayingResultActivity :
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
OfflineCmdServiceHelper.addOnLineListener(listener)
GlassSdk.getGlassMediaService()?.addPhotoCallback(mPhotoFileCallback)
+ intent.getStringExtra("path")?.apply {
+ binding.iv.setImageBitmap(BitmapFactory.decodeFile(this))
+ }
}
override fun onDestroy() {
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_ocr.xml b/app/src/main/res/layout/activity_spraying_ocr.xml
index 0070e4b..b7de2eb 100644
--- a/app/src/main/res/layout/activity_spraying_ocr.xml
+++ b/app/src/main/res/layout/activity_spraying_ocr.xml
@@ -25,7 +25,7 @@