中建365-二期开发-bug修复

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
                         )
                     )
                 }

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"
       />
 

base/src/main/java/com/xty/base/act/BaseListAct.kt

@@ -39,7 +39,6 @@ abstract class BaseListAct<V : BaseVm> : BaseVmAct<V>() {
         }
         refresh.setEnableLoadMore(isLoadMore)
         refresh.setOnLoadMoreListener {
-            page++
             loadData()
             refresh.finishLoadMore(1000)
         }

health/src/main/java/com/zj365/health/fragment/BreathFrag.kt

@@ -368,7 +368,7 @@ class BreathFrag : BaseVmFrag<BreathVm>() {
         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
         }

health/src/main/java/com/zj365/health/fragment/TemFrag.kt

@@ -343,7 +343,7 @@ class TemFrag : BaseVmFrag<TempVm>() {
         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
         }

health/src/main/java/com/zj365/health/fragment/XinlvFrag.kt

@@ -391,7 +391,7 @@ class XinlvFrag : BaseVmFrag<XlVm>() {
         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
         }

health/src/main/java/com/zj365/health/fragment/XueTangFrag.kt

@@ -576,7 +576,7 @@ class XueTangFrag : BaseVmFrag<XTangVm>() {
         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
         }

health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt

@@ -472,7 +472,7 @@ class XueyaFrag : BaseVmFrag<XyaVm>() {
         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
         }

health/src/main/java/com/zj365/health/fragment/XueyangFrag.kt

@@ -372,7 +372,7 @@ class XueyangFrag : BaseVmFrag<XyVm>() {
         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
         }

health/src/main/java/com/zj365/health/fragment/bloodlipid/BloodFatFrag.kt

@@ -386,7 +386,9 @@ class BloodFatFrag : BaseVmFrag<BloodFatVm>() {
                     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<BloodFatVm>() {
                     LogUtils.d("过期时间还剩：$expireDay 天；有效期截至：$expireTimeStr")
                     if (expireDay > 30) {
                         binding.tvRenew.visibility = View.GONE
+
                     } else if (it.data.status == 2) {
                         binding.tvRenew.visibility = View.VISIBLE
                     }

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" />

health/src/main/res/layout/item_blood_calib.xml

@@ -84,7 +84,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="高压值"
+                    android:text="收缩压(高压)"
                     android:textColor="@color/col_313"
                     android:textSize="@dimen/sp_15"
                     tools:ignore="HardcodedText" />
@@ -135,7 +135,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="低压值"
+                    android:text="舒张压(低压)"
                     android:textColor="@color/col_313"
                     android:textSize="@dimen/sp_15"
                     tools:ignore="HardcodedText" />