feat(spraying): 更新喷洒功能界面和视图模型
- 移除 BitmapFactory 导入并优化导入列表 - 将 SprayingActivity 中的按钮文本从"拍照"改为"开始任务" - 为 SprayingOCRActivity 创建新的 SprayingOCRVM 视图模型 - 在 SprayingOCRActivity 中切换到新的 SprayingOCRVM 视图模型 - 为列表项添加文本显示功能并设置 ID - 在 SprayingOCRActivity 中将按钮文本从"拍照"改为"重拍" - 更新 SprayingVM 中的数据源文本为"开始任务"
这个提交包含在:
父节点
53b5be8ec4
当前提交
cc7a72f098
@ -1,7 +1,6 @@
|
|||||||
package com.nova.brain.glass.ui
|
package com.nova.brain.glass.ui
|
||||||
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.graphics.BitmapFactory
|
|
||||||
import android.os.Environment
|
import android.os.Environment
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.nova.brain.glass.R
|
import com.nova.brain.glass.R
|
||||||
@ -115,7 +114,7 @@ class SprayingActivity :
|
|||||||
holder
|
holder
|
||||||
.setClickListener(R.id.photo) {
|
.setClickListener(R.id.photo) {
|
||||||
when (item.text) {
|
when (item.text) {
|
||||||
"拍照" -> {
|
"开始任务" -> {
|
||||||
runOnUiThread {
|
runOnUiThread {
|
||||||
binding.hint.text = "拍照中,请稍后..."
|
binding.hint.text = "拍照中,请稍后..."
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,6 +11,7 @@ import com.nova.brain.glass.databinding.ActivitySprayingOcrBinding
|
|||||||
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.model.ItemItem
|
import com.nova.brain.glass.model.ItemItem
|
||||||
|
import com.nova.brain.glass.viewmodel.SprayingOCRVM
|
||||||
import com.nova.brain.glass.viewmodel.SprayingVM
|
import com.nova.brain.glass.viewmodel.SprayingVM
|
||||||
import com.rokid.security.glass3.open.sdk.GlassSdk
|
import com.rokid.security.glass3.open.sdk.GlassSdk
|
||||||
import com.rokid.security.glass3.sdk.base.data.media.PhotoResolution
|
import com.rokid.security.glass3.sdk.base.data.media.PhotoResolution
|
||||||
@ -25,7 +26,7 @@ import java.io.File
|
|||||||
import java.util.UUID
|
import java.util.UUID
|
||||||
|
|
||||||
class SprayingOCRActivity :
|
class SprayingOCRActivity :
|
||||||
BaseListFormLayoutNormalActivity<ItemItem, SprayingVM, ActivitySprayingOcrBinding>() {
|
BaseListFormLayoutNormalActivity<ItemItem, SprayingOCRVM, ActivitySprayingOcrBinding>() {
|
||||||
override fun getLayoutId(): Int = R.layout.activity_spraying_ocr
|
override fun getLayoutId(): Int = R.layout.activity_spraying_ocr
|
||||||
override fun fullscreen(): Boolean = true
|
override fun fullscreen(): Boolean = true
|
||||||
|
|
||||||
@ -112,9 +113,10 @@ class SprayingOCRActivity :
|
|||||||
private val adapter = object : CommonPagedAdapter<ItemItem>(R.layout.item_photo) {
|
private val adapter = object : CommonPagedAdapter<ItemItem>(R.layout.item_photo) {
|
||||||
override fun convert(holder: ViewHolder, item: ItemItem, position: Int) {
|
override fun convert(holder: ViewHolder, item: ItemItem, position: Int) {
|
||||||
holder
|
holder
|
||||||
|
.setText(R.id.text, item.text)
|
||||||
.setClickListener(R.id.photo) {
|
.setClickListener(R.id.photo) {
|
||||||
when (item.text) {
|
when (item.text) {
|
||||||
"拍照" -> {
|
"重拍" -> {
|
||||||
runOnUiThread {
|
runOnUiThread {
|
||||||
binding.hint.text = "拍照中,请稍后..."
|
binding.hint.text = "拍照中,请稍后..."
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,16 @@
|
|||||||
|
package com.nova.brain.glass.viewmodel
|
||||||
|
|
||||||
|
import com.nova.brain.glass.model.ItemItem
|
||||||
|
import com.xuqm.base.viewmodel.BaseListViewModel
|
||||||
|
import com.xuqm.base.viewmodel.callback.Response
|
||||||
|
|
||||||
|
class SprayingOCRVM: BaseListViewModel<ItemItem>() {
|
||||||
|
override fun loadData(
|
||||||
|
page: Int,
|
||||||
|
onResponse: Response<ItemItem>
|
||||||
|
) {
|
||||||
|
onResponse.onResponse(arrayListOf<ItemItem>().apply {
|
||||||
|
add(ItemItem("重拍"))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -10,7 +10,7 @@ class SprayingVM: BaseListViewModel<ItemItem>() {
|
|||||||
onResponse: Response<ItemItem>
|
onResponse: Response<ItemItem>
|
||||||
) {
|
) {
|
||||||
onResponse.onResponse(arrayListOf<ItemItem>().apply {
|
onResponse.onResponse(arrayListOf<ItemItem>().apply {
|
||||||
add(ItemItem("拍照"))
|
add(ItemItem("开始任务"))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -21,6 +21,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:textColor="#4AFE59"
|
android:textColor="#4AFE59"
|
||||||
|
android:id="@+id/text"
|
||||||
android:textSize="14sp"
|
android:textSize="14sp"
|
||||||
android:layout_marginTop="6dp"
|
android:layout_marginTop="6dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|||||||
正在加载...
在新工单中引用
屏蔽一个用户