1.订阅新ui字符串增加其他语言

2.启动页增加检测防篡改加载状态

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
     )
 

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()
     }

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

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" />
+
+    <com.qmuiteam.qmui.widget.QMUILoadingView
+        android:id="@+id/lv_splash_check_state_loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_18"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/iv_splash_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-de/strings.xml

@@ -906,4 +906,62 @@
     <string name="txt_remove">Entfernen</string>
     <string name="txt_turn_off_remove">Deaktivieren &amp; entfernen</string>
     <string name="txt_no_legal_app">Nicht autorisierte App. Von offizieller Quelle laden</string>
+
+    <string name="txt_auto_renew2">Automatische Verlängerung</string>
+    <string name="txt_unavailable">Nicht verfügbar</string>
+
+    <string name="txt_available">Verfügbar</string>
+
+    <string name="txt_under_review">In Prüfung</string>
+
+    <string name="txt_processing">Wird bearbeitet</string>
+
+    <string name="txt_failed">Fehlgeschlagen</string>
+
+    <string name="txt_declined">Abgelehnt</string>
+
+    <string name="txt_turn_off_auto_renew">Automatische Verlängerung deaktivieren?</string>
+
+    <string name="txt_turn_on_auto_renew">Automatische Verlängerung aktivieren?</string>
+
+    <string name="txt_refund_pending_tips">Ihr Erstattungsantrag wurde eingereicht und wird geprüft.</string>
+
+    <string name="txt_plan_active_until_expires">Ihr Tarif bleibt bis zum Ablauf aktiv.</string>
+
+    <string name="txt_refund_details">Erstattungsdetails</string>
+
+    <string name="txt_plan1">Tarif</string>
+    <string name="txt_order_id1">Bestell-ID</string>
+
+    <string name="txt_order_time">Bestellzeit</string>
+
+    <string name="txt_paid_method">Zahlungsmethode</string>
+
+    <string name="txt_refund_amount">Erstattungsbetrag</string>
+
+    <string name="txt_refund_status">Erstattungsstatus</string>
+
+    <string name="txt_refund_processing">Erstattung wird bearbeitet</string>
+
+    <string name="txt_refund_processing_tips">Ihre Erstattung wurde genehmigt und wird bearbeitet.</string>
+
+    <string name="txt_refund_completed">Erstattung abgeschlossen</string>
+
+    <string name="txt_refund_unsuccessful">Erstattung nicht erfolgreich</string>
+
+    <string name="txt_refund_success_tips">Ihre Erstattung wurde an die ursprüngliche Zahlungsmethode gesendet.</string>
+
+    <string name="txt_refund_fail_tips">Ihr Erstattungsantrag wurde nicht genehmigt.</string>
+
+    <string name="txt_request_submit_dec">Ihr Erstattungsantrag wurde eingereicht.</string>
+
+    <string name="txt_request_submit">Antrag eingereicht</string>
+
+    <string name="txt_under_review_dec">Ihr Erstattungsantrag wird geprüft.</string>
+
+    <string name="txt_refund_failed_dec">Ihre Erstattung konnte nicht abgeschlossen werden. Bitte versuchen Sie es erneut oder kontaktieren Sie den Support.</string>
+
+    <string name="txt_refund_failed">Erstattung fehlgeschlagen</string>
+    <string name="txt_refund_declined">Erstattung abgelehnt</string>
+    <string name="txt_refund_pending">Erstattung ausstehend</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -899,7 +899,6 @@
     <string name="txt_privacy_html">privacy_fr.html</string>
     <string name="txt_subscription_terms_conditions_html">subscription_terms_conditions_fr.html</string>
     <string name="txt_login_info_invalid">Session expirée. Veuillez vous reconnecter</string>
-
     <string name="txt_remove_pay_method">Supprimer le mode de paiement</string>
     <string name="txt_remove_pay_method_tips1">Voulez-vous vraiment supprimer ce mode de paiement ?</string>
     <string name="txt_remove_pay_method_tips2">Veuillez désactiver le renouvellement automatique avant de supprimer votre mode de paiement.</string>
