diff --git a/health/src/main/AndroidManifest.xml b/health/src/main/AndroidManifest.xml index 43c5bf3..16aed24 100644 --- a/health/src/main/AndroidManifest.xml +++ b/health/src/main/AndroidManifest.xml @@ -269,6 +269,9 @@ + \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt b/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt index 530a7df..76217bc 100644 --- a/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt +++ b/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt @@ -669,7 +669,7 @@ class HealthSkyHourReportAct : BaseVmAct() { val mecid = sbMedical.toString() binding.mTvDis.text = mecid.substring(0, mecid.length - 1) } - addClickableText(binding.mTvDis) + // addClickableText(binding.mTvDis) val notifyMsg = it.data.notifyMsg if (notifyMsg.isNullOrEmpty()) { diff --git a/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt b/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt index 59fe8e4..c5b3fa7 100644 --- a/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt +++ b/health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt @@ -1084,7 +1084,7 @@ class HealthWeekMonthHourReportAct : BaseVmAct() { val mecid = sbMedical.toString() binding.mTvDis.text = mecid.substring(0, mecid.length - 1) } - addClickableText(binding.mTvDis) + // addClickableText(binding.mTvDis) binding.mImage.setImageUser(this, it.data.user.avatarUrl, it.data.user.sex) binding.mName.text = it.data.user.name diff --git a/health/src/main/java/com/zj365/health/act/MedicalHistoryAct.kt b/health/src/main/java/com/zj365/health/act/MedicalHistoryAct.kt index 58c6942..86daebe 100644 --- a/health/src/main/java/com/zj365/health/act/MedicalHistoryAct.kt +++ b/health/src/main/java/com/zj365/health/act/MedicalHistoryAct.kt @@ -1,6 +1,7 @@ package com.zj365.health.act import android.annotation.SuppressLint +import android.graphics.Color import android.view.LayoutInflater import android.view.View import android.widget.* @@ -70,6 +71,7 @@ class MedicalHistoryAct : BaseVmAct() { binding.title.mIvBack.setOnClickListener { finish() } binding.title.mTvRight.apply { text = getString(R.string.confirm) + setTextColor(Color.parseColor("#3B4343")) visibility = if (isShowFoot) View.VISIBLE else View.GONE setOnClickListener { getSelectList() diff --git a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt index 12a8556..ec60d67 100644 --- a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyAdapter.kt @@ -12,9 +12,8 @@ import com.zj365.health.R import de.hdodenhof.circleimageview.CircleImageView class HealthFamilyAdapter: BaseAdapter(R.layout.item_health_family) { - val mAdapterTaget by lazy { HealthFamilyTargetAdapter() } - val mAvatarAdapter by lazy { HealthFamilyUserAvatorAdapter() } + override fun convert(holder: BaseViewHolder, item: FamilyHealthBean) { @@ -27,7 +26,7 @@ class HealthFamilyAdapter: BaseAdapter(R.layout.item_health_fa var tvAddOrCancel = holder.getView(R.id.tv_add_cancel) var avatarRecycler = holder.getView(R.id.user_avatar_recycler) - + var mAvatarAdapter = HealthFamilyUserAvatorAdapter() avatarRecycler.layoutManager = LinearLayoutManager(context,LinearLayoutManager.HORIZONTAL,false) avatarRecycler.adapter = mAvatarAdapter @@ -78,6 +77,7 @@ class HealthFamilyAdapter: BaseAdapter(R.layout.item_health_fa drawableLeft.setBounds(0,0,drawableLeft.minimumWidth,drawableLeft.minimumHeight) tvPower.setCompoundDrawables(drawableLeft,null,null,null) tvPower.compoundDrawablePadding = 5 + var mAdapterTaget = HealthFamilyTargetAdapter() recycler.layoutManager = LinearLayoutManager(context,LinearLayoutManager.HORIZONTAL,false) diff --git a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt index 3a618f6..60e0eb7 100644 --- a/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/FamilyHealth/HealthFamilyTargetAdapter.kt @@ -8,6 +8,7 @@ import androidx.core.content.ContextCompat import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.tencent.qcloud.tuikit.timcommon.component.impl.GlideEngine import com.xty.base.adapter.BaseAdapter +import com.xty.common.LogUtils import com.xty.common.util.SpannableUtils import com.xty.network.model.FamilyHealthBean import com.zj365.health.R @@ -37,7 +38,7 @@ class HealthFamilyTargetAdapter : BaseAdapter contentValue = if (item.value == "0") "--" else item.value } - + LogUtils.e("HealthFamilyTargetAdapter","contentValue:${contentValue}") if(item.status == 1){ tvValue.setTextColor(Color.parseColor("#7C7C7C")) tvValue.text = SpannableUtils.setStrSpan( @@ -63,7 +64,7 @@ class HealthFamilyTargetAdapter : BaseAdapter "${contentValue}${context.getString(units[item.type-1])}".length - context.getString(units[item.type-1]).length) } - + LogUtils.e("HealthFamilyTargetAdapter","textValue:${tvValue.text.toString()}") when(item.type){ 1 ->{ diff --git a/health/src/main/java/com/zj365/health/fragment/CommunityStepRankFrag.kt b/health/src/main/java/com/zj365/health/fragment/CommunityStepRankFrag.kt index a94ebe2..dd9fdb6 100644 --- a/health/src/main/java/com/zj365/health/fragment/CommunityStepRankFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/CommunityStepRankFrag.kt @@ -62,7 +62,7 @@ class CommunityStepRankFrag : BaseVmFrag() { rank, 20, ContextCompat.getColor( - requireContext(), R.color.col_009 + requireContext(), R.color.col_02c ), Typeface.BOLD, 0, diff --git a/health/src/main/java/com/zj365/health/weight/DialogTipNew.kt b/health/src/main/java/com/zj365/health/weight/DialogTipNew.kt index dc94f00..a46ea77 100644 --- a/health/src/main/java/com/zj365/health/weight/DialogTipNew.kt +++ b/health/src/main/java/com/zj365/health/weight/DialogTipNew.kt @@ -25,6 +25,7 @@ class DialogTipNew( setDialogPadding(SizeUtil.dp2px(context, 40f), 0, SizeUtil.dp2px(context, 40f), 0) // binding.mTitle.text = content binding.tvTitle.text = title + // binding.mTitle.text = content if (isSingleBtn) { binding.clTwoBtnLayout.visibility = View.GONE diff --git a/health/src/main/res/layout/frag_breath.xml b/health/src/main/res/layout/frag_breath.xml index ee9880f..23894bb 100644 --- a/health/src/main/res/layout/frag_breath.xml +++ b/health/src/main/res/layout/frag_breath.xml @@ -418,7 +418,7 @@ android:drawableLeft="@drawable/shape_hint_bg" android:drawablePadding="@dimen/dp_4" android:gravity="center|right" - android:text="正常心率：50-100次/分" + android:text="正常呼吸率：12-24次/分" android:textColor="@color/col_c7c" android:textSize="@dimen/sp_12" android:textStyle="bold" />