diff --git a/app/src/main/java/com/xjjk/healthyclients/bean/CvdMainBean.kt b/app/src/main/java/com/xjjk/healthyclients/bean/CvdMainBean.kt index 8684131..bfe6ab0 100644 --- a/app/src/main/java/com/xjjk/healthyclients/bean/CvdMainBean.kt +++ b/app/src/main/java/com/xjjk/healthyclients/bean/CvdMainBean.kt @@ -1,141 +1,23 @@ -package com.xjjk.healthyclients.bean; +package com.xjjk.healthyclients.bean -import java.util.ArrayList; +class CvdMainBean { + var indexItemVos: ArrayList? = null + var days: String? = null + var distance: Long = 0 + var aveSleep: Double = 0.0 -public class CvdMainBean { + inner class dataBean( + var wdType: String?, + var wdTypeName: String?, + var dataDate: String?, + var dataValue: String? + ) { + var warnMin: String? = null + var warnMax: String? = null + var dataMax: String? = null + var dataMin: String? = null + var dataAvg: String? = null - private ArrayList indexItemVos; - private String days; - private long distance; - private double aveSleep; - public ArrayList getIndexItemVos() { - return indexItemVos; } - - public void setIndexItemVos(ArrayList indexItemVos) { - this.indexItemVos = indexItemVos; - } - - public String getDays() { - return days; - } - - public void setDays(String days) { - this.days = days; - } - - public long getDistance() { - return distance; - } - - public void setDistance(long distance) { - this.distance = distance; - } - - public double getAveSleep() { - return aveSleep; - } - - public void setAveSleep(double aveSleep) { - this.aveSleep = aveSleep; - } - - public class dataBean { - - private String wdType; - private String wdTypeName; - private String dataDate; - private String dataValue; - private String warnMin; - private String warnMax; - private String dataMax; - private String dataMin; - private String dataAvg; - - - public dataBean(String wdType, String wdTypeName,String dataDate,String dataValue) { - this.wdType = wdType; - this.wdTypeName = wdTypeName; - this.dataDate = dataDate; - this.dataValue = dataValue; - } - - public dataBean() { - - } - - public String getWdType() { - return wdType; - } - - public void setWdType(String wdType) { - this.wdType = wdType; - } - - public String getWdTypeName() { - return wdTypeName; - } - - public void setWdTypeName(String wdTypeName) { - this.wdTypeName = wdTypeName; - } - - public String getDataDate() { - return dataDate; - } - - public void setDataDate(String dataDate) { - this.dataDate = dataDate; - } - - public String getDataValue() { - return dataValue; - } - - public void setDataValue(String dataValue) { - this.dataValue = dataValue; - } - - public String getWarnMin() { - return warnMin; - } - - public void setWarnMin(String warnMin) { - this.warnMin = warnMin; - } - - public String getWarnMax() { - return warnMax; - } - - public void setWarnMax(String warnMax) { - this.warnMax = warnMax; - } - - public String getDataMin() { - return dataMin; - } - - public void setDataMin(String dataMin) { - this.dataMin = dataMin; - } - - public String getDataAvg() { - return dataAvg; - } - - public void setDataAvg(String dataAvg) { - this.dataAvg = dataAvg; - } - - public String getDataMax() { - return dataMax; - } - - public void setDataMax(String dataMax) { - this.dataMax = dataMax; - } - } - } diff --git a/app/src/main/java/com/xjjk/healthyclients/fragment/MonitorFragment.kt b/app/src/main/java/com/xjjk/healthyclients/fragment/MonitorFragment.kt index 873606d..a83c141 100644 --- a/app/src/main/java/com/xjjk/healthyclients/fragment/MonitorFragment.kt +++ b/app/src/main/java/com/xjjk/healthyclients/fragment/MonitorFragment.kt @@ -23,6 +23,7 @@ import com.xjjk.healthyclients.databinding.FragmentMonitorBinding import com.xjjk.healthyclients.retrofit.getHealthCheckRetrofit import com.xjjk.healthyclients.retrofit.intervention.CallbackInterventionManager import com.xjjk.healthyclients.superfuntion.initColors +import com.xjjk.healthyclients.superfuntion.orEmptyDefault import com.xjjk.healthyclients.ui.activity.CvdWarningHistoryActivity import com.xjjk.healthyclients.ui.activity.InterventionWebActivity import com.xjjk.healthyclients.utils.ConstantUtils @@ -222,28 +223,34 @@ class MonitorFragment: BaseVMBFragment(R. val dataBean = iterator.next() if (dataBean.wdType.equals("sleep")) { mBinding.sleepDateTv.text = dataBean.dataDate - var minutes: Float? = dataBean.dataValue.toFloatOrNull() - mBinding.sleepValueHourTv.text = - "${minutes?.div(60)?.toUInt()}" - mBinding.sleepValueMinuteTv.text = - "${minutes?.rem(60)?.toUInt()}" + + if (TextUtils.isEmpty(dataBean.dataValue)) { + mBinding.sleepValueHourTv.text = "--" + mBinding.sleepValueMinuteTv.text = "--" + } else { + var minutes: Float? = dataBean.dataValue?.toFloatOrNull() + mBinding.sleepValueHourTv.text = + "${minutes?.div(60)?.toUInt()}" + mBinding.sleepValueMinuteTv.text = + "${minutes?.rem(60)?.toUInt()}" + } iterator.remove() } if (dataBean.wdType.equals("steps")) { mBinding.stepDateTv.text = dataBean.dataDate - mBinding.stepValueTv.text = "${dataBean.dataValue}" + mBinding.stepValueTv.text = "${dataBean.dataValue.orEmptyDefault()}" iterator.remove() } if (dataBean.wdType.equals(TYPE_HEART_RATE)) { if (!TextUtils.isEmpty(dataBean.warnMin) && !TextUtils.isEmpty(dataBean.warnMax)) { - heartRateDefaultMin = "${dataBean.warnMin.toFloat().toInt()}次/分钟" - heartRateDefaultMax = "${dataBean.warnMax.toFloat().toInt()}次/分钟" + heartRateDefaultMin = "${dataBean.warnMin!!.toFloat().toInt()}次/分钟" + heartRateDefaultMax = "${dataBean.warnMax!!.toFloat().toInt()}次/分钟" } } if (dataBean.wdType.equals(TYPE_SPO2)) { if (!TextUtils.isEmpty(dataBean.warnMin)) { - spo2DefaultMin = dataBean.warnMin.toFloat().toInt() + spo2DefaultMin = dataBean.warnMin!!.toFloat().toInt() } } if (dataBean.wdType.equals(TYPE_TEMPERATURE)) { @@ -254,7 +261,7 @@ class MonitorFragment: BaseVMBFragment(R. } if (dataBean.wdType.equals(TYPE_STRESS)) { if (!TextUtils.isEmpty(dataBean.warnMax)) { - StressDefaultMin = dataBean.warnMax.toFloat().toInt() + StressDefaultMin = dataBean.warnMax!!.toFloat().toInt() } } } diff --git a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt index 42f450a..ea487d2 100644 --- a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt +++ b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt @@ -15,12 +15,12 @@ object UrlConfig { // private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://192.168.1.23/" // 开发环境 private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://api-xj.tri.dt.io/" // 开发环境 - private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://api-xj.tri.icdat.cn" // 测试环境 + private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://xj-api.mcrm.vip:8888" // 测试环境 // private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://api.xjygjk.com" // 正式环境 private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://api-jkglpt.iosp.ydpt.tech" // 正式环境 private const val DEBUG_H5_ADDRESS_REMOTE = "http://console-xj.tri.dt.io" // 开发环境 - private const val TEST_H5_ADDRESS_REMOTE = "https://console-xj.tri.icdat.cn" // 测试环境 + private const val TEST_H5_ADDRESS_REMOTE = "https://xj-admin.mcrm.vip:8888" // 测试环境 // private const val PRODUCT_H5_ADDRESS_REMOTE = "https://console.xjygjk.com" // 正式环境 private const val PRODUCT_H5_ADDRESS_REMOTE = "https://console-jkglpt.iosp.ydpt.tech" // 正式环境 //2025年10月23日 14:37 冯普说改为阿里云的地址，给油田部署的正式地址还没有启用 @@ -30,7 +30,7 @@ object UrlConfig { const val ANYAN_CHANGE_PASSWORD_H5 = "https://sso.iosp.ydpt.tech/SSOManageClient/userController/changePassword" - val baseUrlType: BaseUrlType = BaseUrlType.PRODUCT + val baseUrlType: BaseUrlType = BaseUrlType.TEST var testDeviceList = mutableListOf("7e8e7e49a26340b1","bb2d17cc138d109f")//测试设备列表 荣耀 oppo vivo var isTestDevice: Boolean = false