中建365-优化/bug修复

health/src/main/AndroidManifest.xml

@@ -269,6 +269,9 @@
         <activity android:name=".act.NSuanHowOpenAct"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <activity android:name=".act.familyhealth.FamilyHealthRealTimeAct"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>

health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt

@@ -669,7 +669,7 @@ class HealthSkyHourReportAct : BaseVmAct<ReportVm>() {
                 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()) {

health/src/main/java/com/zj365/health/act/HealthWeekMonthHourReportAct.kt

@@ -1084,7 +1084,7 @@ class HealthWeekMonthHourReportAct : BaseVmAct<ReportVm>() {
                 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

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<MedicalHistoryVm>() {
         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()

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<FamilyHealthBean>(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<FamilyHealthBean>(R.layout.item_health_fa
         var tvAddOrCancel = holder.getView<TextView>(R.id.tv_add_cancel)
 
         var avatarRecycler = holder.getView<RecyclerView>(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<FamilyHealthBean>(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)

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<FamilyHealthBean.FamilyTargetBean>
             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<FamilyHealthBean.FamilyTargetBean>
                 "${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 ->{

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

@@ -62,7 +62,7 @@ class CommunityStepRankFrag : BaseVmFrag<RankListVm>() {
                     rank,
                     20,
                     ContextCompat.getColor(
-                        requireContext(), R.color.col_009
+                        requireContext(), R.color.col_02c
                     ),
                     Typeface.BOLD,
                     0,

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

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