diff --git a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt index b79dba3..74dde93 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -3,6 +3,7 @@ package com.zj365.dc.fragment import android.Manifest import android.annotation.SuppressLint import android.content.Intent +import android.graphics.Color import android.os.Build import android.provider.Settings import android.text.Spannable @@ -798,13 +799,20 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission setUserImage(bean.user.id.toString(), bean.user.image, bean.user.sex.toString()) binding.mHeader.tvUserName.text = bean.user.name - bean.bmiInfo?.let { - binding.mHeader.mBMI.text = "BMI ${it.bmi}" - binding.mHeader.mBMIStatus.text = "${it.levelName}" - }?:{ + if(bean.bmiInfo == null){ binding.mHeader.mBMI.text = "BMI --" binding.mHeader.mBMIStatus.text = "--" - } + }else{ + bean.bmiInfo?.let { + binding.mHeader.mBMI.text = "BMI ${it.bmi}" + binding.mHeader.mBMIStatus.text = "${it.levelName}" + if(it.levelName.equals("理想") || it.levelName.equals("标准")){ + binding.mHeader.mBMIStatus.setTextColor(Color.parseColor("#02C191")) + } + } + } + + binding.mHeader.tvWarningNum.text ="预警次数：${if (bean.warningCount == 0) "--" else bean.warningCount}次" diff --git a/app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt b/app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt index 95d2637..0f19330 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt @@ -59,47 +59,8 @@ class MessageFragment : BaseFragList() { } initAdapter() setRecycleRefresh(binding.mRecycle,binding.mRefresh) - // initTest() } - - /*fun initTest(){ - var titles = ArrayList() - titles.add("胆经") - titles.add("肝经") - titles.add("肺经") - titles.add("大肠经") - titles.add("胃经") - titles.add("脾经") - - titles.add("心经") - titles.add("小肠经") - titles.add("膀胱经") - titles.add("肾经") - titles.add("心包经") - titles.add("三焦经") - - var img = ArrayList() - - img.add(R.mipmap.ic_heart_1) - img.add(R.mipmap.ic_liver_1) - img.add(R.mipmap.ic_spleen_1) - img.add(R.mipmap.ic_lung_1) - img.add(R.mipmap.ic_kidney_1) - img.add(R.mipmap.ic_large_intestine_1) - - img.add(R.mipmap.ic_small_intestine_1) - img.add(R.mipmap.ic_stomach_1) - img.add(R.mipmap.ic_lymph_1) - img.add(R.mipmap.ic_gallbladder_1) - img.add(R.mipmap.ic_bladder_1) - img.add(R.mipmap.ic_pericardium_1) - - binding.clBody.healthBody.setMenuItemIconsAndTexts(img,titles) - // binding..healthBody.setMenuItemIconsAndTexts(img, titles) - - }*/ - override fun refresh() { val userId = if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") { "" @@ -141,6 +102,13 @@ class MessageFragment : BaseFragList() { @Subscribe(threadMode = ThreadMode.MAIN) fun loginOutChange(event: LoginOutEvent){ // refresh() + + adapter.setNewInstance(null) + val intent = Intent() + intent.action = Const.CONVERSATION_UNREAD_COUNT_ACTION + intent.putExtra(Const.UNREAD_COUNT_EXTRA, 0) + LocalBroadcastManager.getInstance(requireContext()) + .sendBroadcast(intent) } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/main/res/layout/frag_dynamic_management_header.xml b/app/src/main/res/layout/frag_dynamic_management_header.xml index d48a0aa..513aefb 100644 --- a/app/src/main/res/layout/frag_dynamic_management_header.xml +++ b/app/src/main/res/layout/frag_dynamic_management_header.xml @@ -75,7 +75,7 @@ android:paddingRight="@dimen/dp_8" android:paddingBottom="@dimen/dp_2" tools:text="正常" - android:textColor="@color/col_D9BD" + android:textColor="@color/col_91d" android:textSize="@dimen/sp_14" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@+id/mBMI" diff --git a/base/src/main/java/com/xty/base/utils/OrganStatusCalcUtil.kt b/base/src/main/java/com/xty/base/utils/OrganStatusCalcUtil.kt index d4ee01f..c725f8c 100644 --- a/base/src/main/java/com/xty/base/utils/OrganStatusCalcUtil.kt +++ b/base/src/main/java/com/xty/base/utils/OrganStatusCalcUtil.kt @@ -197,7 +197,7 @@ object OrganStatusCalcUtil { fun tcStatuText(statu: Float): String {//tc总胆固醇 - return if (statu > 2.82f && statu < 5.21f) {//2.83-5.20 + return if (statu <= 5.2f) {//2.83-5.20 "正常" } else { "异常" @@ -205,7 +205,7 @@ object OrganStatusCalcUtil { } fun tcStatus(status: Float):Int{ //tc 0是正常 1是异常 - return if (status > 2.82f && status < 5.21f) {//2.83-5.20 + return if (status <= 5.2f) {//2.83-5.20 0 } else { 1 @@ -213,7 +213,7 @@ object OrganStatusCalcUtil { } fun tgStatuText(statu: Float): String {//tg甘油三酯 - return if (statu > 0.44f && statu < 1.70f) {//0.45-1.69 + return if (statu <= 1.69f) {//0.45-1.69 "正常" } else { "异常" @@ -221,14 +221,14 @@ object OrganStatusCalcUtil { } fun tgStatus(status:Float):Int{ //tg 0是正常 1是异常 - return if (status > 0.44f && status < 1.70f) {//0.45-1.69 + return if (status <= 1.69f) {//0.45-1.69 0 } else { 1 } } fun hdlStatuText(statu: Float): String {//hdl高密度脂蛋白 - return if(statu > 0.92f && statu < 1.94f) {//0.93-1.93 + return if(statu >= 0.93f) {//0.93-1.93 "正常" } else { "异常" @@ -236,7 +236,7 @@ object OrganStatusCalcUtil { } fun hdlStatus(status:Float) :Int{ // hdl 0是正常 1是异常 - return if (status > 0.92f && status < 1.94f) {//0.93-1.93 + return if (status >= 0.93f ) {//0.93-1.93 0 } else { 1 @@ -244,7 +244,7 @@ object OrganStatusCalcUtil { } fun ldlStatuText(statu: Float): String {//ldl低密度脂蛋白 - return if (statu > -1f && statu < 3.13f) {//0.0-3.12 + return if (statu <= 3.12f) {//0.0-3.12 "正常" } else { "异常" @@ -252,7 +252,7 @@ object OrganStatusCalcUtil { } fun ldlStatus(status:Float): Int{ // ldl 0是正常 1是异常 - return if (status > -1f && status < 3.13f) {//0.0-3.12 + return if (status <= 3.12f) {//0.0-3.12 0 } else { 1 diff --git a/common/src/main/java/com/xty/common/weight/SideBar.java b/common/src/main/java/com/xty/common/weight/SideBar.java index 585491f..fc144be 100644 --- a/common/src/main/java/com/xty/common/weight/SideBar.java +++ b/common/src/main/java/com/xty/common/weight/SideBar.java @@ -10,6 +10,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.TextView; +import com.xty.common.LogUtils; import com.xty.common.R; public class SideBar extends View { @@ -59,10 +60,12 @@ public class SideBar extends View { protected void onDraw(Canvas canvas) { super.onDraw(canvas); // 获取焦点改变背景颜色. - int height = getHeight();// 获取对应高度 + int height = getHeight() -100;// 获取对应高度 + //LogUtils.INSTANCE.e("SideBar","height"+height); int width = getWidth(); // 获取对应宽度 if (b.length > 0) { int singleHeight = height / b.length;// 获取每一个字母的高度 + // LogUtils.INSTANCE.e("SideBar","singleHeight"+singleHeight); for (int i = 0; i < b.length; i++) { paint.setColor(Color.rgb(85, 100, 129)); paint.setTextSize(15); @@ -75,6 +78,8 @@ public class SideBar extends View { // x坐标等于中间-字符串宽度的一半. float xPos = width / 2 - paint.measureText(b[i]) / 2; float yPos = singleHeight * i + singleHeight / 2; + // LogUtils.INSTANCE.e("SideBar","yPos"+yPos); + canvas.drawText(b[i], xPos, yPos, paint); paint.reset();// 重置画笔 } 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 3cc33d0..525a0a3 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 @@ -71,7 +71,7 @@ class HealthRecordMainAct : BaseVmAct() { it.data.bmiInfo?.let { binding.tvBmi.text = "${it.bmi}" binding.tvBmiDesc.text = it.levelName - if (it.levelName.equals("理想")){ + if (it.levelName.equals("理想") || it.levelName.equals("标准")){ binding.tvBmiDesc.setTextColor(Color.parseColor("#02C191")) } } diff --git a/health/src/main/res/layout/frag_boold_fat.xml b/health/src/main/res/layout/frag_boold_fat.xml index da876d4..da3312a 100644 --- a/health/src/main/res/layout/frag_boold_fat.xml +++ b/health/src/main/res/layout/frag_boold_fat.xml @@ -273,7 +273,7 @@ android:layout_marginTop="@dimen/dp_11" android:layout_marginBottom="@dimen/dp_40" android:text="温馨提示：手表数据仅作为参考，不作为诊断、治疗依据。" - android:textColor="@color/col_2628" + android:textColor="@color/col_313" android:textSize="@dimen/sp_15" tools:ignore="HardcodedText" />