This commit is contained in:
马增飞
2025-11-26 11:14:17 +08:00
parent d531e3c455
commit 1e46a5ace7
4 changed files with 49 additions and 3 deletions
@@ -317,9 +317,11 @@ class FoodCollectionActivity : ComponentActivity() {
// //toast("保存失败") // //toast("保存失败")
// return // return
// } // }
val goods = searchGoodsList[clickIndex]
val saveName = goods.goodsName + goods.goodsCode
box?.put( box?.put(
Food( Food(
name = searchGoodsList[clickIndex].goodsName, name = saveName,
foodIdx = 0, foodIdx = 0,
foodVector = imageVector foodVector = imageVector
) )
@@ -428,6 +430,23 @@ class FoodCollectionActivity : ComponentActivity() {
} }
} }
private val receiptViewModel: ReceiptViewModel by viewModels()
fun searchGoodsInfoList(goodsName: String, block:(List<SearchGoodsInfo.Record>)->Unit) {
runBlocking {
val list = searchGoodsInfoList2(goodsName)
block(list)
}
}
suspend fun searchGoodsInfoList2(
goodsName: String,
pageNo: Int = 1,
pageSize: Int = 10
): List<SearchGoodsInfo.Record> {
return receiptViewModel.searchGoodsInfoList2(goodsName, pageNo, pageSize)
}
data class RespData( data class RespData(
var code:String?=null, var code:String?=null,
var data:String?=null, var data:String?=null,
@@ -174,6 +174,10 @@ abstract class GoodsListActivity : ComponentActivity() {
//} //}
if (weight < 200) { if (weight < 200) {
if (abs(weight) < 10) { if (abs(weight) < 10) {
// val clazzName = DialogManager.getDialogList()
// .map { it.javaClass.simpleName }
// .joinToString(",")
// Timber.tag(TAG).d(clazzName)
if (DialogManager.getDialogList().size == 1 && if (DialogManager.getDialogList().size == 1 &&
DialogManager.contains("GoodsRecognizeDialog") && DialogManager.contains("GoodsRecognizeDialog") &&
goodsRecognizeDialog?.isShowing == true) { goodsRecognizeDialog?.isShowing == true) {
@@ -609,7 +613,7 @@ abstract class GoodsListActivity : ComponentActivity() {
if (isAgainRecognize) { if (isAgainRecognize) {
runOnUiThread { runOnUiThread {
Loading.dismiss() Loading.dismiss()
toast("识别识别,请稍候重试") //toast("识别失败,请稍候重试")
recognizeCallback?.invoke(mutableListOf()) recognizeCallback?.invoke(mutableListOf())
} }
isAgainRecognize = false isAgainRecognize = false
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import androidx.activity.viewModels
import androidx.core.widget.addTextChangedListener import androidx.core.widget.addTextChangedListener
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
@@ -18,6 +19,7 @@ import com.sw.inbound.objbox.ObjectBox
import com.sw.inbound.utils.ext.addOnActionSearchListener import com.sw.inbound.utils.ext.addOnActionSearchListener
import com.sw.inbound.utils.ext.hideKeyboard import com.sw.inbound.utils.ext.hideKeyboard
import com.sw.inbound.utils.ext.toast import com.sw.inbound.utils.ext.toast
import com.sw.inbound.viewmodel.ReceiptViewModel
import io.objectbox.Box import io.objectbox.Box
import io.objectbox.kotlin.boxFor import io.objectbox.kotlin.boxFor
@@ -98,6 +100,7 @@ class CollectSearchDialog(
// } // }
// }.start() // }.start()
//} //}
} }
private var pageNo = 1 private var pageNo = 1
@@ -206,4 +209,24 @@ class CollectSearchDialog(
binding.root.hideKeyboard() binding.root.hideKeyboard()
} }
fun test() {
val goodsName = "多宝鱼,黑鱼(整条鱼),鸡腿肉"
activity?.searchGoodsInfoList(goodsName = goodsName) { items->
items.forEach { goods ->
box?.all?.filter {
it.name?.contains(goods.goodsName?:"-") == true
}?.forEach {
activity?.runOnUiThread {
activity?.toast(goods.goodsName)
}
it.name = goods.goodsName + goods.goodsCode
box?.put(it)
}
}
// activity?.runOnUiThread {
// activity?.toast("已保存")
// }
}
}
} }
@@ -456,7 +456,7 @@ class GoodsStoreDialog(
val imageVector = FoodModule.bitmap2FloatArray(bitmap) val imageVector = FoodModule.bitmap2FloatArray(bitmap)
box?.put( box?.put(
Food( Food(
name = goods.goodsName, foodIdx = 0, foodVector = imageVector name = goods.goodsName + goods.goodsCode, foodIdx = 0, foodVector = imageVector
) )
) )
} catch (e: Exception) { } catch (e: Exception) {