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 c19cdae..5b86486 100644 --- a/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt +++ b/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt @@ -147,9 +147,27 @@ class MySubscriptionAdapter( } val times = Utils.differYear(cTimeMillis, 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]) + holder.getTextView(R.id.tv_add_success_device_expires_days).apply { + visibility = if (item.subscriptionStatus == ConstantInt.Close) { + text = times[0] + View.VISIBLE + } else View.GONE + holder.getTextView(R.id.tv_add_device_expires_year_title).visibility = visibility + } + holder.getTextView(R.id.tv_add_success_device_expires_hours).apply { + visibility = if (item.subscriptionStatus == ConstantInt.Close) { + text = times[1] + View.VISIBLE + } else View.GONE + holder.getTextView(R.id.tv_add_device_expires_month_title).visibility = visibility + } + holder.getTextView(R.id.tv_add_success_device_expires_min).apply { + visibility = if (item.subscriptionStatus == ConstantInt.Close) { + text = times[2] + View.VISIBLE + } else View.GONE + holder.getTextView(R.id.tv_add_device_expires_day_title).visibility = visibility + } holder.getView(R.id.fl_my_subscription_btn_layout).apply { //UserId不一样就是共享设备的订单 diff --git a/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt b/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt index b5db77a..b60f1cb 100644 --- a/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt +++ b/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt @@ -581,9 +581,8 @@ class ViewUtil private constructor() { if (allGranted) { LogUtil.e("获取READ_MEDIA_IMAGES权限成功") EasyPhotos.createAlbum(activity, true, false, CoilEngine.instance) - .setFileProviderAuthority(FileUtil.FILE_PROVIDER) - .setCount(count).setPuzzleMenu(false).setCleanMenu(false) - .start(requestCode) + .setFileProviderAuthority(FileUtil.FILE_PROVIDER).setCount(count) + .setPuzzleMenu(false).setCleanMenu(false).start(requestCode) //activity.overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left) } else { LogUtil.e("获取READ_MEDIA_IMAGES权限,但部分权限未正常授予") diff --git a/app/src/main/res/layout/layout_subscribe_count_down.xml b/app/src/main/res/layout/layout_subscribe_count_down.xml index 041607a..54076ac 100644 --- a/app/src/main/res/layout/layout_subscribe_count_down.xml +++ b/app/src/main/res/layout/layout_subscribe_count_down.xml @@ -52,6 +52,7 @@ app:qmui_radius="@dimen/dp_8" /> Fully charged Fell asleep %s ago Move %s to wake up - Baidu Map Timeline Keep phone close to device