Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String ID = "_id"; +======= + public static final String ID = "_id";// 行的唯一标识符 +>>>>>>> liuyitao-branch /** * The parent's id for note or folder *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String PARENT_ID = "parent_id"; +======= + public static final String PARENT_ID = "parent_id";// 父级的ID +>>>>>>> liuyitao-branch /** * Created data for note or folder *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String CREATED_DATE = "created_date"; +======= + public static final String CREATED_DATE = "created_date";// 创建日期 +>>>>>>> liuyitao-branch /** * Latest modified date *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String MODIFIED_DATE = "modified_date"; +======= + public static final String MODIFIED_DATE = "modified_date";// 最后修改日期 +>>>>>>> liuyitao-branch /** * Alert date *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String ALERTED_DATE = "alert_date"; +======= + public static final String ALERTED_DATE = "alert_date";// 提醒日期 +>>>>>>> liuyitao-branch /** * Folder's name or text content of note *Type: TEXT
*/ +<<<<<<< HEAD public static final String SNIPPET = "snippet"; +======= + public static final String SNIPPET = "snippet";// 文件夹名称或便签的文本内容 +>>>>>>> liuyitao-branch /** * Note's widget id *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String WIDGET_ID = "widget_id"; +======= + public static final String WIDGET_ID = "widget_id";// 便签的Widget ID +>>>>>>> liuyitao-branch /** * Note's widget type *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String WIDGET_TYPE = "widget_type"; +======= + public static final String WIDGET_TYPE = "widget_type";// 便签的Widget类型 +>>>>>>> liuyitao-branch /** * Note's background color's id *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String BG_COLOR_ID = "bg_color_id"; +======= + public static final String BG_COLOR_ID = "bg_color_id";// 便签的背景颜色ID +>>>>>>> liuyitao-branch /** * For text note, it doesn't has attachment, for multi-media * note, it has at least one attachment *Type: INTEGER
*/ +<<<<<<< HEAD public static final String HAS_ATTACHMENT = "has_attachment"; +======= + public static final String HAS_ATTACHMENT = "has_attachment";// 是否有附件 +>>>>>>> liuyitao-branch /** * Folder's count of notes *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String NOTES_COUNT = "notes_count"; +======= + public static final String NOTES_COUNT = "notes_count";// 文件夹中的便签数量 +>>>>>>> liuyitao-branch /** * The file type: folder or note *Type: INTEGER
*/ +<<<<<<< HEAD public static final String TYPE = "type"; +======= + public static final String TYPE = "type";// 文件类型：文件夹或便签 +>>>>>>> liuyitao-branch /** * The last sync id *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String SYNC_ID = "sync_id"; +======= + public static final String SYNC_ID = "sync_id";// 最后同步的ID +>>>>>>> liuyitao-branch /** * Sign to indicate local modified or not *Type: INTEGER
*/ +<<<<<<< HEAD public static final String LOCAL_MODIFIED = "local_modified"; +======= + public static final String LOCAL_MODIFIED = "local_modified";// 标识是否本地修改 +>>>>>>> liuyitao-branch /** * Original parent id before moving into temporary folder *Type : INTEGER
*/ +<<<<<<< HEAD public static final String ORIGIN_PARENT_ID = "origin_parent_id"; +======= + public static final String ORIGIN_PARENT_ID = "origin_parent_id";// 移动到临时文件夹之前的原始父级ID +>>>>>>> liuyitao-branch /** * The gtask id *Type : TEXT
*/ +<<<<<<< HEAD public static final String GTASK_ID = "gtask_id"; +======= + public static final String GTASK_ID = "gtask_id";// Google任务ID +>>>>>>> liuyitao-branch /** * The version code *Type : INTEGER (long)
*/ +<<<<<<< HEAD public static final String VERSION = "version"; } +======= + public static final String VERSION = "version";// 版本号 + } + + /* + * 功能描述：定义DataColumns接口数据的常量，用于创建数据库表头 + */ +>>>>>>> liuyitao-branch public interface DataColumns { /** * The unique ID for a row *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String ID = "_id"; +======= + public static final String ID = "_id";// 标识符 +>>>>>>> liuyitao-branch /** * The MIME type of the item represented by this row. *Type: Text
*/ +<<<<<<< HEAD public static final String MIME_TYPE = "mime_type"; +======= + public static final String MIME_TYPE = "mime_type";// 数据的MIME类型 +>>>>>>> liuyitao-branch /** * The reference id to note that this data belongs to *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String NOTE_ID = "note_id"; +======= + public static final String NOTE_ID = "note_id";// 数据ID +>>>>>>> liuyitao-branch /** * Created data for note or folder *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String CREATED_DATE = "created_date"; +======= + public static final String CREATED_DATE = "created_date";// 创建日期 +>>>>>>> liuyitao-branch /** * Latest modified date *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String MODIFIED_DATE = "modified_date"; +======= + public static final String MODIFIED_DATE = "modified_date";// 最后修改日期 +>>>>>>> liuyitao-branch /** * Data's content *Type: TEXT
*/ +<<<<<<< HEAD public static final String CONTENT = "content"; +======= + public static final String CONTENT = "content";// 内容 +>>>>>>> liuyitao-branch /** @@ -210,42 +369,68 @@ public class Notes { * integer data type *Type: INTEGER
*/ +<<<<<<< HEAD public static final String DATA1 = "data1"; +======= + public static final String DATA1 = "data1";// 通用数据1 +>>>>>>> liuyitao-branch /** * Generic data column, the meaning is {@link #MIMETYPE} specific, used for * integer data type *Type: INTEGER
*/ +<<<<<<< HEAD public static final String DATA2 = "data2"; +======= + public static final String DATA2 = "data2";// 通用数据2 +>>>>>>> liuyitao-branch /** * Generic data column, the meaning is {@link #MIMETYPE} specific, used for * TEXT data type *Type: TEXT
*/ +<<<<<<< HEAD public static final String DATA3 = "data3"; +======= + public static final String DATA3 = "data3";// 通用数据3 +>>>>>>> liuyitao-branch /** * Generic data column, the meaning is {@link #MIMETYPE} specific, used for * TEXT data type *Type: TEXT
*/ +<<<<<<< HEAD public static final String DATA4 = "data4"; +======= + public static final String DATA4 = "data4";// 通用数据4 +>>>>>>> liuyitao-branch /** * Generic data column, the meaning is {@link #MIMETYPE} specific, used for * TEXT data type *Type: TEXT
*/ +<<<<<<< HEAD public static final String DATA5 = "data5"; } +======= + public static final String DATA5 = "data5";// 通用数据5 + } + + /* + * 定义了文本便签的数据结构 + */ +>>>>>>> liuyitao-branch public static final class TextNote implements DataColumns { /** * Mode to indicate the text in check list mode or not *Type: Integer 1:check list mode 0: normal mode
*/ +<<<<<<< HEAD public static final String MODE = DATA1; public static final int MODE_CHECK_LIST = 1; @@ -257,17 +442,38 @@ public class Notes { public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); } +======= + public static final String MODE = DATA1;// 模式 + + public static final int MODE_CHECK_LIST = 1;// 待办清单模式 + + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";// 内容类型 + + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";// 单个条目的内容类型 + + public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");// 查询文本便签的URI + } + + /* + * 定义电话便签的数据结构 + */ +>>>>>>> liuyitao-branch public static final class CallNote implements DataColumns { /** * Call date for this record *Type: INTEGER (long)
*/ +<<<<<<< HEAD public static final String CALL_DATE = DATA1; +======= + public static final String CALL_DATE = DATA1;// 通话日期 +>>>>>>> liuyitao-branch /** * Phone number for this record *Type: TEXT
*/ +<<<<<<< HEAD public static final String PHONE_NUMBER = DATA3; public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; @@ -275,5 +481,14 @@ public class Notes { public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); +======= + public static final String PHONE_NUMBER = DATA3;// 电话号码 + + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";// 内容类型 + + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";// 单个条目的内容类型 + + public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");// 查询电话便签的URI +>>>>>>> liuyitao-branch } } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index ffe5d57..59ced1d 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -16,6 +16,7 @@ package net.micode.notes.data; +<<<<<<< HEAD import android.content.ContentValues; import android.content.Context; import android.database.sqlite.SQLiteDatabase; @@ -33,11 +34,38 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final int DB_VERSION = 4; public interface TABLE { +======= + +import android.content.ContentValues;//就是用于保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。 +import android.content.Context;//加载和访问资源。（android中主要是这两个功能，但是这里具体不清楚） +import android.database.sqlite.SQLiteDatabase;//主要提供了对应于添加、删除、更新、查询的操作方法： insert()、delete()、update()和query()。配合content.values +import android.database.sqlite.SQLiteOpenHelper;//用来管理数据的创建和版本更新 +import android.util.Log; + + +import net.micode.notes.data.Notes.DataColumns; +import net.micode.notes.data.Notes.DataConstants; +import net.micode.notes.data.Notes.NoteColumns; +/* +* 功能描述：数据库操作，用SQLOpenhelper,对一些note和文件进行数据库的操作 +*/ + +public class NotesDatabaseHelper extends SQLiteOpenHelper { + private static final String DB_NAME = "note.db";// 数据库名 + + private static final int DB_VERSION = 4;// 版本号 + + public interface TABLE { + /* + * 接口，分成note和data,用于表示数据库中两种表格 + * */ +>>>>>>> liuyitao-branch public static final String NOTE = "note"; public static final String DATA = "data"; } +<<<<<<< HEAD private static final String TAG = "NotesDatabaseHelper"; private static NotesDatabaseHelper mInstance; @@ -78,6 +106,61 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + ")"; +======= + private static final String TAG = "NotesDatabaseHelper";// 日志标签，用于在日志中标识数据库操作的相关信息 + + /* + * NotesDatabaseHelper 类的实例，用于单例模式的数据库操作，通过 getInstance() 方法获取 NotesDatabaseHelper 的唯一实例 + * 单例模式是一种设计模式，在数据库操作中使用单例模式可以确保只有一个数据库连接，避免了重复创建和关闭数据库连接可能导致的性能问题 + */ + private static NotesDatabaseHelper mInstance; + + /* + * 创建TABLE.NOTE表格，用于存储便签的相关信息 + */ + private static final String CREATE_NOTE_TABLE_SQL = + "CREATE TABLE " + TABLE.NOTE + "(" + + NoteColumns.ID + " INTEGER PRIMARY KEY," +// 便签ID + NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +// 便签父级的ID + NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +// 便签的提醒日期 + NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + // 便签的背景颜色ID + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + // 便签的创建日期 + NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +// 便签是否有附件 + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +// 便签的最后修改日期 + NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +// 文件夹中的便签数量 + NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +// 文件夹名称或便签的文本内容 + NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +// 便签的类型 + NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +// 便签的Widget ID + NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +// 便签的Widget类型 + NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +// 便签的同步ID + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +// 便签的本地修改标记 + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +// 原始父级便签的ID + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +// 便签在Google任务中的ID + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +// 便签的版本号 + ")"; + + /* + * 创建TABLE.DATA表格，用于存储便签中的数据 + */ + private static final String CREATE_DATA_TABLE_SQL = + "CREATE TABLE " + TABLE.DATA + "(" + + DataColumns.ID + " INTEGER PRIMARY KEY," +// 数据ID + DataColumns.MIME_TYPE + " TEXT NOT NULL," +// 数据ID数据的MIME类型 + DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +// 数据所属的便签的ID + NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +// 数据的创建日期 + NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +// 数据的最后修改日期 + DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +// 数据的内容 + DataColumns.DATA1 + " INTEGER," +// 数据的附加信息1 + DataColumns.DATA2 + " INTEGER," +// 数据的附加信息2 + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +// 数据的附加信息3 + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +// 数据的附加信息4 + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +// 数据的附加信息5 + ")"; + + /* + * 创建一个名为 note_id_index 的索引，在 TABLE.DATA 表格的 DataColumns.NOTE_ID 列上创建索引，以提高查询性能 + */ +>>>>>>> liuyitao-branch private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = "CREATE INDEX IF NOT EXISTS note_id_index ON " + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; @@ -85,6 +168,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Increase folder's note count when move note to the folder */ +<<<<<<< HEAD +======= + + /* + * 在更新 TABLE.NOTE 表格的 NoteColumns.PARENT_ID 列时，增加相应文件夹的便签计数 + * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其加1 + */ +>>>>>>> liuyitao-branch private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER increase_folder_count_on_update "+ " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + @@ -97,6 +188,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Decrease folder's note count when move note from folder */ +<<<<<<< HEAD +======= + + /* + * 在更新 TABLE.NOTE 表格的 NoteColumns.PARENT_ID 列时，减少相应文件夹的便签计数 + * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其减1 + */ +>>>>>>> liuyitao-branch private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_update " + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + @@ -110,6 +209,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Increase folder's note count when insert new note to the folder */ +<<<<<<< HEAD +======= + + /* + * 在向 TABLE.NOTE 表格插入新便签时，增加相应文件夹的便签计数 + * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其加1 + */ +>>>>>>> liuyitao-branch private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = "CREATE TRIGGER increase_folder_count_on_insert " + " AFTER INSERT ON " + TABLE.NOTE + @@ -122,6 +229,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Decrease folder's note count when delete note from the folder */ +<<<<<<< HEAD +======= + + /* + * 在从 TABLE.NOTE 表格删除便签时，减少相应文件夹的便签计数 + * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其减1 + */ +>>>>>>> liuyitao-branch private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_delete " + " AFTER DELETE ON " + TABLE.NOTE + @@ -135,6 +250,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Update note's content when insert data with type {@link DataConstants#NOTE} */ +<<<<<<< HEAD +======= + + /* + * 在向 TABLE.DATA 表格插入类型为 DataConstants.NOTE 的数据时，更新对应便签的内容 + * 通过更新 TABLE.NOTE 表格中的 NoteColumns.SNIPPET 列，将其设置为新插入数据的内容 + */ +>>>>>>> liuyitao-branch private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = "CREATE TRIGGER update_note_content_on_insert " + " AFTER INSERT ON " + TABLE.DATA + @@ -148,6 +271,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Update note's content when data with {@link DataConstants#NOTE} type has changed */ +<<<<<<< HEAD +======= + + /* + * 在更新类型为 DataConstants.NOTE 的数据时，更新对应便签的内容 + * 通过触发器在 TABLE.DATA 表格上创建，在数据被更新后将新的内容更新到对应的便签中 + */ +>>>>>>> liuyitao-branch private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = "CREATE TRIGGER update_note_content_on_update " + " AFTER UPDATE ON " + TABLE.DATA + @@ -161,6 +292,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Update note's content when data with {@link DataConstants#NOTE} type has deleted */ +<<<<<<< HEAD +======= + + /* + * 在删除类型为 DataConstants.NOTE 的数据时，更新对应便签的内容 + * 通过触发器在 TABLE.DATA 表格上创建，在数据被删除后将对应的便签内容清空 + */ +>>>>>>> liuyitao-branch private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = "CREATE TRIGGER update_note_content_on_delete " + " AFTER delete ON " + TABLE.DATA + @@ -174,6 +313,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Delete datas belong to note which has been deleted */ +<<<<<<< HEAD +======= + + /* + * 在删除便签时，同时删除该便签相关的数据 + * 通过触发器在 TABLE.NOTE 表格上创建，在便签被删除后将与该便签相关的数据一并删除 + */ +>>>>>>> liuyitao-branch private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = "CREATE TRIGGER delete_data_on_delete " + " AFTER DELETE ON " + TABLE.NOTE + @@ -185,6 +332,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Delete notes belong to folder which has been deleted */ +<<<<<<< HEAD +======= + + /* + * 在删除文件夹时，同时删除该文件夹下的所有便签 + * 通过触发器在 TABLE.NOTE 表格上创建，在文件夹被删除后将该文件夹下的所有便签一并删除。 + */ +>>>>>>> liuyitao-branch private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = "CREATE TRIGGER folder_delete_notes_on_delete " + " AFTER DELETE ON " + TABLE.NOTE + @@ -196,6 +351,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * Move notes belong to folder which has been moved to trash folder */ +<<<<<<< HEAD +======= + + /* + * 在将文件夹移动到回收站时，同时将该文件夹下的所有便签一并移动到回收站 + * 通过触发器在 TABLE.NOTE 表格上创建，在文件夹被移动到回收站后将该文件夹下的所有便签的父文件夹ID更新为回收站的ID + */ +>>>>>>> liuyitao-branch private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = "CREATE TRIGGER folder_move_notes_on_trash " + " AFTER UPDATE ON " + TABLE.NOTE + @@ -206,10 +369,22 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + " END"; +<<<<<<< HEAD +======= + /* + * 构造函数，传入数据库的名称和版本 + */ +>>>>>>> liuyitao-branch public NotesDatabaseHelper(Context context) { super(context, DB_NAME, null, DB_VERSION); } +<<<<<<< HEAD +======= + /* + * 用于创建存储标签属性的表格 + */ +>>>>>>> liuyitao-branch public void createNoteTable(SQLiteDatabase db) { db.execSQL(CREATE_NOTE_TABLE_SQL); reCreateNoteTableTriggers(db); @@ -217,7 +392,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { Log.d(TAG, "note table has been created"); } +<<<<<<< HEAD private void reCreateNoteTableTriggers(SQLiteDatabase db) { +======= + /* + * 用于重新创建数据库中的触发器 + */ + private void reCreateNoteTableTriggers(SQLiteDatabase db) { + // 通过执行SQL语句DROP TRIGGER IF EXISTS来删除已存在的触发器，以确保不会重复创建 +>>>>>>> liuyitao-branch db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_delete"); @@ -225,6 +408,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert"); db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete"); db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash"); +<<<<<<< HEAD db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); @@ -235,12 +419,33 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); } +======= + // 创建新的触发器 + db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);// 增加文件夹计数的触发器 + db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);// 减少文件夹计数的触发器 + db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);// 删除文件夹计数的触发器 + db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER);// 在删除时同时删除数据的触发器 + db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);// 增加文件夹计数的触发器 + db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);// 在删除时同时删除文件夹中的笔记的触发器 + db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);// 将笔记移动到垃圾箱的触发器 + } + + /* + *用于创建系统文件夹，插入四个不同类型的文件夹记录到 NoteColumns 表中 + */ +>>>>>>> liuyitao-branch private void createSystemFolder(SQLiteDatabase db) { ContentValues values = new ContentValues(); /** * call record foler for call notes */ +<<<<<<< HEAD +======= + /* + * 创建通话记录文件夹 + */ +>>>>>>> liuyitao-branch values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); @@ -248,6 +453,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * root folder which is default folder */ +<<<<<<< HEAD +======= + /* + * 根目录，即默认文件夹 + */ +>>>>>>> liuyitao-branch values.clear(); values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); @@ -256,6 +467,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * temporary folder which is used for moving note */ +<<<<<<< HEAD +======= + /* + * 临时目录，用于移动笔记 + */ +>>>>>>> liuyitao-branch values.clear(); values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); @@ -264,12 +481,19 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { /** * create trash folder */ +<<<<<<< HEAD +======= + /* + * 创建垃圾箱 + */ +>>>>>>> liuyitao-branch values.clear(); values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); } +<<<<<<< HEAD public void createDataTable(SQLiteDatabase db) { db.execSQL(CREATE_DATA_TABLE_SQL); reCreateDataTableTriggers(db); @@ -277,6 +501,21 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { Log.d(TAG, "data table has been created"); } +======= + /* + * 用于创建存储标签内容的表格 + */ + public void createDataTable(SQLiteDatabase db) { + db.execSQL(CREATE_DATA_TABLE_SQL);// 执行 CREATE_DATA_TABLE_SQL 的 SQL 语句来创建数据表 + reCreateDataTableTriggers(db);// 调用 reCreateDataTableTriggers() 方法重新创建数据表中的触发器 + db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);// 执行 CREATE_DATA_NOTE_ID_INDEX_SQL 的 SQL 语句来创建一个索引 + Log.d(TAG, "data table has been created"); + } + + /* + * 用于重新创建数据表中的触发器 + */ +>>>>>>> liuyitao-branch private void reCreateDataTableTriggers(SQLiteDatabase db) { db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update"); @@ -287,6 +526,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); } +<<<<<<< HEAD +======= + /* + * 用于获取单例的数据库帮助类对象 + * 解决同一时刻只能有一个线程执行. + * 在写程序库代码时，有时有一个类需要被所的其它类使用 + * 但又要求这个类只能被实例化一次，是个服务类，定义一次，其它类使用同一个这个类的实例 + */ +>>>>>>> liuyitao-branch static synchronized NotesDatabaseHelper getInstance(Context context) { if (mInstance == null) { mInstance = new NotesDatabaseHelper(context); @@ -295,44 +543,87 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { } @Override +<<<<<<< HEAD +======= + /* + * 在数据库第一次创建时被调用，用于创建所需的表格和触发器 + */ +>>>>>>> liuyitao-branch public void onCreate(SQLiteDatabase db) { createNoteTable(db); createDataTable(db); } @Override +<<<<<<< HEAD public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { boolean reCreateTriggers = false; boolean skipV2 = false; +======= + /* + * 根据旧版本和新版本之间的差异来执行相应的数据库升级操作 + */ + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + boolean reCreateTriggers = false; + boolean skipV2 = false;// 是否进行V2升级 + /* + * 如果旧版本为1，则调用upgradeToV2方法 + */ +>>>>>>> liuyitao-branch if (oldVersion == 1) { upgradeToV2(db); skipV2 = true; // this upgrade including the upgrade from v2 to v3 oldVersion++; } +<<<<<<< HEAD +======= + /* + * 如果旧版本为2且未跳过V2升级，则调用upgradeToV3方法 + */ +>>>>>>> liuyitao-branch if (oldVersion == 2 && !skipV2) { upgradeToV3(db); reCreateTriggers = true; oldVersion++; } +<<<<<<< HEAD +======= + /* + * 如果旧版本为3，则调用upgradeToV4方法 + */ +>>>>>>> liuyitao-branch if (oldVersion == 3) { upgradeToV4(db); oldVersion++; } +<<<<<<< HEAD +======= + /* + * 如果需要重新创建触发器，则调用reCreateNoteTableTriggers和reCreateDataTableTriggers方法重新创建触发器 + */ +>>>>>>> liuyitao-branch if (reCreateTriggers) { reCreateNoteTableTriggers(db); reCreateDataTableTriggers(db); } +<<<<<<< HEAD +======= + /* + * 如果旧版本和新版本不匹配，则抛出异常 + */ +>>>>>>> liuyitao-branch if (oldVersion != newVersion) { throw new IllegalStateException("Upgrade notes database to version " + newVersion + "fails"); } } +<<<<<<< HEAD private void upgradeToV2(SQLiteDatabase db) { db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); @@ -341,13 +632,47 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { } private void upgradeToV3(SQLiteDatabase db) { +======= + /* + * 更新到V2版本 + * */ + private void upgradeToV2(SQLiteDatabase db) { + /* + * 通过执行SQL语句DROP TABLE IF EXISTS来删除旧的NOTE和DATA表格 + * */ + db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); + db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); + createNoteTable(db);// 调用createNoteTable和createDataTable方法来创建新的NOTE表格 + createDataTable(db);// 调用createNoteTable和createDataTable方法来创建新的DATA表格 + } + + /* + * 更新到V3版本 + * */ + private void upgradeToV3(SQLiteDatabase db) { + /* + * 执行SQL语句DROP TRIGGER IF EXISTS来移除不再使用的触发器 + * */ +>>>>>>> liuyitao-branch // drop unused triggers db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert"); db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete"); db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update"); +<<<<<<< HEAD // add a column for gtask id db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''"); +======= + /* + * 执行ALTER TABLE语句向NOTE表格中添加一个新的列GTASK_ID，该列的类型是TEXT，并设置默认值为'' + * */ + // add a column for gtask id + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID + + " TEXT NOT NULL DEFAULT ''"); + /* + * 通过ContentValues对象向NOTE表格中插入一条记录，该记录代表垃圾箱系统文件夹 + * */ +>>>>>>> liuyitao-branch // add a trash system folder ContentValues values = new ContentValues(); values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); @@ -355,8 +680,17 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.insert(TABLE.NOTE, null, values); } +<<<<<<< HEAD private void upgradeToV4(SQLiteDatabase db) { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0"); +======= + /* + * 更新到V4版本 + * */ + private void upgradeToV4(SQLiteDatabase db) { + db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + + " INTEGER NOT NULL DEFAULT 0");// 通过执行ALTER TABLE语句向NOTE表格中添加一个新的列VERSION，该列的类型是INTEGER，并设置默认值为0 +>>>>>>> liuyitao-branch } } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java index edb0a60..1473b57 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java @@ -34,6 +34,7 @@ import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; +<<<<<<< HEAD public class NotesProvider extends ContentProvider { private static final UriMatcher mMatcher; @@ -43,6 +44,19 @@ public class NotesProvider extends ContentProvider { private static final String TAG = "NotesProvider"; private static final int URI_NOTE = 1; +======= +/* +* 功能描述：用于提供对便签数据的存储和获取功能，实现了创建、读取、更新、删除操作，以便其他组件可以通过 ContentResolver 访问和管理便签数据。 +* */ +public class NotesProvider extends ContentProvider { + private static final UriMatcher mMatcher;// UriMatcher用于匹配Uri + + private NotesDatabaseHelper mHelper;// 数据库帮助类 + + private static final String TAG = "NotesProvider";// 标签 + + private static final int URI_NOTE = 1;// Uri匹配码 +>>>>>>> liuyitao-branch private static final int URI_NOTE_ITEM = 2; private static final int URI_DATA = 3; private static final int URI_DATA_ITEM = 4; @@ -51,6 +65,7 @@ public class NotesProvider extends ContentProvider { private static final int URI_SEARCH_SUGGEST = 6; static { +<<<<<<< HEAD mMatcher = new UriMatcher(UriMatcher.NO_MATCH); mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM); @@ -59,12 +74,32 @@ public class NotesProvider extends ContentProvider { mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH); mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST); mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST); +======= + mMatcher = new UriMatcher(UriMatcher.NO_MATCH);// 创建UriMatcher时，调用UriMatcher(UriMatcher.NO_MATCH)表示不匹配任何路径的返回码 + /* + * 把需要匹配Uri路径全部给注册上 + * */ + mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);// 便签列表的路径 + mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);// 便签详情的路径，其中 "#" 表示数字，表示具体的便签 ID + mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);// 数据列表的路径 + mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM);// 数据详情的路径，其中 "#" 表示数字，表示具体的数据 ID + mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH);// 搜索的路径 + mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST);// 搜索建议的路径 + mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);// 带搜索关键字的搜索建议的路径 +>>>>>>> liuyitao-branch } /** * x'0A' represents the '\n' character in sqlite. For title and content in the search result, * we will trim '\n' and white space in order to show more information. */ +<<<<<<< HEAD +======= + + /* + * 查询搜索结果的投影。该投影包含了搜索结果需要的各个字段，如便签的 ID、搜索文本等 + * */ +>>>>>>> liuyitao-branch private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," @@ -73,6 +108,12 @@ public class NotesProvider extends ContentProvider { + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; +<<<<<<< HEAD +======= + /* + * 查询语句，用于查询搜索结果 + * */ +>>>>>>> liuyitao-branch private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION + " FROM " + TABLE.NOTE + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" @@ -80,12 +121,19 @@ public class NotesProvider extends ContentProvider { + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; @Override +<<<<<<< HEAD +======= + /* + *在onCreate()中初始化Context，实例化mHelper + * */ +>>>>>>> liuyitao-branch public boolean onCreate() { mHelper = NotesDatabaseHelper.getInstance(getContext()); return true; } @Override +<<<<<<< HEAD public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { Cursor c = null; @@ -109,17 +157,53 @@ public class NotesProvider extends ContentProvider { id = uri.getPathSegments().get(1); c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs, null, null, sortOrder); +======= + /* + * 根据传入的Uri进行数据库查询操作 + * */ + public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, + String sortOrder) { + Cursor c = null;// 定义一个Cursor对象用于存放查询结果 + SQLiteDatabase db = mHelper.getReadableDatabase();// 获取可读数据库实例 + String id = null;// 用于存放ID值 + /* + * 根据Uri使用Matcher匹配相应的操作，对于不同的匹配值，在数据库中查找相应的条目 + * */ + switch (mMatcher.match(uri)) { + case URI_NOTE: + c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, + sortOrder);// 查询便签列表 + break; + case URI_NOTE_ITEM: + id = uri.getPathSegments().get(1);// 获取Uri中的ID值 + c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id + + parseSelection(selection), selectionArgs, null, null, sortOrder);// 查询特定ID的便签详情 + break; + case URI_DATA: + c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null, + sortOrder);// 查询数据列表 + break; + case URI_DATA_ITEM: + id = uri.getPathSegments().get(1); // 获取Uri中的ID值 + c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id + + parseSelection(selection), selectionArgs, null, null, sortOrder);// 查询特定ID的数据详情 +>>>>>>> liuyitao-branch break; case URI_SEARCH: case URI_SEARCH_SUGGEST: if (sortOrder != null || projection != null) { throw new IllegalArgumentException( +<<<<<<< HEAD "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); +======= + "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");// 如果存在不合法的参数则抛出异常 +>>>>>>> liuyitao-branch } String searchString = null; if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { if (uri.getPathSegments().size() > 1) { +<<<<<<< HEAD searchString = uri.getPathSegments().get(1); } } else { @@ -194,11 +278,103 @@ public class NotesProvider extends ContentProvider { break; case URI_NOTE_ITEM: id = uri.getPathSegments().get(1); +======= + searchString = uri.getPathSegments().get(1); // 获取搜索关键字 + } + } else { + searchString = uri.getQueryParameter("pattern"); // 获取搜索关键字 + } + + if (TextUtils.isEmpty(searchString)) { + return null;// 如果搜索关键字为空则直接返回null + } + + try { + searchString = String.format("%%%s%%", searchString);// 格式化搜索关键字 + c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY, + new String[] { searchString });// 执行搜索查询 + } catch (IllegalStateException ex) { + Log.e(TAG, "got exception: " + ex.toString());// 捕获异常 + } + break; + default: + throw new IllegalArgumentException("Unknown URI " + uri);// 对于未知的Uri抛出异常 + } + if (c != null) { + c.setNotificationUri(getContext().getContentResolver(), uri);// 设置查询结果的变更通知URI + } + return c;// 返回查询结果的Cursor对象 + } + + @Override + /* + * 功能描述：实现对数据库表单的增加记录操作 + * 输入参数：参数 uri 表示插入的 URI，values 表示插入的值 + * */ + public Uri insert(Uri uri, ContentValues values) { + SQLiteDatabase db = mHelper.getWritableDatabase();// 获得可写的数据库 + long dataId = 0, noteId = 0, insertedId = 0;// 定义三个id值变量 + /* + * 根据Uri使用Matcher匹配相应的操作 + * */ + switch (mMatcher.match(uri)) { + case URI_NOTE: + insertedId = noteId = db.insert(TABLE.NOTE, null, values);// 在便签表中插入新记录 + break; + case URI_DATA: + if (values.containsKey(DataColumns.NOTE_ID)) { + noteId = values.getAsLong(DataColumns.NOTE_ID);// 如果数据内容包含NOTE_ID字段，获取NOTE_ID值 + } else { + Log.d(TAG, "Wrong data format without note id:" + values.toString());// 如果不包含则输出日志信息 + } + insertedId = dataId = db.insert(TABLE.DATA, null, values);// 在数据表中插入新记录 + break; + default: + throw new IllegalArgumentException("Unknown URI " + uri);// 对于未知的Uri抛出异常 + } + // Notify the note uri + if (noteId > 0) {// 如果是便签新增操作 + getContext().getContentResolver().notifyChange( + ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);// 通过ContentResolver对象发送通知，更新便签的变更通知URI + } + + // Notify the data uri + if (dataId > 0) {// 如果是数据新增操作 + getContext().getContentResolver().notifyChange( + ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);// 通过ContentResolver对象发送通知，更新数据的变更通知URI + } + + return ContentUris.withAppendedId(uri, insertedId);// 返回插入的uri的路径 + } + + @Override + /* + * 功能描述：实现对数据库表单的删除记录操作 + * 输入参数：参数 uri 表示删除的 URI，selection 表示删除条件，selectionArgs 表示删除条件值 + * */ + public int delete(Uri uri, String selection, String[] selectionArgs) { + //Uri代表要操作的数据，Android上可用的每种资源 -包括 图像、视频片段、音频资源等都可以用Uri来表示 + int count = 0;// 定义计数变量 + String id = null;// 定义id字符串变量 + SQLiteDatabase db = mHelper.getWritableDatabase();// 获取可写数据库实例 + boolean deleteData = false;// 是否删除数据标志位 + /* + * 根据Uri使用Matcher匹配相应的操作 + * */ + switch (mMatcher.match(uri)) { + case URI_NOTE: + selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";// 对于便签的删除操作，添加额外的条件限制 + count = db.delete(TABLE.NOTE, selection, selectionArgs);// 在便签表中删除符合条件的记录 + break; + case URI_NOTE_ITEM: + id = uri.getPathSegments().get(1);// 获取Uri中的ID参数 +>>>>>>> liuyitao-branch /** * ID that smaller than 0 is system folder which is not allowed to * trash */ long noteId = Long.valueOf(id); +<<<<<<< HEAD if (noteId <= 0) { break; } @@ -267,10 +443,91 @@ public class NotesProvider extends ContentProvider { return count; } +======= + if (noteId <= 0) {// 如果ID小于等于0，则不允许删除 + break; + } + count = db.delete(TABLE.NOTE, + NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);// 在便签表中删除指定ID的记录 + break; + case URI_DATA: + count = db.delete(TABLE.DATA, selection, selectionArgs);// 在数据表中删除符合条件的记录 + deleteData = true;// 设置删除数据标志位为true + break; + case URI_DATA_ITEM: + id = uri.getPathSegments().get(1);// 获取Uri中的ID参数 + count = db.delete(TABLE.DATA, + DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);// 在数据表中删除指定ID的记录 + deleteData = true;// 设置删除数据标志位为true + break; + default: + throw new IllegalArgumentException("Unknown URI " + uri);// 对于未知的Uri抛出异常 + } + if (count > 0) {// 如果删除记录数大于0 + if (deleteData) { + getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);// 通过ContentResolver对象发送通知，更新便签变更通知URI + } + getContext().getContentResolver().notifyChange(uri, null);// 通过ContentResolver对象发送通知，更新变更通知URI + } + return count;// 返回删除的记录数 + } + + @Override + /* + * 功能描述：实现对数据库表单的更新操作 + * 输入参数：参数 uri 表示更新的 URI，values 表示更新的值，selection 表示更新条件，selectionArgs 表示更新条件值 + * */ + public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { + int count = 0;// 定义计数变量 + String id = null;// 定义id字符串变量 + SQLiteDatabase db = mHelper.getWritableDatabase();// 获取可写数据库实例 + boolean updateData = false;// 是否更新数据标志位 + /* + * 根据Uri使用Matcher匹配相应的操作 + * */ + switch (mMatcher.match(uri)) { + case URI_NOTE: + increaseNoteVersion(-1, selection, selectionArgs);// 增加便签版本号，针对便签的更新操作，添加额外的条件限制 + count = db.update(TABLE.NOTE, values, selection, selectionArgs);// 在便签表中更新符合条件的记录 + break; + case URI_NOTE_ITEM: + id = uri.getPathSegments().get(1);// 获取Uri中的ID参数 + increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);// 增加便签版本号，针对便签的更新操作，添加额外的条件限制 + count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id + + parseSelection(selection), selectionArgs);// 在便签表中更新指定ID的记录 + break; + case URI_DATA: + count = db.update(TABLE.DATA, values, selection, selectionArgs);// 在数据表中更新符合条件的记录 + updateData = true;// 设置更新数据标志位为tru + break; + case URI_DATA_ITEM: + id = uri.getPathSegments().get(1);// 获取Uri中的ID参数 + count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id + + parseSelection(selection), selectionArgs);// 在数据表中更新指定ID的记录 + updateData = true;// 设置更新数据标志位为true + break; + default: + throw new IllegalArgumentException("Unknown URI " + uri);// 对于未知的Uri抛出异常 + } + + if (count > 0) {// 如果更新记录数大于0 + if (updateData) { + getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);// 通过ContentResolver对象发送通知，更新便签变更通知URI + } + getContext().getContentResolver().notifyChange(uri, null);// 通过ContentResolver对象发送通知，更新变更通知URI + } + return count;// 返回更新的记录数 + } + + /* + * 解析查询条件selection，如果selection不为空，则在其前面加上" AND "，用于拼接SQL语句 + * */ +>>>>>>> liuyitao-branch private String parseSelection(String selection) { return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); } +<<<<<<< HEAD private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { StringBuilder sql = new StringBuilder(120); sql.append("UPDATE "); @@ -297,9 +554,49 @@ public class NotesProvider extends ContentProvider { } @Override +======= + /* + * 根据传入的id和selection参数确定要更新的记录，并将版本号加1 + * */ + private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { + StringBuilder sql = new StringBuilder(120);// 创建一个StringBuilder对象，用于构建SQL语句 + sql.append("UPDATE ");// 构建UPDATE语句，指定要更新的表名 + sql.append(TABLE.NOTE);// 表名 + sql.append(" SET ");// 指定要更新的字段和新的值 + sql.append(NoteColumns.VERSION);// 字段名 + sql.append("=" + NoteColumns.VERSION + "+1 ");// 将版本号加1 + + if (id > 0 || !TextUtils.isEmpty(selection)) { + sql.append(" WHERE ");// 根据传入的参数决定是否添加WHERE子句 + } + if (id > 0) { + sql.append(NoteColumns.ID + "=" + String.valueOf(id)); // 如果传入的id大于0，则表示只更新指定id的记录 + } + if (!TextUtils.isEmpty(selection)) {// 如果传入的selection不为空，则根据它来确定要更新的记录 + String selectString = id > 0 ? parseSelection(selection) : selection;// 调用parseSelection方法将selection转换为SQL语句中的WHERE子句 + for (String args : selectionArgs) { + selectString = selectString.replaceFirst("\\?", args);// 替换WHERE子句中的问号占位符为实际的参数值 + } + sql.append(selectString);// 添加WHERE子句到SQL语句中 + } + + // execSQL()方法可以执行insert、delete、update和CREATE TABLE之类有更改行为的SQL语句 + mHelper.getWritableDatabase().execSQL(sql.toString());// 添加WHERE子句到SQL语句中 + } + + @Override + /* + * 功能描述：用于根据 URI 返回相应的 MIME 类型 + * 输入参数：参数 uri 表示查询或操作的 URI + * 函数中是环境自动生成的，也可自己改写 + * */ +>>>>>>> liuyitao-branch public String getType(Uri uri) { // TODO Auto-generated method stub return null; } +<<<<<<< HEAD +======= +>>>>>>> liuyitao-branch } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java index 3128286..1edcef7 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java @@ -26,6 +26,7 @@ import org.json.JSONObject; public class MetaData extends Task { +<<<<<<< HEAD /* * 功能描述：得到类的简写名称存入字符串TAG中 * 实现过程：调用getSimpleName ()函数 @@ -50,10 +51,22 @@ public class MetaData extends Task { /* * 输出错误信息 */ +======= + private final static String TAG = MetaData.class.getSimpleName(); + + private String mRelatedGid = null; + + public void setMeta(String gid, JSONObject metaInfo) { + try { + metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid); + } catch (JSONException e) { + Log.e(TAG, "failed to put related gid"); +>>>>>>> liuyitao-branch } setNotes(metaInfo.toString()); setName(GTaskStringUtils.META_NOTE_NAME); } +<<<<<<< HEAD /* * 功能描述：获取相关联的Gid */ @@ -63,15 +76,26 @@ public class MetaData extends Task { /* * 功能描述：判断当前数据是否为空，若为空则返回真即值得保存 */ +======= + + public String getRelatedGid() { + return mRelatedGid; + } + +>>>>>>> liuyitao-branch @Override public boolean isWorthSaving() { return getNotes() != null; } +<<<<<<< HEAD /* * 功能描述：使用远程json数据对象设置元数据内容 * 实现过程：调用父类Task中的setContentByRemoteJSON ()函数，并 * 参数注解： */ +======= + +>>>>>>> liuyitao-branch @Override public void setContentByRemoteJSON(JSONObject js) { super.setContentByRemoteJSON(js); @@ -81,21 +105,29 @@ public class MetaData extends Task { mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID); } catch (JSONException e) { Log.w(TAG, "failed to get related gid"); +<<<<<<< HEAD /* * 输出警告信息 */ +======= +>>>>>>> liuyitao-branch mRelatedGid = null; } } } +<<<<<<< HEAD /* * 功能描述：使用本地json数据对象设置元数据内容，一般不会用到，若用到，则抛出异常 */ +======= + +>>>>>>> liuyitao-branch @Override public void setContentByLocalJSON(JSONObject js) { // this function should not be called throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called"); } +<<<<<<< HEAD @Override public JSONObject getLocalJSONFromContent() { throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called"); @@ -113,4 +145,17 @@ public class MetaData extends Task { 传递非法参数异常 */ } +======= + + @Override + public JSONObject getLocalJSONFromContent() { + throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called"); + } + + @Override + public int getSyncAction(Cursor c) { + throw new IllegalAccessError("MetaData:getSyncAction should not be called"); + } + +>>>>>>> liuyitao-branch } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java index 15f2f24..91a34fd 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java @@ -20,6 +20,7 @@ import android.database.Cursor; import org.json.JSONObject; +<<<<<<< HEAD /** * 应该是同步操作的基础数据类型，定义了相关指示同步操作的常量 * 关键字：abstract @@ -43,11 +44,32 @@ public abstract class Node { public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;// 同步出现冲突 public static final int SYNC_ACTION_ERROR = 8;// 同步出现错误 +======= +public abstract class Node { + public static final int SYNC_ACTION_NONE = 0; + + public static final int SYNC_ACTION_ADD_REMOTE = 1; + + public static final int SYNC_ACTION_ADD_LOCAL = 2; + + public static final int SYNC_ACTION_DEL_REMOTE = 3; + + public static final int SYNC_ACTION_DEL_LOCAL = 4; + + public static final int SYNC_ACTION_UPDATE_REMOTE = 5; + + public static final int SYNC_ACTION_UPDATE_LOCAL = 6; + + public static final int SYNC_ACTION_UPDATE_CONFLICT = 7; + + public static final int SYNC_ACTION_ERROR = 8; +>>>>>>> liuyitao-branch private String mGid; private String mName; +<<<<<<< HEAD private long mLastModified;//记录最后一次修改时间 private boolean mDeleted;//表征是否被删除 @@ -102,4 +124,61 @@ public abstract class Node { public boolean getDeleted() { return this.mDeleted; // 返回 mDeleted 的取值 } +======= + private long mLastModified; + + private boolean mDeleted; + + public Node() { + mGid = null; + mName = ""; + mLastModified = 0; + mDeleted = false; + } + + public abstract JSONObject getCreateAction(int actionId); + + public abstract JSONObject getUpdateAction(int actionId); + + public abstract void setContentByRemoteJSON(JSONObject js); + + public abstract void setContentByLocalJSON(JSONObject js); + + public abstract JSONObject getLocalJSONFromContent(); + + public abstract int getSyncAction(Cursor c); + + public void setGid(String gid) { + this.mGid = gid; + } + + public void setName(String name) { + this.mName = name; + } + + public void setLastModified(long lastModified) { + this.mLastModified = lastModified; + } + + public void setDeleted(boolean deleted) { + this.mDeleted = deleted; + } + + public String getGid() { + return this.mGid; + } + + public String getName() { + return this.mName; + } + + public long getLastModified() { + return this.mLastModified; + } + + public boolean getDeleted() { + return this.mDeleted; + } + +>>>>>>> liuyitao-branch } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java index 9a1d281..a7c6ac0 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java @@ -14,6 +14,7 @@ * limitations under the License. */ +<<<<<<< HEAD /* * Description：用于支持小米便签最底层的数据库相关操作，和sqlnote的关系上是子集关系，即data是note的子集（节点）。 * SqlData其实就是也就是所谓数据中的数据 @@ -25,6 +26,9 @@ package net.micode.notes.gtask.data; * 实现过程： * 参数注解： */ +======= +package net.micode.notes.gtask.data; +>>>>>>> liuyitao-branch import android.content.ContentResolver; import android.content.ContentUris; @@ -46,6 +50,7 @@ import org.json.JSONObject; public class SqlData { +<<<<<<< HEAD /* * 功能描述：得到类的简写名称存入字符串TAG中 * 实现过程：调用getSimpleName ()函数 @@ -59,10 +64,17 @@ public class SqlData { */ // 集合了interface DataColumns中所有SF常量 +======= + private static final String TAG = SqlData.class.getSimpleName(); + + private static final int INVALID_ID = -99999; + +>>>>>>> liuyitao-branch public static final String[] PROJECTION_DATA = new String[] { DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1, DataColumns.DATA3 }; +<<<<<<< HEAD /* * 以下五个变量作为sql表中5列的编号 */ @@ -102,6 +114,39 @@ public class SqlData { mContentResolver = context.getContentResolver(); mIsCreate = true; mDataId = INVALID_ID;//mDataId置初始值-99999 +======= + + public static final int DATA_ID_COLUMN = 0; + + public static final int DATA_MIME_TYPE_COLUMN = 1; + + public static final int DATA_CONTENT_COLUMN = 2; + + public static final int DATA_CONTENT_DATA_1_COLUMN = 3; + + public static final int DATA_CONTENT_DATA_3_COLUMN = 4; + + private ContentResolver mContentResolver; + + private boolean mIsCreate; + + private long mDataId; + + private String mDataMimeType; + + private String mDataContent; + + private long mDataContentData1; + + private String mDataContentData3; + + private ContentValues mDiffDataValues; + + public SqlData(Context context) { + mContentResolver = context.getContentResolver(); + mIsCreate = true; + mDataId = INVALID_ID; +>>>>>>> liuyitao-branch mDataMimeType = DataConstants.NOTE; mDataContent = ""; mDataContentData1 = 0; @@ -109,6 +154,7 @@ public class SqlData { mDiffDataValues = new ContentValues(); } +<<<<<<< HEAD /* * 功能描述：构造函数，初始化数据 @@ -216,6 +262,82 @@ public class SqlData { mDataId = Long.valueOf(uri.getPathSegments().get(1)); } catch (NumberFormatException e) { // 如果获取ID出错则输出错误日志并抛出ActionFailureException异常 +======= + public SqlData(Context context, Cursor c) { + mContentResolver = context.getContentResolver(); + mIsCreate = false; + loadFromCursor(c); + mDiffDataValues = new ContentValues(); + } + + private void loadFromCursor(Cursor c) { + mDataId = c.getLong(DATA_ID_COLUMN); + mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN); + mDataContent = c.getString(DATA_CONTENT_COLUMN); + mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN); + mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN); + } + + public void setContent(JSONObject js) throws JSONException { + long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID; + if (mIsCreate || mDataId != dataId) { + mDiffDataValues.put(DataColumns.ID, dataId); + } + mDataId = dataId; + + String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE) + : DataConstants.NOTE; + if (mIsCreate || !mDataMimeType.equals(dataMimeType)) { + mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType); + } + mDataMimeType = dataMimeType; + + String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : ""; + if (mIsCreate || !mDataContent.equals(dataContent)) { + mDiffDataValues.put(DataColumns.CONTENT, dataContent); + } + mDataContent = dataContent; + + long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0; + if (mIsCreate || mDataContentData1 != dataContentData1) { + mDiffDataValues.put(DataColumns.DATA1, dataContentData1); + } + mDataContentData1 = dataContentData1; + + String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : ""; + if (mIsCreate || !mDataContentData3.equals(dataContentData3)) { + mDiffDataValues.put(DataColumns.DATA3, dataContentData3); + } + mDataContentData3 = dataContentData3; + } + + public JSONObject getContent() throws JSONException { + if (mIsCreate) { + Log.e(TAG, "it seems that we haven't created this in database yet"); + return null; + } + JSONObject js = new JSONObject(); + js.put(DataColumns.ID, mDataId); + js.put(DataColumns.MIME_TYPE, mDataMimeType); + js.put(DataColumns.CONTENT, mDataContent); + js.put(DataColumns.DATA1, mDataContentData1); + js.put(DataColumns.DATA3, mDataContentData3); + return js; + } + + public void commit(long noteId, boolean validateVersion, long version) { + + if (mIsCreate) { + if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) { + mDiffDataValues.remove(DataColumns.ID); + } + + mDiffDataValues.put(DataColumns.NOTE_ID, noteId); + Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues); + try { + mDataId = Long.valueOf(uri.getPathSegments().get(1)); + } catch (NumberFormatException e) { +>>>>>>> liuyitao-branch Log.e(TAG, "Get note id error :" + e.toString()); throw new ActionFailureException("create note failed"); } @@ -223,6 +345,7 @@ public class SqlData { if (mDiffDataValues.size() > 0) { int result = 0; if (!validateVersion) { +<<<<<<< HEAD // 如果不需要验证版本，则直接通过mDataId更新mDiffDataValues到数据库中 result = mContentResolver.update(ContentUris.withAppendedId( Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null); @@ -230,18 +353,29 @@ public class SqlData { // 如果需要验证版本，则通过noteId和version进行更新 result = mContentResolver.update(ContentUris.withAppendedId( Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, +======= + result = mContentResolver.update(ContentUris.withAppendedId( + Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null); + } else { + result = mContentResolver.update(ContentUris.withAppendedId( + Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, +>>>>>>> liuyitao-branch " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE + " WHERE " + NoteColumns.VERSION + "=?)", new String[] { String.valueOf(noteId), String.valueOf(version) }); } if (result == 0) { +<<<<<<< HEAD // 如果没有更新任何数据，则输出警告日志 +======= +>>>>>>> liuyitao-branch Log.w(TAG, "there is no update. maybe user updates note when syncing"); } } } +<<<<<<< HEAD // 清空差异数据 mDiffDataValues.clear(); // 将新建标记设为false @@ -255,4 +389,13 @@ public class SqlData { return mDataId; } +======= + mDiffDataValues.clear(); + mIsCreate = false; + } + + public long getId() { + return mDataId; + } +>>>>>>> liuyitao-branch } diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java index 5edea99..127b78a 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java @@ -43,6 +43,7 @@ public class SqlNote { private static final int INVALID_ID = -99999; +<<<<<<< HEAD // 定义查询笔记的投影，包含需要查询的列 public static final String[] PROJECTION_NOTE = new String[] { NoteColumns.ID, // 笔记ID @@ -148,11 +149,140 @@ public class SqlNote { Cursor c = null;// 初始化游标对象 try { // 通过 ID 查询笔记数据 +======= + public static final String[] PROJECTION_NOTE = new String[] { + NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID, + NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE, + NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE, + NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID, + NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID, + NoteColumns.VERSION + }; + + public static final int ID_COLUMN = 0; + + public static final int ALERTED_DATE_COLUMN = 1; + + public static final int BG_COLOR_ID_COLUMN = 2; + + public static final int CREATED_DATE_COLUMN = 3; + + public static final int HAS_ATTACHMENT_COLUMN = 4; + + public static final int MODIFIED_DATE_COLUMN = 5; + + public static final int NOTES_COUNT_COLUMN = 6; + + public static final int PARENT_ID_COLUMN = 7; + + public static final int SNIPPET_COLUMN = 8; + + public static final int TYPE_COLUMN = 9; + + public static final int WIDGET_ID_COLUMN = 10; + + public static final int WIDGET_TYPE_COLUMN = 11; + + public static final int SYNC_ID_COLUMN = 12; + + public static final int LOCAL_MODIFIED_COLUMN = 13; + + public static final int ORIGIN_PARENT_ID_COLUMN = 14; + + public static final int GTASK_ID_COLUMN = 15; + + public static final int VERSION_COLUMN = 16; + + private Context mContext; + + private ContentResolver mContentResolver; + + private boolean mIsCreate; + + private long mId; + + private long mAlertDate; + + private int mBgColorId; + + private long mCreatedDate; + + private int mHasAttachment; + + private long mModifiedDate; + + private long mParentId; + + private String mSnippet; + + private int mType; + + private int mWidgetId; + + private int mWidgetType; + + private long mOriginParent; + + private long mVersion; + + private ContentValues mDiffNoteValues; + + private ArrayList