From 0709084f5ee09b066aaa16a3d5dc67b4e8399229 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Wed, 28 Feb 2024 10:34:06 +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-bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt | 3 ++- app/src/main/res/layout/item_shop_categroy.xml | 1 + base/src/main/java/com/xty/base/act/BaseListAct.kt | 1 - health/src/main/java/com/zj365/health/fragment/BreathFrag.kt | 2 +- health/src/main/java/com/zj365/health/fragment/TemFrag.kt | 2 +- health/src/main/java/com/zj365/health/fragment/XinlvFrag.kt | 2 +- .../src/main/java/com/zj365/health/fragment/XueTangFrag.kt | 2 +- health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt | 2 +- .../src/main/java/com/zj365/health/fragment/XueyangFrag.kt | 2 +- .../com/zj365/health/fragment/bloodlipid/BloodFatFrag.kt | 5 ++++- health/src/main/res/layout/frag_xy.xml | 2 +- health/src/main/res/layout/item_blood_calib.xml | 4 ++-- 12 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt b/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt index 8f96836..c5cc644 100644 --- a/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt @@ -686,7 +686,8 @@ class DynamicManagementVm : BaseVm() { R.mipmap.bg_fat, R.mipmap.ic_fat, 10, - it.type + it.type, + calorie = bloodFatData.count ) ) } diff --git a/app/src/main/res/layout/item_shop_categroy.xml b/app/src/main/res/layout/item_shop_categroy.xml index d6aa9ed..0b353bb 100644 --- a/app/src/main/res/layout/item_shop_categroy.xml +++ b/app/src/main/res/layout/item_shop_categroy.xml @@ -16,6 +16,7 @@ android:background="@mipmap/icon_default_avator" app:is_circle="true" app:border_color="@color/white" + android:scaleType="centerCrop" app:border_width="@dimen/dp_1" /> diff --git a/base/src/main/java/com/xty/base/act/BaseListAct.kt b/base/src/main/java/com/xty/base/act/BaseListAct.kt index ae30983..3d9cf3a 100644 --- a/base/src/main/java/com/xty/base/act/BaseListAct.kt +++ b/base/src/main/java/com/xty/base/act/BaseListAct.kt @@ -39,7 +39,6 @@ abstract class BaseListAct : BaseVmAct() { } refresh.setEnableLoadMore(isLoadMore) refresh.setOnLoadMoreListener { - page++ loadData() refresh.finishLoadMore(1000) } diff --git a/health/src/main/java/com/zj365/health/fragment/BreathFrag.kt b/health/src/main/java/com/zj365/health/fragment/BreathFrag.kt index 7fa924b..0ff8c09 100644 --- a/health/src/main/java/com/zj365/health/fragment/BreathFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/BreathFrag.kt @@ -368,7 +368,7 @@ class BreathFrag : BaseVmFrag() { binding.mOrganView.tvFirstName.text = "正常" binding.mOrganView.tvFirstValue.text = setSpan(normalTime, 0) if (normalTime == 0) { - binding.mOrganView.ivFirst.visibility = View.INVISIBLE + binding.mOrganView.ivFirst.visibility = View.VISIBLE //正常数为0也显示正常标签 } else { binding.mOrganView.ivFirst.visibility = View.VISIBLE } diff --git a/health/src/main/java/com/zj365/health/fragment/TemFrag.kt b/health/src/main/java/com/zj365/health/fragment/TemFrag.kt index ffaf613..6a45ea6 100644 --- a/health/src/main/java/com/zj365/health/fragment/TemFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/TemFrag.kt @@ -343,7 +343,7 @@ class TemFrag : BaseVmFrag() { binding.tvSecondName.text = "高温" binding.tvSecondValue.text = setSpan(highTime, 1) if (normalTime == 0){ - binding.ivFirst.visibility = View.GONE + binding.ivFirst.visibility = View.VISIBLE } else { binding.ivFirst.visibility = View.VISIBLE } diff --git a/health/src/main/java/com/zj365/health/fragment/XinlvFrag.kt b/health/src/main/java/com/zj365/health/fragment/XinlvFrag.kt index e3f0fd4..57e420c 100644 --- a/health/src/main/java/com/zj365/health/fragment/XinlvFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/XinlvFrag.kt @@ -391,7 +391,7 @@ class XinlvFrag : BaseVmFrag() { binding.mOrganView.tvFirstName.text = "正常" binding.mOrganView.tvFirstValue.text = setSpan(normalTime, 0) if (normalTime == 0) { - binding.mOrganView.ivFirst.visibility = View.INVISIBLE + binding.mOrganView.ivFirst.visibility = View.VISIBLE //正常数为0也显示正常标签 } else { binding.mOrganView.ivFirst.visibility = View.VISIBLE } diff --git a/health/src/main/java/com/zj365/health/fragment/XueTangFrag.kt b/health/src/main/java/com/zj365/health/fragment/XueTangFrag.kt index a08c7b5..c6a8160 100644 --- a/health/src/main/java/com/zj365/health/fragment/XueTangFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/XueTangFrag.kt @@ -576,7 +576,7 @@ class XueTangFrag : BaseVmFrag() { binding.mOrganView.tvFirstName.text = "正常" binding.mOrganView.tvFirstValue.text = setSpan(normalTime) if (normalTime == 0) { - binding.mOrganView.ivFirst.visibility = View.INVISIBLE + binding.mOrganView.ivFirst.visibility = View.VISIBLE } else { binding.mOrganView.ivFirst.visibility = View.VISIBLE } diff --git a/health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt b/health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt index 776f94e..406fc66 100644 --- a/health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt @@ -472,7 +472,7 @@ class XueyaFrag : BaseVmFrag() { binding.mOrganView.tvFirstName.text = "正常" binding.mOrganView.tvFirstValue.text = setSpan(normalTime) if (normalTime == 0) { - binding.mOrganView.ivFirst.visibility = View.INVISIBLE + binding.mOrganView.ivFirst.visibility = View.VISIBLE } else { binding.mOrganView.ivFirst.visibility = View.VISIBLE } diff --git a/health/src/main/java/com/zj365/health/fragment/XueyangFrag.kt b/health/src/main/java/com/zj365/health/fragment/XueyangFrag.kt index 47b708e..58eab3d 100644 --- a/health/src/main/java/com/zj365/health/fragment/XueyangFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/XueyangFrag.kt @@ -372,7 +372,7 @@ class XueyangFrag : BaseVmFrag() { binding.mOrganView.tvFirstName.text = "正常" binding.mOrganView.tvFirstValue.text = setSpan(normalTime, 0) if (normalTime == 0) { - binding.mOrganView.ivFirst.visibility = View.INVISIBLE + binding.mOrganView.ivFirst.visibility = View.VISIBLE //正常数为0也显示正常标签 } else { binding.mOrganView.ivFirst.visibility = View.VISIBLE } diff --git a/health/src/main/java/com/zj365/health/fragment/bloodlipid/BloodFatFrag.kt b/health/src/main/java/com/zj365/health/fragment/bloodlipid/BloodFatFrag.kt index 2c1cd46..924c70d 100644 --- a/health/src/main/java/com/zj365/health/fragment/bloodlipid/BloodFatFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/bloodlipid/BloodFatFrag.kt @@ -386,7 +386,9 @@ class BloodFatFrag : BaseVmFrag() { binding.clCurHdl.tvBloodValue.text = "${it.data.data.hdl}" binding.clCurLdl.tvBloodValue.text = "${it.data.data.ldl}" - + binding.tvOpen.visibility = View.GONE + binding.compareTv.visibility = View.VISIBLE + binding.llRenew.visibility = View.VISIBLE if (id == MMkvHelper.getLong(Const.USER_ID).toString()) { binding.tvBloodLipidAdjust.visibility = View.VISIBLE } else { @@ -401,6 +403,7 @@ class BloodFatFrag : BaseVmFrag() { LogUtils.d("过期时间还剩：$expireDay 天；有效期截至：$expireTimeStr") if (expireDay > 30) { binding.tvRenew.visibility = View.GONE + } else if (it.data.status == 2) { binding.tvRenew.visibility = View.VISIBLE } diff --git a/health/src/main/res/layout/frag_xy.xml b/health/src/main/res/layout/frag_xy.xml index cdb41ce..333e1f6 100644 --- a/health/src/main/res/layout/frag_xy.xml +++ b/health/src/main/res/layout/frag_xy.xml @@ -103,7 +103,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:text="次/分" + tools:text="次/分" android:textColor="@color/col_6B6" android:textSize="@dimen/sp_12" android:textStyle="bold" /> diff --git a/health/src/main/res/layout/item_blood_calib.xml b/health/src/main/res/layout/item_blood_calib.xml index 22bdda4..b3965f3 100644 --- a/health/src/main/res/layout/item_blood_calib.xml +++ b/health/src/main/res/layout/item_blood_calib.xml @@ -84,7 +84,7 @@ @@ -135,7 +135,7 @@