xieyongming
/
anyu_zhongjian_android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

中建365-二期开发-线上健康监测显示问题修复

Browse Source
dev_second
wlh 1 year ago
parent c05475e96a
commit ee43f56b45
11 changed files with 253 additions and 113 deletions
Show Stats Download Patch File Download Diff File

25
health/src/main/java/com/zj365/health/fragment/BreathFrag.kt
Unescape Escape View File

@ -198,15 +198,10 @@ class BreathFrag : BaseVmFrag<BreathVm>() {
if (isDemonstrate){ if (isDemonstrate){
binding.tvXinLv.text = "18" binding.tvXinLv.text = "18"
binding.tvTestTime.text = RxTimeTool.getCurTimeString( 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.getSetting(Const.BREATH_SETTING)
mViewModel.getLastData(id) mViewModel.getLastData(id)
binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")) binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd"))
@ -263,7 +258,21 @@ class BreathFrag : BaseVmFrag<BreathVm>() {
binding.tvXinLv.text = "${it.respiratory.toInt()}" binding.tvXinLv.text = "${it.respiratory.toInt()}"
binding.tvTestTime.text = RxTimeTool.milliseconds2String( binding.tvTestTime.text = RxTimeTool.milliseconds2String(
it.time!!.toLong() * 1000, 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
) )
} }
} }

27
health/src/main/java/com/zj365/health/fragment/TemFrag.kt
Unescape Escape View File

@ -190,17 +190,12 @@ class TemFrag : BaseVmFrag<TempVm>() {
if (isDemonstrate){ if (isDemonstrate){
binding.tvXinLv.text = "36.4" binding.tvXinLv.text = "36.4"
binding.tvTestTime.text = RxTimeTool.getCurTimeString( binding.tvTestTime.text = RxTimeTool.getCurTimeString(
SimpleDateFormat("HH:mm") SimpleDateFormat("yyyy-MM-dd HH:mm")
) )
}else{ }else{
mViewModel.getLastData(id) mViewModel.getLastData(id)
} }
mViewModel.getTempData(
type,
RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")),
id,
isDemonstrate
)
mViewModel.getSetting(Const.TEMP_SETTING) mViewModel.getSetting(Const.TEMP_SETTING)
binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")) binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd"))
binding.mTvTime.setOnClickListener { binding.mTvTime.setOnClickListener {
@ -253,7 +248,23 @@ class TemFrag : BaseVmFrag<TempVm>() {
binding.tvXinLv.text = "${String.format("%.1f", it.tempInt + (it.tempFloat * 0.1))}" binding.tvXinLv.text = "${String.format("%.1f", it.tempInt + (it.tempFloat * 0.1))}"
binding.tvTestTime.text = RxTimeTool.milliseconds2String( binding.tvTestTime.text = RxTimeTool.milliseconds2String(
it.time!!.toLong() * 1000, 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
) )
} }
} }

103
health/src/main/java/com/zj365/health/fragment/UricAcidFrag.kt
Unescape Escape View File

