From 93775e1f3d79a1e11b839abbf24201dafcd9e646 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 25 四月 2025 13:45:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 app/src/main/java/com/example/firstapp/receiver/SmsReceiver.kt |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/example/firstapp/receiver/SmsReceiver.kt b/app/src/main/java/com/example/firstapp/receiver/SmsReceiver.kt
index 8cbd3f3..fc12fec 100644
--- a/app/src/main/java/com/example/firstapp/receiver/SmsReceiver.kt
+++ b/app/src/main/java/com/example/firstapp/receiver/SmsReceiver.kt
@@ -39,9 +39,15 @@
                 val messages = arrayOfNulls<SmsMessage>(pdus.size)
                 val messageBody = StringBuilder()
 
+                // 获取短信时间戳(使用第一条短信的时间戳)
+                var timestamp: Long = 0
+
                 for (i in pdus.indices) {
                     messages[i] = SmsMessage.createFromPdu(pdus[i] as ByteArray)
                     messageBody.append(messages[i]?.messageBody)
+                    if (i == 0) {
+                        timestamp = messages[i]?.timestampMillis ?: System.currentTimeMillis()
+                    }
                 }
 
                 // 保存原始短信
@@ -80,7 +86,8 @@
                                         company = response.data.details.company,
                                         pickupCode = response.data.details.pickupCode,
                                         address = response.data.details.address,
-                                        time = response.data.details.time
+                                        time = response.data.details.time,
+                                        smsTimestamp = timestamp  // 添加短信时间戳
                                     )
                                     CodeUtils.saveCode(code)
                                 }
@@ -95,7 +102,8 @@
                                         date = response.data.details.date,
                                         address = response.data.details.address,
                                         minAmount = response.data.details.min_amount,
-                                        number = response.data.details.number
+                                        number = response.data.details.number,
+                                        smsTimestamp = timestamp  // 添加短信时间戳
                                     )
                                     CodeUtils.saveCode(code)
                                 }
@@ -108,7 +116,8 @@
                                         amount = response.data.details.amount,
                                         datetime = response.data.details.datetime,
                                         address = response.data.details.address,
-                                        balance = response.data.details.balance
+                                        balance = response.data.details.balance,
+                                        smsTimestamp = timestamp  // 添加短信时间戳
                                     )
                                     CodeUtils.saveCode(code)
                                 }
@@ -122,7 +131,8 @@
                                         end = response.data.details.end,
                                         seat = response.data.details.seat,
                                         time = response.data.details.time,
-                                        address = response.data.details.address
+                                        address = response.data.details.address,
+                                        smsTimestamp = timestamp  // 添加短信时间戳
                                     )
                                     CodeUtils.saveCode(code)
                                 }
@@ -135,7 +145,8 @@
                                         seat = response.data.details.seat,
                                         time = response.data.details.time,
                                         address = response.data.details.address,
-                                        trips = response.data.details.trips
+                                        trips = response.data.details.trips,
+                                        smsTimestamp = timestamp  // 添加短信时间戳
                                     )
                                     CodeUtils.saveCode(code)
                                 }

--
Gitblit v1.9.3