diff --git a/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt b/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt index 50d75bd..c19cdae 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt +++ b/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt @@ -80,7 +80,7 @@ class MySubscriptionAdapter( } holder.setText( 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 { @@ -91,12 +91,12 @@ class MySubscriptionAdapter( holder.getTextView(R.id.tv_my_subscription_expires_on).apply { 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 { Utils.formatTime( Utils.timestampAddHowTimestamp( item.payTime, item.mealPeriod, item.mealUnit - ), Utils.DATE_FORMAT_PATTERN_EN7 + ), Utils.DATE_FORMAT_PATTERN_CN ) } } diff --git a/app/src/main/java/com/abbidot/tracker/adapter/NotificationV2Adapter.kt b/app/src/main/java/com/abbidot/tracker/adapter/NotificationV2Adapter.kt index 1853e21..e3a64fd 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/NotificationV2Adapter.kt +++ b/app/src/main/java/com/abbidot/tracker/adapter/NotificationV2Adapter.kt @@ -67,15 +67,15 @@ class NotificationV2Adapter( val now = System.currentTimeMillis() formatDateStr = if (DateUtils.isToday(cTimeStamp)) { 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)) { mContext.getString(R.string.txt_yesterday) + " " + Utils.formatTime( - timeStamp, Utils.DATE_FORMAT_PATTERN_EN8 + timeStamp, Utils.DATE_FORMAT_PATTERN_EN14 ) } else { Utils.formatTime( - timeStamp, Utils.DATE_FORMAT_PATTERN_EN9 + timeStamp, Utils.DATE_FORMAT_PATTERN_CN2 ) } return formatDateStr diff --git a/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt b/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt index 5cd7c8d..5e3cd6b 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt +++ b/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt @@ -63,7 +63,7 @@ class SubscriptionHistoryAdapter( holder.setText(R.id.tv_subscription_annual_care_state, state) holder.setText( 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个月算 @@ -73,7 +73,7 @@ class SubscriptionHistoryAdapter( R.id.tv_subscription_annual_care_expiry_time, Utils.formatTime( Utils.timestampAddHowTimestamp( item.payTime, insuranceTime, ConstantString.PackageUnitYear - ), Utils.DATE_FORMAT_PATTERN_EN7 + ), Utils.DATE_FORMAT_PATTERN_CN ) ) holder.setText( @@ -93,7 +93,7 @@ class SubscriptionHistoryAdapter( ) holder.setText( 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( diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt index e4bfda1..c015c49 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt @@ -68,7 +68,7 @@ class PaymentSuccessActivity : tvPaymentSuccessExpiresOnDate.text = Utils.formatTime( Utils.stringToTimestamp( it.expirationTime, isUtc = true - ), Utils.DATE_FORMAT_PATTERN_EN6 + ), Utils.DATE_FORMAT_PATTERN_CN4 ) val times = Utils.differYear( System.currentTimeMillis(), Utils.stringToTimestamp(it.expirationTime) diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt index 8e254e9..2635a73 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SureSubscriptionPlanActivity.kt @@ -193,7 +193,7 @@ class SureSubscriptionPlanActivity : nowTimestamp, p.period, ConstantString.PackageUnitYear ) val renewalDate = - Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_EN7) + Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_CN) if (p.planTimeMonthsCount > 12) { String.format( getString(R.string.txt_renewal_years), @@ -210,7 +210,7 @@ class SureSubscriptionPlanActivity : val renewalTimestamp = Utils.getAfterHowTimestamp(nowTimestamp, p.period.toLong()) val renewalDate = - Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_EN7) + Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_CN) String.format( getString(R.string.txt_renewal_day), autoRenewPrice, @@ -222,7 +222,7 @@ class SureSubscriptionPlanActivity : nowTimestamp, p.planTimeMonthsCount, ConstantString.PackageUnitMonth ) val renewalDate = - Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_EN7) + Utils.formatTime(renewalTimestamp, Utils.DATE_FORMAT_PATTERN_CN) if (p.planTimeMonthsCount > 1) { String.format( getString(R.string.txt_renewal_months), diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt index bc904e1..d69cb24 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/ActivityV2Fragment.kt @@ -196,9 +196,9 @@ class ActivityV2Fragment : var activeTime = 0 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 { - Utils.formatTime(homeDataBean.updateTime * 1000, Utils.DATE_FORMAT_PATTERN_EN6) + Utils.formatTime(homeDataBean.updateTime * 1000, Utils.DATE_FORMAT_PATTERN_EN15) } tvHomeActivityV2UpdateTime.text = String.format(getString(R.string.txt_update_time), updateTime) diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV3Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV3Fragment.kt index be3219f..a1482e0 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV3Fragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV3Fragment.kt @@ -396,7 +396,7 @@ class RouteV3Fragment : BaseFragment(FragmentRouteV3Bind mHistoryDataList[position].apply { //详细位置 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 mViewBinding.root.postDelayed( diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt index da2a22b..8963a68 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/device/HomeTrackFragment.kt @@ -633,7 +633,7 @@ class HomeTrackFragment : ) }" 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 id = "ID:$deviceOutId" diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt index 795cac6..1188689 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt @@ -140,7 +140,7 @@ class MapV3Fragment : BaseFragment(FragmentMapV3Binding::i mContext!!, ilHomeMapPetLocation, llHomeMapDeviceBatteryLayout, - Utils.DATE_FORMAT_PATTERN_EN11, + Utils.DATE_FORMAT_PATTERN_EN15, true ) { mapLoadOk() } diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/pet/HomePetFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/pet/HomePetFragment.kt index eaeffa4..7292b23 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/pet/HomePetFragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/pet/HomePetFragment.kt @@ -200,7 +200,7 @@ class HomePetFragment : BaseFragment(FragmentHomePetBind tvHomePetV2Birthday.text = Utils.stringToDate( pet.birthdayDate, Utils.DATE_FORMAT_PATTERN_CN, - Utils.DATE_FORMAT_PATTERN_EN7 + Utils.DATE_FORMAT_PATTERN_CN ) tvHomePetV2Sex.text = mPetViewModel.getSexName(mContext!!, pet.gender) val sexImage = if (pet.gender == ConstantInt.Man) { diff --git a/app/src/main/res/layout/fragment_route_v3.xml b/app/src/main/res/layout/fragment_route_v3.xml index 302862a..60ddf90 100644 --- a/app/src/main/res/layout/fragment_route_v3.xml +++ b/app/src/main/res/layout/fragment_route_v3.xml @@ -174,7 +174,7 @@ android:background="@drawable/shape20_white_half_bottom_bg" android:paddingHorizontal="@dimen/dp_14" android:paddingBottom="@dimen/dp_22" - android:visibility="visible"> + android:visibility="gone">