diff --git a/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt index e7bb603..f8124f4 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt @@ -98,7 +98,7 @@ class PrepareCookActivity : BaseActivity() { return@setOnClickListener } } - val weight = binding.tvDishPartWeight.text.toString().toDouble() + val weight = binding.tvDishPartWeight.text.toString().toDoubleOrNull() ?:0.toDouble() if (weight <= 0.toDouble()) { toast("食材用量需要大于0") return@setOnClickListener diff --git a/app/src/main/java/com/shuwei/dish/match/utils/DecimalAdapter.kt b/app/src/main/java/com/shuwei/dish/match/utils/DecimalAdapter.kt index 7395bda..b939ed3 100644 --- a/app/src/main/java/com/shuwei/dish/match/utils/DecimalAdapter.kt +++ b/app/src/main/java/com/shuwei/dish/match/utils/DecimalAdapter.kt @@ -14,7 +14,7 @@ class DecimalAdapter : TypeAdapter() { override fun read(reader: JsonReader): Number { return when (reader.peek()) { JsonToken.NUMBER -> reader.nextDouble() - JsonToken.STRING -> reader.nextString().toDouble() + JsonToken.STRING -> reader.nextString().toDoubleOrNull() ?: 0.0 else -> 0.0 } }