diff --git a/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt b/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt index ac24391..753a633 100644 --- a/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt +++ b/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt @@ -16,7 +16,7 @@ import com.sw.inbound.utils.ext.hideKeyboard abstract class BaseDialog( context: Context, var defWidth: Int = 1500.dp, - var defHeight: Int = 900.dp + var defHeight: Int = 800.dp ) : Dialog(context, R.style.DialogTheme) { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt b/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt index a279467..ace9c1a 100644 --- a/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt +++ b/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt @@ -17,6 +17,7 @@ import androidx.core.graphics.toColorInt import androidx.core.view.updateLayoutParams import androidx.core.widget.addTextChangedListener import coil.load +import coil.transform.RoundedCornersTransformation import com.shuwei.intelligent.shelves.utils.ext.appendText import com.shuwei.intelligent.shelves.utils.ext.buildSpannableString import com.sw.inbound.R @@ -415,7 +416,9 @@ class GoodsStoreDialog( } //只显示原始图片 imagePreviewBinding = LayoutImagePreviewBinding.inflate(inflater, binding.flContainer) - imagePreviewBinding?.imageView?.load(goods.relativeUrl) + imagePreviewBinding?.imageView?.load(goods.relativeUrl) { + transformations(RoundedCornersTransformation(radius = 10.dp.toFloat())) + } binding.flContainer.let { it.setBackgroundResource(R.drawable.bg_white_radius10_stroke2) it.updateLayoutParams { diff --git a/app/src/main/java/com/sw/inbound/viewmodel/BaseViewModel.kt b/app/src/main/java/com/sw/inbound/viewmodel/BaseViewModel.kt index f20634b..3451750 100644 --- a/app/src/main/java/com/sw/inbound/viewmodel/BaseViewModel.kt +++ b/app/src/main/java/com/sw/inbound/viewmodel/BaseViewModel.kt @@ -208,8 +208,11 @@ abstract class BaseViewModel( val paramList = if (nameList.isNullOrEmpty()) scoreList!!.map { it.name } else nameList val response = repository.recognizeGoodsList(paramList) val list = if (parseResponse(response)) response.data?:listOf() else listOf() - scoreList?.forEachIndexed { index, item -> - list[index].score = ((1 - item.score) * 10000).roundToInt() + if (scoreList.isNullOrEmpty().not()) { + list.forEach { record -> + val item = scoreList.firstOrNull { it.name == record.goodsName } + record.score = ((1 - (item?.score?:0.0)) * 10000).roundToInt() + } } callback(list) }