自动订阅的套餐列表，不显示倒计时，取消自动订阅的套餐才显示

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.getTextView(R.id.tv_add_success_device_expires_days).apply {
-        holder.setText(R.id.tv_add_success_device_expires_hours, times[1])
+            visibility = if (item.subscriptionStatus == ConstantInt.Close) {
-        holder.setText(R.id.tv_add_success_device_expires_min, times[2])
+                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不一样就是共享设备的订单

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)
+                            .setFileProviderAuthority(FileUtil.FILE_PROVIDER).setCount(count)
-                            .setCount(count).setPuzzleMenu(false).setCleanMenu(false)
+                            .setPuzzleMenu(false).setCleanMenu(false).start(requestCode)
-                            .start(requestCode)
                         //activity.overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left)
                     } else {
                         LogUtil.e("获取READ_MEDIA_IMAGES权限，但部分权限未正常授予")

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"

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>