From dc9c091155b31d8a8576404b33e5734487ed93c7 Mon Sep 17 00:00:00 2001
From: yezhiqiu <983577727@qq.com>
Date: Thu, 5 Feb 2026 17:36:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E6=AC=BE=E8=BF=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=B4=BB=E8=B7=83=E5=B9=B6=E4=B8=94=E7=82=B9?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E6=98=AF=E5=BC=80=E5=90=AF=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/abbidot/tracker/adapter/MySubscriptionAdapter.kt | 6 ++++--
 .../tracker/adapter/SubscriptionHistoryAdapter.kt        | 6 ++++--
 .../abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt  | 9 ++++-----
 3 files changed, 12 insertions(+), 9 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 5003e60..532a182 100644
--- a/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt
+++ b/app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt
@@ -98,7 +98,8 @@ class MySubscriptionAdapter(
             )
         }
         val cTimeMillis = System.currentTimeMillis()
-        val expiredTime = item.endTime * 1000 - cTimeMillis
+        val endTime = if (item.refundTime == 0L) item.endTime else item.refundTime
+        val expiredTime = endTime * 1000 - cTimeMillis
         //是否过期套餐
         val isExpired =
             item.orderStatus == 6 || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0)
@@ -179,7 +180,8 @@ class MySubscriptionAdapter(
         //升级套餐
         view.findViewById<TypefaceTextView>(R.id.tv_pop_my_subscription_auto_renew).apply {
             val cTimeMillis = System.currentTimeMillis()
-            val expiredTime = item.endTime * 1000 - cTimeMillis
+            val endTime = if (item.refundTime == 0L) item.endTime else item.refundTime
+            val expiredTime = endTime * 1000 - cTimeMillis
             visibility =
                 if (item.planCategory == "Premium" || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0)) {
                     View.GONE
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 900dcfe..5cd7c8d 100644
--- a/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt
+++ b/app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt
@@ -52,7 +52,8 @@ class SubscriptionHistoryAdapter(
             context.getString(R.string.txt_order_id) + item.orderNum
         )
         val cTimeMillis = System.currentTimeMillis()
-        val expiredTime = item.endTime * 1000 - cTimeMillis
+        val endTime = if (item.refundTime == 0L) item.endTime else item.refundTime
+        val expiredTime = endTime * 1000 - cTimeMillis
         val state =
             if (item.enabled == ConstantInt.Type0 || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0)) {
                 context.getString(R.string.txt_expired)
@@ -163,7 +164,8 @@ class SubscriptionHistoryAdapter(
         }
 
         val cTimeMillis = System.currentTimeMillis()
-        val expiredTime = item.endTime * 1000 - cTimeMillis
+        val endTime = if (item.refundTime == 0L) item.endTime else item.refundTime
+        val expiredTime = endTime * 1000 - cTimeMillis
         val state =
             if (item.enabled == ConstantInt.Type0 || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0)) {
                 context.getString(R.string.txt_expired)
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt
index e19c46f..d9c0744 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt
@@ -1,7 +1,6 @@
 package com.abbidot.tracker.ui.fragment.data
 
 import android.content.Context
-import android.text.TextUtils
 import android.view.Gravity
 import android.view.View
 import androidx.core.view.WindowInsetsCompat
@@ -172,11 +171,11 @@ class RouteV2Fragment : BaseFragment<FragmentRouteV2Binding>(FragmentRouteV2Bind
                 mViewBinding.miHomeRouteAddressView.visibility = View.GONE
                 mHistoryDataMapCommon.slideChanged(progress)
 
-                val historyDataBean = mHistoryDataList[progress]
-                val address = historyDataBean.address
-                if (!TextUtils.isEmpty(address)) {
+//                val historyDataBean = mHistoryDataList[progress]
+//                val address = historyDataBean.address
+//                if (!TextUtils.isEmpty(address)) {
 //                    mHistoryDataMapCommon.showInfoWindow(historyDataBean)
-                }
+//                }
             }
 
             override fun onStopChanged(progress: Int) {