Signed-off-by: lilium-saber <WR364999428@hotmail.com>
DUANYIQUN_BRANCH
lilium-saber 2 years ago
parent 57dbac7bbf
commit 730599d461

@ -17,6 +17,7 @@
package net.micode.notes.data; package net.micode.notes.data;
import android.net.Uri; import android.net.Uri;
public class Notes { // 定义类,为模块的其他类提供变量定义 public class Notes { // 定义类,为模块的其他类提供变量定义
public static final String AUTHORITY = "micode_notes"; // 设置AUTHORITY public static final String AUTHORITY = "micode_notes"; // 设置AUTHORITY
public static final String TAG = "Notes"; // 设置TAG public static final String TAG = "Notes"; // 设置TAG
@ -64,105 +65,138 @@ public class Notes {
public interface NoteColumns { // 定义便签变量接口 public interface NoteColumns { // 定义便签变量接口
/** /**
* The unique ID for a row * The unique ID for a row
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String ID = "_id"; public static final String ID = "_id";
/** /**
* The parent's id for note or folder * The parent's id for note or folder
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String PARENT_ID = "parent_id"; // 父文件夹的id public static final String PARENT_ID = "parent_id"; // 父文件夹的id
/** /**
* Created data for note or folder * Created data for note or folder
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String CREATED_DATE = "created_date"; // 表示文件夹或便签创建日期 public static final String CREATED_DATE = "created_date"; // 表示文件夹或便签创建日期
/** /**
* Latest modified date * Latest modified date
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String MODIFIED_DATE = "modified_date"; // 便签的最新的修改日期 public static final String MODIFIED_DATE = "modified_date"; // 便签的最新的修改日期
/** /**
* Alert date * Alert date
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String ALERTED_DATE = "alert_date"; // 提醒日期 public static final String ALERTED_DATE = "alert_date"; // 提醒日期
/** /**
* Folder's name or text content of note * Folder's name or text content of note
* <P> Type: TEXT </P> * <P>
* Type: TEXT
* </P>
*/ */
public static final String SNIPPET = "snippet"; // 文件夹名称或便签内容 public static final String SNIPPET = "snippet"; // 文件夹名称或便签内容
/** /**
* Note's widget id * Note's widget id
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String WIDGET_ID = "widget_id"; // 便签的widget的id public static final String WIDGET_ID = "widget_id"; // 便签的widget的id
/** /**
* Note's widget type * Note's widget type
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String WIDGET_TYPE = "widget_type"; // 便签widget的类型 public static final String WIDGET_TYPE = "widget_type"; // 便签widget的类型
/** /**
* Note's background color's id * Note's background color's id
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String BG_COLOR_ID = "bg_color_id"; // 背景颜色代号 public static final String BG_COLOR_ID = "bg_color_id"; // 背景颜色代号
/** /**
* For text note, it doesn't has attachment, for multi-media * For text note, it doesn't has attachment, for multi-media
* note, it has at least one attachment * note, it has at least one attachment
* <P> Type: INTEGER </P> * <P>
* Type: INTEGER
* </P>
*/ */
public static final String HAS_ATTACHMENT = "has_attachment"; public static final String HAS_ATTACHMENT = "has_attachment";
/** /**
* Folder's count of notes * Folder's count of notes
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String NOTES_COUNT = "notes_count"; // 文件夹内的便签数 public static final String NOTES_COUNT = "notes_count"; // 文件夹内的便签数
/** /**
* The file type: folder or note * The file type: folder or note
* <P> Type: INTEGER </P> * <P>
* Type: INTEGER
* </P>
*/ */
public static final String TYPE = "type"; // 文件类型,是文件夹或便签 public static final String TYPE = "type"; // 文件类型,是文件夹或便签
/** /**
* The last sync id * The last sync id
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String SYNC_ID = "sync_id"; // 最后一次同步id public static final String SYNC_ID = "sync_id"; // 最后一次同步id
/** /**
* Sign to indicate local modified or not * Sign to indicate local modified or not
* <P> Type: INTEGER </P> * <P>
* Type: INTEGER
* </P>
*/ */
public static final String LOCAL_MODIFIED = "local_modified"; // 本地修改名称标识 public static final String LOCAL_MODIFIED = "local_modified"; // 本地修改名称标识
/** /**
* Original parent id before moving into temporary folder * Original parent id before moving into temporary folder
* <P> Type : INTEGER </P> * <P>
* Type : INTEGER
* </P>
*/ */
public static final String ORIGIN_PARENT_ID = "origin_parent_id"; // 移动文件时文件的前父类文件夹 public static final String ORIGIN_PARENT_ID = "origin_parent_id"; // 移动文件时文件的前父类文件夹
/** /**
* The gtask id * The gtask id
* <P> Type : TEXT </P> * <P>
* Type : TEXT
* </P>
*/ */
public static final String GTASK_ID = "gtask_id"; public static final String GTASK_ID = "gtask_id";
/** /**
* The version code * The version code
* <P> Type : INTEGER (long) </P> * <P>
* Type : INTEGER (long)
* </P>
*/ */
public static final String VERSION = "version"; // 版本名称 public static final String VERSION = "version"; // 版本名称
} }
@ -170,73 +204,94 @@ public class Notes {
public interface DataColumns { // 定义数据变量接口 public interface DataColumns { // 定义数据变量接口
/** /**
* The unique ID for a row * The unique ID for a row
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String ID = "_id"; public static final String ID = "_id";
/** /**
* The MIME type of the item represented by this row. * The MIME type of the item represented by this row.
* <P> Type: Text </P> * <P>
* Type: Text
* </P>
*/ */
public static final String MIME_TYPE = "mime_type"; public static final String MIME_TYPE = "mime_type";
/** /**
* The reference id to note that this data belongs to * The reference id to note that this data belongs to
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String NOTE_ID = "note_id"; // 便签名称 public static final String NOTE_ID = "note_id"; // 便签名称
/** /**
* Created data for note or folder * Created data for note or folder
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String CREATED_DATE = "created_date"; // 创建文件夹或者便签的名称 public static final String CREATED_DATE = "created_date"; // 创建文件夹或者便签的名称
/** /**
* Latest modified date * Latest modified date
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String MODIFIED_DATE = "modified_date"; // 最后修改日期 public static final String MODIFIED_DATE = "modified_date"; // 最后修改日期
/** /**
* Data's content * Data's content
* <P> Type: TEXT </P> * <P>
* Type: TEXT
* </P>
*/ */
public static final String CONTENT = "content"; // 便签内容数据 public static final String CONTENT = "content"; // 便签内容数据
/** /**
* Generic data column, the meaning is {@link #MIMETYPE} specific, used for * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
* integer data type * integer data type
* <P> Type: INTEGER </P> * <P>
* Type: INTEGER
* </P>
*/ */
public static final String DATA1 = "data1"; // 不同类型的通用数据列,用于可能的存储与查找 public static final String DATA1 = "data1"; // 不同类型的通用数据列,用于可能的存储与查找
/** /**
* Generic data column, the meaning is {@link #MIMETYPE} specific, used for * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
* integer data type * integer data type
* <P> Type: INTEGER </P> * <P>
* Type: INTEGER
* </P>
*/ */
public static final String DATA2 = "data2"; public static final String DATA2 = "data2";
/** /**
* Generic data column, the meaning is {@link #MIMETYPE} specific, used for * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
* TEXT data type * TEXT data type
* <P> Type: TEXT </P> * <P>
* Type: TEXT
* </P>
*/ */
public static final String DATA3 = "data3"; public static final String DATA3 = "data3";
/** /**
* Generic data column, the meaning is {@link #MIMETYPE} specific, used for * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
* TEXT data type * TEXT data type
* <P> Type: TEXT </P> * <P>
* Type: TEXT
* </P>
*/ */
public static final String DATA4 = "data4"; public static final String DATA4 = "data4";
/** /**
* Generic data column, the meaning is {@link #MIMETYPE} specific, used for * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
* TEXT data type * TEXT data type
* <P> Type: TEXT </P> * <P>
* Type: TEXT
* </P>
*/ */
public static final String DATA5 = "data5"; public static final String DATA5 = "data5";
} }
@ -244,7 +299,10 @@ public class Notes {
public static final class TextNote implements DataColumns { public static final class TextNote implements DataColumns {
/** /**
* Mode to indicate the text in check list mode or not * Mode to indicate the text in check list mode or not
* <P> Type: Integer 1:check list mode 0: normal mode </P> //1为列表检查模式0为普通模式 * <P>
* Type: Integer 1:check list mode 0: normal mode
* </P>
* //1为列表检查模式0为普通模式
*/ */
public static final String MODE = DATA1; // 模式 public static final String MODE = DATA1; // 模式
@ -260,13 +318,17 @@ public class Notes {
public static final class CallNote implements DataColumns { public static final class CallNote implements DataColumns {
/** /**
* Call date for this record * Call date for this record
* <P> Type: INTEGER (long) </P> * <P>
* Type: INTEGER (long)
* </P>
*/ */
public static final String CALL_DATE = DATA1; // 呼叫数据 public static final String CALL_DATE = DATA1; // 呼叫数据
/** /**
* Phone number for this record * Phone number for this record
* <P> Type: TEXT </P> * <P>
* Type: TEXT
* </P>
*/ */
public static final String PHONE_NUMBER = DATA3; // 呼叫号码 public static final String PHONE_NUMBER = DATA3; // 呼叫号码
@ -276,4 +338,5 @@ public class Notes {
public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");// 访问电话记录uri public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");// 访问电话记录uri
} }
} }

@ -78,15 +78,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
")"; ")";
private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = "CREATE INDEX IF NOT EXISTS note_id_index ON " +
"CREATE INDEX IF NOT EXISTS note_id_index ON " +
TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; // 创建查询操作表索引,用于查找 TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; // 创建查询操作表索引,用于查找
/** /**
* Increase folder's note count when move note to the folder * Increase folder's note count when move note to the folder
*/ */
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER increase_folder_count_on_update "
"CREATE TRIGGER increase_folder_count_on_update "+ +
" AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
" BEGIN " + " BEGIN " +
" UPDATE " + TABLE.NOTE + " UPDATE " + TABLE.NOTE +
@ -97,8 +96,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/** /**
* Decrease folder's note count when move note from folder * Decrease folder's note count when move note from folder
*/ */
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_update "
"CREATE TRIGGER decrease_folder_count_on_update " + +
" AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE +
" BEGIN " + " BEGIN " +
" UPDATE " + TABLE.NOTE + " UPDATE " + TABLE.NOTE +
@ -110,8 +109,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/** /**
* Increase folder's note count when insert new note to the folder * Increase folder's note count when insert new note to the folder
*/ */
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = "CREATE TRIGGER increase_folder_count_on_insert "
"CREATE TRIGGER increase_folder_count_on_insert " + +
" AFTER INSERT ON " + TABLE.NOTE + " AFTER INSERT ON " + TABLE.NOTE +
" BEGIN " + " BEGIN " +
" UPDATE " + TABLE.NOTE + " UPDATE " + TABLE.NOTE +
@ -122,8 +121,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/** /**
* Decrease folder's note count when delete note from the folder * Decrease folder's note count when delete note from the folder
*/ */
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = "CREATE TRIGGER decrease_folder_count_on_delete "
"CREATE TRIGGER decrease_folder_count_on_delete " + +
" AFTER DELETE ON " + TABLE.NOTE + " AFTER DELETE ON " + TABLE.NOTE +
" BEGIN " + " BEGIN " +
" UPDATE " + TABLE.NOTE + " UPDATE " + TABLE.NOTE +
@ -135,8 +134,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/** /**
* Update note's content when insert data with type {@link DataConstants#NOTE} * Update note's content when insert data with type {@link DataConstants#NOTE}
*/ */
private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = "CREATE TRIGGER update_note_content_on_insert "
"CREATE TRIGGER update_note_content_on_insert " + +
" AFTER INSERT ON " + TABLE.DATA + " AFTER INSERT ON " + TABLE.DATA +
" WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
" BEGIN" + " BEGIN" +
@ -146,10 +145,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" END"; // 更新便签数据时更改table表内容 " END"; // 更新便签数据时更改table表内容
/** /**
* Update note's content when data with {@link DataConstants#NOTE} type has changed * Update note's content when data with {@link DataConstants#NOTE} type has
* changed
*/ */
private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = "CREATE TRIGGER update_note_content_on_update "
"CREATE TRIGGER update_note_content_on_update " + +
" AFTER UPDATE ON " + TABLE.DATA + " AFTER UPDATE ON " + TABLE.DATA +
" WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
" BEGIN" + " BEGIN" +
@ -159,10 +159,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" END"; // 改变便签数据时更改table表内容 " END"; // 改变便签数据时更改table表内容
/** /**
* Update note's content when data with {@link DataConstants#NOTE} type has deleted * Update note's content when data with {@link DataConstants#NOTE} type has
* deleted
*/ */
private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = "CREATE TRIGGER update_note_content_on_delete "
"CREATE TRIGGER update_note_content_on_delete " + +
" AFTER delete ON " + TABLE.DATA + " AFTER delete ON " + TABLE.DATA +
" WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" +
" BEGIN" + " BEGIN" +
@ -174,8 +175,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/** /**
* Delete datas belong to note which has been deleted * Delete datas belong to note which has been deleted
*/ */
private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = "CREATE TRIGGER delete_data_on_delete " +
"CREATE TRIGGER delete_data_on_delete " +
" AFTER DELETE ON " + TABLE.NOTE + " AFTER DELETE ON " + TABLE.NOTE +
" BEGIN" + " BEGIN" +
" DELETE FROM " + TABLE.DATA + " DELETE FROM " + TABLE.DATA +
@ -185,8 +185,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/** /**
* Delete notes belong to folder which has been deleted * Delete notes belong to folder which has been deleted
*/ */
private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = "CREATE TRIGGER folder_delete_notes_on_delete "
"CREATE TRIGGER folder_delete_notes_on_delete " + +
" AFTER DELETE ON " + TABLE.NOTE + " AFTER DELETE ON " + TABLE.NOTE +
" BEGIN" + " BEGIN" +
" DELETE FROM " + TABLE.NOTE + " DELETE FROM " + TABLE.NOTE +
@ -196,8 +196,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/** /**
* Move notes belong to folder which has been moved to trash folder * Move notes belong to folder which has been moved to trash folder
*/ */
private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = "CREATE TRIGGER folder_move_notes_on_trash " +
"CREATE TRIGGER folder_move_notes_on_trash " +
" AFTER UPDATE ON " + TABLE.NOTE + " AFTER UPDATE ON " + TABLE.NOTE +
" WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER +
" BEGIN" + " BEGIN" +

@ -16,7 +16,6 @@
package net.micode.notes.data; package net.micode.notes.data;
import android.app.SearchManager; import android.app.SearchManager;
import android.content.ContentProvider; import android.content.ContentProvider;
import android.content.ContentUris; import android.content.ContentUris;
@ -34,7 +33,6 @@ import net.micode.notes.data.Notes.DataColumns;
import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.data.NotesDatabaseHelper.TABLE; import net.micode.notes.data.NotesDatabaseHelper.TABLE;
public class NotesProvider extends ContentProvider { public class NotesProvider extends ContentProvider {
private static final UriMatcher mMatcher; // UriMatcher类用于分辨数据表 private static final UriMatcher mMatcher; // UriMatcher类用于分辨数据表
@ -62,7 +60,8 @@ public class NotesProvider extends ContentProvider {
} // 将不同的uri与数值相匹配 } // 将不同的uri与数值相匹配
/** /**
* x'0A' represents the '\n' character in sqlite. For title and content in the search result, * 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. * we will trim '\n' and white space in order to show more information.
*/ // 用0A代表\n为搜索结果换行 */ // 用0A代表\n为搜索结果换行
private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","

@ -15,6 +15,7 @@
*/ */
package net.micode.notes.model; package net.micode.notes.model;
import android.content.ContentProviderOperation; import android.content.ContentProviderOperation;
import android.content.ContentProviderResult; import android.content.ContentProviderResult;
import android.content.ContentUris; import android.content.ContentUris;
@ -33,11 +34,11 @@ import net.micode.notes.data.Notes.TextNote;
import java.util.ArrayList; import java.util.ArrayList;
public class Note { public class Note {
private ContentValues mNoteDiffValues; // 用于保存便签修改值 private ContentValues mNoteDiffValues; // 用于保存便签修改值
private NoteData mNoteData; // 保存便签的数据 private NoteData mNoteData; // 保存便签的数据
private static final String TAG = "Note"; // 设置TAG为Note private static final String TAG = "Note"; // 设置TAG为Note
/** /**
* Create a new note id for adding a new note to databases * Create a new note id for adding a new note to databases
*/ */
@ -110,8 +111,10 @@ public class Note {
} }
/** /**
* In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and * In theory, once data changed, the note should be updated on
* {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the * {@link NoteColumns#LOCAL_MODIFIED} and
* {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails,
* we also update the
* note data info * note data info
*/ */
if (context.getContentResolver().update( // 打包并同步 if (context.getContentResolver().update( // 打包并同步

@ -31,7 +31,6 @@ import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.data.Notes.TextNote; import net.micode.notes.data.Notes.TextNote;
import net.micode.notes.tool.ResourceParser.NoteBgResources; import net.micode.notes.tool.ResourceParser.NoteBgResources;
public class WorkingNote { public class WorkingNote {
// Note for the working note // Note for the working note
private Note mNote; // 表示工作便签 private Note mNote; // 表示工作便签
@ -360,6 +359,7 @@ public class WorkingNote {
/** /**
* Call when switch between check list mode and normal mode * Call when switch between check list mode and normal mode
*
* @param oldMode is previous mode before change * @param oldMode is previous mode before change
* @param newMode is new mode * @param newMode is new mode
*/ */

Loading…
Cancel
Save