@ -83,7 +83,7 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
private var isPermission = false private var isPermission = false
private var isCompleteInfo = false private var isCompleteInfo = false
private var expireTimeStr: String = "" 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") } 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) } private val weekStr by lazy { resources.getStringArray(R.array.week_day) }
val dialogBind by lazy { val dialogBind by lazy {
@ -345,7 +345,7 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
//尿酸头部信息,这里有判断是否绑定了尿酸设备 //尿酸头部信息,这里有判断是否绑定了尿酸设备
mViewModel.getUricAcidHead(id) mViewModel.getUricAcidHead(id)
} }
mViewModel.getUricAcidInfo(type, binding.tvShowDate.text.toString(), id, isDemonstrate)
} }
private fun moveToErrorShow(bundle: Bundle) { private fun moveToErrorShow(bundle: Bundle) {
@ -510,9 +510,14 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
calendar.time = format.parse(data.time!!)!! calendar.time = format.parse(data.time!!)!!
val myFormat = SimpleDateFormat("yyyy-MM-dd HH:mm") 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.getCurrentUricAcidValue(data.timeDay, id, isDemonstrate)
mViewModel.getUricAcidInfo(type, binding.tvShowDate.text.toString(), id, isDemonstrate)
} }
} }
@ -527,6 +532,11 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
when (type) { when (type) {
1->{
it[type]!!.model = it[type]!!.mapDataToTimeNodes(it[type]!!.model)
}
2 -> {//周 2 -> {//周
val split = binding.tvShowDate.text.toString().split("至") val split = binding.tvShowDate.text.toString().split("至")
val start = split[0] val start = split[0]
@ -725,7 +735,11 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
val y = it.axisLeft val y = it.axisLeft
// y.axisMaximum=max // y.axisMaximum=max
// y.axisMinimum=min // 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.textColor = ContextCompat.getColor(requireContext(), R.color.col_92a)
y.setDrawAxisLine(false) y.setDrawAxisLine(false)
y.setPosition(YAxis.YAxisLabelPosition.OUTSIDE_CHART) y.setPosition(YAxis.YAxisLabelPosition.OUTSIDE_CHART)
@ -750,14 +764,15 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
val barsetsNew: java.util.ArrayList<ILineDataSet> = java.util.ArrayList() val barsetsNew: java.util.ArrayList<ILineDataSet> = java.util.ArrayList()
var segments = splitDataIntoSegments(list) var segments = splitDataIntoSegments(list)
if (segments.size > 0) { // if (segments.size > 0) {
segments = checkData(segments) // segments = checkData(segments)
} // }
val dataSets = segments.mapNotNull { segment -> val dataSets = segments.mapNotNull { segment ->
if (segment.isEmpty()) return@mapNotNull null if (segment.isEmpty()) return@mapNotNull null
val entries = segment.mapIndexed { index, model -> val entries = segment.mapIndexed { index, model ->
Entry( Entry(
convertTimeToIndex(model.time, index).toFloat(), convertTimeToIndex(model.time, index).toFloat(),
model.uaValue, model.uaValue,
@ -798,7 +813,7 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
m.postScale( m.postScale(
when (type) { when (type) {
1 -> { 1 -> {
11.5f 0.5f
} }
3 -> { 3 -> {
@ -836,7 +851,8 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
} }
} }
val y = it.axisLeft 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.textColor = ContextCompat.getColor(requireContext(), R.color.col_92a)
y.setDrawAxisLine(false) y.setDrawAxisLine(false)
y.setPosition(YAxis.YAxisLabelPosition.OUTSIDE_CHART) y.setPosition(YAxis.YAxisLabelPosition.OUTSIDE_CHART)
@ -880,7 +896,12 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
} }
val bard = BarData(dataBarSets) 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.data = bard
binding.mBarChart.invalidate() binding.mBarChart.invalidate()
} }
@ -922,16 +943,17 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
var currentSegment = mutableListOf<UricAcidInfoBean.Model>() var currentSegment = mutableListOf<UricAcidInfoBean.Model>()
for (model in dataList) { for (model in dataList) {
if (model.uaValue.toFloat().isNaN()) { // if (model.uaValue.toFloat().isNaN()) {
// 遇到 Float.NaN，如果当前线段不为空，则添加到结果中，并开始新的线段 // // 遇到 Float.NaN，如果当前线段不为空，则添加到结果中，并开始新的线段
if (currentSegment.isNotEmpty()) { // if (currentSegment.isNotEmpty()) {
segments.add(currentSegment) // segments.add(currentSegment)
currentSegment = mutableListOf() // currentSegment = mutableListOf()
} // }
} else { // } else {
// 遇到有效数据，将其添加到当前线段中 // // 遇到有效数据，将其添加到当前线段中
currentSegment.add(model) // currentSegment.add(model)
} // }
currentSegment.add(model)
} }
// 将最后一个线段添加到结果中 // 将最后一个线段添加到结果中
@ -1060,10 +1082,10 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
val minutes = parts[1].toInt() val minutes = parts[1].toInt()
// 计算对应的分钟数 // 计算对应的分钟数
val totalMinutes = hours * 60 + minutes val totalMinutes = hours * 60
// 计算对应的索引值 // 计算对应的索引值
index = totalMinutes / 10 index = hours - 5
} }
2 -> { 2 -> {
@ -1180,13 +1202,14 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
private val mTabEntities: ArrayList<CustomTabEntity> = ArrayList() private val mTabEntities: ArrayList<CustomTabEntity> = ArrayList()
private val mFragments: SparseArray<Fragment> = SparseArray() private val mFragments: SparseArray<Fragment> = SparseArray()
private val mTitles = arrayOf( private val mTitles = arrayOf(
"周", "月", "年" "日", "周", "月", "年"
) )
private fun initTab() { private fun initTab() {
val currentDay = Date() val currentDay = Date()
val day = TimeUtils.date2String(currentDay, "yyyy-MM-dd") val day = TimeUtils.date2String(currentDay, "yyyy-MM-dd")
dayDate = day
weekDate = "${TimeUtils.date2String(getDateAdd(6), "yyyy-MM-dd")}至$day" weekDate = "${TimeUtils.date2String(getDateAdd(6), "yyyy-MM-dd")}至$day"
mouthDate = TimeUtils.date2String(currentDay, "yyyy-MM") mouthDate = TimeUtils.date2String(currentDay, "yyyy-MM")
yearDate = TimeUtils.date2String(currentDay, "yyyy") yearDate = TimeUtils.date2String(currentDay, "yyyy")
@ -1206,17 +1229,21 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
binding.commonTabLayout.currentTab = position binding.commonTabLayout.currentTab = position
when (position) { when (position) {
0 -> { //周 0->{
binding.tvShowDate.text = dayDate
type = 1
}
1 -> { //周
binding.tvShowDate.text = weekDate binding.tvShowDate.text = weekDate
type = 2 type = 2
} }
1 -> { //月 2 -> { //月
binding.tvShowDate.text = mouthDate binding.tvShowDate.text = mouthDate
type = 3 type = 3
} }
2 -> { //年 3 -> { //年
binding.tvShowDate.text = yearDate binding.tvShowDate.text = yearDate
type = 4 type = 4
} }
@ -1237,14 +1264,28 @@ class UricAcidFrag : BaseVmFrag<UricAcidVm>() {
private fun initTimeSelect() { private fun initTimeSelect() {
val currentDay = Date() // val currentDay = Date()
val day = TimeUtils.date2String(currentDay, "yyyy-MM-dd") // val day = TimeUtils.date2String(currentDay, "yyyy-MM-dd")
weekDate = "${TimeUtils.date2String(getDateAdd(6), "yyyy-MM-dd")}至$day" // weekDate = "${TimeUtils.date2String(getDateAdd(6), "yyyy-MM-dd")}至$day"
binding.tvShowDate.text = weekDate // 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 { binding.tvShowDate.setOnClickListener {
when (type) { when (type) {
0,1->{
timeSelect.selectTime(it, "yyyy-MM-dd")
}
2 -> { 2 -> {
bottomSheetDialog?.show() bottomSheetDialog?.show()
} }

37
health/src/main/java/com/zj365/health/fragment/XinlvFrag.kt
Unescape Escape View File

@ -211,15 +211,10 @@ class XinlvFrag : BaseVmFrag<XlVm>() {
if (isDemonstrate) { if (isDemonstrate) {
binding.tvXinLv.text = "84" binding.tvXinLv.text = "84"
binding.tvTestTime.text = RxTimeTool.getCurTimeString( 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.getSetting(Const.Xl_SETTING)
mViewModel.getLastData(id) mViewModel.getLastData(id)
// binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")) // binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd"))
@ -292,7 +287,21 @@ class XinlvFrag : BaseVmFrag<XlVm>() {
binding.tvXinLv.text = "${it.hrData.toInt()}" binding.tvXinLv.text = "${it.hrData.toInt()}"
binding.tvTestTime.text = RxTimeTool.milliseconds2String( binding.tvTestTime.text = RxTimeTool.milliseconds2String(
it.time.toLong() * 1000, 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<XlVm>() {
barValue.clear() barValue.clear()
val rever = (list.indices).reversed() val rever = (list.indices).reversed()
if (selectDay()) {//如果是当天才操作 // if (selectDay()) {//如果是当天才操作
normalTime = 0 normalTime = 0
highTime = 0 highTime = 0
lowTime = 0 lowTime = 0
@ -318,12 +327,12 @@ class XinlvFrag : BaseVmFrag<XlVm>() {
highListTime.clear() highListTime.clear()
lowList.clear() lowList.clear()
lowListTime.clear() lowListTime.clear()
} // }
for (t in daysModelList.indices) { for (t in daysModelList.indices) {
if (selectDay()) {//如果是当天才操作 // if (selectDay()) {//如果是当天才操作
getOrganStatu(daysModelList[daysModelList.size - t - 1]) getOrganStatu(daysModelList[daysModelList.size - t - 1])
} // }
} }
for (i in rever) { for (i in rever) {
// var times = list[i].time.toLong() * 1000 // var times = list[i].time.toLong() * 1000
@ -345,9 +354,9 @@ class XinlvFrag : BaseVmFrag<XlVm>() {
) )
) )
} }
if (selectDay()) {//如果是当天才操作 // if (selectDay()) {//如果是当天才操作
setOrganStatu() setOrganStatu()
} // }
binding.mLineChart.clear() binding.mLineChart.clear()
binding.mBarChart.clear() binding.mBarChart.clear()
initChart(list, bean.value.min.toFloat(), bean.value.max.toFloat()) initChart(list, bean.value.min.toFloat(), bean.value.max.toFloat())

51
health/src/main/java/com/zj365/health/fragment/XueTangFrag.kt
Unescape Escape View File

@ -241,8 +241,8 @@ class XueTangFrag : BaseVmFrag<XTangVm>() {
} }
binding.mTvDynamicBloodSugar.isSelected = true binding.mTvDynamicBloodSugar.isSelected = true
binding.mTvGlycosylated.isSelected = false binding.mTvGlycosylated.isSelected = false
requestInfo() // requestInfo()
requestDetail() // requestDetail()
} }
//糖化血红蛋白 //糖化血红蛋白
R.id.mTvGlycosylated -> { R.id.mTvGlycosylated -> {
@ -330,13 +330,13 @@ class XueTangFrag : BaseVmFrag<XTangVm>() {
if (isDemonstrate) { if (isDemonstrate) {
binding.tvXinLv.text = "6.2" binding.tvXinLv.text = "6.2"
binding.tvTestTime.text = RxTimeTool.getCurTimeString( binding.tvTestTime.text = RxTimeTool.getCurTimeString(
SimpleDateFormat("HH:mm") SimpleDateFormat("yyyy-MM-dd HH:mm")
) )
binding.mTvDynamicBloodSugar.isSelected = true binding.mTvDynamicBloodSugar.isSelected = true
} else { } else {
requestInfo() requestInfo()
} }
requestDetail() // requestDetail()
} }
/** /**
@ -389,6 +389,17 @@ class XueTangFrag : BaseVmFrag<XTangVm>() {
mViewModel.xtInfo.observe(this) { mViewModel.xtInfo.observe(this) {
xtInfo = it.data xtInfo = it.data
mModel = xtInfo!!.model mModel = xtInfo!!.model
var infoBean =xtInfo!!
expireTimeStr = infoBean.expireTime
updateBloodsugarStatus(infoBean.model, expireTimeStr)
if (!infoBean.introUrl.isNullOrEmpty()) {
binding.ivXtangIntro.setImage(requireContext(), infoBean.introUrl)
}
updateHeaderInfo() updateHeaderInfo()
if (null != xtInfo) { if (null != xtInfo) {
initChart(xuetangLineInfo?.model, xtInfo!!.min, xtInfo!!.max) initChart(xuetangLineInfo?.model, xtInfo!!.min, xtInfo!!.max)
@ -472,14 +483,6 @@ class XueTangFrag : BaseVmFrag<XTangVm>() {
binding.mOrganView.root.visibility = View.GONE 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<XTangVm>() {
binding.tvXinLv.text = "--" 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 binding.tvModelingExplain.visibility = View.GONE
} }
@ -722,22 +725,28 @@ class XueTangFrag : BaseVmFrag<XTangVm>() {
binding.tvModelingExplain.visibility = View.VISIBLE binding.tvModelingExplain.visibility = View.VISIBLE
binding.tvAfter.text = "" binding.tvAfter.text = ""
// binding.mTvExpireTime.text = "" // binding.mTvExpireTime.text = ""
binding.tvTestTime.text = RxTimeTool.getCurrentDateTime("HH:mm") binding.tvTestTime.text = RxTimeTool.getCurrentDateTime("yyyy-MM-dd HH:mm")
} }
2 -> { 2 -> {
val centerText: String val centerText: String
val unit: String val unit: String
val bottomText: String val bottomText: String
val dateText:String
if (isBloodSugar()) { if (isBloodSugar()) {
binding.mTvOper.text = "血糖校准" binding.mTvOper.text = "血糖校准"
binding.mTvOper.visibility = if (isMine) View.VISIBLE else View.GONE binding.mTvOper.visibility = if (isMine) View.VISIBLE else View.GONE
centerText = if (null == xtInfo) "-" else xtInfo?.bloodsugar.toString() centerText = if (null == xtInfo) "-" else xtInfo?.bloodsugar.toString()
unit = "mmol/L" unit = "mmol/L"
bottomText = if (null == xtInfo) "-" else RxTimeTool.simpleDateFormat( bottomText = if (null == xtInfo) "-" else RxTimeTool.simpleDateFormat(
"HH:mm", "yyyy-MM-dd HH:mm",
RxTimeTool.string2Date("yyyy-MM-dd HH:mm:ss", xtInfo?.time) 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" binding.mTvExpireTime.text = "到期时间：$expireTime"
val expireDay = RxTimeTool.getIntervalByNow( val expireDay = RxTimeTool.getIntervalByNow(
expireTime, expireTime,
@ -756,9 +765,14 @@ class XueTangFrag : BaseVmFrag<XTangVm>() {
if (null == sugarInfo) "-" else sugarInfo?.bloodsugar.toString() if (null == sugarInfo) "-" else sugarInfo?.bloodsugar.toString()
unit = "%" unit = "%"
bottomText = if (null == sugarInfo) "-" else RxTimeTool.simpleDateFormat( bottomText = if (null == sugarInfo) "-" else RxTimeTool.simpleDateFormat(
"HH:mm", "yyyy-MM-dd HH:mm",
RxTimeTool.string2Date("yyyy-MM-dd HH:mm:ss", sugarInfo?.time) 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.mTvExpireTime.text = "监测周期：$expireTime"
binding.tvRenew.visibility = View.GONE binding.tvRenew.visibility = View.GONE
} }
@ -771,9 +785,14 @@ class XueTangFrag : BaseVmFrag<XTangVm>() {
binding.tvAfter.text = "mmol/L" binding.tvAfter.text = "mmol/L"
// binding.mTvExpireTime.text = "" // binding.mTvExpireTime.text = ""
binding.tvTestTime.text = bottomText binding.tvTestTime.text = bottomText
dayDate = dateText
binding.tvShowDate.text = dayDate
// binding.mFull.center_txt = centerText // binding.mFull.center_txt = centerText
binding.tvOpen.visibility = View.GONE binding.tvOpen.visibility = View.GONE
binding.tvModelingExplain.visibility = View.GONE binding.tvModelingExplain.visibility = View.GONE
requestDetail()
} }
} }
} }

29
health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt
Unescape Escape View File

@ -237,18 +237,17 @@ class XueyaFrag : BaseVmFrag<XyaVm>() {
binding.tvTestTime.text = RxTimeTool.getCurTimeString( binding.tvTestTime.text = RxTimeTool.getCurTimeString(
SimpleDateFormat("HH:mm") SimpleDateFormat("HH:mm")
) )
binding.tvDateTime.text = RxTimeTool.getCurTimeString(
SimpleDateFormat("yyyy-MM-dd")
)
} else { } else {
mViewModel.getLastData(id) mViewModel.getLastData(id)
} }
CommonUtils.getMyUserInfo()?.let { CommonUtils.getMyUserInfo()?.let {
mViewModel.calibrationHistory(it.id) mViewModel.calibrationHistory(it.id)
} }
mViewModel.getXyaData(
type,
RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")),
id,
isDemonstrate
)
mViewModel.getSetting(Const.DBP_SETTING) mViewModel.getSetting(Const.DBP_SETTING)
@ -399,6 +398,24 @@ class XueyaFrag : BaseVmFrag<XyaVm>() {
it.time.toLong() * 1000, it.time.toLong() * 1000,
SimpleDateFormat("HH:mm") 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
)
} }
} }
} }

26
health/src/main/java/com/zj365/health/fragment/XueyangFrag.kt
Unescape Escape View File

@ -204,10 +204,9 @@ class XueyangFrag : BaseVmFrag<XyVm>() {
if (isDemonstrate){ if (isDemonstrate){
binding.tvXinLv.text = "98" binding.tvXinLv.text = "98"
binding.tvTestTime.text = RxTimeTool.getCurTimeString( 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.getSetting(Const.XY_SETTING)
mViewModel.getLastData(id) mViewModel.getLastData(id)
binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd")) binding.mTvTime.text = RxTimeTool.getCurTimeString(SimpleDateFormat("yyyy-MM-dd"))
@ -268,8 +267,17 @@ class XueyangFrag : BaseVmFrag<XyVm>() {
binding.tvXinLv.text = "${it.soData.toInt()}" binding.tvXinLv.text = "${it.soData.toInt()}"
binding.tvTestTime.text = RxTimeTool.milliseconds2String( binding.tvTestTime.text = RxTimeTool.milliseconds2String(
it.time!!.toLong() * 1000, 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<XyVm>() {
barValue.clear() barValue.clear()
var rever = (list.indices).reversed() var rever = (list.indices).reversed()
if (selectDay()) { // if (selectDay()) {
normalTime = 0 normalTime = 0
highTime = 0 highTime = 0
lowTime = 0 lowTime = 0
@ -307,11 +315,11 @@ class XueyangFrag : BaseVmFrag<XyVm>() {
highListTime.clear() highListTime.clear()
lowList.clear() lowList.clear()
lowListTime.clear() lowListTime.clear()
} // }
for (t in daysModelList.indices) { for (t in daysModelList.indices) {
if (selectDay()) {//如果是当天才操作 // if (selectDay()) {//如果是当天才操作
getOrganStatu(daysModelList[daysModelList.size - t - 1]) getOrganStatu(daysModelList[daysModelList.size - t - 1])
} // }
} }
for (i in rever) { for (i in rever) {
var bean = list[list.size - i - 1] var bean = list[list.size - i - 1]
@ -336,9 +344,9 @@ class XueyangFrag : BaseVmFrag<XyVm>() {
) )
} }
if (selectDay()) { // if (selectDay()) {
setOrganStatu() setOrganStatu()
} // }
initChart(list, bean.value.min.toFloat(), bean.value.max.toFloat()) initChart(list, bean.value.min.toFloat(), bean.value.max.toFloat())
} }

12
health/src/main/java/com/zj365/health/fragment/bloodlipid/BloodFatFrag.kt
Unescape Escape View File

@ -255,7 +255,6 @@ class BloodFatFrag : BaseVmFrag<BloodFatVm>() {
mViewModel.getBloodFatHead(id) mViewModel.getBloodFatHead(id)
} }
mViewModel.getBloodFatInfo(type, binding.tvShowDate.text.toString(), id, isDemonstrate)
} }
private fun setKindLayoutClickListener(view: BloodFatChartBinding) { private fun setKindLayoutClickListener(view: BloodFatChartBinding) {
@ -413,10 +412,21 @@ class BloodFatFrag : BaseVmFrag<BloodFatVm>() {
calendar.time = format.parse(it.data.data.time!!)!! calendar.time = format.parse(it.data.data.time!!)!!
val myFormat = SimpleDateFormat("HH:mm") val myFormat = SimpleDateFormat("HH:mm")
val dateFormat = SimpleDateFormat("yyyy-MM-dd")
binding.clCurTc.tvTestTime.text = "mmol/L ${myFormat.format(calendar.time)}" binding.clCurTc.tvTestTime.text = "mmol/L ${myFormat.format(calendar.time)}"
binding.clCurTg.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.clCurHdl.tvTestTime.text = "mmol/L ${myFormat.format(calendar.time)}"
binding.clCurLdl.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)
} }
} }
} }

8
health/src/main/res/layout/frag_xya.xml
Unescape Escape View File

@ -114,6 +114,14 @@
android:textSize="@dimen/sp_12" android:textSize="@dimen/sp_12"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/tvDateTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="次/分"
android:textColor="@color/col_6B6"
android:textSize="@dimen/sp_12"/>
</LinearLayout> </LinearLayout>

10
health/src/main/res/layout/item_blood_fat.xml
Unescape Escape View File

@ -41,9 +41,19 @@
android:textSize="@dimen/sp_11" android:textSize="@dimen/sp_11"
android:textStyle="bold" android:textStyle="bold"
tools:text="mmol/L 16:30" /> tools:text="mmol/L 16:30" />
<TextView
android:id="@+id/tvDateTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@color/col_6B6"
android:textSize="@dimen/sp_11"
android:textStyle="bold"
tools:text="2023-03-26" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

38
network/src/main/java/com/xty/network/model/UricAcidInfoBean.kt
Unescape Escape View File

@ -36,14 +36,14 @@ data class UricAcidInfoBean(
val dateFormat = SimpleDateFormat("HH:mm", Locale.getDefault()) val dateFormat = SimpleDateFormat("HH:mm", Locale.getDefault())
// 创建一天的时间节点 // 创建一天的时间节点
val calendar = Calendar.getInstance() val calendar = Calendar.getInstance()
calendar.set(Calendar.HOUR_OF_DAY, 0) calendar.set(Calendar.HOUR_OF_DAY, 5)
calendar.set(Calendar.MINUTE, 0) calendar.set(Calendar.MINUTE, 0)
calendar.set(Calendar.SECOND, 0) calendar.set(Calendar.SECOND, 0)
calendar.set(Calendar.MILLISECOND, 0) calendar.set(Calendar.MILLISECOND, 0)
val startTime = calendar.time val startTime = calendar.time
calendar.add(Calendar.DAY_OF_MONTH, 1) calendar.add(Calendar.HOUR_OF_DAY, 4)
calendar.add(Calendar.MINUTE, -1) calendar.add(Calendar.MINUTE, 0)
var endTime = calendar.time var endTime = calendar.time
// 如果是时间是今天，endTime为最近的时间 // 如果是时间是今天，endTime为最近的时间
@ -69,11 +69,9 @@ data class UricAcidInfoBean(
) )
) )
calendar.time = currentTime calendar.time = currentTime
calendar.add(Calendar.MINUTE, 10) calendar.add(Calendar.HOUR_OF_DAY, 1)
currentTime = calendar.time currentTime = calendar.time
} }
val timestamp = 1688631900L
val time = Date(timestamp * 1000)
// 将数据集合中的时间映射到时间节点上 // 将数据集合中的时间映射到时间节点上
for (model in dataList) { for (model in dataList) {
@ -198,20 +196,20 @@ data class UricAcidInfoBean(
var maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH) var maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH)
// 如果是时间是今天，endTime为最近的时间 // 如果是时间是今天，endTime为最近的时间
val now = Calendar.getInstance() // val now = Calendar.getInstance()
val today = now.clone() as Calendar // val today = now.clone() as Calendar
try { // try {
now.timeInMillis = // now.timeInMillis =
if (dataList.isEmpty()) System.currentTimeMillis() else dataList.first().time.toLong() * 1000 // if (dataList.isEmpty()) System.currentTimeMillis() else dataList.first().time.toLong() * 1000
}catch (e:Exception){ // }catch (e:Exception){
} // }
//
if (today.get(Calendar.YEAR) == now.get(Calendar.YEAR) && // if (today.get(Calendar.YEAR) == now.get(Calendar.YEAR) &&
today.get(Calendar.MONTH) == now.get(Calendar.MONTH) // today.get(Calendar.MONTH) == now.get(Calendar.MONTH)
) { // ) {
// If today, use the last time in the range // // If today, use the last time in the range
maxDay = now.get(Calendar.DAY_OF_MONTH) // maxDay = now.get(Calendar.DAY_OF_MONTH)
} // }
// 循环遍历整个月份的每一天 // 循环遍历整个月份的每一天
for (day in 1..maxDay) { for (day in 1..maxDay) {

Write Preview
Loading…
Cancel
Save