@@ -907,4 +906,61 @@
     <string name="txt_remove">Supprimer</string>
     <string name="txt_turn_off_remove">Désactiver et supprimer</string>
     <string name="txt_no_legal_app">App non autorisée. Téléchargez depuis une source officielle</string>
+
+    <string name="txt_auto_renew2">Renouvellement automatique</string>
+
+    <string name="txt_unavailable">Indisponible</string>
+
+    <string name="txt_available">Disponible</string>
+
+    <string name="txt_under_review">En cours d’examen</string>
+
+    <string name="txt_processing">En cours de traitement</string>
+
+    <string name="txt_failed">Échec</string>
+
+    <string name="txt_declined">Refusé</string>
+
+    <string name="txt_turn_off_auto_renew">Désactiver le renouvellement automatique ?</string>
+
+    <string name="txt_turn_on_auto_renew">Activer le renouvellement automatique ?</string>
+
+    <string name="txt_refund_pending_tips">Votre demande de remboursement a été envoyée et est en cours d’examen.</string>
+
+    <string name="txt_plan_active_until_expires">Votre forfait reste actif jusqu’à son expiration.</string>
+
+    <string name="txt_refund_details">Détails du remboursement</string>
+
+    <string name="txt_plan1">Forfait</string>
+    <string name="txt_order_id1">ID de commande</string>
+    <string name="txt_order_time">Date de commande</string>
+
+    <string name="txt_paid_method">Mode de paiement</string>
+
+    <string name="txt_refund_amount">Montant du remboursement</string>
+
+    <string name="txt_refund_status">Statut du remboursement</string>
+
+    <string name="txt_refund_processing">Remboursement en cours</string>
+
+    <string name="txt_refund_processing_tips">Votre remboursement a été approuvé et est en cours de traitement.</string>
+
+    <string name="txt_refund_completed">Remboursement terminé</string>
+
+    <string name="txt_refund_unsuccessful">Remboursement échoué</string>
+
+    <string name="txt_refund_success_tips">Votre remboursement a été envoyé à votre mode de paiement initial.</string>
+
+    <string name="txt_refund_fail_tips">Votre demande de remboursement n’a pas été approuvée.</string>
+
+    <string name="txt_request_submit_dec">Votre demande de remboursement a été envoyée.</string>
+
+    <string name="txt_request_submit">Demande envoyée</string>
+
+    <string name="txt_under_review_dec">Votre demande de remboursement est en cours d’examen.</string>
+
+    <string name="txt_refund_failed_dec">Nous n’avons pas pu effectuer votre remboursement. Veuillez réessayer ou contacter le support.</string>
+    <string name="txt_refund_failed">Échec du remboursement</string>
+    <string name="txt_refund_declined">Remboursement refusé</string>
+    <string name="txt_refund_pending">Remboursement en attente</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -896,4 +896,57 @@
     <string name="txt_renewal_months">Rinnovo: $%s/%s mesi su %s</string>
     <string name="txt_login_info_invalid">La sessione di accesso è scaduta. Accedi di nuovo</string>
     <string name="txt_no_legal_app">App non autorizzata. Scarica da una fonte ufficiale</string>
