ABBIDOT_APP/Abbidot_Android
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复退款还显示活跃并且点充值是开启自动订阅的bug

Browse Source
This commit is contained in:
yezhiqiu
2026-02-05 17:36:01 +08:00
parent 5373acaa80
commit dc9c091155
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/abbidot/tracker/adapter/MySubscriptionAdapter.kt
View File

@@ -98,7 +98,8 @@ class MySubscriptionAdapter(
) )
} }
val cTimeMillis = System.currentTimeMillis() 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 = val isExpired =
item.orderStatus == 6 || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0) 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 { view.findViewById<TypefaceTextView>(R.id.tv_pop_my_subscription_auto_renew).apply {
val cTimeMillis = System.currentTimeMillis() 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 = visibility =
if (item.planCategory == "Premium" || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0)) { if (item.planCategory == "Premium" || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0)) {
View.GONE View.GONE

6
app/src/main/java/com/abbidot/tracker/adapter/SubscriptionHistoryAdapter.kt
View File

@@ -52,7 +52,8 @@ class SubscriptionHistoryAdapter(
context.getString(R.string.txt_order_id) + item.orderNum context.getString(R.string.txt_order_id) + item.orderNum
) )
val cTimeMillis = System.currentTimeMillis() 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 = val state =
if (item.enabled == ConstantInt.Type0 || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0)) { if (item.enabled == ConstantInt.Type0 || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0)) {
context.getString(R.string.txt_expired) context.getString(R.string.txt_expired)
@@ -163,7 +164,8 @@ class SubscriptionHistoryAdapter(
} }
val cTimeMillis = System.currentTimeMillis() 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 = val state =
if (item.enabled == ConstantInt.Type0 || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0)) { if (item.enabled == ConstantInt.Type0 || (item.subscriptionStatus == ConstantInt.Close && expiredTime <= 0)) {
context.getString(R.string.txt_expired) context.getString(R.string.txt_expired)

9
app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt
View File

@@ -1,7 +1,6 @@
package com.abbidot.tracker.ui.fragment.data package com.abbidot.tracker.ui.fragment.data
import android.content.Context import android.content.Context
import android.text.TextUtils
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
@@ -172,11 +171,11 @@ class RouteV2Fragment : BaseFragment<FragmentRouteV2Binding>(FragmentRouteV2Bind
mViewBinding.miHomeRouteAddressView.visibility = View.GONE mViewBinding.miHomeRouteAddressView.visibility = View.GONE
mHistoryDataMapCommon.slideChanged(progress) mHistoryDataMapCommon.slideChanged(progress)
val historyDataBean = mHistoryDataList[progress] // val historyDataBean = mHistoryDataList[progress]
val address = historyDataBean.address // val address = historyDataBean.address
if (!TextUtils.isEmpty(address)) { // if (!TextUtils.isEmpty(address)) {
// mHistoryDataMapCommon.showInfoWindow(historyDataBean) // mHistoryDataMapCommon.showInfoWindow(historyDataBean)
} // }
} }
override fun onStopChanged(progress: Int) { override fun onStopChanged(progress: Int) {