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/database/AppDatabase.kt | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/database/AppDatabase.kt b/app/src/main/java/com/example/firstapp/database/AppDatabase.kt
index 626aae1..99792b8 100644
--- a/app/src/main/java/com/example/firstapp/database/AppDatabase.kt
+++ b/app/src/main/java/com/example/firstapp/database/AppDatabase.kt
@@ -10,32 +10,33 @@
import com.example.firstapp.database.dao.CodeDao
import com.example.firstapp.database.dao.KeywordDao
import com.example.firstapp.database.dao.MsgDao
-import com.example.firstapp.database.dao.ReminderDao
import com.example.firstapp.database.entity.Code
import com.example.firstapp.database.entity.KeywordEntity
import com.example.firstapp.database.entity.Msg
-import com.example.firstapp.database.entity.Reminder
import com.example.firstapp.utils.DATABASE_NAME
-import com.example.firstapp.utils.SettingUtils
-import com.example.firstapp.utils.TAG_LIST
import com.example.firstapp.database.ext.ConvertersDate
import com.example.firstapp.model.CourierStat
import com.example.firstapp.model.DailyStat
+import com.example.firstapp.database.dao.ReminderDao
+import com.example.firstapp.database.dao.ReminderRecordDao
+import com.example.firstapp.database.entity.Reminder
+import com.example.firstapp.database.entity.ReminderRecord
@Database(
entities = [
Msg::class,
Code::class,
- KeywordEntity::class,
- Reminder::class
+ KeywordEntity::class,
+ Reminder::class,
+ ReminderRecord::class
],
views = [
CourierStat::class,
DailyStat::class
],
- version = 20,
+ version = 21,
exportSchema = false
)
@TypeConverters(ConvertersDate::class)
@@ -44,6 +45,7 @@
abstract fun codeDao(): CodeDao
abstract fun keywordDao(): KeywordDao
abstract fun reminderDao(): ReminderDao
+ abstract fun reminderRecordDao(): ReminderRecordDao
companion object {
@Volatile
@@ -64,8 +66,8 @@
}
}).addMigrations(
-
MIGRATION_MSG,
+ MIGRATION_20_21
)
/*if (BuildConfig.DEBUG) {
@@ -139,6 +141,39 @@
}
}
+ private val MIGRATION_20_21 = object : Migration(20, 21) {
+ override fun migrate(database: SupportSQLiteDatabase) {
+ // 创建 reminders 表
+ database.execSQL(
+ """
+ CREATE TABLE IF NOT EXISTS reminders (
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ categoryId INTEGER NOT NULL,
+ categoryName TEXT NOT NULL,
+ notificationMethod TEXT NOT NULL,
+ isEnabled INTEGER NOT NULL DEFAULT 1,
+ createdAt INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)
+ )
+ """
+ )
+
+ // 创建 reminder_records 表
+ database.execSQL(
+ """
+ CREATE TABLE IF NOT EXISTS reminder_records (
+ id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+ categoryId INTEGER NOT NULL,
+ categoryName TEXT NOT NULL,
+ content TEXT NOT NULL,
+ notificationMethod TEXT NOT NULL,
+ status INTEGER NOT NULL DEFAULT 0,
+ createdAt INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)
+ )
+ """
+ )
+ }
+ }
+
}
}
--
Gitblit v1.9.3