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

时间统一格式

Browse Source
This commit is contained in:
yezhiqiu
2026-04-15 11:51:38 +08:00
parent d002310a0d
commit d8ab8599da
12 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ class MySubscriptionAdapter(
} }
holder.setText( holder.setText(
R.id.tv_my_subscription_active_time, R.id.tv_my_subscription_active_time,
Utils.formatTime(item.payTime, Utils.DATE_FORMAT_PATTERN_EN6) Utils.formatTime(item.payTime, Utils.DATE_FORMAT_PATTERN_CN4)
) )
holder.getTextView(R.id.tv_my_subscription_annual_care).apply { holder.getTextView(R.id.tv_my_subscription_annual_care).apply {
@@ -91,12 +91,12 @@ class MySubscriptionAdapter(
holder.getTextView(R.id.tv_my_subscription_expires_on).apply { holder.getTextView(R.id.tv_my_subscription_expires_on).apply {
text = if (item.orderStatus == 6 && item.refundTime > 0L) { text = if (item.orderStatus == 6 && item.refundTime > 0L) {
Utils.formatTime(item.refundTime, Utils.DATE_FORMAT_PATTERN_EN6) Utils.formatTime(item.refundTime, Utils.DATE_FORMAT_PATTERN_CN4)
} else { } else {
Utils.formatTime( Utils.formatTime(
Utils.timestampAddHowTimestamp( Utils.timestampAddHowTimestamp(
item.payTime, item.mealPeriod, item.mealUnit item.payTime, item.mealPeriod, item.mealUnit
), Utils.DATE_FORMAT_PATTERN_EN7 ), Utils.DATE_FORMAT_PATTERN_CN
) )
} }
} }

6
app/src/main/java/com/abbidot/tracker/adapter/NotificationV2Adapter.kt
View File

@@ -67,15 +67,15 @@ class NotificationV2Adapter(
val now = System.currentTimeMillis() val now = System.currentTimeMillis()
formatDateStr = if (DateUtils.isToday(cTimeStamp)) { formatDateStr = if (DateUtils.isToday(cTimeStamp)) {
mContext.getString(R.string.txt_today) + " " + Utils.formatTime( mContext.getString(R.string.txt_today) + " " + Utils.formatTime(
timeStamp, Utils.DATE_FORMAT_PATTERN_EN8 timeStamp, Utils.DATE_FORMAT_PATTERN_EN14
) )
} else if (now - cTimeStamp < (48 * 60 * 60 * 1000)) { } else if (now - cTimeStamp < (48 * 60 * 60 * 1000)) {
mContext.getString(R.string.txt_yesterday) + " " + Utils.formatTime( mContext.getString(R.string.txt_yesterday) + " " + Utils.formatTime(
timeStamp, Utils.DATE_FORMAT_PATTERN_EN8 timeStamp, Utils.DATE_FORMAT_PATTERN_EN14
) )
} else { } else {
Utils.formatTime( Utils.formatTime(
timeStamp, Utils.DATE_FORMAT_PATTERN_EN9 timeStamp, Utils.DATE_FORMAT_PATTERN_CN2
) )
} }
return formatDateStr return formatDateStr

6
app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt
View File

@@ -63,7 +63,7 @@ class SubscriptionHistoryAdapter(
holder.setText(R.id.tv_subscription_annual_care_state, state) holder.setText(R.id.tv_subscription_annual_care_state, state)
holder.setText( holder.setText(
R.id.tv_subscription_annual_care_active_time, Utils.formatTime( R.id.tv_subscription_annual_care_active_time, Utils.formatTime(
item.payTime, Utils.DATE_FORMAT_PATTERN_EN7 item.payTime, Utils.DATE_FORMAT_PATTERN_CN
) )
) )
//保险时长，不足一年按12个月算 //保险时长，不足一年按12个月算
@@ -73,7 +73,7 @@ class SubscriptionHistoryAdapter(
R.id.tv_subscription_annual_care_expiry_time, Utils.formatTime( R.id.tv_subscription_annual_care_expiry_time, Utils.formatTime(
Utils.timestampAddHowTimestamp( Utils.timestampAddHowTimestamp(
item.payTime, insuranceTime, ConstantString.PackageUnitYear item.payTime, insuranceTime, ConstantString.PackageUnitYear
), Utils.DATE_FORMAT_PATTERN_EN7 ), Utils.DATE_FORMAT_PATTERN_CN
) )
) )
holder.setText( holder.setText(
@@ -93,7 +93,7 @@ class SubscriptionHistoryAdapter(
) )
holder.setText( holder.setText(
R.id.tv_subscription_history_order_time, R.id.tv_subscription_history_order_time,
Utils.formatTime(item.payTime, Utils.DATE_FORMAT_PATTERN_EN10) Utils.formatTime(item.payTime, Utils.DATE_FORMAT_PATTERN_CN2)
) )
holder.setText(R.id.tv_subscription_history_package_name, item.mealName) holder.setText(R.id.tv_subscription_history_package_name, item.mealName)
holder.setText( holder.setText(

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

@@ -68,7 +68,7 @@ class PaymentSuccessActivity :
tvPaymentSuccessExpiresOnDate.text = Utils.formatTime( tvPaymentSuccessExpiresOnDate.text = Utils.formatTime(
Utils.stringToTimestamp( Utils.stringToTimestamp(
it.expirationTime, isUtc = true it.expirationTime, isUtc = true
), Utils.DATE_FORMAT_PATTERN_EN6 ), Utils.DATE_FORMAT_PATTERN_CN4
) )
val times = Utils.differYear( val times = Utils.differYear(
System.currentTimeMillis(), Utils.stringToTimestamp(it.expirationTime) System.currentTimeMillis(), Utils.stringToTimestamp(it.expirationTime)

6
app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt
View File

@@ -193,7 +193,7 @@ class SureSubscriptionPlanActivity :
nowTimestamp, p.period, ConstantString.PackageUnitYear nowTimestamp, p.period, ConstantString.PackageUnitYear
) )
val renewalDate = val renewalDate =
Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_EN7) Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_CN)
if (p.planTimeMonthsCount > 12) { if (p.planTimeMonthsCount > 12) {
String.format( String.format(
getString(R.string.txt_renewal_years), getString(R.string.txt_renewal_years),
@@ -210,7 +210,7 @@ class SureSubscriptionPlanActivity :
val renewalTimestamp = val renewalTimestamp =
Utils.getAfterHowTimestamp(nowTimestamp, p.period.toLong()) Utils.getAfterHowTimestamp(nowTimestamp, p.period.toLong())
val renewalDate = val renewalDate =
Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_EN7) Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_CN)
String.format( String.format(
getString(R.string.txt_renewal_day), getString(R.string.txt_renewal_day),
autoRenewPrice, autoRenewPrice,
@@ -222,7 +222,7 @@ class SureSubscriptionPlanActivity :
nowTimestamp, p.planTimeMonthsCount, ConstantString.PackageUnitMonth nowTimestamp, p.planTimeMonthsCount, ConstantString.PackageUnitMonth
) )
val renewalDate = val renewalDate =
Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_EN7) Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_CN)
if (p.planTimeMonthsCount > 1) { if (p.planTimeMonthsCount > 1) {
String.format( String.format(
getString(R.string.txt_renewal_months), getString(R.string.txt_renewal_months),

4
app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt
View File

@@ -196,9 +196,9 @@ class ActivityV2Fragment :
var activeTime = 0 var activeTime = 0
val updateTime = if (homeDataBean.updateTime == 0L) { val updateTime = if (homeDataBean.updateTime == 0L) {
Utils.formatTime(System.currentTimeMillis(), Utils.DATE_FORMAT_PATTERN_EN6) Utils.formatTime(System.currentTimeMillis(), Utils.DATE_FORMAT_PATTERN_EN15)
} else { } else {
Utils.formatTime(homeDataBean.updateTime * 1000, Utils.DATE_FORMAT_PATTERN_EN6) Utils.formatTime(homeDataBean.updateTime * 1000, Utils.DATE_FORMAT_PATTERN_EN15)
} }
tvHomeActivityV2UpdateTime.text = tvHomeActivityV2UpdateTime.text =
String.format(getString(R.string.txt_update_time), updateTime) String.format(getString(R.string.txt_update_time), updateTime)

2
app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV3Fragment.kt
View File

@@ -396,7 +396,7 @@ class RouteV3Fragment : BaseFragment<FragmentRouteV3Binding>(FragmentRouteV3Bind
mHistoryDataList[position].apply { mHistoryDataList[position].apply {
//详细位置 //详细位置
address = it address = it
val timeString = Utils.formatTime(timeStamp * 1000, Utils.DATE_FORMAT_PATTERN_EN10) val timeString = Utils.formatTime(timeStamp * 1000, Utils.DATE_FORMAT_PATTERN_CN5)
//更新位置时间 //更新位置时间
dayTime = timeString dayTime = timeString
mViewBinding.root.postDelayed( mViewBinding.root.postDelayed(

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

@@ -633,7 +633,7 @@ class HomeTrackFragment :
) )
}" }"
val eTime = Utils.stringToDate( val eTime = Utils.stringToDate(
endTime, Utils.DATE_FORMAT_PATTERN_CN, Utils.DATE_FORMAT_PATTERN_EN7 endTime, Utils.DATE_FORMAT_PATTERN_CN, Utils.DATE_FORMAT_PATTERN_CN
) )
val endTime = "${getString(R.string.txt_end_time)}：$eTime" val endTime = "${getString(R.string.txt_end_time)}：$eTime"
val id = "ID:$deviceOutId" val id = "ID:$deviceOutId"

2
app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt
View File

@@ -140,7 +140,7 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
mContext!!, mContext!!,
ilHomeMapPetLocation, ilHomeMapPetLocation,
llHomeMapDeviceBatteryLayout, llHomeMapDeviceBatteryLayout,
Utils.DATE_FORMAT_PATTERN_EN11, Utils.DATE_FORMAT_PATTERN_EN15,
true true
) { mapLoadOk() } ) { mapLoadOk() }

2
app/src/main/java/com/abbidot/tracker/ui/fragment/pet/HomePetFragment.kt
View File

@@ -200,7 +200,7 @@ class HomePetFragment : BaseFragment<FragmentHomePetBinding>(FragmentHomePetBind
tvHomePetV2Birthday.text = Utils.stringToDate( tvHomePetV2Birthday.text = Utils.stringToDate(
pet.birthdayDate, pet.birthdayDate,
Utils.DATE_FORMAT_PATTERN_CN, Utils.DATE_FORMAT_PATTERN_CN,
Utils.DATE_FORMAT_PATTERN_EN7 Utils.DATE_FORMAT_PATTERN_CN
) )
tvHomePetV2Sex.text = mPetViewModel.getSexName(mContext!!, pet.gender) tvHomePetV2Sex.text = mPetViewModel.getSexName(mContext!!, pet.gender)
val sexImage = if (pet.gender == ConstantInt.Man) { val sexImage = if (pet.gender == ConstantInt.Man) {

2
app/src/main/res/layout/fragment_route_v3.xml
View File

@@ -174,7 +174,7 @@
android:background="@drawable/shape20_white_half_bottom_bg" android:background="@drawable/shape20_white_half_bottom_bg"
android:paddingHorizontal="@dimen/dp_14" android:paddingHorizontal="@dimen/dp_14"
android:paddingBottom="@dimen/dp_22" android:paddingBottom="@dimen/dp_22"
android:visibility="visible"> android:visibility="gone">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ll_map_route_line_v3_zooming_layout" android:id="@+id/ll_map_route_line_v3_zooming_layout"

2
baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt
View File

@@ -32,6 +32,8 @@ class Utils {
const val DATE_FORMAT_PATTERN_CN = "yyyy-MM-dd" const val DATE_FORMAT_PATTERN_CN = "yyyy-MM-dd"
const val DATE_FORMAT_PATTERN_CN2 = "yyyy-MM-dd HH:mm:ss" const val DATE_FORMAT_PATTERN_CN2 = "yyyy-MM-dd HH:mm:ss"
const val DATE_FORMAT_PATTERN_CN3 = "yyyy/MM/dd HH:mm:ss" const val DATE_FORMAT_PATTERN_CN3 = "yyyy/MM/dd HH:mm:ss"
const val DATE_FORMAT_PATTERN_CN4 = "yyyy-MM-dd HH:mm"
const val DATE_FORMAT_PATTERN_CN5 = "MM-dd HH:mm:ss"
const val DATE_FORMAT_PATTERN_EN1 = "MMM d, yyyy | HH:mm" const val DATE_FORMAT_PATTERN_EN1 = "MMM d, yyyy | HH:mm"
const val DATE_FORMAT_PATTERN_EN2 = "d MMM yyyy hh:mm a" const val DATE_FORMAT_PATTERN_EN2 = "d MMM yyyy hh:mm a"
const val DATE_FORMAT_PATTERN_EN3 = "MMM d, yyyy" const val DATE_FORMAT_PATTERN_EN3 = "MMM d, yyyy"