diff --git a/doc/开源代码质量分析报告模板.docx b/doc/开源代码质量分析报告模板.docx deleted file mode 100644 index 994df4d..0000000 Binary files a/doc/开源代码质量分析报告模板.docx and /dev/null differ diff --git a/doc/开源软件维护方案及成果模板.docx b/doc/开源软件维护方案及成果模板.docx deleted file mode 100644 index d9db027..0000000 Binary files a/doc/开源软件维护方案及成果模板.docx and /dev/null differ diff --git a/doc/软件设计规格说明书模板.doc b/doc/软件设计规格说明书模板.doc deleted file mode 100644 index 1b04b11..0000000 Binary files a/doc/软件设计规格说明书模板.doc and /dev/null differ diff --git a/doc/软件需求构思及描述模板.docx b/doc/软件需求构思及描述模板.docx deleted file mode 100644 index 3749e5a..0000000 Binary files a/doc/软件需求构思及描述模板.docx and /dev/null differ diff --git a/doc/软件需求规格说明书模板.docx b/doc/软件需求规格说明书模板.docx deleted file mode 100644 index 0e50506..0000000 Binary files a/doc/软件需求规格说明书模板.docx and /dev/null differ diff --git a/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java index 70b6bb4..ffe5d57 100644 --- a/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/Notes-master/src/net/micode/notes/data/NotesDatabaseHelper.java @@ -14,230 +14,210 @@ * limitations under the License. */ -// 数据库帮助类，负责创建和维护便签应用的数据库 package net.micode.notes.data; -// 导入所需的Android类 import android.content.ContentValues; import android.content.Context; import android.database.sqlite.SQLiteDatabase; 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; -// 数据库帮助类，继承自SQLiteOpenHelper + public class NotesDatabaseHelper extends SQLiteOpenHelper { - // 数据库名称常量 private static final String DB_NAME = "note.db"; - // 当前数据库版本号 private static final int DB_VERSION = 4; - // 数据库表名定义接口 public interface TABLE { - public static final String NOTE = "note"; // 便签表名 - public static final String DATA = "data"; // 数据表名 + public static final String NOTE = "note"; + + public static final String DATA = "data"; } - // 日志标签 private static final String TAG = "NotesDatabaseHelper"; - // 单例实例 private static NotesDatabaseHelper mInstance; - // 创建便签表的SQL语句 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，默认为0 - 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," + // 小部件ID - NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + // 小部件类型 - 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" + // 版本号 - ")"; - - // 创建数据表的SQL语句 + "CREATE TABLE " + TABLE.NOTE + "(" + + NoteColumns.ID + " INTEGER PRIMARY KEY," + + NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + + 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," + + NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + + NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + + ")"; + private static final String CREATE_DATA_TABLE_SQL = - "CREATE TABLE " + TABLE.DATA + "(" + - DataColumns.ID + " INTEGER PRIMARY KEY," + // 主键ID - DataColumns.MIME_TYPE + " TEXT NOT NULL," + // 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索引的SQL语句 + "CREATE TABLE " + TABLE.DATA + "(" + + DataColumns.ID + " INTEGER PRIMARY KEY," + + DataColumns.MIME_TYPE + " TEXT NOT NULL," + + DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + + 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," + + DataColumns.DATA2 + " INTEGER," + + DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + + ")"; + private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = - "CREATE INDEX IF NOT EXISTS note_id_index ON " + - TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; + "CREATE INDEX IF NOT EXISTS note_id_index ON " + + TABLE.DATA + "(" + DataColumns.NOTE_ID + ");"; /** - * 触发器：当更新便签的父ID时，增加目标文件夹的便签计数 + * Increase folder's note count when move note to the folder */ 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 + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; + "CREATE TRIGGER increase_folder_count_on_update "+ + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END"; /** - * 触发器：当更新便签的父ID时，减少原文件夹的便签计数 + * Decrease folder's note count when move note from folder */ 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 + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + - " END"; + "CREATE TRIGGER decrease_folder_count_on_update " + + " AFTER UPDATE OF " + NoteColumns.PARENT_ID + " ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + + " END"; /** - * 触发器：当插入新便签时，增加父文件夹的便签计数 + * Increase folder's note count when insert new note to the folder */ private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = - "CREATE TRIGGER increase_folder_count_on_insert " + - " AFTER INSERT ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + - " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; + "CREATE TRIGGER increase_folder_count_on_insert " + + " AFTER INSERT ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + + " END"; /** - * 触发器：当删除便签时，减少父文件夹的便签计数 + * Decrease folder's note count when delete note from the folder */ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = - "CREATE TRIGGER decrease_folder_count_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN " + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + - " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + - " AND " + NoteColumns.NOTES_COUNT + ">0;" + - " END"; + "CREATE TRIGGER decrease_folder_count_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN " + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + + " AND " + NoteColumns.NOTES_COUNT + ">0;" + + " END"; /** - * 触发器：当插入类型为NOTE的数据时，更新便签的内容摘要 + * Update note's content when insert data with type {@link DataConstants#NOTE} */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = - "CREATE TRIGGER update_note_content_on_insert " + - " AFTER INSERT ON " + TABLE.DATA + - " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; + "CREATE TRIGGER update_note_content_on_insert " + + " AFTER INSERT ON " + TABLE.DATA + + " WHEN new." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END"; /** - * 触发器：当更新类型为NOTE的数据时，更新便签的内容摘要 + * Update note's content when data with {@link DataConstants#NOTE} type has changed */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = - "CREATE TRIGGER update_note_content_on_update " + - " AFTER UPDATE ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + - " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; + "CREATE TRIGGER update_note_content_on_update " + + " AFTER UPDATE ON " + TABLE.DATA + + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + + " END"; /** - * 触发器：当删除类型为NOTE的数据时，清空便签的内容摘要 + * Update note's content when data with {@link DataConstants#NOTE} type has deleted */ private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = - "CREATE TRIGGER update_note_content_on_delete " + - " AFTER delete ON " + TABLE.DATA + - " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.SNIPPET + "=''" + - " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + - " END"; + "CREATE TRIGGER update_note_content_on_delete " + + " AFTER delete ON " + TABLE.DATA + + " WHEN old." + DataColumns.MIME_TYPE + "='" + DataConstants.NOTE + "'" + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.SNIPPET + "=''" + + " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + + " END"; /** - * 触发器：当删除便签时，自动删除关联的数据 + * Delete datas belong to note which has been deleted */ private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = - "CREATE TRIGGER delete_data_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.DATA + - " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + - " END"; + "CREATE TRIGGER delete_data_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN" + + " DELETE FROM " + TABLE.DATA + + " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + + " END"; /** - * 触发器：当删除文件夹时，自动删除该文件夹下的所有便签 + * Delete notes belong to folder which has been deleted */ private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = - "CREATE TRIGGER folder_delete_notes_on_delete " + - " AFTER DELETE ON " + TABLE.NOTE + - " BEGIN" + - " DELETE FROM " + TABLE.NOTE + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; + "CREATE TRIGGER folder_delete_notes_on_delete " + + " AFTER DELETE ON " + TABLE.NOTE + + " BEGIN" + + " DELETE FROM " + TABLE.NOTE + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END"; /** - * 触发器：当文件夹被移动到回收站时，将其下的便签也移动到回收站 + * Move notes belong to folder which has been moved to trash folder */ private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = - "CREATE TRIGGER folder_move_notes_on_trash " + - " AFTER UPDATE ON " + TABLE.NOTE + - " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " BEGIN" + - " UPDATE " + TABLE.NOTE + - " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + - " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; - - // 构造函数 + "CREATE TRIGGER folder_move_notes_on_trash " + + " AFTER UPDATE ON " + TABLE.NOTE + + " WHEN new." + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + + " BEGIN" + + " UPDATE " + TABLE.NOTE + + " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + + " END"; + public NotesDatabaseHelper(Context context) { super(context, DB_NAME, null, DB_VERSION); } - /** - * 创建便签表 - * @param db SQLiteDatabase对象 - */ public void createNoteTable(SQLiteDatabase db) { - db.execSQL(CREATE_NOTE_TABLE_SQL); // 执行创建表SQL - reCreateNoteTableTriggers(db); // 重建触发器 - createSystemFolder(db); // 创建系统文件夹 + db.execSQL(CREATE_NOTE_TABLE_SQL); + reCreateNoteTableTriggers(db); + createSystemFolder(db); Log.d(TAG, "note table has been created"); } - /** - * 重建便签表相关的触发器 - * @param db SQLiteDatabase对象 - */ private void reCreateNoteTableTriggers(SQLiteDatabase db) { - // 删除所有现有的触发器 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"); @@ -246,7 +226,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete"); db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash"); - // 重新创建所有触发器 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); @@ -256,22 +235,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER); } - /** - * 创建系统文件夹 - * @param db SQLiteDatabase对象 - */ private void createSystemFolder(SQLiteDatabase db) { ContentValues values = new ContentValues(); /** - * 创建通话记录文件夹 + * call record foler for call notes */ values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); /** - * 创建根文件夹 + * root folder which is default folder */ values.clear(); values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER); @@ -279,7 +254,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.insert(TABLE.NOTE, null, values); /** - * 创建临时文件夹（用于移动便签时临时存放） + * temporary folder which is used for moving note */ values.clear(); values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER); @@ -287,7 +262,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.insert(TABLE.NOTE, null, values); /** - * 创建回收站文件夹 + * create trash folder */ values.clear(); values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); @@ -295,38 +270,23 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { db.insert(TABLE.NOTE, null, values); } - /** - * 创建数据表 - * @param db SQLiteDatabase对象 - */ public void createDataTable(SQLiteDatabase db) { - db.execSQL(CREATE_DATA_TABLE_SQL); // 执行创建表SQL - reCreateDataTableTriggers(db); // 重建触发器 - db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL); // 创建索引 + db.execSQL(CREATE_DATA_TABLE_SQL); + reCreateDataTableTriggers(db); + db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL); Log.d(TAG, "data table has been created"); } - /** - * 重建数据表相关的触发器 - * @param db SQLiteDatabase对象 - */ 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"); db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete"); - // 重新创建所有触发器 db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER); db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER); db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER); } - /** - * 获取单例实例 - * @param context 上下文对象 - * @return NotesDatabaseHelper实例 - */ static synchronized NotesDatabaseHelper getInstance(Context context) { if (mInstance == null) { mInstance = new NotesDatabaseHelper(context); @@ -334,98 +294,69 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { return mInstance; } - /** - * 创建数据库时调用 - * @param db SQLiteDatabase对象 - */ @Override public void onCreate(SQLiteDatabase db) { - createNoteTable(db); // 创建便签表 - createDataTable(db); // 创建数据表 + createNoteTable(db); + createDataTable(db); } - /** - * 升级数据库时调用 - * @param db SQLiteDatabase对象 - * @param oldVersion 旧版本号 - * @param newVersion 新版本号 - */ @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - boolean reCreateTriggers = false; // 是否需要重建触发器 - boolean skipV2 = false; // 是否跳过V2升级 + boolean reCreateTriggers = false; + boolean skipV2 = false; - // 从V1升级到V2 if (oldVersion == 1) { upgradeToV2(db); - skipV2 = true; // 这个升级包含从V2到V3的升级 + skipV2 = true; // this upgrade including the upgrade from v2 to v3 oldVersion++; } - // 从V2升级到V3 if (oldVersion == 2 && !skipV2) { upgradeToV3(db); reCreateTriggers = true; oldVersion++; } - // 从V3升级到V4 if (oldVersion == 3) { upgradeToV4(db); oldVersion++; } - // 如果需要，重建触发器 if (reCreateTriggers) { reCreateNoteTableTriggers(db); reCreateDataTableTriggers(db); } - // 检查版本号是否匹配 if (oldVersion != newVersion) { throw new IllegalStateException("Upgrade notes database to version " + newVersion + "fails"); } } - /** - * 升级到V2版本：重建所有表 - * @param db SQLiteDatabase对象 - */ private void upgradeToV2(SQLiteDatabase db) { - db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); // 删除便签表 - db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); // 删除数据表 - createNoteTable(db); // 重新创建便签表 - createDataTable(db); // 重新创建数据表 + db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); + db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); + createNoteTable(db); + createDataTable(db); } - /** - * 升级到V3版本：添加GTASK_ID列和回收站文件夹 - * @param db SQLiteDatabase对象 - */ private void upgradeToV3(SQLiteDatabase db) { - // 删除不再使用的触发器 + // 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"); - - // 添加GTASK_ID列 + // add a column for gtask id db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''"); - - // 添加回收站系统文件夹 + // add a trash system folder ContentValues values = new ContentValues(); values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); } - /** - * 升级到V4版本：添加VERSION列 - * @param db SQLiteDatabase对象 - */ private void upgradeToV4(SQLiteDatabase db) { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0"); } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/data/NotesProvider.java b/src/Notes-master/src/net/micode/notes/data/NotesProvider.java index f68161d..edb0a60 100644 --- a/src/Notes-master/src/net/micode/notes/data/NotesProvider.java +++ b/src/Notes-master/src/net/micode/notes/data/NotesProvider.java @@ -14,10 +14,9 @@ * limitations under the License. */ -// 便签内容提供者，负责处理便签数据的CRUD操作 package net.micode.notes.data; -// 导入所需的Android类 + import android.app.SearchManager; import android.content.ContentProvider; import android.content.ContentUris; @@ -30,206 +29,174 @@ import android.net.Uri; import android.text.TextUtils; import android.util.Log; -// 导入应用资源和数据定义 import net.micode.notes.R; import net.micode.notes.data.Notes.DataColumns; import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; -// 便签内容提供者类，继承自ContentProvider + public class NotesProvider extends ContentProvider { - // URI匹配器，用于匹配不同的URI请求 private static final UriMatcher mMatcher; - // 数据库帮助类实例 private NotesDatabaseHelper mHelper; - // 日志标签 private static final String TAG = "NotesProvider"; - // URI匹配常量定义 - private static final int URI_NOTE = 1; // 便签表URI - private static final int URI_NOTE_ITEM = 2; // 单个便签URI - private static final int URI_DATA = 3; // 数据表URI - private static final int URI_DATA_ITEM = 4; // 单个数据项URI - private static final int URI_SEARCH = 5; // 搜索URI - private static final int URI_SEARCH_SUGGEST = 6; // 搜索建议URI + private static final int URI_NOTE = 1; + private static final int URI_NOTE_ITEM = 2; + private static final int URI_DATA = 3; + private static final int URI_DATA_ITEM = 4; + + private static final int URI_SEARCH = 5; + private static final int URI_SEARCH_SUGGEST = 6; - // 静态初始化块，配置URI匹配器 static { mMatcher = new UriMatcher(UriMatcher.NO_MATCH); - mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); // 匹配便签表 - mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM); // 匹配单个便签 - mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA); // 匹配数据表 - mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM); // 匹配单个数据项 - 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.addURI(Notes.AUTHORITY, "note", URI_NOTE); + mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM); + mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA); + mMatcher.addURI(Notes.AUTHORITY, "data/#", URI_DATA_ITEM); + 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); } /** - * 搜索投影字段定义： - * x'0A'在SQLite中代表换行符'\n'。对于搜索结果中的标题和内容， - * 我们将去除'\n'和空格以显示更多信息。 + * 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. */ - private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," // 便签ID - + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," // 建议项额外数据 - + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + "," // 建议文本1 - + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + "," // 建议文本2 - + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," // 建议图标 - + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," // 建议动作 - + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; // 建议数据 + 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 + "," + + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + "," + + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," + + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," + + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; - // 便签片段搜索查询SQL private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION - + " FROM " + TABLE.NOTE // 从便签表查询 - + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" // 按片段匹配 - + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER // 排除回收站中的便签 - + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; // 只查询普通便签类型 + + " FROM " + TABLE.NOTE + + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" + + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; - /** - * 创建内容提供者时调用 - * @return 是否成功创建 - */ @Override public boolean onCreate() { - mHelper = NotesDatabaseHelper.getInstance(getContext()); // 获取数据库帮助类实例 + mHelper = NotesDatabaseHelper.getInstance(getContext()); return true; } - /** - * 查询方法 - * @param uri 请求的URI - * @param projection 要返回的列 - * @param selection 选择条件 - * @param selectionArgs 选择参数 - * @param sortOrder 排序方式 - * @return 查询结果的Cursor - */ @Override public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, - String sortOrder) { + String sortOrder) { Cursor c = null; - SQLiteDatabase db = mHelper.getReadableDatabase(); // 获取可读数据库 + SQLiteDatabase db = mHelper.getReadableDatabase(); String id = null; - switch (mMatcher.match(uri)) { // 根据URI匹配不同操作 - case URI_NOTE: // 查询便签表 + switch (mMatcher.match(uri)) { + case URI_NOTE: c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, sortOrder); break; - case URI_NOTE_ITEM: // 查询单个便签 + case URI_NOTE_ITEM: id = uri.getPathSegments().get(1); c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs, null, null, sortOrder); break; - case URI_DATA: // 查询数据表 + case URI_DATA: c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null, sortOrder); break; - case URI_DATA_ITEM: // 查询单个数据项 + case URI_DATA_ITEM: id = uri.getPathSegments().get(1); c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs, null, null, sortOrder); break; - case URI_SEARCH: // 搜索请求 - case URI_SEARCH_SUGGEST: // 搜索建议请求 + case URI_SEARCH: + case URI_SEARCH_SUGGEST: if (sortOrder != null || projection != null) { throw new IllegalArgumentException( "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); } String searchString = null; - if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { // 处理搜索建议请求 + if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { if (uri.getPathSegments().size() > 1) { searchString = uri.getPathSegments().get(1); } - } else { // 处理普通搜索请求 + } else { searchString = uri.getQueryParameter("pattern"); } - if (TextUtils.isEmpty(searchString)) { // 搜索字符串为空则返回null + if (TextUtils.isEmpty(searchString)) { return null; } try { - searchString = String.format("%%%s%%", searchString); // 格式化搜索字符串 - c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY, // 执行原始查询 + 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()); // 记录异常 + Log.e(TAG, "got exception: " + ex.toString()); } break; default: - throw new IllegalArgumentException("Unknown URI " + uri); // 未知URI抛出异常 + throw new IllegalArgumentException("Unknown URI " + uri); } if (c != null) { - c.setNotificationUri(getContext().getContentResolver(), uri); // 设置通知URI + c.setNotificationUri(getContext().getContentResolver(), uri); } return c; } - /** - * 插入方法 - * @param uri 请求的URI - * @param values 要插入的值 - * @return 新插入项的URI - */ @Override public Uri insert(Uri uri, ContentValues values) { - SQLiteDatabase db = mHelper.getWritableDatabase(); // 获取可写数据库 + SQLiteDatabase db = mHelper.getWritableDatabase(); long dataId = 0, noteId = 0, insertedId = 0; - switch (mMatcher.match(uri)) { // 根据URI匹配不同操作 - case URI_NOTE: // 插入便签 + 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)) { // 检查是否包含便签ID + case URI_DATA: + if (values.containsKey(DataColumns.NOTE_ID)) { noteId = values.getAsLong(DataColumns.NOTE_ID); } else { - Log.d(TAG, "Wrong data format without note id:" + values.toString()); // 记录格式错误 + 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抛出异常 + 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); } - // 通知数据URI变化 + // Notify the data uri if (dataId > 0) { getContext().getContentResolver().notifyChange( ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null); } - return ContentUris.withAppendedId(uri, insertedId); // 返回新插入项的URI + return ContentUris.withAppendedId(uri, insertedId); } - /** - * 删除方法 - * @param uri 请求的URI - * @param selection 选择条件 - * @param selectionArgs 选择参数 - * @return 删除的行数 - */ @Override public int delete(Uri uri, String selection, String[] selectionArgs) { int count = 0; String id = null; - SQLiteDatabase db = mHelper.getWritableDatabase(); // 获取可写数据库 + SQLiteDatabase db = mHelper.getWritableDatabase(); boolean deleteData = false; - switch (mMatcher.match(uri)) { // 根据URI匹配不同操作 - case URI_NOTE: // 删除便签 - selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 "; // 只允许删除ID大于0的便签 + 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: // 删除单个便签 + case URI_NOTE_ITEM: id = uri.getPathSegments().get(1); /** - * ID小于0的是系统文件夹，不允许删除 + * ID that smaller than 0 is system folder which is not allowed to + * trash */ long noteId = Long.valueOf(id); if (noteId <= 0) { @@ -238,124 +205,101 @@ public class NotesProvider extends ContentProvider { count = db.delete(TABLE.NOTE, NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); break; - case URI_DATA: // 删除数据 + case URI_DATA: count = db.delete(TABLE.DATA, selection, selectionArgs); deleteData = true; break; - case URI_DATA_ITEM: // 删除单个数据项 + case URI_DATA_ITEM: id = uri.getPathSegments().get(1); count = db.delete(TABLE.DATA, DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs); deleteData = true; break; default: - throw new IllegalArgumentException("Unknown URI " + uri); // 未知URI抛出异常 + throw new IllegalArgumentException("Unknown URI " + uri); } - if (count > 0) { // 如果删除了数据 + if (count > 0) { if (deleteData) { - getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); // 通知便签URI变化 + getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); } - getContext().getContentResolver().notifyChange(uri, null); // 通知当前URI变化 + getContext().getContentResolver().notifyChange(uri, null); } return count; } - /** - * 更新方法 - * @param uri 请求的URI - * @param values 要更新的值 - * @param selection 选择条件 - * @param selectionArgs 选择参数 - * @return 更新的行数 - */ @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { int count = 0; String id = null; - SQLiteDatabase db = mHelper.getWritableDatabase(); // 获取可写数据库 + SQLiteDatabase db = mHelper.getWritableDatabase(); boolean updateData = false; - switch (mMatcher.match(uri)) { // 根据URI匹配不同操作 - case URI_NOTE: // 更新便签 - increaseNoteVersion(-1, selection, selectionArgs); // 增加便签版本 + switch (mMatcher.match(uri)) { + case URI_NOTE: + increaseNoteVersion(-1, selection, selectionArgs); count = db.update(TABLE.NOTE, values, selection, selectionArgs); break; - case URI_NOTE_ITEM: // 更新单个便签 + case URI_NOTE_ITEM: id = uri.getPathSegments().get(1); - increaseNoteVersion(Long.valueOf(id), selection, selectionArgs); // 增加便签版本 + increaseNoteVersion(Long.valueOf(id), selection, selectionArgs); count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs); break; - case URI_DATA: // 更新数据 + case URI_DATA: count = db.update(TABLE.DATA, values, selection, selectionArgs); updateData = true; break; - case URI_DATA_ITEM: // 更新单个数据项 + case URI_DATA_ITEM: id = uri.getPathSegments().get(1); count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs); updateData = true; break; default: - throw new IllegalArgumentException("Unknown URI " + uri); // 未知URI抛出异常 + throw new IllegalArgumentException("Unknown URI " + uri); } - if (count > 0) { // 如果更新了数据 + if (count > 0) { if (updateData) { - getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); // 通知便签URI变化 + getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null); } - getContext().getContentResolver().notifyChange(uri, null); // 通知当前URI变化 + getContext().getContentResolver().notifyChange(uri, null); } return count; } - /** - * 解析选择条件，添加AND连接符 - * @param selection 原始选择条件 - * @return 解析后的选择条件 - */ private String parseSelection(String selection) { return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); } - /** - * 增加便签版本号 - * @param id 便签ID，-1表示不指定 - * @param selection 选择条件 - * @param selectionArgs 选择参数 - */ private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { StringBuilder sql = new StringBuilder(120); sql.append("UPDATE "); sql.append(TABLE.NOTE); sql.append(" SET "); sql.append(NoteColumns.VERSION); - sql.append("=" + NoteColumns.VERSION + "+1 "); // 版本号加1 + sql.append("=" + NoteColumns.VERSION + "+1 "); - if (id > 0 || !TextUtils.isEmpty(selection)) { // 如果有ID或选择条件 + if (id > 0 || !TextUtils.isEmpty(selection)) { sql.append(" WHERE "); } - if (id > 0) { // 如果指定了ID + if (id > 0) { sql.append(NoteColumns.ID + "=" + String.valueOf(id)); } - if (!TextUtils.isEmpty(selection)) { // 如果有选择条件 + if (!TextUtils.isEmpty(selection)) { String selectString = id > 0 ? parseSelection(selection) : selection; - for (String args : selectionArgs) { // 替换参数 + for (String args : selectionArgs) { selectString = selectString.replaceFirst("\\?", args); } sql.append(selectString); } - mHelper.getWritableDatabase().execSQL(sql.toString()); // 执行SQL + mHelper.getWritableDatabase().execSQL(sql.toString()); } - /** - * 获取URI对应的MIME类型 - * @param uri 请求的URI - * @return MIME类型字符串 - */ @Override public String getType(Uri uri) { // TODO Auto-generated method stub return null; } -} \ No newline at end of file + +} diff --git a/src/Notes-master/src/net/micode/notes/model/Note.java b/src/Notes-master/src/net/micode/notes/model/Note.java index 3475930..6706cf6 100644 --- a/src/Notes-master/src/net/micode/notes/model/Note.java +++ b/src/Notes-master/src/net/micode/notes/model/Note.java @@ -15,7 +15,6 @@ */ package net.micode.notes.model; - import android.content.ContentProviderOperation; import android.content.ContentProviderResult; import android.content.ContentUris; @@ -34,23 +33,16 @@ import net.micode.notes.data.Notes.TextNote; import java.util.ArrayList; -/** - * 便签数据模型类，负责便签的创建、更新和管理 - * 封装了便签及其关联数据（文本内容、通话记录等）的操作逻辑 - */ + public class Note { - private ContentValues mNoteDiffValues; // 便签差异值，用于记录待更新的便签属性 - private NoteData mNoteData; // 便签关联数据（文本内容、通话记录等） + private ContentValues mNoteDiffValues; + private NoteData mNoteData; private static final String TAG = "Note"; - /** - * 创建一个新的便签ID并插入到数据库 - * @param context 上下文 - * @param folderId 父文件夹ID - * @return 返回新创建的便签ID + * Create a new note id for adding a new note to databases */ public static synchronized long getNewNoteId(Context context, long folderId) { - // 在数据库中创建新便签 + // Create a new note in the database ContentValues values = new ContentValues(); long createdTime = System.currentTimeMillis(); values.put(NoteColumns.CREATED_DATE, createdTime); @@ -73,81 +65,41 @@ public class Note { return noteId; } - /** - * 构造函数，初始化便签对象 - */ public Note() { mNoteDiffValues = new ContentValues(); mNoteData = new NoteData(); } - /** - * 设置便签属性值 - * @param key 属性名 - * @param value 属性值 - */ public void setNoteValue(String key, String value) { mNoteDiffValues.put(key, value); mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); } - /** - * 设置便签文本内容数据 - * @param key 文本数据键 - * @param value 文本数据值 - */ public void setTextData(String key, String value) { mNoteData.setTextData(key, value); } - /** - * 设置文本数据ID - * @param id 文本数据ID - */ public void setTextDataId(long id) { mNoteData.setTextDataId(id); } - /** - * 获取文本数据ID - * @return 文本数据ID - */ public long getTextDataId() { return mNoteData.mTextDataId; } - /** - * 设置通话记录数据ID - * @param id 通话记录数据ID - */ public void setCallDataId(long id) { mNoteData.setCallDataId(id); } - /** - * 设置通话记录数据 - * @param key 通话数据键 - * @param value 通话数据值 - */ public void setCallData(String key, String value) { mNoteData.setCallData(key, value); } - /** - * 判断便签是否有本地修改 - * @return 有修改返回true，否则返回false - */ public boolean isLocalModified() { return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified(); } - /** - * 将便签同步到数据库 - * @param context 上下文 - * @param noteId 便签ID - * @return 同步成功返回true，失败返回false - */ public boolean syncNote(Context context, long noteId) { if (noteId <= 0) { throw new IllegalArgumentException("Wrong note id:" + noteId); @@ -158,15 +110,15 @@ public class Note { } /** - * 理论上，一旦数据发生变化，便签应该在{@link NoteColumns#LOCAL_MODIFIED}和 - * {@link NoteColumns#MODIFIED_DATE}上更新。为了数据安全，即使便签更新失败，我们也会更新 - * 便签数据信息 + * In theory, once data changed, the note should be updated on {@link NoteColumns#LOCAL_MODIFIED} and + * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the + * note data info */ if (context.getContentResolver().update( ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null, null) == 0) { Log.e(TAG, "Update note error, should not happen"); - // 不返回，继续执行 + // Do not return, fall through } mNoteDiffValues.clear(); @@ -178,19 +130,17 @@ public class Note { return true; } - /** - * 便签关联数据的内部类，管理便签的文本内容和通话记录等数据 - */ private class NoteData { - private long mTextDataId; // 文本数据ID - private ContentValues mTextDataValues; // 文本数据值 - private long mCallDataId; // 通话记录数据ID - private ContentValues mCallDataValues; // 通话记录数据值 + private long mTextDataId; + + private ContentValues mTextDataValues; + + private long mCallDataId; + + private ContentValues mCallDataValues; + private static final String TAG = "NoteData"; - /** - * 构造函数，初始化便签数据对象 - */ public NoteData() { mTextDataValues = new ContentValues(); mCallDataValues = new ContentValues(); @@ -198,18 +148,10 @@ public class Note { mCallDataId = 0; } - /** - * 判断便签数据是否有本地修改 - * @return 有修改返回true，否则返回false - */ boolean isLocalModified() { return mTextDataValues.size() > 0 || mCallDataValues.size() > 0; } - /** - * 设置文本数据ID - * @param id 文本数据ID - */ void setTextDataId(long id) { if(id <= 0) { throw new IllegalArgumentException("Text data id should larger than 0"); @@ -217,10 +159,6 @@ public class Note { mTextDataId = id; } - /** - * 设置通话记录数据ID - * @param id 通话记录数据ID - */ void setCallDataId(long id) { if (id <= 0) { throw new IllegalArgumentException("Call data id should larger than 0"); @@ -228,37 +166,21 @@ public class Note { mCallDataId = id; } - /** - * 设置通话记录数据 - * @param key 通话数据键 - * @param value 通话数据值 - */ void setCallData(String key, String value) { mCallDataValues.put(key, value); mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); } - /** - * 设置文本数据 - * @param key 文本数据键 - * @param value 文本数据值 - */ void setTextData(String key, String value) { mTextDataValues.put(key, value); mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); } - /** - * 将便签数据推送到内容提供者（数据库） - * @param context 上下文 - * @param noteId 便签ID - * @return 操作成功返回便签URI，失败返回null - */ Uri pushIntoContentResolver(Context context, long noteId) { /** - * 安全检查 + * Check for safety */ if (noteId <= 0) { throw new IllegalArgumentException("Wrong note id:" + noteId); @@ -267,11 +189,9 @@ public class Note { ArrayList operationList = new ArrayList(); ContentProviderOperation.Builder builder = null; - // 处理文本数据 if(mTextDataValues.size() > 0) { mTextDataValues.put(DataColumns.NOTE_ID, noteId); if (mTextDataId == 0) { - // 插入新文本数据 mTextDataValues.put(DataColumns.MIME_TYPE, TextNote.CONTENT_ITEM_TYPE); Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, mTextDataValues); @@ -283,7 +203,6 @@ public class Note { return null; } } else { - // 更新现有文本数据 builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( Notes.CONTENT_DATA_URI, mTextDataId)); builder.withValues(mTextDataValues); @@ -292,11 +211,9 @@ public class Note { mTextDataValues.clear(); } - // 处理通话记录数据 if(mCallDataValues.size() > 0) { mCallDataValues.put(DataColumns.NOTE_ID, noteId); if (mCallDataId == 0) { - // 插入新通话记录数据 mCallDataValues.put(DataColumns.MIME_TYPE, CallNote.CONTENT_ITEM_TYPE); Uri uri = context.getContentResolver().insert(Notes.CONTENT_DATA_URI, mCallDataValues); @@ -308,7 +225,6 @@ public class Note { return null; } } else { - // 更新现有通话记录数据 builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId( Notes.CONTENT_DATA_URI, mCallDataId)); builder.withValues(mCallDataValues); @@ -317,7 +233,6 @@ public class Note { mCallDataValues.clear(); } - // 批量执行ContentProvider操作 if (operationList.size() > 0) { try { ContentProviderResult[] results = context.getContentResolver().applyBatch( @@ -335,4 +250,4 @@ public class Note { return null; } } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/model/WorkingNote.java b/src/Notes-master/src/net/micode/notes/model/WorkingNote.java index 6681b89..be081e4 100644 --- a/src/Notes-master/src/net/micode/notes/model/WorkingNote.java +++ b/src/Notes-master/src/net/micode/notes/model/WorkingNote.java @@ -31,41 +31,37 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.Notes.TextNote; import net.micode.notes.tool.ResourceParser.NoteBgResources; -/** - * 工作便签类，用于管理便签的创建、加载、编辑和保存操作 - * 封装了便签的各种属性和操作方法，支持与数据库的交互 - */ + public class WorkingNote { - // 便签核心操作类 + // Note for the working note private Note mNote; - // 便签ID + // Note Id private long mNoteId; - // 便签内容 + // Note content private String mContent; - // 便签模式（普通文本或待办列表） + // Note mode private int mMode; - // 提醒日期 + private long mAlertDate; - // 修改日期 + private long mModifiedDate; - // 背景色ID + private int mBgColorId; - // 关联的桌面小部件ID + private int mWidgetId; - // 小部件类型 + private int mWidgetType; - // 所属文件夹ID + private long mFolderId; - // 上下文 + private Context mContext; - // 日志标签 + private static final String TAG = "WorkingNote"; - // 是否被删除标记 + private boolean mIsDeleted; - // 设置变更监听器 + private NoteSettingChangedListener mNoteSettingStatusListener; - // 数据查询投影（指定要查询的列） public static final String[] DATA_PROJECTION = new String[] { DataColumns.ID, DataColumns.CONTENT, @@ -76,7 +72,6 @@ public class WorkingNote { DataColumns.DATA4, }; - // 便签查询投影 public static final String[] NOTE_PROJECTION = new String[] { NoteColumns.PARENT_ID, NoteColumns.ALERTED_DATE, @@ -86,25 +81,27 @@ public class WorkingNote { NoteColumns.MODIFIED_DATE }; - // 数据列索引常量 private static final int DATA_ID_COLUMN = 0; + private static final int DATA_CONTENT_COLUMN = 1; + private static final int DATA_MIME_TYPE_COLUMN = 2; + private static final int DATA_MODE_COLUMN = 3; - // 便签列索引常量 private static final int NOTE_PARENT_ID_COLUMN = 0; + private static final int NOTE_ALERTED_DATE_COLUMN = 1; + private static final int NOTE_BG_COLOR_ID_COLUMN = 2; + private static final int NOTE_WIDGET_ID_COLUMN = 3; + private static final int NOTE_WIDGET_TYPE_COLUMN = 4; + private static final int NOTE_MODIFIED_DATE_COLUMN = 5; - /** - * 私有构造函数，用于创建新便签 - * @param context 上下文 - * @param folderId 所属文件夹ID - */ + // New note construct private WorkingNote(Context context, long folderId) { mContext = context; mAlertDate = 0; @@ -117,12 +114,7 @@ public class WorkingNote { mWidgetType = Notes.TYPE_WIDGET_INVALIDE; } - /** - * 私有构造函数，用于加载已有便签 - * @param context 上下文 - * @param noteId 便签ID - * @param folderId 所属文件夹ID - */ + // Existing note construct private WorkingNote(Context context, long noteId, long folderId) { mContext = context; mNoteId = noteId; @@ -132,9 +124,6 @@ public class WorkingNote { loadNote(); } - /** - * 从数据库加载便签基本信息 - */ private void loadNote() { Cursor cursor = mContext.getContentResolver().query( ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null, @@ -157,9 +146,6 @@ public class WorkingNote { loadNoteData(); } - /** - * 从数据库加载便签详细数据（内容、类型等） - */ private void loadNoteData() { Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] { @@ -188,15 +174,6 @@ public class WorkingNote { } } - /** - * 创建一个空的便签对象 - * @param context 上下文 - * @param folderId 所属文件夹ID - * @param widgetId 小部件ID - * @param widgetType 小部件类型 - * @param defaultBgColorId 默认背景色ID - * @return 返回新建的便签对象 - */ public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId, int widgetType, int defaultBgColorId) { WorkingNote note = new WorkingNote(context, folderId); @@ -206,20 +183,10 @@ public class WorkingNote { return note; } - /** - * 从数据库加载指定ID的便签 - * @param context 上下文 - * @param id 便签ID - * @return 返回加载的便签对象 - */ public static WorkingNote load(Context context, long id) { return new WorkingNote(context, id, 0); } - /** - * 保存便签到数据库 - * @return 保存成功返回true，失败返回false - */ public synchronized boolean saveNote() { if (isWorthSaving()) { if (!existInDatabase()) { @@ -232,7 +199,7 @@ public class WorkingNote { mNote.syncNote(mContext, mNoteId); /** - * 如果此便签存在关联的桌面小部件，则更新小部件内容 + * Update widget content if there exist any widget of this note */ if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID && mWidgetType != Notes.TYPE_WIDGET_INVALIDE @@ -245,18 +212,10 @@ public class WorkingNote { } } - /** - * 判断便签是否已存在于数据库中 - * @return 存在返回true，否则返回false - */ public boolean existInDatabase() { return mNoteId > 0; } - /** - * 判断便签是否值得保存（有实际内容或修改） - * @return 值得保存返回true，否则返回false - */ private boolean isWorthSaving() { if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent)) || (existInDatabase() && !mNote.isLocalModified())) { @@ -266,19 +225,10 @@ public class WorkingNote { } } - /** - * 设置便签设置变更监听器 - * @param l 监听器对象 - */ public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) { mNoteSettingStatusListener = l; } - /** - * 设置便签提醒日期 - * @param date 提醒日期时间戳 - * @param set 是否设置提醒 - */ public void setAlertDate(long date, boolean set) { if (date != mAlertDate) { mAlertDate = date; @@ -289,10 +239,6 @@ public class WorkingNote { } } - /** - * 标记便签为已删除状态 - * @param mark 是否标记为删除 - */ public void markDeleted(boolean mark) { mIsDeleted = mark; if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID @@ -301,10 +247,6 @@ public class WorkingNote { } } - /** - * 设置便签背景色 - * @param id 背景色ID - */ public void setBgColorId(int id) { if (id != mBgColorId) { mBgColorId = id; @@ -315,10 +257,6 @@ public class WorkingNote { } } - /** - * 设置便签模式（普通文本或待办列表） - * @param mode 模式值 - */ public void setCheckListMode(int mode) { if (mMode != mode) { if (mNoteSettingStatusListener != null) { @@ -329,10 +267,6 @@ public class WorkingNote { } } - /** - * 设置关联的小部件类型 - * @param type 小部件类型 - */ public void setWidgetType(int type) { if (type != mWidgetType) { mWidgetType = type; @@ -340,10 +274,6 @@ public class WorkingNote { } } - /** - * 设置关联的小部件ID - * @param id 小部件ID - */ public void setWidgetId(int id) { if (id != mWidgetId) { mWidgetId = id; @@ -351,10 +281,6 @@ public class WorkingNote { } } - /** - * 设置便签文本内容 - * @param text 文本内容 - */ public void setWorkingText(String text) { if (!TextUtils.equals(mContent, text)) { mContent = text; @@ -362,137 +288,81 @@ public class WorkingNote { } } - /** - * 将便签转换为通话记录便签 - * @param phoneNumber 电话号码 - * @param callDate 通话日期 - */ public void convertToCallNote(String phoneNumber, long callDate) { mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate)); mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber); mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER)); } - /** - * 判断便签是否设置了提醒 - * @return 设置了提醒返回true，否则返回false - */ public boolean hasClockAlert() { return (mAlertDate > 0 ? true : false); } - /** - * 获取便签内容 - * @return 便签内容字符串 - */ public String getContent() { return mContent; } - /** - * 获取提醒日期 - * @return 提醒日期时间戳 - */ public long getAlertDate() { return mAlertDate; } - /** - * 获取修改日期 - * @return 修改日期时间戳 - */ public long getModifiedDate() { return mModifiedDate; } - /** - * 获取背景色资源ID - * @return 背景色资源ID - */ public int getBgColorResId() { return NoteBgResources.getNoteBgResource(mBgColorId); } - /** - * 获取背景色ID - * @return 背景色ID - */ public int getBgColorId() { return mBgColorId; } - /** - * 获取便签标题背景资源ID - * @return 标题背景资源ID - */ public int getTitleBgResId() { return NoteBgResources.getNoteTitleBgResource(mBgColorId); } - /** - * 获取便签模式 - * @return 便签模式值 - */ public int getCheckListMode() { return mMode; } - /** - * 获取便签ID - * @return 便签ID - */ public long getNoteId() { return mNoteId; } - /** - * 获取所属文件夹ID - * @return 文件夹ID - */ public long getFolderId() { return mFolderId; } - /** - * 获取关联的小部件ID - * @return 小部件ID - */ public int getWidgetId() { return mWidgetId; } - /** - * 获取关联的小部件类型 - * @return 小部件类型 - */ public int getWidgetType() { return mWidgetType; } - /** - * 便签设置变更监听器接口 - */ public interface NoteSettingChangedListener { /** - * 当便签背景色变更时调用 + * Called when the background color of current note has just changed */ void onBackgroundColorChanged(); /** - * 当用户设置提醒时钟时调用 + * Called when user set clock */ void onClockAlertChanged(long date, boolean set); /** - * 当用户从小部件创建便签时调用 + * Call when user create note from widget */ void onWidgetChanged(); /** - * 当在待办列表模式和普通模式之间切换时调用 - * @param oldMode 变更前的模式 - * @param newMode 变更后的模式 + * Call when switch between check list mode and normal mode + * @param oldMode is previous mode before change + * @param newMode is new mode */ void onCheckListModeChanged(int oldMode, int newMode); } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java index 0e445cd..85723be 100644 --- a/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java +++ b/src/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java @@ -39,27 +39,21 @@ import net.micode.notes.tool.DataUtils; import java.io.IOException; -/** - * 闹钟提醒Activity类 - * 功能：当便签提醒时间到达时显示提醒对话框并播放闹铃 - */ + public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener { - private long mNoteId; // 当前提醒便签的ID - private String mSnippet; // 便签内容摘要 - private static final int SNIPPET_PREW_MAX_LEN = 60; // 摘要预览最大长度 - MediaPlayer mPlayer; // 媒体播放器实例，用于播放闹铃 + private long mNoteId; + private String mSnippet; + private static final int SNIPPET_PREW_MAX_LEN = 60; + MediaPlayer mPlayer; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // 设置无标题栏 requestWindowFeature(Window.FEATURE_NO_TITLE); final Window win = getWindow(); - // 添加标志使界面在锁屏状态下也能显示 win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); - // 如果屏幕未点亮，则添加相关标志保持屏幕唤醒 if (!isScreenOn()) { win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON @@ -67,15 +61,11 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); } - // 获取启动此Activity的Intent Intent intent = getIntent(); try { - // 从Intent URI中解析出便签ID mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); - // 根据ID从数据库获取便签内容摘要 mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId); - // 如果摘要过长则截断并添加省略提示 mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0, SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info) : mSnippet; @@ -84,89 +74,65 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD return; } - // 初始化媒体播放器 mPlayer = new MediaPlayer(); - // 检查便签是否仍然存在于数据库中 if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { - showActionDialog(); // 显示提醒对话框 - playAlarmSound(); // 播放闹铃声音 + showActionDialog(); + playAlarmSound(); } else { - finish(); // 如果便签已被删除则直接结束 + finish(); } } - /** - * 检查屏幕是否处于点亮状态 - * @return boolean 屏幕点亮状态 - */ private boolean isScreenOn() { PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); return pm.isScreenOn(); } - /** - * 播放闹铃声音方法 - */ private void playAlarmSound() { - // 获取系统默认闹铃铃声URI Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); - // 获取系统设置的受静音模式影响的音频流 int silentModeStreams = Settings.System.getInt(getContentResolver(), Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); - // 根据系统设置设置音频流类型 if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) { mPlayer.setAudioStreamType(silentModeStreams); } else { mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM); } - try { - // 设置音频源并准备播放 mPlayer.setDataSource(this, url); mPlayer.prepare(); - mPlayer.setLooping(true); // 设置循环播放 - mPlayer.start(); // 开始播放 + mPlayer.setLooping(true); + mPlayer.start(); } catch (IllegalArgumentException e) { + // TODO Auto-generated catch block e.printStackTrace(); } catch (SecurityException e) { + // TODO Auto-generated catch block e.printStackTrace(); } catch (IllegalStateException e) { + // TODO Auto-generated catch block e.printStackTrace(); } catch (IOException e) { + // TODO Auto-generated catch block e.printStackTrace(); } } - /** - * 显示提醒操作对话框 - */ private void showActionDialog() { - // 创建AlertDialog构建器 AlertDialog.Builder dialog = new AlertDialog.Builder(this); - // 设置对话框标题和内容 dialog.setTitle(R.string.app_name); dialog.setMessage(mSnippet); - // 添加确定按钮 dialog.setPositiveButton(R.string.notealert_ok, this); - // 如果屏幕已点亮，则添加"进入"按钮 if (isScreenOn()) { dialog.setNegativeButton(R.string.notealert_enter, this); } - // 显示对话框并设置关闭监听 dialog.show().setOnDismissListener(this); } - /** - * 对话框按钮点击事件处理 - * @param dialog 对话框实例 - * @param which 被点击的按钮标识 - */ public void onClick(DialogInterface dialog, int which) { switch (which) { case DialogInterface.BUTTON_NEGATIVE: - // 点击"进入"按钮时跳转到便签编辑界面 Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_VIEW); intent.putExtra(Intent.EXTRA_UID, mNoteId); @@ -177,23 +143,16 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD } } - /** - * 对话框关闭事件处理 - * @param dialog 对话框实例 - */ public void onDismiss(DialogInterface dialog) { - stopAlarmSound(); // 停止闹铃声音 - finish(); // 结束当前Activity + stopAlarmSound(); + finish(); } - /** - * 停止闹铃声音方法 - */ private void stopAlarmSound() { if (mPlayer != null) { - mPlayer.stop(); // 停止播放 - mPlayer.release(); // 释放资源 - mPlayer = null; // 置空引用 + mPlayer.stop(); + mPlayer.release(); + mPlayer = null; } } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java index 0de33cc..f221202 100644 --- a/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java +++ b/src/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java @@ -27,53 +27,39 @@ import android.database.Cursor; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; -/** - * 闹钟初始化广播接收器 - * 功能：在设备启动后重新设置所有未触发的便签提醒 - */ + public class AlarmInitReceiver extends BroadcastReceiver { - // 查询数据库的列投影 private static final String [] PROJECTION = new String [] { - NoteColumns.ID, // 便签ID列 - NoteColumns.ALERTED_DATE // 提醒日期列 + NoteColumns.ID, + NoteColumns.ALERTED_DATE }; - // 列索引常量 - private static final int COLUMN_ID = 0; // ID列索引 - private static final int COLUMN_ALERTED_DATE = 1; // 提醒日期列索引 + private static final int COLUMN_ID = 0; + private static final int COLUMN_ALERTED_DATE = 1; @Override public void onReceive(Context context, Intent intent) { - // 获取当前系统时间 long currentDate = System.currentTimeMillis(); - - // 查询所有未触发且类型为普通便签的提醒 Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI, PROJECTION, NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE, - new String[] { String.valueOf(currentDate) }, // 参数：当前时间 + new String[] { String.valueOf(currentDate) }, null); if (c != null) { if (c.moveToFirst()) { do { - // 获取提醒时间 long alertDate = c.getLong(COLUMN_ALERTED_DATE); - // 创建闹钟触发时要发送的Intent Intent sender = new Intent(context, AlarmReceiver.class); - // 设置便签URI sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID))); - // 创建PendingIntent PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0); - // 获取AlarmManager服务 AlarmManager alermManager = (AlarmManager) context .getSystemService(Context.ALARM_SERVICE); - // 设置闹钟 alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); } while (c.moveToNext()); } c.close(); } } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java b/src/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java index a686b60..54e503b 100644 --- a/src/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java +++ b/src/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java @@ -20,23 +20,11 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -/** - * 闹钟广播接收器，用于接收和处理系统闹钟提醒广播 - * 当闹钟触发时，会启动AlarmAlertActivity显示提醒界面 - */ public class AlarmReceiver extends BroadcastReceiver { - /** - * 接收广播时调用的方法 - * @param context 上下文对象 - * @param intent 接收到的广播Intent - */ @Override public void onReceive(Context context, Intent intent) { - // 将Intent的目标Activity设置为AlarmAlertActivity intent.setClass(context, AlarmAlertActivity.class); - // 添加新任务栈标志，因为从广播接收器启动Activity需要新的任务栈 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - // 启动闹钟提醒Activity context.startActivity(intent); } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java b/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java index e473ac5..496b0cd 100644 --- a/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java +++ b/src/Notes-master/src/net/micode/notes/ui/DateTimePicker.java @@ -21,124 +21,92 @@ import java.util.Calendar; import net.micode.notes.R; + import android.content.Context; import android.text.format.DateFormat; import android.view.View; import android.widget.FrameLayout; import android.widget.NumberPicker; -/** - * 日期时间选择器控件，用于选择日期和时间 - * 支持12小时制和24小时制显示模式 - */ public class DateTimePicker extends FrameLayout { - // 默认启用状态 + private static final boolean DEFAULT_ENABLE_STATE = true; - // 时间相关常量 - private static final int HOURS_IN_HALF_DAY = 12; // 半天的小时数 - private static final int HOURS_IN_ALL_DAY = 24; // 全天的小时数 - private static final int DAYS_IN_ALL_WEEK = 7; // 一周的天数 - - // 日期选择器范围 + private static final int HOURS_IN_HALF_DAY = 12; + private static final int HOURS_IN_ALL_DAY = 24; + private static final int DAYS_IN_ALL_WEEK = 7; private static final int DATE_SPINNER_MIN_VAL = 0; private static final int DATE_SPINNER_MAX_VAL = DAYS_IN_ALL_WEEK - 1; - - // 24小时制时间选择器范围 private static final int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW = 0; private static final int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW = 23; - - // 12小时制时间选择器范围 private static final int HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW = 1; private static final int HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW = 12; - - // 分钟选择器范围 private static final int MINUT_SPINNER_MIN_VAL = 0; private static final int MINUT_SPINNER_MAX_VAL = 59; - - // AM/PM选择器范围 private static final int AMPM_SPINNER_MIN_VAL = 0; private static final int AMPM_SPINNER_MAX_VAL = 1; - // 控件成员变量 - private final NumberPicker mDateSpinner; // 日期选择器 - private final NumberPicker mHourSpinner; // 小时选择器 - private final NumberPicker mMinuteSpinner; // 分钟选择器 - private final NumberPicker mAmPmSpinner; // AM/PM选择器 - - private Calendar mDate; // 当前选择的日期时间 - - private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; // 日期显示值数组 - - private boolean mIsAm; // 是否为上午 - private boolean mIs24HourView; // 是否为24小时制 - private boolean mIsEnabled = DEFAULT_ENABLE_STATE; // 控件是否可用 - private boolean mInitialising; // 是否正在初始化 - - private OnDateTimeChangedListener mOnDateTimeChangedListener; // 日期时间变化监听器 - - // 日期变化监听器 + private final NumberPicker mDateSpinner; + private final NumberPicker mHourSpinner; + private final NumberPicker mMinuteSpinner; + private final NumberPicker mAmPmSpinner; + private Calendar mDate; + + private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; + + private boolean mIsAm; + + private boolean mIs24HourView; + + private boolean mIsEnabled = DEFAULT_ENABLE_STATE; + + private boolean mInitialising; + + private OnDateTimeChangedListener mOnDateTimeChangedListener; + private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() { @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - // 计算日期变化量并更新日期 mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal); updateDateControl(); onDateTimeChanged(); } }; - // 小时变化监听器 private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() { @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { boolean isDateChanged = false; Calendar cal = Calendar.getInstance(); - - // 处理12小时制下的特殊时间点变化 if (!mIs24HourView) { - // 处理PM到AM的日期变化 if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; - } - // 处理AM到PM的日期变化 - else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { + } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -1); isDateChanged = true; } - - // 处理AM/PM切换 if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY || oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { mIsAm = !mIsAm; updateAmPmControl(); } - } - // 处理24小时制下的特殊时间点变化 - else { - // 处理23点到0点的日期变化 + } else { if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; - } - // 处理0点到23点的日期变化 - else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) { + } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -1); isDateChanged = true; } } - - // 更新当前小时并触发变化事件 int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY); mDate.set(Calendar.HOUR_OF_DAY, newHour); onDateTimeChanged(); - - // 如果需要更新日期 if (isDateChanged) { setCurrentYear(cal.get(Calendar.YEAR)); setCurrentMonth(cal.get(Calendar.MONTH)); @@ -147,28 +115,21 @@ public class DateTimePicker extends FrameLayout { } }; - // 分钟变化监听器 private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() { @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { int minValue = mMinuteSpinner.getMinValue(); int maxValue = mMinuteSpinner.getMaxValue(); int offset = 0; - - // 处理分钟循环滚动 if (oldVal == maxValue && newVal == minValue) { - offset += 1; // 从最大值滚动到最小值，小时加1 + offset += 1; } else if (oldVal == minValue && newVal == maxValue) { - offset -= 1; // 从最小值滚动到最大值，小时减1 + offset -= 1; } - - // 如果需要调整小时 if (offset != 0) { mDate.add(Calendar.HOUR_OF_DAY, offset); mHourSpinner.setValue(getCurrentHour()); updateDateControl(); - - // 更新AM/PM显示 int newHour = getCurrentHourOfDay(); if (newHour >= HOURS_IN_HALF_DAY) { mIsAm = false; @@ -178,18 +139,14 @@ public class DateTimePicker extends FrameLayout { updateAmPmControl(); } } - - // 设置新分钟并触发变化事件 mDate.set(Calendar.MINUTE, newVal); onDateTimeChanged(); } }; - // AM/PM变化监听器 private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() { @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { - // 切换AM/PM状态并调整时间 mIsAm = !mIsAm; if (mIsAm) { mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY); @@ -201,58 +158,39 @@ public class DateTimePicker extends FrameLayout { } }; - /** - * 日期时间变化监听接口 - */ public interface OnDateTimeChangedListener { void onDateTimeChanged(DateTimePicker view, int year, int month, int dayOfMonth, int hourOfDay, int minute); } - /** - * 构造函数，使用当前时间初始化 - */ public DateTimePicker(Context context) { this(context, System.currentTimeMillis()); } - /** - * 构造函数，使用指定时间戳初始化 - */ public DateTimePicker(Context context, long date) { this(context, date, DateFormat.is24HourFormat(context)); } - /** - * 主构造函数，完成所有初始化工作 - */ public DateTimePicker(Context context, long date, boolean is24HourView) { super(context); mDate = Calendar.getInstance(); mInitialising = true; - mIsAm = getCurrentHourOfDay() < HOURS_IN_HALF_DAY; // 根据当前时间设置AM/PM - - // 加载布局 + mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; inflate(context, R.layout.datetime_picker, this); - // 初始化日期选择器 mDateSpinner = (NumberPicker) findViewById(R.id.date); mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL); mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL); mDateSpinner.setOnValueChangedListener(mOnDateChangedListener); - // 初始化小时选择器 mHourSpinner = (NumberPicker) findViewById(R.id.hour); mHourSpinner.setOnValueChangedListener(mOnHourChangedListener); - - // 初始化分钟选择器 - mMinuteSpinner = (NumberPicker) findViewById(R.id.minute); + mMinuteSpinner = (NumberPicker) findViewById(R.id.minute); mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL); mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL); - mMinuteSpinner.setOnLongPressUpdateInterval(100); // 设置长按更新间隔 + mMinuteSpinner.setOnLongPressUpdateInterval(100); mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener); - // 初始化AM/PM选择器 String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings(); mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm); mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL); @@ -260,21 +198,19 @@ public class DateTimePicker extends FrameLayout { mAmPmSpinner.setDisplayedValues(stringsForAmPm); mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener); - // 更新控件初始状态 + // update controls to initial state updateDateControl(); updateHourControl(); updateAmPmControl(); - // 设置时间显示模式 set24HourView(is24HourView); - // 设置为当前时间 + // set to current time setCurrentDate(date); - // 设置启用状态 setEnabled(isEnabled()); - // 初始化完成 + // set the content descriptions mInitialising = false; } @@ -284,7 +220,6 @@ public class DateTimePicker extends FrameLayout { return; } super.setEnabled(enabled); - // 设置各子控件的启用状态 mDateSpinner.setEnabled(enabled); mMinuteSpinner.setEnabled(enabled); mHourSpinner.setEnabled(enabled); @@ -298,14 +233,18 @@ public class DateTimePicker extends FrameLayout { } /** - * 获取当前日期的时间戳 + * Get the current date in millis + * + * @return the current date in millis */ public long getCurrentDateInTimeMillis() { return mDate.getTimeInMillis(); } /** - * 设置当前日期（通过时间戳） + * Set the current date + * + * @param date The current date in millis */ public void setCurrentDate(long date) { Calendar cal = Calendar.getInstance(); @@ -315,7 +254,13 @@ public class DateTimePicker extends FrameLayout { } /** - * 设置当前日期（通过年月日时分） + * Set the current date + * + * @param year The current year + * @param month The current month + * @param dayOfMonth The current dayOfMonth + * @param hourOfDay The current hourOfDay + * @param minute The current minute */ public void setCurrentDate(int year, int month, int dayOfMonth, int hourOfDay, int minute) { @@ -327,14 +272,18 @@ public class DateTimePicker extends FrameLayout { } /** - * 获取当前年份 + * Get current year + * + * @return The current year */ public int getCurrentYear() { return mDate.get(Calendar.YEAR); } /** - * 设置当前年份 + * Set current year + * + * @param year The current year */ public void setCurrentYear(int year) { if (!mInitialising && year == getCurrentYear()) { @@ -346,14 +295,18 @@ public class DateTimePicker extends FrameLayout { } /** - * 获取当前月份 + * Get current month in the year + * + * @return The current month in the year */ public int getCurrentMonth() { return mDate.get(Calendar.MONTH); } /** - * 设置当前月份 + * Set current month in the year + * + * @param month The month in the year */ public void setCurrentMonth(int month) { if (!mInitialising && month == getCurrentMonth()) { @@ -365,14 +318,18 @@ public class DateTimePicker extends FrameLayout { } /** - * 获取当前日期 + * Get current day of the month + * + * @return The day of the month */ public int getCurrentDay() { return mDate.get(Calendar.DAY_OF_MONTH); } /** - * 设置当前日期 + * Set current day of the month + * + * @param dayOfMonth The day of the month */ public void setCurrentDay(int dayOfMonth) { if (!mInitialising && dayOfMonth == getCurrentDay()) { @@ -384,38 +341,36 @@ public class DateTimePicker extends FrameLayout { } /** - * 获取当前小时（24小时制） + * Get current hour in 24 hour mode, in the range (0~23) + * @return The current hour in 24 hour mode */ public int getCurrentHourOfDay() { return mDate.get(Calendar.HOUR_OF_DAY); } - /** - * 获取当前小时（根据显示模式） - */ private int getCurrentHour() { if (mIs24HourView){ return getCurrentHourOfDay(); } else { int hour = getCurrentHourOfDay(); if (hour > HOURS_IN_HALF_DAY) { - return hour - HOURS_IN_HALF_DAY; // PM时间转换为12小时制 + return hour - HOURS_IN_HALF_DAY; } else { - return hour == 0 ? HOURS_IN_HALF_DAY : hour; // 0点转换为12点 + return hour == 0 ? HOURS_IN_HALF_DAY : hour; } } } /** - * 设置当前小时（24小时制） + * Set current hour in 24 hour mode, in the range (0~23) + * + * @param hourOfDay */ public void setCurrentHour(int hourOfDay) { if (!mInitialising && hourOfDay == getCurrentHourOfDay()) { return; } mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); - - // 处理12小时制下的显示 if (!mIs24HourView) { if (hourOfDay >= HOURS_IN_HALF_DAY) { mIsAm = false; @@ -435,14 +390,16 @@ public class DateTimePicker extends FrameLayout { } /** - * 获取当前分钟 + * Get currentMinute + * + * @return The Current Minute */ public int getCurrentMinute() { return mDate.get(Calendar.MINUTE); } /** - * 设置当前分钟 + * Set current minute */ public void setCurrentMinute(int minute) { if (!mInitialising && minute == getCurrentMinute()) { @@ -454,14 +411,16 @@ public class DateTimePicker extends FrameLayout { } /** - * 是否为24小时制显示 + * @return true if this is in 24 hour view else false. */ - public boolean is24HourView() { + public boolean is24HourView () { return mIs24HourView; } /** - * 设置时间显示模式（24小时制或12小时制） + * Set whether in 24 hour or AM/PM mode. + * + * @param is24HourView True for 24 hour mode. False for AM/PM mode. */ public void set24HourView(boolean is24HourView) { if (mIs24HourView == is24HourView) { @@ -475,29 +434,20 @@ public class DateTimePicker extends FrameLayout { updateAmPmControl(); } - /** - * 更新日期控件显示 - */ private void updateDateControl() { Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -DAYS_IN_ALL_WEEK / 2 - 1); mDateSpinner.setDisplayedValues(null); - - // 生成一周的日期显示文本 for (int i = 0; i < DAYS_IN_ALL_WEEK; ++i) { cal.add(Calendar.DAY_OF_YEAR, 1); mDateDisplayValues[i] = (String) DateFormat.format("MM.dd EEEE", cal); } - mDateSpinner.setDisplayedValues(mDateDisplayValues); - mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2); // 设置中间位置为当前日期 + mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2); mDateSpinner.invalidate(); } - /** - * 更新AM/PM控件显示 - */ private void updateAmPmControl() { if (mIs24HourView) { mAmPmSpinner.setVisibility(View.GONE); @@ -508,9 +458,6 @@ public class DateTimePicker extends FrameLayout { } } - /** - * 更新小时控件显示范围 - */ private void updateHourControl() { if (mIs24HourView) { mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW); @@ -522,19 +469,17 @@ public class DateTimePicker extends FrameLayout { } /** - * 设置日期时间变化监听器 + * Set the callback that indicates the 'Set' button has been pressed. + * @param callback the callback, if null will do nothing */ public void setOnDateTimeChangedListener(OnDateTimeChangedListener callback) { mOnDateTimeChangedListener = callback; } - /** - * 触发日期时间变化事件 - */ private void onDateTimeChanged() { if (mOnDateTimeChangedListener != null) { mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(), getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute()); } } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java index 1e12c8e..2c47ba4 100644 --- a/src/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java +++ b/src/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java @@ -30,78 +30,61 @@ import android.text.format.DateFormat; import android.text.format.DateUtils; public class DateTimePickerDialog extends AlertDialog implements OnClickListener { - // 用于存储日期时间的Calendar对象 + private Calendar mDate = Calendar.getInstance(); - // 标记是否使用24小时制 private boolean mIs24HourView; - // 日期时间设置回调接口 private OnDateTimeSetListener mOnDateTimeSetListener; - // 日期时间选择器控件 private DateTimePicker mDateTimePicker; - // 定义日期时间设置完成的回调接口 public interface OnDateTimeSetListener { void OnDateTimeSet(AlertDialog dialog, long date); } - // 构造函数，传入上下文和初始日期时间 public DateTimePickerDialog(Context context, long date) { super(context); - // 初始化日期时间选择器 mDateTimePicker = new DateTimePicker(context); setView(mDateTimePicker); - // 设置日期时间变化监听器 mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() { public void onDateTimeChanged(DateTimePicker view, int year, int month, int dayOfMonth, int hourOfDay, int minute) { - // 当日期时间变化时更新Calendar对象 mDate.set(Calendar.YEAR, year); mDate.set(Calendar.MONTH, month); mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); mDate.set(Calendar.MINUTE, minute); - // 更新对话框标题显示新的日期时间 updateTitle(mDate.getTimeInMillis()); } }); - // 设置初始日期时间 mDate.setTimeInMillis(date); - mDate.set(Calendar.SECOND, 0); // 秒数设为0 + mDate.set(Calendar.SECOND, 0); mDateTimePicker.setCurrentDate(mDate.getTimeInMillis()); - // 设置确定和取消按钮 setButton(context.getString(R.string.datetime_dialog_ok), this); setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null); - // 根据系统设置决定是否使用24小时制 set24HourView(DateFormat.is24HourFormat(this.getContext())); - // 初始化对话框标题 updateTitle(mDate.getTimeInMillis()); } - // 设置是否使用24小时制显示时间 public void set24HourView(boolean is24HourView) { mIs24HourView = is24HourView; } - // 设置日期时间设置完成的回调 public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) { mOnDateTimeSetListener = callBack; } - // 更新对话框标题显示当前日期时间 private void updateTitle(long date) { int flag = - DateUtils.FORMAT_SHOW_YEAR | // 显示年份 - DateUtils.FORMAT_SHOW_DATE | // 显示日期 - DateUtils.FORMAT_SHOW_TIME; // 显示时间 + DateUtils.FORMAT_SHOW_YEAR | + DateUtils.FORMAT_SHOW_DATE | + DateUtils.FORMAT_SHOW_TIME; flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; - // 使用DateUtils格式化日期时间并设置为标题 setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); } - // 点击确定按钮时调用回调函数 public void onClick(DialogInterface arg0, int arg1) { if (mOnDateTimeSetListener != null) { mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis()); } } + } \ No newline at end of file diff --git a/src/Notes-master/src/net/micode/notes/ui/DropdownMenu.java b/src/Notes-master/src/net/micode/notes/ui/DropdownMenu.java index 9246b2a..613dc74 100644 --- a/src/Notes-master/src/net/micode/notes/ui/DropdownMenu.java +++ b/src/Notes-master/src/net/micode/notes/ui/DropdownMenu.java @@ -27,31 +27,17 @@ import android.widget.PopupMenu.OnMenuItemClickListener; import net.micode.notes.R; -/** - * 下拉菜单控件类，用于在按钮上显示一个弹出式菜单 - */ public class DropdownMenu { - private Button mButton; // 触发下拉菜单的按钮 - private PopupMenu mPopupMenu; // 弹出菜单对象 - private Menu mMenu; // 菜单项集合 + private Button mButton; + private PopupMenu mPopupMenu; + private Menu mMenu; - /** - * 构造函数，初始化下拉菜单 - * @param context 上下文环境 - * @param button 触发菜单的按钮 - * @param menuId 菜单资源ID - */ public DropdownMenu(Context context, Button button, int menuId) { mButton = button; - // 设置按钮背景为下拉图标 mButton.setBackgroundResource(R.drawable.dropdown_icon); - // 创建弹出菜单，锚点为传入的按钮 mPopupMenu = new PopupMenu(context, mButton); - // 获取菜单对象 mMenu = mPopupMenu.getMenu(); - // 从资源文件填充菜单项 mPopupMenu.getMenuInflater().inflate(menuId, mMenu); - // 设置按钮点击事件，点击时显示弹出菜单 mButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { mPopupMenu.show(); @@ -59,30 +45,17 @@ public class DropdownMenu { }); } - /** - * 设置菜单项点击监听器 - * @param listener 菜单项点击监听器 - */ public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) { if (mPopupMenu != null) { mPopupMenu.setOnMenuItemClickListener(listener); } } - /** - * 查找指定ID的菜单项 - * @param id 菜单项ID - * @return 找到的菜单项，未找到返回null - */ public MenuItem findItem(int id) { return mMenu.findItem(id); } - /** - * 设置按钮的标题文本 - * @param title 要显示的标题文本 - */ public void setTitle(CharSequence title) { mButton.setText(title); } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java b/src/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java index bfdf3f8..96b77da 100644 --- a/src/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java +++ b/src/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java @@ -28,87 +28,53 @@ import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; -/** - * 文件夹列表适配器，用于在列表中显示文件夹数据 - */ + public class FoldersListAdapter extends CursorAdapter { - // 定义查询的列名 public static final String [] PROJECTION = { NoteColumns.ID, NoteColumns.SNIPPET }; - // 定义列的索引 public static final int ID_COLUMN = 0; public static final int NAME_COLUMN = 1; - /** - * 构造函数 - * @param context 上下文 - * @param c 数据源Cursor - */ public FoldersListAdapter(Context context, Cursor c) { super(context, c); // TODO Auto-generated constructor stub } - /** - * 创建新的列表项视图 - */ @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { return new FolderListItem(context); } - /** - * 绑定数据到列表项视图 - */ @Override public void bindView(View view, Context context, Cursor cursor) { if (view instanceof FolderListItem) { - // 如果是根文件夹则显示特定字符串，否则显示文件夹名称 String folderName = (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); ((FolderListItem) view).bind(folderName); } } - /** - * 获取指定位置的文件夹名称 - * @param context 上下文 - * @param position 位置 - * @return 文件夹名称 - */ public String getFolderName(Context context, int position) { Cursor cursor = (Cursor) getItem(position); return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN); } - /** - * 文件夹列表项自定义视图 - */ private class FolderListItem extends LinearLayout { - private TextView mName; // 显示文件夹名称的TextView + private TextView mName; - /** - * 构造函数 - * @param context 上下文 - */ public FolderListItem(Context context) { super(context); - // 加载布局文件 inflate(context, R.layout.folder_list_item, this); - // 初始化TextView mName = (TextView) findViewById(R.id.tv_folder_name); } - /** - * 绑定文件夹名称到视图 - * @param name 文件夹名称 - */ public void bind(String name) { mName.setText(name); } } -} \ No newline at end of file + +} diff --git a/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java index b1a61e5..96a9ff8 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java @@ -1,15 +1,17 @@ /* * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * - * 遵循 Apache 许可证 2.0（"许可证"）； - * 除非遵守许可证，否则不得使用此文件。 - * 您可以在以下地址获取许可证副本： + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - * 除非适用法律要求或书面同意，否则根据许可证分发的软件 - * 按"原样"分发，不附带任何明示或暗示的保证或条件。 - * 请参阅许可证，了解管理权限和限制的具体语言。 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.micode.notes.ui; @@ -70,26 +72,18 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -/** - * 笔记编辑活动类 - * 负责处理笔记的编辑、显示、提醒设置、界面样式调整等功能 - * 实现了点击事件监听、笔记设置变更监听、文本变更监听等接口 - */ public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { - - /** - * 头部视图ViewHolder类 - * 用于持有笔记头部视图中的各个控件引用 - */ private class HeadViewHolder { - public TextView tvModified; // 修改时间文本视图 - public ImageView ivAlertIcon; // 提醒图标 - public TextView tvAlertDate; // 提醒时间文本视图 - public ImageView ibSetBgColor; // 设置背景颜色按钮 + public TextView tvModified; + + public ImageView ivAlertIcon; + + public TextView tvAlertDate; + + public ImageView ibSetBgColor; } - // 背景颜色选择按钮映射：按钮ID -> 背景颜色资源ID private static final Map sBgSelectorBtnsMap = new HashMap(); static { sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); @@ -99,7 +93,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); } - // 背景颜色选择选中状态映射：背景颜色资源ID -> 选中状态图标ID private static final Map sBgSelectorSelectionMap = new HashMap(); static { sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select); @@ -109,7 +102,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select); } - // 字体大小按钮映射：按钮ID -> 字体大小资源ID private static final Map sFontSizeBtnsMap = new HashMap(); static { sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE); @@ -118,7 +110,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER); } - // 字体大小选择选中状态映射：字体大小资源ID -> 选中状态图标ID private static final Map sFontSelectorSelectionMap = new HashMap(); static { sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select); @@ -129,39 +120,50 @@ public class NoteEditActivity extends Activity implements OnClickListener, private static final String TAG = "NoteEditActivity"; - private HeadViewHolder mNoteHeaderHolder; // 头部视图ViewHolder实例 - private View mHeadViewPanel; // 头部视图面板 - private View mNoteBgColorSelector; // 背景颜色选择视图 - private View mFontSizeSelector; // 字体大小选择视图 - private EditText mNoteEditor; // 笔记编辑文本框 - private View mNoteEditorPanel; // 编辑区域面板 - private WorkingNote mWorkingNote; // 当前编辑的笔记模型 - private SharedPreferences mSharedPrefs; // 共享偏好设置 - private int mFontSizeId; // 当前字体大小ID - private static final String PREFERENCE_FONT_SIZE = "pref_font_size"; // 字体大小偏好键 - private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; // 快捷方式标题最大长度 - public static final String TAG_CHECKED = String.valueOf('\u221A'); // 勾选标记 - public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); // 未勾选标记 - private LinearLayout mEditTextList; // 列表模式下的编辑项容器 - private String mUserQuery; // 用户搜索查询词（用于高亮显示） - private Pattern mPattern; // 搜索匹配模式 + private HeadViewHolder mNoteHeaderHolder; + + private View mHeadViewPanel; + + private View mNoteBgColorSelector; + + private View mFontSizeSelector; + + private EditText mNoteEditor; + + private View mNoteEditorPanel; + + private WorkingNote mWorkingNote; + + private SharedPreferences mSharedPrefs; + private int mFontSizeId; + + private static final String PREFERENCE_FONT_SIZE = "pref_font_size"; + + private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10; + + public static final String TAG_CHECKED = String.valueOf('\u221A'); + public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); + + private LinearLayout mEditTextList; + + private String mUserQuery; + private Pattern mPattern; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); this.setContentView(R.layout.note_edit); - // 初始化活动状态（加载已有笔记或创建新笔记） if (savedInstanceState == null && !initActivityState(getIntent())) { finish(); return; } - initResources(); // 初始化界面资源 + initResources(); } /** - * 恢复活动状态（处理内存不足导致的活动销毁） - * @param savedInstanceState 保存的实例状态 + * Current activity may be killed when the memory is low. Once it is killed, for another time + * user load this activity, we should restore the former state */ @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { @@ -177,25 +179,24 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } - /** - * 初始化活动状态（加载笔记或创建新笔记） - * @param intent 传入的Intent - * @return 是否初始化成功 - */ private boolean initActivityState(Intent intent) { + /** + * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id, + * then jump to the NotesListActivity + */ mWorkingNote = null; - // 处理查看笔记操作 if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) { long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0); mUserQuery = ""; - // 处理搜索结果中的笔记 + /** + * Starting from the searched result + */ if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) { noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY)); mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY); } - // 检查笔记是否存在且可见 if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) { Intent jump = new Intent(this, NotesListActivity.class); startActivity(jump); @@ -210,13 +211,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, return false; } } - // 设置软键盘模式（隐藏并调整布局） getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); - } - // 处理插入或编辑新笔记操作 - else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { + } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { + // New note long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); @@ -225,7 +224,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, ResourceParser.getDefaultBgId(this)); - // 处理通话记录笔记 + // Parse call-record note String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER); long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0); if (callDate != 0 && phoneNumber != null) { @@ -233,7 +232,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, Log.w(TAG, "The call record number is null"); } long noteId = 0; - // 检查是否已存在该通话记录笔记 if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(), phoneNumber, callDate)) > 0) { mWorkingNote = WorkingNote.load(this, noteId); @@ -243,17 +241,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, return false; } } else { - // 创建新的通话记录笔记 mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, bgResId); mWorkingNote.convertToCallNote(phoneNumber, callDate); } } else { - // 创建普通新笔记 mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, bgResId); } - // 设置软键盘模式（可见并调整布局） + getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); @@ -262,7 +258,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, finish(); return false; } - // 设置笔记设置变更监听器 mWorkingNote.setOnSettingStatusChangedListener(this); return true; } @@ -270,59 +265,48 @@ public class NoteEditActivity extends Activity implements OnClickListener, @Override protected void onResume() { super.onResume(); - initNoteScreen(); // 初始化笔记界面显示 + initNoteScreen(); } - /** - * 初始化笔记界面显示 - */ private void initNoteScreen() { - // 设置编辑框文本样式（根据字体大小） mNoteEditor.setTextAppearance(this, TextAppearanceResources .getTexAppearanceResource(mFontSizeId)); - // 检查是否为列表模式（勾选列表） if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - switchToListMode(mWorkingNote.getContent()); // 切换到列表编辑模式 + switchToListMode(mWorkingNote.getContent()); } else { - // 普通文本模式，显示带高亮的文本 mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); - mNoteEditor.setSelection(mNoteEditor.getText().length()); // 定位到文本末尾 + mNoteEditor.setSelection(mNoteEditor.getText().length()); } - // 隐藏所有背景颜色选择的选中状态图标 for (Integer id : sBgSelectorSelectionMap.keySet()) { findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE); } - // 设置头部视图和编辑区域背景 mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId()); - // 显示修改时间 mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this, mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_YEAR)); - // 显示提醒时间（TODO: 后续完善提醒功能） + /** + * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker + * is not ready + */ showAlertHeader(); } - /** - * 显示提醒头部信息（提醒时间和图标） - */ private void showAlertHeader() { if (mWorkingNote.hasClockAlert()) { long time = System.currentTimeMillis(); if (time > mWorkingNote.getAlertDate()) { - mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired); // 提醒已过期 + mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired); } else { - // 显示相对时间（如“5分钟后”） mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString( mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS)); } mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE); } else { - // 隐藏提醒相关元素 mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); }; @@ -331,23 +315,26 @@ public class NoteEditActivity extends Activity implements OnClickListener, @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); - initActivityState(intent); // 处理新的Intent（如从搜索结果打开） + initActivityState(intent); } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - // 保存未存入数据库的新笔记（生成ID） + /** + * For new note without note id, we should firstly save it to + * generate a id. If the editing note is not worth saving, there + * is no id which is equivalent to create new note + */ if (!mWorkingNote.existInDatabase()) { saveNote(); } - outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId()); // 保存笔记ID + outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId()); Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState"); } @Override public boolean dispatchTouchEvent(MotionEvent ev) { - // 点击外部区域时隐藏背景颜色和字体大小选择视图 if (mNoteBgColorSelector.getVisibility() == View.VISIBLE && !inRangeOfView(mNoteBgColorSelector, ev)) { mNoteBgColorSelector.setVisibility(View.GONE); @@ -362,30 +349,20 @@ public class NoteEditActivity extends Activity implements OnClickListener, return super.dispatchTouchEvent(ev); } - /** - * 检查触摸事件是否在指定视图范围内 - * @param view 目标视图 - * @param ev 触摸事件 - * @return 是否在范围内 - */ private boolean inRangeOfView(View view, MotionEvent ev) { int []location = new int[2]; view.getLocationOnScreen(location); int x = location[0]; int y = location[1]; - // 判断触摸点是否在视图区域内 if (ev.getX() < x || ev.getX() > (x + view.getWidth()) || ev.getY() < y || ev.getY() > (y + view.getHeight())) { - return false; - } + return false; + } return true; } - /** - * 初始化界面资源（控件引用、事件监听等） - */ private void initResources() { mHeadViewPanel = findViewById(R.id.note_title); mNoteHeaderHolder = new HeadViewHolder(); @@ -393,47 +370,44 @@ public class NoteEditActivity extends Activity implements OnClickListener, mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon); mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date); mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color); - mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this); // 设置背景颜色按钮点击监听 + mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this); mNoteEditor = (EditText) findViewById(R.id.note_edit_view); mNoteEditorPanel = findViewById(R.id.sv_note_edit); mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector); - // 为背景颜色选择按钮设置点击监听 for (int id : sBgSelectorBtnsMap.keySet()) { ImageView iv = (ImageView) findViewById(id); iv.setOnClickListener(this); } mFontSizeSelector = findViewById(R.id.font_size_selector); - // 为字体大小选择按钮设置点击监听 for (int id : sFontSizeBtnsMap.keySet()) { View view = findViewById(id); view.setOnClickListener(this); }; mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); - // 从偏好设置中获取字体大小ID，默认使用默认值 mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); - // 处理可能的无效字体大小ID（防止越界） + /** + * HACKME: Fix bug of store the resource id in shared preference. + * The id may larger than the length of resources, in this case, + * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE} + */ if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) { mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE; } - mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); // 列表模式编辑容器 + mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); } @Override protected void onPause() { super.onPause(); - if(saveNote()) { // 保存笔记内容 + if(saveNote()) { Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length()); } - clearSettingState(); // 清除设置状态（隐藏选择视图） + clearSettingState(); } - /** - * 更新桌面小部件（当笔记关联小部件时） - */ private void updateWidget() { Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); - // 根据小部件类型设置对应的提供者类 if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) { intent.setClass(this, NoteWidgetProvider_2x.class); } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) { @@ -447,68 +421,47 @@ public class NoteEditActivity extends Activity implements OnClickListener, mWorkingNote.getWidgetId() }); - sendBroadcast(intent); // 发送更新广播 - setResult(RESULT_OK, intent); // 设置结果码 + sendBroadcast(intent); + setResult(RESULT_OK, intent); } - /** - * 点击事件处理 - * @param v 被点击的视图 - */ public void onClick(View v) { int id = v.getId(); - // 处理设置背景颜色按钮点击 if (id == R.id.btn_set_bg_color) { - mNoteBgColorSelector.setVisibility(View.VISIBLE); // 显示背景颜色选择视图 - // 显示当前选中的背景颜色对应的选中状态图标 + mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - View.VISIBLE); - } - // 处理背景颜色选择按钮点击 - else if (sBgSelectorBtnsMap.containsKey(id)) { - // 隐藏之前选中的背景颜色的选中状态图标 + - View.VISIBLE); + } else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); - // 设置新的背景颜色ID mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id)); - mNoteBgColorSelector.setVisibility(View.GONE); // 隐藏选择视图 - } - // 处理字体大小选择按钮点击 - else if (sFontSizeBtnsMap.containsKey(id)) { - // 隐藏之前选中的字体大小的选中状态图标 + mNoteBgColorSelector.setVisibility(View.GONE); + } else if (sFontSizeBtnsMap.containsKey(id)) { findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE); - mFontSizeId = sFontSizeBtnsMap.get(id); // 设置新的字体大小ID - // 保存字体大小到偏好设置 + mFontSizeId = sFontSizeBtnsMap.get(id); mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit(); - // 显示新选中的字体大小的选中状态图标 findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - // 如果是列表模式，重新应用字体大小到所有列表项 if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { getWorkingText(); switchToListMode(mWorkingNote.getContent()); } else { - // 普通模式下直接设置编辑框文本样式 mNoteEditor.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); } - mFontSizeSelector.setVisibility(View.GONE); // 隐藏选择视图 + mFontSizeSelector.setVisibility(View.GONE); } } @Override public void onBackPressed() { - if(clearSettingState()) { // 先清除设置状态（如有打开的选择视图） + if(clearSettingState()) { return; } - saveNote(); // 保存笔记 - super.onBackPressed(); // 调用父类返回逻辑 + saveNote(); + super.onBackPressed(); } - /** - * 清除设置状态（隐藏选择视图） - * @return 是否成功清除 - */ private boolean clearSettingState() { if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) { mNoteBgColorSelector.setVisibility(View.GONE); @@ -520,14 +473,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, return false; } - /** - * 背景颜色变更回调（来自笔记模型） - */ public void onBackgroundColorChanged() { - // 显示当前背景颜色的选中状态图标 findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.VISIBLE); - // 更新编辑区域和头部视图背景 mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId()); mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId()); } @@ -537,21 +485,18 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (isFinishing()) { return true; } - clearSettingState(); // 清除设置状态 - menu.clear(); // 清空菜单 - // 根据笔记所在文件夹类型加载不同菜单（通话记录笔记专用菜单） + clearSettingState(); + menu.clear(); if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) { getMenuInflater().inflate(R.menu.call_note_edit, menu); } else { getMenuInflater().inflate(R.menu.note_edit, menu); } - // 根据当前模式更新列表模式菜单项标题 if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode); } else { menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode); } - // 根据是否有提醒设置显示/隐藏相关菜单项 if (mWorkingNote.hasClockAlert()) { menu.findItem(R.id.menu_alert).setVisible(false); } else { @@ -564,10 +509,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.menu_new_note: - createNewNote(); // 创建新笔记 + createNewNote(); break; case R.id.menu_delete: - // 显示删除确认对话框 AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(getString(R.string.alert_title_delete)); builder.setIcon(android.R.drawable.ic_dialog_alert); @@ -575,7 +519,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - deleteCurrentNote(); // 删除当前笔记 + deleteCurrentNote(); finish(); } }); @@ -583,27 +527,25 @@ public class NoteEditActivity extends Activity implements OnClickListener, builder.show(); break; case R.id.menu_font_size: - mFontSizeSelector.setVisibility(View.VISIBLE); // 显示字体大小选择视图 - // 显示当前选中的字体大小的选中状态图标 + mFontSizeSelector.setVisibility(View.VISIBLE); findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); break; case R.id.menu_list_mode: - // 切换列表模式状态 mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? TextNote.MODE_CHECK_LIST : 0); break; case R.id.menu_share: - getWorkingText(); // 获取当前笔记内容 - sendTo(this, mWorkingNote.getContent()); // 分享笔记内容 + getWorkingText(); + sendTo(this, mWorkingNote.getContent()); break; case R.id.menu_send_to_desktop: - sendToDesktop(); // 发送到桌面创建快捷方式 + sendToDesktop(); break; case R.id.menu_alert: - setReminder(); // 设置提醒时间 + setReminder(); break; case R.id.menu_delete_remind: - mWorkingNote.setAlertDate(0, false); // 清除提醒时间 + mWorkingNote.setAlertDate(0, false); break; default: break; @@ -611,39 +553,32 @@ public class NoteEditActivity extends Activity implements OnClickListener, return true; } - /** - * 设置提醒时间（打开日期时间选择对话框） - */ private void setReminder() { DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); d.setOnDateTimeSetListener(new OnDateTimeSetListener() { public void OnDateTimeSet(AlertDialog dialog, long date) { - mWorkingNote.setAlertDate(date, true); // 设置提醒时间并启用提醒 + mWorkingNote.setAlertDate(date , true); } }); d.show(); } /** - * 分享笔记内容到其他应用 - * @param context 上下文 - * @param info 要分享的内容 + * Share note to apps that support {@link Intent#ACTION_SEND} action + * and {@text/plain} type */ private void sendTo(Context context, String info) { Intent intent = new Intent(Intent.ACTION_SEND); intent.putExtra(Intent.EXTRA_TEXT, info); - intent.setType("text/plain"); // 设置分享类型为纯文本 + intent.setType("text/plain"); context.startActivity(intent); } - /** - * 创建新笔记（保存当前笔记后启动新的编辑活动） - */ private void createNewNote() { - // 先保存当前编辑的笔记 + // Firstly, save current editing notes saveNote(); - // 启动新的笔记编辑活动 + // For safety, start a new NoteEditActivity finish(); Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_INSERT_OR_EDIT); @@ -651,9 +586,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, startActivity(intent); } - /** - * 删除当前笔记 - */ private void deleteCurrentNote() { if (mWorkingNote.existInDatabase()) { HashSet ids = new HashSet(); @@ -663,7 +595,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, } else { Log.d(TAG, "Wrong note id, should not happen"); } - // 根据是否为同步模式处理删除（移动到回收站或直接删除） if (!isSyncMode()) { if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { Log.e(TAG, "Delete Note error"); @@ -674,24 +605,18 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } } - mWorkingNote.markDeleted(true); // 标记笔记为已删除 + mWorkingNote.markDeleted(true); } - /** - * 判断是否为同步模式（存在同步账户） - * @return 是否为同步模式 - */ private boolean isSyncMode() { return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; } - /** - * 提醒时间变更回调（来自笔记模型） - * @param date 提醒时间 - * @param set 是否设置提醒 - */ public void onClockAlertChanged(long date, boolean set) { - // 未保存的笔记需要先保存才能设置提醒 + /** + * User could set clock to an unsaved note, so before setting the + * alert clock, we should save the note first + */ if (!mWorkingNote.existInDatabase()) { saveNote(); } @@ -700,44 +625,39 @@ public class NoteEditActivity extends Activity implements OnClickListener, intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId())); PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); - showAlertHeader(); // 更新提醒头部显示 + showAlertHeader(); if(!set) { - alarmManager.cancel(pendingIntent); // 取消提醒 + alarmManager.cancel(pendingIntent); } else { - alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); // 设置提醒 + alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); } } else { - // 处理笔记内容为空的情况 + /** + * There is the condition that user has input nothing (the note is + * not worthy saving), we have no note id, remind the user that he + * should input something + */ Log.e(TAG, "Clock alert setting error"); showToast(R.string.error_note_empty_for_clock); } } - /** - * 小部件变更回调（来自笔记模型） - */ public void onWidgetChanged() { - updateWidget(); // 更新桌面小部件 + updateWidget(); } - /** - * 列表模式编辑项删除回调 - * @param index 删除项索引 - * @param text 删除项文本 - */ public void onEditTextDelete(int index, String text) { int childCount = mEditTextList.getChildCount(); if (childCount == 1) { return; } - // 调整后续项的索引 for (int i = index + 1; i < childCount; i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) .setIndex(i - 1); } - mEditTextList.removeViewAt(index); // 删除视图 + mEditTextList.removeViewAt(index); NoteEditText edit = null; if(index == 0) { edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById( @@ -747,68 +667,54 @@ public class NoteEditActivity extends Activity implements OnClickListener, R.id.et_edit_text); } int length = edit.length(); - edit.append(text); // 将删除项文本添加到前一项 + edit.append(text); edit.requestFocus(); - edit.setSelection(length); // 定位到文本末尾 + edit.setSelection(length); } - /** - * 列表模式编辑项换行回调（创建新项） - * @param index 新项索引 - * @param text 新项文本 - */ public void onEditTextEnter(int index, String text) { + /** + * Should not happen, check for debug + */ if(index > mEditTextList.getChildCount()) { Log.e(TAG, "Index out of mEditTextList boundrary, should not happen"); } - View view = getListItem(text, index); // 创建新的列表项视图 - mEditTextList.addView(view, index); // 添加到列表 + View view = getListItem(text, index); + mEditTextList.addView(view, index); NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - edit.requestFocus(); // 获取焦点 - edit.setSelection(0); // 定位到文本开头 - // 调整后续项的索引 + edit.requestFocus(); + edit.setSelection(0); for (int i = index + 1; i < mEditTextList.getChildCount(); i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) .setIndex(i); } } - /** - * 切换到列表编辑模式 - * @param text 笔记内容文本 - */ private void switchToListMode(String text) { - mEditTextList.removeAllViews(); // 清空列表容器 - String[] items = text.split("\n"); // 按换行分割文本 + mEditTextList.removeAllViews(); + String[] items = text.split("\n"); int index = 0; for (String item : items) { if(!TextUtils.isEmpty(item)) { - mEditTextList.addView(getListItem(item, index)); // 添加列表项视图 + mEditTextList.addView(getListItem(item, index)); index++; } } - mEditTextList.addView(getListItem("", index)); // 添加空的新项 - mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus(); // 焦点定位到新项 + mEditTextList.addView(getListItem("", index)); + mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus(); - mNoteEditor.setVisibility(View.GONE); // 隐藏普通编辑框 - mEditTextList.setVisibility(View.VISIBLE); // 显示列表编辑容器 + mNoteEditor.setVisibility(View.GONE); + mEditTextList.setVisibility(View.VISIBLE); } - /** - * 获取带搜索词高亮的文本 - * @param fullText 完整文本 - * @param userQuery 搜索查询词 - * @return 带高亮标记的Spannable字符串 - */ private Spannable getHighlightQueryResult(String fullText, String userQuery) { SpannableString spannable = new SpannableString(fullText == null ? "" : fullText); if (!TextUtils.isEmpty(userQuery)) { - mPattern = Pattern.compile(userQuery); // 编译搜索模式 + mPattern = Pattern.compile(userQuery); Matcher m = mPattern.matcher(fullText); int start = 0; while (m.find(start)) { - // 设置背景颜色高亮 spannable.setSpan( new BackgroundColorSpan(this.getResources().getColor( R.color.user_query_highlight)), m.start(), m.end(), @@ -819,30 +725,21 @@ public class NoteEditActivity extends Activity implements OnClickListener, return spannable; } - /** - * 创建列表模式下的单个编辑项视图 - * @param item 项文本内容 - * @param index 项索引 - * @return 列表项视图 - */ private View getListItem(String item, int index) { View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - // 设置文本样式（根据字体大小） edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item)); - // 勾选状态变更监听（处理删除线效果） cb.setOnCheckedChangeListener(new OnCheckedChangeListener() { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { - edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); // 添加删除线 + edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); } else { - edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); // 清除删除线 + edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); } } }); - // 解析文本中的勾选标记 if (item.startsWith(TAG_CHECKED)) { cb.setChecked(true); edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); @@ -853,23 +750,17 @@ public class NoteEditActivity extends Activity implements OnClickListener, item = item.substring(TAG_UNCHECKED.length(), item.length()).trim(); } - edit.setOnTextViewChangeListener(this); // 设置文本变更监听 - edit.setIndex(index); // 设置项索引 - edit.setText(getHighlightQueryResult(item, mUserQuery)); // 显示带高亮的文本 + edit.setOnTextViewChangeListener(this); + edit.setIndex(index); + edit.setText(getHighlightQueryResult(item, mUserQuery)); return view; } - /** - * 列表模式文本变更回调 - * @param index 变更项索引 - * @param hasText 是否有文本内容 - */ public void onTextChange(int index, boolean hasText) { if (index >= mEditTextList.getChildCount()) { Log.e(TAG, "Wrong index, should not happen"); return; } - // 根据是否有文本显示/隐藏勾选框 if(hasText) { mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE); } else { @@ -877,36 +768,24 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } - /** - * 列表模式状态变更回调 - * @param oldMode 旧模式 - * @param newMode 新模式 - */ public void onCheckListModeChanged(int oldMode, int newMode) { if (newMode == TextNote.MODE_CHECK_LIST) { - switchToListMode(mNoteEditor.getText().toString()); // 切换到列表模式 + switchToListMode(mNoteEditor.getText().toString()); } else { if (!getWorkingText()) { - // 切换回普通模式时处理勾选标记 mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", "")); } - // 显示带高亮的普通文本 mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); - mEditTextList.setVisibility(View.GONE); // 隐藏列表编辑容器 - mNoteEditor.setVisibility(View.VISIBLE); // 显示普通编辑框 + mEditTextList.setVisibility(View.GONE); + mNoteEditor.setVisibility(View.VISIBLE); } } - /** - * 获取当前笔记内容（根据模式处理列表项或普通文本） - * @return 是否包含勾选项 - */ private boolean getWorkingText() { boolean hasChecked = false; if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { StringBuilder sb = new StringBuilder(); - // 遍历列表项生成带勾选标记的文本 for (int i = 0; i < mEditTextList.getChildCount(); i++) { View view = mEditTextList.getChildAt(i); NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); @@ -919,31 +798,35 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } } - mWorkingNote.setWorkingText(sb.toString()); // 设置笔记内容 + mWorkingNote.setWorkingText(sb.toString()); } else { - mWorkingNote.setWorkingText(mNoteEditor.getText().toString()); // 普通模式直接获取文本 + mWorkingNote.setWorkingText(mNoteEditor.getText().toString()); } return hasChecked; } - /** - * 保存笔记内容到数据库 - * @return 是否保存成功 - */ private boolean saveNote() { - getWorkingText(); // 获取当前内容 - boolean saved = mWorkingNote.saveNote(); // 保存笔记 + getWorkingText(); + boolean saved = mWorkingNote.saveNote(); if (saved) { - setResult(RESULT_OK); // 设置结果码为成功 + /** + * There are two modes from List view to edit view, open one note, + * create/edit a node. Opening node requires to the original + * position in the list when back from edit view, while creating a + * new node requires to the top of the list. This code + * {@link #RESULT_OK} is used to identify the create/edit state + */ + setResult(RESULT_OK); } return saved; } - /** - * 发送到桌面创建快捷方式 - */ private void sendToDesktop() { - // 未保存的笔记需要先保存 + /** + * Before send message to home, we should make sure that current + * editing note is exists in databases. So, for new note, firstly + * save it + */ if (!mWorkingNote.existInDatabase()) { saveNote(); } @@ -952,50 +835,39 @@ public class NoteEditActivity extends Activity implements OnClickListener, Intent sender = new Intent(); Intent shortcutIntent = new Intent(this, NoteEditActivity.class); shortcutIntent.setAction(Intent.ACTION_VIEW); - shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); // 设置快捷方式目标笔记ID + shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); - // 设置快捷方式标题（截断到最大长度） sender.putExtra(Intent.EXTRA_SHORTCUT_NAME, makeShortcutIconTitle(mWorkingNote.getContent())); sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app)); sender.putExtra("duplicate", true); - sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); // 安装快捷方式动作 - showToast(R.string.info_note_enter_desktop); // 显示提示 - sendBroadcast(sender); // 发送广播 + sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); + showToast(R.string.info_note_enter_desktop); + sendBroadcast(sender); } else { - // 处理内容为空的情况 + /** + * There is the condition that user has input nothing (the note is + * not worthy saving), we have no note id, remind the user that he + * should input something + */ Log.e(TAG, "Send to desktop error"); showToast(R.string.error_note_empty_for_send_to_desktop); } } - /** - * 生成快捷方式标题（去除勾选标记并截断长度） - * @param content 笔记内容 - * @return 处理后的标题 - */ private String makeShortcutIconTitle(String content) { - content = content.replace(TAG_CHECKED, ""); // 移除勾选标记 - content = content.replace(TAG_UNCHECKED, ""); // 移除未勾选标记 + content = content.replace(TAG_CHECKED, ""); + content = content.replace(TAG_UNCHECKED, ""); return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0, - SHORTCUT_ICON_TITLE_MAX_LEN) : content; // 截断到最大长度 + SHORTCUT_ICON_TITLE_MAX_LEN) : content; } - /** - * 显示Toast提示 - * @param resId 提示文本资源ID - */ private void showToast(int resId) { showToast(resId, Toast.LENGTH_SHORT); } - /** - * 显示Toast提示（支持自定义时长） - * @param resId 提示文本资源ID - * @param duration Toast时长 - */ private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/NoteEditText.java b/src/Notes-master/src/net/micode/notes/ui/NoteEditText.java index 5f8fb21..2afe2a8 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NoteEditText.java +++ b/src/Notes-master/src/net/micode/notes/ui/NoteEditText.java @@ -37,22 +37,15 @@ import net.micode.notes.R; import java.util.HashMap; import java.util.Map; -/** - * 自定义笔记编辑文本框 - * 扩展自EditText，用于处理笔记中的文本编辑操作 - * 支持链接识别、键盘事件处理和文本变化监听等功能 - */ public class NoteEditText extends EditText { private static final String TAG = "NoteEditText"; - private int mIndex; // 当前编辑框在列表中的索引位置 - private int mSelectionStartBeforeDelete; // 记录删除操作前的光标位置 + private int mIndex; + private int mSelectionStartBeforeDelete; - // 支持的链接协议 private static final String SCHEME_TEL = "tel:" ; private static final String SCHEME_HTTP = "http:" ; private static final String SCHEME_EMAIL = "mailto:" ; - // 链接协议与菜单项文本资源的映射 private static final Map sSchemaActionResMap = new HashMap(); static { sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel); @@ -61,43 +54,38 @@ public class NoteEditText extends EditText { } /** - * 文本视图变化监听器接口 - * 由NoteEditActivity实现，用于处理编辑文本的删除、添加和文本变化事件 + * Call by the {@link NoteEditActivity} to delete or add edit text */ public interface OnTextViewChangeListener { /** - * 当按下删除键且文本为空时，删除当前编辑文本 + * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens + * and the text is null */ void onEditTextDelete(int index, String text); /** - * 当按下回车键时，在当前编辑文本后添加新的编辑文本 + * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER} + * happen */ void onEditTextEnter(int index, String text); /** - * 当文本变化时，隐藏或显示项目选项 + * Hide or show item option when text change */ void onTextChange(int index, boolean hasText); } - private OnTextViewChangeListener mOnTextViewChangeListener; // 文本变化监听器 + private OnTextViewChangeListener mOnTextViewChangeListener; public NoteEditText(Context context) { super(context, null); mIndex = 0; } - /** - * 设置编辑框在列表中的索引位置 - */ public void setIndex(int index) { mIndex = index; } - /** - * 设置文本视图变化监听器 - */ public void setOnTextViewChangeListener(OnTextViewChangeListener listener) { mOnTextViewChangeListener = listener; } @@ -108,13 +96,14 @@ public class NoteEditText extends EditText { public NoteEditText(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); + // TODO Auto-generated constructor stub } @Override public boolean onTouchEvent(MotionEvent event) { switch (event.getAction()) { case MotionEvent.ACTION_DOWN: - // 计算触摸位置对应的文本偏移量并设置光标位置 + int x = (int) event.getX(); int y = (int) event.getY(); x -= getTotalPaddingLeft(); @@ -136,13 +125,11 @@ public class NoteEditText extends EditText { public boolean onKeyDown(int keyCode, KeyEvent event) { switch (keyCode) { case KeyEvent.KEYCODE_ENTER: - // 回车键事件处理，由监听器处理 if (mOnTextViewChangeListener != null) { return false; } break; case KeyEvent.KEYCODE_DEL: - // 记录删除操作前的光标位置 mSelectionStartBeforeDelete = getSelectionStart(); break; default: @@ -155,9 +142,7 @@ public class NoteEditText extends EditText { public boolean onKeyUp(int keyCode, KeyEvent event) { switch(keyCode) { case KeyEvent.KEYCODE_DEL: - // 删除键事件处理 if (mOnTextViewChangeListener != null) { - // 如果光标在文本开头且不是第一个编辑框，则删除当前编辑框 if (0 == mSelectionStartBeforeDelete && mIndex != 0) { mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString()); return true; @@ -167,10 +152,7 @@ public class NoteEditText extends EditText { } break; case KeyEvent.KEYCODE_ENTER: - // 回车键事件处理 if (mOnTextViewChangeListener != null) { - // 获取光标位置之后的文本，将当前文本截断到光标位置 - // 并在后面添加新的编辑框 int selectionStart = getSelectionStart(); String text = getText().subSequence(selectionStart, length()).toString(); setText(getText().subSequence(0, selectionStart)); @@ -187,7 +169,6 @@ public class NoteEditText extends EditText { @Override protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) { - // 焦点变化时通知监听器文本状态 if (mOnTextViewChangeListener != null) { if (!focused && TextUtils.isEmpty(getText())) { mOnTextViewChangeListener.onTextChange(mIndex, false); @@ -200,19 +181,15 @@ public class NoteEditText extends EditText { @Override protected void onCreateContextMenu(ContextMenu menu) { - // 处理上下文菜单（长按菜单） if (getText() instanceof Spanned) { - // 获取选中的文本范围 int selStart = getSelectionStart(); int selEnd = getSelectionEnd(); int min = Math.min(selStart, selEnd); int max = Math.max(selStart, selEnd); - // 检查选中的文本中是否包含URLSpan final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class); if (urls.length == 1) { - // 根据URL协议设置菜单项文本 int defaultResId = 0; for(String schema: sSchemaActionResMap.keySet()) { if(urls[0].getURL().indexOf(schema) >= 0) { @@ -225,11 +202,10 @@ public class NoteEditText extends EditText { defaultResId = R.string.note_link_other; } - // 添加菜单项并设置点击事件 menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener( new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { - // 打开链接 + // goto a new intent urls[0].onClick(NoteEditText.this); return true; } @@ -238,4 +214,4 @@ public class NoteEditText extends EditText { } super.onCreateContextMenu(menu); } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/NoteItemData.java b/src/Notes-master/src/net/micode/notes/ui/NoteItemData.java index 7432890..0f5a878 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NoteItemData.java +++ b/src/Notes-master/src/net/micode/notes/ui/NoteItemData.java @@ -1,15 +1,17 @@ /* * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * - * 遵循 Apache 许可证 2.0（"许可证"）； - * 除非遵守许可证，否则不得使用此文件。 - * 您可以在以下地址获取许可证副本： + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - * 除非适用法律要求或书面同意，否则根据许可证分发的软件 - * 按"原样"分发，不附带任何明示或暗示的保证或条件。 - * 请参阅许可证，了解管理权限和限制的具体语言。 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.micode.notes.ui; @@ -24,73 +26,57 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.tool.DataUtils; -/** - * 笔记项数据模型类 - * 用于封装从数据库查询到的笔记或文件夹数据 - * 提供数据解析、位置判断和属性访问等功能 - */ public class NoteItemData { - - // 数据库查询投影（指定要查询的列） - static final String[] PROJECTION = new String[]{ - NoteColumns.ID, // 笔记/文件夹ID - NoteColumns.ALERTED_DATE, // 提醒时间 - NoteColumns.BG_COLOR_ID, // 背景颜色ID - NoteColumns.CREATED_DATE, // 创建时间 - NoteColumns.HAS_ATTACHMENT, // 是否有附件（0/1） - NoteColumns.MODIFIED_DATE, // 修改时间 - NoteColumns.NOTES_COUNT, // 子笔记数量（仅文件夹有效） - NoteColumns.PARENT_ID, // 父文件夹ID - NoteColumns.SNIPPET, // 笔记摘要 - NoteColumns.TYPE, // 类型（笔记/文件夹/系统类型等） - NoteColumns.WIDGET_ID, // 小部件ID - NoteColumns.WIDGET_TYPE, // 小部件类型 + static final String [] PROJECTION = 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, }; - // 投影列索引常量（提高代码可读性） - private static final int ID_COLUMN = 0; - private static final int ALERTED_DATE_COLUMN = 1; - private static final int BG_COLOR_ID_COLUMN = 2; - private static final int CREATED_DATE_COLUMN = 3; - private static final int HAS_ATTACHMENT_COLUMN = 4; - private static final int MODIFIED_DATE_COLUMN = 5; - private static final int NOTES_COUNT_COLUMN = 6; - private static final int PARENT_ID_COLUMN = 7; - private static final int SNIPPET_COLUMN = 8; - private static final int TYPE_COLUMN = 9; - private static final int WIDGET_ID_COLUMN = 10; - private static final int WIDGET_TYPE_COLUMN = 11; - - // 数据字段（对应数据库列） - private long mId; // 笔记/文件夹ID - private long mAlertDate; // 提醒时间 - private int mBgColorId; // 背景颜色ID - private long mCreatedDate; // 创建时间 - private boolean mHasAttachment; // 是否有附件 - private long mModifiedDate; // 修改时间 - private int mNotesCount; // 子笔记数量 - private long mParentId; // 父文件夹ID - private String mSnippet; // 笔记摘要（去除勾选标记） - private int mType; // 类型（Notes.TYPE_*常量） - private int mWidgetId; // 小部件ID - private int mWidgetType; // 小部件类型（2x或4x） - private String mName; // 联系人姓名（通话记录笔记专用） - private String mPhoneNumber; // 电话号码（通话记录笔记专用） - - // 位置相关标志位（用于界面显示逻辑） - private boolean mIsLastItem; // 是否是列表中的最后一项 - private boolean mIsFirstItem; // 是否是列表中的第一项 - private boolean mIsOnlyOneItem; // 是否是列表中唯一一项 - private boolean mIsOneNoteFollowingFolder;// 是否是文件夹后的单个笔记 - private boolean mIsMultiNotesFollowingFolder;// 是否是文件夹后的多个笔记 - - /** - * 构造函数：从数据库Cursor中解析数据 - * @param context 上下文 - * @param cursor 包含笔记数据的Cursor - */ + private static final int ID_COLUMN = 0; + private static final int ALERTED_DATE_COLUMN = 1; + private static final int BG_COLOR_ID_COLUMN = 2; + private static final int CREATED_DATE_COLUMN = 3; + private static final int HAS_ATTACHMENT_COLUMN = 4; + private static final int MODIFIED_DATE_COLUMN = 5; + private static final int NOTES_COUNT_COLUMN = 6; + private static final int PARENT_ID_COLUMN = 7; + private static final int SNIPPET_COLUMN = 8; + private static final int TYPE_COLUMN = 9; + private static final int WIDGET_ID_COLUMN = 10; + private static final int WIDGET_TYPE_COLUMN = 11; + + private long mId; + private long mAlertDate; + private int mBgColorId; + private long mCreatedDate; + private boolean mHasAttachment; + private long mModifiedDate; + private int mNotesCount; + private long mParentId; + private String mSnippet; + private int mType; + private int mWidgetId; + private int mWidgetType; + private String mName; + private String mPhoneNumber; + + private boolean mIsLastItem; + private boolean mIsFirstItem; + private boolean mIsOnlyOneItem; + private boolean mIsOneNoteFollowingFolder; + private boolean mIsMultiNotesFollowingFolder; + public NoteItemData(Context context, Cursor cursor) { - // 从Cursor中读取各列数据并初始化字段 mId = cursor.getLong(ID_COLUMN); mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN); mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN); @@ -100,7 +86,6 @@ public class NoteItemData { mNotesCount = cursor.getInt(NOTES_COUNT_COLUMN); mParentId = cursor.getLong(PARENT_ID_COLUMN); mSnippet = cursor.getString(SNIPPET_COLUMN); - // 去除摘要中的勾选标记（适配列表模式） mSnippet = mSnippet.replace(NoteEditActivity.TAG_CHECKED, "").replace( NoteEditActivity.TAG_UNCHECKED, ""); mType = cursor.getInt(TYPE_COLUMN); @@ -108,13 +93,12 @@ public class NoteItemData { mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN); mPhoneNumber = ""; - // 处理通话记录笔记：获取电话号码和联系人姓名 if (mParentId == Notes.ID_CALL_RECORD_FOLDER) { mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId); if (!TextUtils.isEmpty(mPhoneNumber)) { - mName = Contact.getContact(context, mPhoneNumber); // 从联系人获取姓名 + mName = Contact.getContact(context, mPhoneNumber); if (mName == null) { - mName = mPhoneNumber; // 无姓名时使用电话号码 + mName = mPhoneNumber; } } } @@ -122,35 +106,27 @@ public class NoteItemData { if (mName == null) { mName = ""; } - checkPostion(cursor); // 检查当前项在列表中的位置状态 + checkPostion(cursor); } - /** - * 检查当前项在Cursor中的位置状态（是否是第一个/最后一个/唯一项等） - * @param cursor 数据Cursor - */ private void checkPostion(Cursor cursor) { mIsLastItem = cursor.isLast() ? true : false; mIsFirstItem = cursor.isFirst() ? true : false; - mIsOnlyOneItem = (cursor.getCount() == 1); // 是否仅有一条数据 + mIsOnlyOneItem = (cursor.getCount() == 1); mIsMultiNotesFollowingFolder = false; mIsOneNoteFollowingFolder = false; - // 处理笔记类型且非首项的情况：判断是否跟随在文件夹之后 if (mType == Notes.TYPE_NOTE && !mIsFirstItem) { int position = cursor.getPosition(); - if (cursor.moveToPrevious()) { // 移动到前一项 - // 前一项是文件夹或系统类型 + if (cursor.moveToPrevious()) { if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) { - // 判断后续是否有多个笔记 if (cursor.getCount() > (position + 1)) { mIsMultiNotesFollowingFolder = true; } else { mIsOneNoteFollowingFolder = true; } } - // 恢复Cursor位置 if (!cursor.moveToNext()) { throw new IllegalStateException("cursor move to previous but can't move back"); } @@ -158,99 +134,91 @@ public class NoteItemData { } } - // 以下为各数据字段的访问方法（getter）和状态判断方法 - public boolean isOneFollowingFolder() { - return mIsOneNoteFollowingFolder; // 是否是文件夹后的单个笔记 + return mIsOneNoteFollowingFolder; } public boolean isMultiFollowingFolder() { - return mIsMultiNotesFollowingFolder; // 是否是文件夹后的多个笔记 + return mIsMultiNotesFollowingFolder; } public boolean isLast() { - return mIsLastItem; // 是否是列表最后一项 + return mIsLastItem; } public String getCallName() { - return mName; // 获取通话记录的联系人姓名 + return mName; } public boolean isFirst() { - return mIsFirstItem; // 是否是列表首项 + return mIsFirstItem; } public boolean isSingle() { - return mIsOnlyOneItem; // 是否是列表唯一项 + return mIsOnlyOneItem; } public long getId() { - return mId; // 获取ID + return mId; } public long getAlertDate() { - return mAlertDate; // 获取提醒时间 + return mAlertDate; } public long getCreatedDate() { - return mCreatedDate; // 获取创建时间 + return mCreatedDate; } public boolean hasAttachment() { - return mHasAttachment; // 是否有附件 + return mHasAttachment; } public long getModifiedDate() { - return mModifiedDate; // 获取修改时间 + return mModifiedDate; } public int getBgColorId() { - return mBgColorId; // 获取背景颜色ID + return mBgColorId; } public long getParentId() { - return mParentId; // 获取父文件夹ID + return mParentId; } public int getNotesCount() { - return mNotesCount; // 获取子笔记数量（文件夹专用） + return mNotesCount; } - public long getFolderId() { - return mParentId; // 获取文件夹ID（与父ID一致） + public long getFolderId () { + return mParentId; } public int getType() { - return mType; // 获取类型（笔记/文件夹等） + return mType; } public int getWidgetType() { - return mWidgetType; // 获取小部件类型 + return mWidgetType; } public int getWidgetId() { - return mWidgetId; // 获取小部件ID + return mWidgetId; } public String getSnippet() { - return mSnippet; // 获取笔记摘要 + return mSnippet; } public boolean hasAlert() { - return (mAlertDate > 0); // 是否设置了提醒 + return (mAlertDate > 0); } public boolean isCallRecord() { - // 是否是通话记录笔记（父文件夹为通话记录文件夹且有电话号码） return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber)); } - /** - * 静态方法：从Cursor中获取类型字段值 - * @param cursor 数据Cursor - * @return 类型值（Notes.TYPE_*常量） - */ public static int getNoteType(Cursor cursor) { return cursor.getInt(TYPE_COLUMN); } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java index 69f861c..e843aec 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java @@ -1,15 +1,17 @@ /* * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) * - * 遵循 Apache 许可证 2.0 版（"许可证"）； - * 除非遵守许可证，否则不得使用本文件。 - * 您可以在以下网址获取许可证副本： + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - * 除非适用法律要求或书面同意，根据许可证分发的软件 - * 按"原样"分发，不附带任何明示或暗示的保证或条件。 - * 请参阅许可证，了解管理权限和限制的具体语言。 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package net.micode.notes.ui; @@ -76,91 +78,93 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.HashSet; -/** - * 笔记列表活动类，负责展示笔记和文件夹列表，处理用户交互（如新建、删除、移动笔记等） - * 实现了列表项点击、长按等事件处理接口 - */ public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { - private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; // 文件夹笔记列表查询标记 - private static final int FOLDER_LIST_QUERY_TOKEN = 1; // 文件夹列表查询标记 - private static final int MENU_FOLDER_DELETE = 0; // 文件夹删除菜单项ID - private static final int MENU_FOLDER_VIEW = 1; // 文件夹查看菜单项ID - private static final int MENU_FOLDER_CHANGE_NAME = 2; // 文件夹重命名菜单项ID - private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; // 首次使用引导标记的SharedPreferences键 - - /** - * 列表编辑状态枚举： - * NOTE_LIST - 根笔记列表状态 - * SUB_FOLDER - 子文件夹状态 - * CALL_RECORD_FOLDER - 通话记录文件夹状态 - */ + private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; + + private static final int FOLDER_LIST_QUERY_TOKEN = 1; + + private static final int MENU_FOLDER_DELETE = 0; + + private static final int MENU_FOLDER_VIEW = 1; + + private static final int MENU_FOLDER_CHANGE_NAME = 2; + + private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; + private enum ListEditState { NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER }; - private ListEditState mState; // 当前列表编辑状态 - private BackgroundQueryHandler mBackgroundQueryHandler; // 后台查询处理器，用于异步数据库查询 - private NotesListAdapter mNotesListAdapter; // 笔记列表适配器 - private ListView mNotesListView; // 笔记列表视图 - private Button mAddNewNote; // 新建笔记按钮 - private boolean mDispatch; // 触摸事件分发标记 - private int mOriginY; // 触摸事件原始Y坐标 - private int mDispatchY; // 分发事件的Y坐标 - private TextView mTitleBar; // 标题栏文本视图 - private long mCurrentFolderId; // 当前文件夹ID，默认根文件夹 - private ContentResolver mContentResolver; // 内容解析器，用于操作数据提供者 - private ModeCallback mModeCallBack; // 多选模式回调处理器 - private static final String TAG = "NotesListActivity"; // 日志标签 - public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; // 列表滚动速率 - private NoteItemData mFocusNoteDataItem; // 当前聚焦的笔记/文件夹数据项 - - // 查询条件常量 - private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?"; // 普通查询：子项属于某个父文件夹 + private ListEditState mState; + + private BackgroundQueryHandler mBackgroundQueryHandler; + + private NotesListAdapter mNotesListAdapter; + + private ListView mNotesListView; + + private Button mAddNewNote; + + private boolean mDispatch; + + private int mOriginY; + + private int mDispatchY; + + private TextView mTitleBar; + + private long mCurrentFolderId; + + private ContentResolver mContentResolver; + + private ModeCallback mModeCallBack; + + private static final String TAG = "NotesListActivity"; + + public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; + + private NoteItemData mFocusNoteDataItem; + + private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?"; + private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>" + Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + "=?)" + " OR (" + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND " - + NoteColumns.NOTES_COUNT + ">0)"; // 根文件夹查询：排除系统类型或包含有内容的通话记录文件夹 + + NoteColumns.NOTES_COUNT + ">0)"; - private final static int REQUEST_CODE_OPEN_NODE = 102; // 打开节点（笔记/文件夹）请求码 - private final static int REQUEST_CODE_NEW_NODE = 103; // 新建节点请求码 + private final static int REQUEST_CODE_OPEN_NODE = 102; + private final static int REQUEST_CODE_NEW_NODE = 103; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.note_list); // 加载笔记列表布局 - initResources(); // 初始化资源和视图组件 + setContentView(R.layout.note_list); + initResources(); /** - * 首次使用应用时插入引导笔记 + * Insert an introduction when user firstly use this application */ - setAppInfoFromRawRes(); // 从原始资源读取引导内容并保存为笔记 + setAppInfoFromRawRes(); } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - // 处理子活动返回结果，刷新列表数据 if (resultCode == RESULT_OK && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) { - mNotesListAdapter.changeCursor(null); // 刷新适配器数据 + mNotesListAdapter.changeCursor(null); } else { super.onActivityResult(requestCode, resultCode, data); } } - /** - * 从原始资源文件读取引导内容并保存为笔记 - */ private void setAppInfoFromRawRes() { SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); - // 检查是否已显示过引导 if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { StringBuilder sb = new StringBuilder(); InputStream in = null; try { - // 打开引导内容资源文件 - in = getResources().openRawResource(R.raw.introduction); + in = getResources().openRawResource(R.raw.introduction); if (in != null) { - // 读取文本内容 InputStreamReader isr = new InputStreamReader(in); BufferedReader br = new BufferedReader(isr); char [] buf = new char[1024]; @@ -176,23 +180,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt e.printStackTrace(); return; } finally { - // 关闭输入流 if(in != null) { try { in.close(); } catch (IOException e) { + // TODO Auto-generated catch block e.printStackTrace(); } } } - // 创建引导笔记并保存 WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER, AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE, ResourceParser.RED); note.setWorkingText(sb.toString()); if (note.saveNote()) { - // 标记已显示引导 sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit(); } else { Log.e(TAG, "Save introduction note error"); @@ -204,154 +206,138 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override protected void onStart() { super.onStart(); - startAsyncNotesListQuery(); // 启动异步查询加载笔记列表数据 + startAsyncNotesListQuery(); } - /** - * 初始化资源和视图组件 - */ private void initResources() { - mContentResolver = this.getContentResolver(); // 获取内容解析器 - mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver()); // 创建后台查询处理器 - mCurrentFolderId = Notes.ID_ROOT_FOLDER; // 默认显示根文件夹 - mNotesListView = (ListView) findViewById(R.id.notes_list); // 获取列表视图 - // 添加列表页脚视图 + mContentResolver = this.getContentResolver(); + mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver()); + mCurrentFolderId = Notes.ID_ROOT_FOLDER; + mNotesListView = (ListView) findViewById(R.id.notes_list); mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null), null, false); - // 设置列表项点击监听器 mNotesListView.setOnItemClickListener(new OnListItemClickListener()); - // 设置列表项长按监听器（当前活动自身处理） mNotesListView.setOnItemLongClickListener(this); - mNotesListAdapter = new NotesListAdapter(this); // 创建列表适配器 - mNotesListView.setAdapter(mNotesListAdapter); // 设置适配器 - mAddNewNote = (Button) findViewById(R.id.btn_new_note); // 获取新建笔记按钮 - mAddNewNote.setOnClickListener(this); // 设置点击监听器 - mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener()); // 设置触摸事件监听器，处理透明区域点击分发 - mDispatch = false; // 初始化事件分发标记 + mNotesListAdapter = new NotesListAdapter(this); + mNotesListView.setAdapter(mNotesListAdapter); + mAddNewNote = (Button) findViewById(R.id.btn_new_note); + mAddNewNote.setOnClickListener(this); + mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener()); + mDispatch = false; mDispatchY = 0; mOriginY = 0; - mTitleBar = (TextView) findViewById(R.id.tv_title_bar); // 获取标题栏视图 - mState = ListEditState.NOTE_LIST; // 初始状态为根笔记列表 - mModeCallBack = new ModeCallback(); // 创建多选模式回调对象 + mTitleBar = (TextView) findViewById(R.id.tv_title_bar); + mState = ListEditState.NOTE_LIST; + mModeCallBack = new ModeCallback(); } - /** - * 多选模式回调处理类，实现ListView.MultiChoiceModeListener和菜单项点击处理 - */ private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener { - private DropdownMenu mDropDownMenu; // 下拉菜单组件 - private ActionMode mActionMode; // 多选模式操作栏 + private DropdownMenu mDropDownMenu; + private ActionMode mActionMode; + private MenuItem mMoveMenu; - /** - * 创建多选模式操作栏时调用，加载菜单布局并设置菜单项点击监听器 - */ public boolean onCreateActionMode(ActionMode mode, Menu menu) { - getMenuInflater().inflate(R.menu.note_list_options, menu); // 加载操作栏菜单布局 - menu.findItem(R.id.delete).setOnMenuItemClickListener(this); // 设置删除菜单项点击监听器 - mMoveMenu = menu.findItem(R.id.move); // 获取移动菜单项 - - // 根据当前文件夹类型和用户文件夹数量判断移动菜单项是否可见 + getMenuInflater().inflate(R.menu.note_list_options, menu); + menu.findItem(R.id.delete).setOnMenuItemClickListener(this); + mMoveMenu = menu.findItem(R.id.move); if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER || DataUtils.getUserFolderCount(mContentResolver) == 0) { mMoveMenu.setVisible(false); } else { mMoveMenu.setVisible(true); - mMoveMenu.setOnMenuItemClickListener(this); // 设置移动菜单项点击监听器 + mMoveMenu.setOnMenuItemClickListener(this); } + mActionMode = mode; + mNotesListAdapter.setChoiceMode(true); + mNotesListView.setLongClickable(false); + mAddNewNote.setVisibility(View.GONE); - mActionMode = mode; // 保存操作栏实例 - mNotesListAdapter.setChoiceMode(true); // 启用列表项多选模式 - mNotesListView.setLongClickable(false); // 禁用长按事件（避免与多选模式冲突） - mAddNewNote.setVisibility(View.GONE); // 隐藏新建笔记按钮 - - // 设置操作栏自定义视图（下拉菜单） View customView = LayoutInflater.from(NotesListActivity.this).inflate( R.layout.note_list_dropdown_menu, null); mode.setCustomView(customView); mDropDownMenu = new DropdownMenu(NotesListActivity.this, (Button) customView.findViewById(R.id.selection_menu), R.menu.note_list_dropdown); - // 设置下拉菜单点击监听器（全选/反选） mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){ public boolean onMenuItemClick(MenuItem item) { - mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected()); // 切换全选状态 - updateMenu(); // 更新菜单显示 + mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected()); + updateMenu(); return true; } + }); return true; } - /** - * 更新菜单显示状态（选中项数量、全选/反选文本） - */ private void updateMenu() { - int selectedCount = mNotesListAdapter.getSelectedCount(); // 获取选中项数量 - // 更新下拉菜单标题 + int selectedCount = mNotesListAdapter.getSelectedCount(); + // Update dropdown menu String format = getResources().getString(R.string.menu_select_title, selectedCount); mDropDownMenu.setTitle(format); - // 更新全选菜单项状态 MenuItem item = mDropDownMenu.findItem(R.id.action_select_all); if (item != null) { if (mNotesListAdapter.isAllSelected()) { item.setChecked(true); - item.setTitle(R.string.menu_deselect_all); // 显示反选文本 + item.setTitle(R.string.menu_deselect_all); } else { item.setChecked(false); - item.setTitle(R.string.menu_select_all); // 显示全选文本 + item.setTitle(R.string.menu_select_all); } } } - // 以下为ListView.MultiChoiceModeListener接口的默认实现（未使用的方法） - public boolean onPrepareActionMode(ActionMode mode, Menu menu) { return false; } - public boolean onActionItemClicked(ActionMode mode, MenuItem item) { return false; } + public boolean onPrepareActionMode(ActionMode mode, Menu menu) { + // TODO Auto-generated method stub + return false; + } + + public boolean onActionItemClicked(ActionMode mode, MenuItem item) { + // TODO Auto-generated method stub + return false; + } + public void onDestroyActionMode(ActionMode mode) { - // 销毁操作栏时恢复列表状态 - mNotesListAdapter.setChoiceMode(false); // 禁用多选模式 - mNotesListView.setLongClickable(true); // 重新启用长按事件 - mAddNewNote.setVisibility(View.VISIBLE); // 显示新建笔记按钮 + mNotesListAdapter.setChoiceMode(false); + mNotesListView.setLongClickable(true); + mAddNewNote.setVisibility(View.VISIBLE); } - public void finishActionMode() { mActionMode.finish(); } // 结束操作栏 - /** - * 列表项选中状态变化时调用，更新选中状态和菜单显示 - */ - public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) { - mNotesListAdapter.setCheckedItem(position, checked); // 更新适配器中的选中状态 - updateMenu(); // 更新菜单显示 + public void finishActionMode() { + mActionMode.finish(); + } + + public void onItemCheckedStateChanged(ActionMode mode, int position, long id, + boolean checked) { + mNotesListAdapter.setCheckedItem(position, checked); + updateMenu(); } - /** - * 处理操作栏菜单项点击事件（删除、移动） - */ public boolean onMenuItemClick(MenuItem item) { if (mNotesListAdapter.getSelectedCount() == 0) { - // 无选中项时提示用户 Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none), Toast.LENGTH_SHORT).show(); return true; } switch (item.getItemId()) { - case R.id.delete: // 删除菜单项 - // 显示删除确认对话框 + case R.id.delete: AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); builder.setTitle(getString(R.string.alert_title_delete)); builder.setIcon(android.R.drawable.ic_dialog_alert); builder.setMessage(getString(R.string.alert_message_delete_notes, - mNotesListAdapter.getSelectedCount())); // 显示删除数量提示 + mNotesListAdapter.getSelectedCount())); builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - batchDelete(); // 执行批量删除操作 - } - }); + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + batchDelete(); + } + }); builder.setNegativeButton(android.R.string.cancel, null); builder.show(); break; - case R.id.move: // 移动菜单项 - startQueryDestinationFolders(); // 启动目标文件夹查询 + case R.id.move: + startQueryDestinationFolders(); break; default: return false; @@ -360,36 +346,37 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - /** - * 新建笔记按钮触摸事件监听器，处理透明区域的事件分发 - */ private class NewNoteOnTouchListener implements OnTouchListener { public boolean onTouch(View v, MotionEvent event) { switch (event.getAction()) { - case MotionEvent.ACTION_DOWN: { // 按下事件 + case MotionEvent.ACTION_DOWN: { Display display = getWindowManager().getDefaultDisplay(); int screenHeight = display.getHeight(); int newNoteViewHeight = mAddNewNote.getHeight(); - int start = screenHeight - newNoteViewHeight; // 按钮底部Y坐标 - int eventY = start + (int) event.getY(); // 事件在屏幕中的Y坐标 - - // 根据当前状态调整坐标（子文件夹状态需减去标题栏高度） + int start = screenHeight - newNoteViewHeight; + int eventY = start + (int) event.getY(); + /** + * Minus TitleBar's height + */ if (mState == ListEditState.SUB_FOLDER) { eventY -= mTitleBar.getHeight(); start -= mTitleBar.getHeight(); } - /** - * 处理按钮透明区域的点击事件分发： - * 透明区域由公式 y = -0.12x + 94（基于按钮左顶点的坐标系统）和按钮顶部边界定义 - * 当点击位置在透明区域内时，将事件分发到列表视图以触发滚动或点击操作 + * HACKME:When click the transparent part of "New Note" button, dispatch + * the event to the list view behind this button. The transparent part of + * "New Note" button could be expressed by formula y=-0.12x+94（Unit:pixel） + * and the line top of the button. The coordinate based on left of the "New + * Note" button. The 94 represents maximum height of the transparent part. + * Notice that, if the background of the button changes, the formula should + * also change. This is very bad, just for the UI designer's strong requirement. */ if (event.getY() < (event.getX() * (-0.12) + 94)) { View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1 - - mNotesListView.getFooterViewsCount()); // 获取最后一个可见列表项 - if (view != null && view.getBottom() > start && (view.getTop() < (start + 94))) { - // 保存原始坐标并调整事件坐标，触发列表视图的事件分发 + - mNotesListView.getFooterViewsCount()); + if (view != null && view.getBottom() > start + && (view.getTop() < (start + 94))) { mOriginY = (int) event.getY(); mDispatchY = eventY; event.setLocation(event.getX(), mDispatchY); @@ -399,15 +386,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } break; } - case MotionEvent.ACTION_MOVE: { // 移动事件，继续分发 + case MotionEvent.ACTION_MOVE: { if (mDispatch) { - mDispatchY += (int) event.getY() - mOriginY; // 更新分发坐标 + mDispatchY += (int) event.getY() - mOriginY; event.setLocation(event.getX(), mDispatchY); return mNotesListView.dispatchTouchEvent(event); } break; } - default: { // 其他事件（抬起、取消等），结束分发 + default: { if (mDispatch) { event.setLocation(event.getX(), mDispatchY); mDispatch = false; @@ -421,23 +408,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt }; - /** - * 启动异步查询加载笔记列表数据 - */ private void startAsyncNotesListQuery() { - // 根据当前文件夹ID构建查询条件 String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION : NORMAL_SELECTION; - // 执行异步查询（背景线程处理数据库操作） mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { - String.valueOf(mCurrentFolderId) - }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); // 按类型降序、修改时间降序排序 + String.valueOf(mCurrentFolderId) + }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } - /** - * 后台查询处理器，处理查询结果回调 - */ private final class BackgroundQueryHandler extends AsyncQueryHandler { public BackgroundQueryHandler(ContentResolver contentResolver) { super(contentResolver); @@ -446,12 +425,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override protected void onQueryComplete(int token, Object cookie, Cursor cursor) { switch (token) { - case FOLDER_NOTE_LIST_QUERY_TOKEN: // 笔记列表查询结果 - mNotesListAdapter.changeCursor(cursor); // 更新适配器数据 + case FOLDER_NOTE_LIST_QUERY_TOKEN: + mNotesListAdapter.changeCursor(cursor); break; - case FOLDER_LIST_QUERY_TOKEN: // 文件夹列表查询结果 + case FOLDER_LIST_QUERY_TOKEN: if (cursor != null && cursor.getCount() > 0) { - showFolderListMenu(cursor); // 显示目标文件夹选择菜单 + showFolderListMenu(cursor); } else { Log.e(TAG, "Query folder failed"); } @@ -462,62 +441,48 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - /** - * 显示目标文件夹选择菜单，用于移动笔记操作 - */ private void showFolderListMenu(Cursor cursor) { AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(R.string.menu_title_select_folder); // 设置对话框标题 - final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor); // 创建文件夹列表适配器 - // 设置列表项点击监听器（执行移动操作） + builder.setTitle(R.string.menu_title_select_folder); + final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor); builder.setAdapter(adapter, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { - // 批量移动选中笔记到目标文件夹 DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which)); - // 显示成功提示 Toast.makeText( NotesListActivity.this, getString(R.string.format_move_notes_to_folder, mNotesListAdapter.getSelectedCount(), adapter.getFolderName(NotesListActivity.this, which)), Toast.LENGTH_SHORT).show(); - mModeCallBack.finishActionMode(); // 结束多选模式 + mModeCallBack.finishActionMode(); } }); - builder.show(); // 显示对话框 + builder.show(); } - /** - * 创建新笔记，启动笔记编辑活动 - */ private void createNewNote() { Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_INSERT_OR_EDIT); // 操作类型：插入或编辑 - intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId); // 传递当前文件夹ID - this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE); // 启动活动并等待结果 + intent.setAction(Intent.ACTION_INSERT_OR_EDIT); + intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId); + this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE); } - /** - * 批量删除选中的笔记或文件夹（异步任务处理） - */ private void batchDelete() { new AsyncTask>() { - /** - * 后台执行删除操作，返回关联的桌面小部件信息 - */ protected HashSet doInBackground(Void... unused) { - HashSet widgets = mNotesListAdapter.getSelectedWidget(); // 获取选中项关联的小部件 - + HashSet widgets = mNotesListAdapter.getSelectedWidget(); if (!isSyncMode()) { - // 非同步模式：直接删除 + // if not synced, delete notes directly if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter .getSelectedItemIds())) { } else { Log.e(TAG, "Delete notes error, should not happens"); } } else { - // 同步模式：移动到回收站文件夹 + // in sync mode, we'll move the deleted note into the trash + // folder if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) { Log.e(TAG, "Move notes to trash folder error, should not happens"); @@ -526,51 +491,39 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return widgets; } - /** - * 处理删除后的操作（更新小部件） - */ @Override protected void onPostExecute(HashSet widgets) { if (widgets != null) { - // 遍历更新所有关联的桌面小部件 for (AppWidgetAttribute widget : widgets) { if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) { - updateWidget(widget.widgetId, widget.widgetType); // 更新小部件显示 + updateWidget(widget.widgetId, widget.widgetType); } } } - mModeCallBack.finishActionMode(); // 结束多选模式 + mModeCallBack.finishActionMode(); } }.execute(); } - /** - * 删除指定文件夹（包括其下所有内容） - */ private void deleteFolder(long folderId) { if (folderId == Notes.ID_ROOT_FOLDER) { - // 不能删除根文件夹 Log.e(TAG, "Wrong folder id, should not happen " + folderId); return; } HashSet ids = new HashSet(); - ids.add(folderId); // 添加要删除的文件夹ID - // 获取文件夹内笔记关联的小部件 + ids.add(folderId); HashSet widgets = DataUtils.getFolderNoteWidget(mContentResolver, folderId); - if (!isSyncMode()) { - // 非同步模式：直接删除 + // if not synced, delete folder directly DataUtils.batchDeleteNotes(mContentResolver, ids); } else { - // 同步模式：移动到回收站 + // in sync mode, we'll move the deleted folder into the trash folder DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER); } - if (widgets != null) { - // 更新关联的小部件 for (AppWidgetAttribute widget : widgets) { if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) { @@ -580,175 +533,154 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - /** - * 打开笔记节点（查看或编辑笔记） - */ private void openNode(NoteItemData data) { Intent intent = new Intent(this, NoteEditActivity.class); - intent.setAction(Intent.ACTION_VIEW); // 操作类型：查看 - intent.putExtra(Intent.EXTRA_UID, data.getId()); // 传递笔记ID - this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); // 启动活动并等待结果 + intent.setAction(Intent.ACTION_VIEW); + intent.putExtra(Intent.EXTRA_UID, data.getId()); + this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE); } - /** - * 打开文件夹，切换到子文件夹视图 - */ private void openFolder(NoteItemData data) { - mCurrentFolderId = data.getId(); // 更新当前文件夹ID - startAsyncNotesListQuery(); // 加载子文件夹内容 - + mCurrentFolderId = data.getId(); + startAsyncNotesListQuery(); if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { - mState = ListEditState.CALL_RECORD_FOLDER; // 设置为通话记录文件夹状态 - mAddNewNote.setVisibility(View.GONE); // 隐藏新建笔记按钮 + mState = ListEditState.CALL_RECORD_FOLDER; + mAddNewNote.setVisibility(View.GONE); } else { - mState = ListEditState.SUB_FOLDER; // 设置为子文件夹状态 + mState = ListEditState.SUB_FOLDER; } - - // 更新标题栏显示 if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { - mTitleBar.setText(R.string.call_record_folder_name); // 通话记录文件夹标题 + mTitleBar.setText(R.string.call_record_folder_name); } else { - mTitleBar.setText(data.getSnippet()); // 显示文件夹名称 + mTitleBar.setText(data.getSnippet()); } - mTitleBar.setVisibility(View.VISIBLE); // 显示标题栏 + mTitleBar.setVisibility(View.VISIBLE); } - /** - * 视图点击事件处理（主要处理新建笔记按钮点击） - */ public void onClick(View v) { switch (v.getId()) { - case R.id.btn_new_note: // 新建笔记按钮 - createNewNote(); // 调用新建笔记方法 + case R.id.btn_new_note: + createNewNote(); break; default: break; } } - /** - * 显示软键盘 - */ private void showSoftInput() { InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); if (inputMethodManager != null) { - inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0); // 强制显示软键盘 + inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0); } } - /** - * 隐藏软键盘 - */ private void hideSoftInput(View view) { InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); - inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); // 隐藏指定视图的软键盘 + inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0); } - /** - * 显示创建或修改文件夹对话框 - * @param create 是否为创建模式（true=创建新文件夹，false=修改现有文件夹） - */ private void showCreateOrModifyFolderDialog(final boolean create) { final AlertDialog.Builder builder = new AlertDialog.Builder(this); - View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null); // 加载输入对话框布局 - final EditText etName = (EditText) view.findViewById(R.id.et_foler_name); // 获取名称输入框 - showSoftInput(); // 显示软键盘 - + View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null); + final EditText etName = (EditText) view.findViewById(R.id.et_foler_name); + showSoftInput(); if (!create) { - // 修改模式：填充现有文件夹名称 if (mFocusNoteDataItem != null) { etName.setText(mFocusNoteDataItem.getSnippet()); - builder.setTitle(getString(R.string.menu_folder_change_name)); // 设置标题为"重命名" + builder.setTitle(getString(R.string.menu_folder_change_name)); } else { Log.e(TAG, "The long click data item is null"); return; } } else { - // 创建模式：清空输入框 etName.setText(""); - builder.setTitle(this.getString(R.string.menu_create_folder)); // 设置标题为"新建文件夹" + builder.setTitle(this.getString(R.string.menu_create_folder)); } - builder.setPositiveButton(android.R.string.ok, null); // 初始时不设置点击监听器，防止空值提交 + builder.setPositiveButton(android.R.string.ok, null); builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - hideSoftInput(etName); // 隐藏软键盘 + hideSoftInput(etName); } }); - final Dialog dialog = builder.setView(view).show(); // 显示对话框 - final Button positive = (Button)dialog.findViewById(android.R.id.button1); // 获取确定按钮 - - // 确定按钮点击监听器（处理名称验证和保存） + final Dialog dialog = builder.setView(view).show(); + final Button positive = (Button)dialog.findViewById(android.R.id.button1); positive.setOnClickListener(new OnClickListener() { public void onClick(View v) { - hideSoftInput(etName); // 隐藏软键盘 - String name = etName.getText().toString(); // 获取输入的名称 - - // 检查文件夹名称是否已存在 + hideSoftInput(etName); + String name = etName.getText().toString(); if (DataUtils.checkVisibleFolderName(mContentResolver, name)) { Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name), Toast.LENGTH_LONG).show(); - etName.setSelection(0, etName.length()); // 选中全部文本以便修改 + etName.setSelection(0, etName.length()); return; } - if (!create) { - // 修改模式：更新文件夹名称 if (!TextUtils.isEmpty(name)) { ContentValues values = new ContentValues(); - values.put(NoteColumns.SNIPPET, name); // 设置新名称 - values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); // 类型为文件夹 - values.put(NoteColumns.LOCAL_MODIFIED, 1); // 标记本地修改 + values.put(NoteColumns.SNIPPET, name); + values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); + values.put(NoteColumns.LOCAL_MODIFIED, 1); mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID + "=?", new String[] { - String.valueOf(mFocusNoteDataItem.getId()) + String.valueOf(mFocusNoteDataItem.getId()) }); } } else if (!TextUtils.isEmpty(name)) { - // 创建模式：插入新文件夹 ContentValues values = new ContentValues(); values.put(NoteColumns.SNIPPET, name); values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); - mContentResolver.insert(Notes.CONTENT_NOTE_URI, values); // 插入到内容提供者 + mContentResolver.insert(Notes.CONTENT_NOTE_URI, values); } - dialog.dismiss(); // 关闭对话框 + dialog.dismiss(); } }); - // 输入框内容变化监听器（控制确定按钮是否可用） if (TextUtils.isEmpty(etName.getText())) { positive.setEnabled(false); } + /** + * When the name edit text is null, disable the positive button + */ etName.addTextChangedListener(new TextWatcher() { - public void beforeTextChanged(CharSequence s, int start, int count, int after) {} + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + // TODO Auto-generated method stub + + } public void onTextChanged(CharSequence s, int start, int before, int count) { - positive.setEnabled(!TextUtils.isEmpty(etName.getText())); // 非空时启用按钮 + if (TextUtils.isEmpty(etName.getText())) { + positive.setEnabled(false); + } else { + positive.setEnabled(true); + } } - public void afterTextChanged(Editable s) {} + public void afterTextChanged(Editable s) { + // TODO Auto-generated method stub + + } }); } @Override public void onBackPressed() { - // 处理返回键逻辑，根据当前状态切换视图 switch (mState) { - case SUB_FOLDER: // 子文件夹状态：返回根目录 + case SUB_FOLDER: mCurrentFolderId = Notes.ID_ROOT_FOLDER; mState = ListEditState.NOTE_LIST; - startAsyncNotesListQuery(); // 重新加载根目录内容 - mTitleBar.setVisibility(View.GONE); // 隐藏标题栏 + startAsyncNotesListQuery(); + mTitleBar.setVisibility(View.GONE); break; - case CALL_RECORD_FOLDER: // 通话记录文件夹状态：返回根目录 + case CALL_RECORD_FOLDER: mCurrentFolderId = Notes.ID_ROOT_FOLDER; mState = ListEditState.NOTE_LIST; - mAddNewNote.setVisibility(View.VISIBLE); // 显示新建按钮 + mAddNewNote.setVisibility(View.VISIBLE); mTitleBar.setVisibility(View.GONE); startAsyncNotesListQuery(); break; - case NOTE_LIST: // 根目录状态：调用系统返回逻辑 + case NOTE_LIST: super.onBackPressed(); break; default: @@ -756,15 +688,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } - /** - * 更新桌面小部件显示 - * @param appWidgetId 小部件ID - * @param appWidgetType 小部件类型（2x或4x） - */ private void updateWidget(int appWidgetId, int appWidgetType) { - Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); // 小部件更新意图 - - // 根据类型设置目标组件 + Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); if (appWidgetType == Notes.TYPE_WIDGET_2X) { intent.setClass(this, NoteWidgetProvider_2x.class); } else if (appWidgetType == Notes.TYPE_WIDGET_4X) { @@ -774,20 +699,18 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return; } - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { appWidgetId }); // 传递小部件ID - sendBroadcast(intent); // 发送广播更新小部件 - setResult(RESULT_OK, intent); // 设置活动结果 + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { + appWidgetId + }); + + sendBroadcast(intent); + setResult(RESULT_OK, intent); } - /** - * 文件夹长按上下文菜单创建监听器 - */ private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() { public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { if (mFocusNoteDataItem != null) { - // 设置菜单标题为文件夹名称 menu.setHeaderTitle(mFocusNoteDataItem.getSnippet()); - // 添加查看、删除、重命名菜单项 menu.add(0, MENU_FOLDER_VIEW, 0, R.string.menu_folder_view); menu.add(0, MENU_FOLDER_DELETE, 0, R.string.menu_folder_delete); menu.add(0, MENU_FOLDER_CHANGE_NAME, 0, R.string.menu_folder_change_name); @@ -798,7 +721,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override public void onContextMenuClosed(Menu menu) { if (mNotesListView != null) { - mNotesListView.setOnCreateContextMenuListener(null); // 清除上下文菜单监听器 + mNotesListView.setOnCreateContextMenuListener(null); } super.onContextMenuClosed(menu); } @@ -809,48 +732,46 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt Log.e(TAG, "The long click data item is null"); return false; } - // 处理上下文菜单项点击事件（查看、删除、重命名文件夹） switch (item.getItemId()) { - case MENU_FOLDER_VIEW: // 查看文件夹 + case MENU_FOLDER_VIEW: openFolder(mFocusNoteDataItem); break; - case MENU_FOLDER_DELETE: // 删除文件夹 - // 显示删除确认对话框 + case MENU_FOLDER_DELETE: AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(getString(R.string.alert_title_delete)); builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_folder)); // 删除文件夹提示 + builder.setMessage(getString(R.string.alert_message_delete_folder)); builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - deleteFolder(mFocusNoteDataItem.getId()); // 执行删除操作 + deleteFolder(mFocusNoteDataItem.getId()); } }); builder.setNegativeButton(android.R.string.cancel, null); builder.show(); break; - case MENU_FOLDER_CHANGE_NAME: // 重命名文件夹 - showCreateOrModifyFolderDialog(false); // 显示修改对话框 + case MENU_FOLDER_CHANGE_NAME: + showCreateOrModifyFolderDialog(false); break; default: break; } + return true; } @Override public boolean onPrepareOptionsMenu(Menu menu) { - menu.clear(); // 清空菜单 - // 根据当前状态加载不同的菜单布局 + menu.clear(); if (mState == ListEditState.NOTE_LIST) { - getMenuInflater().inflate(R.menu.note_list, menu); // 根目录菜单 - // 更新同步菜单项文本（显示"同步"或"取消同步"） + getMenuInflater().inflate(R.menu.note_list, menu); + // set sync or sync_cancel menu.findItem(R.id.menu_sync).setTitle( GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync); } else if (mState == ListEditState.SUB_FOLDER) { - getMenuInflater().inflate(R.menu.sub_folder, menu); // 子文件夹菜单 + getMenuInflater().inflate(R.menu.sub_folder, menu); } else if (mState == ListEditState.CALL_RECORD_FOLDER) { - getMenuInflater().inflate(R.menu.call_record_folder, menu); // 通话记录文件夹菜单 + getMenuInflater().inflate(R.menu.call_record_folder, menu); } else { Log.e(TAG, "Wrong state:" + mState); } @@ -859,38 +780,36 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override public boolean onOptionsItemSelected(MenuItem item) { - // 处理选项菜单点击事件 switch (item.getItemId()) { - case R.id.menu_new_folder: { // 新建文件夹 - showCreateOrModifyFolderDialog(true); // 显示创建对话框 + case R.id.menu_new_folder: { + showCreateOrModifyFolderDialog(true); break; } - case R.id.menu_export_text: { // 导出笔记为文本 - exportNoteToText(); // 执行导出操作 + case R.id.menu_export_text: { + exportNoteToText(); break; } - case R.id.menu_sync: { // 同步操作 + case R.id.menu_sync: { if (isSyncMode()) { - // 根据当前同步状态切换操作（开始/取消同步） if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { GTaskSyncService.startSync(this); } else { GTaskSyncService.cancelSync(this); } } else { - startPreferenceActivity(); // 启动设置活动配置同步账户 + startPreferenceActivity(); } break; } - case R.id.menu_setting: { // 打开设置 + case R.id.menu_setting: { startPreferenceActivity(); break; } - case R.id.menu_new_note: { // 新建笔记（选项菜单中的入口） + case R.id.menu_new_note: { createNewNote(); break; } - case R.id.menu_search: // 搜索笔记 + case R.id.menu_search: onSearchRequested(); break; default: @@ -901,99 +820,91 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override public boolean onSearchRequested() { - startSearch(null, false, null /* appData */, false); // 启动系统搜索功能 + startSearch(null, false, null /* appData */, false); return true; } - /** - * 导出笔记为文本文件（异步任务处理） - */ private void exportNoteToText() { - final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this); // 获取备份工具实例 + final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this); new AsyncTask() { @Override protected Integer doInBackground(Void... unused) { - return backup.exportToText(); // 执行导出操作并返回状态码 + return backup.exportToText(); } @Override protected void onPostExecute(Integer result) { - // 根据导出结果显示相应提示对话框 if (result == BackupUtils.STATE_SD_CARD_UNMOUONTED) { - showExportResultDialog(R.string.failed_sdcard_export, R.string.error_sdcard_unmounted); + AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); + builder.setTitle(NotesListActivity.this + .getString(R.string.failed_sdcard_export)); + builder.setMessage(NotesListActivity.this + .getString(R.string.error_sdcard_unmounted)); + builder.setPositiveButton(android.R.string.ok, null); + builder.show(); } else if (result == BackupUtils.STATE_SUCCESS) { - showExportResultDialog(R.string.success_sdcard_export, - getString(R.string.format_exported_file_location, backup + AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); + builder.setTitle(NotesListActivity.this + .getString(R.string.success_sdcard_export)); + builder.setMessage(NotesListActivity.this.getString( + R.string.format_exported_file_location, backup .getExportedTextFileName(), backup.getExportedTextFileDir())); + builder.setPositiveButton(android.R.string.ok, null); + builder.show(); } else if (result == BackupUtils.STATE_SYSTEM_ERROR) { - showExportResultDialog(R.string.failed_sdcard_export, R.string.error_sdcard_export); + AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); + builder.setTitle(NotesListActivity.this + .getString(R.string.failed_sdcard_export)); + builder.setMessage(NotesListActivity.this + .getString(R.string.error_sdcard_export)); + builder.setPositiveButton(android.R.string.ok, null); + builder.show(); } } - /** - * 显示导出结果提示对话框的辅助方法 - */ - private void showExportResultDialog(int titleResId, int messageResId) { - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(titleResId); - builder.setMessage(messageResId); - builder.setPositiveButton(android.R.string.ok, null); - builder.show(); - } }.execute(); } - /** - * 判断是否处于同步模式（已配置同步账户） - */ private boolean isSyncMode() { return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; } - /** - * 启动设置活动（偏好设置） - */ private void startPreferenceActivity() { Activity from = getParent() != null ? getParent() : this; Intent intent = new Intent(from, NotesPreferenceActivity.class); - from.startActivityIfNeeded(intent, -1); // 启动活动（如需） + from.startActivityIfNeeded(intent, -1); } - /** - * 列表项点击事件监听器（处理普通点击事件） - */ private class OnListItemClickListener implements OnItemClickListener { public void onItemClick(AdapterView parent, View view, int position, long id) { if (view instanceof NotesListItem) { - NoteItemData item = ((NotesListItem) view).getItemData(); // 获取点击的列表项数据 - + NoteItemData item = ((NotesListItem) view).getItemData(); if (mNotesListAdapter.isInChoiceMode()) { - // 多选模式下处理选中状态切换（仅针对笔记项） if (item.getType() == Notes.TYPE_NOTE) { - position = position - mNotesListView.getHeaderViewsCount(); // 计算适配器中的真实位置 + position = position - mNotesListView.getHeaderViewsCount(); mModeCallBack.onItemCheckedStateChanged(null, position, id, - !mNotesListAdapter.isSelectedItem(position)); // 更新选中状态 + !mNotesListAdapter.isSelectedItem(position)); } return; } - // 根据当前状态处理不同类型的列表项点击 switch (mState) { - case NOTE_LIST: // 根目录状态 - if (item.getType() == Notes.TYPE_FOLDER || item.getType() == Notes.TYPE_SYSTEM) { - openFolder(item); // 打开文件夹 + case NOTE_LIST: + if (item.getType() == Notes.TYPE_FOLDER + || item.getType() == Notes.TYPE_SYSTEM) { + openFolder(item); } else if (item.getType() == Notes.TYPE_NOTE) { - openNode(item); // 打开笔记 + openNode(item); } else { Log.e(TAG, "Wrong note type in NOTE_LIST"); } break; - case SUB_FOLDER: // 子文件夹状态 - case CALL_RECORD_FOLDER: // 通话记录文件夹状态 + case SUB_FOLDER: + case CALL_RECORD_FOLDER: if (item.getType() == Notes.TYPE_NOTE) { - openNode(item); // 打开笔记 + openNode(item); } else { Log.e(TAG, "Wrong note type in SUB_FOLDER"); } @@ -1006,16 +917,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } - /** - * 启动目标文件夹查询（用于移动笔记时选择目标文件夹） - */ private void startQueryDestinationFolders() { - // 构建查询条件：类型为文件夹，非回收站，非当前文件夹（根据当前状态可能包含根目录） String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?"; - selection = (mState == ListEditState.NOTE_LIST) ? selection : - "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")"; + selection = (mState == ListEditState.NOTE_LIST) ? selection: + "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")"; - // 执行异步查询获取目标文件夹列表 mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN, null, Notes.CONTENT_NOTE_URI, @@ -1026,29 +932,23 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt String.valueOf(Notes.ID_TRASH_FOLER), String.valueOf(mCurrentFolderId) }, - NoteColumns.MODIFIED_DATE + " DESC"); // 按修改时间降序排序 + NoteColumns.MODIFIED_DATE + " DESC"); } - /** - * 列表项长按事件处理（启动多选模式或显示上下文菜单） - */ public boolean onItemLongClick(AdapterView parent, View view, int position, long id) { if (view instanceof NotesListItem) { - mFocusNoteDataItem = ((NotesListItem) view).getItemData(); // 获取长按的列表项数据 - + mFocusNoteDataItem = ((NotesListItem) view).getItemData(); if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) { - // 长按笔记项且非多选模式时启动多选操作栏 if (mNotesListView.startActionMode(mModeCallBack) != null) { - mModeCallBack.onItemCheckedStateChanged(null, position, id, true); // 标记为选中 - mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); // 触发长按震动反馈 + mModeCallBack.onItemCheckedStateChanged(null, position, id, true); + mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); } else { Log.e(TAG, "startActionMode fails"); } } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) { - // 长按文件夹时显示上下文菜单 mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener); } } return false; } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java index 45e6147..51c9cb9 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java +++ b/src/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java @@ -31,29 +31,18 @@ import java.util.HashSet; import java.util.Iterator; -/** - * NotesListAdapter是用于展示笔记列表的适配器，继承自CursorAdapter - * 支持多选模式，可对笔记进行选择操作 - */ public class NotesListAdapter extends CursorAdapter { private static final String TAG = "NotesListAdapter"; - private Context mContext; // 上下文环境 - private HashMap mSelectedIndex; // 存储选中项的索引和状态 - private int mNotesCount; // 笔记总数 - private boolean mChoiceMode; // 是否处于选择模式 + private Context mContext; + private HashMap mSelectedIndex; + private int mNotesCount; + private boolean mChoiceMode; - /** - * 应用小部件属性类，用于存储小部件ID和类型 - */ public static class AppWidgetAttribute { - public int widgetId; // 小部件ID - public int widgetType; // 小部件类型 + public int widgetId; + public int widgetType; }; - /** - * 构造函数，初始化适配器 - * @param context 上下文环境 - */ public NotesListAdapter(Context context) { super(context, null); mSelectedIndex = new HashMap(); @@ -61,71 +50,38 @@ public class NotesListAdapter extends CursorAdapter { mNotesCount = 0; } - /** - * 创建新的视图 - * @param context 上下文环境 - * @param cursor 数据集游标 - * @param parent 父视图组 - * @return 返回新的笔记列表项视图 - */ @Override public View newView(Context context, Cursor cursor, ViewGroup parent) { return new NotesListItem(context); } - /** - * 绑定数据到视图 - * @param view 目标视图 - * @param context 上下文环境 - * @param cursor 数据集游标 - */ @Override public void bindView(View view, Context context, Cursor cursor) { if (view instanceof NotesListItem) { - // 创建笔记项数据对象 NoteItemData itemData = new NoteItemData(context, cursor); - // 绑定数据到视图，设置选择模式和选中状态 ((NotesListItem) view).bind(context, itemData, mChoiceMode, isSelectedItem(cursor.getPosition())); } } - /** - * 设置指定位置项的选中状态 - * @param position 位置索引 - * @param checked 选中状态 - */ public void setCheckedItem(final int position, final boolean checked) { mSelectedIndex.put(position, checked); - notifyDataSetChanged(); // 通知数据变化，刷新视图 + notifyDataSetChanged(); } - /** - * 判断是否处于选择模式 - * @return 是/否 - */ public boolean isInChoiceMode() { return mChoiceMode; } - /** - * 设置选择模式 - * @param mode 选择模式 - */ public void setChoiceMode(boolean mode) { - mSelectedIndex.clear(); // 清除已选项目 - mChoiceMode = mode; // 设置选择模式 + mSelectedIndex.clear(); + mChoiceMode = mode; } - /** - * 全选或取消全选操作 - * @param checked 全选/取消全选 - */ public void selectAll(boolean checked) { Cursor cursor = getCursor(); for (int i = 0; i < getCount(); i++) { if (cursor.moveToPosition(i)) { - // 只对笔记类型进行操作，文件夹不处理 if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) { setCheckedItem(i, checked); } @@ -133,10 +89,6 @@ public class NotesListAdapter extends CursorAdapter { } } - /** - * 获取选中项的ID集合 - * @return 选中项ID的集合 - */ public HashSet getSelectedItemIds() { HashSet itemSet = new HashSet(); for (Integer position : mSelectedIndex.keySet()) { @@ -149,13 +101,10 @@ public class NotesListAdapter extends CursorAdapter { } } } + return itemSet; } - /** - * 获取选中的小部件集合 - * @return 选中的小部件属性集合 - */ public HashSet getSelectedWidget() { HashSet itemSet = new HashSet(); for (Integer position : mSelectedIndex.keySet()) { @@ -179,10 +128,6 @@ public class NotesListAdapter extends CursorAdapter { return itemSet; } - /** - * 获取选中项的数量 - * @return 选中项数量 - */ public int getSelectedCount() { Collection values = mSelectedIndex.values(); if (null == values) { @@ -198,20 +143,11 @@ public class NotesListAdapter extends CursorAdapter { return count; } - /** - * 判断是否已全选 - * @return 是/否 - */ public boolean isAllSelected() { int checkedCount = getSelectedCount(); return (checkedCount != 0 && checkedCount == mNotesCount); } - /** - * 判断指定位置的项是否被选中 - * @param position 位置索引 - * @return 是/否 - */ public boolean isSelectedItem(final int position) { if (null == mSelectedIndex.get(position)) { return false; @@ -219,28 +155,18 @@ public class NotesListAdapter extends CursorAdapter { return mSelectedIndex.get(position); } - /** - * 当内容发生变化时调用 - */ @Override protected void onContentChanged() { super.onContentChanged(); - calcNotesCount(); // 重新计算笔记数量 + calcNotesCount(); } - /** - * 更改游标时调用 - * @param cursor 新的游标 - */ @Override public void changeCursor(Cursor cursor) { super.changeCursor(cursor); - calcNotesCount(); // 重新计算笔记数量 + calcNotesCount(); } - /** - * 计算笔记数量，只统计类型为笔记的项 - */ private void calcNotesCount() { mNotesCount = 0; for (int i = 0; i < getCount(); i++) { @@ -255,4 +181,4 @@ public class NotesListAdapter extends CursorAdapter { } } } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java b/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java index 7e40665..1221e80 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java +++ b/src/Notes-master/src/net/micode/notes/ui/NotesListItem.java @@ -30,21 +30,14 @@ import net.micode.notes.tool.DataUtils; import net.micode.notes.tool.ResourceParser.NoteItemBgResources; -/** - * 便签列表项视图，用于在列表中展示便签或文件夹信息 - */ public class NotesListItem extends LinearLayout { - private ImageView mAlert; // 提醒图标，显示闹钟或通话记录图标 - private TextView mTitle; // 标题文本，显示便签内容或文件夹名称 - private TextView mTime; // 时间文本，显示最后修改时间 - private TextView mCallName; // 通话记录名称，用于显示通话联系人 - private NoteItemData mItemData; // 便签数据对象 - private CheckBox mCheckBox; // 复选框，用于多选操作 + private ImageView mAlert; + private TextView mTitle; + private TextView mTime; + private TextView mCallName; + private NoteItemData mItemData; + private CheckBox mCheckBox; - /** - * 构造函数，初始化视图组件 - * @param context 上下文对象 - */ public NotesListItem(Context context) { super(context); inflate(context, R.layout.note_item, this); @@ -55,15 +48,7 @@ public class NotesListItem extends LinearLayout { mCheckBox = (CheckBox) findViewById(android.R.id.checkbox); } - /** - * 绑定数据到视图 - * @param context 上下文对象 - * @param data 便签数据 - * @param choiceMode 是否为选择模式 - * @param checked 是否选中 - */ public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) { - // 根据选择模式和便签类型决定是否显示复选框 if (choiceMode && data.getType() == Notes.TYPE_NOTE) { mCheckBox.setVisibility(View.VISIBLE); mCheckBox.setChecked(checked); @@ -72,7 +57,6 @@ public class NotesListItem extends LinearLayout { } mItemData = data; - // 处理通话记录文件夹 if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { mCallName.setVisibility(View.GONE); mAlert.setVisibility(View.VISIBLE); @@ -80,20 +64,17 @@ public class NotesListItem extends LinearLayout { mTitle.setText(context.getString(R.string.call_record_folder_name) + context.getString(R.string.format_folder_files_count, data.getNotesCount())); mAlert.setImageResource(R.drawable.call_record); - // 处理通话记录子项 } else if (data.getParentId() == Notes.ID_CALL_RECORD_FOLDER) { mCallName.setVisibility(View.VISIBLE); mCallName.setText(data.getCallName()); mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem); mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); - // 显示提醒图标 if (data.hasAlert()) { mAlert.setImageResource(R.drawable.clock); mAlert.setVisibility(View.VISIBLE); } else { mAlert.setVisibility(View.GONE); } - // 处理普通便签和文件夹 } else { mCallName.setVisibility(View.GONE); mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem); @@ -105,7 +86,6 @@ public class NotesListItem extends LinearLayout { mAlert.setVisibility(View.GONE); } else { mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet())); - // 显示提醒图标 if (data.hasAlert()) { mAlert.setImageResource(R.drawable.clock); mAlert.setVisibility(View.VISIBLE); @@ -114,21 +94,14 @@ public class NotesListItem extends LinearLayout { } } } - // 设置相对时间显示，如"1小时前" mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate())); - // 设置背景样式 setBackground(data); } - /** - * 根据便签类型和位置设置背景样式 - * @param data 便签数据 - */ private void setBackground(NoteItemData data) { int id = data.getBgColorId(); if (data.getType() == Notes.TYPE_NOTE) { - // 根据便签在列表中的位置设置不同的背景资源 if (data.isSingle() || data.isOneFollowingFolder()) { setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id)); } else if (data.isLast()) { @@ -139,16 +112,11 @@ public class NotesListItem extends LinearLayout { setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id)); } } else { - // 文件夹使用特定背景资源 setBackgroundResource(NoteItemBgResources.getFolderBgRes()); } } - /** - * 获取便签数据对象 - * @return 便签数据 - */ public NoteItemData getItemData() { return mItemData; } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java b/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java index 05e54ae..07c5f7e 100644 --- a/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/src/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java @@ -48,61 +48,42 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.gtask.remote.GTaskSyncService; -/** - * NotesPreferenceActivity是一个用于设置便签应用偏好的Activity - * 提供了账户管理、同步设置等功能 - */ public class NotesPreferenceActivity extends PreferenceActivity { - // 偏好设置的名称 public static final String PREFERENCE_NAME = "notes_preferences"; - - // 存储同步账户名称的键 + public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name"; - - // 存储上次同步时间的键 + public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time"; - - // 设置便签背景颜色的键 + public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear"; - - // 同步账户设置的键 + private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key"; - - // 账户权限过滤器的键 + private static final String AUTHORITIES_FILTER_KEY = "authorities"; - - // 账户设置的分类 + private PreferenceCategory mAccountCategory; - - // 接收同步服务广播的接收器 + private GTaskReceiver mReceiver; - - // 原始账户列表 + private Account[] mOriAccounts; - - // 是否添加了新账户的标志 + private boolean mHasAddedAccount; @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); - // 设置应用图标可用于导航返回 + /* using the app icon for navigation */ getActionBar().setDisplayHomeAsUpEnabled(true); - // 加载偏好设置布局 addPreferencesFromResource(R.xml.preferences); mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY); mReceiver = new GTaskReceiver(); - - // 注册广播接收器，监听同步服务的状态变化 IntentFilter filter = new IntentFilter(); filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME); registerReceiver(mReceiver, filter); mOriAccounts = null; - - // 添加设置页面的头部视图 View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null); getListView().addHeaderView(header, null, true); } @@ -111,7 +92,8 @@ public class NotesPreferenceActivity extends PreferenceActivity { protected void onResume() { super.onResume(); - // 如果添加了新账户，自动设置同步账户 + // need to set sync account automatically if user has added a new + // account if (mHasAddedAccount) { Account[] accounts = getGoogleAccounts(); if (mOriAccounts != null && accounts.length > mOriAccounts.length) { @@ -131,44 +113,36 @@ public class NotesPreferenceActivity extends PreferenceActivity { } } - // 刷新界面 refreshUI(); } @Override protected void onDestroy() { - // 注销广播接收器，防止内存泄漏 if (mReceiver != null) { unregisterReceiver(mReceiver); } super.onDestroy(); } - /** - * 加载账户设置相关的偏好项 - */ private void loadAccountPreference() { - // 清空账户分类下的所有偏好项 mAccountCategory.removeAll(); - // 创建账户选择偏好项 Preference accountPref = new Preference(this); final String defaultAccount = getSyncAccountName(this); accountPref.setTitle(getString(R.string.preferences_account_title)); accountPref.setSummary(getString(R.string.preferences_account_summary)); accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() { public boolean onPreferenceClick(Preference preference) { - // 如果当前没有进行同步操作 if (!GTaskSyncService.isSyncing()) { - // 如果还没有设置账户，显示选择账户对话框 if (TextUtils.isEmpty(defaultAccount)) { + // the first time to set account showSelectAccountAlertDialog(); } else { - // 如果已经设置了账户，显示更改账户确认对话框 + // if the account has already been set, we need to promp + // user about the risk showChangeAccountConfirmAlertDialog(); } } else { - // 同步过程中不能更改账户，提示用户 Toast.makeText(NotesPreferenceActivity.this, R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT) .show(); @@ -177,20 +151,15 @@ public class NotesPreferenceActivity extends PreferenceActivity { } }); - // 将账户偏好项添加到分类中 mAccountCategory.addPreference(accountPref); } - /** - * 加载同步按钮和相关状态显示 - */ private void loadSyncButton() { Button syncButton = (Button) findViewById(R.id.preference_sync_button); TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview); - // 设置同步按钮状态 + // set button state if (GTaskSyncService.isSyncing()) { - // 当前正在同步，显示取消同步按钮 syncButton.setText(getString(R.string.preferences_button_sync_cancel)); syncButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { @@ -198,7 +167,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { } }); } else { - // 当前没有同步，显示立即同步按钮 syncButton.setText(getString(R.string.preferences_button_sync_immediately)); syncButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { @@ -206,16 +174,13 @@ public class NotesPreferenceActivity extends PreferenceActivity { } }); } - // 如果没有设置同步账户，禁用同步按钮 syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this))); - // 设置上次同步时间显示 + // set last sync time if (GTaskSyncService.isSyncing()) { - // 显示同步进度 lastSyncTimeView.setText(GTaskSyncService.getProgressString()); lastSyncTimeView.setVisibility(View.VISIBLE); } else { - // 显示上次同步时间 long lastSyncTime = getLastSyncTime(this); if (lastSyncTime != 0) { lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time, @@ -223,27 +188,19 @@ public class NotesPreferenceActivity extends PreferenceActivity { lastSyncTime))); lastSyncTimeView.setVisibility(View.VISIBLE); } else { - // 从未同步过，隐藏时间显示 lastSyncTimeView.setVisibility(View.GONE); } } } - /** - * 刷新整个设置界面 - */ private void refreshUI() { loadAccountPreference(); loadSyncButton(); } - /** - * 显示选择账户的对话框 - */ private void showSelectAccountAlertDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); - // 设置对话框标题 View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); titleTextView.setText(getString(R.string.preferences_dialog_select_account_title)); @@ -253,7 +210,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { dialogBuilder.setCustomTitle(titleView); dialogBuilder.setPositiveButton(null, null); - // 获取所有Google账户 Account[] accounts = getGoogleAccounts(); String defAccount = getSyncAccountName(this); @@ -261,7 +217,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { mHasAddedAccount = false; if (accounts.length > 0) { - // 有可用账户，显示账户列表供用户选择 CharSequence[] items = new CharSequence[accounts.length]; final CharSequence[] itemMapping = items; int checkedItem = -1; @@ -275,7 +230,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { dialogBuilder.setSingleChoiceItems(items, checkedItem, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - // 用户选择了账户，设置为同步账户 setSyncAccount(itemMapping[which].toString()); dialog.dismiss(); refreshUI(); @@ -283,14 +237,12 @@ public class NotesPreferenceActivity extends PreferenceActivity { }); } - // 添加"添加账户"选项 View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null); dialogBuilder.setView(addAccountView); final AlertDialog dialog = dialogBuilder.show(); addAccountView.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - // 用户点击添加账户 mHasAddedAccount = true; Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] { @@ -302,13 +254,9 @@ public class NotesPreferenceActivity extends PreferenceActivity { }); } - /** - * 显示更改账户确认对话框 - */ private void showChangeAccountConfirmAlertDialog() { AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this); - // 设置对话框标题 View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null); TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title); titleTextView.setText(getString(R.string.preferences_dialog_change_account_title, @@ -317,7 +265,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg)); dialogBuilder.setCustomTitle(titleView); - // 设置选项：更改账户、移除账户、取消 CharSequence[] menuItemArray = new CharSequence[] { getString(R.string.preferences_menu_change_account), getString(R.string.preferences_menu_remove_account), @@ -326,10 +273,8 @@ public class NotesPreferenceActivity extends PreferenceActivity { dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { if (which == 0) { - // 用户选择更改账户 showSelectAccountAlertDialog(); } else if (which == 1) { - // 用户选择移除账户 removeSyncAccount(); refreshUI(); } @@ -338,22 +283,13 @@ public class NotesPreferenceActivity extends PreferenceActivity { dialogBuilder.show(); } - /** - * 获取设备上的Google账户列表 - */ private Account[] getGoogleAccounts() { AccountManager accountManager = AccountManager.get(this); return accountManager.getAccountsByType("com.google"); } - /** - * 设置同步账户 - * @param account 要设置的账户名称 - */ private void setSyncAccount(String account) { - // 如果新设置的账户与当前账户不同 if (!getSyncAccountName(this).equals(account)) { - // 保存新的账户名称到偏好设置 SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); SharedPreferences.Editor editor = settings.edit(); if (account != null) { @@ -363,10 +299,10 @@ public class NotesPreferenceActivity extends PreferenceActivity { } editor.commit(); - // 清除上次同步时间 + // clean up last sync time setLastSyncTime(this, 0); - // 清除本地与Google任务相关的信息 + // clean up local gtask related info new Thread(new Runnable() { public void run() { ContentValues values = new ContentValues(); @@ -376,18 +312,13 @@ public class NotesPreferenceActivity extends PreferenceActivity { } }).start(); - // 提示用户账户设置成功 Toast.makeText(NotesPreferenceActivity.this, getString(R.string.preferences_toast_success_set_accout, account), Toast.LENGTH_SHORT).show(); } } - /** - * 移除同步账户 - */ private void removeSyncAccount() { - // 从偏好设置中移除账户信息 SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); SharedPreferences.Editor editor = settings.edit(); if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) { @@ -398,7 +329,7 @@ public class NotesPreferenceActivity extends PreferenceActivity { } editor.commit(); - // 清除本地与Google任务相关的信息 + // clean up local gtask related info new Thread(new Runnable() { public void run() { ContentValues values = new ContentValues(); @@ -409,22 +340,12 @@ public class NotesPreferenceActivity extends PreferenceActivity { }).start(); } - /** - * 获取当前设置的同步账户名称 - * @param context 上下文对象 - * @return 同步账户名称，如果没有设置则返回空字符串 - */ public static String getSyncAccountName(Context context) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, ""); } - /** - * 设置上次同步时间 - * @param context 上下文对象 - * @param time 上次同步的时间戳（毫秒） - */ public static void setLastSyncTime(Context context, long time) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); @@ -433,42 +354,29 @@ public class NotesPreferenceActivity extends PreferenceActivity { editor.commit(); } - /** - * 获取上次同步时间 - * @param context 上下文对象 - * @return 上次同步的时间戳（毫秒），如果没有同步过则返回0 - */ public static long getLastSyncTime(Context context) { SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE); return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0); } - /** - * 广播接收器，用于接收同步服务的状态更新 - */ private class GTaskReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - // 刷新界面 refreshUI(); - // 如果正在同步，更新同步状态显示 if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) { TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview); syncStatus.setText(intent .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG)); } + } } - /** - * 处理选项菜单的点击事件 - */ public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: - // 点击应用图标，返回主界面 Intent intent = new Intent(this, NotesListActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); @@ -477,4 +385,4 @@ public class NotesPreferenceActivity extends PreferenceActivity { return false; } } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java index 08445ce..ec6f819 100644 --- a/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java +++ b/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java @@ -32,31 +32,19 @@ import net.micode.notes.tool.ResourceParser; import net.micode.notes.ui.NoteEditActivity; import net.micode.notes.ui.NotesListActivity; -/** - * 便签桌面小部件的基类，提供了小部件的核心功能实现 - * 继承自AppWidgetProvider，处理小部件的创建、更新和删除等操作 - */ public abstract class NoteWidgetProvider extends AppWidgetProvider { - // 定义查询便签内容时需要的字段 public static final String [] PROJECTION = new String [] { - NoteColumns.ID, // 便签ID - NoteColumns.BG_COLOR_ID, // 便签背景色ID - NoteColumns.SNIPPET // 便签摘要内容 + NoteColumns.ID, + NoteColumns.BG_COLOR_ID, + NoteColumns.SNIPPET }; - // 投影列的索引常量，方便从Cursor中获取对应数据 public static final int COLUMN_ID = 0; public static final int COLUMN_BG_COLOR_ID = 1; public static final int COLUMN_SNIPPET = 2; private static final String TAG = "NoteWidgetProvider"; - /** - * 当小部件被删除时调用此方法 - * 将对应便签的widget_id字段置为INVALID_APPWIDGET_ID，表示该便签不再关联小部件 - * @param context 上下文 - * @param appWidgetIds 被删除的小部件ID数组 - */ @Override public void onDeleted(Context context, int[] appWidgetIds) { ContentValues values = new ContentValues(); @@ -69,12 +57,6 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { } } - /** - * 获取指定小部件ID对应的便签信息 - * @param context 上下文 - * @param widgetId 小部件ID - * @return 返回包含便签信息的Cursor，或null（如果查询失败） - */ private Cursor getNoteWidgetInfo(Context context, int widgetId) { return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, PROJECTION, @@ -83,109 +65,68 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { null); } - /** - * 更新小部件（非隐私模式） - * @param context 上下文 - * @param appWidgetManager AppWidgetManager实例 - * @param appWidgetIds 需要更新的小部件ID数组 - */ protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { update(context, appWidgetManager, appWidgetIds, false); } - /** - * 更新小部件显示内容 - * @param context 上下文 - * @param appWidgetManager AppWidgetManager实例 - * @param appWidgetIds 需要更新的小部件ID数组 - * @param privacyMode 是否为隐私模式（隐私模式下显示通用提示，隐藏具体便签内容） - */ private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, boolean privacyMode) { for (int i = 0; i < appWidgetIds.length; i++) { if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) { - int bgId = ResourceParser.getDefaultBgId(context); // 默认背景色ID - String snippet = ""; // 便签内容摘要 - - // 创建启动便签编辑页面的Intent + int bgId = ResourceParser.getDefaultBgId(context); + String snippet = ""; Intent intent = new Intent(context, NoteEditActivity.class); intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]); intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType()); - // 查询小部件对应的便签内容 Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]); if (c != null && c.moveToFirst()) { - // 检查是否存在多个便签关联同一个小部件ID的异常情况 if (c.getCount() > 1) { Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]); c.close(); return; } - - // 从Cursor中获取便签内容和背景色 snippet = c.getString(COLUMN_SNIPPET); bgId = c.getInt(COLUMN_BG_COLOR_ID); intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID)); - intent.setAction(Intent.ACTION_VIEW); // 设置Intent动作为查看已有便签 + intent.setAction(Intent.ACTION_VIEW); } else { - // 如果没有找到对应便签，显示默认提示信息 snippet = context.getResources().getString(R.string.widget_havenot_content); - intent.setAction(Intent.ACTION_INSERT_OR_EDIT); // 设置Intent动作为新建便签 + intent.setAction(Intent.ACTION_INSERT_OR_EDIT); } - // 确保Cursor被关闭，防止内存泄漏 if (c != null) { c.close(); } - // 创建RemoteViews对象，用于设置小部件的显示内容 RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId()); rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId)); intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId); - /** - * 生成用于启动小部件宿主的PendingIntent - * 根据是否为隐私模式，设置不同的点击行为 + * Generate the pending intent to start host for the widget */ PendingIntent pendingIntent = null; if (privacyMode) { - // 隐私模式下显示提示信息，点击后跳转到便签列表 rv.setTextViewText(R.id.widget_text, context.getString(R.string.widget_under_visit_mode)); pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent( context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); } else { - // 正常模式下显示便签内容，点击后跳转到便签编辑页 rv.setTextViewText(R.id.widget_text, snippet); pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent, PendingIntent.FLAG_UPDATE_CURRENT); } - // 设置小部件的点击事件 rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent); - // 更新小部件 appWidgetManager.updateAppWidget(appWidgetIds[i], rv); } } } - /** - * 获取背景资源ID（由子类实现） - * @param bgId 背景色ID - * @return 对应的资源ID - */ protected abstract int getBgResourceId(int bgId); - /** - * 获取小部件布局ID（由子类实现） - * @return 布局资源ID - */ protected abstract int getLayoutId(); - /** - * 获取小部件类型（由子类实现） - * @return 小部件类型常量 - */ protected abstract int getWidgetType(); -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java index 32503fc..adcb2f7 100644 --- a/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java +++ b/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java @@ -24,50 +24,24 @@ import net.micode.notes.data.Notes; import net.micode.notes.tool.ResourceParser; -/** - * 2x尺寸便签小部件的实现类 - * 继承自NoteWidgetProvider基类，用于定义2x尺寸小部件的具体样式和行为 - */ public class NoteWidgetProvider_2x extends NoteWidgetProvider { - - /** - * 小部件更新时调用（覆盖父类方法） - * 调用父类的update方法完成基础更新逻辑 - * @param context 上下文对象 - * @param appWidgetManager AppWidgetManager实例 - * @param appWidgetIds 需要更新的小部件ID数组 - */ @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - super.update(context, appWidgetManager, appWidgetIds); // 调用父类更新逻辑 + super.update(context, appWidgetManager, appWidgetIds); } - /** - * 获取小部件布局资源ID（实现父类抽象方法） - * @return 返回2x尺寸小部件的布局文件ID（widget_2x.xml） - */ @Override protected int getLayoutId() { - return R.layout.widget_2x; // 指定2x尺寸对应的布局文件 + return R.layout.widget_2x; } - /** - * 获取背景资源ID（实现父类抽象方法） - * @param bgId 背景色ID - * @return 返回2x尺寸小部件对应的背景资源ID - */ @Override protected int getBgResourceId(int bgId) { - // 通过资源解析器获取2x尺寸专用的背景资源 return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId); } - /** - * 获取小部件类型（实现父类抽象方法） - * @return 返回小部件类型为2x尺寸类型 - */ @Override protected int getWidgetType() { - return Notes.TYPE_WIDGET_2X; // 标识为2x尺寸的小部件类型 + return Notes.TYPE_WIDGET_2X; } -} \ No newline at end of file +} diff --git a/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java index ba5d04e..c12a02e 100644 --- a/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java +++ b/src/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java @@ -24,50 +24,23 @@ import net.micode.notes.data.Notes; import net.micode.notes.tool.ResourceParser; -/** - * 4x尺寸便签小部件的实现类 - * 继承自NoteWidgetProvider基类，用于定义4x尺寸小部件的具体样式和行为 - */ public class NoteWidgetProvider_4x extends NoteWidgetProvider { - - /** - * 小部件更新时调用（覆盖父类方法） - * 调用父类的update方法完成基础更新逻辑（如数据绑定、界面渲染） - * @param context 上下文对象 - * @param appWidgetManager AppWidgetManager实例 - * @param appWidgetIds 需要更新的小部件ID数组 - */ @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - super.update(context, appWidgetManager, appWidgetIds); // 复用父类更新逻辑 + super.update(context, appWidgetManager, appWidgetIds); } - /** - * 获取小部件布局资源ID（实现父类抽象方法） - * @return 返回4x尺寸小部件的布局文件ID（widget_4x.xml） - */ - @Override protected int getLayoutId() { - return R.layout.widget_4x; // 指定4x尺寸对应的布局文件 + return R.layout.widget_4x; } - /** - * 获取背景资源ID（实现父类抽象方法） - * @param bgId 背景色ID - * @return 返回4x尺寸小部件对应的背景资源ID（通过专用解析器获取） - */ @Override protected int getBgResourceId(int bgId) { - // 使用资源解析器获取4x尺寸专用的背景图片资源 return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId); } - /** - * 获取小部件类型（实现父类抽象方法） - * @return 返回小部件类型为4x尺寸类型（用于区分不同尺寸的小部件） - */ @Override protected int getWidgetType() { - return Notes.TYPE_WIDGET_4X; // 标识为4x尺寸的小部件类型 + return Notes.TYPE_WIDGET_4X; } -} \ No newline at end of file +} diff --git a/test1.txt b/test1.txt deleted file mode 100644 index e69de29..0000000