From 661a264fef5d1a23ba850c9f65ac79c0127b3d1d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 01 四月 2025 15:59:10 +0800
Subject: [PATCH] fix : 样式
---
app/src/main/java/com/example/firstapp/MainActivity.kt | 182 +++++++++++++++++++++++----------------------
1 files changed, 94 insertions(+), 88 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/MainActivity.kt b/app/src/main/java/com/example/firstapp/MainActivity.kt
index 0554ff5..9db1f81 100644
--- a/app/src/main/java/com/example/firstapp/MainActivity.kt
+++ b/app/src/main/java/com/example/firstapp/MainActivity.kt
@@ -256,112 +256,118 @@
// 使用协程处理API调用和数据库操作
CoroutineScope(Dispatchers.IO).launch {
try {
- // API调用移到synchronized块外
val response = RetrofitModelClient.modelService.processSms(mapOf("content" to messageBody))
- // 数据库操作放在synchronized块内
synchronized(syncLock) {
if (response.status == "success") {
when (response.data.category) {
"快递" -> {
- val existingCode = Core.code.queryByTypeAndCodeAndDate(
- response.data.category,
- response.data.details.pickupCode ?: "",
- dateString
- )
-
- if (existingCode == null) {
- val code = Code(
- id = 0,
- category = response.data.category,
- categoryId = 1,
- typeId = 1,
- ruleId = 1,
- msgId = msgId,
- createTime = dateString,
- oneLevel = response.data.details.post ?: "",
- secondLevel = response.data.details.company ?: "",
- code = response.data.details.pickupCode ?: "",
- pickup = 0,
- pickupTime = "",
- overTime = "",
- address = response.data.details.address ?: "",
- remarks = response.data.details.time ?: "",
+ val pickupCode = response.data.details.pickupCode ?: ""
+ if (pickupCode.isNotEmpty()) {
+ val existingCode = Core.code.queryByTypeAndCodeAndDate(
+ response.data.category,
+ pickupCode,
+ dateString
)
- if(code.oneLevel!="" && code.secondLevel!="" && code.code!="") {
- Core.code.insert(code)
+
+ if (existingCode == null) {
+ val code = Code(
+ id = 0,
+ category = response.data.category,
+ categoryId = 1,
+ typeId = 1,
+ ruleId = 1,
+ msgId = msgId,
+ createTime = dateString,
+ oneLevel = response.data.details.post ?: "",
+ secondLevel = response.data.details.company ?: "",
+ code = pickupCode,
+ pickup = 0,
+ pickupTime = "",
+ overTime = "",
+ address = response.data.details.address ?: "",
+ remarks = response.data.details.time ?: "",
+ )
+ if(code.oneLevel.isNotEmpty() && code.secondLevel.isNotEmpty() && code.code.isNotEmpty()) {
+ Core.code.insert(code)
+ android.util.Log.d("MainActivity", "历史快递短信已保存: $pickupCode")
+ }
+ } else {
+ android.util.Log.d("MainActivity", "发现重复快递短信，跳过保存: $pickupCode")
}
- android.util.Log.d("MainActivity", "历史快递短信已保存: ${response.data.details.pickupCode}")
- } else {
- android.util.Log.d("MainActivity", "发现重复快递短信，跳过保存: ${response.data.details.pickupCode}")
}
}
"还款" -> {
- val existingCode = Core.code.queryByTypeAndCodeAndDate(
- response.data.category,
- response.data.details.amount ?: "",
- dateString
- )
-
- if (existingCode == null) {
- val code = Code(
- id = 0,
- category = response.data.category,
- categoryId = 2,
- typeId = 1,
- ruleId = 2,
- msgId = msgId,
- createTime = dateString,
- oneLevel = response.data.details.type ?: "",
- secondLevel = response.data.details.bank ?: "",
- code = response.data.details.amount ?: "",
- pickup = 0,
- pickupTime = "",
- overTime = response.data.details.date ?: "",
- address = response.data.details.address ?: "",
- remarks = "最小还款金额${response.data.details.min_amount}还款卡号${response.data.details.number}"
+ val amount = response.data.details.amount ?: ""
+ if (amount.isNotEmpty()) {
+ val existingCode = Core.code.queryByTypeAndCodeAndDate(
+ response.data.category,
+ amount,
+ dateString
)
- if(code.oneLevel!="" && code.secondLevel!="" && code.code!="") {
- Core.code.insert(code)
+
+ if (existingCode == null) {
+ val code = Code(
+ id = 0,
+ category = response.data.category,
+ categoryId = 2,
+ typeId = 1,
+ ruleId = 2,
+ msgId = msgId,
+ createTime = dateString,
+ oneLevel = response.data.details.type ?: "",
+ secondLevel = response.data.details.bank ?: "",
+ code = amount,
+ pickup = 0,
+ pickupTime = "",
+ overTime = response.data.details.date ?: "",
+ address = response.data.details.address ?: "",
+ remarks = "最小还款金额${response.data.details.min_amount}还款卡号${response.data.details.number}"
+ )
+ if(code.oneLevel.isNotEmpty() && code.secondLevel.isNotEmpty() && code.code.isNotEmpty()) {
+ Core.code.insert(code)
+ android.util.Log.d("MainActivity", "历史还款短信已保存: $amount")
+ }
+ } else {
+ android.util.Log.d("MainActivity", "发现重复还款短信，跳过保存: $amount")
}
- android.util.Log.d("MainActivity", "历史还款短信已保存: ${response.data.details.amount}")
- } else {
- android.util.Log.d("MainActivity", "发现重复还款短信，跳过保存: ${response.data.details.amount}")
}
}
-
"收入" -> {
- val existingCode = Core.code.queryByTypeAndCodeAndDate(
- response.data.category,
- response.data.details.amount ?: "",
- dateString
- )
-
- if (existingCode == null) {
- val code = Code(
- id = 0,
- category = response.data.category,
- categoryId = 3, // 3-收入类型
- typeId = 1, //暂时没有根据type分类
- ruleId = 2, //1-还款类型
- msgId = msgId,
- createTime = dateString,
- oneLevel = response.data.details.bank ?: "",
- secondLevel = response.data.details.bank ?: "",
- code = response.data.details.amount ?: "",
- pickup = 0, // 0-未取件，1-已取件
- pickupTime = "", // 取件时间为空
- overTime = response.data.details.datetime
- ?: "", // 超时时间为空，暂时没有这块处理逻辑
- address = response.data.details.address ?: "",
- remarks = "余额" + response.data.details.balance ?: "",
+ val amount = response.data.details.amount ?: ""
+ if (amount.isNotEmpty()) {
+ val existingCode = Core.code.queryByTypeAndCodeAndDate(
+ response.data.category,
+ amount,
+ dateString
)
- if(code.oneLevel!="" && code.secondLevel!="" && code.code!="") {
- Core.code.insert(code)
+
+ if (existingCode == null) {
+ val code = Code(
+ id = 0,
+ category = response.data.category,
+ categoryId = 3, // 3-收入类型
+ typeId = 1, //暂时没有根据type分类
+ ruleId = 2, //1-还款类型
+ msgId = msgId,
+ createTime = dateString,
+ oneLevel = response.data.details.bank ?: "",
+ secondLevel = response.data.details.bank ?: "",
+ code = amount,
+ pickup = 0, // 0-未取件，1-已取件
+ pickupTime = "", // 取件时间为空
+ overTime = response.data.details.datetime
+ ?: "", // 超时时间为空，暂时没有这块处理逻辑
+ address = response.data.details.address ?: "",
+ remarks = "余额" + response.data.details.balance ?: "",
+ )
+ if(code.oneLevel.isNotEmpty() && code.secondLevel.isNotEmpty() && code.code.isNotEmpty()) {
+ Core.code.insert(code)
+ android.util.Log.d("MainActivity", "历史还款短信已保存: $amount")
+ }
+ } else {
+ android.util.Log.d("MainActivity", "发现重复还款短信，跳过保存: $amount")
}
- android.util.Log.d("MainActivity", "历史还款短信已保存: ${response.data.details.amount}")
- } else {
- android.util.Log.d("MainActivity", "发现重复还款短信，跳过保存: ${response.data.details.amount}")
}
}
}
--
Gitblit v1.9.3