+
+    <string name="txt_auto_renew2">Rinnovo automatico</string>
+
+    <string name="txt_unavailable">Non disponibile</string>
+    <string name="txt_available">Disponibile</string>
+
+    <string name="txt_under_review">In revisione</string>
+
+    <string name="txt_processing">In elaborazione</string>
+
+    <string name="txt_failed">Non riuscito</string>
+
+    <string name="txt_declined">Rifiutato</string>
+
+    <string name="txt_turn_off_auto_renew">Disattivare il rinnovo automatico?</string>
+
+    <string name="txt_turn_on_auto_renew">Attivare il rinnovo automatico?</string>
+
+    <string name="txt_refund_pending_tips">La richiesta di rimborso è stata inviata ed è in fase di revisione.</string>
+
+    <string name="txt_plan_active_until_expires">Il tuo piano rimane attivo fino alla scadenza.</string>
+
+    <string name="txt_refund_details">Dettagli del rimborso</string>
+
+    <string name="txt_plan1">Piano</string>
+
+    <string name="txt_order_id1">ID ordine</string>
+    <string name="txt_order_time">Data ordine</string>
+    <string name="txt_paid_method"> Metodo di pagamento</string>
+
+    <string name="txt_refund_amount">Importo del rimborso</string>
+
+    <string name="txt_refund_status">Stato del rimborso</string>
+
+    <string name="txt_refund_processing">Rimborso in elaborazione</string>
+    <string name="txt_refund_processing_tips">Il rimborso è stato approvato ed è in fase di elaborazione.</string>
+    <string name="txt_refund_completed">Rimborso completato</string>
+
+    <string name="txt_refund_unsuccessful">Rimborso non riuscito</string>
+
+    <string name="txt_refund_success_tips">Il rimborso è stato inviato al metodo di pagamento originale.</string>
+
+    <string name="txt_refund_fail_tips">La richiesta di rimborso non è stata approvata.</string>
+
+    <string name="txt_request_submit_dec">La richiesta di rimborso è stata inviata.</string>
+
+    <string name="txt_request_submit">Richiesta inviata</string>
+    <string name="txt_under_review_dec">La richiesta di rimborso è in fase di revisione.</string>
+
+    <string name="txt_refund_failed_dec">Non è stato possibile completare il rimborso. Riprova o contatta l’assistenza.</string>
+    <string name="txt_refund_failed">Rimborso non riuscito</string>
+    <string name="txt_refund_declined">Rimborso rifiutato</string>
+    <string name="txt_refund_pending">Rimborso in sospeso</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -949,4 +949,36 @@
     <string name="txt_remove">移除</string>
     <string name="txt_turn_off_remove">关闭并移除</string>
     <string name="txt_no_legal_app">非法APP，请从正规渠道下载安装</string>
+
+    <string name="txt_auto_renew2">自动续订</string>
+    <string name="txt_unavailable">不可用</string>
+    <string name="txt_available">可用</string>
+    <string name="txt_under_review">审核中</string>
+    <string name="txt_processing">处理中</string>
+    <string name="txt_failed">失败</string>
+    <string name="txt_declined">已拒绝</string>
+    <string name="txt_turn_off_auto_renew">关闭自动续订？</string>
+    <string name="txt_turn_on_auto_renew">开启自动续订？</string>
+    <string name="txt_refund_pending_tips">您的退款申请已提交，正在审核中。</string>
+    <string name="txt_plan_active_until_expires">您的套餐将在到期前保持有效。</string>
+    <string name="txt_refund_details">退款详情</string>
+    <string name="txt_plan1">套餐</string>
+    <string name="txt_order_id1">订单 ID</string>
+    <string name="txt_order_time">下单时间</string>
+    <string name="txt_paid_method">支付方式</string>
+    <string name="txt_refund_amount">退款金额</string>
+    <string name="txt_refund_status">退款状态</string>
+    <string name="txt_refund_processing">退款处理中</string>
+    <string name="txt_refund_processing_tips">您的退款已通过审核，正在处理中。</string>
+    <string name="txt_refund_completed">退款完成</string>
+    <string name="txt_refund_unsuccessful">退款失败</string>
+    <string name="txt_refund_success_tips">退款已退回至您的原支付方式。</string>
+    <string name="txt_refund_fail_tips">您的退款申请未获批准。</string>
+    <string name="txt_request_submit_dec">您的退款申请已提交。</string>
+    <string name="txt_request_submit">申请已提交</string>
+    <string name="txt_under_review_dec">您的退款申请正在审核中。</string>
+    <string name="txt_refund_failed_dec">退款无法完成，请重试或联系客服。</string>
+    <string name="txt_refund_failed">退款失败</string>
+    <string name="txt_refund_declined">退款被拒绝</string>
+    <string name="txt_refund_pending">退款待处理</string>
 </resources>