diff --git a/app/src/main/java/com/xjjk/healthyclients/fragment/WatchItemFragment.kt b/app/src/main/java/com/xjjk/healthyclients/fragment/WatchItemFragment.kt index 10b8dce..84dd637 100644 --- a/app/src/main/java/com/xjjk/healthyclients/fragment/WatchItemFragment.kt +++ b/app/src/main/java/com/xjjk/healthyclients/fragment/WatchItemFragment.kt @@ -129,23 +129,23 @@ class WatchItemFragment : mBinding.watchLeftValue.text = "--" mBinding.watchRightValue.text = "--" } else { - if (TextUtils.isEmpty(bean.latest)) { - mBinding.watchValue.text = "--" + if (TextUtils.isEmpty(bean.latest)||bean.latest.floatToInt()==0) { + mBinding.watchValue.text = "--分钟" } else { mBinding.watchValue.text = DateUtil.timeDiff(bean.latest!!.floatToInt().toLong() * 1000 * 60) .orEmptyDefault() } - if (TextUtils.isEmpty(bean.max)) { - mBinding.watchLeftValue.text = "--" + if (TextUtils.isEmpty(bean.max)||bean.max.floatToInt()==0) { + mBinding.watchLeftValue.text = "--分钟" } else { mBinding.watchLeftValue.text = DateUtil.timeDiff(bean.max!!.floatToInt().toLong() * 1000 * 60) .orEmptyDefault() } - if (TextUtils.isEmpty(bean.min)) { - mBinding.watchRightValue.text = "--" + if (TextUtils.isEmpty(bean.min)||bean.min.floatToInt()==0) { + mBinding.watchRightValue.text = "--分钟" } else { mBinding.watchRightValue.text = DateUtil.timeDiff(bean.min!!.floatToInt().toLong() * 1000 * 60) diff --git a/app/src/main/res/drawable-xxhdpi/icon_home_head.png b/app/src/main/res/drawable-xxhdpi/icon_home_head.png index 1d69f5c..1da04af 100644 Binary files a/app/src/main/res/drawable-xxhdpi/icon_home_head.png and b/app/src/main/res/drawable-xxhdpi/icon_home_head.png differ diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index d3e2df2..1a31965 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -84,7 +84,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="24dp" - android:layout_marginTop="10dp" + android:layout_marginTop="6dp" android:ellipsize="end" android:textColor="@color/white" android:textSize="12sp" diff --git a/config.gradle b/config.gradle index 9bc2eba..bf9df65 100644 --- a/config.gradle +++ b/config.gradle @@ -2,8 +2,8 @@ ext { minSdkVersion = 26 targetSdkVersion = 32 compileSdkVersion = 33 - versionCode = 1010 - versionName = "1.0.10" + versionCode = 1011 + versionName = "1.0.11" //Dependencies junitVersion = "4.12" lifecycleVersion = "2.6.0-alpha01"