From b808650f7c9456f83ab272be1203d5ad7a20bafe Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 02 四月 2025 10:37:36 +0800
Subject: [PATCH] fix : 分类缓存
---
app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt | 246 ++++++++++++++++++++++++------------------------
1 files changed, 122 insertions(+), 124 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt b/app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt
index d8c92f2..80483dc 100644
--- a/app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt
@@ -14,6 +14,8 @@
import com.example.firstapp.model.ExpressPackage
import com.example.firstapp.model.FinanceGroup
import com.example.firstapp.model.FinancePackage
+import com.example.firstapp.model.IncomeGroup
+import com.example.firstapp.model.IncomePackage
import com.example.firstapp.util.SecureStorage
import kotlinx.coroutines.launch
@@ -21,22 +23,21 @@
private val _expressItems = MutableLiveData<List<ExpressGroup>>()
private val _financeItems = MutableLiveData<List<FinanceGroup>>()
- private val _incomeItems = MutableLiveData<List<FinanceGroup>>()
+ private val _incomeItems = MutableLiveData<List<IncomeGroup>>()
private val _flightItems = MutableLiveData<List<FinanceGroup>>()
private val _trainItems = MutableLiveData<List<FinanceGroup>>()
val expressItems: LiveData<List<ExpressGroup>> = _expressItems
val financeItems: LiveData<List<FinanceGroup>> = _financeItems
- val incomeItems: LiveData<List<FinanceGroup>> = _incomeItems
+ val incomeItems: LiveData<List<IncomeGroup>> = _incomeItems
val flightItems: LiveData<List<FinanceGroup>> = _flightItems
val trainItems: LiveData<List<FinanceGroup>> = _trainItems
private val _categories = MutableLiveData<List<CategoryConfig>>()
val categories: LiveData<List<CategoryConfig>> = _categories
- // 添加可见分类的 LiveData
- private val _visibleCategories = MutableLiveData<List<String>>()
- val visibleCategories: LiveData<List<String>> = _visibleCategories
+ private val _visibleCategories = MutableLiveData<List<CategoryConfig>>()
+ val visibleCategories: LiveData<List<CategoryConfig>> = _visibleCategories
private lateinit var secureStorage: SecureStorage
private lateinit var currentUserId: String
@@ -56,121 +57,132 @@
_categories.value?.let { updateVisibleCategories(it) }
}
- fun loadExpressData() {
+ private fun loadDataByType(type: String) {
viewModelScope.launch {
- // 1. 获取所有驿站类型的提醒设置
- val stations = Core.reminder.getByType("快递")
-
- // 2. 按驿站分组获取包裹信息
- val groups = stations.map { station ->
- val packages = Core.code.getByKeyword(station.nickname).map { code ->
- ExpressPackage(
- id = code.id, //ID
- company = code.secondLevel, //快递公司
- trackingNumber = code.code, // 取件码
- createTime = code.createTime //快递时间
- )
+ try {
+ // 获取该类型下的所有站点分组
+ val stations = Core.code.getStationsByType(type)
+
+ when (type) {
+ "快递" -> {
+ // 处理快递类型
+ val groups = stations.map { station ->
+ val packages = Core.code.getPackagesByTypeAndStation(type, station.stationName).map { code ->
+ ExpressPackage(
+ id = code.id,
+ company = code.secondLevel,
+ trackingNumber = code.code,
+ createTime = code.createTime
+ )
+ }
+ ExpressGroup(stationName = station.stationName, packages = packages)
+ }
+ _expressItems.postValue(groups)
+ }
+ "收入" -> {
+ // 特殊处理收入类型
+ val groups = stations.map { station ->
+ val packages = Core.code.getPackagesByTypeAndStation(type, station.stationName).map { code ->
+ IncomePackage(
+ id = code.id,
+ company = code.secondLevel, // 交易对方
+ trackingNumber = code.code, // 金额
+ createTime = code.createTime,
+ balance = code.remarks.replace("余额", "") // 去掉"余额"前缀
+ )
+ }
+ IncomeGroup(stationName = station.stationName, packages = packages)
+ }
+ _incomeItems.postValue(groups)
+ }
+ else -> {
+ // 处理其他类型（还款、航班、火车票）
+ val groups = stations.map { station ->
+ val packages = Core.code.getPackagesByTypeAndStation(type, station.stationName).map { code ->
+ FinancePackage(
+ id = code.id,
+ company = code.secondLevel,
+ trackingNumber = code.code,
+ createTime = code.createTime
+ )
+ }
+ FinanceGroup(stationName = station.stationName, packages = packages)
+ }
+
+ // 根据类型更新对应的 LiveData
+ when (type) {
+ "还款" -> _financeItems.postValue(groups)
+ "航班" -> _flightItems.postValue(groups)
+ "火车票" -> _trainItems.postValue(groups)
+ }
+ }
}
- ExpressGroup(
- stationName = station.nickname, packages = packages
- )
+ } catch (e: Exception) {
+ Log.e("HomeViewModel", "Failed to load $type data: ${e.message}")
}
-
- _expressItems.postValue(groups)
}
+ }
+
+ fun loadExpressData() {
+ loadDataByType("快递")
}
fun loadFinanceData() {
- viewModelScope.launch {
- // 1. 获取所有驿站类型的提醒设置
- val stations = Core.reminder.getByType("还款")
-
- // 2. 按驿站分组获取包裹信息
- val groups = stations.map { station ->
- val packages = Core.code.getByKeyword(station.nickname).map { code ->
- FinancePackage(
- id = code.id, //ID
- company = code.secondLevel, //快递公司
- trackingNumber = code.code, // 取件码
- createTime = code.createTime //快递时间
- )
- }
- FinanceGroup(
- stationName = station.nickname, packages = packages
- )
- }
-
- _financeItems.postValue(groups)
- }
+ loadDataByType("还款")
}
fun loadIncomeData() {
- viewModelScope.launch {
- val stations = Core.reminder.getByType("收入")
- val groups = stations.map { station ->
- val packages = Core.code.getByKeyword(station.nickname).map { code ->
- FinancePackage(
- id = code.id,
- company = code.secondLevel,
- trackingNumber = code.code,
- createTime = code.createTime
- )
- }
- FinanceGroup(stationName = station.nickname, packages = packages)
- }
- _incomeItems.postValue(groups)
- }
+ loadDataByType("收入")
}
fun loadFlightData() {
- viewModelScope.launch {
- val stations = Core.reminder.getByType("航班")
- val groups = stations.map { station ->
- val packages = Core.code.getByKeyword(station.nickname).map { code ->
- FinancePackage(
- id = code.id,
- company = code.secondLevel,
- trackingNumber = code.code,
- createTime = code.createTime
- )
- }
- FinanceGroup(stationName = station.nickname, packages = packages)
- }
- _flightItems.postValue(groups)
- }
+ loadDataByType("航班")
}
fun loadTrainData() {
- viewModelScope.launch {
- val stations = Core.reminder.getByType("火车票")
- val groups = stations.map { station ->
- val packages = Core.code.getByKeyword(station.nickname).map { code ->
- FinancePackage(
- id = code.id,
- company = code.secondLevel,
- trackingNumber = code.code,
- createTime = code.createTime
- )
- }
- FinanceGroup(stationName = station.nickname, packages = packages)
- }
- _trainItems.postValue(groups)
- }
+ loadDataByType("火车票")
}
fun loadCategories() {
viewModelScope.launch {
try {
- // 先尝试从服务器获取配置
- val serverCategories = RetrofitClient.apiService.getUserCategories(currentUserId)
- if (serverCategories.isNotEmpty()) {
- _categories.value = serverCategories
- secureStorage.saveCategories(currentUserId, serverCategories)
+ // 先尝试从本地获取配置
+ val localCategories = secureStorage.getCategories(currentUserId)
+ if (localCategories.isNotEmpty()) {
+ // 如果本地有配置，直接使用本地配置
+ _categories.value = localCategories
+ // 同时尝试从服务器更新
+ try {
+ val serverCategories = RetrofitClient.apiService.getUserCategories(currentUserId)
+ if (serverCategories.isNotEmpty()) {
+ _categories.value = serverCategories
+ secureStorage.saveCategories(currentUserId, serverCategories)
+ }
+ } catch (e: Exception) {
+ // 服务器获取失败，继续使用本地配置
+ Log.e("HomeViewModel", "Failed to fetch server categories: ${e.message}")
+ }
} else {
- // 如果服务器没有配置，尝试获取本地配置
- val localCategories = secureStorage.getCategories(currentUserId)
- if (localCategories.isEmpty()) {
- // 如果本地也没有配置，使用默认配置
+ // 如果本地没有配置，尝试从服务器获取
+ try {
+ val serverCategories = RetrofitClient.apiService.getUserCategories(currentUserId)
+ if (serverCategories.isNotEmpty()) {
+ _categories.value = serverCategories
+ secureStorage.saveCategories(currentUserId, serverCategories)
+ } else {
+ // 如果服务器也没有配置，使用默认配置
+ val defaultCategories = listOf(
+ CategoryConfig(1, "快递", 0),
+ CategoryConfig(2, "还款", 1),
+ CategoryConfig(3, "收入", 2),
+ CategoryConfig(4, "航班", 3),
+ CategoryConfig(5, "火车票", 4)
+ )
+ _categories.value = defaultCategories
+ secureStorage.saveCategories(currentUserId, defaultCategories)
+ }
+ } catch (e: Exception) {
+ // 如果服务器请求失败，使用默认配置
val defaultCategories = listOf(
CategoryConfig(1, "快递", 0),
CategoryConfig(2, "还款", 1),
@@ -179,24 +191,13 @@
CategoryConfig(5, "火车票", 4)
)
_categories.value = defaultCategories
- syncCategoriesToServer(defaultCategories)
- } else {
- _categories.value = localCategories
- syncCategoriesToServer(localCategories)
+ secureStorage.saveCategories(currentUserId, defaultCategories)
}
}
+ // 更新可见分类
+ _categories.value?.let { updateVisibleCategories(it) }
} catch (e: Exception) {
- // 如果网络请求失败，使用本地数据
- val localCategories = secureStorage.getCategories(currentUserId)
- _categories.value = localCategories.ifEmpty {
- listOf(
- CategoryConfig(1, "快递", 0),
- CategoryConfig(2, "还款", 1),
- CategoryConfig(3, "收入", 2),
- CategoryConfig(4, "航班", 3),
- CategoryConfig(5, "火车票", 4)
- )
- }
+ Log.e("HomeViewModel", "Failed to load categories: ${e.message}")
}
}
}
@@ -215,16 +216,13 @@
}
fun saveCategories(categories: List<CategoryConfig>) {
- viewModelScope.launch {
- // 保存到本地
- secureStorage.saveCategories(currentUserId, categories)
- // 同步到服务器
- syncCategoriesToServer(categories)
- _categories.value = categories
-
- // 更新可见分类
- updateVisibleCategories(categories)
- }
+ _categories.value = categories
+ // 保存到本地存储
+ secureStorage.saveCategories(currentUserId, categories)
+ // 同步到服务器
+ syncCategoriesToServer(categories)
+ // 更新可见分类
+ updateVisibleCategories(categories)
}
private fun updateVisibleCategories(categories: List<CategoryConfig>) {
@@ -233,7 +231,7 @@
.sortedBy { it.order }
.map { it.name }
- _visibleCategories.value = visibleNames
+ _visibleCategories.value = categories.filter { it.isEnabled }
}
// 登出时不再清除本地数据
--
Gitblit v1.9.3