From ad130c609fedd28f093698fcdfaf19f395efe676 Mon Sep 17 00:00:00 2001
From: wlh <646507849@qq.com>
Date: Tue, 30 Jan 2024 11:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BA=8C=E6=9C=9F?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91-=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../health/act/healthcode/HealthBodyInquiryAct.kt   | 13 +++++++++----
 .../health/act/healthrecord/HealthRecordMainAct.kt  |  3 ++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/health/src/main/java/com/zj365/health/act/healthcode/HealthBodyInquiryAct.kt b/health/src/main/java/com/zj365/health/act/healthcode/HealthBodyInquiryAct.kt
index 6a13bf6..8ff0731 100644
--- a/health/src/main/java/com/zj365/health/act/healthcode/HealthBodyInquiryAct.kt
+++ b/health/src/main/java/com/zj365/health/act/healthcode/HealthBodyInquiryAct.kt
@@ -9,6 +9,7 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory
 import com.xty.base.act.BaseVmAct
 import com.xty.base.vm.BaseVm
 import com.xty.common.arouter.ARouterUrl
+import com.xty.common.util.ImageGetterUtils
 import com.zj365.health.databinding.ActHealthBodyInquiryBinding
 import com.zj365.health.vm.HealthBodyInquiryVm
 import me.chunyu.call_kit.CallKit
@@ -27,7 +28,8 @@ class HealthBodyInquiryAct : BaseVmAct<HealthBodyInquiryVm>() {
                 binding.llDepartment.visibility = View.GONE
             }else{
                 binding.llDepartment.visibility = View.VISIBLE
-                binding.tvDepartment.text = Html.fromHtml(it.data.department)
+                binding.tvDepartment.text = Html.fromHtml(it.data.department,
+                    ImageGetterUtils.MyImageGetter(this,binding.tvDepartment),null)
 
             }
 
@@ -35,7 +37,8 @@ class HealthBodyInquiryAct : BaseVmAct<HealthBodyInquiryVm>() {
                 binding.llSurvey.visibility = View.GONE
             }else{
                 binding.llSurvey.visibility = View.VISIBLE
-                binding.tvSurvey.text = Html.fromHtml(it.data.condition)
+                binding.tvSurvey.text =Html.fromHtml(it.data.condition,
+                    ImageGetterUtils.MyImageGetter(this,binding.tvSurvey),null)
 
             }
 
@@ -43,7 +46,8 @@ class HealthBodyInquiryAct : BaseVmAct<HealthBodyInquiryVm>() {
                 binding.llDefinition.visibility = View.GONE
             }else{
                 binding.llDefinition.visibility = View.VISIBLE
-                binding.tvDefinition.text = Html.fromHtml(it.data.symptom)
+                binding.tvDefinition.text =Html.fromHtml(it.data.symptom,
+                    ImageGetterUtils.MyImageGetter(this,binding.tvDefinition),null)
 
             }
 
@@ -51,7 +55,8 @@ class HealthBodyInquiryAct : BaseVmAct<HealthBodyInquiryVm>() {
                 binding.llPathogeny.visibility = View.GONE
             }else{
                 binding.llPathogeny.visibility = View.VISIBLE
-                binding.tvPathogeny.text = Html.fromHtml(it.data.etiology)
+                binding.tvPathogeny.text =Html.fromHtml(it.data.etiology,
+                    ImageGetterUtils.MyImageGetter(this,binding.tvPathogeny),null)
 
             }
 
diff --git a/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt b/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt
index df468ff..7bc1316 100644
--- a/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt
+++ b/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt
@@ -20,6 +20,7 @@ import com.xty.common.arouter.RouteManager
 import com.xty.common.onEventObject
 import com.xty.common.setImageUser
 import com.xty.common.util.CommonUtils
+import com.xty.common.util.NumUtils
 import com.xty.common.weight.HealthBodyView
 import com.xty.network.model.HealthArchiveBean
 import com.zj365.health.BuildConfig
@@ -70,7 +71,7 @@ class HealthRecordMainAct : BaseVmAct<HealthRecordMainVm>() {
                 binding.tvBmiDesc.setTextColor(Color.parseColor("#02C191"))
             }
             binding.tvBmr.text = "${it.data.bmr}"
-            binding.tvBodyFat.text = if(it.data.bodyFat.isNullOrEmpty()) { "--"} else it.data.bodyFat
+            binding.tvBodyFat.text = if(it.data.bodyFat == 0.00) { "--"} else NumUtils.formatter(it.data.bodyFat,"###.00")
             binding.mProgress.progress = it.data.userSchedule * 10
             binding.clBody.tvScore.text = "${it.data.surveys.score}"
             mSurveysList = it.data.surveys.list