From 132589278026d3e6021a10c6aaf9463dc7150012 Mon Sep 17 00:00:00 2001
From: yezhiqiu <983577727@qq.com>
Date: Thu, 16 Apr 2026 14:58:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A2=E9=98=85=E7=9A=84?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=88=97=E8=A1=A8=EF=BC=8C=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=80=92=E8=AE=A1=E6=97=B6=EF=BC=8C=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A2=E9=98=85=E7=9A=84=E5=A5=97=E9=A4=90?=
 =?UTF-8?q?=E6=89=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tracker/adapter/MySubscriptionAdapter.kt  | 24 ++++++++++++++++---
 .../java/com/abbidot/tracker/util/ViewUtil.kt |  5 ++--
 .../layout/layout_subscribe_count_down.xml    |  3 +++
 app/src/main/res/values/strings.xml           |  1 -
 4 files changed, 26 insertions(+), 7 deletions(-)

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" />
 
     <com.abbidot.tracker.widget.TypefaceTextView
+        android:id="@+id/tv_add_device_expires_year_title"
         style="@style/my_TextView_style_v2"
         android:layout_below="@id/tv_add_success_device_expires_days"
         android:layout_alignStart="@id/tv_add_success_device_expires_days"
@@ -64,6 +65,7 @@
         app:typeface="@string/roboto_regular_font" />
 
     <com.abbidot.tracker.widget.TypefaceTextView
+        android:id="@+id/tv_add_device_expires_month_title"
         style="@style/my_TextView_style_v2"
         android:layout_below="@id/tv_add_success_device_expires_days"
         android:layout_alignStart="@id/tv_add_success_device_expires_hours"
@@ -76,6 +78,7 @@
         app:typeface="@string/roboto_regular_font" />
 
     <com.abbidot.tracker.widget.TypefaceTextView
+        android:id="@+id/tv_add_device_expires_day_title"
         style="@style/my_TextView_style_v2"
         android:layout_below="@id/tv_add_success_device_expires_days"
         android:layout_alignStart="@id/tv_add_success_device_expires_min"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7b733f..4494287 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1075,7 +1075,6 @@
     <string name="txt_fully_charged">Fully charged</string>
     <string name="txt_fully_asleep">Fell asleep %s ago</string>
     <string name="txt_move_wake">Move %s to wake up</string>
-
     <string name="map_navigate_map_baidu">Baidu Map</string>
     <string name="txt_time_line">Timeline</string>
     <string name="txt_phone_close_device">Keep phone close to device</string>