From 2e1edcb7518f20dec30dbd6e1686e9e6b558ec15 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期三, 16 四月 2025 17:05:12 +0800
Subject: [PATCH] 43 首页登录->首页登录 1.首页弹窗协议同意后，不能默认自动勾选，还需要用户手动勾选 2.退出登录后，再次登录需要手动勾选与用户协议（目前是默认勾选了） 44 首页登录->邀请码 邀请码默认填入“邀请码（选填） 47 数据统计->饼状图数据分类统计问题 1、只统计快递 无需统计还款其他分类 2、图形上下间隔过大" 48 数据统计 天、周、月、年 1.数据统计只统计快递类的，其他分类不需要统计展示，例如取件码记录 2.包括周、月、年的统计环状图，只需要统计快递分类的
---
app/src/main/java/com/example/firstapp/ui/home/HomeViewModel.kt | 171 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 118 insertions(+), 53 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 f915575..45b5b0a 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
@@ -17,31 +17,41 @@
import com.example.firstapp.model.IncomeGroup
import com.example.firstapp.model.IncomePackage
import com.example.firstapp.util.SecureStorage
+import com.example.firstapp.utils.PreferencesManager
import kotlinx.coroutines.launch
+import com.example.firstapp.database.repository.ReminderRecordRepository
+import com.example.firstapp.database.entity.ReminderRecord
+import com.example.firstapp.model.TrainGroup
+import com.example.firstapp.model.TrainPackage
+import com.example.firstapp.model.FlightGroup
+import com.example.firstapp.model.FlightPackage
class HomeViewModel : ViewModel() {
private val _expressItems = MutableLiveData<List<ExpressGroup>>()
private val _financeItems = MutableLiveData<List<FinanceGroup>>()
private val _incomeItems = MutableLiveData<List<IncomeGroup>>()
- private val _flightItems = MutableLiveData<List<FinanceGroup>>()
- private val _trainItems = MutableLiveData<List<FinanceGroup>>()
+ private val _flightItems = MutableLiveData<List<FlightGroup>>()
+ private val _trainItems = MutableLiveData<List<TrainGroup>>()
val expressItems: LiveData<List<ExpressGroup>> = _expressItems
val financeItems: LiveData<List<FinanceGroup>> = _financeItems
val incomeItems: LiveData<List<IncomeGroup>> = _incomeItems
- val flightItems: LiveData<List<FinanceGroup>> = _flightItems
- val trainItems: LiveData<List<FinanceGroup>> = _trainItems
+ val flightItems: LiveData<List<FlightGroup>> = _flightItems
+ val trainItems: LiveData<List<TrainGroup>> = _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 val _unreadReminderCount = MutableLiveData<Int>()
+ val unreadReminderCount: LiveData<Int> = _unreadReminderCount
private lateinit var secureStorage: SecureStorage
private lateinit var currentUserId: String
+ private lateinit var reminderRecordRepository: ReminderRecordRepository
init {
// 初始化时加载包裹列表数据
@@ -53,9 +63,12 @@
fun initialize(context: Context, userId: String) {
secureStorage = SecureStorage(context)
currentUserId = userId
+ reminderRecordRepository = ReminderRecordRepository(context)
loadCategories()
// 初始化时更新可见分类
_categories.value?.let { updateVisibleCategories(it) }
+ // 加载未读提醒数量
+ checkUnreadReminders()
}
private fun loadDataByType(type: String) {
@@ -96,8 +109,38 @@
}
_incomeItems.postValue(groups)
}
+ "火车票" -> {
+ // 处理火车票类型
+ val groups = stations.map { station ->
+ val packages = Core.code.getPackagesByTypeAndStation(type, station.stationName).map { code ->
+ TrainPackage(
+ id = code.id,
+ company = code.secondLevel,
+ trackingNumber = code.code,
+ createTime = code.createTime
+ )
+ }
+ TrainGroup(stationName = station.stationName, packages = packages)
+ }
+ _trainItems.postValue(groups)
+ }
+ "航班" -> {
+ // 处理航班类型
+ val groups = stations.map { station ->
+ val packages = Core.code.getPackagesByTypeAndStation(type, station.stationName).map { code ->
+ FlightPackage(
+ id = code.id,
+ company = code.secondLevel,
+ trackingNumber = code.code,
+ createTime = code.createTime
+ )
+ }
+ FlightGroup(stationName = station.stationName, packages = packages)
+ }
+ _flightItems.postValue(groups)
+ }
else -> {
- // 处理其他类型（还款、航班、火车票）
+ // 处理其他类型（还款）
val groups = stations.map { station ->
val packages = Core.code.getPackagesByTypeAndStation(type, station.stationName).map { code ->
FinancePackage(
@@ -113,8 +156,6 @@
// 根据类型更新对应的 LiveData
when (type) {
"还款" -> _financeItems.postValue(groups)
- "航班" -> _flightItems.postValue(groups)
- "火车票" -> _trainItems.postValue(groups)
}
}
}
@@ -144,45 +185,60 @@
loadDataByType("火车票")
}
- fun loadCategories() {
+ private 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)
+
+ // 默认完整分类列表
+ val fullCategories = listOf(
+ CategoryConfig(1, "快递", 0, true),
+ CategoryConfig(2, "还款", 1, true),
+ CategoryConfig(3, "收入", 2, true),
+ CategoryConfig(4, "航班", 3, true),
+ CategoryConfig(5, "火车票", 4, true)
+ )
+
+ // 基础分类（非会员可见）
+ val basicCategories = listOf(
+ CategoryConfig(1, "快递", 0, true),
+ CategoryConfig(2, "还款", 1, true)
+ )
+
+ if (localCategories.isNotEmpty()) {
+ // 如果本地有配置，直接使用本地配置
+ _categories.value = localCategories
} else {
- // 如果服务器没有配置，尝试获取本地配置
- val localCategories = secureStorage.getCategories(currentUserId)
- if (localCategories.isEmpty()) {
- // 如果本地也没有配置，使用默认配置
- val defaultCategories = listOf(
- CategoryConfig(1, "快递", 0),
- CategoryConfig(2, "还款", 1),
- CategoryConfig(3, "收入", 2),
- CategoryConfig(4, "航班", 3),
- CategoryConfig(5, "火车票", 4)
- )
+ try {
+ // 尝试从服务器获取用户信息判断是否是会员
+ val savedPhone = PreferencesManager.getPhone()
+ val response = RetrofitClient.apiService.getUserInfo(savedPhone ?: "")
+ val isMember = response.code == "0" && response.data?.isMember == true
+
+ // 根据会员状态设置默认分类
+ val defaultCategories = if (isMember) fullCategories else basicCategories
_categories.value = defaultCategories
- syncCategoriesToServer(defaultCategories)
- } else {
- _categories.value = localCategories
- syncCategoriesToServer(localCategories)
+ secureStorage.saveCategories(currentUserId, defaultCategories)
+
+ // 同步到服务器
+ try {
+ syncCategoriesToServer(defaultCategories)
+ } catch (e: Exception) {
+ Log.e("HomeViewModel", "Failed to sync categories: ${e.message}")
+ }
+ } catch (e: Exception) {
+ // 如果获取用户信息失败，使用基础分类
+ _categories.value = basicCategories
+ secureStorage.saveCategories(currentUserId, basicCategories)
}
}
+
+ // 更新可见分类
+ _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}")
}
}
}
@@ -201,16 +257,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>) {
@@ -219,7 +272,19 @@
.sortedBy { it.order }
.map { it.name }
- _visibleCategories.value = visibleNames
+ _visibleCategories.value = categories.filter { it.isEnabled }
+ }
+
+ // 添加检查未读提醒数量的方法
+ fun checkUnreadReminders() {
+ viewModelScope.launch {
+ try {
+ val unreadCount = reminderRecordRepository.getUnreadCount(ReminderRecord.STATUS_UNREAD)
+ _unreadReminderCount.postValue(unreadCount)
+ } catch (e: Exception) {
+ Log.e("HomeViewModel", "Failed to get unread reminder count: ${e.message}")
+ }
+ }
}
// 登出时不再清除本地数据
--
Gitblit v1.9.3