ABBIDOT_APP/Abbidot_Android
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.套餐到期年月日时间重新计算，去掉显示一位数补齐0

Browse Source
This commit is contained in:
yezhiqiu
2026-01-09 15:02:51 +08:00
parent dd3beea20e
commit 5663af6a17
5 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt
View File

@@ -120,7 +120,7 @@ class MySubscriptionAdapter(
}
}
val times = Utils.getDayToYearMonthDay(item.surplusDays)
val times = Utils.differYear(System.currentTimeMillis(), item.endTime)
holder.setText(R.id.tv_add_success_device_expires_days, times[0])
holder.setText(R.id.tv_add_success_device_expires_hours, times[1])
holder.setText(R.id.tv_add_success_device_expires_min, times[2])

4
app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt
View File

@@ -78,7 +78,9 @@ class PaymentSuccessActivity :
tvPaymentSuccessExpiresOnDate.text = Utils.stringToDate(
it.expirationTime, resultFormat = Utils.DATE_FORMAT_PATTERN_EN7
)
val times = Utils.getDayToYearMonthDay(it.surplusDays)
val times = Utils.differYear(
System.currentTimeMillis(), Utils.stringToTimestamp(it.expirationTime)
)
ilPaymentSuccessCountDownLayout.tvAddSuccessDeviceExpiresDays.text = times[0]
ilPaymentSuccessCountDownLayout.tvAddSuccessDeviceExpiresHours.text = times[1]
ilPaymentSuccessCountDownLayout.tvAddSuccessDeviceExpiresMin.text = times[2]

2
app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt
View File

@@ -416,9 +416,11 @@ class HomeTrackFragment :
private fun shareDeviceState() {
val share = MMKVUtil.getInt(MMKVKey.Shared)
if (share == ConstantInt.NoShare) {
mViewBinding.rvHomePetTrackMenu.visibility=View.VISIBLE
mZoneAdapter.showNoDataAddButton(true)
mFencesAdapter.showNoDataAddButton(true)
} else {
mViewBinding.rvHomePetTrackMenu.visibility=View.GONE
mZoneAdapter.showNoDataAddButton(false)
mFencesAdapter.showNoDataAddButton(false)
}

4
app/src/main/res/layout/fragment_home_track.xml
View File

@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/dp_8">
android:paddingBottom="@dimen/dp_10">
<RelativeLayout
android:layout_width="match_parent"
@@ -142,6 +142,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"
android:background="@drawable/shape16_white_color_bg"
android:nestedScrollingEnabled="false"/>
android:nestedScrollingEnabled="false" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.core.widget.NestedScrollView>