瀏覽代碼

feat(spraying): 更新喷洒功能界面和视图模型

- 移除 BitmapFactory 导入并优化导入列表
- 将 SprayingActivity 中的按钮文本从"拍照"改为"开始任务"
- 为 SprayingOCRActivity 创建新的 SprayingOCRVM 视图模型
- 在 SprayingOCRActivity 中切换到新的 SprayingOCRVM 视图模型
- 为列表项添加文本显示功能并设置 ID
- 在 SprayingOCRActivity 中将按钮文本从"拍照"改为"重拍"
- 更新 SprayingVM 中的数据源文本为"开始任务"
徐勤民 2 天之前
父節點
當前提交
cc7a72f098

+ 1 - 2
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 = "拍照中,请稍后..."
                             }

+ 4 - 2
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<ItemItem, SprayingVM, ActivitySprayingOcrBinding>() {
+    BaseListFormLayoutNormalActivity<ItemItem, SprayingOCRVM, ActivitySprayingOcrBinding>() {
     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<ItemItem>(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 = "拍照中,请稍后..."
                             }

+ 16 - 0
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<ItemItem>() {
+    override fun loadData(
+        page: Int,
+        onResponse: Response<ItemItem>
+    ) {
+        onResponse.onResponse(arrayListOf<ItemItem>().apply {
+            add(ItemItem("重拍"))
+        })
+    }
+}

+ 1 - 1
app/src/main/java/com/nova/brain/glass/viewmodel/SprayingVM.kt

@@ -10,7 +10,7 @@ class SprayingVM: BaseListViewModel<ItemItem>() {
         onResponse: Response<ItemItem>
     ) {
         onResponse.onResponse(arrayListOf<ItemItem>().apply {
-            add(ItemItem("拍照"))
+            add(ItemItem("开始任务"))
         })
     }
 }

+ 1 - 0
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"