From ee43f56b45d6a938d1736f826dd1926ce01f1bf6 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Wed, 27 Mar 2024 18:04:19 +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-=E7=BA=BF=E4=B8=8A=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zj365/health/fragment/BreathFrag.kt | 25 +++-- .../java/com/zj365/health/fragment/TemFrag.kt | 27 +++-- .../com/zj365/health/fragment/UricAcidFrag.kt | 103 ++++++++++++------ .../com/zj365/health/fragment/XinlvFrag.kt | 37 ++++--- .../com/zj365/health/fragment/XueTangFrag.kt | 51 ++++++--- .../com/zj365/health/fragment/XueyaFrag.kt | 29 ++++- .../com/zj365/health/fragment/XueyangFrag.kt | 26 +++-- .../fragment/bloodlipid/BloodFatFrag.kt | 12 +- health/src/main/res/layout/frag_xya.xml | 8 ++ health/src/main/res/layout/item_blood_fat.xml | 10 ++ .../com/xty/network/model/UricAcidInfoBean.kt | 38 +++---- 11 files changed, 253 insertions(+), 113 deletions(-) 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 0ff8c09..1434c61 100644 --- a/health/src/main/java/com/zj365/health/fragment/BreathFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/BreathFrag.kt @@ -198,15 +198,10 @@ class BreathFrag : BaseVmFrag() { if (isDemonstrate){ binding.tvXinLv.text = "18" binding.tvTestTime.text = RxTimeTool.getCurTimeString( - SimpleDateFormat("HH:mm") + SimpleDateFormat("yyyy-MM-dd HH:mm") ) } - mViewModel.getRespData( - type, - RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")), - id, - isDemonstrate - ) + mViewModel.getSetting(Const.BREATH_SETTING) mViewModel.getLastData(id) binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")) @@ -263,7 +258,21 @@ class BreathFrag : BaseVmFrag() { binding.tvXinLv.text = "${it.respiratory.toInt()}" binding.tvTestTime.text = RxTimeTool.milliseconds2String( it.time!!.toLong() * 1000, - SimpleDateFormat("HH:mm") + SimpleDateFormat("yyyy-MM-dd HH:mm") + ) + dayDate= RxTimeTool.milliseconds2String( + it.time!!.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd") + ) + binding.tvShowDate.text = dayDate + mViewModel.getRespData( + type, + RxTimeTool.milliseconds2String( + it.time!!.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd") + ), + id, + isDemonstrate ) } } 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 6a45ea6..7463ba8 100644 --- a/health/src/main/java/com/zj365/health/fragment/TemFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/TemFrag.kt @@ -190,17 +190,12 @@ class TemFrag : BaseVmFrag() { if (isDemonstrate){ binding.tvXinLv.text = "36.4" binding.tvTestTime.text = RxTimeTool.getCurTimeString( - SimpleDateFormat("HH:mm") + SimpleDateFormat("yyyy-MM-dd HH:mm") ) }else{ mViewModel.getLastData(id) } - mViewModel.getTempData( - type, - RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")), - id, - isDemonstrate - ) + mViewModel.getSetting(Const.TEMP_SETTING) binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")) binding.mTvTime.setOnClickListener { @@ -253,7 +248,23 @@ class TemFrag : BaseVmFrag() { binding.tvXinLv.text = "${String.format("%.1f", it.tempInt + (it.tempFloat * 0.1))}" binding.tvTestTime.text = RxTimeTool.milliseconds2String( it.time!!.toLong() * 1000, - SimpleDateFormat("HH:mm") + SimpleDateFormat("yyyy-MM-dd HH:mm") + ) + + dayDate= RxTimeTool.milliseconds2String( + it.time!!.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd") + ) + binding.tvShowDate.text = dayDate + + mViewModel.getTempData( + type, + RxTimeTool.milliseconds2String( + it.time!!.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd") + ), + id, + isDemonstrate ) } } diff --git a/health/src/main/java/com/zj365/health/fragment/UricAcidFrag.kt b/health/src/main/java/com/zj365/health/fragment/UricAcidFrag.kt index 7b9e884..be38988 100644 --- a/health/src/main/java/com/zj365/health/fragment/UricAcidFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/UricAcidFrag.kt @@ -83,7 +83,7 @@ class UricAcidFrag : BaseVmFrag() { private var isPermission = false private var isCompleteInfo = false private var expireTimeStr: String = "" - var type = 2 + var type = 1 val fomartStr by lazy { arrayOf("HH:mm", "HH:mm", "MM-dd", "MM-dd", "yy-MM") } private val weekStr by lazy { resources.getStringArray(R.array.week_day) } val dialogBind by lazy { @@ -345,7 +345,7 @@ class UricAcidFrag : BaseVmFrag() { //尿酸头部信息,这里有判断是否绑定了尿酸设备 mViewModel.getUricAcidHead(id) } - mViewModel.getUricAcidInfo(type, binding.tvShowDate.text.toString(), id, isDemonstrate) + } private fun moveToErrorShow(bundle: Bundle) { @@ -510,9 +510,14 @@ class UricAcidFrag : BaseVmFrag() { calendar.time = format.parse(data.time!!)!! val myFormat = SimpleDateFormat("yyyy-MM-dd HH:mm") - binding.tvTestTime.text = myFormat.format(calendar.time) + val dateForm = SimpleDateFormat("yyyy-MM-dd") + binding.tvTestTime.text = myFormat.format(calendar.time) + dayDate = dateForm.format(calendar.time) + binding.tvShowDate.text = dayDate mViewModel.getCurrentUricAcidValue(data.timeDay, id, isDemonstrate) + + mViewModel.getUricAcidInfo(type, binding.tvShowDate.text.toString(), id, isDemonstrate) } } @@ -527,6 +532,11 @@ class UricAcidFrag : BaseVmFrag() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { when (type) { + 1->{ + it[type]!!.model = it[type]!!.mapDataToTimeNodes(it[type]!!.model) + + } + 2 -> {//周 val split = binding.tvShowDate.text.toString().split("至") val start = split[0] @@ -725,7 +735,11 @@ class UricAcidFrag : BaseVmFrag() { val y = it.axisLeft // y.axisMaximum=max // y.axisMinimum=min - y.setLabelCountAndMaxMinValue(6, false, min - 10f, max + 10f) + y.setLabelCountAndMaxMinValue( + 6, + false, + if (min - 1f > 0f) min - 1f else min, + if (max >= 0f) max + 1f else max) y.textColor = ContextCompat.getColor(requireContext(), R.color.col_92a) y.setDrawAxisLine(false) y.setPosition(YAxis.YAxisLabelPosition.OUTSIDE_CHART) @@ -750,14 +764,15 @@ class UricAcidFrag : BaseVmFrag() { val barsetsNew: java.util.ArrayList = java.util.ArrayList() var segments = splitDataIntoSegments(list) - if (segments.size > 0) { - segments = checkData(segments) - } +// if (segments.size > 0) { +// segments = checkData(segments) +// } val dataSets = segments.mapNotNull { segment -> if (segment.isEmpty()) return@mapNotNull null val entries = segment.mapIndexed { index, model -> + Entry( convertTimeToIndex(model.time, index).toFloat(), model.uaValue, @@ -798,7 +813,7 @@ class UricAcidFrag : BaseVmFrag() { m.postScale( when (type) { 1 -> { - 11.5f + 0.5f } 3 -> { @@ -836,7 +851,8 @@ class UricAcidFrag : BaseVmFrag() { } } val y = it.axisLeft - y.setLabelCountAndMaxMinValue(6, false, min - 10, max + 10) + y.setLabelCountAndMaxMinValue(6, false, if (min - 1f > 0f) min - 1f else min, + if (max >= 0f) max + 1f else max) y.textColor = ContextCompat.getColor(requireContext(), R.color.col_92a) y.setDrawAxisLine(false) y.setPosition(YAxis.YAxisLabelPosition.OUTSIDE_CHART) @@ -880,7 +896,12 @@ class UricAcidFrag : BaseVmFrag() { } val bard = BarData(dataBarSets) - bard.barWidth = calculateBarWidth(bard.dataSetCount) + if (type == 1) { + bard.barWidth = calculateBarWidth(bard.dataSetCount) / 4 + } else { + bard.barWidth = calculateBarWidth(bard.dataSetCount) + } + // bard.barWidth = calculateBarWidth(bard.dataSetCount) binding.mBarChart.data = bard binding.mBarChart.invalidate() } @@ -922,16 +943,17 @@ class UricAcidFrag : BaseVmFrag() { var currentSegment = mutableListOf() for (model in dataList) { - if (model.uaValue.toFloat().isNaN()) { - // 遇到 Float.NaN，如果当前线段不为空，则添加到结果中，并开始新的线段 - if (currentSegment.isNotEmpty()) { - segments.add(currentSegment) - currentSegment = mutableListOf() - } - } else { - // 遇到有效数据，将其添加到当前线段中 - currentSegment.add(model) - } +// if (model.uaValue.toFloat().isNaN()) { +// // 遇到 Float.NaN，如果当前线段不为空，则添加到结果中，并开始新的线段 +// if (currentSegment.isNotEmpty()) { +// segments.add(currentSegment) +// currentSegment = mutableListOf() +// } +// } else { +// // 遇到有效数据，将其添加到当前线段中 +// currentSegment.add(model) +// } + currentSegment.add(model) } // 将最后一个线段添加到结果中 @@ -1060,10 +1082,10 @@ class UricAcidFrag : BaseVmFrag() { val minutes = parts[1].toInt() // 计算对应的分钟数 - val totalMinutes = hours * 60 + minutes + val totalMinutes = hours * 60 // 计算对应的索引值 - index = totalMinutes / 10 + index = hours - 5 } 2 -> { @@ -1180,13 +1202,14 @@ class UricAcidFrag : BaseVmFrag() { private val mTabEntities: ArrayList = ArrayList() private val mFragments: SparseArray = SparseArray() private val mTitles = arrayOf( - "周", "月", "年" + "日", "周", "月", "年" ) private fun initTab() { val currentDay = Date() val day = TimeUtils.date2String(currentDay, "yyyy-MM-dd") + dayDate = day weekDate = "${TimeUtils.date2String(getDateAdd(6), "yyyy-MM-dd")}至$day" mouthDate = TimeUtils.date2String(currentDay, "yyyy-MM") yearDate = TimeUtils.date2String(currentDay, "yyyy") @@ -1206,17 +1229,21 @@ class UricAcidFrag : BaseVmFrag() { binding.commonTabLayout.currentTab = position when (position) { - 0 -> { //周 + 0->{ + binding.tvShowDate.text = dayDate + type = 1 + } + 1 -> { //周 binding.tvShowDate.text = weekDate type = 2 } - 1 -> { //月 + 2 -> { //月 binding.tvShowDate.text = mouthDate type = 3 } - 2 -> { //年 + 3 -> { //年 binding.tvShowDate.text = yearDate type = 4 } @@ -1237,14 +1264,28 @@ class UricAcidFrag : BaseVmFrag() { private fun initTimeSelect() { - val currentDay = Date() - val day = TimeUtils.date2String(currentDay, "yyyy-MM-dd") - weekDate = "${TimeUtils.date2String(getDateAdd(6), "yyyy-MM-dd")}至$day" - binding.tvShowDate.text = weekDate +// val currentDay = Date() +// val day = TimeUtils.date2String(currentDay, "yyyy-MM-dd") +// weekDate = "${TimeUtils.date2String(getDateAdd(6), "yyyy-MM-dd")}至$day" +// binding.tvShowDate.text = weekDate + + //日筛选 + val calendar = Calendar.getInstance() + timeSelect.startDate.set(1922, 1, 1) + timeSelect.endDate.set( + calendar[Calendar.YEAR], calendar[Calendar.MONTH], if (calendar[Calendar.HOUR] >= 11) { + calendar[Calendar.DATE] + } else { + calendar[Calendar.DATE] + } + ) + binding.tvShowDate.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")) binding.tvShowDate.setOnClickListener { when (type) { - + 0,1->{ + timeSelect.selectTime(it, "yyyy-MM-dd") + } 2 -> { bottomSheetDialog?.show() } 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 57e420c..a79ea23 100644 --- a/health/src/main/java/com/zj365/health/fragment/XinlvFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/XinlvFrag.kt @@ -211,15 +211,10 @@ class XinlvFrag : BaseVmFrag() { if (isDemonstrate) { binding.tvXinLv.text = "84" binding.tvTestTime.text = RxTimeTool.getCurTimeString( - SimpleDateFormat("HH:mm") + SimpleDateFormat("yyyy-MM-dd HH:mm") ) } - mViewModel.getXlData( - type, - RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")), - id, - isDemonstrate - ) + mViewModel.getSetting(Const.Xl_SETTING) mViewModel.getLastData(id) // binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")) @@ -292,7 +287,21 @@ class XinlvFrag : BaseVmFrag() { binding.tvXinLv.text = "${it.hrData.toInt()}" binding.tvTestTime.text = RxTimeTool.milliseconds2String( it.time.toLong() * 1000, - SimpleDateFormat("HH:mm") + SimpleDateFormat("yyyy-MM-dd HH:mm") + ) + dayDate = RxTimeTool.milliseconds2String( + it.time.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd") + ) + binding.tvShowDate.text = dayDate + mViewModel.getXlData( + type, + RxTimeTool.milliseconds2String( + it.time.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd") + ), + id, + isDemonstrate ) } } @@ -310,7 +319,7 @@ class XinlvFrag : BaseVmFrag() { barValue.clear() val rever = (list.indices).reversed() - if (selectDay()) {//如果是当天才操作 + // if (selectDay()) {//如果是当天才操作 normalTime = 0 highTime = 0 lowTime = 0 @@ -318,12 +327,12 @@ class XinlvFrag : BaseVmFrag() { highListTime.clear() lowList.clear() lowListTime.clear() - } + // } for (t in daysModelList.indices) { - if (selectDay()) {//如果是当天才操作 + // if (selectDay()) {//如果是当天才操作 getOrganStatu(daysModelList[daysModelList.size - t - 1]) - } + // } } for (i in rever) { // var times = list[i].time.toLong() * 1000 @@ -345,9 +354,9 @@ class XinlvFrag : BaseVmFrag() { ) ) } - if (selectDay()) {//如果是当天才操作 + // if (selectDay()) {//如果是当天才操作 setOrganStatu() - } +// } binding.mLineChart.clear() binding.mBarChart.clear() initChart(list, bean.value.min.toFloat(), bean.value.max.toFloat()) 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 c6a8160..90f7442 100644 --- a/health/src/main/java/com/zj365/health/fragment/XueTangFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/XueTangFrag.kt @@ -241,8 +241,8 @@ class XueTangFrag : BaseVmFrag() { } binding.mTvDynamicBloodSugar.isSelected = true binding.mTvGlycosylated.isSelected = false - requestInfo() - requestDetail() + // requestInfo() + // requestDetail() } //糖化血红蛋白 R.id.mTvGlycosylated -> { @@ -330,13 +330,13 @@ class XueTangFrag : BaseVmFrag() { if (isDemonstrate) { binding.tvXinLv.text = "6.2" binding.tvTestTime.text = RxTimeTool.getCurTimeString( - SimpleDateFormat("HH:mm") + SimpleDateFormat("yyyy-MM-dd HH:mm") ) binding.mTvDynamicBloodSugar.isSelected = true } else { requestInfo() } - requestDetail() + // requestDetail() } /** @@ -389,6 +389,17 @@ class XueTangFrag : BaseVmFrag() { mViewModel.xtInfo.observe(this) { xtInfo = it.data mModel = xtInfo!!.model + + + var infoBean =xtInfo!! + + expireTimeStr = infoBean.expireTime + updateBloodsugarStatus(infoBean.model, expireTimeStr) + + if (!infoBean.introUrl.isNullOrEmpty()) { + binding.ivXtangIntro.setImage(requireContext(), infoBean.introUrl) + } + updateHeaderInfo() if (null != xtInfo) { initChart(xuetangLineInfo?.model, xtInfo!!.min, xtInfo!!.max) @@ -472,14 +483,6 @@ class XueTangFrag : BaseVmFrag() { binding.mOrganView.root.visibility = View.GONE } - var infoBean = (if (isBloodSugar) xtInfo else sugarInfo) ?: return - - expireTimeStr = infoBean.expireTime - updateBloodsugarStatus(infoBean.model, expireTimeStr) - - if (!infoBean.introUrl.isNullOrEmpty()) { - binding.ivXtangIntro.setImage(requireContext(), infoBean.introUrl) - } } @@ -690,7 +693,7 @@ class XueTangFrag : BaseVmFrag() { binding.tvXinLv.text = "--" } } - binding.tvTestTime.text = RxTimeTool.getCurrentDateTime("HH:mm") + binding.tvTestTime.text = RxTimeTool.getCurrentDateTime("yyyy-MM-dd HH:mm") binding.tvModelingExplain.visibility = View.GONE } @@ -722,22 +725,28 @@ class XueTangFrag : BaseVmFrag() { binding.tvModelingExplain.visibility = View.VISIBLE binding.tvAfter.text = "" // binding.mTvExpireTime.text = "" - binding.tvTestTime.text = RxTimeTool.getCurrentDateTime("HH:mm") + binding.tvTestTime.text = RxTimeTool.getCurrentDateTime("yyyy-MM-dd HH:mm") } 2 -> { val centerText: String val unit: String val bottomText: String + val dateText:String if (isBloodSugar()) { binding.mTvOper.text = "血糖校准" binding.mTvOper.visibility = if (isMine) View.VISIBLE else View.GONE centerText = if (null == xtInfo) "-" else xtInfo?.bloodsugar.toString() unit = "mmol/L" bottomText = if (null == xtInfo) "-" else RxTimeTool.simpleDateFormat( - "HH:mm", + "yyyy-MM-dd HH:mm", RxTimeTool.string2Date("yyyy-MM-dd HH:mm:ss", xtInfo?.time) ) + + dateText = if (null == xtInfo) "-" else RxTimeTool.simpleDateFormat( + "yyyy-MM-dd", + RxTimeTool.string2Date("yyyy-MM-dd", xtInfo?.time) + ) binding.mTvExpireTime.text = "到期时间：$expireTime" val expireDay = RxTimeTool.getIntervalByNow( expireTime, @@ -756,9 +765,14 @@ class XueTangFrag : BaseVmFrag() { if (null == sugarInfo) "-" else sugarInfo?.bloodsugar.toString() unit = "%" bottomText = if (null == sugarInfo) "-" else RxTimeTool.simpleDateFormat( - "HH:mm", + "yyyy-MM-dd HH:mm", RxTimeTool.string2Date("yyyy-MM-dd HH:mm:ss", sugarInfo?.time) ) + + dateText = if (null == sugarInfo) "-" else RxTimeTool.simpleDateFormat( + "yyyy-MM-dd", + RxTimeTool.string2Date("yyyy-MM-dd", sugarInfo?.time) + ) binding.mTvExpireTime.text = "监测周期：$expireTime" binding.tvRenew.visibility = View.GONE } @@ -771,9 +785,14 @@ class XueTangFrag : BaseVmFrag() { binding.tvAfter.text = "mmol/L" // binding.mTvExpireTime.text = "" binding.tvTestTime.text = bottomText + + dayDate = dateText + binding.tvShowDate.text = dayDate // binding.mFull.center_txt = centerText binding.tvOpen.visibility = View.GONE binding.tvModelingExplain.visibility = View.GONE + + requestDetail() } } } 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 8afc34c..d640ce7 100644 --- a/health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt @@ -237,18 +237,17 @@ class XueyaFrag : BaseVmFrag() { binding.tvTestTime.text = RxTimeTool.getCurTimeString( SimpleDateFormat("HH:mm") ) + + binding.tvDateTime.text = RxTimeTool.getCurTimeString( + SimpleDateFormat("yyyy-MM-dd") + ) } else { mViewModel.getLastData(id) } CommonUtils.getMyUserInfo()?.let { mViewModel.calibrationHistory(it.id) } - mViewModel.getXyaData( - type, - RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")), - id, - isDemonstrate - ) + mViewModel.getSetting(Const.DBP_SETTING) @@ -399,6 +398,24 @@ class XueyaFrag : BaseVmFrag() { it.time.toLong() * 1000, SimpleDateFormat("HH:mm") ) + binding.tvDateTime.text = RxTimeTool.milliseconds2String( + it.time.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd") + ) + dayDate = RxTimeTool.milliseconds2String( + it.time.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd") + ) + binding.tvShowDate.text = dayDate + mViewModel.getXyaData( + type, + RxTimeTool.milliseconds2String( + it.time.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd") + ), + id, + isDemonstrate + ) } } } 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 58eab3d..a7e312c 100644 --- a/health/src/main/java/com/zj365/health/fragment/XueyangFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/XueyangFrag.kt @@ -204,10 +204,9 @@ class XueyangFrag : BaseVmFrag() { if (isDemonstrate){ binding.tvXinLv.text = "98" binding.tvTestTime.text = RxTimeTool.getCurTimeString( - SimpleDateFormat("HH:mm") + SimpleDateFormat("yyyy-MM-dd HH:mm") ) } - mViewModel.getSoData(type, RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")), id,isDemonstrate) mViewModel.getSetting(Const.XY_SETTING) mViewModel.getLastData(id) binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")) @@ -268,8 +267,17 @@ class XueyangFrag : BaseVmFrag() { binding.tvXinLv.text = "${it.soData.toInt()}" binding.tvTestTime.text = RxTimeTool.milliseconds2String( it.time!!.toLong() * 1000, - SimpleDateFormat("HH:mm") + SimpleDateFormat("yyyy-MM-dd HH:mm") ) + dayDate = RxTimeTool.milliseconds2String( + it.time!!.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd") + ) + binding.tvShowDate.text = dayDate + mViewModel.getSoData(type, RxTimeTool.milliseconds2String( + it.time!!.toLong() * 1000, + SimpleDateFormat("yyyy-MM-dd")), id,isDemonstrate) + } } @@ -299,7 +307,7 @@ class XueyangFrag : BaseVmFrag() { barValue.clear() var rever = (list.indices).reversed() - if (selectDay()) { + // if (selectDay()) { normalTime = 0 highTime = 0 lowTime = 0 @@ -307,11 +315,11 @@ class XueyangFrag : BaseVmFrag() { highListTime.clear() lowList.clear() lowListTime.clear() - } + // } for (t in daysModelList.indices) { - if (selectDay()) {//如果是当天才操作 + // if (selectDay()) {//如果是当天才操作 getOrganStatu(daysModelList[daysModelList.size - t - 1]) - } + // } } for (i in rever) { var bean = list[list.size - i - 1] @@ -336,9 +344,9 @@ class XueyangFrag : BaseVmFrag() { ) } - if (selectDay()) { + // if (selectDay()) { setOrganStatu() - } + // } initChart(list, bean.value.min.toFloat(), bean.value.max.toFloat()) } 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 924c70d..22d7860 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 @@ -255,7 +255,6 @@ class BloodFatFrag : BaseVmFrag() { mViewModel.getBloodFatHead(id) } - mViewModel.getBloodFatInfo(type, binding.tvShowDate.text.toString(), id, isDemonstrate) } private fun setKindLayoutClickListener(view: BloodFatChartBinding) { @@ -413,10 +412,21 @@ class BloodFatFrag : BaseVmFrag() { calendar.time = format.parse(it.data.data.time!!)!! val myFormat = SimpleDateFormat("HH:mm") + val dateFormat = SimpleDateFormat("yyyy-MM-dd") + binding.clCurTc.tvTestTime.text = "mmol/L ${myFormat.format(calendar.time)}" binding.clCurTg.tvTestTime.text = "mmol/L ${myFormat.format(calendar.time)}" binding.clCurHdl.tvTestTime.text = "mmol/L ${myFormat.format(calendar.time)}" binding.clCurLdl.tvTestTime.text = "mmol/L ${myFormat.format(calendar.time)}" + + binding.clCurTc.tvDateTime.text = "${dateFormat.format(calendar.time)}" + binding.clCurTg.tvDateTime.text = "${dateFormat.format(calendar.time)}" + binding.clCurHdl.tvDateTime.text = "${dateFormat.format(calendar.time)}" + binding.clCurLdl.tvDateTime.text = "${dateFormat.format(calendar.time)}" + dayDate = dateFormat.format(calendar.time) + binding.tvShowDate.text = dayDate + mViewModel.getBloodFatInfo(type, binding.tvShowDate.text.toString(), id, isDemonstrate) + } } } diff --git a/health/src/main/res/layout/frag_xya.xml b/health/src/main/res/layout/frag_xya.xml index 45e54dd..0af0593 100644 --- a/health/src/main/res/layout/frag_xya.xml +++ b/health/src/main/res/layout/frag_xya.xml @@ -114,6 +114,14 @@ android:textSize="@dimen/sp_12" android:textStyle="bold" /> + diff --git a/health/src/main/res/layout/item_blood_fat.xml b/health/src/main/res/layout/item_blood_fat.xml index fdddf37..81ae931 100644 --- a/health/src/main/res/layout/item_blood_fat.xml +++ b/health/src/main/res/layout/item_blood_fat.xml @@ -41,9 +41,19 @@ android:textSize="@dimen/sp_11" android:textStyle="bold" tools:text="mmol/L 16:30" /> + +