diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3658d39..fda696a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,6 +90,9 @@
+
+ if (result.resultCode != Activity.RESULT_OK) {
+ return@registerForActivityResult
+ }
+ when (result.data?.getStringExtra(SprayingFinishActivity.EXTRA_FINISH_ACTION)) {
+ SprayingFinishActivity.ACTION_SUPPLEMENT -> {
+ runOnUiThread {
+ binding.hint.text = "拍照中,请稍后..."
+ }
+ isPhoto = true
+ takePhoto()
+ }
+
+ SprayingFinishActivity.ACTION_SUBMIT -> {
+ SprayingPhotoManager.clear()
+ finish()
+ }
+ }
+ }
private val listener = object : OfflineCmdListener {
override fun onOfflineCmd(cmd: String) {
@@ -91,7 +112,9 @@ class SprayingResultActivity :
fun rest() {
manualResultLauncher.launch(Intent(this, SprayingManualResultActivity::class.java))
}
- fun taskFinish(){}
+ fun taskFinish() {
+ finishLauncher.launch(Intent(this, SprayingFinishActivity::class.java))
+ }
private val photoCallbackId = UUID.randomUUID().toString()
@@ -117,6 +140,7 @@ class SprayingResultActivity :
"相机异常".showMessage()
}
} else {
+ SprayingPhotoManager.addPhoto(path)
startActivity(
Intent(
this@SprayingResultActivity, SprayingOCRActivity::class.java