diff --git a/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt index 252f032..632b755 100644 --- a/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt +++ b/app/src/main/java/com/nova/brain/glass/ui/SprayingActivity.kt @@ -1,7 +1,6 @@ package com.nova.brain.glass.ui import android.content.Intent -import android.graphics.BitmapFactory import android.os.Environment import androidx.recyclerview.widget.RecyclerView import com.nova.brain.glass.R @@ -115,7 +114,7 @@ class SprayingActivity : holder .setClickListener(R.id.photo) { when (item.text) { - "拍照" -> { + "开始任务" -> { runOnUiThread { binding.hint.text = "拍照中,请稍后..." } 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 6c8d51c..3e3e039 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 @@ -11,6 +11,7 @@ import com.nova.brain.glass.databinding.ActivitySprayingOcrBinding import com.nova.brain.glass.helper.OfflineCmdListener import com.nova.brain.glass.helper.OfflineCmdServiceHelper import com.nova.brain.glass.model.ItemItem +import com.nova.brain.glass.viewmodel.SprayingOCRVM import com.nova.brain.glass.viewmodel.SprayingVM import com.rokid.security.glass3.open.sdk.GlassSdk import com.rokid.security.glass3.sdk.base.data.media.PhotoResolution @@ -25,7 +26,7 @@ import java.io.File import java.util.UUID class SprayingOCRActivity : - BaseListFormLayoutNormalActivity() { + BaseListFormLayoutNormalActivity() { override fun getLayoutId(): Int = R.layout.activity_spraying_ocr override fun fullscreen(): Boolean = true @@ -112,9 +113,10 @@ class SprayingOCRActivity : private val adapter = object : CommonPagedAdapter(R.layout.item_photo) { override fun convert(holder: ViewHolder, item: ItemItem, position: Int) { holder + .setText(R.id.text, item.text) .setClickListener(R.id.photo) { when (item.text) { - "拍照" -> { + "重拍" -> { runOnUiThread { binding.hint.text = "拍照中,请稍后..." } diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/SprayingOCRVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/SprayingOCRVM.kt new file mode 100644 index 0000000..f5b9cb9 --- /dev/null +++ b/app/src/main/java/com/nova/brain/glass/viewmodel/SprayingOCRVM.kt @@ -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() { + override fun loadData( + page: Int, + onResponse: Response + ) { + onResponse.onResponse(arrayListOf().apply { + add(ItemItem("重拍")) + }) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/SprayingVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/SprayingVM.kt index 52b3d96..6f61a34 100644 --- a/app/src/main/java/com/nova/brain/glass/viewmodel/SprayingVM.kt +++ b/app/src/main/java/com/nova/brain/glass/viewmodel/SprayingVM.kt @@ -10,7 +10,7 @@ class SprayingVM: BaseListViewModel() { onResponse: Response ) { onResponse.onResponse(arrayListOf().apply { - add(ItemItem("拍照")) + add(ItemItem("开始任务")) }) } } \ No newline at end of file diff --git a/app/src/main/res/layout/item_photo.xml b/app/src/main/res/layout/item_photo.xml index 4f9a8be..b48df70 100644 --- a/app/src/main/res/layout/item_photo.xml +++ b/app/src/main/res/layout/item_photo.xml @@ -21,6 +21,7 @@ android:layout_width="wrap_content" android:gravity="center" android:textColor="#4AFE59" + android:id="@+id/text" android:textSize="14sp" android:layout_marginTop="6dp" android:layout_height="wrap_content"