From d7fb4e3a56fcef12f854458d1fddea0d9b09d2b5 Mon Sep 17 00:00:00 2001
From: yezhiqiu <123456@qq.com>
Date: Tue, 22 Sep 2026 17:59:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AE=A2=E9=98=85=E6=96=B0ui=E5=AD=97?=
=?UTF-8?q?=E7=AC=A6=E4=B8=B2=E5=A2=9E=E5=8A=A0=E5=85=B6=E4=BB=96=E8=AF=AD?=
=?UTF-8?q?=E8=A8=80=202.=E5=90=AF=E5=8A=A8=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=98=B2=E7=AF=A1=E6=94=B9=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tracker/bean/SubscriptionsOrderBean.kt | 5 +-
.../tracker/ui/activity/SplashActivity.kt | 5 +-
.../subscribe/RefundDetailsActivity.kt | 14 ++---
app/src/main/res/layout/activity_splash.xml | 10 ++++
app/src/main/res/values-de/strings.xml | 58 +++++++++++++++++++
app/src/main/res/values-fr/strings.xml | 58 ++++++++++++++++++-
app/src/main/res/values-it/strings.xml | 53 +++++++++++++++++
app/src/main/res/values-zh-rCN/strings.xml | 32 ++++++++++
8 files changed, 221 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/com/abbidot/tracker/bean/SubscriptionsOrderBean.kt b/app/src/main/java/com/abbidot/tracker/bean/SubscriptionsOrderBean.kt
index 5254afd..6733224 100644
--- a/app/src/main/java/com/abbidot/tracker/bean/SubscriptionsOrderBean.kt
+++ b/app/src/main/java/com/abbidot/tracker/bean/SubscriptionsOrderBean.kt
@@ -60,6 +60,7 @@ data class SubscriptionsOrderBean(
@MultipleEntity var menuType: Int,
var renewNum: String,
var paymentMethodInfo: String,
+ var refundCreateTime: Long,
var createUserId: String,//这个订单是由哪个用户创建的
var isUpdateOrder: Int = 0//是否是升级订单 1:是 0:否
) : Parcelable, MultiItemEntity {
@@ -108,7 +109,7 @@ data class SubscriptionsOrderBean(
0L,
0,
0,
- menuType, "", "", "",
+ menuType, "", "", 0L, "",
0
)
@@ -157,7 +158,7 @@ data class SubscriptionsOrderBean(
0L,
0,
0,
- MultipleEntity.TEXT, "", "", "",
+ MultipleEntity.TEXT, "", "", 0L, "",
0
)
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt
index b5af55e..310889b 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt
@@ -121,6 +121,7 @@ class SplashActivity : QMUIActivity() {
}
if (NetworkUtil.isNetworkAvailable(mContext)) {
+ mViewBinding.lvSplashCheckStateLoading.visibility = View.VISIBLE
mAppSetViewModel.apply {
mCheckPackageStatusLiveData.observe(this@SplashActivity) {
if (null == it) {
@@ -152,13 +153,15 @@ class SplashActivity : QMUIActivity() {
* 显示非法APP包提示窗并finish
*/
private fun showToastAndFinish() {
+ mViewBinding.lvSplashCheckStateLoading.visibility = View.GONE
Toaster.show(getString(R.string.txt_no_legal_app))
mViewBinding.root.postDelayed({
finish()
- }, 2000)
+ }, 2500)
}
private fun checkLegal(checkType: Int) {
+ mViewBinding.lvSplashCheckStateLoading.visibility = View.GONE
MMKVUtil.putInt(MMKVKey.isCheckLegalApp, checkType)
legalApp()
}
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/RefundDetailsActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/RefundDetailsActivity.kt
index 1e76b3f..df752a4 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/RefundDetailsActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/RefundDetailsActivity.kt
@@ -59,6 +59,10 @@ class RefundDetailsActivity :
ilRefundDetailsStateStep4.tvRefundStateStepDesc.visibility = View.GONE
ilRefundDetailsStateStep4.viewRefundStateStepLine.visibility = View.GONE
+ if (it.refundCreateTime > 0) {
+ ilRefundDetailsStateStep1.tvRefundStateStepDesc.text =
+ Utils.formatTime(it.refundCreateTime, Utils.DATE_FORMAT_PATTERN_CN2)
+ }
//orderStatus=0 支付取消 1支付成功 2支付失败 3待支付 4申请审核中 5退款中 6退款成功 7退款失败 8审核失败
when (it.orderStatus) {
4 -> {
@@ -67,8 +71,6 @@ class RefundDetailsActivity :
getString(R.string.txt_refund_pending_tips)
ilRefundDetailsStateStep1.ivRefundStateStepDot.isSelected = true
- ilRefundDetailsStateStep1.tvRefundStateStepDesc.text =
- "2026年9月18日 15:40:07"
ilRefundDetailsStateStep2.ivRefundStateStepDot.isActivated = true
ilRefundDetailsStateStep2.tvRefundStateStepTitle.setTextColor(
ContextCompat.getColor(
@@ -86,8 +88,6 @@ class RefundDetailsActivity :
getString(R.string.txt_refund_processing_tips)
ilRefundDetailsStateStep1.ivRefundStateStepDot.isSelected = true
- ilRefundDetailsStateStep1.tvRefundStateStepDesc.text =
- "2026年9月18日 15:40:07"
ilRefundDetailsStateStep2.ivRefundStateStepDot.isSelected = true
ilRefundDetailsStateStep2.tvRefundStateStepTitle.setTypeface(typeface)
ilRefundDetailsStateStep2.tvRefundStateStepDesc.visibility = View.VISIBLE
@@ -108,8 +108,6 @@ class RefundDetailsActivity :
tvRefundDetailsStateContent.setText(R.string.txt_refund_success_tips)
ilRefundDetailsStateStep1.ivRefundStateStepDot.isSelected = true
- ilRefundDetailsStateStep1.tvRefundStateStepDesc.text =
- "2026年9月18日 15:40:07"
ilRefundDetailsStateStep2.ivRefundStateStepDot.isSelected = true
ilRefundDetailsStateStep2.tvRefundStateStepTitle.setTypeface(typeface)
ilRefundDetailsStateStep2.tvRefundStateStepDesc.visibility = View.VISIBLE
@@ -129,8 +127,6 @@ class RefundDetailsActivity :
tvRefundDetailsStateContent.setText(R.string.txt_refund_fail_tips)
ilRefundDetailsStateStep1.ivRefundStateStepDot.isSelected = true
- ilRefundDetailsStateStep1.tvRefundStateStepDesc.text =
- "2026年9月18日 15:40:07"
ilRefundDetailsStateStep2.ivRefundStateStepDot.isSelected = true
ilRefundDetailsStateStep2.tvRefundStateStepTitle.setTypeface(typeface)
ilRefundDetailsStateStep2.tvRefundStateStepDesc.visibility = View.VISIBLE
@@ -151,8 +147,6 @@ class RefundDetailsActivity :
tvRefundDetailsStateContent.setText(R.string.txt_refund_fail_tips)
ilRefundDetailsStateStep1.ivRefundStateStepDot.isSelected = true
- ilRefundDetailsStateStep1.tvRefundStateStepDesc.text =
- "2026年9月18日 15:40:07"
ilRefundDetailsStateStep2.ivRefundStateStepDot.isSelected = true
ilRefundDetailsStateStep2.tvRefundStateStepTitle.setTypeface(typeface)
ilRefundDetailsStateStep2.tvRefundStateStepDesc.visibility = View.VISIBLE
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index f858037..a130012 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -51,4 +51,14 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 341d523..dd58990 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -906,4 +906,62 @@
Entfernen
Deaktivieren & entfernen
Nicht autorisierte App. Von offizieller Quelle laden
+
+ Automatische Verlängerung
+ Nicht verfügbar
+
+ Verfügbar
+
+ In Prüfung
+
+ Wird bearbeitet
+
+ Fehlgeschlagen
+
+ Abgelehnt
+
+ Automatische Verlängerung deaktivieren?
+
+ Automatische Verlängerung aktivieren?
+
+ Ihr Erstattungsantrag wurde eingereicht und wird geprüft.
+
+ Ihr Tarif bleibt bis zum Ablauf aktiv.
+
+ Erstattungsdetails
+
+ Tarif
+ Bestell-ID
+
+ Bestellzeit
+
+ Zahlungsmethode
+
+ Erstattungsbetrag
+
+ Erstattungsstatus
+
+ Erstattung wird bearbeitet
+
+ Ihre Erstattung wurde genehmigt und wird bearbeitet.
+
+ Erstattung abgeschlossen
+
+ Erstattung nicht erfolgreich
+
+ Ihre Erstattung wurde an die ursprüngliche Zahlungsmethode gesendet.
+
+ Ihr Erstattungsantrag wurde nicht genehmigt.
+
+ Ihr Erstattungsantrag wurde eingereicht.
+
+ Antrag eingereicht
+
+ Ihr Erstattungsantrag wird geprüft.
+
+ Ihre Erstattung konnte nicht abgeschlossen werden. Bitte versuchen Sie es erneut oder kontaktieren Sie den Support.
+
+ Erstattung fehlgeschlagen
+ Erstattung abgelehnt
+ Erstattung ausstehend
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d96ec00..8e15843 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -899,7 +899,6 @@
privacy_fr.html
subscription_terms_conditions_fr.html
Session expirée. Veuillez vous reconnecter
-
Supprimer le mode de paiement
Voulez-vous vraiment supprimer ce mode de paiement ?
Veuillez désactiver le renouvellement automatique avant de supprimer votre mode de paiement.
@@ -907,4 +906,61 @@
Supprimer
Désactiver et supprimer
App non autorisée. Téléchargez depuis une source officielle
+
+ Renouvellement automatique
+
+ Indisponible
+
+ Disponible
+
+ En cours d’examen
+
+ En cours de traitement
+
+ Échec
+
+ Refusé
+
+ Désactiver le renouvellement automatique ?
+
+ Activer le renouvellement automatique ?
+
+ Votre demande de remboursement a été envoyée et est en cours d’examen.
+
+ Votre forfait reste actif jusqu’à son expiration.
+
+ Détails du remboursement
+
+ Forfait
+ ID de commande
+ Date de commande
+
+ Mode de paiement
+
+ Montant du remboursement
+
+ Statut du remboursement
+
+ Remboursement en cours
+
+ Votre remboursement a été approuvé et est en cours de traitement.
+
+ Remboursement terminé
+
+ Remboursement échoué
+
+ Votre remboursement a été envoyé à votre mode de paiement initial.
+
+ Votre demande de remboursement n’a pas été approuvée.
+
+ Votre demande de remboursement a été envoyée.
+
+ Demande envoyée
+
+ Votre demande de remboursement est en cours d’examen.
+
+ Nous n’avons pas pu effectuer votre remboursement. Veuillez réessayer ou contacter le support.
+ Échec du remboursement
+ Remboursement refusé
+ Remboursement en attente
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3a99836..649c044 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -896,4 +896,57 @@
Rinnovo: $%s/%s mesi su %s
La sessione di accesso è scaduta. Accedi di nuovo
App non autorizzata. Scarica da una fonte ufficiale
+
+ Rinnovo automatico
+
+ Non disponibile
+ Disponibile
+
+ In revisione
+
+ In elaborazione
+
+ Non riuscito
+
+ Rifiutato
+
+ Disattivare il rinnovo automatico?
+
+ Attivare il rinnovo automatico?
+
+ La richiesta di rimborso è stata inviata ed è in fase di revisione.
+
+ Il tuo piano rimane attivo fino alla scadenza.
+
+ Dettagli del rimborso
+
+ Piano
+
+ ID ordine
+ Data ordine
+ Metodo di pagamento
+
+ Importo del rimborso
+
+ Stato del rimborso
+
+ Rimborso in elaborazione
+ Il rimborso è stato approvato ed è in fase di elaborazione.
+ Rimborso completato
+
+ Rimborso non riuscito
+
+ Il rimborso è stato inviato al metodo di pagamento originale.
+
+ La richiesta di rimborso non è stata approvata.
+
+ La richiesta di rimborso è stata inviata.
+
+ Richiesta inviata
+ La richiesta di rimborso è in fase di revisione.
+
+ Non è stato possibile completare il rimborso. Riprova o contatta l’assistenza.
+ Rimborso non riuscito
+ Rimborso rifiutato
+ Rimborso in sospeso
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4da4d89..47e0531 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -949,4 +949,36 @@
移除
关闭并移除
非法APP，请从正规渠道下载安装
+
+ 自动续订
+ 不可用
+ 可用
+ 审核中
+ 处理中
+ 失败
+ 已拒绝
+ 关闭自动续订？
+ 开启自动续订？
+ 您的退款申请已提交，正在审核中。
+ 您的套餐将在到期前保持有效。
+ 退款详情
+ 套餐
+ 订单 ID
+ 下单时间
+ 支付方式
+ 退款金额
+ 退款状态
+ 退款处理中
+ 您的退款已通过审核，正在处理中。
+ 退款完成
+ 退款失败
+ 退款已退回至您的原支付方式。
+ 您的退款申请未获批准。
+ 您的退款申请已提交。
+ 申请已提交
+ 您的退款申请正在审核中。
+ 退款无法完成，请重试或联系客服。
+ 退款失败
+ 退款被拒绝
+ 退款待处理
\ No newline at end of file