|
@@ -12,6 +12,7 @@ import com.nova.brain.glass.R
|
|
|
import com.nova.brain.glass.databinding.ActivitySprayingResultBinding
|
|
import com.nova.brain.glass.databinding.ActivitySprayingResultBinding
|
|
|
import com.nova.brain.glass.helper.OfflineCmdListener
|
|
import com.nova.brain.glass.helper.OfflineCmdListener
|
|
|
import com.nova.brain.glass.helper.OfflineCmdServiceHelper
|
|
import com.nova.brain.glass.helper.OfflineCmdServiceHelper
|
|
|
|
|
+import com.nova.brain.glass.helper.SprayingPhotoManager
|
|
|
import com.nova.brain.glass.model.ItemItem
|
|
import com.nova.brain.glass.model.ItemItem
|
|
|
import com.nova.brain.glass.viewmodel.SprayingResultVM
|
|
import com.nova.brain.glass.viewmodel.SprayingResultVM
|
|
|
import com.rokid.security.glass3.open.sdk.GlassSdk
|
|
import com.rokid.security.glass3.open.sdk.GlassSdk
|
|
@@ -50,6 +51,26 @@ class SprayingResultActivity :
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ private val finishLauncher =
|
|
|
|
|
+ registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
|
|
|
|
|
+ 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 {
|
|
private val listener = object : OfflineCmdListener {
|
|
|
override fun onOfflineCmd(cmd: String) {
|
|
override fun onOfflineCmd(cmd: String) {
|
|
@@ -91,7 +112,9 @@ class SprayingResultActivity :
|
|
|
fun rest() {
|
|
fun rest() {
|
|
|
manualResultLauncher.launch(Intent(this, SprayingManualResultActivity::class.java))
|
|
manualResultLauncher.launch(Intent(this, SprayingManualResultActivity::class.java))
|
|
|
}
|
|
}
|
|
|
- fun taskFinish(){}
|
|
|
|
|
|
|
+ fun taskFinish() {
|
|
|
|
|
+ finishLauncher.launch(Intent(this, SprayingFinishActivity::class.java))
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
private val photoCallbackId = UUID.randomUUID().toString()
|
|
private val photoCallbackId = UUID.randomUUID().toString()
|
|
|
|
|
|
|
@@ -117,6 +140,7 @@ class SprayingResultActivity :
|
|
|
"相机异常".showMessage()
|
|
"相机异常".showMessage()
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ SprayingPhotoManager.addPhoto(path)
|
|
|
startActivity(
|
|
startActivity(
|
|
|
Intent(
|
|
Intent(
|
|
|
this@SprayingResultActivity, SprayingOCRActivity::class.java
|
|
this@SprayingResultActivity, SprayingOCRActivity::class.java
|