();
- }
-
- if(sContactCache.containsKey(phoneNumber)) {
- return sContactCache.get(phoneNumber);
- }
-
- String selection = CALLER_ID_SELECTION.replace("+",
- PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
- Cursor cursor = context.getContentResolver().query(
- Data.CONTENT_URI,
- new String [] { Phone.DISPLAY_NAME },
- selection,
- new String[] { phoneNumber },
- null);
-
- if (cursor != null && cursor.moveToFirst()) {
- try {
- String name = cursor.getString(0);
- sContactCache.put(phoneNumber, name);
- return name;
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, " Cursor get string error " + e.toString());
- return null;
- } finally {
- cursor.close();
- }
- } else {
- Log.d(TAG, "No contact matched with number:" + phoneNumber);
- return null;
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- }
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/data/Notes.java b/20233171391/src/src/net/micode/notes/data/Notes.java
deleted file mode 100644
index ad97fde..0000000
--- a/20233171391/src/src/net/micode/notes/data/Notes.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.data;
-
-import android.net.Uri;
-<<<<<<< HEAD
-// Notes类中定义了很多int和string类型的常量
-public class Notes {
- // 提供者权限
- public static final String AUTHORITY = "micode_notes";
- // 日志标签
- public static final String TAG = "Notes";
-
- // 笔记类型的常量
- public static final int TYPE_NOTE = 0; // 普通笔记
- public static final int TYPE_FOLDER = 1; // 文件夹
- public static final int TYPE_SYSTEM = 2; // 系统文件夹
-
- /**
- * 以下是系统文件夹的标识符
- * {@link Notes#ID_ROOT_FOLDER } 是默认文件夹
- * {@link Notes#ID_TEMPARAY_FOLDER } 用于不属于任何文件夹的笔记
- * {@link Notes#ID_CALL_RECORD_FOLDER} 用于存储通话记录
- * {@link Notes#ID_TRASH_FOLER} 用于回收站
-=======
-public class Notes {
- public static final String AUTHORITY = "micode_notes";
- public static final String TAG = "Notes";
- public static final int TYPE_NOTE = 0;
- public static final int TYPE_FOLDER = 1;
- public static final int TYPE_SYSTEM = 2;
-
- /**
- * Following IDs are system folders' identifiers
- * {@link Notes#ID_ROOT_FOLDER } is default folder
- * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
- * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- */
- public static final int ID_ROOT_FOLDER = 0;
- public static final int ID_TEMPARAY_FOLDER = -1;
- public static final int ID_CALL_RECORD_FOLDER = -2;
- public static final int ID_TRASH_FOLER = -3;
-
-<<<<<<< HEAD
- // 意图附加数据的常量键值
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";
- public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";
- public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";
- public static final String INTENT_EXTRA_WIDGET_TYPE = "net.micode.notes.widget_type";
- public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";
- public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";
-
-<<<<<<< HEAD
- // 小部件类型的常量
- public static final int TYPE_WIDGET_INVALIDE = -1; // 无效小部件类型
- public static final int TYPE_WIDGET_2X = 0; // 小部件类型 2x
- public static final int TYPE_WIDGET_4X = 1; // 小部件类型 4x
-
- // 数据常量类，包含笔记和通话记录的内容类型
- public static class DataConstants {
- public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; // 笔记内容类型
- public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; // 通话记录内容类型
-=======
- public static final int TYPE_WIDGET_INVALIDE = -1;
- public static final int TYPE_WIDGET_2X = 0;
- public static final int TYPE_WIDGET_4X = 1;
-
- public static class DataConstants {
- public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
- public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- }
-
- /**
- * Uri to query all notes and folders
- */
- public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
-
- /**
- * Uri to query data
- */
- public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
-
- public interface NoteColumns {
- /**
- * The unique ID for a row
- * Type: INTEGER (long)
- */
- public static final String ID = "_id";
-
- /**
- * The parent's id for note or folder
- * Type: INTEGER (long)
- */
- public static final String PARENT_ID = "parent_id";
-
- /**
- * Created data for note or folder
- * Type: INTEGER (long)
- */
- public static final String CREATED_DATE = "created_date";
-
- /**
- * Latest modified date
- * Type: INTEGER (long)
- */
- public static final String MODIFIED_DATE = "modified_date";
-
-
- /**
- * Alert date
- * Type: INTEGER (long)
- */
- public static final String ALERTED_DATE = "alert_date";
-
- /**
- * Folder's name or text content of note
- * Type: TEXT
- */
- public static final String SNIPPET = "snippet";
-
- /**
- * Note's widget id
- * Type: INTEGER (long)
- */
- public static final String WIDGET_ID = "widget_id";
-
- /**
- * Note's widget type
- * Type: INTEGER (long)
- */
- public static final String WIDGET_TYPE = "widget_type";
-
- /**
- * Note's background color's id
- * Type: INTEGER (long)
- */
- public static final String BG_COLOR_ID = "bg_color_id";
-
- /**
- * For text note, it doesn't has attachment, for multi-media
- * note, it has at least one attachment
- * Type: INTEGER
- */
- public static final String HAS_ATTACHMENT = "has_attachment";
-
- /**
- * Folder's count of notes
- * Type: INTEGER (long)
- */
- public static final String NOTES_COUNT = "notes_count";
-
- /**
- * The file type: folder or note
- * Type: INTEGER
- */
- public static final String TYPE = "type";
-
- /**
- * The last sync id
- * Type: INTEGER (long)
- */
- public static final String SYNC_ID = "sync_id";
-
- /**
- * Sign to indicate local modified or not
- * Type: INTEGER
- */
- public static final String LOCAL_MODIFIED = "local_modified";
-
- /**
- * Original parent id before moving into temporary folder
- * Type : INTEGER
- */
- public static final String ORIGIN_PARENT_ID = "origin_parent_id";
-
- /**
- * The gtask id
- * Type : TEXT
- */
- public static final String GTASK_ID = "gtask_id";
-
- /**
- * The version code
- * Type : INTEGER (long)
- */
- public static final String VERSION = "version";
- }
-
- public interface DataColumns {
- /**
- * The unique ID for a row
- * Type: INTEGER (long)
- */
- public static final String ID = "_id";
-
- /**
- * The MIME type of the item represented by this row.
- * Type: Text
- */
- public static final String MIME_TYPE = "mime_type";
-
- /**
- * The reference id to note that this data belongs to
- * Type: INTEGER (long)
- */
- public static final String NOTE_ID = "note_id";
-
- /**
- * Created data for note or folder
- * Type: INTEGER (long)
- */
- public static final String CREATED_DATE = "created_date";
-
- /**
- * Latest modified date
- * Type: INTEGER (long)
- */
- public static final String MODIFIED_DATE = "modified_date";
-
- /**
- * Data's content
- * Type: TEXT
- */
- public static final String CONTENT = "content";
-
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * integer data type
- * Type: INTEGER
- */
- public static final String DATA1 = "data1";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * integer data type
- * Type: INTEGER
- */
- public static final String DATA2 = "data2";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- * Type: TEXT
- */
- public static final String DATA3 = "data3";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- * Type: TEXT
- */
- public static final String DATA4 = "data4";
-
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- * Type: TEXT
- */
- public static final String DATA5 = "data5";
- }
-
-<<<<<<< HEAD
- /**
- * 文本笔记类，实现了 DataColumns 接口。
- */
- public static final class TextNote implements DataColumns {
- /**
- * 表示文本笔记处于待办事项模式还是普通模式的模式常量。
- * 类型：整数 1: 待办事项模式 0: 普通模式
-=======
- public static final class TextNote implements DataColumns {
- /**
- * Mode to indicate the text in check list mode or not
- * Type: Integer 1:check list mode 0: normal mode
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- */
- public static final String MODE = DATA1;
-
- public static final int MODE_CHECK_LIST = 1;
-
- public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";
-
- public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
-
-<<<<<<< HEAD
- // 内容 URI
- public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
- }
-
- /**
- * 通话笔记类，实现了 DataColumns 接口。
- */
- public static final class CallNote implements DataColumns {
- /**
- * 通话记录的日期。
- * 类型：整数 (长整型)
-=======
- public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
- }
-
- public static final class CallNote implements DataColumns {
- /**
- * Call date for this record
- * Type: INTEGER (long)
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- */
- public static final String CALL_DATE = DATA1;
-
- /**
-<<<<<<< HEAD
- * 通话记录的电话号码。
- * 类型：文本
-=======
- * Phone number for this record
- * Type: TEXT
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- */
- public static final String PHONE_NUMBER = DATA3;
-
- public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";
-
- public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
-
-<<<<<<< HEAD
- // 内容 URI
- public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
- }
-
-=======
- public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
- }
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-}
diff --git a/20233171391/src/src/net/micode/notes/data/NotesDatabaseHelper.java b/20233171391/src/src/net/micode/notes/data/NotesDatabaseHelper.java
deleted file mode 100644
index 878422a..0000000
--- a/20233171391/src/src/net/micode/notes/data/NotesDatabaseHelper.java
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.data;
-
-<<<<<<< HEAD
-import android.content.ContentValues;//保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。
-import android.content.Context;//加载和访问资源。
-import android.database.sqlite.SQLiteDatabase;//提供对应于添加、删除、更新、查询的操作方法： insert()、delete()、update()和query()。配合content.values
-import android.database.sqlite.SQLiteOpenHelper;//用来管理数据的创建和版本更新
-=======
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-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;
-
-
-<<<<<<< HEAD
-/**
- * 笔记数据库帮助类，继承自 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";
- }
-
- // 日志标签
- private static final String TAG = "NotesDatabaseHelper";
-
- // 单例实例
- private static NotesDatabaseHelper mInstance;
-
- // 创建笔记表的 SQL 语句
-=======
-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";
- }
-
- private static final String TAG = "NotesDatabaseHelper";
-
- private static NotesDatabaseHelper mInstance;
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private static final String CREATE_NOTE_TABLE_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" +
- ")";
-<<<<<<< HEAD
- // 创建数据表的 SQL 语句
- private static final String CREATE_DATA_TABLE_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 ''" +
- ")";
-
- // 创建数据表中关于 note_id 字段的索引的 SQL 语句
- private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
- "CREATE INDEX IF NOT EXISTS note_id_index ON " +
- TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
-
- /**
- * 在更新笔记的父文件夹 ID 之后，增加文件夹的笔记计数的触发器
- */
- 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";
-
- /**
- * 在更新笔记的父文件夹 ID 之后，减少文件夹的笔记计数的触发器
-=======
-
- private static final String CREATE_DATA_TABLE_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 + ");";
-
- /**
- * 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";
-
- /**
- * Decrease folder's note count when move note from folder
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- */
- 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";
-
- /**
- * 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";
-
- /**
- * 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";
-
- /**
- * 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";
-
- /**
- * 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";
-
- /**
- * 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";
-
- /**
- * 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";
-
- /**
- * 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";
-
- /**
- * 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";
-
- public NotesDatabaseHelper(Context context) {
- super(context, DB_NAME, null, DB_VERSION);
- }
-
- public void createNoteTable(SQLiteDatabase db) {
- db.execSQL(CREATE_NOTE_TABLE_SQL);
- reCreateNoteTableTriggers(db);
- createSystemFolder(db);
- Log.d(TAG, "note table has been created");
- }
-
- 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");
- db.execSQL("DROP TRIGGER IF EXISTS delete_data_on_delete");
- db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert");
- db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete");
- db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash");
-
- db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
- db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
- db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER);
- db.execSQL(NOTE_DELETE_DATA_ON_DELETE_TRIGGER);
- db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER);
- db.execSQL(FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER);
- db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
- }
-
- private void createSystemFolder(SQLiteDatabase db) {
- ContentValues values = new ContentValues();
-
- /**
-<<<<<<< HEAD
- * 创建通话记录文件夹用于存储通话备注
-=======
- * call record foler for call notes
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- */
- values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
-
- /**
-<<<<<<< HEAD
- * 根文件夹，即默认文件夹
-=======
- * root folder which is default folder
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- */
- values.clear();
- values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
-
- /**
-<<<<<<< HEAD
- * 临时文件夹，用于移动笔记
-=======
- * temporary folder which is used for moving note
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- */
- values.clear();
- values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
-
- /**
-<<<<<<< HEAD
- * 创建垃圾箱文件夹
-=======
- * create trash folder
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- */
- values.clear();
- values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
- values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- db.insert(TABLE.NOTE, null, values);
- }
-
- public void createDataTable(SQLiteDatabase db) {
-<<<<<<< HEAD
- // 创建数据表
- db.execSQL(CREATE_DATA_TABLE_SQL);
- // 重新创建数据表的触发器
- reCreateDataTableTriggers(db);
- // 创建数据表的笔记ID索引
- db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
- Log.d(TAG, "数据表已创建");
- }
-
- private void reCreateDataTableTriggers(SQLiteDatabase db) {
- // 移除旧的触发器
-=======
- db.execSQL(CREATE_DATA_TABLE_SQL);
- reCreateDataTableTriggers(db);
- db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
- Log.d(TAG, "data table has been created");
- }
-
- private void reCreateDataTableTriggers(SQLiteDatabase db) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- 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");
-
-<<<<<<< HEAD
- // 创建新的触发器
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- 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);
- }
-
-<<<<<<< HEAD
- //创建一个静态同步方法 getInstance，用于获取数据库帮助类的实例。这个方法是同步的，保证在多线程环境下对实例的访问安全。
- static synchronized NotesDatabaseHelper getInstance(Context context) {
- if (mInstance == null) { //如果当前的数据库帮助类实例为 null。
- mInstance = new NotesDatabaseHelper(context); //创建一个新的数据库帮助类实例，并传入上下文。
- }
- return mInstance; //返回数据库帮助类的实例。
- }
-
- @Override
- public void onCreate(SQLiteDatabase db) { //重写数据库创建方法，当数据库首次被创建时被调用。
- createNoteTable(db); //在数据库中创建笔记表。
- createDataTable(db); //在数据库中创建笔记表。
- }
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { //重写数据库升级方法，当数据库版本更新时被调用。
- boolean reCreateTriggers = false; //定义一个布尔变量 reCreateTriggers，用于标识是否需要重新创建触发器。
- boolean skipV2 = false; //定义一个布尔变量 skipV2，用于标识是否需要跳过版本2的升级。
-
- if (oldVersion == 1) { //如果当前数据库的版本为1。
- upgradeToV2(db); //执行数据库升级到版本2的操作。
- skipV2 = true; // this upgrade including the upgrade from v2 to v3标记为跳过版本2的升级步骤。
- oldVersion++; //将当前数据库的版本号增加到下一个版本。
- }
-
- if (oldVersion == 2 && !skipV2) { //如果当前数据库的版本为2且不需要跳过版本2的升级。
- upgradeToV3(db); //执行数据库升级到版本3的操作。
- reCreateTriggers = true; //标记为需要重新创建触发器。
- oldVersion++; //将当前数据库的版本号增加到下一个版本。
- }
-
- if (oldVersion == 3) { //如果当前数据库的版本为3。
- upgradeToV4(db); //执行数据库升级到版本4的操作。
- oldVersion++; //将当前数据库的版本号增加到下一个版本。
- }
-
- if (reCreateTriggers) { //如果需要重新创建触发器。
- reCreateNoteTableTriggers(db); //重新创建笔记表的触发器。
- reCreateDataTableTriggers(db); //重新创建数据表的触发器。
- }
-
- if (oldVersion != newVersion) { //如果最终数据库的版本号不等于预期的新版本号。
- throw new IllegalStateException("Upgrade notes database to version " + newVersion
- + "fails"); //抛出一个异常，指示数据库升级到特定版本失败
- }
- }
-
- private void upgradeToV2(SQLiteDatabase db) { //定义一个方法，用于将数据库升级到版本2。
- db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); //执行 SQL 语句删除笔记表。
- db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); //执行 SQL 语句删除笔记表。
- createNoteTable(db); //重新创建笔记表。
- createDataTable(db); //重新创建数据表。
- }
-
- private void upgradeToV3(SQLiteDatabase db) { //定义一个方法，用于将数据库升级到版本3。
- // drop unused triggers
- db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert"); //执行 SQL 语句插入时笔记修改日期的触发器。
- db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete"); //执行 SQL 语句删除时笔记修改日期的触发器。
- db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update"); //执行 SQL 语句更新笔记修改日期的触发器。
- // add a column for gtask id
- db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
- + " TEXT NOT NULL DEFAULT ''"); //执行 SQL 语句，向笔记表中添加一个名为 GTASK_ID 的 TEXT 类型列，并设置默认值为空字符串。
-=======
- static synchronized NotesDatabaseHelper getInstance(Context context) {
- if (mInstance == null) {
- mInstance = new NotesDatabaseHelper(context);
- }
- return mInstance;
- }
-
- @Override
- public void onCreate(SQLiteDatabase db) {
- createNoteTable(db);
- createDataTable(db);
- }
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- boolean reCreateTriggers = false;
- boolean skipV2 = false;
-
- if (oldVersion == 1) {
- upgradeToV2(db);
- skipV2 = true; // this upgrade including the upgrade from v2 to v3
- oldVersion++;
- }
-
- if (oldVersion == 2 && !skipV2) {
- upgradeToV3(db);
- reCreateTriggers = true;
- oldVersion++;
- }
-
- 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");
- }
- }
-
- 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);
- }
-
- 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");
- // add a column for gtask id
- db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
- + " TEXT NOT NULL DEFAULT ''");
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- // 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);
- }
-
- private void upgradeToV4(SQLiteDatabase db) {
- db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
- + " INTEGER NOT NULL DEFAULT 0");
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/data/NotesProvider.java b/20233171391/src/src/net/micode/notes/data/NotesProvider.java
deleted file mode 100644
index be94a5f..0000000
--- a/20233171391/src/src/net/micode/notes/data/NotesProvider.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.data;
-
-
-import android.app.SearchManager;
-import android.content.ContentProvider;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Intent;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-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;
-
-<<<<<<< HEAD
-//为存储和获取数据提供接口。可以在不同的应用程序之间共享数据
-//ContentProvider提供的方法
-//query：查询
-//insert：插入
-//update：更新
-//delete：删除
-//getType：得到数据类型
-public class NotesProvider extends ContentProvider {
- private static final UriMatcher mMatcher; //定义一个静态的 UriMatcher 对象，用于匹配 URI。
-
- private NotesDatabaseHelper mHelper; //创建一个名为 mHelper 的 NotesDatabaseHelper 对象，用于管理数据库。
-
- private static final String TAG = "NotesProvider"; //创建一个字符串常量，用于标识日志的 TAG。
-
- 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。
- //在静态初始化块中，将不同的 URI 模式添加到 UriMatcher 中，以便稍后能够识别和处理这些 URI。
-=======
-
-public class NotesProvider extends ContentProvider {
- private static final UriMatcher mMatcher;
-
- private NotesDatabaseHelper mHelper;
-
- private static final String TAG = "NotesProvider";
-
- 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;
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- 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);
- }
-
- /**
- * x'0A' represents the '\n' character in sqlite. For title and content in the search result,
- * we will trim '\n' and white space in order to show more information.
- */
-<<<<<<< HEAD
- //定义一个字符串常量，表示在搜索时用于构建搜索建议的投影。这里包括一些列的列名和值。
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- 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;
-<<<<<<< HEAD
- //定义一个 SQL 查询字符串，用于在数据库中执行搜索。查询的条件是笔记的摘录包含给定的搜索条件，并且不属于垃圾箱。
-=======
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- 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;
-
- @Override
- public boolean onCreate() {
-<<<<<<< HEAD
- // 创建时调用，初始化 NotesDatabaseHelper 实例
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- mHelper = NotesDatabaseHelper.getInstance(getContext());
- return true;
- }
-
-<<<<<<< HEAD
-
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- @Override
- public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
- String sortOrder) {
- Cursor c = null;
- SQLiteDatabase db = mHelper.getReadableDatabase();
- String id = null;
- switch (mMatcher.match(uri)) {
-<<<<<<< HEAD
- case URI_NOTE: //// 查询所有的笔记
- c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
- sortOrder);
- break;
- case URI_NOTE_ITEM: //// 查询指定ID的单个笔记
-=======
- case URI_NOTE:
- c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
- sortOrder);
- break;
- case URI_NOTE_ITEM:
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- id = uri.getPathSegments().get(1);
- c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id
- + parseSelection(selection), selectionArgs, null, null, sortOrder);
- break;
-<<<<<<< HEAD
- case URI_DATA: // 查询所有的数据
- c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
- sortOrder);
- break;
- case URI_DATA_ITEM: // 查询指定ID的单个数据
-=======
- case URI_DATA:
- c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
- sortOrder);
- break;
- case URI_DATA_ITEM:
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- id = uri.getPathSegments().get(1);
- c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
- + parseSelection(selection), selectionArgs, null, null, sortOrder);
- break;
- case URI_SEARCH:
-<<<<<<< HEAD
- case URI_SEARCH_SUGGEST: // 查询搜索建议或搜索结果
-=======
- case URI_SEARCH_SUGGEST:
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- 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 (uri.getPathSegments().size() > 1) {
- searchString = uri.getPathSegments().get(1);
- }
- } else {
- searchString = uri.getQueryParameter("pattern");
- }
-
- if (TextUtils.isEmpty(searchString)) {
- return null;
- }
-
- try {
- searchString = String.format("%%%s%%", searchString);
- c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY,
- new String[] { searchString });
- } catch (IllegalStateException ex) {
- Log.e(TAG, "got exception: " + ex.toString());
- }
- break;
- default:
- throw new IllegalArgumentException("Unknown URI " + uri);
- }
- if (c != null) {
- c.setNotificationUri(getContext().getContentResolver(), uri);
- }
- return c;
- }
-
- @Override
- public Uri insert(Uri uri, ContentValues values) {
-<<<<<<< HEAD
- // 获取可写的数据库实例
- SQLiteDatabase db = mHelper.getWritableDatabase();
- // 定义变量用于存储数据和笔记的ID以及插入的ID
- long dataId = 0, noteId = 0, insertedId = 0;
-
- // 根据传入的URI类型执行不同的插入操作
- switch (mMatcher.match(uri)) {
- case URI_NOTE:
- // 对笔记表进行插入操作，并将插入的ID保存在noteId和insertedId中
- insertedId = noteId = db.insert(TABLE.NOTE, null, values);
- break;
- case URI_DATA:
- // 对数据表进行插入操作
- if (values.containsKey(DataColumns.NOTE_ID)) {
- // 如果ContentValues包含Note的ID，则将其赋值给noteId
- noteId = values.getAsLong(DataColumns.NOTE_ID);
- } else {
- // 如果没有Note的ID，则记录一个错误日志
- Log.d(TAG, "Wrong data format without note id:" + values.toString());
- }
- // 对数据表进行插入操作，并将插入的ID保存在dataId和insertedId中
- insertedId = dataId = db.insert(TABLE.DATA, null, values);
- break;
- default:
- // 如果传入的URI类型不是URI_NOTE或URI_DATA，则抛出异常
- throw new IllegalArgumentException("Unknown URI " + uri);
- }
-
- // 通知笔记URI发生了变化
-=======
- SQLiteDatabase db = mHelper.getWritableDatabase();
- long dataId = 0, noteId = 0, insertedId = 0;
- switch (mMatcher.match(uri)) {
- case URI_NOTE:
- insertedId = noteId = db.insert(TABLE.NOTE, null, values);
- break;
- case URI_DATA:
- if (values.containsKey(DataColumns.NOTE_ID)) {
- noteId = values.getAsLong(DataColumns.NOTE_ID);
- } else {
- Log.d(TAG, "Wrong data format without note id:" + values.toString());
- }
- insertedId = dataId = db.insert(TABLE.DATA, null, values);
- break;
- default:
- throw new IllegalArgumentException("Unknown URI " + uri);
- }
- // Notify the note uri
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (noteId > 0) {
- getContext().getContentResolver().notifyChange(
- ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
- }
-
-<<<<<<< HEAD
- // 通知数据URI发生了变化
-=======
- // Notify the data uri
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (dataId > 0) {
- getContext().getContentResolver().notifyChange(
- ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
- }
-
-<<<<<<< HEAD
- // 返回包含插入的ID的URI
- return ContentUris.withAppendedId(uri, insertedId);
- }
-
-
- @Override
- public int delete(Uri uri, String selection, String[] selectionArgs) {
- // 初始化删除的记录数为0
- int count = 0;
- // 用于存储ID的字符串
- String id = null;
- // 获取可写的数据库实例
- SQLiteDatabase db = mHelper.getWritableDatabase();
- // 标志是否删除了数据表的记录
- boolean deleteData = false;
-
- // 根据传入的URI类型执行不同的删除操作
- switch (mMatcher.match(uri)) {
- // 删除整个笔记表中符合条件的记录
- case URI_NOTE:
- // 添加条件，确保删除的记录ID大于0
- selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";
- // 执行删除操作，并获取删除的记录数
- count = db.delete(TABLE.NOTE, selection, selectionArgs);
- break;
- // 删除笔记表中指定ID的记录
- case URI_NOTE_ITEM:
- // 从URI中提取ID
-=======
- return ContentUris.withAppendedId(uri, insertedId);
- }
-
- @Override
- public int delete(Uri uri, String selection, String[] selectionArgs) {
- int count = 0;
- String id = null;
- SQLiteDatabase db = mHelper.getWritableDatabase();
- boolean deleteData = false;
- 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:
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- id = uri.getPathSegments().get(1);
- /**
- * ID that smaller than 0 is system folder which is not allowed to
- * trash
- */
-<<<<<<< HEAD
- // 将字符串类型的ID转换为长整型
- long noteId = Long.valueOf(id);
- // 如果ID小于等于0，则表示系统文件夹，不允许删除
- if (noteId <= 0) {
- break;
- }
- // 执行删除操作，并获取删除的记录数
- count = db.delete(TABLE.NOTE,
- NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
- break;
- // 删除整个数据表中符合条件的记录
- case URI_DATA:
- // 执行删除操作，并获取删除的记录数
- count = db.delete(TABLE.DATA, selection, selectionArgs);
- // 标记删除了数据表的记录
- deleteData = true;
- break;
- // 删除数据表中指定ID的记录
- case URI_DATA_ITEM:
- // 从URI中提取ID
- id = uri.getPathSegments().get(1);
- // 执行删除操作，并获取删除的记录数
- count = db.delete(TABLE.DATA,
- DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
- // 标记删除了数据表的记录
- deleteData = true;
- break;
- // 未知的URI类型，抛出异常
- default:
- throw new IllegalArgumentException("Unknown URI " + uri);
- }
-
- // 如果有记录被删除，则通知观察者数据发生了变化
- if (count > 0) {
- // 如果删除了数据表的记录，则通知笔记URI发生了变化
- if (deleteData) {
- getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
- }
- // 通知传入的URI发生了变化
- getContext().getContentResolver().notifyChange(uri, null);
- }
-
- // 返回删除的记录数
- return count;
- }
-
-
- @Override
- public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
- // 初始化计数器，用于记录更新的行数
- int count = 0;
- // 用于存储 URI 中的 id
- String id = null;
- // 获取可写的数据库实例
- SQLiteDatabase db = mHelper.getWritableDatabase();
- // 用于标记是否需要更新数据
- boolean updateData = false;
-
- // 根据 URI 进行匹配，执行相应的操作
- switch (mMatcher.match(uri)) {
- case URI_NOTE:
- // 对于 URI_NOTE，增加笔记版本并更新相应的数据
-=======
- long noteId = Long.valueOf(id);
- if (noteId <= 0) {
- break;
- }
- count = db.delete(TABLE.NOTE,
- NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
- break;
- case URI_DATA:
- count = db.delete(TABLE.DATA, selection, selectionArgs);
- deleteData = true;
- break;
- 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);
- }
- if (count > 0) {
- if (deleteData) {
- getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
- }
- getContext().getContentResolver().notifyChange(uri, null);
- }
- return count;
- }
-
- @Override
- public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
- int count = 0;
- String id = null;
- SQLiteDatabase db = mHelper.getWritableDatabase();
- boolean updateData = false;
- switch (mMatcher.match(uri)) {
- case URI_NOTE:
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- increaseNoteVersion(-1, selection, selectionArgs);
- count = db.update(TABLE.NOTE, values, selection, selectionArgs);
- break;
- case URI_NOTE_ITEM:
-<<<<<<< HEAD
- // 对于 URI_NOTE_ITEM，获取 URI 中的 id，增加笔记版本并更新相应的数据
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- id = uri.getPathSegments().get(1);
- increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);
- count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
- + parseSelection(selection), selectionArgs);
- break;
- case URI_DATA:
-<<<<<<< HEAD
- // 对于 URI_DATA，直接更新数据
- count = db.update(TABLE.DATA, values, selection, selectionArgs);
- // 标记需要更新数据
- updateData = true;
- break;
- case URI_DATA_ITEM:
- // 对于 URI_DATA_ITEM，获取 URI 中的 id，更新相应的数据
- id = uri.getPathSegments().get(1);
- count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id
- + parseSelection(selection), selectionArgs);
- // 标记需要更新数据
- updateData = true;
- break;
- default:
- // 如果 URI 无法匹配，抛出异常
- throw new IllegalArgumentException("Unknown URI " + uri);
- }
-
- // 如果更新的行数大于 0
- if (count > 0) {
- // 如果标记为更新数据，通知数据变化
- if (updateData) {
- getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
- }
- // 通知指定 URI 的数据变化
- getContext().getContentResolver().notifyChange(uri, null);
- }
- // 返回更新的行数
- return count;
- }
-
-
- // 定义一个私有方法，用于解析传入的查询条件
- private String parseSelection(String selection) {
- // 如果传入的查询条件不为空，返回拼接了条件的字符串，否则返回空字符串
- return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
- }
-
- // 定义一个增加笔记版本的方法，接受一个笔记ID、查询条件以及查询条件参数的数组作为参数
- private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
- // 创建一个可变的字符串，初始容量为120
- StringBuilder sql = new StringBuilder(120);
- // 拼接更新语句的开头部分
- sql.append("UPDATE ");
- sql.append(TABLE.NOTE); // 更新的表名
- sql.append(" SET ");
- sql.append(NoteColumns.VERSION); // 设置笔记版本字段
- sql.append("=" + NoteColumns.VERSION + "+1 "); // 增加版本号
-
- // 如果传入的ID大于0或者查询条件不为空，则添加WHERE子句
- if (id > 0 || !TextUtils.isEmpty(selection)) {
- sql.append(" WHERE ");
- }
-
- // 如果传入的ID大于0，添加根据ID查询的条件
- if (id > 0) {
- sql.append(NoteColumns.ID + "=" + String.valueOf(id));
- }
-
- // 如果传入的查询条件不为空
- if (!TextUtils.isEmpty(selection)) {
- // 如果ID大于0，则调用parseSelection方法解析查询条件，否则直接使用传入的条件
- String selectString = id > 0 ? parseSelection(selection) : selection;
-
- // 替换条件中的占位符?为相应的参数值
- for (String args : selectionArgs) {
- selectString = selectString.replaceFirst("\\?", args);
- }
-
- // 将处理后的查询条件拼接到更新语句中
- sql.append(selectString);
- }
-
- // 执行SQL语句，更新数据库中的记录
-=======
- count = db.update(TABLE.DATA, values, selection, selectionArgs);
- updateData = true;
- break;
- 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);
- }
-
- if (count > 0) {
- if (updateData) {
- getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
- }
- getContext().getContentResolver().notifyChange(uri, null);
- }
- return count;
- }
-
- private String parseSelection(String selection) {
- return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
- }
-
- 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 ");
-
- if (id > 0 || !TextUtils.isEmpty(selection)) {
- sql.append(" WHERE ");
- }
- if (id > 0) {
- sql.append(NoteColumns.ID + "=" + String.valueOf(id));
- }
- if (!TextUtils.isEmpty(selection)) {
- String selectString = id > 0 ? parseSelection(selection) : selection;
- for (String args : selectionArgs) {
- selectString = selectString.replaceFirst("\\?", args);
- }
- sql.append(selectString);
- }
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- mHelper.getWritableDatabase().execSQL(sql.toString());
- }
-
- @Override
- public String getType(Uri uri) {
-<<<<<<< HEAD
- // 返回类型为null，此处需要根据具体需求进行实现
- return null;
- }
-
-
-=======
- // TODO Auto-generated method stub
- return null;
- }
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-}
diff --git a/20233171391/src/src/net/micode/notes/gtask/data/MetaData.java b/20233171391/src/src/net/micode/notes/gtask/data/MetaData.java
deleted file mode 100644
index cb8b47d..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/data/MetaData.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.data;
-
-import android.database.Cursor;
-import android.util.Log;
-
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-<<<<<<< HEAD
-// 定义一个名为MetaData的类，继承自Task类
-public class MetaData extends Task {
- // 通过getSimpleName方法获取类的简称，并存入名为TAG的字符串中
- private final static String TAG = MetaData.class.getSimpleName();
-
- // 声明一个字符串变量mRelatedGid，并初始化为null
- private String mRelatedGid = null;
-
- // 定义一个设置元数据的方法，接受gid和metaInfo作为参数
- public void setMeta(String gid, JSONObject metaInfo) {
- try {
- // 将元数据中的GTask ID放入metaInfo中
- metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
- } catch (JSONException e) {
- // 如果出现异常，记录错误日志
- Log.e(TAG, "failed to put related gid");
- }
- // 将设置好的元数据转换为字符串，并设置为任务的笔记
- setNotes(metaInfo.toString());
- // 设置任务的名称为META_NOTE_NAME
- setName(GTaskStringUtils.META_NOTE_NAME);
- }
-
- // 定义获取关联GTask ID的方法
-=======
-
-public class MetaData extends Task {
- private final static String TAG = MetaData.class.getSimpleName();
-
- private String mRelatedGid = null;
-
- public void setMeta(String gid, JSONObject metaInfo) {
- try {
- metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
- } catch (JSONException e) {
- Log.e(TAG, "failed to put related gid");
- }
- setNotes(metaInfo.toString());
- setName(GTaskStringUtils.META_NOTE_NAME);
- }
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public String getRelatedGid() {
- return mRelatedGid;
- }
-
-<<<<<<< HEAD
- // 重写父类的方法，判断任务是否值得保存
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- @Override
- public boolean isWorthSaving() {
- return getNotes() != null;
- }
-
-<<<<<<< HEAD
- // 重写父类的方法，根据远程JSON内容设置任务的内容
- @Override
- public void setContentByRemoteJSON(JSONObject js) {
- super.setContentByRemoteJSON(js);
- // 如果任务的笔记不为空
- if (getNotes() != null) {
- try {
- // 解析任务的笔记内容为JSON对象
- JSONObject metaInfo = new JSONObject(getNotes().trim());
- // 从解析得到的JSON对象中获取关联的GTask ID，并赋值给mRelatedGid
- mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
- } catch (JSONException e) {
- // 如果出现异常，记录警告日志，同时将mRelatedGid置为null
-=======
- @Override
- public void setContentByRemoteJSON(JSONObject js) {
- super.setContentByRemoteJSON(js);
- if (getNotes() != null) {
- try {
- JSONObject metaInfo = new JSONObject(getNotes().trim());
- mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
- } catch (JSONException e) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.w(TAG, "failed to get related gid");
- mRelatedGid = null;
- }
- }
- }
-
-<<<<<<< HEAD
- // 重写父类的方法，抛出非法访问错误，表示不应该调用此方法
- @Override
- public void setContentByLocalJSON(JSONObject js) {
- throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
- }
-
- // 重写父类的方法，抛出非法访问错误，表示不应该调用此方法
-=======
- @Override
- public void setContentByLocalJSON(JSONObject js) {
- // this function should not be called
- throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
- }
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- @Override
- public JSONObject getLocalJSONFromContent() {
- throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
- }
-
-<<<<<<< HEAD
- // 重写父类的方法，抛出非法访问错误，表示不应该调用此方法
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- @Override
- public int getSyncAction(Cursor c) {
- throw new IllegalAccessError("MetaData:getSyncAction should not be called");
- }
-<<<<<<< HEAD
-}
-
-=======
-
-}
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/20233171391/src/src/net/micode/notes/gtask/data/Node.java b/20233171391/src/src/net/micode/notes/gtask/data/Node.java
deleted file mode 100644
index 973818f..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/data/Node.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.data;
-
-import android.database.Cursor;
-
-import org.json.JSONObject;
-
-<<<<<<< HEAD
-// 定义一个抽象类 Node
-public abstract class Node {
- // 定义同步操作的常量，表示不同的同步动作
- public static final int SYNC_ACTION_NONE = 0; // 无同步动作
- public static final int SYNC_ACTION_ADD_REMOTE = 1; // 添加远程节点
- public static final int SYNC_ACTION_ADD_LOCAL = 2; // 添加本地节点
- public static final int SYNC_ACTION_DEL_REMOTE = 3; // 删除远程节点
- public static final int SYNC_ACTION_DEL_LOCAL = 4; // 删除本地节点
- public static final int SYNC_ACTION_UPDATE_REMOTE = 5; // 更新远程节点
- public static final int SYNC_ACTION_UPDATE_LOCAL = 6; // 更新本地节点
- public static final int SYNC_ACTION_UPDATE_CONFLICT = 7; // 更新冲突
- public static final int SYNC_ACTION_ERROR = 8; // 同步错误
-
- // 私有成员变量，用于表示节点的全局唯一标识、名称、最后修改时间和删除状态
- private String mGid;
- private String mName;
- private long mLastModified;
- private boolean mDeleted;
-
- // 构造方法，初始化节点的属性
-=======
-public abstract class Node {
- public static final int SYNC_ACTION_NONE = 0;
-
- public static final int SYNC_ACTION_ADD_REMOTE = 1;
-
- public static final int SYNC_ACTION_ADD_LOCAL = 2;
-
- public static final int SYNC_ACTION_DEL_REMOTE = 3;
-
- public static final int SYNC_ACTION_DEL_LOCAL = 4;
-
- public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
-
- public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
-
- public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
-
- public static final int SYNC_ACTION_ERROR = 8;
-
- private String mGid;
-
- private String mName;
-
- private long mLastModified;
-
- private boolean mDeleted;
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public Node() {
- mGid = null;
- mName = "";
- mLastModified = 0;
- mDeleted = false;
- }
-
-<<<<<<< HEAD
- // 抽象方法，用于获取创建操作的 JSON 对象
- public abstract JSONObject getCreateAction(int actionId);
-
- // 抽象方法，用于获取更新操作的 JSON 对象
- public abstract JSONObject getUpdateAction(int actionId);
-
- // 抽象方法，根据远程 JSON 设置节点内容
- public abstract void setContentByRemoteJSON(JSONObject js);
-
- // 抽象方法，根据本地 JSON 设置节点内容
- public abstract void setContentByLocalJSON(JSONObject js);
-
- // 抽象方法，获取节点内容的本地 JSON 对象
- public abstract JSONObject getLocalJSONFromContent();
-
- // 抽象方法，获取节点在同步时的动作类型
- public abstract int getSyncAction(Cursor c);
-
- // 设置节点的全局唯一标识
-=======
- public abstract JSONObject getCreateAction(int actionId);
-
- public abstract JSONObject getUpdateAction(int actionId);
-
- public abstract void setContentByRemoteJSON(JSONObject js);
-
- public abstract void setContentByLocalJSON(JSONObject js);
-
- public abstract JSONObject getLocalJSONFromContent();
-
- public abstract int getSyncAction(Cursor c);
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void setGid(String gid) {
- this.mGid = gid;
- }
-
-<<<<<<< HEAD
- // 设置节点的名称
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void setName(String name) {
- this.mName = name;
- }
-
-<<<<<<< HEAD
- // 设置节点的最后修改时间
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void setLastModified(long lastModified) {
- this.mLastModified = lastModified;
- }
-
-<<<<<<< HEAD
- // 设置节点的删除状态
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void setDeleted(boolean deleted) {
- this.mDeleted = deleted;
- }
-
-<<<<<<< HEAD
- // 获取节点的全局唯一标识
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public String getGid() {
- return this.mGid;
- }
-
-<<<<<<< HEAD
- // 获取节点的名称
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public String getName() {
- return this.mName;
- }
-
-<<<<<<< HEAD
- // 获取节点的最后修改时间
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public long getLastModified() {
- return this.mLastModified;
- }
-
-<<<<<<< HEAD
- // 获取节点的删除状态
- public boolean getDeleted() {
- return this.mDeleted;
- }
-}
-
-=======
- public boolean getDeleted() {
- return this.mDeleted;
- }
-
-}
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/20233171391/src/src/net/micode/notes/gtask/data/SqlData.java b/20233171391/src/src/net/micode/notes/gtask/data/SqlData.java
deleted file mode 100644
index ed66424..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/data/SqlData.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.data;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.data.NotesDatabaseHelper.TABLE;
-import net.micode.notes.gtask.exception.ActionFailureException;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-public class SqlData {
-<<<<<<< HEAD
- // 定义类常量 TAG，用于在日志中标识类名
- private static final String TAG = SqlData.class.getSimpleName();
-
- // 定义常量 INVALID_ID，表示无效的数据 ID
- private static final int INVALID_ID = -99999;
-
- // 定义数据表字段数组 PROJECTION_DATA
-=======
- private static final String TAG = SqlData.class.getSimpleName();
-
- private static final int INVALID_ID = -99999;
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public static final String[] PROJECTION_DATA = new String[] {
- DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
- DataColumns.DATA3
- };
-
-<<<<<<< HEAD
- // 定义数据表字段在数组中的索引常量
- public static final int DATA_ID_COLUMN = 0;
- public static final int DATA_MIME_TYPE_COLUMN = 1;
- public static final int DATA_CONTENT_COLUMN = 2;
- public static final int DATA_CONTENT_DATA_1_COLUMN = 3;
- public static final int DATA_CONTENT_DATA_3_COLUMN = 4;
-
- // 声明 ContentResolver 对象
- private ContentResolver mContentResolver;
-
- // 声明标志是否创建数据的变量
- private boolean mIsCreate;
-
- // 声明数据的 ID 变量
- private long mDataId;
-
- // 声明数据的 MIME 类型变量
- private String mDataMimeType;
-
- // 声明数据内容变量
- private String mDataContent;
-
- // 声明数据内容的 DATA1 字段变量
- private long mDataContentData1;
-
- // 声明数据内容的 DATA3 字段变量
- private String mDataContentData3;
-
- // 声明 ContentValues 对象，用于存储数据的差异值
- private ContentValues mDiffDataValues;
-
- // 构造方法，接受一个 Context 参数
- public SqlData(Context context) {
- // 获取 ContentResolver 对象
- mContentResolver = context.getContentResolver();
- // 初始化标志变量为 true，表示创建数据
- mIsCreate = true;
- // 初始化数据的 ID 为无效值
- mDataId = INVALID_ID;
- // 初始化数据的 MIME 类型为 DataConstants.NOTE
- mDataMimeType = DataConstants.NOTE;
- // 初始化数据内容为空字符串
- mDataContent = "";
- // 初始化数据内容的 DATA1 字段为 0
- mDataContentData1 = 0;
- // 初始化数据内容的 DATA3 字段为空字符串
- mDataContentData3 = "";
- // 初始化 ContentValues 对象
- mDiffDataValues = new ContentValues();
- }
-
- // 构造方法，接受一个 Context 和一个 Cursor 参数
- public SqlData(Context context, Cursor c) {
- // 获取 ContentResolver 对象
- mContentResolver = context.getContentResolver();
- // 初始化标志变量为 false，表示不是创建数据
- mIsCreate = false;
- // 调用 loadFromCursor 方法，从 Cursor 中加载数据
- loadFromCursor(c);
- // 初始化 ContentValues 对象
- mDiffDataValues = new ContentValues();
- }
-
- // 从 Cursor 中加载数据的私有方法
- private void loadFromCursor(Cursor c) {
- // 从 Cursor 中获取数据的 ID 并赋值给 mDataId
- mDataId = c.getLong(DATA_ID_COLUMN);
- // 从 Cursor 中获取数据的 MIME 类型并赋值给 mDataMimeType
- mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
- // 从 Cursor 中获取数据的内容并赋值给 mDataContent
- mDataContent = c.getString(DATA_CONTENT_COLUMN);
- // 从 Cursor 中获取数据的 DATA1 字段值并赋值给 mDataContentData1
- mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN);
- // 从 Cursor 中获取数据的 DATA3 字段值并赋值给 mDataContentData3
- mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
- }
-
- // 定义一个公共方法，用于设置数据内容，参数为JSONObject类型，可能会抛出JSONException异常
- public void setContent(JSONObject js) throws JSONException {
- // 从JSONObject中获取数据ID，如果存在则获取，否则使用INVALID_ID
- long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
-
- // 如果是创建操作（mIsCreate为真）或者数据ID与当前数据ID不同，则将数据ID放入差异数据集合中
- if (mIsCreate || mDataId != dataId) {
- mDiffDataValues.put(DataColumns.ID, dataId);
- }
-
- // 更新当前数据ID
- mDataId = dataId;
-
- // 从JSONObject中获取数据的MIME类型，如果存在则获取，否则使用默认值DataConstants.NOTE
- String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE)
- : DataConstants.NOTE;
-
- // 如果是创建操作或者当前MIME类型与新的MIME类型不同，则将新的MIME类型放入差异数据集合中
- if (mIsCreate || !mDataMimeType.equals(dataMimeType)) {
- mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType);
- }
-
- // 更新当前MIME类型
- mDataMimeType = dataMimeType;
-
- // 从JSONObject中获取数据内容，如果存在则获取，否则使用空字符串
- String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : "";
-
- // 如果是创建操作或者当前数据内容与新的数据内容不同，则将新的数据内容放入差异数据集合中
- if (mIsCreate || !mDataContent.equals(dataContent)) {
- mDiffDataValues.put(DataColumns.CONTENT, dataContent);
- }
-
- // 更新当前数据内容
- mDataContent = dataContent;
-
- // 从JSONObject中获取数据的DATA1，如果存在则获取，否则使用0
- long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0;
-
- // 如果是创建操作或者当前DATA1与新的DATA1不同，则将新的DATA1放入差异数据集合中
- if (mIsCreate || mDataContentData1 != dataContentData1) {
- mDiffDataValues.put(DataColumns.DATA1, dataContentData1);
- }
-
- // 更新当前DATA1
- mDataContentData1 = dataContentData1;
-
- // 从JSONObject中获取数据的DATA3，如果存在则获取，否则使用空字符串
- String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : "";
-
- // 如果是创建操作或者当前DATA3与新的DATA3不同，则将新的DATA3放入差异数据集合中
- if (mIsCreate || !mDataContentData3.equals(dataContentData3)) {
- mDiffDataValues.put(DataColumns.DATA3, dataContentData3);
- }
-
- // 更新当前DATA3
- mDataContentData3 = dataContentData3;
- }
-
- // 获取数据内容并以JSON对象形式返回的方法
- public JSONObject getContent() throws JSONException {
- // 如果数据尚未在数据库中创建，则输出错误日志并返回null
- if (mIsCreate) {
- Log.e(TAG, "似乎我们尚未在数据库中创建此数据");
- return null;
- }
-
- // 创建一个新的JSON对象
- JSONObject js = new JSONObject();
-
- // 将数据的各个字段放入JSON对象中
-=======
- public static final int DATA_ID_COLUMN = 0;
-
- public static final int DATA_MIME_TYPE_COLUMN = 1;
-
- public static final int DATA_CONTENT_COLUMN = 2;
-
- public static final int DATA_CONTENT_DATA_1_COLUMN = 3;
-
- public static final int DATA_CONTENT_DATA_3_COLUMN = 4;
-
- private ContentResolver mContentResolver;
-
- private boolean mIsCreate;
-
- private long mDataId;
-
- private String mDataMimeType;
-
- private String mDataContent;
-
- private long mDataContentData1;
-
- private String mDataContentData3;
-
- private ContentValues mDiffDataValues;
-
- public SqlData(Context context) {
- mContentResolver = context.getContentResolver();
- mIsCreate = true;
- mDataId = INVALID_ID;
- mDataMimeType = DataConstants.NOTE;
- mDataContent = "";
- mDataContentData1 = 0;
- mDataContentData3 = "";
- mDiffDataValues = new ContentValues();
- }
-
- public SqlData(Context context, Cursor c) {
- mContentResolver = context.getContentResolver();
- mIsCreate = false;
- loadFromCursor(c);
- mDiffDataValues = new ContentValues();
- }
-
- private void loadFromCursor(Cursor c) {
- mDataId = c.getLong(DATA_ID_COLUMN);
- mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
- mDataContent = c.getString(DATA_CONTENT_COLUMN);
- mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN);
- mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
- }
-
- public void setContent(JSONObject js) throws JSONException {
- long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
- if (mIsCreate || mDataId != dataId) {
- mDiffDataValues.put(DataColumns.ID, dataId);
- }
- mDataId = dataId;
-
- String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE)
- : DataConstants.NOTE;
- if (mIsCreate || !mDataMimeType.equals(dataMimeType)) {
- mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType);
- }
- mDataMimeType = dataMimeType;
-
- String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : "";
- if (mIsCreate || !mDataContent.equals(dataContent)) {
- mDiffDataValues.put(DataColumns.CONTENT, dataContent);
- }
- mDataContent = dataContent;
-
- long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0;
- if (mIsCreate || mDataContentData1 != dataContentData1) {
- mDiffDataValues.put(DataColumns.DATA1, dataContentData1);
- }
- mDataContentData1 = dataContentData1;
-
- String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : "";
- if (mIsCreate || !mDataContentData3.equals(dataContentData3)) {
- mDiffDataValues.put(DataColumns.DATA3, dataContentData3);
- }
- mDataContentData3 = dataContentData3;
- }
-
- public JSONObject getContent() throws JSONException {
- if (mIsCreate) {
- Log.e(TAG, "it seems that we haven't created this in database yet");
- return null;
- }
- JSONObject js = new JSONObject();
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- js.put(DataColumns.ID, mDataId);
- js.put(DataColumns.MIME_TYPE, mDataMimeType);
- js.put(DataColumns.CONTENT, mDataContent);
- js.put(DataColumns.DATA1, mDataContentData1);
- js.put(DataColumns.DATA3, mDataContentData3);
-<<<<<<< HEAD
-
- // 返回构建好的JSON对象
- return js;
- }
-
- // 提交数据的方法，接受笔记ID、验证版本的标志和版本号作为参数
- public void commit(long noteId, boolean validateVersion, long version) {
- // 如果数据尚未在数据库中创建
- if (mIsCreate) {
- // 如果数据ID无效且差异数据中包含ID字段，则移除ID字段
-=======
- return js;
- }
-
- public void commit(long noteId, boolean validateVersion, long version) {
-
- if (mIsCreate) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
- mDiffDataValues.remove(DataColumns.ID);
- }
-
-<<<<<<< HEAD
- // 将NOTE_ID字段设置为传入的noteId
- mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
-
- // 插入数据到数据库中
- Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
-
- // 尝试从插入操作的URI中获取新创建的数据ID
- try {
- mDataId = Long.valueOf(uri.getPathSegments().get(1));
- } catch (NumberFormatException e) {
- // 如果转换异常，则输出错误日志并抛出ActionFailureException异常
- Log.e(TAG, "获取笔记ID错误：" + e.toString());
- throw new ActionFailureException("创建笔记失败");
- }
- } else {
- // 如果数据已存在且存在差异数据
- if (mDiffDataValues.size() > 0) {
- int result = 0;
- // 如果不需要验证版本，则直接更新数据
-=======
- mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
- Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
- try {
- mDataId = Long.valueOf(uri.getPathSegments().get(1));
- } catch (NumberFormatException e) {
- Log.e(TAG, "Get note id error :" + e.toString());
- throw new ActionFailureException("create note failed");
- }
- } else {
- if (mDiffDataValues.size() > 0) {
- int result = 0;
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (!validateVersion) {
- result = mContentResolver.update(ContentUris.withAppendedId(
- Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
- } else {
-<<<<<<< HEAD
- // 否则，通过验证版本号来更新数据
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- result = mContentResolver.update(ContentUris.withAppendedId(
- Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
- " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
- + " WHERE " + NoteColumns.VERSION + "=?)", new String[] {
- String.valueOf(noteId), String.valueOf(version)
- });
- }
- if (result == 0) {
- Log.w(TAG, "there is no update. maybe user updates note when syncing");
- }
- }
- }
-
- mDiffDataValues.clear();
- mIsCreate = false;
- }
-
- public long getId() {
- return mDataId;
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/gtask/data/SqlNote.java b/20233171391/src/src/net/micode/notes/gtask/data/SqlNote.java
deleted file mode 100644
index 12c7c3c..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/data/SqlNote.java
+++ /dev/null
@@ -1,863 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.data;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-import net.micode.notes.tool.ResourceParser;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-
-public class SqlNote {
-<<<<<<< HEAD
- // 定义一个类常量 TAG，用于在日志中标识当前类名
- private static final String TAG = SqlNote.class.getSimpleName();
-
- // 定义一个无效的 ID 常量，用于标识无效的数据库记录
- private static final int INVALID_ID = -99999;
-
- // 定义一个投影数组 PROJECTION_NOTE，包含了数据库表中的各列名
-=======
- private static final String TAG = SqlNote.class.getSimpleName();
-
- private static final int INVALID_ID = -99999;
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public static final String[] PROJECTION_NOTE = new String[] {
- NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID,
- NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE,
- NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE,
- NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID,
- NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
- NoteColumns.VERSION
- };
-
-<<<<<<< HEAD
- // 定义投影数组中各列的索引常量，以便后续使用
- public static final int ID_COLUMN = 0;
- public static final int ALERTED_DATE_COLUMN = 1;
- public static final int BG_COLOR_ID_COLUMN = 2;
- public static final int CREATED_DATE_COLUMN = 3;
- public static final int HAS_ATTACHMENT_COLUMN = 4;
- public static final int MODIFIED_DATE_COLUMN = 5;
- public static final int NOTES_COUNT_COLUMN = 6;
- public static final int PARENT_ID_COLUMN = 7;
- public static final int SNIPPET_COLUMN = 8;
- public static final int TYPE_COLUMN = 9;
- public static final int WIDGET_ID_COLUMN = 10;
- public static final int WIDGET_TYPE_COLUMN = 11;
- public static final int SYNC_ID_COLUMN = 12;
- public static final int LOCAL_MODIFIED_COLUMN = 13;
- public static final int ORIGIN_PARENT_ID_COLUMN = 14;
- public static final int GTASK_ID_COLUMN = 15;
- public static final int VERSION_COLUMN = 16;
-
- // 定义类的成员变量
- private Context mContext; // 上下文对象
-
- private ContentResolver mContentResolver; // 内容解析器
-
- private boolean mIsCreate; // 标识是否为创建操作
-
- private long mId; // 记录的 ID
-
- private long mAlertDate; // 提醒日期
-
- private int mBgColorId; // 背景颜色 ID
-
- private long mCreatedDate; // 创建日期
-
- private int mHasAttachment; // 是否有附件
-
- private long mModifiedDate; // 修改日期
-
- private long mParentId; // 父记录的 ID
-
- private String mSnippet; // 记录的片段
-
- private int mType; // 记录的类型
-
- private int mWidgetId; // 小部件的 ID
-
- private int mWidgetType; // 小部件的类型
-
- private long mOriginParent; // 私有成员变量，用于存储原始父级ID
-
- private long mVersion; // 私有成员变量，用于存储版本号
-
- private ContentValues mDiffNoteValues; // 私有成员变量，用于存储数据库中笔记的差异内容
-
- private ArrayList mDataList; // 私有成员变量，存储SqlData类型的ArrayList
-
- public SqlNote(Context context) { // 构造函数，接收一个Context参数
- mContext = context; // 将传入的Context赋值给成员变量
- mContentResolver = context.getContentResolver(); // 通过传入的Context获取ContentResolver
- mIsCreate = true; // 设置标志位为true，表示创建新的笔记
- mId = INVALID_ID; // 将mId设为无效ID
- mAlertDate = 0; // 设置警报日期为0
- mBgColorId = ResourceParser.getDefaultBgId(context); // 从ResourceParser获取默认背景ID
- mCreatedDate = System.currentTimeMillis(); // 获取当前时间作为笔记创建时间
- mHasAttachment = 0; // 设置附件标志位为0，表示没有附件
- mModifiedDate = System.currentTimeMillis(); // 获取当前时间作为笔记修改时间
- mParentId = 0; // 将父级ID设为0
- mSnippet = ""; // 将摘录字段设为空字符串
- mType = Notes.TYPE_NOTE; // 将笔记类型设为普通笔记类型
- mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID; // 将小部件ID设为无效ID
- mWidgetType = Notes.TYPE_WIDGET_INVALIDE; // 将小部件类型设为无效类型
- mOriginParent = 0; // 将原始父级ID设为0
- mVersion = 0; // 将版本号设为0
- mDiffNoteValues = new ContentValues(); // 初始化笔记差异内容为一个新的ContentValues对象
- mDataList = new ArrayList(); // 初始化数据列表为一个新的SqlData类型的ArrayList对象
- }
-
- public SqlNote(Context context, Cursor c) { // 构造函数，接收一个Context和Cursor参数
- mContext = context; // 将传入的Context赋值给成员变量
- mContentResolver = context.getContentResolver(); // 通过传入的Context获取ContentResolver
- mIsCreate = false; // 设置标志位为false，表示不是创建新的笔记
- loadFromCursor(c); // 调用loadFromCursor方法，从Cursor加载数据
- mDataList = new ArrayList(); // 初始化数据列表为一个新的SqlData类型的ArrayList对象
- if (mType == Notes.TYPE_NOTE) // 如果笔记类型是普通笔记
- loadDataContent(); // 调用loadDataContent方法，加载数据内容
- mDiffNoteValues = new ContentValues(); // 初始化笔记差异内容为一个新的ContentValues对象
- }
-
- public SqlNote(Context context, long id) { // 构造函数，接收一个Context和一个长整型ID参数
- mContext = context; // 将传入的Context赋值给成员变量
- mContentResolver = context.getContentResolver(); // 通过传入的Context获取ContentResolver
- mIsCreate = false; // 设置标志位为false，表示不是创建新的笔记
- loadFromCursor(id); // 调用loadFromCursor方法，从ID加载数据
- mDataList = new ArrayList(); // 初始化数据列表为一个新的SqlData类型的ArrayList对象
- if (mType == Notes.TYPE_NOTE) // 如果笔记类型是普通笔记
- loadDataContent(); // 调用loadDataContent方法，加载数据内容
- mDiffNoteValues = new ContentValues(); // 初始化笔记差异内容为一个新的ContentValues对象
- }
-
- private void loadFromCursor(long id) { // 从数据库中加载数据的私有方法，接收一个长整型ID参数
- Cursor c = null; // 声明Cursor对象并初始化为null
- try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
- new String[]{String.valueOf(id)}, null); // 通过ContentResolver查询数据库获取Cursor
- if (c != null) { // 如果Cursor不为null
- c.moveToNext(); // 移动Cursor到下一行
- loadFromCursor(c); // 调用loadFromCursor方法，从Cursor加载数据
- } else {
- // 处理Cursor为null的情况
-=======
- public static final int ID_COLUMN = 0;
-
- public static final int ALERTED_DATE_COLUMN = 1;
-
- public static final int BG_COLOR_ID_COLUMN = 2;
-
- public static final int CREATED_DATE_COLUMN = 3;
-
- public static final int HAS_ATTACHMENT_COLUMN = 4;
-
- public static final int MODIFIED_DATE_COLUMN = 5;
-
- public static final int NOTES_COUNT_COLUMN = 6;
-
- public static final int PARENT_ID_COLUMN = 7;
-
- public static final int SNIPPET_COLUMN = 8;
-
- public static final int TYPE_COLUMN = 9;
-
- public static final int WIDGET_ID_COLUMN = 10;
-
- public static final int WIDGET_TYPE_COLUMN = 11;
-
- public static final int SYNC_ID_COLUMN = 12;
-
- public static final int LOCAL_MODIFIED_COLUMN = 13;
-
- public static final int ORIGIN_PARENT_ID_COLUMN = 14;
-
- public static final int GTASK_ID_COLUMN = 15;
-
- public static final int VERSION_COLUMN = 16;
-
- private Context mContext;
-
- private ContentResolver mContentResolver;
-
- private boolean mIsCreate;
-
- private long mId;
-
- private long mAlertDate;
-
- private int mBgColorId;
-
- private long mCreatedDate;
-
- private int mHasAttachment;
-
- private long mModifiedDate;
-
- private long mParentId;
-
- private String mSnippet;
-
- private int mType;
-
- private int mWidgetId;
-
- private int mWidgetType;
-
- private long mOriginParent;
-
- private long mVersion;
-
- private ContentValues mDiffNoteValues;
-
- private ArrayList mDataList;
-
- public SqlNote(Context context) {
- mContext = context;
- mContentResolver = context.getContentResolver();
- mIsCreate = true;
- mId = INVALID_ID;
- mAlertDate = 0;
- mBgColorId = ResourceParser.getDefaultBgId(context);
- mCreatedDate = System.currentTimeMillis();
- mHasAttachment = 0;
- mModifiedDate = System.currentTimeMillis();
- mParentId = 0;
- mSnippet = "";
- mType = Notes.TYPE_NOTE;
- mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
- mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
- mOriginParent = 0;
- mVersion = 0;
- mDiffNoteValues = new ContentValues();
- mDataList = new ArrayList();
- }
-
- public SqlNote(Context context, Cursor c) {
- mContext = context;
- mContentResolver = context.getContentResolver();
- mIsCreate = false;
- loadFromCursor(c);
- mDataList = new ArrayList();
- if (mType == Notes.TYPE_NOTE)
- loadDataContent();
- mDiffNoteValues = new ContentValues();
- }
-
- public SqlNote(Context context, long id) {
- mContext = context;
- mContentResolver = context.getContentResolver();
- mIsCreate = false;
- loadFromCursor(id);
- mDataList = new ArrayList();
- if (mType == Notes.TYPE_NOTE)
- loadDataContent();
- mDiffNoteValues = new ContentValues();
-
- }
-
- private void loadFromCursor(long id) {
- Cursor c = null;
- try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
- new String[] {
- String.valueOf(id)
- }, null);
- if (c != null) {
- c.moveToNext();
- loadFromCursor(c);
- } else {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.w(TAG, "loadFromCursor: cursor = null");
- }
- } finally {
- if (c != null)
- c.close();
- }
- }
-
- private void loadFromCursor(Cursor c) {
- mId = c.getLong(ID_COLUMN);
- mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
- mBgColorId = c.getInt(BG_COLOR_ID_COLUMN);
- mCreatedDate = c.getLong(CREATED_DATE_COLUMN);
- mHasAttachment = c.getInt(HAS_ATTACHMENT_COLUMN);
- mModifiedDate = c.getLong(MODIFIED_DATE_COLUMN);
- mParentId = c.getLong(PARENT_ID_COLUMN);
- mSnippet = c.getString(SNIPPET_COLUMN);
- mType = c.getInt(TYPE_COLUMN);
- mWidgetId = c.getInt(WIDGET_ID_COLUMN);
- mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
- mVersion = c.getLong(VERSION_COLUMN);
- }
-
- private void loadDataContent() {
- Cursor c = null;
- mDataList.clear();
- try {
- c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA,
- "(note_id=?)", new String[] {
- String.valueOf(mId)
- }, null);
- if (c != null) {
- if (c.getCount() == 0) {
- Log.w(TAG, "it seems that the note has not data");
- return;
- }
- while (c.moveToNext()) {
- SqlData data = new SqlData(mContext, c);
- mDataList.add(data);
- }
- } else {
- Log.w(TAG, "loadDataContent: cursor = null");
- }
- } finally {
- if (c != null)
- c.close();
- }
- }
-
- public boolean setContent(JSONObject js) {
- try {
-<<<<<<< HEAD
- // 从JSONObject中获取名为META_HEAD_NOTE的JSONObject对象
- JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-
- // 判断Note的类型是否为系统类型
- if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
- // 如果是系统类型，记录警告信息并返回false
- Log.w(TAG, "cannot set system folder");
- } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
- // 如果是文件夹类型，更新摘要和类型信息
- // 获取摘要信息，如果不存在则使用空字符串
- String snippet = note.has(NoteColumns.SNIPPET) ? note.getString(NoteColumns.SNIPPET) : "";
-
- // 判断是否是创建操作或者摘要信息发生变化
- if (mIsCreate || !mSnippet.equals(snippet)) {
- // 如果是创建操作或者摘要信息发生变化，则将摘要信息放入mDiffNoteValues中
- mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
- }
- // 更新当前的摘要信息
- mSnippet = snippet;
-
- // 获取类型信息，如果不存在则使用默认类型Notes.TYPE_NOTE
- int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) : Notes.TYPE_NOTE;
-
- // 判断是否是创建操作或者类型信息发生变化
- if (mIsCreate || mType != type) {
- // 如果是创建操作或者类型信息发生变化，则将类型信息放入mDiffNoteValues中
- mDiffNoteValues.put(NoteColumns.TYPE, type);
- }
- // 更新当前的类型信息
- mType = type;
- } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
- // 如果是笔记类型，获取名为META_HEAD_DATA的JSONArray对象
- JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-
- // 获取笔记的ID，如果不存在则使用INVALID_ID
- long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
-
- // 判断是否是创建操作或者ID发生变化
- if (mIsCreate || mId != id) {
- // 如果是创建操作或者ID发生变化，则将ID放入mDiffNoteValues中
- mDiffNoteValues.put(NoteColumns.ID, id);
- }
- // 更新当前的ID信息
- mId = id;
-
- // 获取提醒日期，如果不存在则使用0
- long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note.getLong(NoteColumns.ALERTED_DATE) : 0;
-
- // 判断是否是创建操作或者提醒日期发生变化
- if (mIsCreate || mAlertDate != alertDate) {
- // 如果是创建操作或者提醒日期发生变化，则将提醒日期放入mDiffNoteValues中
- mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);
- }
- // 更新当前的提醒日期信息
- mAlertDate = alertDate;
-
- // 获取背景颜色ID，如果不存在则使用默认的背景颜色ID
- int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note.getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
-
- // 判断是否是创建操作或者背景颜色ID发生变化
-=======
- JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
- if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
- Log.w(TAG, "cannot set system folder");
- } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
- // for folder we can only update the snnipet and type
- String snippet = note.has(NoteColumns.SNIPPET) ? note
- .getString(NoteColumns.SNIPPET) : "";
- if (mIsCreate || !mSnippet.equals(snippet)) {
- mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
- }
- mSnippet = snippet;
-
- int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
- : Notes.TYPE_NOTE;
- if (mIsCreate || mType != type) {
- mDiffNoteValues.put(NoteColumns.TYPE, type);
- }
- mType = type;
- } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
- JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
- long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
- if (mIsCreate || mId != id) {
- mDiffNoteValues.put(NoteColumns.ID, id);
- }
- mId = id;
-
- long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note
- .getLong(NoteColumns.ALERTED_DATE) : 0;
- if (mIsCreate || mAlertDate != alertDate) {
- mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);
- }
- mAlertDate = alertDate;
-
- int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
- .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (mIsCreate || mBgColorId != bgColorId) {
- mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);
- }
- mBgColorId = bgColorId;
-
-<<<<<<< HEAD
- // 获取笔记的创建日期，如果存在 CREATED_DATE 列，则使用该值，否则使用当前系统时间
- long createDate = note.has(NoteColumns.CREATED_DATE) ? note
- .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
- // 如果是创建操作（mIsCreate 为 true）或者创建日期与当前日期不同，将创建日期加入到差异值集合中
- if (mIsCreate || mCreatedDate != createDate) {
- mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate);
- }
-// 更新 mCreatedDate 为当前创建日期
- mCreatedDate = createDate;
-
-// 获取是否有附件的信息，如果存在 HAS_ATTACHMENT 列，则使用该值，否则默认为 0
- int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note
- .getInt(NoteColumns.HAS_ATTACHMENT) : 0;
-// 如果是创建操作或者附件信息与当前不同，将附件信息加入到差异值集合中
- if (mIsCreate || mHasAttachment != hasAttachment) {
- mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment);
- }
-// 更新 mHasAttachment 为当前附件信息
-
- mHasAttachment = hasAttachment;
-
-// 获取笔记的修改日期，如果存在 MODIFIED_DATE 列，则使用该值，否则使用当前系统时间
- long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note
- .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis();
-// 如果是创建操作或者修改日期与当前不同，将修改日期加入到差异值集合中
- if (mIsCreate || mModifiedDate != modifiedDate) {
- mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate);
- }
-// 更新 mModifiedDate 为当前修改日期
-
- long parentId = note.has(NoteColumns.PARENT_ID) ? note
- .getLong(NoteColumns.PARENT_ID) : 0;
-// 如果是创建操作或者父级 ID 与当前不同，将父级 ID 加入到差异值集合中
- if (mIsCreate || mParentId != parentId) {
- mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId);
- }
-// 更新 mParentId 为当前父级 ID
-
-// 获取笔记的摘要信息，如果存在 SNIPPET 列，则使用该值，否则默认为空字符串
- String snippet = note.has(NoteColumns.SNIPPET) ? note
- .getString(NoteColumns.SNIPPET) : "";
-// 如果是创建操作或者摘要信息与当前不同，将摘要信息加入到差异值集合中
- if (mIsCreate || !mSnippet.equals(snippet)) {
- mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
- }
-// 更新 mSnippet 为当前摘要信息
-
-// 获取笔记的类型信息，如果存在 TYPE 列，则使用该值，否则默认为 Notes.TYPE_NOTE
- int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
- : Notes.TYPE_NOTE;
-// 如果是创建操作或者类型信息与当前不同，将类型信息加入到差异值集合中
- if (mIsCreate || mType != type) {
- mDiffNoteValues.put(NoteColumns.TYPE, type);
- }
-
-=======
- long createDate = note.has(NoteColumns.CREATED_DATE) ? note
- .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
- if (mIsCreate || mCreatedDate != createDate) {
- mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate);
- }
- mCreatedDate = createDate;
-
- int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note
- .getInt(NoteColumns.HAS_ATTACHMENT) : 0;
- if (mIsCreate || mHasAttachment != hasAttachment) {
- mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment);
- }
- mHasAttachment = hasAttachment;
-
- long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note
- .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis();
- if (mIsCreate || mModifiedDate != modifiedDate) {
- mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate);
- }
- mModifiedDate = modifiedDate;
-
- long parentId = note.has(NoteColumns.PARENT_ID) ? note
- .getLong(NoteColumns.PARENT_ID) : 0;
- if (mIsCreate || mParentId != parentId) {
- mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId);
- }
- mParentId = parentId;
-
- String snippet = note.has(NoteColumns.SNIPPET) ? note
- .getString(NoteColumns.SNIPPET) : "";
- if (mIsCreate || !mSnippet.equals(snippet)) {
- mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
- }
- mSnippet = snippet;
-
- int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
- : Notes.TYPE_NOTE;
- if (mIsCreate || mType != type) {
- mDiffNoteValues.put(NoteColumns.TYPE, type);
- }
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- mType = type;
-
- int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
- : AppWidgetManager.INVALID_APPWIDGET_ID;
- if (mIsCreate || mWidgetId != widgetId) {
- mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId);
- }
- mWidgetId = widgetId;
-
-<<<<<<< HEAD
- // 获取note的widgetId，如果有的话，使用note中的值；否则，使用INVALID_APPWIDGET_ID
- int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
- : AppWidgetManager.INVALID_APPWIDGET_ID;
-// 如果是创建（mIsCreate为true）或者mWidgetId与widgetId不相等，将widgetId放入mDiffNoteValues
- if (mIsCreate || mWidgetId != widgetId) {
- mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId);
- }
-// 更新mWidgetId为当前的widgetId
- mWidgetId = widgetId;
-
-// 获取note的widgetType，如果有的话，使用note中的值；否则，使用TYPE_WIDGET_INVALIDE
- int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
- .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE;
-// 如果是创建（mIsCreate为true）或者mWidgetType与widgetType不相等，将widgetType放入mDiffNoteValues
- if (mIsCreate || mWidgetType != widgetType) {
- mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType);
- }
-// 更新mWidgetType为当前的widgetType
- mWidgetType = widgetType;
-
-// 获取note的originParent，如果有的话，使用note中的值；否则，使用0
- long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
- .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0;
-// 如果是创建（mIsCreate为true）或者mOriginParent与originParent不相等，将originParent放入mDiffNoteValues
- if (mIsCreate || mOriginParent != originParent) {
- mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent);
- }
-// 更新mOriginParent为当前的originParent
- mOriginParent = originParent;
-
-// 循环处理dataArray中的每个元素
- for (int i = 0; i < dataArray.length(); i++) {
- // 获取dataArray中的JSONObject
- JSONObject data = dataArray.getJSONObject(i);
- // 初始化一个SqlData对象
- SqlData sqlData = null;
- // 如果data中有ID属性
- if (data.has(DataColumns.ID)) {
- // 获取data中的ID值
- long dataId = data.getLong(DataColumns.ID);
- // 遍历mDataList，查找是否存在与dataId相等的ID
-=======
- int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
- .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE;
- if (mIsCreate || mWidgetType != widgetType) {
- mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType);
- }
- mWidgetType = widgetType;
-
- long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
- .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0;
- if (mIsCreate || mOriginParent != originParent) {
- mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent);
- }
- mOriginParent = originParent;
-
- for (int i = 0; i < dataArray.length(); i++) {
- JSONObject data = dataArray.getJSONObject(i);
- SqlData sqlData = null;
- if (data.has(DataColumns.ID)) {
- long dataId = data.getLong(DataColumns.ID);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- for (SqlData temp : mDataList) {
- if (dataId == temp.getId()) {
- sqlData = temp;
- }
- }
- }
-<<<<<<< HEAD
- // 如果sqlData为null，说明在mDataList中找不到相应的SqlData对象，则新建一个
- if (sqlData == null) {
- sqlData = new SqlData(mContext);
- // 将新建的sqlData添加到mDataList中
- mDataList.add(sqlData);
- }
- // 将data的内容设置到sqlData中
- sqlData.setContent(data);
- }
- }
- } catch (JSONException e) {// 捕获可能抛出的JSONException异常
- // 打印异常信息
- Log.e(TAG, e.toString());
- e.printStackTrace();
- // 返回false表示操作失败
-=======
-
- if (sqlData == null) {
- sqlData = new SqlData(mContext);
- mDataList.add(sqlData);
- }
-
- sqlData.setContent(data);
- }
- }
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- return false;
- }
- return true;
- }
-
- public JSONObject getContent() {
- try {
- JSONObject js = new JSONObject();
-
- if (mIsCreate) {
- Log.e(TAG, "it seems that we haven't created this in database yet");
- return null;
- }
-
- JSONObject note = new JSONObject();
- if (mType == Notes.TYPE_NOTE) {
- note.put(NoteColumns.ID, mId);
- note.put(NoteColumns.ALERTED_DATE, mAlertDate);
- note.put(NoteColumns.BG_COLOR_ID, mBgColorId);
- note.put(NoteColumns.CREATED_DATE, mCreatedDate);
- note.put(NoteColumns.HAS_ATTACHMENT, mHasAttachment);
- note.put(NoteColumns.MODIFIED_DATE, mModifiedDate);
- note.put(NoteColumns.PARENT_ID, mParentId);
- note.put(NoteColumns.SNIPPET, mSnippet);
- note.put(NoteColumns.TYPE, mType);
- note.put(NoteColumns.WIDGET_ID, mWidgetId);
- note.put(NoteColumns.WIDGET_TYPE, mWidgetType);
- note.put(NoteColumns.ORIGIN_PARENT_ID, mOriginParent);
- js.put(GTaskStringUtils.META_HEAD_NOTE, note);
-
- JSONArray dataArray = new JSONArray();
- for (SqlData sqlData : mDataList) {
- JSONObject data = sqlData.getContent();
- if (data != null) {
- dataArray.put(data);
- }
- }
- js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
- } else if (mType == Notes.TYPE_FOLDER || mType == Notes.TYPE_SYSTEM) {
- note.put(NoteColumns.ID, mId);
- note.put(NoteColumns.TYPE, mType);
- note.put(NoteColumns.SNIPPET, mSnippet);
- js.put(GTaskStringUtils.META_HEAD_NOTE, note);
- }
-
- return js;
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- }
- return null;
- }
-
- public void setParentId(long id) {
- mParentId = id;
- mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
- }
-
- public void setGtaskId(String gid) {
- mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
- }
-
- public void setSyncId(long syncId) {
- mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
- }
-
- public void resetLocalModified() {
- mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
- }
-
- public long getId() {
- return mId;
- }
-
- public long getParentId() {
- return mParentId;
- }
-
- public String getSnippet() {
- return mSnippet;
- }
-
- public boolean isNoteType() {
- return mType == Notes.TYPE_NOTE;
- }
-
- public void commit(boolean validateVersion) {
-<<<<<<< HEAD
- // 如果是新创建的笔记
- if (mIsCreate) {
- // 如果笔记ID为无效且差异数据中包含ID字段，则移除ID字段
-=======
- if (mIsCreate) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
- mDiffNoteValues.remove(NoteColumns.ID);
- }
-
-<<<<<<< HEAD
- // 在Notes.CONTENT_NOTE_URI下插入差异数据，并获取返回的Uri
- Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
- try {
- // 从Uri中获取插入笔记的ID
- mId = Long.valueOf(uri.getPathSegments().get(1));
- } catch (NumberFormatException e) {
- // 处理获取笔记ID时的异常
- Log.e(TAG, "Get note id error :" + e.toString());
- throw new ActionFailureException("create note failed");
- }
-
- // 如果笔记ID为0，则抛出异常，表示创建线程ID失败
-=======
- Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
- try {
- mId = Long.valueOf(uri.getPathSegments().get(1));
- } catch (NumberFormatException e) {
- Log.e(TAG, "Get note id error :" + e.toString());
- throw new ActionFailureException("create note failed");
- }
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (mId == 0) {
- throw new IllegalStateException("Create thread id failed");
- }
-
-<<<<<<< HEAD
- // 如果笔记类型是Notes.TYPE_NOTE，则提交关联的SqlData
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (mType == Notes.TYPE_NOTE) {
- for (SqlData sqlData : mDataList) {
- sqlData.commit(mId, false, -1);
- }
- }
- } else {
-<<<<<<< HEAD
- // 如果不是新创建的笔记
- // 如果笔记ID小于等于0且不是根文件夹或通话记录文件夹，则抛出异常，表示没有这样的笔记
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) {
- Log.e(TAG, "No such note");
- throw new IllegalStateException("Try to update note with invalid id");
- }
-<<<<<<< HEAD
-
- // 如果差异数据中有内容，则增加版本号，然后根据是否验证版本号来更新笔记
- if (mDiffNoteValues.size() > 0) {
- mVersion++;
- int result = 0;
- if (!validateVersion) {
- // 如果不验证版本号，则直接更新笔记
- result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
- + NoteColumns.ID + "=?)", new String[] {
- String.valueOf(mId)
- });
- } else {
- // 如果验证版本号，则更新笔记时需满足ID和版本号条件
- result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
- + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
-=======
- if (mDiffNoteValues.size() > 0) {
- mVersion ++;
- int result = 0;
- if (!validateVersion) {
- result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
- + NoteColumns.ID + "=?)", new String[] {
- String.valueOf(mId)
- });
- } else {
- result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
- + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- new String[] {
- String.valueOf(mId), String.valueOf(mVersion)
- });
- }
-<<<<<<< HEAD
-
- // 如果更新操作影响的行数为0，则打印警告信息
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (result == 0) {
- Log.w(TAG, "there is no update. maybe user updates note when syncing");
- }
- }
-
- if (mType == Notes.TYPE_NOTE) {
- for (SqlData sqlData : mDataList) {
- sqlData.commit(mId, validateVersion, mVersion);
- }
- }
- }
-
- // refresh local info
- loadFromCursor(mId);
- if (mType == Notes.TYPE_NOTE)
- loadDataContent();
-
- mDiffNoteValues.clear();
- mIsCreate = false;
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/gtask/data/Task.java b/20233171391/src/src/net/micode/notes/gtask/data/Task.java
deleted file mode 100644
index ee8326e..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/data/Task.java
+++ /dev/null
@@ -1,580 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.data;
-
-import android.database.Cursor;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.DataConstants;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-public class Task extends Node {
- private static final String TAG = Task.class.getSimpleName();
-
- private boolean mCompleted;
-
- private String mNotes;
-
- private JSONObject mMetaInfo;
-
- private Task mPriorSibling;
-
- private TaskList mParent;
-
- public Task() {
- super();
- mCompleted = false;
- mNotes = null;
- mPriorSibling = null;
- mParent = null;
- mMetaInfo = null;
- }
-
- public JSONObject getCreateAction(int actionId) {
- JSONObject js = new JSONObject();
-
- try {
- // action_type
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
- GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
-<<<<<<< HEAD
- // 将动作类型放入 JSON 对象中
-
- // action_id
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
- // 将动作 ID 放入 JSON 对象中
-
- // index
- js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this));
- // 将索引放入 JSON 对象中，索引通过 mParent.getChildTaskIndex(this) 获取
-
- // entity_delta
- JSONObject entity = new JSONObject();
- // 创建名为 entity 的 JSON 对象
-
- entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
- // 将任务的名称放入 entity JSON 对象中
- entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
- // 将创建者 ID（字符串 "null"）放入 entity JSON 对象中
- entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
- GTaskStringUtils.GTASK_JSON_TYPE_TASK);
- // 将实体类型（任务类型）放入 entity JSON 对象中
-
- if (getNotes() != null) {
- entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
- // 如果存在任务备注，则将备注放入 entity JSON 对象中
- }
-
- js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
- // 将 entity JSON 对象放入主 JSON 对象中的 ENTITY_DELTA 字段
-
- // parent_id
- js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid());
- // 将父任务的 ID 放入 JSON 对象中的 PARENT_ID 字段
-=======
-
- // action_id
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
- // index
- js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this));
-
- // entity_delta
- JSONObject entity = new JSONObject();
- entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
- entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
- entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
- GTaskStringUtils.GTASK_JSON_TYPE_TASK);
- if (getNotes() != null) {
- entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
- }
- js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
- // parent_id
- js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid());
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-
- // dest_parent_type
- js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE,
- GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
-<<<<<<< HEAD
- // 将目标父节点的类型（群组类型）放入 JSON 对象中的 DEST_PARENT_TYPE 字段
-
- // list_id
- js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid());
- // 将列表 ID 放入 JSON 对象中，使用父任务的 ID
-=======
-
- // list_id
- js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid());
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-
- // prior_sibling_id
- if (mPriorSibling != null) {
- js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid());
-<<<<<<< HEAD
- // 如果存在前一个兄弟任务，则将其 ID 放入 JSON 对象中的 PRIOR_SIBLING_ID 字段
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- }
-
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("fail to generate task-create jsonobject");
-<<<<<<< HEAD
- // 在发生 JSON 异常时，记录异常信息并抛出 ActionFailureException 异常
- }
-
- return js;
- // 返回构建好的 JSON 对象
- }
-
-
- public JSONObject getUpdateAction(int actionId) {
- // 创建一个新的JSONObject对象
- JSONObject js = new JSONObject();
-
- try {
- // 设置action_type为"update"
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
- GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
-
- // 设置action_id为传入的参数actionId
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
- // 设置id为当前对象的gid
- js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
-
- // 创建并设置entity_delta
- JSONObject entity = new JSONObject();
- // 设置entity中的name为当前对象的name
- entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
- // 如果notes不为空，设置entity中的notes为当前对象的notes
- if (getNotes() != null) {
- entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
- }
- // 设置entity中的deleted为当前对象的deleted
- entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
- // 将entity放入js的entity_delta中
- js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
- } catch (JSONException e) {
- // 捕获JSONException异常
- Log.e(TAG, e.toString());
- e.printStackTrace();
- // 抛出ActionFailureException异常，表示生成task-update JSONObject失败
- throw new ActionFailureException("fail to generate task-update jsonobject");
- }
-
- // 返回构建好的JSONObject对象
-=======
- }
-
- return js;
- }
-
- public JSONObject getUpdateAction(int actionId) {
- JSONObject js = new JSONObject();
-
- try {
- // action_type
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
- GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
-
- // action_id
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
- // id
- js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
-
- // entity_delta
- JSONObject entity = new JSONObject();
- entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
- if (getNotes() != null) {
- entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
- }
- entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
- js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("fail to generate task-update jsonobject");
- }
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- return js;
- }
-
- public void setContentByRemoteJSON(JSONObject js) {
-<<<<<<< HEAD
- // 检查传入的JSONObject是否为空
- if (js != null) {
- try {
- // 如果JSONObject包含id字段，设置当前对象的gid为该字段的值
-=======
- if (js != null) {
- try {
- // id
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
- setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
- }
-
-<<<<<<< HEAD
- // 如果JSONObject包含last_modified字段，设置当前对象的lastModified为该字段的值
-=======
- // last_modified
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
- setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
- }
-
-<<<<<<< HEAD
- // 如果JSONObject包含name字段，设置当前对象的name为该字段的值
-=======
- // name
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
- setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
- }
-
-<<<<<<< HEAD
- // 如果JSONObject包含notes字段，设置当前对象的notes为该字段的值
-=======
- // notes
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) {
- setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES));
- }
-
-<<<<<<< HEAD
- // 如果JSONObject包含deleted字段，设置当前对象的deleted为该字段的值
-=======
- // deleted
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) {
- setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED));
- }
-
- // completed
- if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) {
- setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED));
- }
-<<<<<<< HEAD
- } catch (JSONException e) { // 捕获可能抛出的JSONException异常
-=======
- } catch (JSONException e) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("fail to get task content from jsonobject");
- }
- }
- }
-
- public void setContentByLocalJSON(JSONObject js) {
-<<<<<<< HEAD
- // 检查传入的 JSONObject 是否为 null，是否包含指定的 META_HEAD_NOTE 和 META_HEAD_DATA
- if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
- || !js.has(GTaskStringUtils.META_HEAD_DATA)) {
- // 若不满足条件，则记录警告日志并返回
- Log.w(TAG, "setContentByLocalJSON: nothing is available");
- }
-
- try {
- // 从传入的 JSONObject 中获取 META_HEAD_NOTE 对应的 JSON 对象
- JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
- // 从传入的 JSONObject 中获取 META_HEAD_DATA 对应的 JSON 数组
- JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-
- // 检查 note 对应的 JSON 对象中的 TYPE 是否为 Notes.TYPE_NOTE
- if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
- // 若不是预期的类型，则记录错误日志并返回
-=======
- if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
- || !js.has(GTaskStringUtils.META_HEAD_DATA)) {
- Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
- }
-
- try {
- JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
- JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-
- if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.e(TAG, "invalid type");
- return;
- }
-
-<<<<<<< HEAD
- // 循环遍历 META_HEAD_DATA 中的每一个 JSON 对象
- for (int i = 0; i < dataArray.length(); i++) {
- // 获取当前位置的 JSON 对象
- JSONObject data = dataArray.getJSONObject(i);
- // 检查 JSON 对象中 MIME_TYPE 是否为 DataConstants.NOTE
- if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
- // 若满足条件，则设置当前对象的名称为 CONTENT，并终止循环
-=======
- for (int i = 0; i < dataArray.length(); i++) {
- JSONObject data = dataArray.getJSONObject(i);
- if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- setName(data.getString(DataColumns.CONTENT));
- break;
- }
- }
-
- } catch (JSONException e) {
-<<<<<<< HEAD
- // 捕获 JSON 解析异常，记录错误日志，并打印异常堆栈信息
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.e(TAG, e.toString());
- e.printStackTrace();
- }
- }
-
- public JSONObject getLocalJSONFromContent() {
-<<<<<<< HEAD
- // 获取当前对象的名称
- String name = getName();
- try {
- // 检查当前对象的 META 信息是否为 null
- if (mMetaInfo == null) {
- // 若为 null，表示是从 Web 创建的新任务
- if (name == null) {
- // 若名称为 null，记录警告日志并返回 null
-=======
- String name = getName();
- try {
- if (mMetaInfo == null) {
- // new task created from web
- if (name == null) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.w(TAG, "the note seems to be an empty one");
- return null;
- }
-
-<<<<<<< HEAD
- // 创建新的 JSONObject，并设置其中的 META_HEAD_DATA 和 META_HEAD_NOTE
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- JSONObject js = new JSONObject();
- JSONObject note = new JSONObject();
- JSONArray dataArray = new JSONArray();
- JSONObject data = new JSONObject();
- data.put(DataColumns.CONTENT, name);
- dataArray.put(data);
- js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
- note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
- js.put(GTaskStringUtils.META_HEAD_NOTE, note);
- return js;
- } else {
- // synced task
- JSONObject note = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
- JSONArray dataArray = mMetaInfo.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
-
- for (int i = 0; i < dataArray.length(); i++) {
- JSONObject data = dataArray.getJSONObject(i);
- if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
- data.put(DataColumns.CONTENT, getName());
- break;
- }
- }
-
- note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
- return mMetaInfo;
- }
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- return null;
- }
- }
-
- public void setMetaInfo(MetaData metaData) {
-<<<<<<< HEAD
- // 检查传入的 metaData 对象是否非空，且其 notes 属性也非空
- if (metaData != null && metaData.getNotes() != null) {
- try {
- // 尝试将 metaData 对象中的 notes 属性转换为 JSONObject
- mMetaInfo = new JSONObject(metaData.getNotes());
- } catch (JSONException e) {
- // 捕捉 JSON 解析异常，记录警告日志，并将 mMetaInfo 置为 null
-=======
- if (metaData != null && metaData.getNotes() != null) {
- try {
- mMetaInfo = new JSONObject(metaData.getNotes());
- } catch (JSONException e) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.w(TAG, e.toString());
- mMetaInfo = null;
- }
- }
- }
-
- public int getSyncAction(Cursor c) {
- try {
-<<<<<<< HEAD
- // 初始化 noteInfo 为 null
- JSONObject noteInfo = null;
- // 如果 mMetaInfo 不为 null 且包含特定的 META_HEAD_NOTE 键
- if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) {
- // 获取 META_HEAD_NOTE 对应的 JSONObject
- noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
- }
-
- // 如果 noteInfo 为 null，则记录警告日志，表示似乎已删除了 note 的元数据
- if (noteInfo == null) {
- Log.w(TAG, "似乎已删除笔记元数据");
- return SYNC_ACTION_UPDATE_REMOTE; // 返回更新远程的同步操作
- }
-
- // 如果 noteInfo 中不包含 NoteColumns.ID 键
- if (!noteInfo.has(NoteColumns.ID)) {
- Log.w(TAG, "远程笔记 ID 似乎已删除");
- return SYNC_ACTION_UPDATE_LOCAL; // 返回更新本地的同步操作
- }
-
- // 验证现在的笔记 ID 是否匹配
- if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) {
- Log.w(TAG, "笔记 ID 不匹配");
- return SYNC_ACTION_UPDATE_LOCAL; // 返回更新本地的同步操作
- }
-
- // 如果本地未修改笔记
- if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
- // 如果本地和远程均无更新
- if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
- return SYNC_ACTION_NONE; // 返回无同步操作
- } else {
- return SYNC_ACTION_UPDATE_LOCAL; // 返回更新本地的同步操作
- }
- } else {
- // 如果本地修改过，验证 gtask id 是否匹配
- if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
- Log.e(TAG, "gtask ID 不匹配");
- return SYNC_ACTION_ERROR; // 返回同步错误操作
- }
- // 如果本地同步 ID 与最后修改时间相匹配
-=======
- JSONObject noteInfo = null;
- if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) {
- noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
- }
-
- if (noteInfo == null) {
- Log.w(TAG, "it seems that note meta has been deleted");
- return SYNC_ACTION_UPDATE_REMOTE;
- }
-
- if (!noteInfo.has(NoteColumns.ID)) {
- Log.w(TAG, "remote note id seems to be deleted");
- return SYNC_ACTION_UPDATE_LOCAL;
- }
-
- // validate the note id now
- if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) {
- Log.w(TAG, "note id doesn't match");
- return SYNC_ACTION_UPDATE_LOCAL;
- }
-
- if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
- // there is no local update
- if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
- // no update both side
- return SYNC_ACTION_NONE;
- } else {
- // apply remote to local
- return SYNC_ACTION_UPDATE_LOCAL;
- }
- } else {
- // validate gtask id
- if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
- Log.e(TAG, "gtask id doesn't match");
- return SYNC_ACTION_ERROR;
- }
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
- // local modification only
- return SYNC_ACTION_UPDATE_REMOTE;
- } else {
- return SYNC_ACTION_UPDATE_CONFLICT;
- }
- }
- } catch (Exception e) {
-<<<<<<< HEAD
- // 捕捉 JSON 解析异常，记录警告日志，并返回同步错误操作
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.e(TAG, e.toString());
- e.printStackTrace();
- }
-
- return SYNC_ACTION_ERROR;
- }
-
- public boolean isWorthSaving() {
- return mMetaInfo != null || (getName() != null && getName().trim().length() > 0)
- || (getNotes() != null && getNotes().trim().length() > 0);
- }
-
- public void setCompleted(boolean completed) {
- this.mCompleted = completed;
- }
-
- public void setNotes(String notes) {
- this.mNotes = notes;
- }
-
- public void setPriorSibling(Task priorSibling) {
- this.mPriorSibling = priorSibling;
- }
-
- public void setParent(TaskList parent) {
- this.mParent = parent;
- }
-
- public boolean getCompleted() {
- return this.mCompleted;
- }
-
- public String getNotes() {
- return this.mNotes;
- }
-
- public Task getPriorSibling() {
- return this.mPriorSibling;
- }
-
- public TaskList getParent() {
- return this.mParent;
- }
-
-}
diff --git a/20233171391/src/src/net/micode/notes/gtask/data/TaskList.java b/20233171391/src/src/net/micode/notes/gtask/data/TaskList.java
deleted file mode 100644
index 2770533..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/data/TaskList.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.data;
-
-import android.database.Cursor;
-import android.util.Log;
-
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-
-
-public class TaskList extends Node {
-<<<<<<< HEAD
- //TAG标记
- private static final String TAG = TaskList.class.getSimpleName();
- //当前TaskList的指针
- private int mIndex;
- //类中主要的保存数据的单元，用来实现一个以Task为元素的ArrayList
- private ArrayList mChildren;
- //生成并返回一个包含了一定数据的JSONObject实体
-=======
- private static final String TAG = TaskList.class.getSimpleName();
-
- private int mIndex;
-
- private ArrayList mChildren;
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public TaskList() {
- super();
- mChildren = new ArrayList();
- mIndex = 1;
- }
-
- public JSONObject getCreateAction(int actionId) {
- JSONObject js = new JSONObject();
-
- try {
- // action_type
-<<<<<<< HEAD
- //对应的值是表示动作类型的常量，用于指明这个动作是创建类型的。
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
- GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
-
- // action_id
-<<<<<<< HEAD
- ///对应的值是传入的actionId参数。
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
- // index
- //对应的值是mIndex变量的值。
- js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex);
-
- // entity_delta
- //对应的值是一个嵌套的JSONObject，包含了一些任务的信息，如名称、创建者ID和实体类型。
-=======
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
- // index
- js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex);
-
- // entity_delta
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- JSONObject entity = new JSONObject();
- entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
- entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
- entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
- GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
- js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("fail to generate tasklist-create jsonobject");
- }
-
- return js;
- }
-
- public JSONObject getUpdateAction(int actionId) {
- JSONObject js = new JSONObject();
-
- try {
- // action_type
-<<<<<<< HEAD
- //对应的值表示动作类型，这里是更新类型的。
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
- GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
-
- // action_id
-<<<<<<< HEAD
- //对应的值是传入的actionId参数。
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
- // id
- //对应的值是getGid()方法的返回值。
- js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
-
- // entity_delta
- //对应的值是一个嵌套的JSONObject，包含了一些任务的信息，如名称和是否被删除。
-=======
- js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
-
- // id
- js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
-
- // entity_delta
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- JSONObject entity = new JSONObject();
- entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
- entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
- js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
-
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("fail to generate tasklist-update jsonobject");
- }
-
- return js;
- }
-
- public void setContentByRemoteJSON(JSONObject js) {
- if (js != null) {
- try {
- // id
- if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
- setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
- }
-
- // last_modified
- if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
- setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
- }
-
- // name
- if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
- setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
- }
-
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("fail to get tasklist content from jsonobject");
- }
- }
- }
-
- public void setContentByLocalJSON(JSONObject js) {
-<<<<<<< HEAD
- // 检查传入的JSON对象是否为空或是否包含必需的字段
- if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
- Log.w(TAG, "setContentByLocalJSON: nothing is available");
- }
-
- try {
- // 从JSON对象中获取名为META_HEAD_NOTE的子对象
- JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-
- // 检查文件夹的类型
- if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
- // 如果是文件夹类型，则获取文件夹的名字，并在原有名字前加上特定前缀
- String name = folder.getString(NoteColumns.SNIPPET);
- setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
- } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
- // 如果是系统文件夹类型，则根据文件夹ID设置特定的名字
-=======
- if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
- Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
- }
-
- try {
- JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-
- if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
- String name = folder.getString(NoteColumns.SNIPPET);
- setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
- } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER)
- setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT);
- else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER)
- setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
- + GTaskStringUtils.FOLDER_CALL_NOTE);
- else
- Log.e(TAG, "invalid system folder");
- } else {
-<<<<<<< HEAD
- // 如果既不是文件夹类型也不是系统文件夹类型，则记录错误
- Log.e(TAG, "error type");
- }
- } catch (JSONException e) {
- // 捕获JSON异常，记录错误信息
-=======
- Log.e(TAG, "error type");
- }
- } catch (JSONException e) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.e(TAG, e.toString());
- e.printStackTrace();
- }
- }
-
- public JSONObject getLocalJSONFromContent() {
- try {
-<<<<<<< HEAD
- // 创建一个新的JSON对象和文件夹对象
- JSONObject js = new JSONObject();
- JSONObject folder = new JSONObject();
-
- // 获取文件夹的名字，并检查是否有特定前缀，然后设置相应的属性
-=======
- JSONObject js = new JSONObject();
- JSONObject folder = new JSONObject();
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- String folderName = getName();
- if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX))
- folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(),
- folderName.length());
- folder.put(NoteColumns.SNIPPET, folderName);
- if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT)
- || folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE))
- folder.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
- else
- folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
-
- js.put(GTaskStringUtils.META_HEAD_NOTE, folder);
-
- return js;
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- return null;
- }
- }
-
- public int getSyncAction(Cursor c) {
- try {
- if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
- // there is no local update
- if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
- // no update both side
- return SYNC_ACTION_NONE;
- } else {
- // apply remote to local
- return SYNC_ACTION_UPDATE_LOCAL;
- }
- } else {
- // validate gtask id
- if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
- Log.e(TAG, "gtask id doesn't match");
- return SYNC_ACTION_ERROR;
- }
- if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
- // local modification only
- return SYNC_ACTION_UPDATE_REMOTE;
- } else {
- // for folder conflicts, just apply local modification
- return SYNC_ACTION_UPDATE_REMOTE;
- }
- }
- } catch (Exception e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- }
-
- return SYNC_ACTION_ERROR;
- }
-
- public int getChildTaskCount() {
- return mChildren.size();
- }
-
- public boolean addChildTask(Task task) {
- boolean ret = false;
- if (task != null && !mChildren.contains(task)) {
- ret = mChildren.add(task);
- if (ret) {
- // need to set prior sibling and parent
- task.setPriorSibling(mChildren.isEmpty() ? null : mChildren
- .get(mChildren.size() - 1));
- task.setParent(this);
- }
- }
- return ret;
- }
-
- public boolean addChildTask(Task task, int index) {
-<<<<<<< HEAD
- // 检查索引是否在有效范围内
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (index < 0 || index > mChildren.size()) {
- Log.e(TAG, "add child task: invalid index");
- return false;
- }
-
-<<<<<<< HEAD
- // 查找任务在列表中的位置
- int pos = mChildren.indexOf(task);
- // 如果任务不为空且不在列表中
- if (task != null && pos == -1) {
- // 在指定索引处添加任务
- mChildren.add(index, task);
-
- // 更新任务列表
- Task preTask = null;
- Task afterTask = null;
- // 获取前一个任务和后一个任务
-=======
- int pos = mChildren.indexOf(task);
- if (task != null && pos == -1) {
- mChildren.add(index, task);
-
- // update the task list
- Task preTask = null;
- Task afterTask = null;
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (index != 0)
- preTask = mChildren.get(index - 1);
- if (index != mChildren.size() - 1)
- afterTask = mChildren.get(index + 1);
-
-<<<<<<< HEAD
- // 设置任务的前一个和后一个任务
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- task.setPriorSibling(preTask);
- if (afterTask != null)
- afterTask.setPriorSibling(task);
- }
-
- return true;
- }
-
- public boolean removeChildTask(Task task) {
- boolean ret = false;
-<<<<<<< HEAD
- // 查找任务在列表中的索引
- int index = mChildren.indexOf(task);
- // 如果任务在列表中
-=======
- int index = mChildren.indexOf(task);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (index != -1) {
- ret = mChildren.remove(task);
-
- if (ret) {
-<<<<<<< HEAD
- // 重置任务的前一个任务和父任务
- task.setPriorSibling(null);
- task.setParent(null);
-
- // 更新任务列表
- if (index != mChildren.size()) {
- // 设置下一个任务的前一个任务
-=======
- // reset prior sibling and parent
- task.setPriorSibling(null);
- task.setParent(null);
-
- // update the task list
- if (index != mChildren.size()) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- mChildren.get(index).setPriorSibling(
- index == 0 ? null : mChildren.get(index - 1));
- }
- }
- }
- return ret;
- }
-
- public boolean moveChildTask(Task task, int index) {
-<<<<<<< HEAD
- // 检查索引是否在有效范围内
-=======
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (index < 0 || index >= mChildren.size()) {
- Log.e(TAG, "move child task: invalid index");
- return false;
- }
-
-<<<<<<< HEAD
- // 查找任务在列表中的位置
- int pos = mChildren.indexOf(task);
- // 如果任务不在列表中
-=======
- int pos = mChildren.indexOf(task);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (pos == -1) {
- Log.e(TAG, "move child task: the task should in the list");
- return false;
- }
-
-<<<<<<< HEAD
- // 如果任务已经在目标位置
- if (pos == index)
- return true;
-
- // 移除任务并在新位置添加任务
- return (removeChildTask(task) && addChildTask(task, index));
- }
-
-
-=======
- if (pos == index)
- return true;
- return (removeChildTask(task) && addChildTask(task, index));
- }
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public Task findChildTaskByGid(String gid) {
- for (int i = 0; i < mChildren.size(); i++) {
- Task t = mChildren.get(i);
- if (t.getGid().equals(gid)) {
- return t;
- }
- }
- return null;
- }
-
- public int getChildTaskIndex(Task task) {
- return mChildren.indexOf(task);
- }
-
- public Task getChildTaskByIndex(int index) {
- if (index < 0 || index >= mChildren.size()) {
- Log.e(TAG, "getTaskByIndex: invalid index");
- return null;
- }
- return mChildren.get(index);
- }
-
- public Task getChilTaskByGid(String gid) {
- for (Task task : mChildren) {
- if (task.getGid().equals(gid))
- return task;
- }
- return null;
- }
-
- public ArrayList getChildTaskList() {
- return this.mChildren;
- }
-
- public void setIndex(int index) {
- this.mIndex = index;
- }
-
- public int getIndex() {
- return this.mIndex;
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/gtask/exception/ActionFailureException.java b/20233171391/src/src/net/micode/notes/gtask/exception/ActionFailureException.java
deleted file mode 100644
index d4496f6..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/exception/ActionFailureException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.exception;
-
-<<<<<<< HEAD
-// 自定义异常类 ActionFailureException 继承自 RuntimeException
-public class ActionFailureException extends RuntimeException {
- // 序列化版本号，用于反序列化时验证类的版本一致性
- private static final long serialVersionUID = 4425249765923293627L;
-
- // 无参构造函数
-=======
-public class ActionFailureException extends RuntimeException {
- private static final long serialVersionUID = 4425249765923293627L;
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public ActionFailureException() {
- super();
- }
-
-<<<<<<< HEAD
- // 带有错误信息参数的构造函数
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public ActionFailureException(String paramString) {
- super(paramString);
- }
-
-<<<<<<< HEAD
- // 带有错误信息和原始异常参数的构造函数
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public ActionFailureException(String paramString, Throwable paramThrowable) {
- super(paramString, paramThrowable);
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java b/20233171391/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java
deleted file mode 100644
index 200fb89..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.exception;
-
-<<<<<<< HEAD
-// 自定义异常类 NetworkFailureException 继承自 Exception
-public class NetworkFailureException extends Exception {
- // 序列化版本号，用于反序列化时验证类的版本一致性
- private static final long serialVersionUID = 2107610287180234136L;
-
- // 无参构造函数
-=======
-public class NetworkFailureException extends Exception {
- private static final long serialVersionUID = 2107610287180234136L;
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public NetworkFailureException() {
- super();
- }
-
-<<<<<<< HEAD
- // 带有错误信息参数的构造函数
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public NetworkFailureException(String paramString) {
- super(paramString);
- }
-
-<<<<<<< HEAD
- // 带有错误信息和原始异常参数的构造函数
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public NetworkFailureException(String paramString, Throwable paramThrowable) {
- super(paramString, paramThrowable);
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/20233171391/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
deleted file mode 100644
index 522cd7c..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ /dev/null
@@ -1,180 +0,0 @@
-
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.remote;
-
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.NotesListActivity;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-
-public class GTaskASyncTask extends AsyncTask {
-
- private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;
-
- public interface OnCompleteListener {
- void onComplete();
- }
-
- private Context mContext;
-
- private NotificationManager mNotifiManager;
-
- private GTaskManager mTaskManager;
-
- private OnCompleteListener mOnCompleteListener;
-
- public GTaskASyncTask(Context context, OnCompleteListener listener) {
- mContext = context;
- mOnCompleteListener = listener;
- mNotifiManager = (NotificationManager) mContext
- .getSystemService(Context.NOTIFICATION_SERVICE);
- mTaskManager = GTaskManager.getInstance();
- }
-
- public void cancelSync() {
- mTaskManager.cancelSync();
- }
-
- public void publishProgess(String message) {
- publishProgress(new String[] {
- message
- });
- }
-
-<<<<<<< HEAD
- // 定义一个用于显示通知的方法，参数包括通知ID和内容
- private void showNotification(int tickerId, String content) {
- // 创建一个通知对象
- Notification notification = new Notification(R.drawable.notification, mContext
- .getString(tickerId), System.currentTimeMillis());
-
- // 设置通知的默认属性
- notification.defaults = Notification.DEFAULT_LIGHTS;
- notification.flags = Notification.FLAG_AUTO_CANCEL;
-
- // 定义一个PendingIntent对象，用于处理通知的点击事件
- PendingIntent pendingIntent;
- // 根据通知ID的不同，设置不同的点击事件
- if (tickerId != R.string.ticker_success) {
- pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesPreferenceActivity.class), 0);
-=======
- private void showNotification(int tickerId, String content) {
- Notification notification = new Notification(R.drawable.notification, mContext
- .getString(tickerId), System.currentTimeMillis());
- notification.defaults = Notification.DEFAULT_LIGHTS;
- notification.flags = Notification.FLAG_AUTO_CANCEL;
- PendingIntent pendingIntent;
- if (tickerId != R.string.ticker_success) {
- pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesPreferenceActivity.class), 0);
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- } else {
- pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
- NotesListActivity.class), 0);
- }
-<<<<<<< HEAD
-
- // 设置通知的最新事件信息，包括应用名称、内容和点击事件
- notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
- pendingIntent);
-
- // 发送通知
- mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
- }
-
- // 在后台执行任务的方法，参数为Void类型，返回一个Integer结果
- @Override
- protected Integer doInBackground(Void... unused) {
- // 发布同步进度通知
- publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
- .getSyncAccountName(mContext)));
-
- // 调用任务管理器的同步方法，返回同步结果
- return mTaskManager.sync(mContext, this);
- }
-
- // 在任务执行过程中更新进度的方法，参数为进度信息数组
- @Override
- protected void onProgressUpdate(String... progress) {
- // 显示同步中的通知，并根据Context类型发送广播
-=======
- notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
- pendingIntent);
- mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
- }
-
- @Override
- protected Integer doInBackground(Void... unused) {
- publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
- .getSyncAccountName(mContext)));
- return mTaskManager.sync(mContext, this);
- }
-
- @Override
- protected void onProgressUpdate(String... progress) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- showNotification(R.string.ticker_syncing, progress[0]);
- if (mContext instanceof GTaskSyncService) {
- ((GTaskSyncService) mContext).sendBroadcast(progress[0]);
- }
- }
-
-<<<<<<< HEAD
- // 任务执行完毕后的方法，参数为任务执行的结果
- @Override
- protected void onPostExecute(Integer result) {
- // 根据任务执行结果显示不同的通知
- if (result == GTaskManager.STATE_SUCCESS) {
- showNotification(R.string.ticker_success, mContext.getString(
- R.string.success_sync_account, mTaskManager.getSyncAccount()));
- // 更新上次同步时间
-=======
- @Override
- protected void onPostExecute(Integer result) {
- if (result == GTaskManager.STATE_SUCCESS) {
- showNotification(R.string.ticker_success, mContext.getString(
- R.string.success_sync_account, mTaskManager.getSyncAccount()));
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis());
- } else if (result == GTaskManager.STATE_NETWORK_ERROR) {
- showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network));
- } else if (result == GTaskManager.STATE_INTERNAL_ERROR) {
- showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_internal));
- } else if (result == GTaskManager.STATE_SYNC_CANCELLED) {
- showNotification(R.string.ticker_cancel, mContext
- .getString(R.string.error_sync_cancelled));
- }
- if (mOnCompleteListener != null) {
- new Thread(new Runnable() {
-
- public void run() {
- mOnCompleteListener.onComplete();
- }
- }).start();
- }
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/gtask/remote/GTaskClient.java b/20233171391/src/src/net/micode/notes/gtask/remote/GTaskClient.java
deleted file mode 100644
index 31f97c7..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/remote/GTaskClient.java
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.remote;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AccountManagerFuture;
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-
-import net.micode.notes.gtask.data.Node;
-import net.micode.notes.gtask.data.Task;
-import net.micode.notes.gtask.data.TaskList;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.gtask.exception.NetworkFailureException;
-import net.micode.notes.tool.GTaskStringUtils;
-import net.micode.notes.ui.NotesPreferenceActivity;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.cookie.Cookie;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpConnectionParams;
-import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpProtocolParams;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterInputStream;
-
-<<<<<<< HEAD
-//实现GTASK的登录操作，进行GTASK任务的创建，创建任务列表，从网络上获取任务和任务列表的内容
-=======
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-public class GTaskClient {
- private static final String TAG = GTaskClient.class.getSimpleName();
-
- private static final String GTASK_URL = "https://mail.google.com/tasks/";
-
- private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig";
-
- private static final String GTASK_POST_URL = "https://mail.google.com/tasks/r/ig";
-
- private static GTaskClient mInstance = null;
-
- private DefaultHttpClient mHttpClient;
-
- private String mGetUrl;
-
- private String mPostUrl;
-
- private long mClientVersion;
-
- private boolean mLoggedin;
-
- private long mLastLoginTime;
-
- private int mActionId;
-
- private Account mAccount;
-
- private JSONArray mUpdateArray;
-
- private GTaskClient() {
- mHttpClient = null;
- mGetUrl = GTASK_GET_URL;
- mPostUrl = GTASK_POST_URL;
- mClientVersion = -1;
- mLoggedin = false;
- mLastLoginTime = 0;
- mActionId = 1;
- mAccount = null;
- mUpdateArray = null;
- }
-<<<<<<< HEAD
- /*用来获取的实例化对象
- * 使用 getInstance()
- * 返回mInstance这个实例化对象
- */
-=======
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public static synchronized GTaskClient getInstance() {
- if (mInstance == null) {
- mInstance = new GTaskClient();
- }
- return mInstance;
- }
-<<<<<<< HEAD
- /*用来实现登录操作的函数，传入的参数是一个Activity
- * 设置登录操作限制时间，如果超时则需要重新登录
- * 有两种登录方式，使用用户自己的URL登录或者使用谷歌官方的URL登录
- * 返回true或者false，即最后是否登陆成功
- */
- public boolean login(Activity activity) {
- // we suppose that the cookie would expire after 5 minutes
- // then we need to re-login
- ////判断距离最后一次登录操作是否超过5分钟
-=======
-
- public boolean login(Activity activity) {
- // we suppose that the cookie would expire after 5 minutes
- // then we need to re-login
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- final long interval = 1000 * 60 * 5;
- if (mLastLoginTime + interval < System.currentTimeMillis()) {
- mLoggedin = false;
- }
-
- // need to re-login after account switch
-<<<<<<< HEAD
- // need to re-login after account switch 重新登录操作
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (mLoggedin
- && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
- .getSyncAccountName(activity))) {
- mLoggedin = false;
- }
-<<<<<<< HEAD
-//如果没超过时间，则不需要重新登录
-=======
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (mLoggedin) {
- Log.d(TAG, "already logged in");
- return true;
- }
-
-<<<<<<< HEAD
- mLastLoginTime = System.currentTimeMillis();//更新最后登录时间，改为系统当前的时间
- String authToken = loginGoogleAccount(activity, false);//判断是否登录到谷歌账户
-=======
- mLastLoginTime = System.currentTimeMillis();
- String authToken = loginGoogleAccount(activity, false);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (authToken == null) {
- Log.e(TAG, "login google account failed");
- return false;
- }
-
- // login with custom domain if necessary
-<<<<<<< HEAD
- //尝试使用用户自己的域名登录
- if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase() //将用户账号名改为统一格式（小写）后判断是否为一个谷歌账号地址
-=======
- if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase()
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- .endsWith("googlemail.com"))) {
- StringBuilder url = new StringBuilder(GTASK_URL).append("a/");
- int index = mAccount.name.indexOf('@') + 1;
- String suffix = mAccount.name.substring(index);
- url.append(suffix + "/");
-<<<<<<< HEAD
- mGetUrl = url.toString() + "ig"; //设置用户对应的getUrl
- mPostUrl = url.toString() + "r/ig"; //设置用户对应的postUrl
-=======
- mGetUrl = url.toString() + "ig";
- mPostUrl = url.toString() + "r/ig";
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-
- if (tryToLoginGtask(activity, authToken)) {
- mLoggedin = true;
- }
- }
-
- // try to login with google official url
-<<<<<<< HEAD
- //如果用户账户无法登录，则使用谷歌官方的URI进行登录
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (!mLoggedin) {
- mGetUrl = GTASK_GET_URL;
- mPostUrl = GTASK_POST_URL;
- if (!tryToLoginGtask(activity, authToken)) {
- return false;
- }
- }
-
- mLoggedin = true;
- return true;
- }
-
-<<<<<<< HEAD
- /*具体实现登录谷歌账户的方法
- * 使用令牌机制
- * 使用AccountManager来管理注册账号
- * 返回值是账号的令牌
- */
- private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
- String authToken; //令牌，是登录操作保证安全性的一个方法
- AccountManager accountManager = AccountManager.get(activity);//AccountManager这个类给用户提供了集中注册账号的接口
- Account[] accounts = accountManager.getAccountsByType("com.google");//获取全部以com.google结尾的account
-=======
- private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
- String authToken;
- AccountManager accountManager = AccountManager.get(activity);
- Account[] accounts = accountManager.getAccountsByType("com.google");
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-
- if (accounts.length == 0) {
- Log.e(TAG, "there is no available google account");
- return null;
- }
-
- String accountName = NotesPreferenceActivity.getSyncAccountName(activity);
- Account account = null;
-<<<<<<< HEAD
- //遍历获得的accounts信息，寻找已经记录过的账户信息
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- for (Account a : accounts) {
- if (a.name.equals(accountName)) {
- account = a;
- break;
- }
- }
- if (account != null) {
- mAccount = account;
- } else {
- Log.e(TAG, "unable to get an account with the same name in the settings");
- return null;
- }
-
- // get the token now
-<<<<<<< HEAD
- //获取选中账号的令牌
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account,
- "goanna_mobile", null, activity, null, null);
- try {
- Bundle authTokenBundle = accountManagerFuture.getResult();
- authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN);
-<<<<<<< HEAD
- //如果是invalidateToken，那么需要调用invalidateAuthToken(String, String)方法废除这个无效token
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (invalidateToken) {
- accountManager.invalidateAuthToken("com.google", authToken);
- loginGoogleAccount(activity, false);
- }
- } catch (Exception e) {
- Log.e(TAG, "get auth token failed");
- authToken = null;
- }
-
- return authToken;
- }
-
-<<<<<<< HEAD
- //尝试登陆Gtask，这只是一个预先判断令牌是否是有效以及是否能登上GTask的方法,而不是具体实现登陆的方法
- private boolean tryToLoginGtask(Activity activity, String authToken) {
- if (!loginGtask(authToken)) {
- // maybe the auth token is out of authTokedate, now let's invalidate the
- // token and try again
- //删除过一个无效的authToken，申请一个新的后再次尝试登陆
-=======
- private boolean tryToLoginGtask(Activity activity, String authToken) {
- if (!loginGtask(authToken)) {
- // maybe the auth token is out of date, now let's invalidate the
- // token and try again
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- authToken = loginGoogleAccount(activity, true);
- if (authToken == null) {
- Log.e(TAG, "login google account failed");
- return false;
- }
-
- if (!loginGtask(authToken)) {
- Log.e(TAG, "login gtask failed");
- return false;
- }
- }
- return true;
- }
-
-<<<<<<< HEAD
- //实现登录GTask的具体操作
- private boolean loginGtask(String authToken) {
- int timeoutConnection = 10000;
- int timeoutSocket = 15000; //socket是一种通信连接实现数据的交换的端口
- HttpParams httpParameters = new BasicHttpParams(); //实例化一个新的HTTP参数类
- HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);//设置连接超时时间
- HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);//设置设置端口超时时间
- mHttpClient = new DefaultHttpClient(httpParameters);
- BasicCookieStore localBasicCookieStore = new BasicCookieStore(); //设置本地cookie
-=======
- private boolean loginGtask(String authToken) {
- int timeoutConnection = 10000;
- int timeoutSocket = 15000;
- HttpParams httpParameters = new BasicHttpParams();
- HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);
- HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);
- mHttpClient = new DefaultHttpClient(httpParameters);
- BasicCookieStore localBasicCookieStore = new BasicCookieStore();
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- mHttpClient.setCookieStore(localBasicCookieStore);
- HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
-
- // login gtask
- try {
-<<<<<<< HEAD
- String loginUrl = mGetUrl + "?auth=" + authToken; //设置登录的url
- HttpGet httpGet = new HttpGet(loginUrl); //通过登录的uri实例化网页上资源的查找
-=======
- String loginUrl = mGetUrl + "?auth=" + authToken;
- HttpGet httpGet = new HttpGet(loginUrl);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- HttpResponse response = null;
- response = mHttpClient.execute(httpGet);
-
- // get the cookie now
-<<<<<<< HEAD
- //获取CookieStore里存放的cookie,看如果存有“GTL(不知道什么意思)”，则说明有验证成功的有效的cookie
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- List cookies = mHttpClient.getCookieStore().getCookies();
- boolean hasAuthCookie = false;
- for (Cookie cookie : cookies) {
- if (cookie.getName().contains("GTL")) {
- hasAuthCookie = true;
- }
- }
- if (!hasAuthCookie) {
- Log.w(TAG, "it seems that there is no auth cookie");
- }
-
- // get the client version
-<<<<<<< HEAD
- //获取client的内容，具体操作是在返回的Content中截取从_setup(开始到)}中间的字符串内容，也就是gtask_url的内容
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- String resString = getResponseContent(response.getEntity());
- String jsBegin = "_setup(";
- String jsEnd = ")}";
- int begin = resString.indexOf(jsBegin);
- int end = resString.lastIndexOf(jsEnd);
- String jsString = null;
- if (begin != -1 && end != -1 && begin < end) {
- jsString = resString.substring(begin + jsBegin.length(), end);
- }
- JSONObject js = new JSONObject(jsString);
- mClientVersion = js.getLong("v");
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- return false;
- } catch (Exception e) {
- // simply catch all exceptions
- Log.e(TAG, "httpget gtask_url failed");
- return false;
- }
-
- return true;
- }
-
- private int getActionId() {
- return mActionId++;
- }
-
-<<<<<<< HEAD
- /*实例化创建一个用于向网络传输数据的对象
- * 使用HttpPost类
- * 返回一个httpPost实例化对象，但里面还没有内容
- */
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private HttpPost createHttpPost() {
- HttpPost httpPost = new HttpPost(mPostUrl);
- httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
- httpPost.setHeader("AT", "1");
- return httpPost;
- }
-
-<<<<<<< HEAD
- /*通过URL获取响应后返回的数据，也就是网络上的数据和资源
- * 使用getContentEncoding()获取网络上的资源和数据
- * 返回值就是获取到的资源
- */
- private String getResponseContent(HttpEntity entity) throws IOException {
- String contentEncoding = null;
- if (entity.getContentEncoding() != null) {//通过URL得到HttpEntity对象，如果不为空则使用getContent（）方法创建一个流将数据从网络都过来
-=======
- private String getResponseContent(HttpEntity entity) throws IOException {
- String contentEncoding = null;
- if (entity.getContentEncoding() != null) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- contentEncoding = entity.getContentEncoding().getValue();
- Log.d(TAG, "encoding: " + contentEncoding);
- }
-
- InputStream input = entity.getContent();
-<<<<<<< HEAD
- if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {//GZIP是使用DEFLATE进行压缩数据的另一个压缩库
- input = new GZIPInputStream(entity.getContent());
- } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {//DEFLATE是一个无专利的压缩算法，它可以实现无损数据压缩
-=======
- if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
- input = new GZIPInputStream(entity.getContent());
- } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Inflater inflater = new Inflater(true);
- input = new InflaterInputStream(entity.getContent(), inflater);
- }
-
- try {
- InputStreamReader isr = new InputStreamReader(input);
-<<<<<<< HEAD
- BufferedReader br = new BufferedReader(isr);//是一个包装类，它可以包装字符流，将字符流放入缓存里，先把字符读到缓存里，到缓存满了时候，再读入内存，是为了提供读的效率而设计的
-=======
- BufferedReader br = new BufferedReader(isr);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- StringBuilder sb = new StringBuilder();
-
- while (true) {
- String buff = br.readLine();
- if (buff == null) {
- return sb.toString();
- }
- sb = sb.append(buff);
- }
- } finally {
- input.close();
- }
- }
-
-<<<<<<< HEAD
- /*通过JSON发送请求
- * 请求的具体内容在json的实例化对象js中然后传入
- * 利用UrlEncodedFormEntity entity和httpPost.setEntity(entity)方法把js中的内容放置到httpPost中
- * 执行请求后使用getResponseContent方法得到返回的数据和资源
- * 将资源再次放入json后返回
- */
- private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
- if (!mLoggedin) {//未登录
-=======
- private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
- if (!mLoggedin) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.e(TAG, "please login first");
- throw new ActionFailureException("not logged in");
- }
-
-<<<<<<< HEAD
- //实例化一个httpPost的对象用来向服务器传输数据，在这里就是发送请求，而请求的内容在js里
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- HttpPost httpPost = createHttpPost();
- try {
- LinkedList list = new LinkedList();
- list.add(new BasicNameValuePair("r", js.toString()));
-<<<<<<< HEAD
- UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8"); //UrlEncodedFormEntity()的形式比较单一，是普通的键值对
- httpPost.setEntity(entity);
-
- // execute the post
- //执行这个请求
-=======
- UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8");
- httpPost.setEntity(entity);
-
- // execute the post
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- HttpResponse response = mHttpClient.execute(httpPost);
- String jsString = getResponseContent(response.getEntity());
- return new JSONObject(jsString);
-
- } catch (ClientProtocolException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new NetworkFailureException("postRequest failed");
- } catch (IOException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new NetworkFailureException("postRequest failed");
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("unable to convert response content to jsonobject");
- } catch (Exception e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("error occurs when posting request");
- }
- }
-
-<<<<<<< HEAD
- /*创建单个任务
- * 传入参数是一个.gtask.data.Task包里Task类的对象
- * 利用json获取Task里的内容,并且创建相应的jsPost
- * 利用postRequest得到任务的返回信息
- * 使用task.setGid设置task的new_ID
- */
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void createTask(Task task) throws NetworkFailureException {
- commitUpdate();
- try {
- JSONObject jsPost = new JSONObject();
- JSONArray actionList = new JSONArray();
-
- // action_list
- actionList.put(task.getCreateAction(getActionId()));
- jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
- // client_version
- jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
- // post
- JSONObject jsResponse = postRequest(jsPost);
- JSONObject jsResult = (JSONObject) jsResponse.getJSONArray(
- GTaskStringUtils.GTASK_JSON_RESULTS).get(0);
- task.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID));
-
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("create task: handing jsonobject failed");
- }
- }
-
-<<<<<<< HEAD
- /*
- * 创建一个任务列表，与createTask几乎一样，区别就是最后设置的是tasklist的gid
- */
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void createTaskList(TaskList tasklist) throws NetworkFailureException {
- commitUpdate();
- try {
- JSONObject jsPost = new JSONObject();
- JSONArray actionList = new JSONArray();
-
- // action_list
- actionList.put(tasklist.getCreateAction(getActionId()));
- jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
- // client version
- jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
- // post
- JSONObject jsResponse = postRequest(jsPost);
- JSONObject jsResult = (JSONObject) jsResponse.getJSONArray(
- GTaskStringUtils.GTASK_JSON_RESULTS).get(0);
- tasklist.setGid(jsResult.getString(GTaskStringUtils.GTASK_JSON_NEW_ID));
-
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("create tasklist: handing jsonobject failed");
- }
- }
-
-<<<<<<< HEAD
- /*
- * 同步更新操作
- * 使用JSONObject进行数据存储，使用jsPost.put，Put的信息包括UpdateArray和ClientVersion
- * 使用postRequest发送这个jspost,进行处理
- */
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void commitUpdate() throws NetworkFailureException {
- if (mUpdateArray != null) {
- try {
- JSONObject jsPost = new JSONObject();
-
- // action_list
- jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, mUpdateArray);
-
- // client_version
- jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
- postRequest(jsPost);
- mUpdateArray = null;
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("commit update: handing jsonobject failed");
- }
- }
- }
-
-<<<<<<< HEAD
- /*
- * 添加更新的事项
- * 调用commitUpdate()实现
- */
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void addUpdateNode(Node node) throws NetworkFailureException {
- if (node != null) {
- // too many update items may result in an error
- // set max to 10 items
- if (mUpdateArray != null && mUpdateArray.length() > 10) {
- commitUpdate();
- }
-
- if (mUpdateArray == null)
- mUpdateArray = new JSONArray();
- mUpdateArray.put(node.getUpdateAction(getActionId()));
- }
- }
-
-<<<<<<< HEAD
- /*
- * 移动task,比如讲task移动到不同的task列表中去
- * 通过getGid获取task所属列表的gid
- * 通过JSONObject.put(String name, Object value)函数设置移动后的task的相关属性值，从而达到移动的目的
- * 最后还是通过postRequest进行更新后的发送
- */
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void moveTask(Task task, TaskList preParent, TaskList curParent)
- throws NetworkFailureException {
- commitUpdate();
- try {
- JSONObject jsPost = new JSONObject();
- JSONArray actionList = new JSONArray();
- JSONObject action = new JSONObject();
-
- // action_list
- action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
- GTaskStringUtils.GTASK_JSON_ACTION_TYPE_MOVE);
- action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
- action.put(GTaskStringUtils.GTASK_JSON_ID, task.getGid());
- if (preParent == curParent && task.getPriorSibling() != null) {
- // put prioring_sibing_id only if moving within the tasklist and
- // it is not the first one
-<<<<<<< HEAD
- //设置优先级ID，只有当移动是发生在文件中
- action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling());
- }
- action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid()); //设置移动前所属列表
- action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid()); //设置当前所属列表
-=======
- action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling());
- }
- action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid());
- action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid());
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (preParent != curParent) {
- // put the dest_list only if moving between tasklists
- action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid());
- }
- actionList.put(action);
-<<<<<<< HEAD
- //最后将ACTION_LIST加入到jsPost中
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
- // client_version
- jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
- postRequest(jsPost);
-
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("move task: handing jsonobject failed");
- }
- }
-
-<<<<<<< HEAD
- /*
- * 删除操作节点
- * 还是利用JSON
- * 删除过后使用postRequest发送删除后的结果
- */
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void deleteNode(Node node) throws NetworkFailureException {
- commitUpdate();
- try {
- JSONObject jsPost = new JSONObject();
- JSONArray actionList = new JSONArray();
-
- // action_list
- node.setDeleted(true);
-<<<<<<< HEAD
- actionList.put(node.getUpdateAction(getActionId())); //这里会获取到删除操作的ID，加入到actionLiast中
-=======
- actionList.put(node.getUpdateAction(getActionId()));
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
- // client_version
- jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
- postRequest(jsPost);
- mUpdateArray = null;
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("delete node: handing jsonobject failed");
- }
- }
-
-<<<<<<< HEAD
- /*
- * 获取任务列表
- * 首先通过GetURI使用getResponseContent从网上获取数据
- * 然后筛选出"_setup("到)}的部分，并且从中获取GTASK_JSON_LISTS的内容返回
- */
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public JSONArray getTaskLists() throws NetworkFailureException {
- if (!mLoggedin) {
- Log.e(TAG, "please login first");
- throw new ActionFailureException("not logged in");
- }
-
- try {
- HttpGet httpGet = new HttpGet(mGetUrl);
- HttpResponse response = null;
- response = mHttpClient.execute(httpGet);
-
- // get the task list
-<<<<<<< HEAD
- //筛选工作，把筛选出的字符串放入jsString
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- String resString = getResponseContent(response.getEntity());
- String jsBegin = "_setup(";
- String jsEnd = ")}";
- int begin = resString.indexOf(jsBegin);
- int end = resString.lastIndexOf(jsEnd);
- String jsString = null;
- if (begin != -1 && end != -1 && begin < end) {
- jsString = resString.substring(begin + jsBegin.length(), end);
- }
- JSONObject js = new JSONObject(jsString);
-<<<<<<< HEAD
- //获取GTASK_JSON_LISTS
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS);
- } catch (ClientProtocolException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new NetworkFailureException("gettasklists: httpget failed");
- } catch (IOException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new NetworkFailureException("gettasklists: httpget failed");
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("get task lists: handing jasonobject failed");
- }
- }
-
-<<<<<<< HEAD
- /*
- * 通过传入的TASKList的gid,从网络上获取相应属于这个任务列表的任务
- */
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public JSONArray getTaskList(String listGid) throws NetworkFailureException {
- commitUpdate();
- try {
- JSONObject jsPost = new JSONObject();
- JSONArray actionList = new JSONArray();
- JSONObject action = new JSONObject();
-
- // action_list
- action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
- GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL);
- action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
-<<<<<<< HEAD
- action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid); //这里设置为传入的listGid
-=======
- action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false);
- actionList.put(action);
- jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
-
- // client_version
- jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
-
- JSONObject jsResponse = postRequest(jsPost);
- return jsResponse.getJSONArray(GTaskStringUtils.GTASK_JSON_TASKS);
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("get task list: handing jsonobject failed");
- }
- }
-
- public Account getSyncAccount() {
- return mAccount;
- }
-
-<<<<<<< HEAD
- //重置更新的内容
- public void resetUpdateArray() {
- mUpdateArray = null;
- }
-}
-=======
- public void resetUpdateArray() {
- mUpdateArray = null;
- }
-}
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/20233171391/src/src/net/micode/notes/gtask/remote/GTaskManager.java b/20233171391/src/src/net/micode/notes/gtask/remote/GTaskManager.java
deleted file mode 100644
index 053cdfa..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/remote/GTaskManager.java
+++ /dev/null
@@ -1,1018 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.remote;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.util.Log;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.DataColumns;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.data.MetaData;
-import net.micode.notes.gtask.data.Node;
-import net.micode.notes.gtask.data.SqlNote;
-import net.micode.notes.gtask.data.Task;
-import net.micode.notes.gtask.data.TaskList;
-import net.micode.notes.gtask.exception.ActionFailureException;
-import net.micode.notes.gtask.exception.NetworkFailureException;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.GTaskStringUtils;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-
-
-public class GTaskManager {
- private static final String TAG = GTaskManager.class.getSimpleName();
-
- public static final int STATE_SUCCESS = 0;
-
- public static final int STATE_NETWORK_ERROR = 1;
-
- public static final int STATE_INTERNAL_ERROR = 2;
-
- public static final int STATE_SYNC_IN_PROGRESS = 3;
-
- public static final int STATE_SYNC_CANCELLED = 4;
-
- private static GTaskManager mInstance = null;
-
- private Activity mActivity;
-
- private Context mContext;
-
- private ContentResolver mContentResolver;
-
- private boolean mSyncing;
-
- private boolean mCancelled;
-
- private HashMap mGTaskListHashMap;
-
- private HashMap mGTaskHashMap;
-
- private HashMap mMetaHashMap;
-
- private TaskList mMetaList;
-
- private HashSet mLocalDeleteIdMap;
-
- private HashMap mGidToNid;
-
- private HashMap mNidToGid;
-
-<<<<<<< HEAD
- private GTaskManager() { //对象初始化函数
- mSyncing = false; //正在同步,flase代表未执行
- mCancelled = false; //全局标识，flase代表可以执行
- mGTaskListHashMap = new HashMap(); //<>代表Java的泛型,就是创建一个用类型作为参数的类。
-=======
- private GTaskManager() {
- mSyncing = false;
- mCancelled = false;
- mGTaskListHashMap = new HashMap();
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- mGTaskHashMap = new HashMap();
- mMetaHashMap = new HashMap();
- mMetaList = null;
- mLocalDeleteIdMap = new HashSet();
-<<<<<<< HEAD
- mGidToNid = new HashMap(); //GoogleID to NodeID
- mNidToGid = new HashMap(); //NodeID to GoogleID通过hashmap散列表建立映射
- }
-
- //包含关键字synchronized，语言级同步，指明该函数可能运行在多线程的环境下。
- public static synchronized GTaskManager getInstance() { //可能运行在多线程环境下，使用语言级同步--synchronized
-=======
- mGidToNid = new HashMap();
- mNidToGid = new HashMap();
- }
-
- public static synchronized GTaskManager getInstance() {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (mInstance == null) {
- mInstance = new GTaskManager();
- }
- return mInstance;
- }
-
-<<<<<<< HEAD
- //包含关键字synchronized，语言级同步，指明该函数可能运行在多线程的环境下。
-
- public synchronized void setActivityContext(Activity activity) {
- // used for getting auth token
- mActivity = activity;
- }
-
- //实现了本地同步操作和远端同步操作
- public int sync(Context context, GTaskASyncTask asyncTask) { //核心函数
- if (mSyncing) {
- Log.d(TAG, "Sync is in progress"); //创建日志文件（调试信息），debug
-=======
- public synchronized void setActivityContext(Activity activity) {
- // used for getting authtoken
- mActivity = activity;
- }
-
- public int sync(Context context, GTaskASyncTask asyncTask) {
- if (mSyncing) {
- Log.d(TAG, "Sync is in progress");
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- return STATE_SYNC_IN_PROGRESS;
- }
- mContext = context;
- mContentResolver = mContext.getContentResolver();
- mSyncing = true;
- mCancelled = false;
- mGTaskListHashMap.clear();
- mGTaskHashMap.clear();
- mMetaHashMap.clear();
- mLocalDeleteIdMap.clear();
- mGidToNid.clear();
- mNidToGid.clear();
-
- try {
-<<<<<<< HEAD
- GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例,client--客户机
- client.resetUpdateArray(); //JSONArray类型，reset即置为NULL
-=======
- GTaskClient client = GTaskClient.getInstance();
- client.resetUpdateArray();
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-
- // login google task
- if (!mCancelled) {
- if (!client.login(mActivity)) {
- throw new NetworkFailureException("login google task failed");
- }
- }
-
- // get the task list from google
- asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
-<<<<<<< HEAD
- initGTaskList(); //获取Google上的JSONtasklist转为本地TaskList
-=======
- initGTaskList();
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-
- // do content sync work
- asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
- syncContent();
-<<<<<<< HEAD
- } catch (NetworkFailureException e) { //分为两种异常，此类异常为网络异常
- Log.e(TAG, e.toString()); //创建日志文件（调试信息），error
- return STATE_NETWORK_ERROR;
- } catch (ActionFailureException e) { //此类异常为操作异常
-=======
- } catch (NetworkFailureException e) {
- Log.e(TAG, e.toString());
- return STATE_NETWORK_ERROR;
- } catch (ActionFailureException e) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Log.e(TAG, e.toString());
- return STATE_INTERNAL_ERROR;
- } catch (Exception e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- return STATE_INTERNAL_ERROR;
- } finally {
- mGTaskListHashMap.clear();
- mGTaskHashMap.clear();
- mMetaHashMap.clear();
- mLocalDeleteIdMap.clear();
- mGidToNid.clear();
- mNidToGid.clear();
- mSyncing = false;
- }
-
- return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
- }
-
-<<<<<<< HEAD
- //初始化GtaskList，获取Google上的JSONtasklist转为本地TaskList。
- private void initGTaskList() throws NetworkFailureException {
- if (mCancelled)
- return;
- GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例，client应指远端客户机
- try {
- //Json对象是Name Value对(即子元素)的无序集合，相当于一个Map对象。JsonObject类是bantouyan-json库对Json对象的抽象，提供操纵Json对象的各种方法。
- //其格式为{"key1":value1,"key2",value2....};key 必须是字符串。
- //因为ajax请求不刷新页面，但配合js可以实现局部刷新，因此json常常被用来作为异步请求的返回对象使用。
- JSONArray jsTaskLists = client.getTaskLists(); //原注释为get task list------lists？？？
-
- // init meta list first
- mMetaList = null; //TaskList类型
- for (int i = 0; i < jsTaskLists.length(); i++) {
- JSONObject object = jsTaskLists.getJSONObject(i); //JSONObject与JSONArray一个为对象，一个为数组。此处取出单个JASONObject
- String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
- String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
-
- if (name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
- mMetaList = new TaskList(); //MetaList意为元表,Tasklist类型，此处为初始化
- mMetaList.setContentByRemoteJSON(object); //将JSON中部分数据复制到自己定义的对象中相对应的数据：name->mname...
-
- // load meta data
- JSONArray jsMetas = client.getTaskList(gid); //原注释为get action_list------list？？？
- for (int j = 0; j < jsMetas.length(); j++) {
- object = (JSONObject) jsMetas.getJSONObject(j);
- MetaData metaData = new MetaData(); //继承自Node
- metaData.setContentByRemoteJSON(object);
- if (metaData.isWorthSaving()) { //if not worth to save，metadata将不加入mMetaList
-=======
- private void initGTaskList() throws NetworkFailureException {
- if (mCancelled)
- return;
- GTaskClient client = GTaskClient.getInstance();
- try {
- JSONArray jsTaskLists = client.getTaskLists();
-
- // init meta list first
- mMetaList = null;
- for (int i = 0; i < jsTaskLists.length(); i++) {
- JSONObject object = jsTaskLists.getJSONObject(i);
- String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
- String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
-
- if (name
- .equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
- mMetaList = new TaskList();
- mMetaList.setContentByRemoteJSON(object);
-
- // load meta data
- JSONArray jsMetas = client.getTaskList(gid);
- for (int j = 0; j < jsMetas.length(); j++) {
- object = (JSONObject) jsMetas.getJSONObject(j);
- MetaData metaData = new MetaData();
- metaData.setContentByRemoteJSON(object);
- if (metaData.isWorthSaving()) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- mMetaList.addChildTask(metaData);
- if (metaData.getGid() != null) {
- mMetaHashMap.put(metaData.getRelatedGid(), metaData);
- }
- }
- }
- }
- }
-
- // create meta list if not existed
- if (mMetaList == null) {
- mMetaList = new TaskList();
- mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
- + GTaskStringUtils.FOLDER_META);
- GTaskClient.getInstance().createTaskList(mMetaList);
- }
-
- // init task list
- for (int i = 0; i < jsTaskLists.length(); i++) {
- JSONObject object = jsTaskLists.getJSONObject(i);
-<<<<<<< HEAD
- String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); //通过getString函数传入本地某个标志数据的名称，获取其在远端的名称。
-=======
- String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
-
- if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)
- && !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX
-<<<<<<< HEAD
- + GTaskStringUtils.FOLDER_META)) {
- TaskList tasklist = new TaskList(); //继承自Node
-=======
- + GTaskStringUtils.FOLDER_META)) {
- TaskList tasklist = new TaskList();
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- tasklist.setContentByRemoteJSON(object);
- mGTaskListHashMap.put(gid, tasklist);
- mGTaskHashMap.put(gid, tasklist);
-
- // load tasks
- JSONArray jsTasks = client.getTaskList(gid);
- for (int j = 0; j < jsTasks.length(); j++) {
- object = (JSONObject) jsTasks.getJSONObject(j);
- gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
- Task task = new Task();
- task.setContentByRemoteJSON(object);
- if (task.isWorthSaving()) {
- task.setMetaInfo(mMetaHashMap.get(gid));
- tasklist.addChildTask(task);
- mGTaskHashMap.put(gid, task);
- }
- }
- }
- }
- } catch (JSONException e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("initGTaskList: handing JSONObject failed");
- }
- }
-
-<<<<<<< HEAD
- //本地内容同步操作
- private void syncContent() throws NetworkFailureException { //本地内容同步操作
- int syncType;
- Cursor c = null; //数据库指针
- String gid; //GoogleID
- Node node; //Node包含Sync_Action的不同类型
-
- mLocalDeleteIdMap.clear(); //HashSet类型
-=======
- private void syncContent() throws NetworkFailureException {
- int syncType;
- Cursor c = null;
- String gid;
- Node node;
-
- mLocalDeleteIdMap.clear();
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-
- if (mCancelled) {
- return;
- }
-
- // for local deleted note
- try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
- "(type<>? AND parent_id=?)", new String[] {
- String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
- }, null);
- if (c != null) {
- while (c.moveToNext()) {
- gid = c.getString(SqlNote.GTASK_ID_COLUMN);
- node = mGTaskHashMap.get(gid);
- if (node != null) {
- mGTaskHashMap.remove(gid);
- doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c);
- }
-
- mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
- }
- } else {
- Log.w(TAG, "failed to query trash folder");
- }
- } finally {
- if (c != null) {
- c.close();
- c = null;
- }
- }
-
- // sync folder first
- syncFolder();
-
- // for note existing in database
- try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
- "(type=? AND parent_id<>?)", new String[] {
- String.valueOf(Notes.TYPE_NOTE), String.valueOf(Notes.ID_TRASH_FOLER)
- }, NoteColumns.TYPE + " DESC");
- if (c != null) {
- while (c.moveToNext()) {
- gid = c.getString(SqlNote.GTASK_ID_COLUMN);
- node = mGTaskHashMap.get(gid);
- if (node != null) {
- mGTaskHashMap.remove(gid);
-<<<<<<< HEAD
- mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); //通过hashmap建立联系
- mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); //通过hashmap建立联系
-=======
- mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
- mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- syncType = node.getSyncAction(c);
- } else {
- if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
- // local add
- syncType = Node.SYNC_ACTION_ADD_REMOTE;
- } else {
- // remote delete
- syncType = Node.SYNC_ACTION_DEL_LOCAL;
- }
- }
- doContentSync(syncType, node, c);
- }
- } else {
- Log.w(TAG, "failed to query existing note in database");
- }
-
- } finally {
- if (c != null) {
- c.close();
- c = null;
- }
- }
-
- // go through remaining items
-<<<<<<< HEAD
- Iterator> iter = mGTaskHashMap.entrySet().iterator(); //Iterator迭代器
-=======
- Iterator> iter = mGTaskHashMap.entrySet().iterator();
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- while (iter.hasNext()) {
- Map.Entry entry = iter.next();
- node = entry.getValue();
- doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
- }
-
-<<<<<<< HEAD
- // mCancelled can be set by another thread, so we neet to check one by //thread----线程
-=======
- // mCancelled can be set by another thread, so we neet to check one by
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- // one
- // clear local delete table
- if (!mCancelled) {
- if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) {
- throw new ActionFailureException("failed to batch-delete local deleted notes");
- }
- }
-
- // refresh local sync id
- if (!mCancelled) {
- GTaskClient.getInstance().commitUpdate();
- refreshLocalSyncId();
- }
-
- }
-
-<<<<<<< HEAD
-
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private void syncFolder() throws NetworkFailureException {
- Cursor c = null;
- String gid;
- Node node;
- int syncType;
-
- if (mCancelled) {
- return;
- }
-
- // for root folder
- try {
- c = mContentResolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
- Notes.ID_ROOT_FOLDER), SqlNote.PROJECTION_NOTE, null, null, null);
- if (c != null) {
- c.moveToNext();
- gid = c.getString(SqlNote.GTASK_ID_COLUMN);
- node = mGTaskHashMap.get(gid);
- if (node != null) {
- mGTaskHashMap.remove(gid);
- mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER);
- mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid);
- // for system folder, only update remote name if necessary
- if (!node.getName().equals(
- GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT))
- doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
- } else {
- doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
- }
- } else {
- Log.w(TAG, "failed to query root folder");
- }
- } finally {
- if (c != null) {
- c.close();
- c = null;
- }
- }
-
- // for call-note folder
- try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)",
- new String[] {
-<<<<<<< HEAD
- String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
-=======
- String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- }, null);
- if (c != null) {
- if (c.moveToNext()) {
- gid = c.getString(SqlNote.GTASK_ID_COLUMN);
- node = mGTaskHashMap.get(gid);
- if (node != null) {
- mGTaskHashMap.remove(gid);
- mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER);
- mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid);
- // for system folder, only update remote name if
- // necessary
- if (!node.getName().equals(
- GTaskStringUtils.MIUI_FOLDER_PREFFIX
- + GTaskStringUtils.FOLDER_CALL_NOTE))
- doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
- } else {
- doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
- }
- }
- } else {
- Log.w(TAG, "failed to query call note folder");
- }
- } finally {
- if (c != null) {
- c.close();
- c = null;
- }
- }
-
- // for local existing folders
- try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
- "(type=? AND parent_id<>?)", new String[] {
- String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)
- }, NoteColumns.TYPE + " DESC");
- if (c != null) {
- while (c.moveToNext()) {
- gid = c.getString(SqlNote.GTASK_ID_COLUMN);
- node = mGTaskHashMap.get(gid);
- if (node != null) {
- mGTaskHashMap.remove(gid);
- mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
- mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
- syncType = node.getSyncAction(c);
- } else {
- if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
- // local add
- syncType = Node.SYNC_ACTION_ADD_REMOTE;
- } else {
- // remote delete
- syncType = Node.SYNC_ACTION_DEL_LOCAL;
- }
- }
- doContentSync(syncType, node, c);
- }
- } else {
- Log.w(TAG, "failed to query existing folder");
- }
- } finally {
- if (c != null) {
- c.close();
- c = null;
- }
- }
-
- // for remote add folders
- Iterator> iter = mGTaskListHashMap.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = iter.next();
- gid = entry.getKey();
- node = entry.getValue();
- if (mGTaskHashMap.containsKey(gid)) {
- mGTaskHashMap.remove(gid);
- doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
- }
- }
-
- if (!mCancelled)
- GTaskClient.getInstance().commitUpdate();
- }
-
-<<<<<<< HEAD
- //功能：syncType分类，addLocalNode，addRemoteNode，deleteNode，updateLocalNode，updateRemoteNode
-
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException {
- if (mCancelled) {
- return;
- }
-
- MetaData meta;
- switch (syncType) {
- case Node.SYNC_ACTION_ADD_LOCAL:
- addLocalNode(node);
- break;
- case Node.SYNC_ACTION_ADD_REMOTE:
- addRemoteNode(node, c);
- break;
- case Node.SYNC_ACTION_DEL_LOCAL:
- meta = mMetaHashMap.get(c.getString(SqlNote.GTASK_ID_COLUMN));
- if (meta != null) {
- GTaskClient.getInstance().deleteNode(meta);
- }
- mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
- break;
- case Node.SYNC_ACTION_DEL_REMOTE:
- meta = mMetaHashMap.get(node.getGid());
- if (meta != null) {
- GTaskClient.getInstance().deleteNode(meta);
- }
- GTaskClient.getInstance().deleteNode(node);
- break;
- case Node.SYNC_ACTION_UPDATE_LOCAL:
- updateLocalNode(node, c);
- break;
- case Node.SYNC_ACTION_UPDATE_REMOTE:
- updateRemoteNode(node, c);
- break;
- case Node.SYNC_ACTION_UPDATE_CONFLICT:
- // merging both modifications maybe a good idea
- // right now just use local update simply
- updateRemoteNode(node, c);
- break;
- case Node.SYNC_ACTION_NONE:
- break;
- case Node.SYNC_ACTION_ERROR:
- default:
- throw new ActionFailureException("unkown sync action type");
- }
- }
-
-<<<<<<< HEAD
- //本地增加Node
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private void addLocalNode(Node node) throws NetworkFailureException {
- if (mCancelled) {
- return;
- }
-
- SqlNote sqlNote;
- if (node instanceof TaskList) {
- if (node.getName().equals(
- GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) {
- sqlNote = new SqlNote(mContext, Notes.ID_ROOT_FOLDER);
- } else if (node.getName().equals(
- GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE)) {
- sqlNote = new SqlNote(mContext, Notes.ID_CALL_RECORD_FOLDER);
- } else {
- sqlNote = new SqlNote(mContext);
- sqlNote.setContent(node.getLocalJSONFromContent());
- sqlNote.setParentId(Notes.ID_ROOT_FOLDER);
- }
- } else {
- sqlNote = new SqlNote(mContext);
- JSONObject js = node.getLocalJSONFromContent();
- try {
- if (js.has(GTaskStringUtils.META_HEAD_NOTE)) {
- JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
- if (note.has(NoteColumns.ID)) {
- long id = note.getLong(NoteColumns.ID);
- if (DataUtils.existInNoteDatabase(mContentResolver, id)) {
- // the id is not available, have to create a new one
- note.remove(NoteColumns.ID);
- }
- }
- }
-
- if (js.has(GTaskStringUtils.META_HEAD_DATA)) {
- JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
- for (int i = 0; i < dataArray.length(); i++) {
- JSONObject data = dataArray.getJSONObject(i);
- if (data.has(DataColumns.ID)) {
- long dataId = data.getLong(DataColumns.ID);
- if (DataUtils.existInDataDatabase(mContentResolver, dataId)) {
- // the data id is not available, have to create
- // a new one
- data.remove(DataColumns.ID);
- }
- }
- }
-
- }
- } catch (JSONException e) {
- Log.w(TAG, e.toString());
- e.printStackTrace();
- }
- sqlNote.setContent(js);
-
- Long parentId = mGidToNid.get(((Task) node).getParent().getGid());
- if (parentId == null) {
- Log.e(TAG, "cannot find task's parent id locally");
- throw new ActionFailureException("cannot add local node");
- }
- sqlNote.setParentId(parentId.longValue());
- }
-
- // create the local node
- sqlNote.setGtaskId(node.getGid());
- sqlNote.commit(false);
-
- // update gid-nid mapping
- mGidToNid.put(node.getGid(), sqlNote.getId());
- mNidToGid.put(sqlNote.getId(), node.getGid());
-
- // update meta
- updateRemoteMeta(node.getGid(), sqlNote);
- }
-
-<<<<<<< HEAD
- //功能：update本地node
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException {
- if (mCancelled) {
- return;
- }
-
- SqlNote sqlNote;
- // update the note locally
- sqlNote = new SqlNote(mContext, c);
- sqlNote.setContent(node.getLocalJSONFromContent());
-
- Long parentId = (node instanceof Task) ? mGidToNid.get(((Task) node).getParent().getGid())
- : new Long(Notes.ID_ROOT_FOLDER);
- if (parentId == null) {
- Log.e(TAG, "cannot find task's parent id locally");
- throw new ActionFailureException("cannot update local node");
- }
- sqlNote.setParentId(parentId.longValue());
- sqlNote.commit(true);
-
- // update meta info
- updateRemoteMeta(node.getGid(), sqlNote);
- }
-
-<<<<<<< HEAD
- //功能：远程增加Node
- //同步操作的基础数据类型
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
- if (mCancelled) {
- return;
- }
-
-<<<<<<< HEAD
- SqlNote sqlNote = new SqlNote(mContext, c); //从本地mContext中获取内容
-=======
- SqlNote sqlNote = new SqlNote(mContext, c);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Node n;
-
- // update remotely
- if (sqlNote.isNoteType()) {
- Task task = new Task();
- task.setContentByLocalJSON(sqlNote.getContent());
-
- String parentGid = mNidToGid.get(sqlNote.getParentId());
- if (parentGid == null) {
-<<<<<<< HEAD
- Log.e(TAG, "cannot find task's parent tasklist"); //调试信息
- throw new ActionFailureException("cannot add remote task");
- }
- mGTaskListHashMap.get(parentGid).addChildTask(task); //在本地生成的GTaskList中增加子结点
-
- //登录远程服务器，创建Task
-=======
- Log.e(TAG, "cannot find task's parent tasklist");
- throw new ActionFailureException("cannot add remote task");
- }
- mGTaskListHashMap.get(parentGid).addChildTask(task);
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- GTaskClient.getInstance().createTask(task);
- n = (Node) task;
-
- // add meta
- updateRemoteMeta(task.getGid(), sqlNote);
- } else {
- TaskList tasklist = null;
-
- // we need to skip folder if it has already existed
- String folderName = GTaskStringUtils.MIUI_FOLDER_PREFFIX;
- if (sqlNote.getId() == Notes.ID_ROOT_FOLDER)
- folderName += GTaskStringUtils.FOLDER_DEFAULT;
- else if (sqlNote.getId() == Notes.ID_CALL_RECORD_FOLDER)
- folderName += GTaskStringUtils.FOLDER_CALL_NOTE;
- else
- folderName += sqlNote.getSnippet();
-
-<<<<<<< HEAD
- //iterator迭代器，通过统一的接口迭代所有的map元素
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Iterator> iter = mGTaskListHashMap.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry entry = iter.next();
- String gid = entry.getKey();
- TaskList list = entry.getValue();
-
- if (list.getName().equals(folderName)) {
- tasklist = list;
- if (mGTaskHashMap.containsKey(gid)) {
- mGTaskHashMap.remove(gid);
- }
- break;
- }
- }
-
- // no match we can add now
- if (tasklist == null) {
- tasklist = new TaskList();
- tasklist.setContentByLocalJSON(sqlNote.getContent());
- GTaskClient.getInstance().createTaskList(tasklist);
- mGTaskListHashMap.put(tasklist.getGid(), tasklist);
- }
- n = (Node) tasklist;
- }
-
- // update local note
- sqlNote.setGtaskId(n.getGid());
- sqlNote.commit(false);
- sqlNote.resetLocalModified();
- sqlNote.commit(true);
-
-<<<<<<< HEAD
- // gid-id mapping //创建id间的映射
-=======
- // gid-id mapping
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- mGidToNid.put(n.getGid(), sqlNote.getId());
- mNidToGid.put(sqlNote.getId(), n.getGid());
- }
-
-<<<<<<< HEAD
- //更新远端的Node，包含meta更新(updateRemoteMeta)
-
- //同步操作的基础数据类型
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException {
- if (mCancelled) {
- return;
- }
-
- SqlNote sqlNote = new SqlNote(mContext, c);
-
- // update remotely
- node.setContentByLocalJSON(sqlNote.getContent());
-<<<<<<< HEAD
- GTaskClient.getInstance().addUpdateNode(node); //GTaskClient用途为从本地登陆远端服务器
-=======
- GTaskClient.getInstance().addUpdateNode(node);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-
- // update meta
- updateRemoteMeta(node.getGid(), sqlNote);
-
- // move task if necessary
- if (sqlNote.isNoteType()) {
- Task task = (Task) node;
- TaskList preParentList = task.getParent();
-<<<<<<< HEAD
- //preParentList为通过node获取的父节点列表
-
- String curParentGid = mNidToGid.get(sqlNote.getParentId());
- //curParentGid为通过光标在数据库中找到sqlNote的mParentId，再通过mNidToGid由long类型转为String类型的Gid
-
-=======
-
- String curParentGid = mNidToGid.get(sqlNote.getParentId());
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (curParentGid == null) {
- Log.e(TAG, "cannot find task's parent tasklist");
- throw new ActionFailureException("cannot update remote task");
- }
- TaskList curParentList = mGTaskListHashMap.get(curParentGid);
-<<<<<<< HEAD
- //通过HashMap找到对应Gid的TaskList
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-
- if (preParentList != curParentList) {
- preParentList.removeChildTask(task);
- curParentList.addChildTask(task);
- GTaskClient.getInstance().moveTask(task, preParentList, curParentList);
- }
- }
-
- // clear local modified flag
- sqlNote.resetLocalModified();
-<<<<<<< HEAD
- //commit到本地数据库
- sqlNote.commit(true);
- }
-
- //升级远程meta。 meta---元数据----计算机文件系统管理数据---管理数据的数据。
- //同步前的数据库操作，故使用类SqlNote
-=======
- sqlNote.commit(true);
- }
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException {
- if (sqlNote != null && sqlNote.isNoteType()) {
- MetaData metaData = mMetaHashMap.get(gid);
- if (metaData != null) {
- metaData.setMeta(gid, sqlNote.getContent());
- GTaskClient.getInstance().addUpdateNode(metaData);
- } else {
- metaData = new MetaData();
- metaData.setMeta(gid, sqlNote.getContent());
- mMetaList.addChildTask(metaData);
- mMetaHashMap.put(gid, metaData);
- GTaskClient.getInstance().createTask(metaData);
- }
- }
- }
-
-<<<<<<< HEAD
- //功能：刷新本地，给sync的ID对应上最后更改过的对象
-
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private void refreshLocalSyncId() throws NetworkFailureException {
- if (mCancelled) {
- return;
- }
-
-<<<<<<< HEAD
- // get the latest gtask list //获取最近的（最晚的）gtask list
-=======
- // get the latest gtask list
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- mGTaskHashMap.clear();
- mGTaskListHashMap.clear();
- mMetaHashMap.clear();
- initGTaskList();
-
- Cursor c = null;
- try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
- "(type<>? AND parent_id<>?)", new String[] {
- String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
-<<<<<<< HEAD
- }, NoteColumns.TYPE + " DESC"); //query语句：五个参数，NoteColumns.TYPE + " DESC"-----为按类型递减顺序返回查询结果。new String[] {String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)}------为选择参数。"(type<>? AND parent_id<>?)"-------指明返回行过滤器。SqlNote.PROJECTION_NOTE--------应返回的数据列的名字。Notes.CONTENT_NOTE_URI--------contentProvider包含所有数据集所对应的uri
-=======
- }, NoteColumns.TYPE + " DESC");
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- if (c != null) {
- while (c.moveToNext()) {
- String gid = c.getString(SqlNote.GTASK_ID_COLUMN);
- Node node = mGTaskHashMap.get(gid);
- if (node != null) {
- mGTaskHashMap.remove(gid);
-<<<<<<< HEAD
- ContentValues values = new ContentValues(); //在ContentValues中创建键值对。准备通过contentResolver写入数据
- values.put(NoteColumns.SYNC_ID, node.getLastModified());
- mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, //进行批量更改，选择参数为NULL，应该可以用insert替换，参数分别为表名和需要更新的value对象。
-=======
- ContentValues values = new ContentValues();
- values.put(NoteColumns.SYNC_ID, node.getLastModified());
- mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- c.getLong(SqlNote.ID_COLUMN)), values, null, null);
- } else {
- Log.e(TAG, "something is missed");
- throw new ActionFailureException(
- "some local items don't have gid after sync");
- }
- }
- } else {
- Log.w(TAG, "failed to query local note to refresh sync id");
- }
- } finally {
- if (c != null) {
- c.close();
- c = null;
- }
- }
- }
-
-<<<<<<< HEAD
- //功能：获取同步账号,mAccount.name
-
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public String getSyncAccount() {
- return GTaskClient.getInstance().getSyncAccount().name;
- }
-
-<<<<<<< HEAD
- //功能：取消同步，置mCancelled为true
-
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public void cancelSync() {
- mCancelled = true;
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/gtask/remote/GTaskSyncService.java b/20233171391/src/src/net/micode/notes/gtask/remote/GTaskSyncService.java
deleted file mode 100644
index e01b563..0000000
--- a/20233171391/src/src/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.gtask.remote;
-
-<<<<<<< HEAD
-/*
- * Service是在一段不定的时间运行在后台，不和用户交互的应用组件
- * 主要方法：
- * private void startSync() 启动一个同步工作
- * private void cancelSync() 取消同步
- * public void onCreate()
- * public int onStartCommand(Intent intent, int flags, int startId) service生命周期的组成部分，相当于重启service（比如在被暂停之后），而不是创建一个新的service
- * public void onLowMemory() 在没有内存的情况下如果存在service则结束掉这的service
- * public IBinder onBind()
- * public void sendBroadcast(String msg) 发送同步的相关通知
- * public static void startSync(Activity activity)
- * public static void cancelSync(Context context)
- * public static boolean isSyncing() 判读是否在进行同步
- * public static String getProgressString() 获取当前进度的信息
- */
-=======
-import android.app.Activity;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.IBinder;
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
-
-public class GTaskSyncService extends Service {
- public final static String ACTION_STRING_NAME = "sync_action_type";
-
- public final static int ACTION_START_SYNC = 0;
-
- public final static int ACTION_CANCEL_SYNC = 1;
-
- public final static int ACTION_INVALID = 2;
-
- public final static String GTASK_SERVICE_BROADCAST_NAME = "net.micode.notes.gtask.remote.gtask_sync_service";
-
- public final static String GTASK_SERVICE_BROADCAST_IS_SYNCING = "isSyncing";
-
- public final static String GTASK_SERVICE_BROADCAST_PROGRESS_MSG = "progressMsg";
-
- private static GTaskASyncTask mSyncTask = null;
-
- private static String mSyncProgress = "";
-
-<<<<<<< HEAD
- //开始一个同步的工作
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private void startSync() {
- if (mSyncTask == null) {
- mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
- public void onComplete() {
- mSyncTask = null;
- sendBroadcast("");
- stopSelf();
- }
- });
- sendBroadcast("");
-<<<<<<< HEAD
- mSyncTask.execute(); //这个函数让任务是以单线程队列方式或线程池队列方式运行
- }
- }
-
-
-=======
- mSyncTask.execute();
- }
- }
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- private void cancelSync() {
- if (mSyncTask != null) {
- mSyncTask.cancelSync();
- }
- }
-
- @Override
-<<<<<<< HEAD
- public void onCreate() { //初始化一个service
-=======
- public void onCreate() {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- mSyncTask = null;
- }
-
- @Override
- public int onStartCommand(Intent intent, int flags, int startId) {
- Bundle bundle = intent.getExtras();
- if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) {
- switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) {
-<<<<<<< HEAD
- //两种情况，开始同步或者取消同步
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- case ACTION_START_SYNC:
- startSync();
- break;
- case ACTION_CANCEL_SYNC:
- cancelSync();
- break;
- default:
- break;
- }
-<<<<<<< HEAD
- return START_STICKY; //等待新的intent来是这个service继续运行
-=======
- return START_STICKY;
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- }
- return super.onStartCommand(intent, flags, startId);
- }
-
- @Override
- public void onLowMemory() {
- if (mSyncTask != null) {
- mSyncTask.cancelSync();
- }
- }
-
- public IBinder onBind(Intent intent) {
- return null;
- }
-
- public void sendBroadcast(String msg) {
- mSyncProgress = msg;
-<<<<<<< HEAD
- Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME); //创建一个新的Intent
- intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null); //附加INTENT中的相应参数的值
- intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg);
- sendBroadcast(intent); //发送这个通知
- }
-
- public static void startSync(Activity activity) {//执行一个service，service的内容里的同步动作就是开始同步
-=======
- Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME);
- intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null);
- intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg);
- sendBroadcast(intent);
- }
-
- public static void startSync(Activity activity) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- GTaskManager.getInstance().setActivityContext(activity);
- Intent intent = new Intent(activity, GTaskSyncService.class);
- intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC);
- activity.startService(intent);
- }
-
-<<<<<<< HEAD
- public static void cancelSync(Context context) {//执行一个service，service的内容里的同步动作就是取消同步
-=======
- public static void cancelSync(Context context) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- Intent intent = new Intent(context, GTaskSyncService.class);
- intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC);
- context.startService(intent);
- }
-
- public static boolean isSyncing() {
- return mSyncTask != null;
- }
-
- public static String getProgressString() {
- return mSyncProgress;
- }
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/20233171391/src/src/net/micode/notes/model/Note.java b/20233171391/src/src/net/micode/notes/model/Note.java
deleted file mode 100644
index 0aba881..0000000
--- a/20233171391/src/src/net/micode/notes/model/Note.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package net.micode.notes.model;
-
-import android.content.ContentProviderOperation;//批量的更新、插入、删除数据。
-import android.content.ContentProviderResult;//操作的结果
-import android.content.ContentUris;//用于添加和获取Uri后面的ID
-import android.content.ContentValues;//一种用来存储基本数据类型数据的存储机制
-import android.content.Context;//需要用该类来弄清楚调用者的实例
-import android.content.OperationApplicationException;//操作应用程序容错
-import android.net.Uri;//表示待操作的数据
-import android.os.RemoteException;//远程容错
-import android.util.Log;//输出日志，比如说出错、警告等
-
-public class Note {
- // private ContentValues mNoteDiffValues;
- ContentValues mNoteDiffValues;//
- private NoteData mNoteData;
- private static final String TAG = "Note";
-
- /**
- * 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);
- values.put(NoteColumns.MODIFIED_DATE, createdTime);
- values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
- values.put(NoteColumns.LOCAL_MODIFIED, 1);
- values.put(NoteColumns.PARENT_ID, folderId);//将数据写入数据库表格
- Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
- //ContentResolver()主要是实现外部应用对ContentProvider中的数据
- //进行添加、删除、修改和查询操作
- long noteId = 0;
- try {
- noteId = Long.valueOf(uri.getPathSegments().get(1));
- } catch (NumberFormatException e) {
- Log.e(TAG, "Get note id error :" + e.toString());
- noteId = 0;
- }//try-catch异常处理
- if (noteId == -1) {
- throw new IllegalStateException("Wrong note id:" + noteId);
- }
- return noteId;
- }
-
- public Note() {
- mNoteDiffValues = new ContentValues();
- mNoteData = new NoteData();
- }//定义两个变量用来存储便签的数据，一个是存储便签属性、一个是存储便签内容
-
- public void setNoteValue(String key, String value) {
- mNoteDiffValues.put(key, value);
- mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
- mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
- }//设置数据库表格的标签属性数据
-
- public void setTextData(String key, String value) {
- mNoteData.setTextData(key, value);
- }//设置数据库表格的标签文本内容的数据
-
- public void setTextDataId(long id) {
- mNoteData.setTextDataId(id);
- }//设置文本数据的ID
-
- public long getTextDataId() {
- return mNoteData.mTextDataId;
- }//得到文本数据的ID
-
- public void setCallDataId(long id) {
- mNoteData.setCallDataId(id);
- }//设置电话号码数据的ID
-
- public void setCallData(String key, String value) {
- mNoteData.setCallData(key, value);
- }//得到电话号码数据的ID
-
- public boolean isLocalModified() {
- return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
- }//判断是否是本地修改
-
- public boolean syncNote(Context context, long noteId) {
- if (noteId <= 0) {
- throw new IllegalArgumentException("Wrong note id:" + noteId);
- }
-
- if (!isLocalModified()) {
- return true;
- }
-
- /**
- * 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();
-
- if (mNoteData.isLocalModified()
- && (mNoteData.pushIntoContentResolver(context, noteId) == null)) {
- return false;
- }
-
- return true;
- }//判断数据是否同步
-
- private class NoteData {//定义一个基本的便签内容的数据类，主要包含文本数据和电话号码数据
- 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();
- mTextDataId = 0;
- mCallDataId = 0;
- }
- //下面是上述几个函数的具体实现
- boolean isLocalModified() {
- return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
- }
-
- void setTextDataId(long id) {
- if(id <= 0) {
- throw new IllegalArgumentException("Text data id should larger than 0");
- }
- mTextDataId = id;
- }
-
- void setCallDataId(long id) {
- if (id <= 0) {
- throw new IllegalArgumentException("Call data id should larger than 0");
- }
- mCallDataId = id;
- }
-
- void setCallData(String key, String value) {
- mCallDataValues.put(key, value);
- mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
- mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
- }
-
- void setTextData(String key, String value) {
- mTextDataValues.put(key, value);
- mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
- mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
- }
- //下面函数的作用是将新的数据通过Uri的操作存储到数据库
- Uri pushIntoContentResolver(Context context, long noteId) {
- /**
- * Check for safety
- */
- if (noteId <= 0) {
- throw new IllegalArgumentException("Wrong note id:" + noteId);
- }//判断数据是否合法
-
- 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);
- try {
- setTextDataId(Long.valueOf(uri.getPathSegments().get(1)));
- } catch (NumberFormatException e) {
- Log.e(TAG, "Insert new text data fail with noteId" + noteId);
- mTextDataValues.clear();
- return null;
- }
- } else {
- builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
- Notes.CONTENT_DATA_URI, mTextDataId));
- builder.withValues(mTextDataValues);
- operationList.add(builder.build());
- }
- mTextDataValues.clear();
- }//把文本数据存入DataColumns
-
- 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);
- try {
- setCallDataId(Long.valueOf(uri.getPathSegments().get(1)));
- } catch (NumberFormatException e) {
- Log.e(TAG, "Insert new call data fail with noteId" + noteId);
- mCallDataValues.clear();
- return null;
- }
- } else {
- builder = ContentProviderOperation.newUpdate(ContentUris.withAppendedId(
- Notes.CONTENT_DATA_URI, mCallDataId));
- builder.withValues(mCallDataValues);
- operationList.add(builder.build());
- }
- mCallDataValues.clear();
- }//把电话号码数据存入DataColumns
-
- if (operationList.size() > 0) {
- try {
- ContentProviderResult[] results = context.getContentResolver().applyBatch(
- Notes.AUTHORITY, operationList);
- return (results == null || results.length == 0 || results[0] == null) ? null
- : ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId);
- } catch (RemoteException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- return null;
- } catch (OperationApplicationException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- return null;
- }
- }//存储过程中的异常处理
- return null;
- }
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/model/WorkingNote.java b/20233171391/src/src/net/micode/notes/model/WorkingNote.java
deleted file mode 100644
index 32ac378..0000000
--- a/20233171391/src/src/net/micode/notes/model/WorkingNote.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package net.micode.notes.model;
-
-public class WorkingNote {
- // Note for the working note
- private Note mNote;
- // Note Id
- private long mNoteId;
- // Note content
- private String mContent;
- // Note mode
- private int mMode;
-
- private long mAlertDate;
- private long mModifiedDate;
- private int mBgColorId;
- private int mWidgetId;
- private int mWidgetType;
- private long mFolderId;
- private Context mContext;
-
- private static final String TAG = "WorkingNote";
-
- private boolean mIsDeleted;
-
- private NoteSettingChangedListener mNoteSettingStatusListener;
-
- // 声明 DATA_PROJECTION字符串数组
- public static final String[] DATA_PROJECTION = new String[] {
- DataColumns.ID,
- DataColumns.CONTENT,
- DataColumns.MIME_TYPE,
- DataColumns.DATA1,
- DataColumns.DATA2,
- DataColumns.DATA3,
- DataColumns.DATA4,
- };
-
- // 声明 NOTE_PROJECTION字符串数组
- public static final String[] NOTE_PROJECTION = new String[] {
- NoteColumns.PARENT_ID,
- NoteColumns.ALERTED_DATE,
- NoteColumns.BG_COLOR_ID,
- NoteColumns.WIDGET_ID,
- NoteColumns.WIDGET_TYPE,
- 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;
-
- // New note construct
- public WorkingNote(Context context, long folderId) {
- mContext = context;
- mAlertDate = 0;
- mModifiedDate = System.currentTimeMillis();
- mFolderId = folderId;
- mNote = new Note();
- mNoteId = 0;
- mIsDeleted = false;
- mMode = 0;
- mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
- }
-
- // WorkingNote的构造函数
- // Existing note construct
- private WorkingNote(Context context, long noteId, long folderId) {
- mContext = context;
- mNoteId = noteId;
- mFolderId = folderId;
- mIsDeleted = false;
- mNote = new Note();
- loadNote();
- }
-
- // 加载Note
- // 通过数据库调用query函数找到第一个条目
- private void loadNote() {
- Cursor cursor = mContext.getContentResolver().query(
- ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
- null, null);
-
- // 若存在，储存相应信息
- if (cursor != null) {
- if (cursor.moveToFirst()) {
- mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
- mBgColorId = cursor.getInt(NOTE_BG_COLOR_ID_COLUMN);
- mWidgetId = cursor.getInt(NOTE_WIDGET_ID_COLUMN);
- mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
- mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
- mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
- }
- cursor.close();
- // 若不存在，报错
- } else {
- Log.e(TAG, "No note with id:" + mNoteId);
- throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
- }
- loadNoteData();
- }
-
- // 加载NoteData
- private void loadNoteData() {
- Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
- DataColumns.NOTE_ID + "=?", new String[] {
- String.valueOf(mNoteId)
- }, null);
-
- if (cursor != null) {
- // 查到信息不为空
- if (cursor.moveToFirst()) { // 查看第一项是否存在
- do {
- String type = cursor.getString(DATA_MIME_TYPE_COLUMN);
- if (DataConstants.NOTE.equals(type)) {
- mContent = cursor.getString(DATA_CONTENT_COLUMN);
- mMode = cursor.getInt(DATA_MODE_COLUMN);
- mNote.setTextDataId(cursor.getLong(DATA_ID_COLUMN));
- } else if (DataConstants.CALL_NOTE.equals(type)) {
- mNote.setCallDataId(cursor.getLong(DATA_ID_COLUMN));
- } else {
- Log.d(TAG, "Wrong note type with type:" + type);
- }
- } while (cursor.moveToNext());//查阅所有项,直到为空
- }
- cursor.close();
- } else {
- Log.e(TAG, "No data with id:" + mNoteId);
- throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
- }
- }
-
- // 创建空的Note
- // 传参：context，文件夹id，widget，背景颜色
- public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
- int widgetType, int defaultBgColorId) {
- WorkingNote note = new WorkingNote(context, folderId);
- // 设定相关属性
- note.setBgColorId(defaultBgColorId);
- note.setWidgetId(widgetId);
- note.setWidgetType(widgetType);
- return note;
- }
-
- public static WorkingNote load(Context context, long id) {
- return new WorkingNote(context, id, 0);
- }
-
- // 保存Note
- public synchronized boolean saveNote() {
- if (isWorthSaving()) { //是否值得保存
- if (!existInDatabase()) { // 是否存在数据库中
- if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) {
- Log.e(TAG, "Create new note fail with id:" + mNoteId);
- return false;
- }
- }
-
- 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
- && mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onWidgetChanged();
- }
- return true;
- } else {
- return false;
- }
- }
-
- // 是否在数据库中存在
- public boolean existInDatabase() {
- return mNoteId > 0;
- }
-
- // 是否值得保存
- private boolean isWorthSaving() {
- // 被删除，或（不在数据库中 内容为空），或 本地已保存过
- if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
- || (existInDatabase() && !mNote.isLocalModified())) {
- return false;
- } else {
- return true;
- }
- }
-
-
- // 设置mNoteSettingStatusListener
- public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
- mNoteSettingStatusListener = l;
- }
-
- // 设置AlertDate
- // 若 mAlertDate与data不同，则更改mAlertDate并设定NoteValue
- public void setAlertDate(long date, boolean set) {
- if (date != mAlertDate) {
- mAlertDate = date;
- mNote.setNoteValue(NoteColumns.ALERTED_DATE, String.valueOf(mAlertDate));
- }
- if (mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onClockAlertChanged(date, set);
- }
- }
-
- // 设定删除标记
- public void markDeleted(boolean mark) {
- // 设定标记
- mIsDeleted = mark;
- if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
- && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onWidgetChanged();
- // 调用mNoteSettingStatusListener的 onWidgetChanged方法
- }
- }
-
- // 设定背景颜色
- public void setBgColorId(int id) {
- if (id != mBgColorId) { //设定条件 id != mBgColorId
- mBgColorId = id;
- if (mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onBackgroundColorChanged();
- }
- mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
- }
- }
-
- // 设定检查列表模式
- // 参数：mode
- public void setCheckListMode(int mode) {
- if (mMode != mode) { //设定条件 mMode != mode
- if (mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode);
- }
- mMode = mode;
- mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
- }
- }
-
-
- // 设定WidgetType
- // 参数：type
- public void setWidgetType(int type) {
- if (type != mWidgetType) {//设定条件 type != mWidgetType
- mWidgetType = type;
- mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
- // 调用Note的setNoteValue方法更改WidgetType
- }
- }
-
- // 设定WidgetId
- // 参数：id
- public void setWidgetId(int id) {
- if (id != mWidgetId) {//设定条件 id != mWidgetId
- mWidgetId = id;
- mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
- // 调用Note的setNoteValue方法更改WidgetId
- }
- }
-
- // 设定WorkingTex
- // 参数：更改的text
- public void setWorkingText(String text) {
- if (!TextUtils.equals(mContent, text)) {//设定条件 mContent, text内容不同
- mContent = text;
- mNote.setTextData(DataColumns.CONTENT, mContent);
- // 调用Note的setTextData方法更改WorkingText
- }
- }
-
- // 转变mNote的CallData及CallNote信息
- // 参数：String phoneNumber, long 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));
- }
-
- // 判断是否有时钟题型
- public boolean hasClockAlert() {
- return (mAlertDate > 0 ? true : false);
- }
-
- // 获取Content
- public String getContent() {
- return mContent;
- }
-
- // 获取AlertDate
- public long getAlertDate() {
- return mAlertDate;
- }
-
- // 获取ModifiedDate
- public long getModifiedDate() {
- return mModifiedDate;
- }
-
- // 获取背景颜色来源id
- public int getBgColorResId() {
- return NoteBgResources.getNoteBgResource(mBgColorId);
- }
-
- // 获取背景颜色id
- public int getBgColorId() {
- return mBgColorId;
- }
-
- // 获取标题背景颜色id
- public int getTitleBgResId() {
- return NoteBgResources.getNoteTitleBgResource(mBgColorId);
- }
-
- // 获取CheckListMode
- public int getCheckListMode() {
- return mMode;
- }
-
- // 获取便签id
- public long getNoteId() {
- return mNoteId;
- }
-
- // 获取文件夹id
- public long getFolderId() {
- return mFolderId;
- }
-
- // 获取WidgetId
- public int getWidgetId() {
- return mWidgetId;
- }
-
- // 获取WidgetType
- public int getWidgetType() {
- return mWidgetType;
- }
-
- // 创建接口 NoteSettingChangedListener,便签更新监视
- // 为NoteEditActivity提供接口
- // 提供函数有
- 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();
-
- /**
- * 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);
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/tool/BackupUtils.java b/20233171391/src/src/net/micode/notes/tool/BackupUtils.java
deleted file mode 100644
index 5aa2f0b..0000000
--- a/20233171391/src/src/net/micode/notes/tool/BackupUtils.java
+++ /dev/null
@@ -1,311 +0,0 @@
-package net.micode.notes.tool;
-
-public class BackupUtils {
- private static final String TAG = "BackupUtils";
- // Singleton stuff
- private static BackupUtils sInstance; //类里面为什么可以定义自身类的对象？
-
- public static synchronized BackupUtils getInstance(Context context) {
- //ynchronized 关键字，代表这个方法加锁,相当于不管哪一个线程（例如线程A）
- //运行到这个方法时,都要检查有没有其它线程B（或者C、 D等）正在用这个方法(或者该类的其他同步方法)，有的话要等正在使用synchronized方法的线程B（或者C 、D）运行完这个方法后再运行此线程A,没有的话,锁定调用者,然后直接运行。
- //它包括两种用法：synchronized 方法和 synchronized 块。
- if (sInstance == null) {
- //如果当前备份不存在，则新声明一个
- sInstance = new BackupUtils(context);
- }
- return sInstance;
- }
-
- /**
- * Following states are signs to represents backup or restore
- * status
- */
- // Currently, the sdcard is not mounted SD卡没有被装入手机
- public static final int STATE_SD_CARD_UNMOUONTED = 0;
- // The backup file not exist 备份文件夹不存在
- public static final int STATE_BACKUP_FILE_NOT_EXIST = 1;
- // The data is not well formated, may be changed by other programs 数据已被破坏，可能被修改
- public static final int STATE_DATA_DESTROIED = 2;
- // Some run-time exception which causes restore or backup fails 超时异常
- public static final int STATE_SYSTEM_ERROR = 3;
- // Backup or restore success 成功存储
- public static final int STATE_SUCCESS = 4;
-
- private TextExport mTextExport;
-
- private BackupUtils(Context context) { //初始化函数
- mTextExport = new TextExport(context);
- }
-
- private static boolean externalStorageAvailable() { //外部存储功能是否可用
- return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
- }
-
- public int exportToText() {
- return mTextExport.exportToText();
- }
-
- public String getExportedTextFileName() {
- return mTextExport.mFileName;
- }
-
- public String getExportedTextFileDir() {
- return mTextExport.mFileDirectory;
- }
-
- private static class TextExport {
- private static final String[] NOTE_PROJECTION = {
- NoteColumns.ID,
- NoteColumns.MODIFIED_DATE,
- NoteColumns.SNIPPET,
- NoteColumns.TYPE
- };
-
- private static final int NOTE_COLUMN_ID = 0;
-
- private static final int NOTE_COLUMN_MODIFIED_DATE = 1;
-
- private static final int NOTE_COLUMN_SNIPPET = 2;
-
- private static final String[] DATA_PROJECTION = {
- DataColumns.CONTENT,
- DataColumns.MIME_TYPE,
- DataColumns.DATA1,
- DataColumns.DATA2,
- DataColumns.DATA3,
- DataColumns.DATA4,
- };
-
- private static final int DATA_COLUMN_CONTENT = 0;
-
- private static final int DATA_COLUMN_MIME_TYPE = 1;
-
- private static final int DATA_COLUMN_CALL_DATE = 2;
-
- private static final int DATA_COLUMN_PHONE_NUMBER = 4;
-
- private final String [] TEXT_FORMAT;
- private static final int FORMAT_FOLDER_NAME = 0;
- private static final int FORMAT_NOTE_DATE = 1;
- private static final int FORMAT_NOTE_CONTENT = 2;
-
- private Context mContext;
- private String mFileName;
- private String mFileDirectory;
-
- public TextExport(Context context) {
- TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note);
- mContext = context;
- mFileName = ""; //为什么为空?
- mFileDirectory = "";
- }
-
- private String getFormat(int id) { //获取文本的组成部分
- return TEXT_FORMAT[id];
- }
-
- /**
- * Export the folder identified by folder id to text
- */
- private void exportFolderToText(String folderId, PrintStream ps) {
- // Query notes belong to this folder 通过查询parent id是文件夹id的note来选出制定ID文件夹下的Note
- Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] {
- folderId
- }, null);
-
- if (notesCursor != null) {
- if (notesCursor.moveToFirst()) {
- do {
- // Print note's last modified date ps里面保存有这份note的日期
- ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
- mContext.getString(R.string.format_datetime_mdhm),
- notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
- // Query data belong to this note
- String noteId = notesCursor.getString(NOTE_COLUMN_ID);
- exportNoteToText(noteId, ps); //将文件导出到text
- } while (notesCursor.moveToNext());
- }
- notesCursor.close();
- }
- }
-
- /**
- * Export note identified by id to a print stream
- */
- private void exportNoteToText(String noteId, PrintStream ps) {
- Cursor dataCursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI,
- DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] {
- noteId
- }, null);
-
- if (dataCursor != null) { //利用光标来扫描内容，区别为callnote和note两种，靠ps.printline输出
- if (dataCursor.moveToFirst()) {
- do {
- String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE);
- if (DataConstants.CALL_NOTE.equals(mimeType)) {
- // Print phone number
- String phoneNumber = dataCursor.getString(DATA_COLUMN_PHONE_NUMBER);
- long callDate = dataCursor.getLong(DATA_COLUMN_CALL_DATE);
- String location = dataCursor.getString(DATA_COLUMN_CONTENT);
-
- if (!TextUtils.isEmpty(phoneNumber)) { //判断是否为空字符
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- phoneNumber));
- }
- // Print call date
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT), DateFormat
- .format(mContext.getString(R.string.format_datetime_mdhm),
- callDate)));
- // Print call attachment location
- if (!TextUtils.isEmpty(location)) {
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- location));
- }
- } else if (DataConstants.NOTE.equals(mimeType)) {
- String content = dataCursor.getString(DATA_COLUMN_CONTENT);
- if (!TextUtils.isEmpty(content)) {
- ps.println(String.format(getFormat(FORMAT_NOTE_CONTENT),
- content));
- }
- }
- } while (dataCursor.moveToNext());
- }
- dataCursor.close();
- }
- // print a line separator between note
- try {
- ps.write(new byte[] {
- Character.LINE_SEPARATOR, Character.LETTER_NUMBER
- });
- } catch (IOException e) {
- Log.e(TAG, e.toString());
- }
- }
-
- /**
- * Note will be exported as text which is user readable
- */
- public int exportToText() { //总函数，调用上面的exportFolder和exportNote
- if (!externalStorageAvailable()) {
- Log.d(TAG, "Media was not mounted");
- return STATE_SD_CARD_UNMOUONTED;
- }
-
- PrintStream ps = getExportToTextPrintStream();
- if (ps == null) {
- Log.e(TAG, "get print stream error");
- return STATE_SYSTEM_ERROR;
- }
- // First export folder and its notes 导出文件夹，就是导出里面包含的便签
- Cursor folderCursor = mContext.getContentResolver().query(
- Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION,
- "(" + NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER + " AND "
- + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + ") OR "
- + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER, null, null);
-
- if (folderCursor != null) {
- if (folderCursor.moveToFirst()) {
- do {
- // Print folder's name
- String folderName = "";
- if(folderCursor.getLong(NOTE_COLUMN_ID) == Notes.ID_CALL_RECORD_FOLDER) {
- folderName = mContext.getString(R.string.call_record_folder_name);
- } else {
- folderName = folderCursor.getString(NOTE_COLUMN_SNIPPET);
- }
- if (!TextUtils.isEmpty(folderName)) {
- ps.println(String.format(getFormat(FORMAT_FOLDER_NAME), folderName));
- }
- String folderId = folderCursor.getString(NOTE_COLUMN_ID);
- exportFolderToText(folderId, ps);
- } while (folderCursor.moveToNext());
- }
- folderCursor.close();
- }
-
- // Export notes in root's folder 将根目录里的便签导出（由于不属于任何文件夹，因此无法通过文件夹导出来实现这一部分便签的导出）
- Cursor noteCursor = mContext.getContentResolver().query(
- Notes.CONTENT_NOTE_URI,
- NOTE_PROJECTION,
- NoteColumns.TYPE + "=" + +Notes.TYPE_NOTE + " AND " + NoteColumns.PARENT_ID
- + "=0", null, null);
-
- if (noteCursor != null) {
- if (noteCursor.moveToFirst()) {
- do {
- ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format(
- mContext.getString(R.string.format_datetime_mdhm),
- noteCursor.getLong(NOTE_COLUMN_MODIFIED_DATE))));
- // Query data belong to this note
- String noteId = noteCursor.getString(NOTE_COLUMN_ID);
- exportNoteToText(noteId, ps);
- } while (noteCursor.moveToNext());
- }
- noteCursor.close();
- }
- ps.close();
-
- return STATE_SUCCESS;
- }
-
- /**
- * Get a print stream pointed to the file {@generateExportedTextFile}
- */
- private PrintStream getExportToTextPrintStream() {
- File file = generateFileMountedOnSDcard(mContext, R.string.file_path,
- R.string.file_name_txt_format);
- if (file == null) {
- Log.e(TAG, "create file to exported failed");
- return null;
- }
- mFileName = file.getName();
- mFileDirectory = mContext.getString(R.string.file_path);
- PrintStream ps = null;
- try {
- FileOutputStream fos = new FileOutputStream(file);
- ps = new PrintStream(fos); //将ps输出流输出到特定的文件，目的就是导出到文件，而不是直接输出
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- return null;
- } catch (NullPointerException e) {
- e.printStackTrace();
- return null;
- }
- return ps;
- }
- }
-
- /**
- * Generate the text file to store imported data
- */
- private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) {
- StringBuilder sb = new StringBuilder();
- sb.append(Environment.getExternalStorageDirectory()); //外部（SD卡）的存储路径
- sb.append(context.getString(filePathResId)); //文件的存储路径
- File filedir = new File(sb.toString()); //filedir应该就是用来存储路径信息
- sb.append(context.getString(
- fileNameFormatResId,
- DateFormat.format(context.getString(R.string.format_date_ymd),
- System.currentTimeMillis())));
- File file = new File(sb.toString());
-
- try { //如果这些文件不存在，则新建
- if (!filedir.exists()) {
- filedir.mkdir();
- }
- if (!file.exists()) {
- file.createNewFile();
- }
- return file;
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
-// try catch 异常处理
- return null;
- }
-}
-
diff --git a/20233171391/src/src/net/micode/notes/tool/DataUtils.java b/20233171391/src/src/net/micode/notes/tool/DataUtils.java
deleted file mode 100644
index 9d7359c..0000000
--- a/20233171391/src/src/net/micode/notes/tool/DataUtils.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package net.micode.notes.tool;
-
-public class DataUtils {
- public static final String TAG = "DataUtils";
- public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) { //直接删除多个笔记
- if (ids == null) {
- Log.d(TAG, "the ids is null");
- return true;
- }
- if (ids.size() == 0) {
- Log.d(TAG, "no id is in the hashset");
- return true;
- }
-
- ArrayList operationList = new ArrayList(); //提供一个任务列表
- for (long id : ids) {
- if(id == Notes.ID_ROOT_FOLDER) {
- Log.e(TAG, "Don't delete system folder root");
- continue;
- } //如果发现是根文件夹，则不删除
- ContentProviderOperation.Builder builder = ContentProviderOperation
- .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); //用newDelete实现删除功能
- operationList.add(builder.build()); //
- }
- try {
- ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList);//主机名（或叫Authority）用于唯一标识这个ContentProvider，外部调用者可以根据这个标识来找到它。
- //数据库事务，数据库事务是由一组数据库操作序列组成，事务作为一个整体被执行
- if (results == null || results.length == 0 || results[0] == null) {
- Log.d(TAG, "delete notes failed, ids:" + ids.toString());
- return false;
- }
- return true;
- } catch (RemoteException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- } catch (OperationApplicationException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- }
- return false;
- }
-
- public static void moveNoteToFoler(ContentResolver resolver, long id, long srcFolderId, long desFolderId) {
- ContentValues values = new ContentValues();
- values.put(NoteColumns.PARENT_ID, desFolderId);
- values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId);
- values.put(NoteColumns.LOCAL_MODIFIED, 1);
- resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null); //对需要移动的便签进行数据更新，然后用update实现
- }
-
- public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids,
- long folderId) {
- if (ids == null) {
- Log.d(TAG, "the ids is null");
- return true;
- }
-
- ArrayList operationList = new ArrayList();
- for (long id : ids) {
- ContentProviderOperation.Builder builder = ContentProviderOperation
- .newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); //通过withAppendedId方法，为该Uri加上ID
- builder.withValue(NoteColumns.PARENT_ID, folderId);
- builder.withValue(NoteColumns.LOCAL_MODIFIED, 1);
- operationList.add(builder.build());
- }//将ids里包含的每一列的数据逐次加入到operationList中，等待最后的批量处理
-
- try {
- ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); //applyBatch一次性处理一个操作列表
- if (results == null || results.length == 0 || results[0] == null) {
- Log.d(TAG, "delete notes failed, ids:" + ids.toString());
- return false;
- }
- return true;
- } catch (RemoteException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- } catch (OperationApplicationException e) {
- Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
- }
- return false;
- }
-
- /**
- * Get the all folder count except system folders {@link Notes#TYPE_SYSTEM}}
- */
- public static int getUserFolderCount(ContentResolver resolver) {
- Cursor cursor =resolver.query(Notes.CONTENT_NOTE_URI,
- new String[] { "COUNT(*)" },
- NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?",
- new String[] { String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)},
- null); //筛选条件：源文件不为trash folder
-
- int count = 0;
- if(cursor != null) {
- if(cursor.moveToFirst()) {
- try {
- count = cursor.getInt(0);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "get folder count failed:" + e.toString());
- } finally {
- cursor.close();
- }
- }
- }
- return count;
- }
-
- public static boolean visibleInNoteDatabase(ContentResolver resolver, long noteId, int type) {
- Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), //通过withAppendedId方法，为该Uri加上ID
- null,
- NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER,
- new String [] {String.valueOf(type)},
- null); //查询条件：type符合，且不属于垃圾文件夹
-
- boolean exist = false;
- if (cursor != null) {
- if (cursor.getCount() > 0) {//用getcount函数判断cursor是否为空
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static boolean existInNoteDatabase(ContentResolver resolver, long noteId) {
- Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId),
- null, null, null, null);
-
- boolean exist = false;
- if (cursor != null) {
- if (cursor.getCount() > 0) {
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static boolean existInDataDatabase(ContentResolver resolver, long dataId) {
- Cursor cursor = resolver.query(ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId),
- null, null, null, null);
-
- boolean exist = false;
- if (cursor != null) {
- if (cursor.getCount() > 0) {
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static boolean checkVisibleFolderName(ContentResolver resolver, String name) {
- Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI, null,
- NoteColumns.TYPE + "=" + Notes.TYPE_FOLDER +
- " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER +
- " AND " + NoteColumns.SNIPPET + "=?",
- new String[] { name }, null);
- //通过名字查询文件是否存在
- boolean exist = false;
- if(cursor != null) {
- if(cursor.getCount() > 0) {
- exist = true;
- }
- cursor.close();
- }
- return exist;
- }
-
- public static HashSet getFolderNoteWidget(ContentResolver resolver, long folderId) {
- Cursor c = resolver.query(Notes.CONTENT_NOTE_URI,
- new String[] { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE },
- NoteColumns.PARENT_ID + "=?",
- new String[] { String.valueOf(folderId) },
- null); //查询条件：父ID是传入的folderId;
-
- HashSet set = null;
- if (c != null) {
- if (c.moveToFirst()) {
- set = new HashSet();
- do {
- try {
- AppWidgetAttribute widget = new AppWidgetAttribute();
- widget.widgetId = c.getInt(0); //0对应的NoteColumns.WIDGET_ID
- widget.widgetType = c.getInt(1); //1对应的NoteColumns.WIDGET_TYPE
- set.add(widget);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, e.toString());
- }
- } while (c.moveToNext()); //查询下一条
- }
- c.close();
- }
- return set;
- }
-
- public static String getCallNumberByNoteId(ContentResolver resolver, long noteId) {
- Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
- new String [] { CallNote.PHONE_NUMBER },
- CallNote.NOTE_ID + "=? AND " + CallNote.MIME_TYPE + "=?",
- new String [] { String.valueOf(noteId), CallNote.CONTENT_ITEM_TYPE },
- null);
-
- if (cursor != null && cursor.moveToFirst()) {
- try {
- return cursor.getString(0);
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "Get call number fails " + e.toString());
- } finally {
- cursor.close();
- }
- }
- return "";
- }
-
- public static long getNoteIdByPhoneNumberAndCallDate(ContentResolver resolver, String phoneNumber, long callDate) {
- Cursor cursor = resolver.query(Notes.CONTENT_DATA_URI,
- new String [] { CallNote.NOTE_ID },
- CallNote.CALL_DATE + "=? AND " + CallNote.MIME_TYPE + "=? AND PHONE_NUMBERS_EQUAL("
- + CallNote.PHONE_NUMBER + ",?)",
- new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber },
- null);
- //通过数据库操作，查询条件是（callDate和phoneNumber匹配传入参数的值）
-
- if (cursor != null) {
- if (cursor.moveToFirst()) {
- try {
- return cursor.getLong(0); //0对应的CallNote.NOTE_ID
- } catch (IndexOutOfBoundsException e) {
- Log.e(TAG, "Get call note id fails " + e.toString());
- }
- }
- cursor.close();
- }
- return 0;
- }
-
- public static String getSnippetById(ContentResolver resolver, long noteId) {
- Cursor cursor = resolver.query(Notes.CONTENT_NOTE_URI,
- new String [] { NoteColumns.SNIPPET },
- NoteColumns.ID + "=?",
- new String [] { String.valueOf(noteId)},
- null);//查询条件：noteId
-
- if (cursor != null) {
- String snippet = "";
- if (cursor.moveToFirst()) {
- snippet = cursor.getString(0);
- }
- cursor.close();
- return snippet;
- }
- throw new IllegalArgumentException("Note is not found with id: " + noteId);
- }
- public static String getFormattedSnippet(String snippet) { //对字符串进行格式处理，将字符串两头的空格去掉，同时将换行符去掉
- if (snippet != null) {
- snippet = snippet.trim();
- int index = snippet.indexOf('\n');
- if (index != -1) {
- snippet = snippet.substring(0, index);
- }
- }
- return snippet;
- }
-
-}
diff --git a/20233171391/src/src/net/micode/notes/tool/GTaskStringUtils.java b/20233171391/src/src/net/micode/notes/tool/GTaskStringUtils.java
deleted file mode 100644
index 0a47643..0000000
--- a/20233171391/src/src/net/micode/notes/tool/GTaskStringUtils.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//简介：定义了很多的静态字符串，目的就是为了提供jsonObject中相应字符串的"key"。把这些静态的定义单独写到了一个类里面，这是非常好的编程规范
-package net.micode.notes.tool;
-
-//这个类就是定义了一堆static string，实际就是为jsonObject提供Key，把这些定义全部写到一个类里，方便查看管理，是一个非常好的编程习惯
-public class GTaskStringUtils {
-
- public final static String GTASK_JSON_ACTION_ID = "action_id";
-
- public final static String GTASK_JSON_ACTION_LIST = "action_list";
-
- public final static String GTASK_JSON_ACTION_TYPE = "action_type";
-
- public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create";
-
- public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all";
-
- public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move";
-
- public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update";
-
- public final static String GTASK_JSON_CREATOR_ID = "creator_id";
-
- public final static String GTASK_JSON_CHILD_ENTITY = "child_entity";
-
- public final static String GTASK_JSON_CLIENT_VERSION = "client_version";
-
- public final static String GTASK_JSON_COMPLETED = "completed";
-
- public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id";
-
- public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id";
-
- public final static String GTASK_JSON_DELETED = "deleted";
-
- public final static String GTASK_JSON_DEST_LIST = "dest_list";
-
- public final static String GTASK_JSON_DEST_PARENT = "dest_parent";
-
- public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type";
-
- public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta";
-
- public final static String GTASK_JSON_ENTITY_TYPE = "entity_type";
-
- public final static String GTASK_JSON_GET_DELETED = "get_deleted";
-
- public final static String GTASK_JSON_ID = "id";
-
- public final static String GTASK_JSON_INDEX = "index";
-
- public final static String GTASK_JSON_LAST_MODIFIED = "last_modified";
-
- public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point";
-
- public final static String GTASK_JSON_LIST_ID = "list_id";
-
- public final static String GTASK_JSON_LISTS = "lists";
-
- public final static String GTASK_JSON_NAME = "name";
-
- public final static String GTASK_JSON_NEW_ID = "new_id";
-
- public final static String GTASK_JSON_NOTES = "notes";
-
- public final static String GTASK_JSON_PARENT_ID = "parent_id";
-
- public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id";
-
- public final static String GTASK_JSON_RESULTS = "results";
-
- public final static String GTASK_JSON_SOURCE_LIST = "source_list";
-
- public final static String GTASK_JSON_TASKS = "tasks";
-
- public final static String GTASK_JSON_TYPE = "type";
-
- public final static String GTASK_JSON_TYPE_GROUP = "GROUP";
-
- public final static String GTASK_JSON_TYPE_TASK = "TASK";
-
- public final static String GTASK_JSON_USER = "user";
-
- public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]";
-
- public final static String FOLDER_DEFAULT = "Default";
-
- public final static String FOLDER_CALL_NOTE = "Call_Note";
-
- public final static String FOLDER_META = "METADATA";
-
- public final static String META_HEAD_GTASK_ID = "meta_gid";
-
- public final static String META_HEAD_NOTE = "meta_note";
-
- public final static String META_HEAD_DATA = "meta_data";
-
- public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE";
-
-}
diff --git a/20233171391/src/src/net/micode/notes/tool/ResourceParser.java b/20233171391/src/src/net/micode/notes/tool/ResourceParser.java
deleted file mode 100644
index 3c10891..0000000
--- a/20233171391/src/src/net/micode/notes/tool/ResourceParser.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package net.micode.notes.tool;
-
-/*简介：字面意义是资源分析器，实际上就是获取资源并且在程序中使用，比如颜色图片等
- * 实现方法：主要利用R.java这个类，其中包括
- * R.id 组件资源引用
- * R.drawable 图片资源 （被使用）
- * R.layout 布局资源
- * R.menu 菜单资源
- * R.String 文字资源
- * R.style 主题资源 （被使用）
- * 在按顺序设置好相应的id后，就可以编写简单的getXXX函数获取需要的资源
- *
- * 特殊的变量 ：
- * @BG_DEFAULT_COLOR 默认背景颜色（黄）
- * BG_DEFAULT_FONT_SIZE 默认文本大小（中）
- */
-
-public class ResourceParser {
-
- public static final int YELLOW = 0;
- public static final int BLUE = 1;
- public static final int WHITE = 2;
- public static final int GREEN = 3;
- public static final int RED = 4;
-
- public static final int BG_DEFAULT_COLOR = YELLOW;
-
- public static final int TEXT_SMALL = 0;
- public static final int TEXT_MEDIUM = 1;
- public static final int TEXT_LARGE = 2;
- public static final int TEXT_SUPER = 3;
-
- public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM;
-
- public static class NoteBgResources {
- private final static int [] BG_EDIT_RESOURCES = new int [] {
- R.drawable.edit_yellow,
- R.drawable.edit_blue,
- R.drawable.edit_white,
- R.drawable.edit_green,
- R.drawable.edit_red
- };
-
- private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] {
- R.drawable.edit_title_yellow,
- R.drawable.edit_title_blue,
- R.drawable.edit_title_white,
- R.drawable.edit_title_green,
- R.drawable.edit_title_red
- };
-
- public static int getNoteBgResource(int id) {
- return BG_EDIT_RESOURCES[id];
- }
-
- public static int getNoteTitleBgResource(int id) {
- return BG_EDIT_TITLE_RESOURCES[id];
- }
- }
- //直接获取默认的背景颜色。看不太懂，这个PREFERENCE_SET_BG_COLOR_KEY是个final string,也就是说getBoolean肯定执行else，为什么要这么写
- public static int getDefaultBgId(Context context) {
- if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(
- NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) {
- return (int) (Math.random() * NoteBgResources.BG_EDIT_RESOURCES.length);
- } else {
- return BG_DEFAULT_COLOR;
- }
- }
-
- public static class NoteItemBgResources {
- private final static int [] BG_FIRST_RESOURCES = new int [] {
- R.drawable.list_yellow_up,
- R.drawable.list_blue_up,
- R.drawable.list_white_up,
- R.drawable.list_green_up,
- R.drawable.list_red_up
- };
-
- private final static int [] BG_NORMAL_RESOURCES = new int [] {
- R.drawable.list_yellow_middle,
- R.drawable.list_blue_middle,
- R.drawable.list_white_middle,
- R.drawable.list_green_middle,
- R.drawable.list_red_middle
- };
-
- private final static int [] BG_LAST_RESOURCES = new int [] {
- R.drawable.list_yellow_down,
- R.drawable.list_blue_down,
- R.drawable.list_white_down,
- R.drawable.list_green_down,
- R.drawable.list_red_down,
- };
-
- private final static int [] BG_SINGLE_RESOURCES = new int [] {
- R.drawable.list_yellow_single,
- R.drawable.list_blue_single,
- R.drawable.list_white_single,
- R.drawable.list_green_single,
- R.drawable.list_red_single
- };
-
- public static int getNoteBgFirstRes(int id) {
- return BG_FIRST_RESOURCES[id];
- }
-
- public static int getNoteBgLastRes(int id) {
- return BG_LAST_RESOURCES[id];
- }
-
- public static int getNoteBgSingleRes(int id) {
- return BG_SINGLE_RESOURCES[id];
- }
-
- public static int getNoteBgNormalRes(int id) {
- return BG_NORMAL_RESOURCES[id];
- }
-
- public static int getFolderBgRes() {
- return R.drawable.list_folder;
- }
- }
-
- public static class WidgetBgResources {
- private final static int [] BG_2X_RESOURCES = new int [] {
- R.drawable.widget_2x_yellow,
- R.drawable.widget_2x_blue,
- R.drawable.widget_2x_white,
- R.drawable.widget_2x_green,
- R.drawable.widget_2x_red,
- };
-
- public static int getWidget2xBgResource(int id) {
- return BG_2X_RESOURCES[id];
- }
-
- private final static int [] BG_4X_RESOURCES = new int [] {
- R.drawable.widget_4x_yellow,
- R.drawable.widget_4x_blue,
- R.drawable.widget_4x_white,
- R.drawable.widget_4x_green,
- R.drawable.widget_4x_red
- };
-
- public static int getWidget4xBgResource(int id) {
- return BG_4X_RESOURCES[id];
- }
- }
-
- public static class TextAppearanceResources {
- private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] {
- R.style.TextAppearanceNormal,
- R.style.TextAppearanceMedium,
- R.style.TextAppearanceLarge,
- R.style.TextAppearanceSuper
- };
-
- //这里有一个容错的函数，防止输入的id大于资源总量，若如此，则自动返回默认的设置结果
- public static int getTexAppearanceResource(int 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 (id >= TEXTAPPEARANCE_RESOURCES.length) {
- return BG_DEFAULT_FONT_SIZE;
- }
- return TEXTAPPEARANCE_RESOURCES[id];
- }
-
- public static int getResourcesSize() {
- return TEXTAPPEARANCE_RESOURCES.length;
- }
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/AlarmAlertActivity.java b/20233171391/src/src/net/micode/notes/ui/AlarmAlertActivity.java
deleted file mode 100644
index 598803a..0000000
--- a/20233171391/src/src/net/micode/notes/ui/AlarmAlertActivity.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.DialogInterface.OnDismissListener;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.provider.Settings;
-import android.view.Window;
-import android.view.WindowManager;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.tool.DataUtils;
-
-import java.io.IOException;
-
-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;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- //Bundle类型的数据与Map类型的数据相似，都是以key-value的形式存储数据的
- //onsaveInstanceState方法是用来保存Activity的状态的
- //能从onCreate的参数savedInsanceState中获得状态数据
- 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
- //将窗体点亮
- | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
- //允许窗体点亮时锁屏
- | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
- }//在手机锁屏后如果到了闹钟提示时间，点亮屏幕
-
- Intent intent = getIntent();
-
- try {
- mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1));
- mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId);
- //根据ID从数据库中获取标签的内容；
- //getContentResolver（）是实现数据共享，实例存储。
- mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0,
- SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
- : mSnippet;
- //判断标签片段是否达到符合长度
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- return;
- }
- /*
- try
- {
- // 代码区
- }
- catch(Exception e)
- {
- // 异常处理
- }
- 代码区如果有错误，就会返回所写异常的处理。*/
- mPlayer = new MediaPlayer();
- if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
- showActionDialog();
- //弹出对话框
- playAlarmSound();
- //闹钟提示音激发
- } else {
- finish();
- //完成闹钟动作
- }
- }
-
- private boolean isScreenOn() {
- //判断屏幕是否锁屏，调用系统函数判断，最后返回值是布尔类型
- PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
- return pm.isScreenOn();
- }
-
- private void playAlarmSound() {
- //闹钟提示音激发
- Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
- //调用系统的铃声管理URI，得到闹钟提示音
- 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);
- //方法：setDataSource(Context context, Uri uri)
- //解释：无返回值，设置多媒体数据来源【根据 Uri】
- mPlayer.prepare();
- //准备同步
- mPlayer.setLooping(true);
- //设置是否循环播放
- mPlayer.start();
- //开始播放
- } catch (IllegalArgumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- //e.printStackTrace()函数功能是抛出异常， 还将显示出更深的调用信息
- //System.out.println(e)，这个方法打印出异常，并且输出在哪里出现的异常
- } 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.Builder dialog = new AlertDialog.Builder(this);
- //AlertDialog的构造方法全部是Protected的
- //所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。
- //要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法
- //如这里的dialog就是新建了一个AlertDialog
- dialog.setTitle(R.string.app_name);
- //为对话框设置标题
- dialog.setMessage(mSnippet);
- //为对话框设置内容
- dialog.setPositiveButton(R.string.notealert_ok, this);
- //给对话框添加"Yes"按钮
- if (isScreenOn()) {
- dialog.setNegativeButton(R.string.notealert_enter, this);
- }//对话框添加"No"按钮
- dialog.show().setOnDismissListener(this);
- }
-
- public void onClick(DialogInterface dialog, int which) {
- switch (which) {
- //用which来选择click后下一步的操作
- case DialogInterface.BUTTON_NEGATIVE:
- //这是取消操作
- Intent intent = new Intent(this, NoteEditActivity.class);
- //实现两个类间的数据传输
- intent.setAction(Intent.ACTION_VIEW);
- //设置动作属性
- intent.putExtra(Intent.EXTRA_UID, mNoteId);
- //实现key-value对
- //EXTRA_UID为key；mNoteId为键
- startActivity(intent);
- //开始动作
- break;
- default:
- //这是确定操作
- break;
- }
- }
-
- public void onDismiss(DialogInterface dialog) {
- //忽略
- stopAlarmSound();
- //停止闹钟声音
- finish();
- //完成该动作
- }
-
- private void stopAlarmSound() {
- if (mPlayer != null) {
- mPlayer.stop();
- //停止播放
- mPlayer.release();
- //释放MediaPlayer对象
- mPlayer = null;
- }
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/AlarmInitReceiver.java b/20233171391/src/src/net/micode/notes/ui/AlarmInitReceiver.java
deleted file mode 100644
index e1d28cc..0000000
--- a/20233171391/src/src/net/micode/notes/ui/AlarmInitReceiver.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.Intent;
-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,
- NoteColumns.ALERTED_DATE
- };
- //对数据库的操作，调用标签ID和闹钟时间
- 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();
- //System.currentTimeMillis()产生一个当前的毫秒
- //这个毫秒其实就是自1970年1月1日0时起的毫秒数
- Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
- PROJECTION,
- NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
- new String[] { String.valueOf(currentDate) },
- //将long变量currentDate转化为字符串
- null);
- //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签
-
- if (c != null) {
- if (c.moveToFirst()) {
- do {
- long alertDate = c.getLong(COLUMN_ALERTED_DATE);
- Intent sender = new Intent(context, AlarmReceiver.class);
- sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID)));
- PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
- AlarmManager alermManager = (AlarmManager) context
- .getSystemService(Context.ALARM_SERVICE);
- alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
- } while (c.moveToNext());
- }
- c.close();
- }
- //然而通过网上查找资料发现，对于闹钟机制的启动，通常需要上面的几个步骤
- //如新建Intent、PendingIntent以及AlarmManager等
- //这里就是根据数据库里的闹钟时间创建一个闹钟机制
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/AlarmReceiver.java b/20233171391/src/src/net/micode/notes/ui/AlarmReceiver.java
deleted file mode 100644
index c7e260d..0000000
--- a/20233171391/src/src/net/micode/notes/ui/AlarmReceiver.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class AlarmReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- intent.setClass(context, AlarmAlertActivity.class);
- //启动AlarmAlertActivity
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- //activity要存在于activity的栈中，而非activity的途径启动activity时必然不存在一个activity的栈
- //所以要新起一个栈装入启动的activity
- context.startActivity(intent);
- }
-}
-//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
-//作用还需要深究但是对于setClass和addFlags的
-
diff --git a/20233171391/src/src/net/micode/notes/ui/DateTimePicker.java b/20233171391/src/src/net/micode/notes/ui/DateTimePicker.java
deleted file mode 100644
index 1e97283..0000000
--- a/20233171391/src/src/net/micode/notes/ui/DateTimePicker.java
+++ /dev/null
@@ -1,491 +0,0 @@
-package net.micode.notes.ui;
-
-import java.text.DateFormatSymbols;
-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;
-
-public class DateTimePicker extends FrameLayout {
- //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 DATE_SPINNER_MIN_VAL = 0;
- private static final int DATE_SPINNER_MAX_VAL = DAYS_IN_ALL_WEEK - 1;
- private static final int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW = 0;
- private static final int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW = 23;
- 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;
- 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;
- //NumberPicker是数字选择器
- //这里定义的四个变量全部是在设置闹钟时需要选择的变量（如日期、时、分、上午或者下午）
- private Calendar mDate;
- //定义了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();
- }
- };//OnValueChangeListener，这是时间改变监听器，这里主要是对日期的监听
- //将现在日期的值传递给mDate；updateDateControl是同步操作
-
- private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() {
- //这里是对 小时（Hour） 的监听
- @Override
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- boolean isDateChanged = false;
- Calendar cal = Calendar.getInstance();
- //声明一个Calendar的变量cal，便于后续的操作
- if (!mIs24HourView) {
- 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;
- //这里是对于12小时制时，晚上11点和12点交替时对日期的更改
- } 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;
- }
- //这里是对于12小时制时，凌晨11点和12点交替时对日期的更改
- 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();
- }//这里是对于12小时制时，中午11点和12点交替时对AM和PM的更改
- } else {
- if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) {
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, 1);
- isDateChanged = true;
- //这里是对于24小时制时，晚上11点和12点交替时对日期的更改
- } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) {
- cal.setTimeInMillis(mDate.getTimeInMillis());
- cal.add(Calendar.DAY_OF_YEAR, -1);
- isDateChanged = true;
- }
- } //这里是对于12小时制时，凌晨11点和12点交替时对日期的更改
- int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY);
- //通过数字选择器对newHour的赋值
- mDate.set(Calendar.HOUR_OF_DAY, newHour);
- //通过set函数将新的Hour值传给mDate
- onDateTimeChanged();
- if (isDateChanged) {
- setCurrentYear(cal.get(Calendar.YEAR));
- setCurrentMonth(cal.get(Calendar.MONTH));
- setCurrentDay(cal.get(Calendar.DAY_OF_MONTH));
- }
- }
- };
-
- private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() {
- @Override
- //这里是对 分钟（Minute）改变的监听
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- int minValue = mMinuteSpinner.getMinValue();
- int maxValue = mMinuteSpinner.getMaxValue();
- int offset = 0;
- //设置offset，作为小时改变的一个记录数据
- if (oldVal == maxValue && newVal == minValue) {
- offset += 1;
- } else if (oldVal == minValue && newVal == maxValue) {
- offset -= 1;
- }
- //如果原值为59，新值为0，则offset加1
- //如果原值为0，新值为59，则offset减1
- if (offset != 0) {
- mDate.add(Calendar.HOUR_OF_DAY, offset);
- mHourSpinner.setValue(getCurrentHour());
- updateDateControl();
- int newHour = getCurrentHourOfDay();
- if (newHour >= HOURS_IN_HALF_DAY) {
- mIsAm = false;
- updateAmPmControl();
- } else {
- mIsAm = true;
- updateAmPmControl();
- }
- }
- mDate.set(Calendar.MINUTE, newVal);
- onDateTimeChanged();
- }
- };
-
- private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
- //对AM和PM的监听
- @Override
- public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
- mIsAm = !mIsAm;
- if (mIsAm) {
- mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY);
- } else {
- mDate.add(Calendar.HOUR_OF_DAY, HOURS_IN_HALF_DAY);
- }
- updateAmPmControl();
- onDateTimeChanged();
- }
- };
-
- 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));
- }//上面函数的得到的是一个天文数字（1970至今的秒数），需要DateFormat将其变得有意义
-
- public DateTimePicker(Context context, long date, boolean is24HourView) {
- super(context);
- //获取系统时间
- mDate = Calendar.getInstance();
- mInitialising = true;
- mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY;
- inflate(context, R.layout.datetime_picker, this);
- //如果当前Activity里用到别的layout，比如对话框layout
- //还要设置这个layout上的其他组件的内容，就必须用inflate()方法先将对话框的layout找出来
- //然后再用findViewById()找到它上面的其它组件
- 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.setMinValue(MINUT_SPINNER_MIN_VAL);
- mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL);
- mMinuteSpinner.setOnLongPressUpdateInterval(100);
- mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener);
-
- String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings();
- mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm);
- mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL);
- mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL);
- 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;
- }
-
- @Override
- public void setEnabled(boolean enabled) {
- if (mIsEnabled == enabled) {
- return;
- }
- super.setEnabled(enabled);
- mDateSpinner.setEnabled(enabled);
- mMinuteSpinner.setEnabled(enabled);
- mHourSpinner.setEnabled(enabled);
- mAmPmSpinner.setEnabled(enabled);
- mIsEnabled = enabled;
- }
- //存在疑问！！！！！！！！！！！！！setEnabled的作用
- //下面的代码通过原程序的注释已经比较清晰，另外可以通过函数名来判断
- //下面的各函数主要是对上面代码引用到的各函数功能的实现
- @Override
- public boolean isEnabled() {
- return mIsEnabled;
- }
-
- /**
- * 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();
- cal.setTimeInMillis(date);
- setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH),
- cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE));
- }//实现函数功能——设置当前的时间，参数是date
-
- /**
- * 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) {
- setCurrentYear(year);
- setCurrentMonth(month);
- setCurrentDay(dayOfMonth);
- setCurrentHour(hourOfDay);
- setCurrentMinute(minute);
- }//实现函数功能——设置当前的时间，参数是各详细的变量
-
- /**
- * Get current year
- *
- * @return The current year
- */
- //下面是得到year、month、day等值
- 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()) {
- return;
- }
- mDate.set(Calendar.YEAR, year);
- updateDateControl();
- onDateTimeChanged();
- }
-
- /**
- * 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()) {
- return;
- }
- mDate.set(Calendar.MONTH, month);
- updateDateControl();
- onDateTimeChanged();
- }
-
- /**
- * 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()) {
- return;
- }
- mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
- updateDateControl();
- onDateTimeChanged();
- }
-
- /**
- * 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;
- } else {
- return hour == 0 ? HOURS_IN_HALF_DAY : hour;
- }
- }
- }
-
- /**
- * 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);
- if (!mIs24HourView) {
- if (hourOfDay >= HOURS_IN_HALF_DAY) {
- mIsAm = false;
- if (hourOfDay > HOURS_IN_HALF_DAY) {
- hourOfDay -= HOURS_IN_HALF_DAY;
- }
- } else {
- mIsAm = true;
- if (hourOfDay == 0) {
- hourOfDay = HOURS_IN_HALF_DAY;
- }
- }
- updateAmPmControl();
- }
- mHourSpinner.setValue(hourOfDay);
- onDateTimeChanged();
- }
-
- /**
- * 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()) {
- return;
- }
- mMinuteSpinner.setValue(minute);
- mDate.set(Calendar.MINUTE, minute);
- onDateTimeChanged();
- }
-
- /**
- * @return true if this is in 24 hour view else false.
- */
- public boolean is24HourView () {
- return mIs24HourView;
- }
-
- /**
- * 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) {
- return;
- }
- mIs24HourView = is24HourView;
- mAmPmSpinner.setVisibility(is24HourView ? View.GONE : View.VISIBLE);
- int hour = getCurrentHourOfDay();
- updateHourControl();
- setCurrentHour(hour);
- 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.invalidate();
- }// 对于星期几的算法
-
- private void updateAmPmControl() {
- if (mIs24HourView) {
- mAmPmSpinner.setVisibility(View.GONE);
- } else {
- int index = mIsAm ? Calendar.AM : Calendar.PM;
- mAmPmSpinner.setValue(index);
- mAmPmSpinner.setVisibility(View.VISIBLE);
- }// 对于上下午操作的算法
- }
-
- private void updateHourControl() {
- if (mIs24HourView) {
- mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW);
- mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW);
- } else {
- mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW);
- mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW);
- }// 对与小时的算法
- }
-
- /**
- * 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());
- }
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/DateTimePickerDialog.java b/20233171391/src/src/net/micode/notes/ui/DateTimePickerDialog.java
deleted file mode 100644
index fce77bf..0000000
--- a/20233171391/src/src/net/micode/notes/ui/DateTimePickerDialog.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package net.micode.notes.ui;
-
-import java.util.Calendar;
-
-import net.micode.notes.R;
-import net.micode.notes.ui.DateTimePicker;
-import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.text.format.DateFormat;
-import android.text.format.DateUtils;
-
-public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
-
- private Calendar mDate = Calendar.getInstance();
- //创建一个Calendar类型的变量 mDate，方便时间的操作
- private boolean mIs24HourView;
- private OnDateTimeSetListener mOnDateTimeSetListener;
- //声明一个时间日期滚动选择控件 mOnDateTimeSetListener
- private DateTimePicker mDateTimePicker;
- //DateTimePicker控件，控件一般用于让用户可以从日期列表中选择单个值。
- //运行时，单击控件边上的下拉箭头，会显示为两个部分：一个下拉列表，一个用于选择日期的
-
- 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) {
- 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
- mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());
- setButton(context.getString(R.string.datetime_dialog_ok), this);
- setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null);
- //设置按钮
- set24HourView(DateFormat.is24HourFormat(this.getContext()));
- //时间标准化打印
- updateTitle(mDate.getTimeInMillis());
- }
-
- 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;
- flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
- setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
- }//android开发中常见日期管理工具类（API）——DateUtils：按照上下午显示时间
-
- public void onClick(DialogInterface arg0, int arg1) {
- if (mOnDateTimeSetListener != null) {
- mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
- }
- }//第一个参数arg0是接收到点击事件的对话框
- //第二个参数arg1是该对话框上的按钮
-
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/DropdownMenu.java b/20233171391/src/src/net/micode/notes/ui/DropdownMenu.java
deleted file mode 100644
index 01915a4..0000000
--- a/20233171391/src/src/net/micode/notes/ui/DropdownMenu.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-
-import net.micode.notes.R;
-
-public class DropdownMenu {
- private Button mButton;
- private PopupMenu mPopupMenu;
- //声明一个下拉菜单
- private Menu mMenu;
-
- public DropdownMenu(Context context, Button button, int menuId) {
- mButton = button;
- mButton.setBackgroundResource(R.drawable.dropdown_icon);
- //设置这个view的背景
- mPopupMenu = new PopupMenu(context, mButton);
- mMenu = mPopupMenu.getMenu();
- mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
- //MenuInflater是用来实例化Menu目录下的Menu布局文件
- //根据ID来确认menu的内容选项
- mButton.setOnClickListener(new OnClickListener() {
- public void onClick(View v) {
- mPopupMenu.show();
- }
- });
- }
-
- public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
- if (mPopupMenu != null) {
- mPopupMenu.setOnMenuItemClickListener(listener);
- }//设置菜单的监听
- }
-
- public MenuItem findItem(int id) {
- return mMenu.findItem(id);
- }//对于菜单选项的初始化，根据索引搜索菜单需要的选项
-
- public void setTitle(CharSequence title) {
- mButton.setText(title);
- }//布局文件，设置标题
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/FoldersListAdapter.java b/20233171391/src/src/net/micode/notes/ui/FoldersListAdapter.java
deleted file mode 100644
index 719c8d3..0000000
--- a/20233171391/src/src/net/micode/notes/ui/FoldersListAdapter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-
-
-public class FoldersListAdapter extends CursorAdapter {
- //CursorAdapter是Cursor和ListView的接口
- //FoldersListAdapter继承了CursorAdapter的类
- //主要作用是便签数据库和用户的交互
- //这里就是用folder（文件夹）的形式展现给用户
- public static final String [] PROJECTION = {
- NoteColumns.ID,
- NoteColumns.SNIPPET
- };//调用数据库中便签的ID和片段
-
- public static final int ID_COLUMN = 0;
- public static final int NAME_COLUMN = 1;
-
- public FoldersListAdapter(Context context, Cursor c) {
- super(context, c);
- // TODO Auto-generated constructor stub
- }//数据库操作
-
- @Override
- public View newView(Context context, Cursor cursor, ViewGroup parent) {
- //ViewGroup是容器
- 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);
- }
- }//将各个布局文件绑定起来
-
- 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);
- }//根据数据库中标签的ID得到标签的各项内容
-
- private class FolderListItem extends LinearLayout {
- private TextView mName;
-
- public FolderListItem(Context context) {
- super(context);
- //操作数据库
- inflate(context, R.layout.folder_list_item, this);
- //根据布局文件的名字等信息将其找出来
- mName = (TextView) findViewById(R.id.tv_folder_name);
- }
-
- public void bind(String name) {
- mName.setText(name);
- }
- }
-
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/NoteEditActivity.java b/20233171391/src/src/net/micode/notes/ui/NoteEditActivity.java
deleted file mode 100644
index 71d6590..0000000
--- a/20233171391/src/src/net/micode/notes/ui/NoteEditActivity.java
+++ /dev/null
@@ -1,1067 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlarmManager;
-import android.app.AlertDialog;
-import android.app.PendingIntent;
-import android.app.SearchManager;
-import android.appwidget.AppWidgetManager;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.Paint;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.text.style.BackgroundColorSpan;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.TextNote;
-import net.micode.notes.model.WorkingNote;
-import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
-import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
-import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
-import net.micode.notes.widget.NoteWidgetProvider_2x;
-import net.micode.notes.widget.NoteWidgetProvider_4x;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-public class NoteEditActivity extends Activity implements OnClickListener,
- NoteSettingChangedListener, OnTextViewChangeListener {
- //该类主要是针对标签的编辑
- //继承了系统内部许多和监听有关的类
- private class HeadViewHolder {
- public TextView tvModified;
-
- public ImageView ivAlertIcon;
-
- public TextView tvAlertDate;
-
- public ImageView ibSetBgColor;
- }
- //使用Map实现数据存储
- private static final Map sBgSelectorBtnsMap = new HashMap();
- static {
- sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
- sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
- sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE);
- sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN);
- sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
- //put函数是将指定值和指定键相连
- }
-
- private static final Map sBgSelectorSelectionMap = new HashMap();
- static {
- sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
- sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
- sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select);
- sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
- sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
- //put函数是将指定值和指定键相连
- }
-
- private static final Map sFontSizeBtnsMap = new HashMap();
- static {
- sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
- sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
- sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM);
- sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
- //put函数是将指定值和指定键相连
- }
-
- private static final Map sFontSelectorSelectionMap = new HashMap();
- static {
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
- sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
- //put函数是将指定值和指定键相连
- }
-
- private static final String TAG = "NoteEditActivity";
-
- private HeadViewHolder mNoteHeaderHolder;
-
- private View mHeadViewPanel;
- //私有化一个界面操作mHeadViewPanel，对表头的操作
- private View mNoteBgColorSelector;
- //私有化一个界面操作mNoteBgColorSelector，对背景颜色的操作
- private View mFontSizeSelector;
- //私有化一个界面操作mFontSizeSelector，对标签字体的操作
- private EditText mNoteEditor;
- //声明编辑控件，对文本操作
- private View mNoteEditorPanel;
- //私有化一个界面操作mNoteEditorPanel，文本编辑的控制板
- //private WorkingNote mWorkingNote;
- public WorkingNote mWorkingNote;
- //对模板WorkingNote的初始化
- private SharedPreferences mSharedPrefs;
- //私有化SharedPreferences的数据存储方式
- //它的本质是基于XML文件存储key-value键值对数据
- 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();
- }
-
- /**
- * 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) {
- super.onRestoreInstanceState(savedInstanceState);
- if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) {
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID));
- if (!initActivityState(intent)) {
- finish();
- return;
- }
- Log.d(TAG, "Restoring from killed activity");
- }//为防止内存不足时程序的终止，在这里有一个保存现场的函数
- }
-
- 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 = "";
- //如果用户实例化标签时，系统并未给出标签ID
- /**
- * Starting from the searched result
- */
- //根据键值查找ID
- if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
- noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
- mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
- }
- //如果ID在数据库中未找到
- if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
- Intent jump = new Intent(this, NotesListActivity.class);
- startActivity(jump);
- //程序将跳转到上面声明的intent——jump
- showToast(R.string.error_note_not_exist);
- finish();
- return false;
- }
- //ID在数据库中找到
- else {
- mWorkingNote = WorkingNote.load(this, noteId);
- if (mWorkingNote == null) {
- Log.e(TAG, "load note failed with note id" + noteId);
- //打印出红色的错误信息
- finish();
- return false;
- }
- }
- //setSoftInputMode——软键盘输入模式
- 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())) {
- // intent.getAction()
- // 大多用于broadcast发送广播时给机制（intent）设置一个action，就是一个字符串
- // 用户可以通过receive（接受）intent，通过 getAction得到的字符串，来决定做什么
- long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
- int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
- AppWidgetManager.INVALID_APPWIDGET_ID);
- int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE,
- Notes.TYPE_WIDGET_INVALIDE);
- int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
- ResourceParser.getDefaultBgId(this));
- // intent.getInt（Long、String）Extra是对各变量的语法分析
- // 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) {
- if (TextUtils.isEmpty(phoneNumber)) {
- 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);
- if (mWorkingNote == null) {
- Log.e(TAG, "load call note failed with note id" + noteId);
- finish();
- return false;
- }
- //将电话号码与手机的号码簿相关
- } else {
- mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
- widgetType, bgResId);
- mWorkingNote.convertToCallNote(phoneNumber, callDate);
- //
- }
- } else {
- mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
- bgResId);
- }//创建一个新的WorkingNote
-
- getWindow().setSoftInputMode(
- WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
- | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
- } else {
- Log.e(TAG, "Intent not specified action, should not support");
- finish();
- return false;
- }
- mWorkingNote.setOnSettingStatusChangedListener(this);
- return true;
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- initNoteScreen();
- }
-
- private void initNoteScreen() {
- //对界面的初始化操作
- mNoteEditor.setTextAppearance(this, TextAppearanceResources
- .getTexAppearanceResource(mFontSizeId));
- //设置外观
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- switchToListMode(mWorkingNote.getContent());
- } else {
- mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
- 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: 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);
- }
- //如果系统时间大于了闹钟设置的时间，那么闹钟失效
- else {
- 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);
- };
- }
-
- @Override
- protected void onNewIntent(Intent intent) {
- super.onNewIntent(intent);
- initActivityState(intent);
- }
-
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- /**
- * 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());
- Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
- }
-
- @Override
- //MotionEvent是对屏幕触控的传递机制
- public boolean dispatchTouchEvent(MotionEvent ev) {
- if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
- && !inRangeOfView(mNoteBgColorSelector, ev)) {
- mNoteBgColorSelector.setVisibility(View.GONE);
- return true;
- }//颜色选择器在屏幕上可见
-
- if (mFontSizeSelector.getVisibility() == View.VISIBLE
- && !inRangeOfView(mFontSizeSelector, ev)) {
- mFontSizeSelector.setVisibility(View.GONE);
- return true;
- }//字体大小选择器在屏幕上可见
- return super.dispatchTouchEvent(ev);
- }
- //对屏幕触控的坐标进行操作
- 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()))
- //如果触控的位置超出了给定的范围，返回false
- {
- return false;
- }
- return true;
- }
-
- private void initResources() {
- mHeadViewPanel = findViewById(R.id.note_title);
- mNoteHeaderHolder = new HeadViewHolder();
- mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
- 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);
- 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);
- mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
- /**
- * 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);
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- if(saveNote()) {
- Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
- }
- 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) {
- intent.setClass(this, NoteWidgetProvider_4x.class);
- } else {
- Log.e(TAG, "Unspported widget type");
- return;
- }
-
- intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
- mWorkingNote.getWidgetId()
- });
-
- sendBroadcast(intent);
- setResult(RESULT_OK, intent);
- }
-
- public void onClick(View v) {
- int id = v.getId();
- if (id == R.id.btn_set_bg_color) {
- mNoteBgColorSelector.setVisibility(View.VISIBLE);
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- - View.VISIBLE);
- } else if (sBgSelectorBtnsMap.containsKey(id)) {
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.GONE);
- mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
- mNoteBgColorSelector.setVisibility(View.GONE);
- } else if (sFontSizeBtnsMap.containsKey(id)) {
- findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
- 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);
- }
- }//************************存在问题
-
- @Override
- public void onBackPressed() {
- if(clearSettingState()) {
- return;
- }
-
- saveNote();
- super.onBackPressed();
- }
-
- private boolean clearSettingState() {
- if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
- mNoteBgColorSelector.setVisibility(View.GONE);
- return true;
- } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) {
- mFontSizeSelector.setVisibility(View.GONE);
- return true;
- }
- return false;
- }
-
- public void onBackgroundColorChanged() {
- findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.VISIBLE);
- mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
- mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
- }
-
- @Override
- //对选择菜单的准备
- public boolean onPrepareOptionsMenu(Menu menu) {
- if (isFinishing()) {
- return true;
- }
- clearSettingState();
- menu.clear();
- if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
- getMenuInflater().inflate(R.menu.call_note_edit, menu);
- // MenuInflater是用来实例化Menu目录下的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 {
- menu.findItem(R.id.menu_delete_remind).setVisible(false);
- }
- return true;
- }
-
- @Override
- /*
- * 函数功能：动态改变菜单选项内容
- * 函数实现：如下注释
- */
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- //根据菜单的id来编剧相关项目
- case R.id.menu_new_note:
- //创建一个新的便签
- createNewNote();
- break;
- case R.id.menu_delete:
- //删除便签
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- //创建关于删除操作的对话框
- builder.setTitle(getString(R.string.alert_title_delete));
- // 设置标签的标题为alert_title_delete
- builder.setIcon(android.R.drawable.ic_dialog_alert);
- //设置对话框图标
- builder.setMessage(getString(R.string.alert_message_delete_note));
- //设置对话框内容
- builder.setPositiveButton(android.R.string.ok,
- new DialogInterface.OnClickListener() {
- //建立按键监听器
- public void onClick(DialogInterface dialog, int which) {
- //点击所触发事件
- deleteCurrentNote();
- // 删除单签便签
- finish();
- }
- });
- //添加“YES”按钮
- builder.setNegativeButton(android.R.string.cancel, null);
- //添加“NO”的按钮
- builder.show();
- //显示对话框
- break;
- case R.id.menu_font_size:
- //字体大小的编辑
- mFontSizeSelector.setVisibility(View.VISIBLE);
- // 将字体选择器置为可见
- findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
- // 通过id找到相应的大小
- 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());
- // 用sendto函数将运行文本发送到遍历的本文内
- break;
- case R.id.menu_send_to_desktop:
- //发送到桌面
- sendToDesktop();
- break;
- case R.id.menu_alert:
- //创建提醒器
- setReminder();
- break;
- case R.id.menu_delete_remind:
- //删除日期提醒
- mWorkingNote.setAlertDate(0, false);
- break;
- default:
- break;
- }
- 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);
- //选择提醒的日期
- }
- });
- //建立时间日期的监听器
- d.show();
- //显示对话框
- }
-
- /**
- * 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链接选项
- intent.putExtra(Intent.EXTRA_TEXT, info);
- //将需要传递的便签信息放入text文件中
- intent.setType("text/plain");
- //编辑连接器的类型
- context.startActivity(intent);
- //在acti中进行链接
- }
-
- /*
- * 函数功能：创建一个新的便签
- * 函数实现：如下注释
- */
- 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);
- //该活动定义为创建或编辑
- intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
- //将运行便签的id添加到INTENT_EXTRA_FOLDER_ID标记中
- startActivity(intent);
- //开始activity并链接
- }
-
- /*
- * 函数功能：删除当前便签
- * 函数实现：如下注释
- */
- private void deleteCurrentNote() {
- if (mWorkingNote.existInDatabase()) {
- //假如当前运行的便签内存有数据
- HashSet ids = new HashSet();
- long id = mWorkingNote.getNoteId();
- if (id != Notes.ID_ROOT_FOLDER) {
- ids.add(id);
- //如果不是头文件夹建立一个hash表把便签id存起来
- } else {
- Log.d(TAG, "Wrong note id, should not happen");
- //否则报错
- }
- if (!isSyncMode()) {
- //在非同步模式情况下
- //删除操作
- if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
- Log.e(TAG, "Delete Note error");
- }
- } else {
- //同步模式
- //移动至垃圾文件夹的操作
- if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
- Log.e(TAG, "Move notes to trash folder error, should not happens");
- }
- }
- }
- mWorkingNote.markDeleted(true);
- //将这些标签的删除标记置为true
- }
-
- /*
- * 函数功能：判断是否为同步模式
- * 函数实现：直接看NotesPreferenceActivity中同步名称是否为空
- */
- private boolean isSyncMode() {
- return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
- }
-
- /*
- * 函数功能：设置提醒时间
- * 函数实现：如下注释
- */
- 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();
- }
- if (mWorkingNote.getNoteId() > 0) {
- Intent intent = new Intent(this, AlarmReceiver.class);
- intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
- //若有有运行的便签就是建立一个链接器将标签id都存在uri中
- PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
- AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
- //设置提醒管理器
- showAlertHeader();
- if(!set) {
- alarmManager.cancel(pendingIntent);
- } else {
- 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);
- }
- }
-
- /*
- * 函数功能：Widget发生改变的所触发的事件
- */
- public void onWidgetChanged() {
- updateWidget();//更新Widget
- }
-
- /*
- * 函数功能： 删除编辑文本框所触发的事件
- * 函数实现：如下注释
- */
- 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);
- //通过id把编辑框存在便签编辑框中
- }
-
- mEditTextList.removeViewAt(index);
- //删除特定位置的视图
- NoteEditText edit = null;
- if(index == 0) {
- edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
- R.id.et_edit_text);
- } else {
- edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
- R.id.et_edit_text);
- }
- //通过id把编辑框存在空的NoteEditText中
- int length = edit.length();
- edit.append(text);
- edit.requestFocus();//请求优先完成该此 编辑
- edit.setSelection(length);//定位到length位置处的条目
- }
-
- /*
- * 函数功能：进入编辑文本框所触发的事件
- * 函数实现：如下注释
- */
- 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);
- //建立一个新的视图并添加到编辑文本框内
- NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
- 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);
- //遍历子文本框并设置对应对下标
- }
- }
-
- /*
- * 函数功能：切换至列表模式
- * 函数实现：如下注释
- */
- private void switchToListMode(String text) {
- mEditTextList.removeAllViews();
- String[] items = text.split("\n");
- int index = 0;
- //清空所有视图，初始化下标
- for (String item : items) {
- if(!TextUtils.isEmpty(item)) {
- mEditTextList.addView(getListItem(item, index));
- index++;
- //遍历所有文本单元并添加到文本框中
- }
- }
- mEditTextList.addView(getListItem("", index));
- mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
- //优先请求此操作
-
- mNoteEditor.setVisibility(View.GONE);
- //便签编辑器不可见
- mEditTextList.setVisibility(View.VISIBLE);
- //将文本编辑框置为可见
- }
-
- /*
- * 函数功能：获取高亮效果的反馈情况
- * 函数实现：如下注释
- */
- private Spannable getHighlightQueryResult(String fullText, String userQuery) {
- SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
- //新建一个效果选项
- if (!TextUtils.isEmpty(userQuery)) {
- mPattern = Pattern.compile(userQuery);
- //将用户的询问进行解析
- Matcher m = mPattern.matcher(fullText);
- //建立一个状态机检查Pattern并进行匹配
- int start = 0;
- while (m.find(start)) {
- spannable.setSpan(
- new BackgroundColorSpan(this.getResources().getColor(
- R.color.user_query_highlight)), m.start(), m.end(),
- Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
- //设置背景颜色
- start = m.end();
- //跟新起始位置
- }
- }
- return spannable;
- }
-
- /*
- * 函数功能：获取列表项
- * 函数实现：如下注释
- */
- 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);
- } else {
- 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);
- item = item.substring(TAG_CHECKED.length(), item.length()).trim();
- } else if (item.startsWith(TAG_UNCHECKED)) {
- //选择不勾选
- cb.setChecked(false);
- edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
- item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
- }
-
- edit.setOnTextViewChangeListener(this);
- edit.setIndex(index);
- edit.setText(getHighlightQueryResult(item, mUserQuery));
- //运行编辑框的监听器对该行为作出反应，并设置下标及文本内容
- return view;
- }
-
- /*
- * 函数功能：便签内容发生改变所 触发的事件
- * 函数实现：如下注释
- */
- 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 {
- mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE);
- }
- //如果内容不为空则将其子编辑框可见性置为可见，否则不可见
- }
-
- /*
- * 函数功能：检查模式和列表模式的切换
- * 函数实现：如下注释
- */
- public void onCheckListModeChanged(int oldMode, int newMode) {
- if (newMode == TextNote.MODE_CHECK_LIST) {
- 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);
- //修改文本编辑器的内容和可见性
- }
- }
-
- /*
- * 函数功能：设置勾选选项表并返回是否勾选的标记
- * 函数实现：如下注释
- */
- private boolean getWorkingText() {
- boolean hasChecked = false;
- //初始化check标记
- if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
- // 若模式为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);
- if (!TextUtils.isEmpty(edit.getText())) {
- //若文本不为空
- if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
- //该选项框已打钩
- sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
- hasChecked = true;
- //扩展字符串为已打钩并把标记置true
- } else {
- sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
- //扩展字符串添加未打钩
- }
- }
- }
- mWorkingNote.setWorkingText(sb.toString());
- //利用编辑好的字符串设置运行便签的内容
- } else {
- mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
- // 若不是该模式直接用编辑器中的内容设置运行中标签的内容
- }
- return hasChecked;
- }
-
- /*
- * 函数功能：保存便签
- * 函数实现：如下注释
- */
- private boolean saveNote() {
- getWorkingText();
- boolean saved = mWorkingNote.saveNote();
- //运行 getWorkingText()之后保存
- if (saved) {
- /**
- * 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
- */
- //如英文注释所说链接RESULT_OK是为了识别保存的2种情况，一是创建后保存，二是修改后保存
- 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();
- //若不存在数据也就是新的标签就保存起来先
- }
-
- if (mWorkingNote.getNoteId() > 0) {
- //若是有内容
- Intent sender = new Intent();
- Intent shortcutIntent = new Intent(this, NoteEditActivity.class);
- //建立发送到桌面的连接器
- shortcutIntent.setAction(Intent.ACTION_VIEW);
- //链接为一个视图
- 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");
- //设置sneder的行为是发送
- 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);
- //空便签直接报错
- }
- }
-
- /*
- * 函数功能：编辑小图标的标题
- * 函数实现：如下注释
- */
- private String makeShortcutIconTitle(String content) {
- 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;
- //直接设置为content中的内容并返回，有勾选和未勾选2种
- }
-
- /*
- * 函数功能：显示提示的视图
- * 函数实现：根据下标显示对应的提示
- */
- private void showToast(int resId) {
- showToast(resId, Toast.LENGTH_SHORT);
- }
-
- /*
- * 函数功能：持续显示提示的视图
- * 函数实现：根据下标和持续的时间（duration）编辑提示视图并显示
- */
- private void showToast(int resId, int duration) {
- Toast.makeText(this, resId, duration).show();
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/NoteEditText.java b/20233171391/src/src/net/micode/notes/ui/NoteEditText.java
deleted file mode 100644
index 2051f5e..0000000
--- a/20233171391/src/src/net/micode/notes/ui/NoteEditText.java
+++ /dev/null
@@ -1,270 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.text.Layout;
-import android.text.Selection;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.URLSpan;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.KeyEvent;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.MotionEvent;
-import android.widget.EditText;
-
-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 static final String SCHEME_TEL = "tel:" ;
- private static final String SCHEME_HTTP = "http:" ;
- private static final String SCHEME_EMAIL = "mailto:" ;
-
- ///建立一个字符和整数的hash表，用于链接电话，网站，还有邮箱
- private static final Map sSchemaActionResMap = new HashMap();
- static {
- sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel);
- sSchemaActionResMap.put(SCHEME_HTTP, R.string.note_link_web);
- sSchemaActionResMap.put(SCHEME_EMAIL, R.string.note_link_email);
- }
-
- /**
- * Call by the {@link NoteEditActivity} to delete or add edit text
- */
- //在NoteEditActivity中删除或添加文本的操作，可以看做是一个文本是否被变的标记，英文注释已说明的很清楚
- 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;
-
- //根据context设置文本
- public NoteEditText(Context context) {
- super(context, null);//用super引用父类变量
- mIndex = 0;
- }
-
- //设置当前光标
- public void setIndex(int index) {
- mIndex = index;
- }
-
- //初始化文本修改标记
- public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
- mOnTextViewChangeListener = listener;
- }
-
- //AttributeSet 百度了一下是自定义空控件属性，用于维护便签动态变化的属性
- //初始化便签
- public NoteEditText(Context context, AttributeSet attrs) {
- super(context, attrs, android.R.attr.editTextStyle);
- }
-
- // 根据defstyle自动初始化
- public NoteEditText(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- // TODO Auto-generated construct or stub
- }
-
- @Override
- //view里的函数，处理手机屏幕的所有事件
- /*参数event为手机屏幕触摸事件封装类的对象，其中封装了该事件的所有信息，
- 例如触摸的位置、触摸的类型以及触摸的时间等。该对象会在用户触摸手机屏幕时被创建。*/
- public boolean onTouchEvent(MotionEvent event) {
- switch (event.getAction()) {
- //重写了需要处理屏幕被按下的事件
- case MotionEvent.ACTION_DOWN:
- //跟新当前坐标值
- int x = (int) event.getX();
- int y = (int) event.getY();
- x -= getTotalPaddingLeft();
- y -= getTotalPaddingTop();
- x += getScrollX();
- y += getScrollY();
-
- //用布局控件layout根据x,y的新值设置新的位置
- Layout layout = getLayout();
- int line = layout.getLineForVertical(y);
- int off = layout.getOffsetForHorizontal(line, x);
-
- //更新光标新的位置
- Selection.setSelection(getText(), off);
- break;
- }
-
- return super.onTouchEvent(event);
- }
-
- @Override
- /*
- * 函数功能：处理用户按下一个键盘按键时会触发 的事件
- * 实现过程：如下注释
- */
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- switch (keyCode) {
- //根据按键的 Unicode 编码值来处理
- case KeyEvent.KEYCODE_ENTER:
- //“进入”按键
- if (mOnTextViewChangeListener != null) {
- return false;
- }
- break;
- case KeyEvent.KEYCODE_DEL:
- //“删除”按键
- mSelectionStartBeforeDelete = getSelectionStart();
- break;
- default:
- break;
- }
- //继续执行父类的其他点击事件
- return super.onKeyDown(keyCode, event);
- }
-
- @Override
- /*
- * 函数功能：处理用户松开一个键盘按键时会触发 的事件
- * 实现方式：如下注释
- */
- public boolean onKeyUp(int keyCode, KeyEvent event) {
- switch(keyCode) {
- //根据按键的 Unicode 编码值来处理，有删除和进入2种操作
- case KeyEvent.KEYCODE_DEL:
- if (mOnTextViewChangeListener != null) {
- //若是被修改过
- if (0 == mSelectionStartBeforeDelete && mIndex != 0) {
- //若之前有被修改并且文档不为空
- mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString());
- //利用上文OnTextViewChangeListener对KEYCODE_DEL按键情况的删除函数进行删除
- return true;
- }
- } else {
- Log.d(TAG, "OnTextViewChangeListener was not seted");
- //其他情况报错，文档的改动监听器并没有建立
- }
- break;
- case KeyEvent.KEYCODE_ENTER:
- //同上也是分为监听器是否建立2种情况
- if (mOnTextViewChangeListener != null) {
- int selectionStart = getSelectionStart();
- //获取当前位置
- String text = getText().subSequence(selectionStart, length()).toString();
- //获取当前文本
- setText(getText().subSequence(0, selectionStart));
- //根据获取的文本设置当前文本
- mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text);
- //当{@link KeyEvent#KEYCODE_ENTER}添加新文本
- } else {
- Log.d(TAG, "OnTextViewChangeListener was not seted");
- //其他情况报错，文档的改动监听器并没有建立
- }
- break;
- default:
- break;
- }
- //继续执行父类的其他按键弹起的事件
- return super.onKeyUp(keyCode, event);
- }
-
- @Override
- /*
- * 函数功能：当焦点发生变化时，会自动调用该方法来处理焦点改变的事件
- * 实现方式：如下注释
- * 参数：focused表示触发该事件的View是否获得了焦点，当该控件获得焦点时，Focused等于true，否则等于false。
- direction表示焦点移动的方向，用数值表示
- Rect：表示在触发事件的View的坐标系中，前一个获得焦点的矩形区域，即表示焦点是从哪里来的。如果不可用则为null
- */
- protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
- if (mOnTextViewChangeListener != null) {
- //若监听器已经建立
- if (!focused && TextUtils.isEmpty(getText())) {
- //获取到焦点并且文本不为空
- mOnTextViewChangeListener.onTextChange(mIndex, false);
- //mOnTextViewChangeListener子函数，置false隐藏事件选项
- } else {
- mOnTextViewChangeListener.onTextChange(mIndex, true);
- //mOnTextViewChangeListener子函数，置true显示事件选项
- }
- }
- //继续执行父类的其他焦点变化的事件
- super.onFocusChanged(focused, direction, previouslyFocusedRect);
- }
-
- @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);
- //获取开始到结尾的最大值和最小值
-
- final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);
- //设置url的信息的范围值
- if (urls.length == 1) {
- int defaultResId = 0;
- for(String schema: sSchemaActionResMap.keySet()) {
- //获取计划表中所有的key值
- if(urls[0].getURL().indexOf(schema) >= 0) {
- //若url可以添加则在添加后将defaultResId置为key所映射的值
- defaultResId = sSchemaActionResMap.get(schema);
- break;
- }
- }
-
- if (defaultResId == 0) {
- //defaultResId == 0则说明url并没有添加任何东西，所以置为连接其他SchemaActionResMap的值
- 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;
- }
- });
- }
- }
- //继续执行父类的其他菜单创建的事件
- super.onCreateContextMenu(menu);
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/NoteItemData.java b/20233171391/src/src/net/micode/notes/ui/NoteItemData.java
deleted file mode 100644
index a9ff48c..0000000
--- a/20233171391/src/src/net/micode/notes/ui/NoteItemData.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.text.TextUtils;
-
-import net.micode.notes.data.Contact;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.tool.DataUtils;
-
-
-public class NoteItemData {
- 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;
- 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;
- //初始化NoteItemData，主要利用光标cursor获取的东西
- public NoteItemData(Context context, Cursor cursor) {
- //getxxx为转换格式
- mId = cursor.getLong(ID_COLUMN);
- mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
- mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
- mCreatedDate = cursor.getLong(CREATED_DATE_COLUMN);
- mHasAttachment = (cursor.getInt(HAS_ATTACHMENT_COLUMN) > 0) ? true : false;
- mModifiedDate = cursor.getLong(MODIFIED_DATE_COLUMN);
- 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);
- mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
- mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
-
- //初始化电话号码的信息
- mPhoneNumber = "";
- if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
- mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
- if (!TextUtils.isEmpty(mPhoneNumber)) {//mphonenumber里有符合字符串，则用contart功能连接
- mName = Contact.getContact(context, mPhoneNumber);
- if (mName == null) {
- mName = mPhoneNumber;
- }
- }
- }
-
- if (mName == null) {
- mName = "";
- }
- checkPostion(cursor);
- }
- ///根据鼠标的位置设置标记，和位置
- private void checkPostion(Cursor cursor) {
- //初始化几个标记，cursor具体功能笔记中已提到，不一一叙述
- mIsLastItem = cursor.isLast() ? true : false;
- mIsFirstItem = cursor.isFirst() ? true : false;
- mIsOnlyOneItem = (cursor.getCount() == 1);
- //初始化“多重子文件”“单一子文件”2个标记
- mIsMultiNotesFollowingFolder = false;
- mIsOneNoteFollowingFolder = false;
-
- //主要是设置上诉2标记
- if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//若是note格式并且不是第一个元素
- int position = cursor.getPosition();
- if (cursor.moveToPrevious()) {//获取光标位置后看上一行
- if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
- || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {//若光标满足系统或note格式
- if (cursor.getCount() > (position + 1)) {
- mIsMultiNotesFollowingFolder = true;//若是数据行数大于但前位置+1则设置成正确
- } else {
- mIsOneNoteFollowingFolder = true;//否则单一文件夹标记为true
- }
- }
- if (!cursor.moveToNext()) {//若不能再往下走则报错
- throw new IllegalStateException("cursor move to previous but can't move back");
- }
- }
- }
- }
- ///以下都是获取标记没什么好说的，不过倒数第二个需要说明下，很具体看下面
- public boolean isOneFollowingFolder() {
- return mIsOneNoteFollowingFolder;
- }
-
- public boolean isMultiFollowingFolder() {
- return mIsMultiNotesFollowingFolder;
- }
-
- public boolean isLast() {
- return mIsLastItem;
- }
-
- public String getCallName() {
- return mName;
- }
-
- public boolean isFirst() {
- return mIsFirstItem;
- }
-
- public boolean isSingle() {
- return mIsOnlyOneItem;
- }
-
- public long getId() {
- return mId;
- }
-
- public long getAlertDate() {
- return mAlertDate;
- }
-
- public long getCreatedDate() {
- return mCreatedDate;
- }
-
- public boolean hasAttachment() {
- return mHasAttachment;
- }
-
- public long getModifiedDate() {
- return mModifiedDate;
- }
-
- public int getBgColorId() {
- return mBgColorId;
- }
-
- public long getParentId() {
- return mParentId;
- }
-
- public int getNotesCount() {
- return mNotesCount;
- }
-
- public long getFolderId () {
- return mParentId;
- }
-
- public int getType() {
- return mType;
- }
-
- public int getWidgetType() {
- return mWidgetType;
- }
-
- public int getWidgetId() {
- return mWidgetId;
- }
-
- public String getSnippet() {
- return mSnippet;
- }
-
- public boolean hasAlert() {
- return (mAlertDate > 0);
- }
-
- //若数据父id为保存至文件夹模式的id且满足电话号码单元不为空，则isCallRecord为true
- public boolean isCallRecord() {
- return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
- }
-
- public static int getNoteType(Cursor cursor) {
- return cursor.getInt(TYPE_COLUMN);
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/NotesListActivity.java b/20233171391/src/src/net/micode/notes/ui/NotesListActivity.java
deleted file mode 100644
index 467caef..0000000
--- a/20233171391/src/src/net/micode/notes/ui/NotesListActivity.java
+++ /dev/null
@@ -1,1002 +0,0 @@
-package net.micode.notes.ui;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.appwidget.AppWidgetManager;
-import android.content.AsyncQueryHandler;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.ActionMode;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Display;
-import android.view.HapticFeedbackConstants;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnCreateContextMenuListener;
-import android.view.View.OnTouchListener;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.PopupMenu;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.remote.GTaskSyncService;
-import net.micode.notes.model.WorkingNote;
-import net.micode.notes.tool.BackupUtils;
-import net.micode.notes.tool.DataUtils;
-import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
-import net.micode.notes.widget.NoteWidgetProvider_2x;
-import net.micode.notes.widget.NoteWidgetProvider_4x;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.HashSet;
-//主界面，一进入就是这个界面
-/**
- * @author k
- *
- */
-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;
-
- 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"; //单行超过80个字符
-
- 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;
-
- 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)";
-
- private final static int REQUEST_CODE_OPEN_NODE = 102;
- private final static int REQUEST_CODE_NEW_NODE = 103;
-
- @Override
- // 创建类
- protected void onCreate(final Bundle savedInstanceState) { //需要是final类型 根据程序上下文环境，Java关键字final有“这是无法改变的”或者“终态的”含义，它可以修饰非抽象类、非抽象类成员方法和变量。你可能出于两种理解而需要阻止改变：设计或效率。
- // final类不能被继承，没有子类，final类中的方法默认是final的。
- //final方法不能被子类的方法覆盖，但可以被继承。
- //final成员变量表示常量，只能被赋值一次，赋值后值不再改变。
- //final不能用于修饰构造方法。
- super.onCreate(savedInstanceState); // 调用父类的onCreate函数
- setContentView(R.layout.note_list);
- initResources();
-
- /**
- * Insert an introduction when user firstly use this application
- */
- setAppInfoFromRawRes();
- }
-
- @Override
- // 返回一些子模块完成的数据交给主Activity处理
- 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);
- } else {
- super.onActivityResult(requestCode, resultCode, data);
- // 调用 Activity 的onActivityResult（）
- }
- }
-
- private void setAppInfoFromRawRes() {
- // Android平台给我们提供了一个SharedPreferences类，它是一个轻量级的存储类，特别适合用于保存软件配置参数。
- SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
- if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
- StringBuilder sb = new StringBuilder();
- InputStream in = null;
- try {
- // 把资源文件放到应用程序的/raw/raw下，那么就可以在应用中使用getResources获取资源后,
- // 以openRawResource方法（不带后缀的资源文件名）打开这个文件。
- in = getResources().openRawResource(R.raw.introduction);
- if (in != null) {
- InputStreamReader isr = new InputStreamReader(in);
- BufferedReader br = new BufferedReader(isr);
- char [] buf = new char[1024]; // 自行定义的数值，使用者不知道有什么意义
- int len = 0;
- while ((len = br.read(buf)) > 0) {
- sb.append(buf, 0, len);
- }
- } else {
- Log.e(TAG, "Read introduction file error");
- return;
- }
- } catch (IOException e) {
- e.printStackTrace();
- return;
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- }
-
- // 创建空的WorkingNote
- 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()) {
- // 更新保存note的信息
- sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
- } else {
- Log.e(TAG, "Save introduction note error");
- return;
- }
- }
- }
-
- @Override
- protected void onStart() {
- super.onStart();
- startAsyncNotesListQuery();
- }
-
- // 初始化资源
- private void initResources() {
- mContentResolver = this.getContentResolver(); // 获取应用程序的数据，得到类似数据表的东西
- mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
- mCurrentFolderId = Notes.ID_ROOT_FOLDER;
-
- // findViewById 是安卓编程的定位函数，主要是引用.R文件里的引用名
- mNotesListView = (ListView) findViewById(R.id.notes_list); // 绑定XML中的ListView，作为Item的容器
- 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);// 在activity中要获取该按钮
- 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();
- }
-
- // 继承自ListView.MultiChoiceModeListener 和 OnMenuItemClickListener
- private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
- 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);
- if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
- || DataUtils.getUserFolderCount(mContentResolver) == 0) {
- mMoveMenu.setVisible(false);
- } else {
- mMoveMenu.setVisible(true);
- mMoveMenu.setOnMenuItemClickListener(this);
- }
- 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(final MenuItem item) {
- mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
- updateMenu();
- return true;
- }
-
- });
- return true;
- }
-
- // 更新菜单
- private void updateMenu() {
- 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);
- } else {
- item.setChecked(false);
- item.setTitle(R.string.menu_select_all);
- }
- }
- }
-
- 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);
- }
-
- 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:
- 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()));
- builder.setPositiveButton(android.R.string.ok,
- 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();
- break;
- default:
- return false;
- }
- return true;
- }
- }
-
- private class NewNoteOnTouchListener implements OnTouchListener {
-
- public boolean onTouch(View v, MotionEvent event) {
- switch (event.getAction()) {
- case MotionEvent.ACTION_DOWN: {
- Display display = getWindowManager().getDefaultDisplay();
- int screenHeight = display.getHeight();
- int newNoteViewHeight = mAddNewNote.getHeight();
- 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();
- }
- /**
- * 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锛圲nit: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))) {
- mOriginY = (int) event.getY();
- mDispatchY = eventY;
- event.setLocation(event.getX(), mDispatchY);
- mDispatch = true;
- return mNotesListView.dispatchTouchEvent(event);
- }
- }
- break;
- }
- case MotionEvent.ACTION_MOVE: {
- if (mDispatch) {
- mDispatchY += (int) event.getY() - mOriginY;
- event.setLocation(event.getX(), mDispatchY);
- return mNotesListView.dispatchTouchEvent(event);
- }
- break;
- }
- default: {
- if (mDispatch) {
- event.setLocation(event.getX(), mDispatchY);
- mDispatch = false;
- return mNotesListView.dispatchTouchEvent(event);
- }
- break;
- }
- }
- return false;
- }
-
- };
-
- private void startAsyncNotesListQuery() {
- 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");
- }
-
- private final class BackgroundQueryHandler extends AsyncQueryHandler {
- public BackgroundQueryHandler(ContentResolver contentResolver) {
- super(contentResolver);
- }
-
- @Override
- protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
- switch (token) {
- case FOLDER_NOTE_LIST_QUERY_TOKEN:
- mNotesListAdapter.changeCursor(cursor);
- break;
- case FOLDER_LIST_QUERY_TOKEN:
- if (cursor != null && cursor.getCount() > 0) {
- showFolderListMenu(cursor);
- } else {
- Log.e(TAG, "Query folder failed");
- }
- break;
- default:
- return;
- }
- }
- }
-
- 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.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();
- }
- });
- 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);
- this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);
- }
-
- private void batchDelete() {
- new AsyncTask>() {
- protected HashSet doInBackground(Void... unused) {
- 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");
- }
- }
- 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);
- }
- }
- }
- 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);
- 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) {
- updateWidget(widget.widgetId, widget.widgetType);
- }
- }
- }
- }
-
- private void openNode(NoteItemData data) {
- Intent intent = new Intent(this, NoteEditActivity.class);
- 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();
- startAsyncNotesListQuery();
- if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
- mState = ListEditState.CALL_RECORD_FOLDER;
- mAddNewNote.setVisibility(View.GONE);
- } else {
- mState = ListEditState.SUB_FOLDER;
- }
- if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
- mTitleBar.setText(R.string.call_record_folder_name);
- } else {
- mTitleBar.setText(data.getSnippet());
- }
- mTitleBar.setVisibility(View.VISIBLE);
- }
-
- public void onClick(View v) {
- switch (v.getId()) {
- 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);
- }
- }
-
- private void hideSoftInput(View view) {
- InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
- inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
- }
-
- 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();
- if (!create) {
- if (mFocusNoteDataItem != null) {
- etName.setText(mFocusNoteDataItem.getSnippet());
- 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.setPositiveButton(android.R.string.ok, null);
- builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- hideSoftInput(etName);
- }
- });
-
- 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();
- if (DataUtils.checkVisibleFolderName(mContentResolver, name)) {
- Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name),
- Toast.LENGTH_LONG).show();
- 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);
- mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID
- + "=?", new String[] {
- 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);
- }
- 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) {
- // TODO Auto-generated method stub
-
- }
-
- public void onTextChanged(CharSequence s, int start, int before, int count) {
- if (TextUtils.isEmpty(etName.getText())) {
- positive.setEnabled(false);
- } else {
- positive.setEnabled(true);
- }
- }
-
- public void afterTextChanged(Editable s) {
- // TODO Auto-generated method stub
-
- }
- });
- }
-
- /* (non-Javadoc)
- * @see android.app.Activity#onBackPressed()
- * 按返回键时根据情况更改类中的数据
- */
- @Override
- public void onBackPressed() { switch (mState) {
- case SUB_FOLDER:
- mCurrentFolderId = Notes.ID_ROOT_FOLDER;
- mState = ListEditState.NOTE_LIST;
- startAsyncNotesListQuery();
- mTitleBar.setVisibility(View.GONE);
- break;
- case CALL_RECORD_FOLDER:
- mCurrentFolderId = Notes.ID_ROOT_FOLDER;
- mState = ListEditState.NOTE_LIST;
- mAddNewNote.setVisibility(View.VISIBLE);
- mTitleBar.setVisibility(View.GONE);
- startAsyncNotesListQuery();
- break;
- case NOTE_LIST:
- super.onBackPressed();
- break;
- default:
- break;
- }
- }
-
- /**
- * @param appWidgetId
- * @param appWidgetType
- * 根据不同类型的widget更新插件，通过intent传送数据
- */
- private void updateWidget(int appWidgetId, int appWidgetType) {
- 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) {
- intent.setClass(this, NoteWidgetProvider_4x.class);
- } else {
- Log.e(TAG, "Unspported widget type");
- return;
- }
-
- 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);
- }
- }
- };
-
- @Override
- public void onContextMenuClosed(Menu menu) {
- if (mNotesListView != null) {
- mNotesListView.setOnCreateContextMenuListener(null);
- }
- super.onContextMenuClosed(menu);
- }
-
- /* (non-Javadoc)
- * @see android.app.Activity#onContextItemSelected(android.view.MenuItem)
- * 针对menu中不同的选择进行不同的处理，里面详细注释
- */
- @Override
- public boolean onContextItemSelected(MenuItem item) {
- if (mFocusNoteDataItem == null) {
- Log.e(TAG, "The long click data item is null");
- return false;
- }
- switch (item.getItemId()) {
- case MENU_FOLDER_VIEW:
- openFolder(mFocusNoteDataItem);//打开对应文件
- break;
- 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.setPositiveButton(android.R.string.ok,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- deleteFolder(mFocusNoteDataItem.getId());
- }
- });
- builder.setNegativeButton(android.R.string.cancel, null);
- builder.show();//显示对话框
- break;
- case MENU_FOLDER_CHANGE_NAME:
- showCreateOrModifyFolderDialog(false);
- break;
- default:
- break;
- }
-
- return true;
- }
-
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- menu.clear();
- if (mState == ListEditState.NOTE_LIST) {
- 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);
- } else if (mState == ListEditState.CALL_RECORD_FOLDER) {
- getMenuInflater().inflate(R.menu.call_record_folder, menu);
- } else {
- Log.e(TAG, "Wrong state:" + mState);
- }
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.menu_new_folder: {
- showCreateOrModifyFolderDialog(true);
- break;
- }
- case R.id.menu_export_text: {
- exportNoteToText();
- break;
- }
- 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();
- }
- break;
- }
- case R.id.menu_setting: {
- startPreferenceActivity();
- break;
- }
- case R.id.menu_new_note: {
- createNewNote();
- break;
- }
- case R.id.menu_search:
- onSearchRequested();
- break;
- default:
- break;
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see android.app.Activity#onSearchRequested()
- * 直接调用startSearch函数
- */
- @Override
- public boolean onSearchRequested() {
- startSearch(null, false, null /* appData */, false);
- return true;
- }
-
- /**
- * 函数功能：实现将便签导出到文本功能
- */
- private void exportNoteToText() {
- final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
- new AsyncTask() {
-
- @Override
- protected Integer doInBackground(Void... unused) {
- return backup.exportToText();
- }
-
- @Override
- protected void onPostExecute(Integer result) {
- if (result == BackupUtils.STATE_SD_CARD_UNMOUONTED) {
- 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) {
- 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) {
- 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();
- }
- }
-
- }.execute();
- }
-
- /**
- * @return
- * 功能：判断是否正在同步
- */
- private boolean isSyncMode() {
- return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
- }
-
- /**
- * 功能：跳转到PreferenceActivity界面
- */
- private void startPreferenceActivity() {
- Activity from = getParent() != null ? getParent() : this;
- Intent intent = new Intent(from, NotesPreferenceActivity.class);
- from.startActivityIfNeeded(intent, -1);
- }
-
- /**
- * @author k
- * 函数功能：实现对便签列表项的点击事件（短按）
- */
- 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();
- if (mNotesListAdapter.isInChoiceMode()) {
- if (item.getType() == Notes.TYPE_NOTE) {
- position = position - mNotesListView.getHeaderViewsCount();
- mModeCallBack.onItemCheckedStateChanged(null, position, id,
- !mNotesListAdapter.isSelectedItem(position));
- }
- return;
- }
-
- switch (mState) {
- 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);
- } else {
- Log.e(TAG, "Wrong note type in NOTE_LIST");
- }
- break;
- case SUB_FOLDER:
- case CALL_RECORD_FOLDER:
- if (item.getType() == Notes.TYPE_NOTE) {
- openNode(item);
- } else {
- Log.e(TAG, "Wrong note type in SUB_FOLDER");
- }
- break;
- default:
- break;
- }
- }
- }
-
- }
-
- /**
- * 查询目标文件
- */
- 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 + ")";
-
- mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN,
- null,
- Notes.CONTENT_NOTE_URI,
- FoldersListAdapter.PROJECTION,
- selection,
- new String[] {
- String.valueOf(Notes.TYPE_FOLDER),
- String.valueOf(Notes.ID_TRASH_FOLER),
- String.valueOf(mCurrentFolderId)
- },
- NoteColumns.MODIFIED_DATE + " DESC");
- }
-
- /* (non-Javadoc)
- * @see android.widget.AdapterView.OnItemLongClickListener#onItemLongClick(android.widget.AdapterView, android.view.View, int, long)
- * 长按某一项时进行的操作
- * 如果长按的是便签，则通过ActionMode菜单实现；如果长按的是文件夹，则通过ContextMenu菜单实现；
- * 具体ActionMOde菜单和ContextMenu菜单的详细见精度笔记
- */
- public boolean onItemLongClick(AdapterView parent, View view, int position, long id) {
- if (view instanceof NotesListItem) {
- 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);
- } else {
- Log.e(TAG, "startActionMode fails");
- }
- } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) {
- mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener);
- }
- }
- return false;
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/NotesListAdapter.java b/20233171391/src/src/net/micode/notes/ui/NotesListAdapter.java
deleted file mode 100644
index f9725ea..0000000
--- a/20233171391/src/src/net/micode/notes/ui/NotesListAdapter.java
+++ /dev/null
@@ -1,257 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-
-
-import net.micode.notes.data.Notes;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-
-
-/*
- * 功能：直译为便签表连接器，继承了CursorAdapter，它为cursor和ListView提供了连接的桥梁。
- * 所以NotesListAdapter实现的是鼠标和编辑便签链接的桥梁
- */
-public class NotesListAdapter extends CursorAdapter {
- private static final String TAG = "NotesListAdapter";
- private Context mContext;
- private HashMap mSelectedIndex;
- private int mNotesCount; //便签数
- private boolean mChoiceMode; //选择模式标记
-
- /*
- * 桌面widget的属性，包括编号和类型
- */
- public static class AppWidgetAttribute {
- public int widgetId;
- public int widgetType;
- };
-
- /*
- * 函数功能：初始化便签链接器
- * 函数实现：根据传进来的内容设置相关变量
- */
- public NotesListAdapter(Context context) {
- super(context, null); //父类对象置空
- mSelectedIndex = new HashMap(); //新建选项下标的hash表
- mContext = context;
- mNotesCount = 0;
- }
-
- @Override
- /*
- * 函数功能：新建一个视图来存储光标所指向的数据
- * 函数实现：使用兄弟类NotesListItem新建一个项目选项
- */
- public View newView(Context context, Cursor cursor, ViewGroup parent) {
- return new NotesListItem(context);
- }
-
- /*
- * 函数功能：将已经存在的视图和鼠标指向的数据进行捆绑
- * 函数实现：如下注释
- */
- @Override
- public void bindView(View view, Context context, Cursor cursor) {
- if (view instanceof NotesListItem) {
- //若view是NotesListItem的一个实例
- NoteItemData itemData = new NoteItemData(context, cursor);
- ((NotesListItem) view).bind(context, itemData, mChoiceMode,
- isSelectedItem(cursor.getPosition()));
- //则新建一个项目选项并且用bind跟将view和鼠标，内容，便签数据捆绑在一起
- }
- }
-
- /*
- * 函数功能：设置勾选框
- * 函数实现：如下注释
- */
- public void setCheckedItem(final int position, final boolean checked) {
- mSelectedIndex.put(position, checked);
- //根据定位和是否勾选设置下标
- notifyDataSetChanged();
- //在修改后刷新activity
- }
-
- /*
- * 函数功能：判断单选按钮是否勾选
- */
- public boolean isInChoiceMode() {
- return mChoiceMode;
- }
-
- /*
- * 函数功能：设置单项选项框
- * 函数实现：重置下标并且根据参数mode设置选项
- */
- public void setChoiceMode(boolean mode) {
- mSelectedIndex.clear();
- mChoiceMode = mode;
- }
-
- /*
- * 函数功能：选择全部选项
- * 函数实现：如下注释
- */
- 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);
- }
- }
- }
- //遍历所有光标可用的位置在判断为便签类型之后勾选单项框
- }
-
- /*
- * 函数功能：建立选择项的下标列表
- * 函数实现：如下注释
- */
- public HashSet getSelectedItemIds() {
- HashSet itemSet = new HashSet();
- //建立hash表
- for (Integer position : mSelectedIndex.keySet()) {
- //遍历所有的关键
- if (mSelectedIndex.get(position) == true) {
- //若光标位置可用
- Long id = getItemId(position);
- if (id == Notes.ID_ROOT_FOLDER) {
- //原文件不需要添加
- Log.d(TAG, "Wrong item id, should not happen");
- } else {
- itemSet.add(id);
- }
- //则将id该下标假如选项集合中
-
- }
- }
-
- return itemSet;
- }
-
- /*
- * 函数功能：建立桌面Widget的选项表
- * 函数实现：如下注释
- */
- public HashSet getSelectedWidget() {
- HashSet itemSet = new HashSet();
- for (Integer position : mSelectedIndex.keySet()) {
- if (mSelectedIndex.get(position) == true) {
- Cursor c = (Cursor) getItem(position);
- //以上4句和getSelectedItemIds一样，不再重复
- if (c != null) {
- //光标位置可用的话就建立新的Widget属性并编辑下标和类型，最后添加到选项集中
- AppWidgetAttribute widget = new AppWidgetAttribute();
- NoteItemData item = new NoteItemData(mContext, c);
- widget.widgetId = item.getWidgetId();
- widget.widgetType = item.getWidgetType();
- itemSet.add(widget);
- /**
- * Don't close cursor here, only the adapter could close it
- */
- } else {
- Log.e(TAG, "Invalid cursor");
- return null;
- }
- }
- }
- return itemSet;
- }
-
- /*
- * 函数功能：获取选项个数
- * 函数实现：如下注释
- */
- public int getSelectedCount() {
- Collection values = mSelectedIndex.values();
- //首先获取选项下标的值
- if (null == values) {
- return 0;
- }
- Iterator iter = values.iterator();
- //初始化叠加器
- int count = 0;
- while (iter.hasNext()) {
- if (true == iter.next()) {
- //若value值为真计数+1
- count++;
- }
- }
- return count;
- }
-
- /*
- * 函数功能：判断是否全部选中
- * 函数实现：如下注释
- */
- public boolean isAllSelected() {
- int checkedCount = getSelectedCount();
- return (checkedCount != 0 && checkedCount == mNotesCount);
- //获取选项数看是否等于便签的个数
- }
-
- /*
- * 函数功能：判断是否为选项表
- * 函数实现：通过传递的下标来确定
- */
- public boolean isSelectedItem(final int position) {
- if (null == mSelectedIndex.get(position)) {
- return false;
- }
- return mSelectedIndex.get(position);
- }
-
- @Override
- /*
- * 函数功能：在activity内容发生局部变动的时候回调该函数计算便签的数量
- * 函数实现：如下注释
- */
- protected void onContentChanged() {
- super.onContentChanged();
- //执行基类函数
- calcNotesCount();
- }
-
- @Override
- /*
- * 函数功能：在activity光标发生局部变动的时候回调该函数计算便签的数量
- */
- public void changeCursor(Cursor cursor) {
- super.changeCursor(cursor);
- //执行基类函数
- calcNotesCount();
- }
-
- /*
- * 函数功能：计算便签数量
- *
- */
- private void calcNotesCount() {
- mNotesCount = 0;
- for (int i = 0; i < getCount(); i++) {
- //获取总数同时遍历
- Cursor c = (Cursor) getItem(i);
- if (c != null) {
- if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
- mNotesCount++;
- //若该位置不为空并且文本类型为便签就+1
- }
- } else {
- Log.e(TAG, "Invalid cursor");
- return;
- }
- //否则报错
- }
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/NotesListItem.java b/20233171391/src/src/net/micode/notes/ui/NotesListItem.java
deleted file mode 100644
index 9f23024..0000000
--- a/20233171391/src/src/net/micode/notes/ui/NotesListItem.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package net.micode.notes.ui;
-
-import android.content.Context;
-import android.text.format.DateUtils;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-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; //打钩框
-
- /*初始化基本信息*/
- public NotesListItem(Context context) {
- super(context); //super()它的主要作用是调整调用父类构造函数的顺序
- inflate(context, R.layout.note_item, this);//Inflate可用于将一个xml中定义的布局控件找出来,这里的xml是r。layout
- //findViewById用于从contentView中查找指定ID的View，转换出来的形式根据需要而定;
- mAlert = (ImageView) findViewById(R.id.iv_alert_icon);
- mTitle = (TextView) findViewById(R.id.tv_title);
- mTime = (TextView) findViewById(R.id.tv_time);
- mCallName = (TextView) findViewById(R.id.tv_name);
- mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
- }
- ///根据data的属性对各个控件的属性的控制，主要是可见性Visibility，内容setText，格式setTextAppearance
- 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); ///格子打钩
- } else {
- mCheckBox.setVisibility(View.GONE);
- }
-
- mItemData = data;
- ///设置控件属性，一共三种情况，由data的id和父id是否与保存到文件夹的id一致来决定
- if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
- mCallName.setVisibility(View.GONE);
- mAlert.setVisibility(View.VISIBLE);
- //设置该textview的style
- mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
- //settext为设置内容
- 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);
- ///设置title格式
- if (data.getType() == Notes.TYPE_FOLDER) {
- mTitle.setText(data.getSnippet()
- + context.getString(R.string.format_folder_files_count,
- data.getNotesCount()));
- mAlert.setVisibility(View.GONE);
- } else {
- mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
- if (data.hasAlert()) {
- mAlert.setImageResource(R.drawable.clock);///设置图片来源
- mAlert.setVisibility(View.VISIBLE);
- } else {
- mAlert.setVisibility(View.GONE);
- }
- }
- }
- ///设置内容，获取相关时间，从data里编辑的日期中获取
- mTime. setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
-
- setBackground(data);
- }
- //根据data的文件属性来设置背景
- private void setBackground(NoteItemData data) {
- int id = data.getBgColorId();
- //，若是note型文件，则4种情况，对于4种不同情况的背景来源
- if (data.getType() == Notes.TYPE_NOTE) {
- //单个数据并且只有一个子文件夹
- if (data.isSingle() || data.isOneFollowingFolder()) {
- setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id));
- } else if (data.isLast()) {//是最后一个数据
- setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id));
- } else if (data.isFirst() || data.isMultiFollowingFolder()) {//是一个数据并有多个子文件夹
- setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id));
- } else {
- setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id));
- }
- } else {
- //若不是note直接调用文件夹的背景来源
- setBackgroundResource(NoteItemBgResources.getFolderBgRes());
- }
- }
- public NoteItemData getItemData() {
- return mItemData;
- }
-}
diff --git a/20233171391/src/src/net/micode/notes/ui/NotesPreferenceActivity.java b/20233171391/src/src/net/micode/notes/ui/NotesPreferenceActivity.java
deleted file mode 100644
index d2915e5..0000000
--- a/20233171391/src/src/net/micode/notes/ui/NotesPreferenceActivity.java
+++ /dev/null
@@ -1,514 +0,0 @@
-package net.micode.notes.ui;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.ActionBar;
-import android.app.AlertDialog;
-import android.content.BroadcastReceiver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
-import android.text.TextUtils;
-import android.text.format.DateFormat;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.gtask.remote.GTaskSyncService;
-
-/*
- *该类功能：NotesPreferenceActivity，在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
- * 继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的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;
- //账户的hash标记
-
- @Override
- /*
- *函数功能：创建一个activity，在函数里要完成所有的正常静态设置
- *参数：Bundle icicle：存放了 activity 当前的状态
- *函数实现：如下注释
- */
- protected void onCreate(Bundle icicle) {
- //先执行父类的创建函数
- super.onCreate(icicle);
-
- /* using the app icon for navigation */
- getActionBar().setDisplayHomeAsUpEnabled(true);
- //给左上角图标的左边加上一个返回的图标
-
- addPreferencesFromResource(R.xml.preferences);
- //添加xml来源并显示 xml
- 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);
- //获取listvivew，ListView的作用:用于列出所有选择
- getListView().addHeaderView(header, null, true);
- //在listview组件上方添加其他组件
- }
-
- @Override
- /*
- * 函数功能：activity交互功能的实现，用于接受用户的输入
- * 函数实现：如下注释
- */
- protected void onResume() {
- //先执行父类 的交互实现
- super.onResume();
-
- // need to set sync account automatically if user has added a new
- // account
- if (mHasAddedAccount) {
- //若用户新加了账户则自动设置同步账户
- Account[] accounts = getGoogleAccounts();
- //获取google同步账户
- if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
- //若原账户不为空且当前账户有增加
- for (Account accountNew : accounts) {
- boolean found = false;
- for (Account accountOld : mOriAccounts) {
- if (TextUtils.equals(accountOld.name, accountNew.name)) {
- //更新账户
- found = true;
- break;
- }
- }
- if (!found) {
- setSyncAccount(accountNew.name);
- //若是没有找到旧的账户，那么同步账号中就只添加新账户
- break;
- }
- }
- }
- }
-
- refreshUI();
- //刷新标签界面
- }
-
- @Override
- /*
- * 函数功能：销毁一个activity
- * 函数实现：如下注释
- */
- 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中显示不能修改
- Toast.makeText(NotesPreferenceActivity.this,
- R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT)
- .show();
- }
- return true;
- }
- });
-
- //根据新建首选项编辑新的账户分组
- 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) {
- GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
- }
- });
- //设置按钮显示的文本为“取消同步”以及监听器
- } else {
- syncButton.setText(getString(R.string.preferences_button_sync_immediately));
- syncButton.setOnClickListener(new View.OnClickListener() {
- public void onClick(View v) {
- GTaskSyncService.startSync(NotesPreferenceActivity.this);
- }
- });
- //若是不同步则设置按钮显示的文本为“立即同步”以及对应监听器
- }
- 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,
- DateFormat.format(getString(R.string.preferences_last_sync_time_format),
- 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));
- TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
- subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
- //设置标题以及子标题的内容
- dialogBuilder.setCustomTitle(titleView);
- dialogBuilder.setPositiveButton(null, null);
- //设置对话框的自定义标题，建立一个YES的按钮
- Account[] accounts = getGoogleAccounts();
- String defAccount = getSyncAccountName(this);
- //获取同步账户信息
- mOriAccounts = accounts;
- mHasAddedAccount = false;
-
- if (accounts.length > 0) {
- //若账户不为空
- CharSequence[] items = new CharSequence[accounts.length];
- final CharSequence[] itemMapping = items;
- int checkedItem = -1;
- int index = 0;
- for (Account account : accounts) {
- if (TextUtils.equals(account.name, defAccount)) {
- checkedItem = index;
- //在账户列表中查询到所需账户
- }
- items[index++] = account.name;
- }
- dialogBuilder.setSingleChoiceItems(items, checkedItem,
- //在对话框建立一个单选的复选框
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- setSyncAccount(itemMapping[which].toString());
- dialog.dismiss();
- //取消对话框
- refreshUI();
- }
- //设置点击后执行的事件，包括检录新同步账户和刷新标签界面
- });
- //建立对话框网络版的监听器
- }
-
- 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;
- //将新加账户的hash置true
- Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");
- //建立网络建立组件
- intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] {
- "gmail-ls"
- });
- startActivityForResult(intent, -1);
- //跳回上一个选项
- dialog.dismiss();
- }
- });
- //建立新加账户对话框的监听器
- }
-
- /*
- * 函数功能：显示账户选择对话框和相关账户操作
- * 函数实现：如下注释
- */
- 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,
- getSyncAccountName(this)));
- TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
- 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),
- getString(R.string.preferences_menu_cancel)
- };
- //定义一些标记字符串
- dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() {
- //设置对话框要显示的一个list，用于显示几个命令时,即change，remove，cancel
- public void onClick(DialogInterface dialog, int which) {
- //按键功能，由which来决定
- if (which == 0) {
- //进入账户选择对话框
- showSelectAccountAlertDialog();
- } else if (which == 1) {
- //删除账户并且跟新便签界面
- removeSyncAccount();
- refreshUI();
- }
- }
- });
- dialogBuilder.show();
- //显示对话框
- }
-
- /*
- *函数功能：获取谷歌账户
- *函数实现：通过账户管理器直接获取
- */
- private Account[] getGoogleAccounts() {
- AccountManager accountManager = AccountManager.get(this);
- return accountManager.getAccountsByType("com.google");
- }
-
- /*
- * 函数功能：设置同步账户
- * 函数实现：如下注释：
- */
- 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) {
- editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account);
- } else {
- editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
- }
- //将该账号加入到首选项中
-
- editor.commit();
- //提交修改的数据
-
-
- setLastSyncTime(this, 0);
- //将最后同步时间清零
-
- // clean up local gtask related info
- new Thread(new Runnable() {
- public void run() {
- ContentValues values = new ContentValues();
- values.put(NoteColumns.GTASK_ID, "");
- values.put(NoteColumns.SYNC_ID, 0);
- getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null);
- }
- }).start();
- //重置当地同步任务的信息
-
- Toast.makeText(NotesPreferenceActivity.this,
- getString(R.string.preferences_toast_success_set_accout, account),
- Toast.LENGTH_SHORT).show();
- //将toast的文本信息置为“设置账户成功”并显示出来
- }
- }
- /*
- * 函数功能：删除同步账户
- * 函数实现：如下注释：
- */
- private void removeSyncAccount() {
- SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
- SharedPreferences.Editor editor = settings.edit();
- //设置共享首选项
-
- if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) {
- editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME);
- //假如当前首选项中有账户就删除
- }
- if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) {
- editor.remove(PREFERENCE_LAST_SYNC_TIME);
- //删除当前首选项中有账户时间
- }
- editor.commit();
- //提交更新后的数据
-
- // clean up local gtask related info
- new Thread(new Runnable() {
- public void run() {
- ContentValues values = new ContentValues();
- values.put(NoteColumns.GTASK_ID, "");
- values.put(NoteColumns.SYNC_ID, 0);
- getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null);
- }
- }).start();
- //重置当地同步任务的信息
- }
-
- /*
- * 函数功能：获取同步账户名称
- * 函数实现：通过共享的首选项里的信息直接获取
- */
- public static String getSyncAccountName(Context context) {
- SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
- Context.MODE_PRIVATE);
- return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
- }
-
- /*
- * 函数功能：设置最终同步的时间
- * 函数实现：如下注释
- */
- public static void setLastSyncTime(Context context, long time) {
- SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
- Context.MODE_PRIVATE);
- SharedPreferences.Editor editor = settings.edit();
- // 从共享首选项中找到相关账户并获取其编辑器
- editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);
- editor.commit();
- //编辑最终同步时间并提交更新
- }
- /*
- * 函数功能：获取最终同步时间
- * 函数实现：通过共享的首选项里的信息直接获取
- */
- public static long getLastSyncTime(Context context) {
- SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
- Context.MODE_PRIVATE);
- return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);
- }
-
- /*
- * 函数功能：接受同步信息
- * 函数实现：继承BroadcastReceiver
- */
- private class GTaskReceiver extends BroadcastReceiver {
-
- @Override
- public void onReceive(Context context, Intent intent) {
- refreshUI();
- if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) {
- //获取随广播而来的Intent中的同步服务的数据
- TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
- syncStatus.setText(intent
- .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
- //通过获取的数据在设置系统的状态
- }
-
- }
- }
-
- /*
- * 函数功能：处理菜单的选项
- * 函数实现：如下注释
- * 参数:MenuItem菜单选项
- */
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- //根据选项的id选择，这里只有一个主页
- case android.R.id.home:
- Intent intent = new Intent(this, NotesListActivity.class);
- intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
- startActivity(intent);
- return true;
- //在主页情况下在创建连接组件intent，发出清空的信号并开始一个相应的activity
- default:
- return false;
- }
- }
-}
-
diff --git a/20233171391/src/src/net/micode/notes/widget/NoteWidgetProvider.java b/20233171391/src/src/net/micode/notes/widget/NoteWidgetProvider.java
deleted file mode 100644
index 7214dde..0000000
--- a/20233171391/src/src/net/micode/notes/widget/NoteWidgetProvider.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.widget;
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.util.Log;
-import android.widget.RemoteViews;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.data.Notes.NoteColumns;
-import net.micode.notes.tool.ResourceParser;
-import net.micode.notes.ui.NoteEditActivity;
-import net.micode.notes.ui.NotesListActivity;
-
-<<<<<<< HEAD
-// 定义一个抽象类 NoteWidgetProvider，继承自 AppWidgetProvider
-public abstract class NoteWidgetProvider extends AppWidgetProvider {
- // 定义查询投影，即需要从数据库中查询的字段
- public static final String [] PROJECTION = new String [] {
- NoteColumns.ID,
- NoteColumns.BG_COLOR_ID,
- NoteColumns.SNIPPET
- };
-
- // 定义投影中各字段在数组中的位置
-=======
-public abstract class NoteWidgetProvider extends AppWidgetProvider {
- public static final String [] PROJECTION = new String [] {
- NoteColumns.ID,
- NoteColumns.BG_COLOR_ID,
- NoteColumns.SNIPPET
- };
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- public static final int COLUMN_ID = 0;
- public static final int COLUMN_BG_COLOR_ID = 1;
- public static final int COLUMN_SNIPPET = 2;
-
-<<<<<<< HEAD
- // 定义标签常量 TAG，用于日志输出
- private static final String TAG = "NoteWidgetProvider";
-
- // 重写 AppWidgetProvider 中的 onDeleted 方法
- @Override
- public void onDeleted(Context context, int[] appWidgetIds) {
- // 创建 ContentValues 对象，用于更新数据库中的记录
- ContentValues values = new ContentValues();
- // 将 Widget Id 设置为无效的 AppWidgetId
- values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
- // 遍历传入的 appWidgetIds 数组
- for (int i = 0; i < appWidgetIds.length; i++) {
- // 更新数据库中的记录，将 Widget Id 设置为无效
-=======
- private static final String TAG = "NoteWidgetProvider";
-
- @Override
- public void onDeleted(Context context, int[] appWidgetIds) {
- ContentValues values = new ContentValues();
- values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
- for (int i = 0; i < appWidgetIds.length; i++) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- context.getContentResolver().update(Notes.CONTENT_NOTE_URI,
- values,
- NoteColumns.WIDGET_ID + "=?",
- new String[] { String.valueOf(appWidgetIds[i])});
- }
- }
-
-<<<<<<< HEAD
- // 定义私有方法，用于获取指定 WidgetId 对应的笔记部件信息的 Cursor 对象
- private Cursor getNoteWidgetInfo(Context context, int widgetId) {
- // 查询指定 WidgetId 对应的笔记部件信息
- return context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
- PROJECTION,
- // 查询条件：WidgetId 等于传入的 widgetId，且父文件夹不是垃圾桶
-=======
- private Cursor getNoteWidgetInfo(Context context, int widgetId) {
- return context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
- PROJECTION,
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?",
- new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) },
- null);
- }
-
-<<<<<<< HEAD
- // 定义受保护的方法，用于更新 App Widget 的显示
- protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
- // 调用下方的重载方法，传入默认参数 false
-=======
- protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- update(context, appWidgetManager, appWidgetIds, false);
- }
-
- private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds,
-<<<<<<< HEAD
- boolean privacyMode) {
- for (int i = 0; i < appWidgetIds.length; i++) { // 遍历小部件ID数组
- if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) { // 检查小部件ID是否有效
- int bgId = ResourceParser.getDefaultBgId(context); // 获取默认背景ID
- String snippet = ""; // 初始化snippet字符串
-
- // 创建启动NoteEditActivity的Intent
- Intent intent = new Intent(context, NoteEditActivity.class);
- intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); // 设置Intent标志
- intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]); // 将小部件ID添加到Intent中
- intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType()); // 获取小部件类型并添加到Intent中
-
- // 获取NoteWidgetInfo的游标
- Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]);
- if (c != null && c.moveToFirst()) { // 检查游标不为空且移动到第一行
- if (c.getCount() > 1) { // 检查游标中数据大于1
- Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]); // 记录错误信息到日志中
- c.close(); // 关闭游标
- return; // 退出方法
- }
- snippet = c.getString(COLUMN_SNIPPET); // 从游标中获取snippet
- bgId = c.getInt(COLUMN_BG_COLOR_ID); // 从游标中获取背景ID
- intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID)); // 将ID添加到Intent中
- intent.setAction(Intent.ACTION_VIEW); // 设置Intent动作为查看
- } else {
- snippet = context.getResources().getString(R.string.widget_havenot_content); // 获取资源文件中的字符串作为snippet
- intent.setAction(Intent.ACTION_INSERT_OR_EDIT); // 设置Intent动作为插入或编辑
- }
-
- if (c != null) { // 如果游标不为空
- c.close(); // 关闭游标
- }
-
- RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId()); // 创建RemoteViews对象
- rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId)); // 设置RemoteViews中的背景图片
- intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId); // 将背景ID添加到Intent中
-
- /**
- * 生成启动小部件宿主的待定Intent
- */
- PendingIntent pendingIntent = null; // 初始化待定Intent变量
- // 检查是否处于隐私模式
- if (privacyMode) {
- // 如果是隐私模式，则设置小部件文本为指定的文本
- rv.setTextViewText(R.id.widget_text, context.getString(R.string.widget_under_visit_mode));
- // 创建一个用于启动 NotesListActivity 的 PendingIntent
- pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent(
- context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
- } else {
- // 如果不是隐私模式，则设置小部件文本为指定的 snippet（摘要）
- rv.setTextViewText(R.id.widget_text, snippet);
- // 创建一个用于启动指定 intent 的 PendingIntent
-=======
- boolean privacyMode) {
- for (int i = 0; i < appWidgetIds.length; i++) {
- if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) {
- 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()) {
- if (c.getCount() > 1) {
- Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]);
- c.close();
- return;
- }
- 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);
- } else {
- snippet = context.getResources().getString(R.string.widget_havenot_content);
- intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
- }
-
- if (c != null) {
- c.close();
- }
-
- RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId());
- rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId));
- intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId);
- /**
- * 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);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent,
- PendingIntent.FLAG_UPDATE_CURRENT);
- }
-
-<<<<<<< HEAD
-// 为小部件文本视图设置点击事件的 PendingIntent
- rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent);
-// 更新小部件
- appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
-
-=======
- rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent);
- appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- }
- }
- }
-
- protected abstract int getBgResourceId(int bgId);
-
- protected abstract int getLayoutId();
-
- protected abstract int getWidgetType();
-}
diff --git a/20233171391/src/src/net/micode/notes/widget/NoteWidgetProvider_2x.java b/20233171391/src/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
deleted file mode 100644
index d5be044..0000000
--- a/20233171391/src/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.
- */
-
-<<<<<<< HEAD
-// 包声明，指定代码所在的包
-package net.micode.notes.widget;
-
-// 导入相关的 Android 类和自定义工具类
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-
-import net.micode.notes.R; // 导入 R 类，用于访问资源
-import net.micode.notes.data.Notes; // 导入自定义的 Notes 类
-import net.micode.notes.tool.ResourceParser; // 导入自定义的 ResourceParser 工具类
-
-// NoteWidgetProvider_2x 类继承自 NoteWidgetProvider 类
-public class NoteWidgetProvider_2x extends NoteWidgetProvider {
-
- // 定义一个私有变量 a，赋值为 1（注意：代码中应该为 private int a = 1;）
- private a = 1
-
- // 重写 onUpdate 方法，处理小部件的更新逻辑
- @Override
- public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
- // 调用父类的 update 方法来处理更新逻辑
- super.update(context, appWidgetManager, appWidgetIds);
- }
-
- // 实现抽象方法 getLayoutId，返回当前小部件的布局资源 ID
-=======
-package net.micode.notes.widget;
-
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.tool.ResourceParser;
-
-
-public class NoteWidgetProvider_2x extends NoteWidgetProvider {
- private a = 1
- @Override
- public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
- super.update(context, appWidgetManager, appWidgetIds);
- }
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- @Override
- protected int getLayoutId() {
- return R.layout.widget_2x;
- }
-
-<<<<<<< HEAD
- // 实现抽象方法 getBgResourceId，根据传入的背景 ID 返回相应的资源 ID
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- @Override
- protected int getBgResourceId(int bgId) {
- return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId);
- }
-
-<<<<<<< HEAD
- // 实现抽象方法 getWidgetType，返回小部件的类型
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- @Override
- protected int getWidgetType() {
- return Notes.TYPE_WIDGET_2X;
- }
-}
-<<<<<<< HEAD
-
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/20233171391/src/src/net/micode/notes/widget/NoteWidgetProvider_4x.java b/20233171391/src/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
deleted file mode 100644
index 4f9923f..0000000
--- a/20233171391/src/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
- *
- * 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.
- */
-
-<<<<<<< HEAD
-// 包声明，指定代码所在的包
-package net.micode.notes.widget;
-
-// 导入相关的 Android 类和自定义工具类
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-
-import net.micode.notes.R; // 导入 R 类，用于访问资源
-import net.micode.notes.data.Notes; // 导入自定义的 Notes 类
-import net.micode.notes.tool.ResourceParser; // 导入自定义的 ResourceParser 工具类
-
-// NoteWidgetProvider_4x 类继承自 NoteWidgetProvider 类
-public class NoteWidgetProvider_4x extends NoteWidgetProvider {
-
- // 重写 onUpdate 方法，处理小部件的更新逻辑
- @Override
- public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
- // 调用父类的 update 方法来处理更新逻辑
- super.update(context, appWidgetManager, appWidgetIds);
- }
-
- // 实现抽象方法 getLayoutId，返回当前小部件的布局资源 ID
-=======
-package net.micode.notes.widget;
-
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-
-import net.micode.notes.R;
-import net.micode.notes.data.Notes;
-import net.micode.notes.tool.ResourceParser;
-
-
-public class NoteWidgetProvider_4x extends NoteWidgetProvider {
- @Override
- public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
- super.update(context, appWidgetManager, appWidgetIds);
- }
-
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- protected int getLayoutId() {
- return R.layout.widget_4x;
- }
-
-<<<<<<< HEAD
- // 实现抽象方法 getBgResourceId，根据传入的背景 ID 返回相应的资源 ID
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- @Override
- protected int getBgResourceId(int bgId) {
- return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId);
- }
-
-<<<<<<< HEAD
- // 实现抽象方法 getWidgetType，返回小部件的类型
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
- @Override
- protected int getWidgetType() {
- return Notes.TYPE_WIDGET_4X;
- }
-}
-<<<<<<< HEAD
-
-=======
->>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/MiNote.iml b/MiNote.iml
deleted file mode 100644
index c6a75e6..0000000
--- a/MiNote.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..16c2d2f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# 20233171391
+
diff --git a/doc/吴凯_2023317139_郑芙琳_2023317155_小米便签泛读报告.docx b/doc/吴凯_2023317139_郑芙琳_2023317155_小米便签泛读报告.docx
new file mode 100644
index 0000000..2fda9b4
Binary files /dev/null and b/doc/吴凯_2023317139_郑芙琳_2023317155_小米便签泛读报告.docx differ
diff --git a/20233171391/doc/张三_学号_小米便签泛读报告.docx b/doc/张三_学号_小米便签泛读报告.docx
similarity index 100%
rename from 20233171391/doc/张三_学号_小米便签泛读报告.docx
rename to doc/张三_学号_小米便签泛读报告.docx
diff --git a/src/src/net/micode/notes/data/Contact.java b/src/src/net/micode/notes/data/Contact.java
index d97ac5d..6eab0a8 100644
--- a/src/src/net/micode/notes/data/Contact.java
+++ b/src/src/net/micode/notes/data/Contact.java
@@ -26,16 +26,61 @@ import android.util.Log;
import java.util.HashMap;
public class Contact {
+<<<<<<< HEAD
+ private static HashMap sContactCache; // 静态变量，存储联系人缓存
+ private static final String TAG = "Contact"; // 常量，用于日志标记
+ // 定义字符串CALLER_ID_SELECTION，用于查询联系人的选择条件
+ private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
+ + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
+ + " AND " + Data.RAW_CONTACT_ID + " IN "
+=======
private static HashMap sContactCache;
private static final String TAG = "Contact";
private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
+ ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
+ " AND " + Data.RAW_CONTACT_ID + " IN "
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
+ "(SELECT raw_contact_id "
+ " FROM phone_lookup"
+ " WHERE min_match = '+')";
+<<<<<<< HEAD
+ // 获取联系人信息的方法，传入上下文和电话号码
+ public static String getContact(Context context, String phoneNumber) {
+ if(sContactCache == null) {
+ sContactCache = new HashMap(); // 如果缓存为空，初始化
+ }
+ // 查找HashMap中是否已有phoneNumber信息
+ if(sContactCache.containsKey(phoneNumber)) {
+ return sContactCache.get(phoneNumber); // 如果缓存中已有，直接返回
+ }
+
+ String selection = CALLER_ID_SELECTION.replace("+",
+ PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); // 替换选择条件中的占位符
+ // 查询联系人信息
+ Cursor cursor = context.getContentResolver().query(
+ Data.CONTENT_URI,
+ new String [] { Phone.DISPLAY_NAME }, // 仅查询显示名
+ selection,
+ new String[] { phoneNumber },
+ null);
+ // 判定查询结果
+ if (cursor != null && cursor.moveToFirst()) { // 如果查询结果非空并且有数据
+ try {
+ String name = cursor.getString(0); // 获取联系人姓名
+ sContactCache.put(phoneNumber, name); // 将结果放入缓存
+ return name; // 返回联系人姓名
+ } catch (IndexOutOfBoundsException e) { // 处理可能的异常
+ Log.e(TAG, " Cursor get string error " + e.toString());
+ return null; // 返回空值
+ } finally {
+ cursor.close(); // 关闭游标
+ }
+ } else {
+ Log.d(TAG, "No contact matched with number:" + phoneNumber); // 如果未找到匹配的联系人，记录日志
+ return null; // 返回空值
+=======
public static String getContact(Context context, String phoneNumber) {
if(sContactCache == null) {
sContactCache = new HashMap();
@@ -68,6 +113,7 @@ public class Contact {
} else {
Log.d(TAG, "No contact matched with number:" + phoneNumber);
return null;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
}
}
}
diff --git a/src/src/net/micode/notes/data/Notes.java b/src/src/net/micode/notes/data/Notes.java
index f240604..ad97fde 100644
--- a/src/src/net/micode/notes/data/Notes.java
+++ b/src/src/net/micode/notes/data/Notes.java
@@ -17,6 +17,26 @@
package net.micode.notes.data;
import android.net.Uri;
+<<<<<<< HEAD
+// Notes类中定义了很多int和string类型的常量
+public class Notes {
+ // 提供者权限
+ public static final String AUTHORITY = "micode_notes";
+ // 日志标签
+ public static final String TAG = "Notes";
+
+ // 笔记类型的常量
+ public static final int TYPE_NOTE = 0; // 普通笔记
+ public static final int TYPE_FOLDER = 1; // 文件夹
+ public static final int TYPE_SYSTEM = 2; // 系统文件夹
+
+ /**
+ * 以下是系统文件夹的标识符
+ * {@link Notes#ID_ROOT_FOLDER } 是默认文件夹
+ * {@link Notes#ID_TEMPARAY_FOLDER } 用于不属于任何文件夹的笔记
+ * {@link Notes#ID_CALL_RECORD_FOLDER} 用于存储通话记录
+ * {@link Notes#ID_TRASH_FOLER} 用于回收站
+=======
public class Notes {
public static final String AUTHORITY = "micode_notes";
public static final String TAG = "Notes";
@@ -29,12 +49,17 @@ public class Notes {
* {@link Notes#ID_ROOT_FOLDER } is default folder
* {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
* {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
*/
public static final int ID_ROOT_FOLDER = 0;
public static final int ID_TEMPARAY_FOLDER = -1;
public static final int ID_CALL_RECORD_FOLDER = -2;
public static final int ID_TRASH_FOLER = -3;
+<<<<<<< HEAD
+ // 意图附加数据的常量键值
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public static final String INTENT_EXTRA_ALERT_DATE = "net.micode.notes.alert_date";
public static final String INTENT_EXTRA_BACKGROUND_ID = "net.micode.notes.background_color_id";
public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";
@@ -42,6 +67,17 @@ public class Notes {
public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";
public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";
+<<<<<<< HEAD
+ // 小部件类型的常量
+ public static final int TYPE_WIDGET_INVALIDE = -1; // 无效小部件类型
+ public static final int TYPE_WIDGET_2X = 0; // 小部件类型 2x
+ public static final int TYPE_WIDGET_4X = 1; // 小部件类型 4x
+
+ // 数据常量类，包含笔记和通话记录的内容类型
+ public static class DataConstants {
+ public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; // 笔记内容类型
+ public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; // 通话记录内容类型
+=======
public static final int TYPE_WIDGET_INVALIDE = -1;
public static final int TYPE_WIDGET_2X = 0;
public static final int TYPE_WIDGET_4X = 1;
@@ -49,6 +85,7 @@ public class Notes {
public static class DataConstants {
public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
}
/**
@@ -241,10 +278,20 @@ public class Notes {
public static final String DATA5 = "data5";
}
+<<<<<<< HEAD
+ /**
+ * 文本笔记类，实现了 DataColumns 接口。
+ */
+ public static final class TextNote implements DataColumns {
+ /**
+ * 表示文本笔记处于待办事项模式还是普通模式的模式常量。
+ * 类型：整数 1: 待办事项模式 0: 普通模式
+=======
public static final class TextNote implements DataColumns {
/**
* Mode to indicate the text in check list mode or not
* Type: Integer 1:check list mode 0: normal mode
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
*/
public static final String MODE = DATA1;
@@ -254,6 +301,19 @@ public class Notes {
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
+<<<<<<< HEAD
+ // 内容 URI
+ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
+ }
+
+ /**
+ * 通话笔记类，实现了 DataColumns 接口。
+ */
+ public static final class CallNote implements DataColumns {
+ /**
+ * 通话记录的日期。
+ * 类型：整数 (长整型)
+=======
public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
}
@@ -261,12 +321,18 @@ public class Notes {
/**
* Call date for this record
* Type: INTEGER (long)
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
*/
public static final String CALL_DATE = DATA1;
/**
+<<<<<<< HEAD
+ * 通话记录的电话号码。
+ * 类型：文本
+=======
* Phone number for this record
* Type: TEXT
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
*/
public static final String PHONE_NUMBER = DATA3;
@@ -274,6 +340,13 @@ public class Notes {
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
+<<<<<<< HEAD
+ // 内容 URI
+ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
+ }
+
+=======
public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
}
diff --git a/src/src/net/micode/notes/data/NotesDatabaseHelper.java b/src/src/net/micode/notes/data/NotesDatabaseHelper.java
index ffe5d57..878422a 100644
--- a/src/src/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/src/src/net/micode/notes/data/NotesDatabaseHelper.java
@@ -16,10 +16,17 @@
package net.micode.notes.data;
+<<<<<<< HEAD
+import android.content.ContentValues;//保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。
+import android.content.Context;//加载和访问资源。
+import android.database.sqlite.SQLiteDatabase;//提供对应于添加、删除、更新、查询的操作方法： insert()、delete()、update()和query()。配合content.values
+import android.database.sqlite.SQLiteOpenHelper;//用来管理数据的创建和版本更新
+=======
import android.content.ContentValues;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
import android.util.Log;
import net.micode.notes.data.Notes.DataColumns;
@@ -27,6 +34,33 @@ import net.micode.notes.data.Notes.DataConstants;
import net.micode.notes.data.Notes.NoteColumns;
+<<<<<<< HEAD
+/**
+ * 笔记数据库帮助类，继承自 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";
+ }
+
+ // 日志标签
+ private static final String TAG = "NotesDatabaseHelper";
+
+ // 单例实例
+ private static NotesDatabaseHelper mInstance;
+
+ // 创建笔记表的 SQL 语句
+=======
public class NotesDatabaseHelper extends SQLiteOpenHelper {
private static final String DB_NAME = "note.db";
@@ -42,6 +76,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
private static NotesDatabaseHelper mInstance;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private static final String CREATE_NOTE_TABLE_SQL =
"CREATE TABLE " + TABLE.NOTE + "(" +
NoteColumns.ID + " INTEGER PRIMARY KEY," +
@@ -62,6 +97,43 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
")";
+<<<<<<< HEAD
+ // 创建数据表的 SQL 语句
+ private static final String CREATE_DATA_TABLE_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 ''" +
+ ")";
+
+ // 创建数据表中关于 note_id 字段的索引的 SQL 语句
+ private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
+ "CREATE INDEX IF NOT EXISTS note_id_index ON " +
+ TABLE.DATA + "(" + DataColumns.NOTE_ID + ");";
+
+ /**
+ * 在更新笔记的父文件夹 ID 之后，增加文件夹的笔记计数的触发器
+ */
+ 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";
+
+ /**
+ * 在更新笔记的父文件夹 ID 之后，减少文件夹的笔记计数的触发器
+=======
private static final String CREATE_DATA_TABLE_SQL =
"CREATE TABLE " + TABLE.DATA + "(" +
@@ -96,6 +168,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Decrease folder's note count when move note from folder
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
*/
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER decrease_folder_count_on_update " +
@@ -239,14 +312,22 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
ContentValues values = new ContentValues();
/**
+<<<<<<< HEAD
+ * 创建通话记录文件夹用于存储通话备注
+=======
* call record foler for call notes
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
*/
values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
db.insert(TABLE.NOTE, null, values);
/**
+<<<<<<< HEAD
+ * 根文件夹，即默认文件夹
+=======
* root folder which is default folder
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
*/
values.clear();
values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
@@ -254,7 +335,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.insert(TABLE.NOTE, null, values);
/**
+<<<<<<< HEAD
+ * 临时文件夹，用于移动笔记
+=======
* temporary folder which is used for moving note
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
*/
values.clear();
values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
@@ -262,7 +347,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.insert(TABLE.NOTE, null, values);
/**
+<<<<<<< HEAD
+ * 创建垃圾箱文件夹
+=======
* create trash folder
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
*/
values.clear();
values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
@@ -271,6 +360,19 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
}
public void createDataTable(SQLiteDatabase db) {
+<<<<<<< HEAD
+ // 创建数据表
+ db.execSQL(CREATE_DATA_TABLE_SQL);
+ // 重新创建数据表的触发器
+ reCreateDataTableTriggers(db);
+ // 创建数据表的笔记ID索引
+ db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
+ Log.d(TAG, "数据表已创建");
+ }
+
+ private void reCreateDataTableTriggers(SQLiteDatabase db) {
+ // 移除旧的触发器
+=======
db.execSQL(CREATE_DATA_TABLE_SQL);
reCreateDataTableTriggers(db);
db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
@@ -278,15 +380,84 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
}
private void reCreateDataTableTriggers(SQLiteDatabase db) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
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");
+<<<<<<< HEAD
+ // 创建新的触发器
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
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);
}
+<<<<<<< HEAD
+ //创建一个静态同步方法 getInstance，用于获取数据库帮助类的实例。这个方法是同步的，保证在多线程环境下对实例的访问安全。
+ static synchronized NotesDatabaseHelper getInstance(Context context) {
+ if (mInstance == null) { //如果当前的数据库帮助类实例为 null。
+ mInstance = new NotesDatabaseHelper(context); //创建一个新的数据库帮助类实例，并传入上下文。
+ }
+ return mInstance; //返回数据库帮助类的实例。
+ }
+
+ @Override
+ public void onCreate(SQLiteDatabase db) { //重写数据库创建方法，当数据库首次被创建时被调用。
+ createNoteTable(db); //在数据库中创建笔记表。
+ createDataTable(db); //在数据库中创建笔记表。
+ }
+
+ @Override
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { //重写数据库升级方法，当数据库版本更新时被调用。
+ boolean reCreateTriggers = false; //定义一个布尔变量 reCreateTriggers，用于标识是否需要重新创建触发器。
+ boolean skipV2 = false; //定义一个布尔变量 skipV2，用于标识是否需要跳过版本2的升级。
+
+ if (oldVersion == 1) { //如果当前数据库的版本为1。
+ upgradeToV2(db); //执行数据库升级到版本2的操作。
+ skipV2 = true; // this upgrade including the upgrade from v2 to v3标记为跳过版本2的升级步骤。
+ oldVersion++; //将当前数据库的版本号增加到下一个版本。
+ }
+
+ if (oldVersion == 2 && !skipV2) { //如果当前数据库的版本为2且不需要跳过版本2的升级。
+ upgradeToV3(db); //执行数据库升级到版本3的操作。
+ reCreateTriggers = true; //标记为需要重新创建触发器。
+ oldVersion++; //将当前数据库的版本号增加到下一个版本。
+ }
+
+ if (oldVersion == 3) { //如果当前数据库的版本为3。
+ upgradeToV4(db); //执行数据库升级到版本4的操作。
+ oldVersion++; //将当前数据库的版本号增加到下一个版本。
+ }
+
+ if (reCreateTriggers) { //如果需要重新创建触发器。
+ reCreateNoteTableTriggers(db); //重新创建笔记表的触发器。
+ reCreateDataTableTriggers(db); //重新创建数据表的触发器。
+ }
+
+ if (oldVersion != newVersion) { //如果最终数据库的版本号不等于预期的新版本号。
+ throw new IllegalStateException("Upgrade notes database to version " + newVersion
+ + "fails"); //抛出一个异常，指示数据库升级到特定版本失败
+ }
+ }
+
+ private void upgradeToV2(SQLiteDatabase db) { //定义一个方法，用于将数据库升级到版本2。
+ db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); //执行 SQL 语句删除笔记表。
+ db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA); //执行 SQL 语句删除笔记表。
+ createNoteTable(db); //重新创建笔记表。
+ createDataTable(db); //重新创建数据表。
+ }
+
+ private void upgradeToV3(SQLiteDatabase db) { //定义一个方法，用于将数据库升级到版本3。
+ // drop unused triggers
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert"); //执行 SQL 语句插入时笔记修改日期的触发器。
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete"); //执行 SQL 语句删除时笔记修改日期的触发器。
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update"); //执行 SQL 语句更新笔记修改日期的触发器。
+ // add a column for gtask id
+ db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
+ + " TEXT NOT NULL DEFAULT ''"); //执行 SQL 语句，向笔记表中添加一个名为 GTASK_ID 的 TEXT 类型列，并设置默认值为空字符串。
+=======
static synchronized NotesDatabaseHelper getInstance(Context context) {
if (mInstance == null) {
mInstance = new NotesDatabaseHelper(context);
@@ -348,6 +519,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
// add a column for gtask id
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
+ " TEXT NOT NULL DEFAULT ''");
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
// add a trash system folder
ContentValues values = new ContentValues();
values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER);
diff --git a/src/src/net/micode/notes/data/NotesProvider.java b/src/src/net/micode/notes/data/NotesProvider.java
index edb0a60..be94a5f 100644
--- a/src/src/net/micode/notes/data/NotesProvider.java
+++ b/src/src/net/micode/notes/data/NotesProvider.java
@@ -34,6 +34,30 @@ import net.micode.notes.data.Notes.DataColumns;
import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.data.NotesDatabaseHelper.TABLE;
+<<<<<<< HEAD
+//为存储和获取数据提供接口。可以在不同的应用程序之间共享数据
+//ContentProvider提供的方法
+//query：查询
+//insert：插入
+//update：更新
+//delete：删除
+//getType：得到数据类型
+public class NotesProvider extends ContentProvider {
+ private static final UriMatcher mMatcher; //定义一个静态的 UriMatcher 对象，用于匹配 URI。
+
+ private NotesDatabaseHelper mHelper; //创建一个名为 mHelper 的 NotesDatabaseHelper 对象，用于管理数据库。
+
+ private static final String TAG = "NotesProvider"; //创建一个字符串常量，用于标识日志的 TAG。
+
+ 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。
+ //在静态初始化块中，将不同的 URI 模式添加到 UriMatcher 中，以便稍后能够识别和处理这些 URI。
+=======
public class NotesProvider extends ContentProvider {
private static final UriMatcher mMatcher;
@@ -50,6 +74,7 @@ public class NotesProvider extends ContentProvider {
private static final int URI_SEARCH = 5;
private static final int URI_SEARCH_SUGGEST = 6;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
static {
mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
@@ -65,6 +90,10 @@ public class NotesProvider extends ContentProvider {
* x'0A' represents the '\n' character in sqlite. For title and content in the search result,
* we will trim '\n' and white space in order to show more information.
*/
+<<<<<<< HEAD
+ //定义一个字符串常量，表示在搜索时用于构建搜索建议的投影。这里包括一些列的列名和值。
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
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 + ","
@@ -72,7 +101,11 @@ public class NotesProvider extends ContentProvider {
+ 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;
+<<<<<<< HEAD
+ //定义一个 SQL 查询字符串，用于在数据库中执行搜索。查询的条件是笔记的摘录包含给定的搜索条件，并且不属于垃圾箱。
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
+ " FROM " + TABLE.NOTE
+ " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
@@ -81,10 +114,18 @@ public class NotesProvider extends ContentProvider {
@Override
public boolean onCreate() {
+<<<<<<< HEAD
+ // 创建时调用，初始化 NotesDatabaseHelper 实例
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
mHelper = NotesDatabaseHelper.getInstance(getContext());
return true;
}
+<<<<<<< HEAD
+
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
@Override
public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
String sortOrder) {
@@ -92,26 +133,46 @@ public class NotesProvider extends ContentProvider {
SQLiteDatabase db = mHelper.getReadableDatabase();
String id = null;
switch (mMatcher.match(uri)) {
+<<<<<<< HEAD
+ case URI_NOTE: //// 查询所有的笔记
+ c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
+ sortOrder);
+ break;
+ case URI_NOTE_ITEM: //// 查询指定ID的单个笔记
+=======
case URI_NOTE:
c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
sortOrder);
break;
case URI_NOTE_ITEM:
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
id = uri.getPathSegments().get(1);
c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id
+ parseSelection(selection), selectionArgs, null, null, sortOrder);
break;
+<<<<<<< HEAD
+ case URI_DATA: // 查询所有的数据
+ c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
+ sortOrder);
+ break;
+ case URI_DATA_ITEM: // 查询指定ID的单个数据
+=======
case URI_DATA:
c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
sortOrder);
break;
case URI_DATA_ITEM:
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
id = uri.getPathSegments().get(1);
c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
+ parseSelection(selection), selectionArgs, null, null, sortOrder);
break;
case URI_SEARCH:
+<<<<<<< HEAD
+ case URI_SEARCH_SUGGEST: // 查询搜索建议或搜索结果
+=======
case URI_SEARCH_SUGGEST:
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (sortOrder != null || projection != null) {
throw new IllegalArgumentException(
"do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");
@@ -149,6 +210,37 @@ public class NotesProvider extends ContentProvider {
@Override
public Uri insert(Uri uri, ContentValues values) {
+<<<<<<< HEAD
+ // 获取可写的数据库实例
+ SQLiteDatabase db = mHelper.getWritableDatabase();
+ // 定义变量用于存储数据和笔记的ID以及插入的ID
+ long dataId = 0, noteId = 0, insertedId = 0;
+
+ // 根据传入的URI类型执行不同的插入操作
+ switch (mMatcher.match(uri)) {
+ case URI_NOTE:
+ // 对笔记表进行插入操作，并将插入的ID保存在noteId和insertedId中
+ insertedId = noteId = db.insert(TABLE.NOTE, null, values);
+ break;
+ case URI_DATA:
+ // 对数据表进行插入操作
+ if (values.containsKey(DataColumns.NOTE_ID)) {
+ // 如果ContentValues包含Note的ID，则将其赋值给noteId
+ noteId = values.getAsLong(DataColumns.NOTE_ID);
+ } else {
+ // 如果没有Note的ID，则记录一个错误日志
+ Log.d(TAG, "Wrong data format without note id:" + values.toString());
+ }
+ // 对数据表进行插入操作，并将插入的ID保存在dataId和insertedId中
+ insertedId = dataId = db.insert(TABLE.DATA, null, values);
+ break;
+ default:
+ // 如果传入的URI类型不是URI_NOTE或URI_DATA，则抛出异常
+ throw new IllegalArgumentException("Unknown URI " + uri);
+ }
+
+ // 通知笔记URI发生了变化
+=======
SQLiteDatabase db = mHelper.getWritableDatabase();
long dataId = 0, noteId = 0, insertedId = 0;
switch (mMatcher.match(uri)) {
@@ -167,17 +259,52 @@ public class NotesProvider extends ContentProvider {
throw new IllegalArgumentException("Unknown URI " + uri);
}
// Notify the note uri
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (noteId > 0) {
getContext().getContentResolver().notifyChange(
ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
}
+<<<<<<< HEAD
+ // 通知数据URI发生了变化
+=======
// Notify the data uri
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (dataId > 0) {
getContext().getContentResolver().notifyChange(
ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
}
+<<<<<<< HEAD
+ // 返回包含插入的ID的URI
+ return ContentUris.withAppendedId(uri, insertedId);
+ }
+
+
+ @Override
+ public int delete(Uri uri, String selection, String[] selectionArgs) {
+ // 初始化删除的记录数为0
+ int count = 0;
+ // 用于存储ID的字符串
+ String id = null;
+ // 获取可写的数据库实例
+ SQLiteDatabase db = mHelper.getWritableDatabase();
+ // 标志是否删除了数据表的记录
+ boolean deleteData = false;
+
+ // 根据传入的URI类型执行不同的删除操作
+ switch (mMatcher.match(uri)) {
+ // 删除整个笔记表中符合条件的记录
+ case URI_NOTE:
+ // 添加条件，确保删除的记录ID大于0
+ selection = "(" + selection + ") AND " + NoteColumns.ID + ">0 ";
+ // 执行删除操作，并获取删除的记录数
+ count = db.delete(TABLE.NOTE, selection, selectionArgs);
+ break;
+ // 删除笔记表中指定ID的记录
+ case URI_NOTE_ITEM:
+ // 从URI中提取ID
+=======
return ContentUris.withAppendedId(uri, insertedId);
}
@@ -193,58 +320,204 @@ public class NotesProvider extends ContentProvider {
count = db.delete(TABLE.NOTE, selection, selectionArgs);
break;
case URI_NOTE_ITEM:
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
id = uri.getPathSegments().get(1);
/**
* ID that smaller than 0 is system folder which is not allowed to
* trash
*/
+<<<<<<< HEAD
+ // 将字符串类型的ID转换为长整型
long noteId = Long.valueOf(id);
+ // 如果ID小于等于0，则表示系统文件夹，不允许删除
if (noteId <= 0) {
break;
}
+ // 执行删除操作，并获取删除的记录数
count = db.delete(TABLE.NOTE,
NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
break;
+ // 删除整个数据表中符合条件的记录
case URI_DATA:
+ // 执行删除操作，并获取删除的记录数
count = db.delete(TABLE.DATA, selection, selectionArgs);
+ // 标记删除了数据表的记录
deleteData = true;
break;
+ // 删除数据表中指定ID的记录
case URI_DATA_ITEM:
+ // 从URI中提取ID
id = uri.getPathSegments().get(1);
+ // 执行删除操作，并获取删除的记录数
count = db.delete(TABLE.DATA,
DataColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
+ // 标记删除了数据表的记录
deleteData = true;
break;
+ // 未知的URI类型，抛出异常
default:
throw new IllegalArgumentException("Unknown URI " + uri);
}
+
+ // 如果有记录被删除，则通知观察者数据发生了变化
if (count > 0) {
+ // 如果删除了数据表的记录，则通知笔记URI发生了变化
if (deleteData) {
getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
}
+ // 通知传入的URI发生了变化
getContext().getContentResolver().notifyChange(uri, null);
}
+
+ // 返回删除的记录数
return count;
}
+
@Override
public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+ // 初始化计数器，用于记录更新的行数
int count = 0;
+ // 用于存储 URI 中的 id
String id = null;
+ // 获取可写的数据库实例
SQLiteDatabase db = mHelper.getWritableDatabase();
+ // 用于标记是否需要更新数据
boolean updateData = false;
+
+ // 根据 URI 进行匹配，执行相应的操作
switch (mMatcher.match(uri)) {
case URI_NOTE:
+ // 对于 URI_NOTE，增加笔记版本并更新相应的数据
+=======
+ long noteId = Long.valueOf(id);
+ if (noteId <= 0) {
+ break;
+ }
+ count = db.delete(TABLE.NOTE,
+ NoteColumns.ID + "=" + id + parseSelection(selection), selectionArgs);
+ break;
+ case URI_DATA:
+ count = db.delete(TABLE.DATA, selection, selectionArgs);
+ deleteData = true;
+ break;
+ 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);
+ }
+ if (count > 0) {
+ if (deleteData) {
+ getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
+ }
+ getContext().getContentResolver().notifyChange(uri, null);
+ }
+ return count;
+ }
+
+ @Override
+ public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+ int count = 0;
+ String id = null;
+ SQLiteDatabase db = mHelper.getWritableDatabase();
+ boolean updateData = false;
+ switch (mMatcher.match(uri)) {
+ case URI_NOTE:
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
increaseNoteVersion(-1, selection, selectionArgs);
count = db.update(TABLE.NOTE, values, selection, selectionArgs);
break;
case URI_NOTE_ITEM:
+<<<<<<< HEAD
+ // 对于 URI_NOTE_ITEM，获取 URI 中的 id，增加笔记版本并更新相应的数据
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
id = uri.getPathSegments().get(1);
increaseNoteVersion(Long.valueOf(id), selection, selectionArgs);
count = db.update(TABLE.NOTE, values, NoteColumns.ID + "=" + id
+ parseSelection(selection), selectionArgs);
break;
case URI_DATA:
+<<<<<<< HEAD
+ // 对于 URI_DATA，直接更新数据
+ count = db.update(TABLE.DATA, values, selection, selectionArgs);
+ // 标记需要更新数据
+ updateData = true;
+ break;
+ case URI_DATA_ITEM:
+ // 对于 URI_DATA_ITEM，获取 URI 中的 id，更新相应的数据
+ id = uri.getPathSegments().get(1);
+ count = db.update(TABLE.DATA, values, DataColumns.ID + "=" + id
+ + parseSelection(selection), selectionArgs);
+ // 标记需要更新数据
+ updateData = true;
+ break;
+ default:
+ // 如果 URI 无法匹配，抛出异常
+ throw new IllegalArgumentException("Unknown URI " + uri);
+ }
+
+ // 如果更新的行数大于 0
+ if (count > 0) {
+ // 如果标记为更新数据，通知数据变化
+ if (updateData) {
+ getContext().getContentResolver().notifyChange(Notes.CONTENT_NOTE_URI, null);
+ }
+ // 通知指定 URI 的数据变化
+ getContext().getContentResolver().notifyChange(uri, null);
+ }
+ // 返回更新的行数
+ return count;
+ }
+
+
+ // 定义一个私有方法，用于解析传入的查询条件
+ private String parseSelection(String selection) {
+ // 如果传入的查询条件不为空，返回拼接了条件的字符串，否则返回空字符串
+ return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
+ }
+
+ // 定义一个增加笔记版本的方法，接受一个笔记ID、查询条件以及查询条件参数的数组作为参数
+ private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
+ // 创建一个可变的字符串，初始容量为120
+ StringBuilder sql = new StringBuilder(120);
+ // 拼接更新语句的开头部分
+ sql.append("UPDATE ");
+ sql.append(TABLE.NOTE); // 更新的表名
+ sql.append(" SET ");
+ sql.append(NoteColumns.VERSION); // 设置笔记版本字段
+ sql.append("=" + NoteColumns.VERSION + "+1 "); // 增加版本号
+
+ // 如果传入的ID大于0或者查询条件不为空，则添加WHERE子句
+ if (id > 0 || !TextUtils.isEmpty(selection)) {
+ sql.append(" WHERE ");
+ }
+
+ // 如果传入的ID大于0，添加根据ID查询的条件
+ if (id > 0) {
+ sql.append(NoteColumns.ID + "=" + String.valueOf(id));
+ }
+
+ // 如果传入的查询条件不为空
+ if (!TextUtils.isEmpty(selection)) {
+ // 如果ID大于0，则调用parseSelection方法解析查询条件，否则直接使用传入的条件
+ String selectString = id > 0 ? parseSelection(selection) : selection;
+
+ // 替换条件中的占位符?为相应的参数值
+ for (String args : selectionArgs) {
+ selectString = selectString.replaceFirst("\\?", args);
+ }
+
+ // 将处理后的查询条件拼接到更新语句中
+ sql.append(selectString);
+ }
+
+ // 执行SQL语句，更新数据库中的记录
+=======
count = db.update(TABLE.DATA, values, selection, selectionArgs);
updateData = true;
break;
@@ -293,13 +566,22 @@ public class NotesProvider extends ContentProvider {
sql.append(selectString);
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
mHelper.getWritableDatabase().execSQL(sql.toString());
}
@Override
public String getType(Uri uri) {
+<<<<<<< HEAD
+ // 返回类型为null，此处需要根据具体需求进行实现
+ return null;
+ }
+
+
+=======
// TODO Auto-generated method stub
return null;
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
}
diff --git a/src/src/net/micode/notes/gtask/data/MetaData.java b/src/src/net/micode/notes/gtask/data/MetaData.java
index 3a2050b..cb8b47d 100644
--- a/src/src/net/micode/notes/gtask/data/MetaData.java
+++ b/src/src/net/micode/notes/gtask/data/MetaData.java
@@ -24,6 +24,32 @@ import net.micode.notes.tool.GTaskStringUtils;
import org.json.JSONException;
import org.json.JSONObject;
+<<<<<<< HEAD
+// 定义一个名为MetaData的类，继承自Task类
+public class MetaData extends Task {
+ // 通过getSimpleName方法获取类的简称，并存入名为TAG的字符串中
+ private final static String TAG = MetaData.class.getSimpleName();
+
+ // 声明一个字符串变量mRelatedGid，并初始化为null
+ private String mRelatedGid = null;
+
+ // 定义一个设置元数据的方法，接受gid和metaInfo作为参数
+ public void setMeta(String gid, JSONObject metaInfo) {
+ try {
+ // 将元数据中的GTask ID放入metaInfo中
+ metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
+ } catch (JSONException e) {
+ // 如果出现异常，记录错误日志
+ Log.e(TAG, "failed to put related gid");
+ }
+ // 将设置好的元数据转换为字符串，并设置为任务的笔记
+ setNotes(metaInfo.toString());
+ // 设置任务的名称为META_NOTE_NAME
+ setName(GTaskStringUtils.META_NOTE_NAME);
+ }
+
+ // 定义获取关联GTask ID的方法
+=======
public class MetaData extends Task {
private final static String TAG = MetaData.class.getSimpleName();
@@ -40,43 +66,83 @@ public class MetaData extends Task {
setName(GTaskStringUtils.META_NOTE_NAME);
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public String getRelatedGid() {
return mRelatedGid;
}
+<<<<<<< HEAD
+ // 重写父类的方法，判断任务是否值得保存
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
@Override
public boolean isWorthSaving() {
return getNotes() != null;
}
+<<<<<<< HEAD
+ // 重写父类的方法，根据远程JSON内容设置任务的内容
@Override
public void setContentByRemoteJSON(JSONObject js) {
super.setContentByRemoteJSON(js);
+ // 如果任务的笔记不为空
if (getNotes() != null) {
try {
+ // 解析任务的笔记内容为JSON对象
JSONObject metaInfo = new JSONObject(getNotes().trim());
+ // 从解析得到的JSON对象中获取关联的GTask ID，并赋值给mRelatedGid
mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
} catch (JSONException e) {
+ // 如果出现异常，记录警告日志，同时将mRelatedGid置为null
+=======
+ @Override
+ public void setContentByRemoteJSON(JSONObject js) {
+ super.setContentByRemoteJSON(js);
+ if (getNotes() != null) {
+ try {
+ JSONObject metaInfo = new JSONObject(getNotes().trim());
+ mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
+ } catch (JSONException e) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.w(TAG, "failed to get related gid");
mRelatedGid = null;
}
}
}
+<<<<<<< HEAD
+ // 重写父类的方法，抛出非法访问错误，表示不应该调用此方法
+ @Override
+ public void setContentByLocalJSON(JSONObject js) {
+ throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
+ }
+
+ // 重写父类的方法，抛出非法访问错误，表示不应该调用此方法
+=======
@Override
public void setContentByLocalJSON(JSONObject js) {
// this function should not be called
throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
@Override
public JSONObject getLocalJSONFromContent() {
throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
}
+<<<<<<< HEAD
+ // 重写父类的方法，抛出非法访问错误，表示不应该调用此方法
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
@Override
public int getSyncAction(Cursor c) {
throw new IllegalAccessError("MetaData:getSyncAction should not be called");
}
+<<<<<<< HEAD
+}
+
+=======
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/src/src/net/micode/notes/gtask/data/Node.java b/src/src/net/micode/notes/gtask/data/Node.java
index 63950e0..973818f 100644
--- a/src/src/net/micode/notes/gtask/data/Node.java
+++ b/src/src/net/micode/notes/gtask/data/Node.java
@@ -20,6 +20,28 @@ import android.database.Cursor;
import org.json.JSONObject;
+<<<<<<< HEAD
+// 定义一个抽象类 Node
+public abstract class Node {
+ // 定义同步操作的常量，表示不同的同步动作
+ public static final int SYNC_ACTION_NONE = 0; // 无同步动作
+ public static final int SYNC_ACTION_ADD_REMOTE = 1; // 添加远程节点
+ public static final int SYNC_ACTION_ADD_LOCAL = 2; // 添加本地节点
+ public static final int SYNC_ACTION_DEL_REMOTE = 3; // 删除远程节点
+ public static final int SYNC_ACTION_DEL_LOCAL = 4; // 删除本地节点
+ public static final int SYNC_ACTION_UPDATE_REMOTE = 5; // 更新远程节点
+ public static final int SYNC_ACTION_UPDATE_LOCAL = 6; // 更新本地节点
+ public static final int SYNC_ACTION_UPDATE_CONFLICT = 7; // 更新冲突
+ public static final int SYNC_ACTION_ERROR = 8; // 同步错误
+
+ // 私有成员变量，用于表示节点的全局唯一标识、名称、最后修改时间和删除状态
+ private String mGid;
+ private String mName;
+ private long mLastModified;
+ private boolean mDeleted;
+
+ // 构造方法，初始化节点的属性
+=======
public abstract class Node {
public static final int SYNC_ACTION_NONE = 0;
@@ -47,6 +69,7 @@ public abstract class Node {
private boolean mDeleted;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public Node() {
mGid = null;
mName = "";
@@ -54,48 +77,103 @@ public abstract class Node {
mDeleted = false;
}
+<<<<<<< HEAD
+ // 抽象方法，用于获取创建操作的 JSON 对象
public abstract JSONObject getCreateAction(int actionId);
+ // 抽象方法，用于获取更新操作的 JSON 对象
public abstract JSONObject getUpdateAction(int actionId);
+ // 抽象方法，根据远程 JSON 设置节点内容
public abstract void setContentByRemoteJSON(JSONObject js);
+ // 抽象方法，根据本地 JSON 设置节点内容
public abstract void setContentByLocalJSON(JSONObject js);
+ // 抽象方法，获取节点内容的本地 JSON 对象
public abstract JSONObject getLocalJSONFromContent();
+ // 抽象方法，获取节点在同步时的动作类型
public abstract int getSyncAction(Cursor c);
+ // 设置节点的全局唯一标识
+=======
+ public abstract JSONObject getCreateAction(int actionId);
+
+ public abstract JSONObject getUpdateAction(int actionId);
+
+ public abstract void setContentByRemoteJSON(JSONObject js);
+
+ public abstract void setContentByLocalJSON(JSONObject js);
+
+ public abstract JSONObject getLocalJSONFromContent();
+
+ public abstract int getSyncAction(Cursor c);
+
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void setGid(String gid) {
this.mGid = gid;
}
+<<<<<<< HEAD
+ // 设置节点的名称
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void setName(String name) {
this.mName = name;
}
+<<<<<<< HEAD
+ // 设置节点的最后修改时间
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void setLastModified(long lastModified) {
this.mLastModified = lastModified;
}
+<<<<<<< HEAD
+ // 设置节点的删除状态
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void setDeleted(boolean deleted) {
this.mDeleted = deleted;
}
+<<<<<<< HEAD
+ // 获取节点的全局唯一标识
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public String getGid() {
return this.mGid;
}
+<<<<<<< HEAD
+ // 获取节点的名称
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public String getName() {
return this.mName;
}
+<<<<<<< HEAD
+ // 获取节点的最后修改时间
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public long getLastModified() {
return this.mLastModified;
}
+<<<<<<< HEAD
+ // 获取节点的删除状态
+ public boolean getDeleted() {
+ return this.mDeleted;
+ }
+}
+
+=======
public boolean getDeleted() {
return this.mDeleted;
}
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/src/src/net/micode/notes/gtask/data/SqlData.java b/src/src/net/micode/notes/gtask/data/SqlData.java
index d3ec3be..ed66424 100644
--- a/src/src/net/micode/notes/gtask/data/SqlData.java
+++ b/src/src/net/micode/notes/gtask/data/SqlData.java
@@ -36,15 +36,175 @@ import org.json.JSONObject;
public class SqlData {
+<<<<<<< HEAD
+ // 定义类常量 TAG，用于在日志中标识类名
private static final String TAG = SqlData.class.getSimpleName();
+ // 定义常量 INVALID_ID，表示无效的数据 ID
private static final int INVALID_ID = -99999;
+ // 定义数据表字段数组 PROJECTION_DATA
+=======
+ private static final String TAG = SqlData.class.getSimpleName();
+
+ private static final int INVALID_ID = -99999;
+
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public static final String[] PROJECTION_DATA = new String[] {
DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
DataColumns.DATA3
};
+<<<<<<< HEAD
+ // 定义数据表字段在数组中的索引常量
+ public static final int DATA_ID_COLUMN = 0;
+ public static final int DATA_MIME_TYPE_COLUMN = 1;
+ public static final int DATA_CONTENT_COLUMN = 2;
+ public static final int DATA_CONTENT_DATA_1_COLUMN = 3;
+ public static final int DATA_CONTENT_DATA_3_COLUMN = 4;
+
+ // 声明 ContentResolver 对象
+ private ContentResolver mContentResolver;
+
+ // 声明标志是否创建数据的变量
+ private boolean mIsCreate;
+
+ // 声明数据的 ID 变量
+ private long mDataId;
+
+ // 声明数据的 MIME 类型变量
+ private String mDataMimeType;
+
+ // 声明数据内容变量
+ private String mDataContent;
+
+ // 声明数据内容的 DATA1 字段变量
+ private long mDataContentData1;
+
+ // 声明数据内容的 DATA3 字段变量
+ private String mDataContentData3;
+
+ // 声明 ContentValues 对象，用于存储数据的差异值
+ private ContentValues mDiffDataValues;
+
+ // 构造方法，接受一个 Context 参数
+ public SqlData(Context context) {
+ // 获取 ContentResolver 对象
+ mContentResolver = context.getContentResolver();
+ // 初始化标志变量为 true，表示创建数据
+ mIsCreate = true;
+ // 初始化数据的 ID 为无效值
+ mDataId = INVALID_ID;
+ // 初始化数据的 MIME 类型为 DataConstants.NOTE
+ mDataMimeType = DataConstants.NOTE;
+ // 初始化数据内容为空字符串
+ mDataContent = "";
+ // 初始化数据内容的 DATA1 字段为 0
+ mDataContentData1 = 0;
+ // 初始化数据内容的 DATA3 字段为空字符串
+ mDataContentData3 = "";
+ // 初始化 ContentValues 对象
+ mDiffDataValues = new ContentValues();
+ }
+
+ // 构造方法，接受一个 Context 和一个 Cursor 参数
+ public SqlData(Context context, Cursor c) {
+ // 获取 ContentResolver 对象
+ mContentResolver = context.getContentResolver();
+ // 初始化标志变量为 false，表示不是创建数据
+ mIsCreate = false;
+ // 调用 loadFromCursor 方法，从 Cursor 中加载数据
+ loadFromCursor(c);
+ // 初始化 ContentValues 对象
+ mDiffDataValues = new ContentValues();
+ }
+
+ // 从 Cursor 中加载数据的私有方法
+ private void loadFromCursor(Cursor c) {
+ // 从 Cursor 中获取数据的 ID 并赋值给 mDataId
+ mDataId = c.getLong(DATA_ID_COLUMN);
+ // 从 Cursor 中获取数据的 MIME 类型并赋值给 mDataMimeType
+ mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
+ // 从 Cursor 中获取数据的内容并赋值给 mDataContent
+ mDataContent = c.getString(DATA_CONTENT_COLUMN);
+ // 从 Cursor 中获取数据的 DATA1 字段值并赋值给 mDataContentData1
+ mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN);
+ // 从 Cursor 中获取数据的 DATA3 字段值并赋值给 mDataContentData3
+ mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
+ }
+
+ // 定义一个公共方法，用于设置数据内容，参数为JSONObject类型，可能会抛出JSONException异常
+ public void setContent(JSONObject js) throws JSONException {
+ // 从JSONObject中获取数据ID，如果存在则获取，否则使用INVALID_ID
+ long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
+
+ // 如果是创建操作（mIsCreate为真）或者数据ID与当前数据ID不同，则将数据ID放入差异数据集合中
+ if (mIsCreate || mDataId != dataId) {
+ mDiffDataValues.put(DataColumns.ID, dataId);
+ }
+
+ // 更新当前数据ID
+ mDataId = dataId;
+
+ // 从JSONObject中获取数据的MIME类型，如果存在则获取，否则使用默认值DataConstants.NOTE
+ String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE)
+ : DataConstants.NOTE;
+
+ // 如果是创建操作或者当前MIME类型与新的MIME类型不同，则将新的MIME类型放入差异数据集合中
+ if (mIsCreate || !mDataMimeType.equals(dataMimeType)) {
+ mDiffDataValues.put(DataColumns.MIME_TYPE, dataMimeType);
+ }
+
+ // 更新当前MIME类型
+ mDataMimeType = dataMimeType;
+
+ // 从JSONObject中获取数据内容，如果存在则获取，否则使用空字符串
+ String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : "";
+
+ // 如果是创建操作或者当前数据内容与新的数据内容不同，则将新的数据内容放入差异数据集合中
+ if (mIsCreate || !mDataContent.equals(dataContent)) {
+ mDiffDataValues.put(DataColumns.CONTENT, dataContent);
+ }
+
+ // 更新当前数据内容
+ mDataContent = dataContent;
+
+ // 从JSONObject中获取数据的DATA1，如果存在则获取，否则使用0
+ long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0;
+
+ // 如果是创建操作或者当前DATA1与新的DATA1不同，则将新的DATA1放入差异数据集合中
+ if (mIsCreate || mDataContentData1 != dataContentData1) {
+ mDiffDataValues.put(DataColumns.DATA1, dataContentData1);
+ }
+
+ // 更新当前DATA1
+ mDataContentData1 = dataContentData1;
+
+ // 从JSONObject中获取数据的DATA3，如果存在则获取，否则使用空字符串
+ String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : "";
+
+ // 如果是创建操作或者当前DATA3与新的DATA3不同，则将新的DATA3放入差异数据集合中
+ if (mIsCreate || !mDataContentData3.equals(dataContentData3)) {
+ mDiffDataValues.put(DataColumns.DATA3, dataContentData3);
+ }
+
+ // 更新当前DATA3
+ mDataContentData3 = dataContentData3;
+ }
+
+ // 获取数据内容并以JSON对象形式返回的方法
+ public JSONObject getContent() throws JSONException {
+ // 如果数据尚未在数据库中创建，则输出错误日志并返回null
+ if (mIsCreate) {
+ Log.e(TAG, "似乎我们尚未在数据库中创建此数据");
+ return null;
+ }
+
+ // 创建一个新的JSON对象
+ JSONObject js = new JSONObject();
+
+ // 将数据的各个字段放入JSON对象中
+=======
public static final int DATA_ID_COLUMN = 0;
public static final int DATA_MIME_TYPE_COLUMN = 1;
@@ -136,21 +296,56 @@ public class SqlData {
return null;
}
JSONObject js = new JSONObject();
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
js.put(DataColumns.ID, mDataId);
js.put(DataColumns.MIME_TYPE, mDataMimeType);
js.put(DataColumns.CONTENT, mDataContent);
js.put(DataColumns.DATA1, mDataContentData1);
js.put(DataColumns.DATA3, mDataContentData3);
+<<<<<<< HEAD
+
+ // 返回构建好的JSON对象
+ return js;
+ }
+
+ // 提交数据的方法，接受笔记ID、验证版本的标志和版本号作为参数
+ public void commit(long noteId, boolean validateVersion, long version) {
+ // 如果数据尚未在数据库中创建
+ if (mIsCreate) {
+ // 如果数据ID无效且差异数据中包含ID字段，则移除ID字段
+=======
return js;
}
public void commit(long noteId, boolean validateVersion, long version) {
if (mIsCreate) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
mDiffDataValues.remove(DataColumns.ID);
}
+<<<<<<< HEAD
+ // 将NOTE_ID字段设置为传入的noteId
+ mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
+
+ // 插入数据到数据库中
+ Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
+
+ // 尝试从插入操作的URI中获取新创建的数据ID
+ try {
+ mDataId = Long.valueOf(uri.getPathSegments().get(1));
+ } catch (NumberFormatException e) {
+ // 如果转换异常，则输出错误日志并抛出ActionFailureException异常
+ Log.e(TAG, "获取笔记ID错误：" + e.toString());
+ throw new ActionFailureException("创建笔记失败");
+ }
+ } else {
+ // 如果数据已存在且存在差异数据
+ if (mDiffDataValues.size() > 0) {
+ int result = 0;
+ // 如果不需要验证版本，则直接更新数据
+=======
mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
try {
@@ -162,10 +357,15 @@ public class SqlData {
} else {
if (mDiffDataValues.size() > 0) {
int result = 0;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (!validateVersion) {
result = mContentResolver.update(ContentUris.withAppendedId(
Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
} else {
+<<<<<<< HEAD
+ // 否则，通过验证版本号来更新数据
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
result = mContentResolver.update(ContentUris.withAppendedId(
Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
" ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
diff --git a/src/src/net/micode/notes/gtask/data/SqlNote.java b/src/src/net/micode/notes/gtask/data/SqlNote.java
index 79a4095..12c7c3c 100644
--- a/src/src/net/micode/notes/gtask/data/SqlNote.java
+++ b/src/src/net/micode/notes/gtask/data/SqlNote.java
@@ -39,10 +39,20 @@ import java.util.ArrayList;
public class SqlNote {
+<<<<<<< HEAD
+ // 定义一个类常量 TAG，用于在日志中标识当前类名
private static final String TAG = SqlNote.class.getSimpleName();
+ // 定义一个无效的 ID 常量，用于标识无效的数据库记录
private static final int INVALID_ID = -99999;
+ // 定义一个投影数组 PROJECTION_NOTE，包含了数据库表中的各列名
+=======
+ private static final String TAG = SqlNote.class.getSimpleName();
+
+ private static final int INVALID_ID = -99999;
+
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public static final String[] PROJECTION_NOTE = new String[] {
NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID,
NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE,
@@ -52,6 +62,117 @@ public class SqlNote {
NoteColumns.VERSION
};
+<<<<<<< HEAD
+ // 定义投影数组中各列的索引常量，以便后续使用
+ public static final int ID_COLUMN = 0;
+ public static final int ALERTED_DATE_COLUMN = 1;
+ public static final int BG_COLOR_ID_COLUMN = 2;
+ public static final int CREATED_DATE_COLUMN = 3;
+ public static final int HAS_ATTACHMENT_COLUMN = 4;
+ public static final int MODIFIED_DATE_COLUMN = 5;
+ public static final int NOTES_COUNT_COLUMN = 6;
+ public static final int PARENT_ID_COLUMN = 7;
+ public static final int SNIPPET_COLUMN = 8;
+ public static final int TYPE_COLUMN = 9;
+ public static final int WIDGET_ID_COLUMN = 10;
+ public static final int WIDGET_TYPE_COLUMN = 11;
+ public static final int SYNC_ID_COLUMN = 12;
+ public static final int LOCAL_MODIFIED_COLUMN = 13;
+ public static final int ORIGIN_PARENT_ID_COLUMN = 14;
+ public static final int GTASK_ID_COLUMN = 15;
+ public static final int VERSION_COLUMN = 16;
+
+ // 定义类的成员变量
+ private Context mContext; // 上下文对象
+
+ private ContentResolver mContentResolver; // 内容解析器
+
+ private boolean mIsCreate; // 标识是否为创建操作
+
+ private long mId; // 记录的 ID
+
+ private long mAlertDate; // 提醒日期
+
+ private int mBgColorId; // 背景颜色 ID
+
+ private long mCreatedDate; // 创建日期
+
+ private int mHasAttachment; // 是否有附件
+
+ private long mModifiedDate; // 修改日期
+
+ private long mParentId; // 父记录的 ID
+
+ private String mSnippet; // 记录的片段
+
+ private int mType; // 记录的类型
+
+ private int mWidgetId; // 小部件的 ID
+
+ private int mWidgetType; // 小部件的类型
+
+ private long mOriginParent; // 私有成员变量，用于存储原始父级ID
+
+ private long mVersion; // 私有成员变量，用于存储版本号
+
+ private ContentValues mDiffNoteValues; // 私有成员变量，用于存储数据库中笔记的差异内容
+
+ private ArrayList mDataList; // 私有成员变量，存储SqlData类型的ArrayList
+
+ public SqlNote(Context context) { // 构造函数，接收一个Context参数
+ mContext = context; // 将传入的Context赋值给成员变量
+ mContentResolver = context.getContentResolver(); // 通过传入的Context获取ContentResolver
+ mIsCreate = true; // 设置标志位为true，表示创建新的笔记
+ mId = INVALID_ID; // 将mId设为无效ID
+ mAlertDate = 0; // 设置警报日期为0
+ mBgColorId = ResourceParser.getDefaultBgId(context); // 从ResourceParser获取默认背景ID
+ mCreatedDate = System.currentTimeMillis(); // 获取当前时间作为笔记创建时间
+ mHasAttachment = 0; // 设置附件标志位为0，表示没有附件
+ mModifiedDate = System.currentTimeMillis(); // 获取当前时间作为笔记修改时间
+ mParentId = 0; // 将父级ID设为0
+ mSnippet = ""; // 将摘录字段设为空字符串
+ mType = Notes.TYPE_NOTE; // 将笔记类型设为普通笔记类型
+ mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID; // 将小部件ID设为无效ID
+ mWidgetType = Notes.TYPE_WIDGET_INVALIDE; // 将小部件类型设为无效类型
+ mOriginParent = 0; // 将原始父级ID设为0
+ mVersion = 0; // 将版本号设为0
+ mDiffNoteValues = new ContentValues(); // 初始化笔记差异内容为一个新的ContentValues对象
+ mDataList = new ArrayList(); // 初始化数据列表为一个新的SqlData类型的ArrayList对象
+ }
+
+ public SqlNote(Context context, Cursor c) { // 构造函数，接收一个Context和Cursor参数
+ mContext = context; // 将传入的Context赋值给成员变量
+ mContentResolver = context.getContentResolver(); // 通过传入的Context获取ContentResolver
+ mIsCreate = false; // 设置标志位为false，表示不是创建新的笔记
+ loadFromCursor(c); // 调用loadFromCursor方法，从Cursor加载数据
+ mDataList = new ArrayList(); // 初始化数据列表为一个新的SqlData类型的ArrayList对象
+ if (mType == Notes.TYPE_NOTE) // 如果笔记类型是普通笔记
+ loadDataContent(); // 调用loadDataContent方法，加载数据内容
+ mDiffNoteValues = new ContentValues(); // 初始化笔记差异内容为一个新的ContentValues对象
+ }
+
+ public SqlNote(Context context, long id) { // 构造函数，接收一个Context和一个长整型ID参数
+ mContext = context; // 将传入的Context赋值给成员变量
+ mContentResolver = context.getContentResolver(); // 通过传入的Context获取ContentResolver
+ mIsCreate = false; // 设置标志位为false，表示不是创建新的笔记
+ loadFromCursor(id); // 调用loadFromCursor方法，从ID加载数据
+ mDataList = new ArrayList(); // 初始化数据列表为一个新的SqlData类型的ArrayList对象
+ if (mType == Notes.TYPE_NOTE) // 如果笔记类型是普通笔记
+ loadDataContent(); // 调用loadDataContent方法，加载数据内容
+ mDiffNoteValues = new ContentValues(); // 初始化笔记差异内容为一个新的ContentValues对象
+ }
+
+ private void loadFromCursor(long id) { // 从数据库中加载数据的私有方法，接收一个长整型ID参数
+ Cursor c = null; // 声明Cursor对象并初始化为null
+ try {
+ c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
+ new String[]{String.valueOf(id)}, null); // 通过ContentResolver查询数据库获取Cursor
+ if (c != null) { // 如果Cursor不为null
+ c.moveToNext(); // 移动Cursor到下一行
+ loadFromCursor(c); // 调用loadFromCursor方法，从Cursor加载数据
+ } else {
+ // 处理Cursor为null的情况
+=======
public static final int ID_COLUMN = 0;
public static final int ALERTED_DATE_COLUMN = 1;
@@ -177,6 +298,7 @@ public class SqlNote {
c.moveToNext();
loadFromCursor(c);
} else {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.w(TAG, "loadFromCursor: cursor = null");
}
} finally {
@@ -228,6 +350,68 @@ public class SqlNote {
public boolean setContent(JSONObject js) {
try {
+<<<<<<< HEAD
+ // 从JSONObject中获取名为META_HEAD_NOTE的JSONObject对象
+ JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+
+ // 判断Note的类型是否为系统类型
+ if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
+ // 如果是系统类型，记录警告信息并返回false
+ Log.w(TAG, "cannot set system folder");
+ } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
+ // 如果是文件夹类型，更新摘要和类型信息
+ // 获取摘要信息，如果不存在则使用空字符串
+ String snippet = note.has(NoteColumns.SNIPPET) ? note.getString(NoteColumns.SNIPPET) : "";
+
+ // 判断是否是创建操作或者摘要信息发生变化
+ if (mIsCreate || !mSnippet.equals(snippet)) {
+ // 如果是创建操作或者摘要信息发生变化，则将摘要信息放入mDiffNoteValues中
+ mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
+ }
+ // 更新当前的摘要信息
+ mSnippet = snippet;
+
+ // 获取类型信息，如果不存在则使用默认类型Notes.TYPE_NOTE
+ int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) : Notes.TYPE_NOTE;
+
+ // 判断是否是创建操作或者类型信息发生变化
+ if (mIsCreate || mType != type) {
+ // 如果是创建操作或者类型信息发生变化，则将类型信息放入mDiffNoteValues中
+ mDiffNoteValues.put(NoteColumns.TYPE, type);
+ }
+ // 更新当前的类型信息
+ mType = type;
+ } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
+ // 如果是笔记类型，获取名为META_HEAD_DATA的JSONArray对象
+ JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
+
+ // 获取笔记的ID，如果不存在则使用INVALID_ID
+ long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
+
+ // 判断是否是创建操作或者ID发生变化
+ if (mIsCreate || mId != id) {
+ // 如果是创建操作或者ID发生变化，则将ID放入mDiffNoteValues中
+ mDiffNoteValues.put(NoteColumns.ID, id);
+ }
+ // 更新当前的ID信息
+ mId = id;
+
+ // 获取提醒日期，如果不存在则使用0
+ long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note.getLong(NoteColumns.ALERTED_DATE) : 0;
+
+ // 判断是否是创建操作或者提醒日期发生变化
+ if (mIsCreate || mAlertDate != alertDate) {
+ // 如果是创建操作或者提醒日期发生变化，则将提醒日期放入mDiffNoteValues中
+ mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);
+ }
+ // 更新当前的提醒日期信息
+ mAlertDate = alertDate;
+
+ // 获取背景颜色ID，如果不存在则使用默认的背景颜色ID
+ int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note.getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
+
+ // 判断是否是创建操作或者背景颜色ID发生变化
+=======
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
Log.w(TAG, "cannot set system folder");
@@ -263,11 +447,69 @@ public class SqlNote {
int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
.getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (mIsCreate || mBgColorId != bgColorId) {
mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);
}
mBgColorId = bgColorId;
+<<<<<<< HEAD
+ // 获取笔记的创建日期，如果存在 CREATED_DATE 列，则使用该值，否则使用当前系统时间
+ long createDate = note.has(NoteColumns.CREATED_DATE) ? note
+ .getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
+ // 如果是创建操作（mIsCreate 为 true）或者创建日期与当前日期不同，将创建日期加入到差异值集合中
+ if (mIsCreate || mCreatedDate != createDate) {
+ mDiffNoteValues.put(NoteColumns.CREATED_DATE, createDate);
+ }
+// 更新 mCreatedDate 为当前创建日期
+ mCreatedDate = createDate;
+
+// 获取是否有附件的信息，如果存在 HAS_ATTACHMENT 列，则使用该值，否则默认为 0
+ int hasAttachment = note.has(NoteColumns.HAS_ATTACHMENT) ? note
+ .getInt(NoteColumns.HAS_ATTACHMENT) : 0;
+// 如果是创建操作或者附件信息与当前不同，将附件信息加入到差异值集合中
+ if (mIsCreate || mHasAttachment != hasAttachment) {
+ mDiffNoteValues.put(NoteColumns.HAS_ATTACHMENT, hasAttachment);
+ }
+// 更新 mHasAttachment 为当前附件信息
+
+ mHasAttachment = hasAttachment;
+
+// 获取笔记的修改日期，如果存在 MODIFIED_DATE 列，则使用该值，否则使用当前系统时间
+ long modifiedDate = note.has(NoteColumns.MODIFIED_DATE) ? note
+ .getLong(NoteColumns.MODIFIED_DATE) : System.currentTimeMillis();
+// 如果是创建操作或者修改日期与当前不同，将修改日期加入到差异值集合中
+ if (mIsCreate || mModifiedDate != modifiedDate) {
+ mDiffNoteValues.put(NoteColumns.MODIFIED_DATE, modifiedDate);
+ }
+// 更新 mModifiedDate 为当前修改日期
+
+ long parentId = note.has(NoteColumns.PARENT_ID) ? note
+ .getLong(NoteColumns.PARENT_ID) : 0;
+// 如果是创建操作或者父级 ID 与当前不同，将父级 ID 加入到差异值集合中
+ if (mIsCreate || mParentId != parentId) {
+ mDiffNoteValues.put(NoteColumns.PARENT_ID, parentId);
+ }
+// 更新 mParentId 为当前父级 ID
+
+// 获取笔记的摘要信息，如果存在 SNIPPET 列，则使用该值，否则默认为空字符串
+ String snippet = note.has(NoteColumns.SNIPPET) ? note
+ .getString(NoteColumns.SNIPPET) : "";
+// 如果是创建操作或者摘要信息与当前不同，将摘要信息加入到差异值集合中
+ if (mIsCreate || !mSnippet.equals(snippet)) {
+ mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
+ }
+// 更新 mSnippet 为当前摘要信息
+
+// 获取笔记的类型信息，如果存在 TYPE 列，则使用该值，否则默认为 Notes.TYPE_NOTE
+ int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
+ : Notes.TYPE_NOTE;
+// 如果是创建操作或者类型信息与当前不同，将类型信息加入到差异值集合中
+ if (mIsCreate || mType != type) {
+ mDiffNoteValues.put(NoteColumns.TYPE, type);
+ }
+
+=======
long createDate = note.has(NoteColumns.CREATED_DATE) ? note
.getLong(NoteColumns.CREATED_DATE) : System.currentTimeMillis();
if (mIsCreate || mCreatedDate != createDate) {
@@ -308,6 +550,7 @@ public class SqlNote {
if (mIsCreate || mType != type) {
mDiffNoteValues.put(NoteColumns.TYPE, type);
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
mType = type;
int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
@@ -317,31 +560,92 @@ public class SqlNote {
}
mWidgetId = widgetId;
+<<<<<<< HEAD
+ // 获取note的widgetId，如果有的话，使用note中的值；否则，使用INVALID_APPWIDGET_ID
+ int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
+ : AppWidgetManager.INVALID_APPWIDGET_ID;
+// 如果是创建（mIsCreate为true）或者mWidgetId与widgetId不相等，将widgetId放入mDiffNoteValues
+ if (mIsCreate || mWidgetId != widgetId) {
+ mDiffNoteValues.put(NoteColumns.WIDGET_ID, widgetId);
+ }
+// 更新mWidgetId为当前的widgetId
+ mWidgetId = widgetId;
+
+// 获取note的widgetType，如果有的话，使用note中的值；否则，使用TYPE_WIDGET_INVALIDE
int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
.getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE;
+// 如果是创建（mIsCreate为true）或者mWidgetType与widgetType不相等，将widgetType放入mDiffNoteValues
if (mIsCreate || mWidgetType != widgetType) {
mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType);
}
+// 更新mWidgetType为当前的widgetType
mWidgetType = widgetType;
+// 获取note的originParent，如果有的话，使用note中的值；否则，使用0
long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
.getLong(NoteColumns.ORIGIN_PARENT_ID) : 0;
+// 如果是创建（mIsCreate为true）或者mOriginParent与originParent不相等，将originParent放入mDiffNoteValues
if (mIsCreate || mOriginParent != originParent) {
mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent);
}
+// 更新mOriginParent为当前的originParent
mOriginParent = originParent;
+// 循环处理dataArray中的每个元素
for (int i = 0; i < dataArray.length(); i++) {
+ // 获取dataArray中的JSONObject
JSONObject data = dataArray.getJSONObject(i);
+ // 初始化一个SqlData对象
SqlData sqlData = null;
+ // 如果data中有ID属性
if (data.has(DataColumns.ID)) {
+ // 获取data中的ID值
long dataId = data.getLong(DataColumns.ID);
+ // 遍历mDataList，查找是否存在与dataId相等的ID
+=======
+ int widgetType = note.has(NoteColumns.WIDGET_TYPE) ? note
+ .getInt(NoteColumns.WIDGET_TYPE) : Notes.TYPE_WIDGET_INVALIDE;
+ if (mIsCreate || mWidgetType != widgetType) {
+ mDiffNoteValues.put(NoteColumns.WIDGET_TYPE, widgetType);
+ }
+ mWidgetType = widgetType;
+
+ long originParent = note.has(NoteColumns.ORIGIN_PARENT_ID) ? note
+ .getLong(NoteColumns.ORIGIN_PARENT_ID) : 0;
+ if (mIsCreate || mOriginParent != originParent) {
+ mDiffNoteValues.put(NoteColumns.ORIGIN_PARENT_ID, originParent);
+ }
+ mOriginParent = originParent;
+
+ for (int i = 0; i < dataArray.length(); i++) {
+ JSONObject data = dataArray.getJSONObject(i);
+ SqlData sqlData = null;
+ if (data.has(DataColumns.ID)) {
+ long dataId = data.getLong(DataColumns.ID);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
for (SqlData temp : mDataList) {
if (dataId == temp.getId()) {
sqlData = temp;
}
}
}
+<<<<<<< HEAD
+ // 如果sqlData为null，说明在mDataList中找不到相应的SqlData对象，则新建一个
+ if (sqlData == null) {
+ sqlData = new SqlData(mContext);
+ // 将新建的sqlData添加到mDataList中
+ mDataList.add(sqlData);
+ }
+ // 将data的内容设置到sqlData中
+ sqlData.setContent(data);
+ }
+ }
+ } catch (JSONException e) {// 捕获可能抛出的JSONException异常
+ // 打印异常信息
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ // 返回false表示操作失败
+=======
if (sqlData == null) {
sqlData = new SqlData(mContext);
@@ -354,6 +658,7 @@ public class SqlNote {
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
return false;
}
return true;
@@ -441,11 +746,31 @@ public class SqlNote {
}
public void commit(boolean validateVersion) {
+<<<<<<< HEAD
+ // 如果是新创建的笔记
+ if (mIsCreate) {
+ // 如果笔记ID为无效且差异数据中包含ID字段，则移除ID字段
+=======
if (mIsCreate) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
mDiffNoteValues.remove(NoteColumns.ID);
}
+<<<<<<< HEAD
+ // 在Notes.CONTENT_NOTE_URI下插入差异数据，并获取返回的Uri
+ Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
+ try {
+ // 从Uri中获取插入笔记的ID
+ mId = Long.valueOf(uri.getPathSegments().get(1));
+ } catch (NumberFormatException e) {
+ // 处理获取笔记ID时的异常
+ Log.e(TAG, "Get note id error :" + e.toString());
+ throw new ActionFailureException("create note failed");
+ }
+
+ // 如果笔记ID为0，则抛出异常，表示创建线程ID失败
+=======
Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
try {
mId = Long.valueOf(uri.getPathSegments().get(1));
@@ -453,20 +778,47 @@ public class SqlNote {
Log.e(TAG, "Get note id error :" + e.toString());
throw new ActionFailureException("create note failed");
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (mId == 0) {
throw new IllegalStateException("Create thread id failed");
}
+<<<<<<< HEAD
+ // 如果笔记类型是Notes.TYPE_NOTE，则提交关联的SqlData
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (mType == Notes.TYPE_NOTE) {
for (SqlData sqlData : mDataList) {
sqlData.commit(mId, false, -1);
}
}
} else {
+<<<<<<< HEAD
+ // 如果不是新创建的笔记
+ // 如果笔记ID小于等于0且不是根文件夹或通话记录文件夹，则抛出异常，表示没有这样的笔记
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) {
Log.e(TAG, "No such note");
throw new IllegalStateException("Try to update note with invalid id");
}
+<<<<<<< HEAD
+
+ // 如果差异数据中有内容，则增加版本号，然后根据是否验证版本号来更新笔记
+ if (mDiffNoteValues.size() > 0) {
+ mVersion++;
+ int result = 0;
+ if (!validateVersion) {
+ // 如果不验证版本号，则直接更新笔记
+ result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ + NoteColumns.ID + "=?)", new String[] {
+ String.valueOf(mId)
+ });
+ } else {
+ // 如果验证版本号，则更新笔记时需满足ID和版本号条件
+ result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
+=======
if (mDiffNoteValues.size() > 0) {
mVersion ++;
int result = 0;
@@ -478,10 +830,16 @@ public class SqlNote {
} else {
result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
new String[] {
String.valueOf(mId), String.valueOf(mVersion)
});
}
+<<<<<<< HEAD
+
+ // 如果更新操作影响的行数为0，则打印警告信息
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (result == 0) {
Log.w(TAG, "there is no update. maybe user updates note when syncing");
}
diff --git a/src/src/net/micode/notes/gtask/data/Task.java b/src/src/net/micode/notes/gtask/data/Task.java
index 6a19454..ee8326e 100644
--- a/src/src/net/micode/notes/gtask/data/Task.java
+++ b/src/src/net/micode/notes/gtask/data/Task.java
@@ -61,43 +61,138 @@ public class Task extends Node {
// action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
+<<<<<<< HEAD
+ // 将动作类型放入 JSON 对象中
// action_id
js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
+ // 将动作 ID 放入 JSON 对象中
// index
js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this));
+ // 将索引放入 JSON 对象中，索引通过 mParent.getChildTaskIndex(this) 获取
// entity_delta
JSONObject entity = new JSONObject();
+ // 创建名为 entity 的 JSON 对象
+
entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
+ // 将任务的名称放入 entity JSON 对象中
entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
+ // 将创建者 ID（字符串 "null"）放入 entity JSON 对象中
entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
GTaskStringUtils.GTASK_JSON_TYPE_TASK);
+ // 将实体类型（任务类型）放入 entity JSON 对象中
+
if (getNotes() != null) {
entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
+ // 如果存在任务备注，则将备注放入 entity JSON 对象中
}
+
js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
+ // 将 entity JSON 对象放入主 JSON 对象中的 ENTITY_DELTA 字段
// parent_id
js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid());
+ // 将父任务的 ID 放入 JSON 对象中的 PARENT_ID 字段
+=======
+
+ // action_id
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
+
+ // index
+ js.put(GTaskStringUtils.GTASK_JSON_INDEX, mParent.getChildTaskIndex(this));
+
+ // entity_delta
+ JSONObject entity = new JSONObject();
+ entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
+ entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
+ entity.put(GTaskStringUtils.GTASK_JSON_ENTITY_TYPE,
+ GTaskStringUtils.GTASK_JSON_TYPE_TASK);
+ if (getNotes() != null) {
+ entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
+ }
+ js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
+
+ // parent_id
+ js.put(GTaskStringUtils.GTASK_JSON_PARENT_ID, mParent.getGid());
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
// dest_parent_type
js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE,
GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
+<<<<<<< HEAD
+ // 将目标父节点的类型（群组类型）放入 JSON 对象中的 DEST_PARENT_TYPE 字段
+
+ // list_id
+ js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid());
+ // 将列表 ID 放入 JSON 对象中，使用父任务的 ID
+=======
// list_id
js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid());
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
// prior_sibling_id
if (mPriorSibling != null) {
js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid());
+<<<<<<< HEAD
+ // 如果存在前一个兄弟任务，则将其 ID 放入 JSON 对象中的 PRIOR_SIBLING_ID 字段
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
}
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
throw new ActionFailureException("fail to generate task-create jsonobject");
+<<<<<<< HEAD
+ // 在发生 JSON 异常时，记录异常信息并抛出 ActionFailureException 异常
+ }
+
+ return js;
+ // 返回构建好的 JSON 对象
+ }
+
+
+ public JSONObject getUpdateAction(int actionId) {
+ // 创建一个新的JSONObject对象
+ JSONObject js = new JSONObject();
+
+ try {
+ // 设置action_type为"update"
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
+ GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
+
+ // 设置action_id为传入的参数actionId
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
+
+ // 设置id为当前对象的gid
+ js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
+
+ // 创建并设置entity_delta
+ JSONObject entity = new JSONObject();
+ // 设置entity中的name为当前对象的name
+ entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
+ // 如果notes不为空，设置entity中的notes为当前对象的notes
+ if (getNotes() != null) {
+ entity.put(GTaskStringUtils.GTASK_JSON_NOTES, getNotes());
+ }
+ // 设置entity中的deleted为当前对象的deleted
+ entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
+ // 将entity放入js的entity_delta中
+ js.put(GTaskStringUtils.GTASK_JSON_ENTITY_DELTA, entity);
+
+ } catch (JSONException e) {
+ // 捕获JSONException异常
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ // 抛出ActionFailureException异常，表示生成task-update JSONObject失败
+ throw new ActionFailureException("fail to generate task-update jsonobject");
+ }
+
+ // 返回构建好的JSONObject对象
+=======
}
return js;
@@ -132,33 +227,57 @@ public class Task extends Node {
throw new ActionFailureException("fail to generate task-update jsonobject");
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
return js;
}
public void setContentByRemoteJSON(JSONObject js) {
+<<<<<<< HEAD
+ // 检查传入的JSONObject是否为空
+ if (js != null) {
+ try {
+ // 如果JSONObject包含id字段，设置当前对象的gid为该字段的值
+=======
if (js != null) {
try {
// id
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
}
+<<<<<<< HEAD
+ // 如果JSONObject包含last_modified字段，设置当前对象的lastModified为该字段的值
+=======
// last_modified
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
}
+<<<<<<< HEAD
+ // 如果JSONObject包含name字段，设置当前对象的name为该字段的值
+=======
// name
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
}
+<<<<<<< HEAD
+ // 如果JSONObject包含notes字段，设置当前对象的notes为该字段的值
+=======
// notes
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) {
setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES));
}
+<<<<<<< HEAD
+ // 如果JSONObject包含deleted字段，设置当前对象的deleted为该字段的值
+=======
// deleted
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) {
setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED));
}
@@ -167,7 +286,11 @@ public class Task extends Node {
if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) {
setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED));
}
+<<<<<<< HEAD
+ } catch (JSONException e) { // 捕获可能抛出的JSONException异常
+=======
} catch (JSONException e) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.e(TAG, e.toString());
e.printStackTrace();
throw new ActionFailureException("fail to get task content from jsonobject");
@@ -176,6 +299,24 @@ public class Task extends Node {
}
public void setContentByLocalJSON(JSONObject js) {
+<<<<<<< HEAD
+ // 检查传入的 JSONObject 是否为 null，是否包含指定的 META_HEAD_NOTE 和 META_HEAD_DATA
+ if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
+ || !js.has(GTaskStringUtils.META_HEAD_DATA)) {
+ // 若不满足条件，则记录警告日志并返回
+ Log.w(TAG, "setContentByLocalJSON: nothing is available");
+ }
+
+ try {
+ // 从传入的 JSONObject 中获取 META_HEAD_NOTE 对应的 JSON 对象
+ JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+ // 从传入的 JSONObject 中获取 META_HEAD_DATA 对应的 JSON 数组
+ JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
+
+ // 检查 note 对应的 JSON 对象中的 TYPE 是否为 Notes.TYPE_NOTE
+ if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
+ // 若不是预期的类型，则记录错误日志并返回
+=======
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
|| !js.has(GTaskStringUtils.META_HEAD_DATA)) {
Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
@@ -186,34 +327,64 @@ public class Task extends Node {
JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.e(TAG, "invalid type");
return;
}
+<<<<<<< HEAD
+ // 循环遍历 META_HEAD_DATA 中的每一个 JSON 对象
+ for (int i = 0; i < dataArray.length(); i++) {
+ // 获取当前位置的 JSON 对象
+ JSONObject data = dataArray.getJSONObject(i);
+ // 检查 JSON 对象中 MIME_TYPE 是否为 DataConstants.NOTE
+ if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
+ // 若满足条件，则设置当前对象的名称为 CONTENT，并终止循环
+=======
for (int i = 0; i < dataArray.length(); i++) {
JSONObject data = dataArray.getJSONObject(i);
if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
setName(data.getString(DataColumns.CONTENT));
break;
}
}
} catch (JSONException e) {
+<<<<<<< HEAD
+ // 捕获 JSON 解析异常，记录错误日志，并打印异常堆栈信息
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.e(TAG, e.toString());
e.printStackTrace();
}
}
public JSONObject getLocalJSONFromContent() {
+<<<<<<< HEAD
+ // 获取当前对象的名称
+ String name = getName();
+ try {
+ // 检查当前对象的 META 信息是否为 null
+ if (mMetaInfo == null) {
+ // 若为 null，表示是从 Web 创建的新任务
+ if (name == null) {
+ // 若名称为 null，记录警告日志并返回 null
+=======
String name = getName();
try {
if (mMetaInfo == null) {
// new task created from web
if (name == null) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.w(TAG, "the note seems to be an empty one");
return null;
}
+<<<<<<< HEAD
+ // 创建新的 JSONObject，并设置其中的 META_HEAD_DATA 和 META_HEAD_NOTE
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
JSONObject js = new JSONObject();
JSONObject note = new JSONObject();
JSONArray dataArray = new JSONArray();
@@ -248,10 +419,20 @@ public class Task extends Node {
}
public void setMetaInfo(MetaData metaData) {
+<<<<<<< HEAD
+ // 检查传入的 metaData 对象是否非空，且其 notes 属性也非空
if (metaData != null && metaData.getNotes() != null) {
try {
+ // 尝试将 metaData 对象中的 notes 属性转换为 JSONObject
mMetaInfo = new JSONObject(metaData.getNotes());
} catch (JSONException e) {
+ // 捕捉 JSON 解析异常，记录警告日志，并将 mMetaInfo 置为 null
+=======
+ if (metaData != null && metaData.getNotes() != null) {
+ try {
+ mMetaInfo = new JSONObject(metaData.getNotes());
+ } catch (JSONException e) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.w(TAG, e.toString());
mMetaInfo = null;
}
@@ -260,6 +441,49 @@ public class Task extends Node {
public int getSyncAction(Cursor c) {
try {
+<<<<<<< HEAD
+ // 初始化 noteInfo 为 null
+ JSONObject noteInfo = null;
+ // 如果 mMetaInfo 不为 null 且包含特定的 META_HEAD_NOTE 键
+ if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) {
+ // 获取 META_HEAD_NOTE 对应的 JSONObject
+ noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+ }
+
+ // 如果 noteInfo 为 null，则记录警告日志，表示似乎已删除了 note 的元数据
+ if (noteInfo == null) {
+ Log.w(TAG, "似乎已删除笔记元数据");
+ return SYNC_ACTION_UPDATE_REMOTE; // 返回更新远程的同步操作
+ }
+
+ // 如果 noteInfo 中不包含 NoteColumns.ID 键
+ if (!noteInfo.has(NoteColumns.ID)) {
+ Log.w(TAG, "远程笔记 ID 似乎已删除");
+ return SYNC_ACTION_UPDATE_LOCAL; // 返回更新本地的同步操作
+ }
+
+ // 验证现在的笔记 ID 是否匹配
+ if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) {
+ Log.w(TAG, "笔记 ID 不匹配");
+ return SYNC_ACTION_UPDATE_LOCAL; // 返回更新本地的同步操作
+ }
+
+ // 如果本地未修改笔记
+ if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
+ // 如果本地和远程均无更新
+ if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
+ return SYNC_ACTION_NONE; // 返回无同步操作
+ } else {
+ return SYNC_ACTION_UPDATE_LOCAL; // 返回更新本地的同步操作
+ }
+ } else {
+ // 如果本地修改过，验证 gtask id 是否匹配
+ if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
+ Log.e(TAG, "gtask ID 不匹配");
+ return SYNC_ACTION_ERROR; // 返回同步错误操作
+ }
+ // 如果本地同步 ID 与最后修改时间相匹配
+=======
JSONObject noteInfo = null;
if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) {
noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
@@ -296,6 +520,7 @@ public class Task extends Node {
Log.e(TAG, "gtask id doesn't match");
return SYNC_ACTION_ERROR;
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
// local modification only
return SYNC_ACTION_UPDATE_REMOTE;
@@ -304,6 +529,10 @@ public class Task extends Node {
}
}
} catch (Exception e) {
+<<<<<<< HEAD
+ // 捕捉 JSON 解析异常，记录警告日志，并返回同步错误操作
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.e(TAG, e.toString());
e.printStackTrace();
}
diff --git a/src/src/net/micode/notes/gtask/data/TaskList.java b/src/src/net/micode/notes/gtask/data/TaskList.java
index 4ea21c5..2770533 100644
--- a/src/src/net/micode/notes/gtask/data/TaskList.java
+++ b/src/src/net/micode/notes/gtask/data/TaskList.java
@@ -31,12 +31,22 @@ import java.util.ArrayList;
public class TaskList extends Node {
+<<<<<<< HEAD
+ //TAG标记
+ private static final String TAG = TaskList.class.getSimpleName();
+ //当前TaskList的指针
+ private int mIndex;
+ //类中主要的保存数据的单元，用来实现一个以Task为元素的ArrayList
+ private ArrayList mChildren;
+ //生成并返回一个包含了一定数据的JSONObject实体
+=======
private static final String TAG = TaskList.class.getSimpleName();
private int mIndex;
private ArrayList mChildren;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public TaskList() {
super();
mChildren = new ArrayList();
@@ -48,16 +58,32 @@ public class TaskList extends Node {
try {
// action_type
+<<<<<<< HEAD
+ //对应的值是表示动作类型的常量，用于指明这个动作是创建类型的。
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
// action_id
+<<<<<<< HEAD
+ ///对应的值是传入的actionId参数。
js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
// index
+ //对应的值是mIndex变量的值。
js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex);
// entity_delta
+ //对应的值是一个嵌套的JSONObject，包含了一些任务的信息，如名称、创建者ID和实体类型。
+=======
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
+
+ // index
+ js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex);
+
+ // entity_delta
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
JSONObject entity = new JSONObject();
entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
entity.put(GTaskStringUtils.GTASK_JSON_CREATOR_ID, "null");
@@ -79,16 +105,32 @@ public class TaskList extends Node {
try {
// action_type
+<<<<<<< HEAD
+ //对应的值表示动作类型，这里是更新类型的。
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
// action_id
+<<<<<<< HEAD
+ //对应的值是传入的actionId参数。
js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
// id
+ //对应的值是getGid()方法的返回值。
js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
// entity_delta
+ //对应的值是一个嵌套的JSONObject，包含了一些任务的信息，如名称和是否被删除。
+=======
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
+
+ // id
+ js.put(GTaskStringUtils.GTASK_JSON_ID, getGid());
+
+ // entity_delta
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
JSONObject entity = new JSONObject();
entity.put(GTaskStringUtils.GTASK_JSON_NAME, getName());
entity.put(GTaskStringUtils.GTASK_JSON_DELETED, getDeleted());
@@ -130,6 +172,24 @@ public class TaskList extends Node {
}
public void setContentByLocalJSON(JSONObject js) {
+<<<<<<< HEAD
+ // 检查传入的JSON对象是否为空或是否包含必需的字段
+ if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
+ Log.w(TAG, "setContentByLocalJSON: nothing is available");
+ }
+
+ try {
+ // 从JSON对象中获取名为META_HEAD_NOTE的子对象
+ JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+
+ // 检查文件夹的类型
+ if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
+ // 如果是文件夹类型，则获取文件夹的名字，并在原有名字前加上特定前缀
+ String name = folder.getString(NoteColumns.SNIPPET);
+ setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
+ } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
+ // 如果是系统文件夹类型，则根据文件夹ID设置特定的名字
+=======
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
}
@@ -141,6 +201,7 @@ public class TaskList extends Node {
String name = folder.getString(NoteColumns.SNIPPET);
setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
} else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER)
setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT);
else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER)
@@ -149,9 +210,17 @@ public class TaskList extends Node {
else
Log.e(TAG, "invalid system folder");
} else {
+<<<<<<< HEAD
+ // 如果既不是文件夹类型也不是系统文件夹类型，则记录错误
Log.e(TAG, "error type");
}
} catch (JSONException e) {
+ // 捕获JSON异常，记录错误信息
+=======
+ Log.e(TAG, "error type");
+ }
+ } catch (JSONException e) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.e(TAG, e.toString());
e.printStackTrace();
}
@@ -159,9 +228,17 @@ public class TaskList extends Node {
public JSONObject getLocalJSONFromContent() {
try {
+<<<<<<< HEAD
+ // 创建一个新的JSON对象和文件夹对象
JSONObject js = new JSONObject();
JSONObject folder = new JSONObject();
+ // 获取文件夹的名字，并检查是否有特定前缀，然后设置相应的属性
+=======
+ JSONObject js = new JSONObject();
+ JSONObject folder = new JSONObject();
+
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
String folderName = getName();
if (getName().startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX))
folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(),
@@ -235,11 +312,28 @@ public class TaskList extends Node {
}
public boolean addChildTask(Task task, int index) {
+<<<<<<< HEAD
+ // 检查索引是否在有效范围内
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (index < 0 || index > mChildren.size()) {
Log.e(TAG, "add child task: invalid index");
return false;
}
+<<<<<<< HEAD
+ // 查找任务在列表中的位置
+ int pos = mChildren.indexOf(task);
+ // 如果任务不为空且不在列表中
+ if (task != null && pos == -1) {
+ // 在指定索引处添加任务
+ mChildren.add(index, task);
+
+ // 更新任务列表
+ Task preTask = null;
+ Task afterTask = null;
+ // 获取前一个任务和后一个任务
+=======
int pos = mChildren.indexOf(task);
if (task != null && pos == -1) {
mChildren.add(index, task);
@@ -247,11 +341,16 @@ public class TaskList extends Node {
// update the task list
Task preTask = null;
Task afterTask = null;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (index != 0)
preTask = mChildren.get(index - 1);
if (index != mChildren.size() - 1)
afterTask = mChildren.get(index + 1);
+<<<<<<< HEAD
+ // 设置任务的前一个和后一个任务
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
task.setPriorSibling(preTask);
if (afterTask != null)
afterTask.setPriorSibling(task);
@@ -262,17 +361,33 @@ public class TaskList extends Node {
public boolean removeChildTask(Task task) {
boolean ret = false;
+<<<<<<< HEAD
+ // 查找任务在列表中的索引
+ int index = mChildren.indexOf(task);
+ // 如果任务在列表中
+=======
int index = mChildren.indexOf(task);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (index != -1) {
ret = mChildren.remove(task);
if (ret) {
+<<<<<<< HEAD
+ // 重置任务的前一个任务和父任务
+ task.setPriorSibling(null);
+ task.setParent(null);
+
+ // 更新任务列表
+ if (index != mChildren.size()) {
+ // 设置下一个任务的前一个任务
+=======
// reset prior sibling and parent
task.setPriorSibling(null);
task.setParent(null);
// update the task list
if (index != mChildren.size()) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
mChildren.get(index).setPriorSibling(
index == 0 ? null : mChildren.get(index - 1));
}
@@ -282,23 +397,45 @@ public class TaskList extends Node {
}
public boolean moveChildTask(Task task, int index) {
+<<<<<<< HEAD
+ // 检查索引是否在有效范围内
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (index < 0 || index >= mChildren.size()) {
Log.e(TAG, "move child task: invalid index");
return false;
}
+<<<<<<< HEAD
+ // 查找任务在列表中的位置
+ int pos = mChildren.indexOf(task);
+ // 如果任务不在列表中
+=======
int pos = mChildren.indexOf(task);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (pos == -1) {
Log.e(TAG, "move child task: the task should in the list");
return false;
}
+<<<<<<< HEAD
+ // 如果任务已经在目标位置
+ if (pos == index)
+ return true;
+
+ // 移除任务并在新位置添加任务
+ return (removeChildTask(task) && addChildTask(task, index));
+ }
+
+
+=======
if (pos == index)
return true;
return (removeChildTask(task) && addChildTask(task, index));
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public Task findChildTaskByGid(String gid) {
for (int i = 0; i < mChildren.size(); i++) {
Task t = mChildren.get(i);
diff --git a/src/src/net/micode/notes/gtask/exception/ActionFailureException.java b/src/src/net/micode/notes/gtask/exception/ActionFailureException.java
index 15504be..d4496f6 100644
--- a/src/src/net/micode/notes/gtask/exception/ActionFailureException.java
+++ b/src/src/net/micode/notes/gtask/exception/ActionFailureException.java
@@ -16,17 +16,34 @@
package net.micode.notes.gtask.exception;
+<<<<<<< HEAD
+// 自定义异常类 ActionFailureException 继承自 RuntimeException
public class ActionFailureException extends RuntimeException {
+ // 序列化版本号，用于反序列化时验证类的版本一致性
private static final long serialVersionUID = 4425249765923293627L;
+ // 无参构造函数
+=======
+public class ActionFailureException extends RuntimeException {
+ private static final long serialVersionUID = 4425249765923293627L;
+
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public ActionFailureException() {
super();
}
+<<<<<<< HEAD
+ // 带有错误信息参数的构造函数
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public ActionFailureException(String paramString) {
super(paramString);
}
+<<<<<<< HEAD
+ // 带有错误信息和原始异常参数的构造函数
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public ActionFailureException(String paramString, Throwable paramThrowable) {
super(paramString, paramThrowable);
}
diff --git a/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java
index b08cfb1..200fb89 100644
--- a/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ b/src/src/net/micode/notes/gtask/exception/NetworkFailureException.java
@@ -16,17 +16,34 @@
package net.micode.notes.gtask.exception;
+<<<<<<< HEAD
+// 自定义异常类 NetworkFailureException 继承自 Exception
public class NetworkFailureException extends Exception {
+ // 序列化版本号，用于反序列化时验证类的版本一致性
private static final long serialVersionUID = 2107610287180234136L;
+ // 无参构造函数
+=======
+public class NetworkFailureException extends Exception {
+ private static final long serialVersionUID = 2107610287180234136L;
+
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public NetworkFailureException() {
super();
}
+<<<<<<< HEAD
+ // 带有错误信息参数的构造函数
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public NetworkFailureException(String paramString) {
super(paramString);
}
+<<<<<<< HEAD
+ // 带有错误信息和原始异常参数的构造函数
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public NetworkFailureException(String paramString, Throwable paramThrowable) {
super(paramString, paramThrowable);
}
diff --git a/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
index b3b61e7..522cd7c 100644
--- a/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/src/src/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -63,6 +63,24 @@ public class GTaskASyncTask extends AsyncTask {
});
}
+<<<<<<< HEAD
+ // 定义一个用于显示通知的方法，参数包括通知ID和内容
+ private void showNotification(int tickerId, String content) {
+ // 创建一个通知对象
+ Notification notification = new Notification(R.drawable.notification, mContext
+ .getString(tickerId), System.currentTimeMillis());
+
+ // 设置通知的默认属性
+ notification.defaults = Notification.DEFAULT_LIGHTS;
+ notification.flags = Notification.FLAG_AUTO_CANCEL;
+
+ // 定义一个PendingIntent对象，用于处理通知的点击事件
+ PendingIntent pendingIntent;
+ // 根据通知ID的不同，设置不同的点击事件
+ if (tickerId != R.string.ticker_success) {
+ pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+ NotesPreferenceActivity.class), 0);
+=======
private void showNotification(int tickerId, String content) {
Notification notification = new Notification(R.drawable.notification, mContext
.getString(tickerId), System.currentTimeMillis());
@@ -73,35 +91,74 @@ public class GTaskASyncTask extends AsyncTask {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
NotesPreferenceActivity.class), 0);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
} else {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
NotesListActivity.class), 0);
}
+<<<<<<< HEAD
+
+ // 设置通知的最新事件信息，包括应用名称、内容和点击事件
notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
pendingIntent);
+
+ // 发送通知
mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
}
+ // 在后台执行任务的方法，参数为Void类型，返回一个Integer结果
@Override
protected Integer doInBackground(Void... unused) {
+ // 发布同步进度通知
publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
.getSyncAccountName(mContext)));
+
+ // 调用任务管理器的同步方法，返回同步结果
return mTaskManager.sync(mContext, this);
}
+ // 在任务执行过程中更新进度的方法，参数为进度信息数组
@Override
protected void onProgressUpdate(String... progress) {
+ // 显示同步中的通知，并根据Context类型发送广播
+=======
+ notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
+ pendingIntent);
+ mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+ }
+
+ @Override
+ protected Integer doInBackground(Void... unused) {
+ publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
+ .getSyncAccountName(mContext)));
+ return mTaskManager.sync(mContext, this);
+ }
+
+ @Override
+ protected void onProgressUpdate(String... progress) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
showNotification(R.string.ticker_syncing, progress[0]);
if (mContext instanceof GTaskSyncService) {
((GTaskSyncService) mContext).sendBroadcast(progress[0]);
}
}
+<<<<<<< HEAD
+ // 任务执行完毕后的方法，参数为任务执行的结果
+ @Override
+ protected void onPostExecute(Integer result) {
+ // 根据任务执行结果显示不同的通知
+ if (result == GTaskManager.STATE_SUCCESS) {
+ showNotification(R.string.ticker_success, mContext.getString(
+ R.string.success_sync_account, mTaskManager.getSyncAccount()));
+ // 更新上次同步时间
+=======
@Override
protected void onPostExecute(Integer result) {
if (result == GTaskManager.STATE_SUCCESS) {
showNotification(R.string.ticker_success, mContext.getString(
R.string.success_sync_account, mTaskManager.getSyncAccount()));
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis());
} else if (result == GTaskManager.STATE_NETWORK_ERROR) {
showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network));
diff --git a/src/src/net/micode/notes/gtask/remote/GTaskClient.java b/src/src/net/micode/notes/gtask/remote/GTaskClient.java
index c67dfdf..31f97c7 100644
--- a/src/src/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/src/src/net/micode/notes/gtask/remote/GTaskClient.java
@@ -60,7 +60,11 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
+<<<<<<< HEAD
+//实现GTASK的登录操作，进行GTASK任务的创建，创建任务列表，从网络上获取任务和任务列表的内容
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public class GTaskClient {
private static final String TAG = GTaskClient.class.getSimpleName();
@@ -101,50 +105,92 @@ public class GTaskClient {
mAccount = null;
mUpdateArray = null;
}
-
+<<<<<<< HEAD
+ /*用来获取的实例化对象
+ * 使用 getInstance()
+ * 返回mInstance这个实例化对象
+ */
+=======
+
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public static synchronized GTaskClient getInstance() {
if (mInstance == null) {
mInstance = new GTaskClient();
}
return mInstance;
}
+<<<<<<< HEAD
+ /*用来实现登录操作的函数，传入的参数是一个Activity
+ * 设置登录操作限制时间，如果超时则需要重新登录
+ * 有两种登录方式，使用用户自己的URL登录或者使用谷歌官方的URL登录
+ * 返回true或者false，即最后是否登陆成功
+ */
+ public boolean login(Activity activity) {
+ // we suppose that the cookie would expire after 5 minutes
+ // then we need to re-login
+ ////判断距离最后一次登录操作是否超过5分钟
+=======
public boolean login(Activity activity) {
// we suppose that the cookie would expire after 5 minutes
// then we need to re-login
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
final long interval = 1000 * 60 * 5;
if (mLastLoginTime + interval < System.currentTimeMillis()) {
mLoggedin = false;
}
// need to re-login after account switch
+<<<<<<< HEAD
+ // need to re-login after account switch 重新登录操作
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (mLoggedin
&& !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
.getSyncAccountName(activity))) {
mLoggedin = false;
}
+<<<<<<< HEAD
+//如果没超过时间，则不需要重新登录
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (mLoggedin) {
Log.d(TAG, "already logged in");
return true;
}
+<<<<<<< HEAD
+ mLastLoginTime = System.currentTimeMillis();//更新最后登录时间，改为系统当前的时间
+ String authToken = loginGoogleAccount(activity, false);//判断是否登录到谷歌账户
+=======
mLastLoginTime = System.currentTimeMillis();
String authToken = loginGoogleAccount(activity, false);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (authToken == null) {
Log.e(TAG, "login google account failed");
return false;
}
// login with custom domain if necessary
+<<<<<<< HEAD
+ //尝试使用用户自己的域名登录
+ if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase() //将用户账号名改为统一格式（小写）后判断是否为一个谷歌账号地址
+=======
if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase()
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
.endsWith("googlemail.com"))) {
StringBuilder url = new StringBuilder(GTASK_URL).append("a/");
int index = mAccount.name.indexOf('@') + 1;
String suffix = mAccount.name.substring(index);
url.append(suffix + "/");
+<<<<<<< HEAD
+ mGetUrl = url.toString() + "ig"; //设置用户对应的getUrl
+ mPostUrl = url.toString() + "r/ig"; //设置用户对应的postUrl
+=======
mGetUrl = url.toString() + "ig";
mPostUrl = url.toString() + "r/ig";
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (tryToLoginGtask(activity, authToken)) {
mLoggedin = true;
@@ -152,6 +198,10 @@ public class GTaskClient {
}
// try to login with google official url
+<<<<<<< HEAD
+ //如果用户账户无法登录，则使用谷歌官方的URI进行登录
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (!mLoggedin) {
mGetUrl = GTASK_GET_URL;
mPostUrl = GTASK_POST_URL;
@@ -164,10 +214,22 @@ public class GTaskClient {
return true;
}
+<<<<<<< HEAD
+ /*具体实现登录谷歌账户的方法
+ * 使用令牌机制
+ * 使用AccountManager来管理注册账号
+ * 返回值是账号的令牌
+ */
+ private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
+ String authToken; //令牌，是登录操作保证安全性的一个方法
+ AccountManager accountManager = AccountManager.get(activity);//AccountManager这个类给用户提供了集中注册账号的接口
+ Account[] accounts = accountManager.getAccountsByType("com.google");//获取全部以com.google结尾的account
+=======
private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
String authToken;
AccountManager accountManager = AccountManager.get(activity);
Account[] accounts = accountManager.getAccountsByType("com.google");
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (accounts.length == 0) {
Log.e(TAG, "there is no available google account");
@@ -176,6 +238,10 @@ public class GTaskClient {
String accountName = NotesPreferenceActivity.getSyncAccountName(activity);
Account account = null;
+<<<<<<< HEAD
+ //遍历获得的accounts信息，寻找已经记录过的账户信息
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
for (Account a : accounts) {
if (a.name.equals(accountName)) {
account = a;
@@ -190,11 +256,19 @@ public class GTaskClient {
}
// get the token now
+<<<<<<< HEAD
+ //获取选中账号的令牌
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account,
"goanna_mobile", null, activity, null, null);
try {
Bundle authTokenBundle = accountManagerFuture.getResult();
authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN);
+<<<<<<< HEAD
+ //如果是invalidateToken，那么需要调用invalidateAuthToken(String, String)方法废除这个无效token
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (invalidateToken) {
accountManager.invalidateAuthToken("com.google", authToken);
loginGoogleAccount(activity, false);
@@ -207,10 +281,19 @@ public class GTaskClient {
return authToken;
}
+<<<<<<< HEAD
+ //尝试登陆Gtask，这只是一个预先判断令牌是否是有效以及是否能登上GTask的方法,而不是具体实现登陆的方法
+ private boolean tryToLoginGtask(Activity activity, String authToken) {
+ if (!loginGtask(authToken)) {
+ // maybe the auth token is out of authTokedate, now let's invalidate the
+ // token and try again
+ //删除过一个无效的authToken，申请一个新的后再次尝试登陆
+=======
private boolean tryToLoginGtask(Activity activity, String authToken) {
if (!loginGtask(authToken)) {
// maybe the auth token is out of date, now let's invalidate the
// token and try again
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
authToken = loginGoogleAccount(activity, true);
if (authToken == null) {
Log.e(TAG, "login google account failed");
@@ -225,6 +308,17 @@ public class GTaskClient {
return true;
}
+<<<<<<< HEAD
+ //实现登录GTask的具体操作
+ private boolean loginGtask(String authToken) {
+ int timeoutConnection = 10000;
+ int timeoutSocket = 15000; //socket是一种通信连接实现数据的交换的端口
+ HttpParams httpParameters = new BasicHttpParams(); //实例化一个新的HTTP参数类
+ HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);//设置连接超时时间
+ HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);//设置设置端口超时时间
+ mHttpClient = new DefaultHttpClient(httpParameters);
+ BasicCookieStore localBasicCookieStore = new BasicCookieStore(); //设置本地cookie
+=======
private boolean loginGtask(String authToken) {
int timeoutConnection = 10000;
int timeoutSocket = 15000;
@@ -233,17 +327,27 @@ public class GTaskClient {
HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);
mHttpClient = new DefaultHttpClient(httpParameters);
BasicCookieStore localBasicCookieStore = new BasicCookieStore();
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
mHttpClient.setCookieStore(localBasicCookieStore);
HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
// login gtask
try {
+<<<<<<< HEAD
+ String loginUrl = mGetUrl + "?auth=" + authToken; //设置登录的url
+ HttpGet httpGet = new HttpGet(loginUrl); //通过登录的uri实例化网页上资源的查找
+=======
String loginUrl = mGetUrl + "?auth=" + authToken;
HttpGet httpGet = new HttpGet(loginUrl);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
HttpResponse response = null;
response = mHttpClient.execute(httpGet);
// get the cookie now
+<<<<<<< HEAD
+ //获取CookieStore里存放的cookie,看如果存有“GTL(不知道什么意思)”，则说明有验证成功的有效的cookie
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
List cookies = mHttpClient.getCookieStore().getCookies();
boolean hasAuthCookie = false;
for (Cookie cookie : cookies) {
@@ -256,6 +360,10 @@ public class GTaskClient {
}
// get the client version
+<<<<<<< HEAD
+ //获取client的内容，具体操作是在返回的Content中截取从_setup(开始到)}中间的字符串内容，也就是gtask_url的内容
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}";
@@ -284,6 +392,13 @@ public class GTaskClient {
return mActionId++;
}
+<<<<<<< HEAD
+ /*实例化创建一个用于向网络传输数据的对象
+ * 使用HttpPost类
+ * 返回一个httpPost实例化对象，但里面还没有内容
+ */
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private HttpPost createHttpPost() {
HttpPost httpPost = new HttpPost(mPostUrl);
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
@@ -291,24 +406,44 @@ public class GTaskClient {
return httpPost;
}
+<<<<<<< HEAD
+ /*通过URL获取响应后返回的数据，也就是网络上的数据和资源
+ * 使用getContentEncoding()获取网络上的资源和数据
+ * 返回值就是获取到的资源
+ */
+ private String getResponseContent(HttpEntity entity) throws IOException {
+ String contentEncoding = null;
+ if (entity.getContentEncoding() != null) {//通过URL得到HttpEntity对象，如果不为空则使用getContent（）方法创建一个流将数据从网络都过来
+=======
private String getResponseContent(HttpEntity entity) throws IOException {
String contentEncoding = null;
if (entity.getContentEncoding() != null) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
contentEncoding = entity.getContentEncoding().getValue();
Log.d(TAG, "encoding: " + contentEncoding);
}
InputStream input = entity.getContent();
+<<<<<<< HEAD
+ if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {//GZIP是使用DEFLATE进行压缩数据的另一个压缩库
+ input = new GZIPInputStream(entity.getContent());
+ } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {//DEFLATE是一个无专利的压缩算法，它可以实现无损数据压缩
+=======
if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
input = new GZIPInputStream(entity.getContent());
} else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Inflater inflater = new Inflater(true);
input = new InflaterInputStream(entity.getContent(), inflater);
}
try {
InputStreamReader isr = new InputStreamReader(input);
+<<<<<<< HEAD
+ BufferedReader br = new BufferedReader(isr);//是一个包装类，它可以包装字符流，将字符流放入缓存里，先把字符读到缓存里，到缓存满了时候，再读入内存，是为了提供读的效率而设计的
+=======
BufferedReader br = new BufferedReader(isr);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
StringBuilder sb = new StringBuilder();
while (true) {
@@ -323,20 +458,43 @@ public class GTaskClient {
}
}
+<<<<<<< HEAD
+ /*通过JSON发送请求
+ * 请求的具体内容在json的实例化对象js中然后传入
+ * 利用UrlEncodedFormEntity entity和httpPost.setEntity(entity)方法把js中的内容放置到httpPost中
+ * 执行请求后使用getResponseContent方法得到返回的数据和资源
+ * 将资源再次放入json后返回
+ */
+ private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
+ if (!mLoggedin) {//未登录
+=======
private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
if (!mLoggedin) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.e(TAG, "please login first");
throw new ActionFailureException("not logged in");
}
+<<<<<<< HEAD
+ //实例化一个httpPost的对象用来向服务器传输数据，在这里就是发送请求，而请求的内容在js里
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
HttpPost httpPost = createHttpPost();
try {
LinkedList list = new LinkedList();
list.add(new BasicNameValuePair("r", js.toString()));
+<<<<<<< HEAD
+ UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8"); //UrlEncodedFormEntity()的形式比较单一，是普通的键值对
+ httpPost.setEntity(entity);
+
+ // execute the post
+ //执行这个请求
+=======
UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8");
httpPost.setEntity(entity);
// execute the post
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
HttpResponse response = mHttpClient.execute(httpPost);
String jsString = getResponseContent(response.getEntity());
return new JSONObject(jsString);
@@ -360,6 +518,15 @@ public class GTaskClient {
}
}
+<<<<<<< HEAD
+ /*创建单个任务
+ * 传入参数是一个.gtask.data.Task包里Task类的对象
+ * 利用json获取Task里的内容,并且创建相应的jsPost
+ * 利用postRequest得到任务的返回信息
+ * 使用task.setGid设置task的new_ID
+ */
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void createTask(Task task) throws NetworkFailureException {
commitUpdate();
try {
@@ -386,6 +553,12 @@ public class GTaskClient {
}
}
+<<<<<<< HEAD
+ /*
+ * 创建一个任务列表，与createTask几乎一样，区别就是最后设置的是tasklist的gid
+ */
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void createTaskList(TaskList tasklist) throws NetworkFailureException {
commitUpdate();
try {
@@ -412,6 +585,14 @@ public class GTaskClient {
}
}
+<<<<<<< HEAD
+ /*
+ * 同步更新操作
+ * 使用JSONObject进行数据存储，使用jsPost.put，Put的信息包括UpdateArray和ClientVersion
+ * 使用postRequest发送这个jspost,进行处理
+ */
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void commitUpdate() throws NetworkFailureException {
if (mUpdateArray != null) {
try {
@@ -433,6 +614,13 @@ public class GTaskClient {
}
}
+<<<<<<< HEAD
+ /*
+ * 添加更新的事项
+ * 调用commitUpdate()实现
+ */
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void addUpdateNode(Node node) throws NetworkFailureException {
if (node != null) {
// too many update items may result in an error
@@ -447,6 +635,15 @@ public class GTaskClient {
}
}
+<<<<<<< HEAD
+ /*
+ * 移动task,比如讲task移动到不同的task列表中去
+ * 通过getGid获取task所属列表的gid
+ * 通过JSONObject.put(String name, Object value)函数设置移动后的task的相关属性值，从而达到移动的目的
+ * 最后还是通过postRequest进行更新后的发送
+ */
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void moveTask(Task task, TaskList preParent, TaskList curParent)
throws NetworkFailureException {
commitUpdate();
@@ -463,15 +660,27 @@ public class GTaskClient {
if (preParent == curParent && task.getPriorSibling() != null) {
// put prioring_sibing_id only if moving within the tasklist and
// it is not the first one
+<<<<<<< HEAD
+ //设置优先级ID，只有当移动是发生在文件中
+ action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling());
+ }
+ action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid()); //设置移动前所属列表
+ action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid()); //设置当前所属列表
+=======
action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling());
}
action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid());
action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid());
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (preParent != curParent) {
// put the dest_list only if moving between tasklists
action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid());
}
actionList.put(action);
+<<<<<<< HEAD
+ //最后将ACTION_LIST加入到jsPost中
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
// client_version
@@ -486,6 +695,14 @@ public class GTaskClient {
}
}
+<<<<<<< HEAD
+ /*
+ * 删除操作节点
+ * 还是利用JSON
+ * 删除过后使用postRequest发送删除后的结果
+ */
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void deleteNode(Node node) throws NetworkFailureException {
commitUpdate();
try {
@@ -494,7 +711,11 @@ public class GTaskClient {
// action_list
node.setDeleted(true);
+<<<<<<< HEAD
+ actionList.put(node.getUpdateAction(getActionId())); //这里会获取到删除操作的ID，加入到actionLiast中
+=======
actionList.put(node.getUpdateAction(getActionId()));
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
// client_version
@@ -509,6 +730,14 @@ public class GTaskClient {
}
}
+<<<<<<< HEAD
+ /*
+ * 获取任务列表
+ * 首先通过GetURI使用getResponseContent从网上获取数据
+ * 然后筛选出"_setup("到)}的部分，并且从中获取GTASK_JSON_LISTS的内容返回
+ */
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public JSONArray getTaskLists() throws NetworkFailureException {
if (!mLoggedin) {
Log.e(TAG, "please login first");
@@ -521,6 +750,10 @@ public class GTaskClient {
response = mHttpClient.execute(httpGet);
// get the task list
+<<<<<<< HEAD
+ //筛选工作，把筛选出的字符串放入jsString
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}";
@@ -531,6 +764,10 @@ public class GTaskClient {
jsString = resString.substring(begin + jsBegin.length(), end);
}
JSONObject js = new JSONObject(jsString);
+<<<<<<< HEAD
+ //获取GTASK_JSON_LISTS
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS);
} catch (ClientProtocolException e) {
Log.e(TAG, e.toString());
@@ -547,6 +784,12 @@ public class GTaskClient {
}
}
+<<<<<<< HEAD
+ /*
+ * 通过传入的TASKList的gid,从网络上获取相应属于这个任务列表的任务
+ */
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public JSONArray getTaskList(String listGid) throws NetworkFailureException {
commitUpdate();
try {
@@ -558,7 +801,11 @@ public class GTaskClient {
action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL);
action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
+<<<<<<< HEAD
+ action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid); //这里设置为传入的listGid
+=======
action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false);
actionList.put(action);
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
@@ -579,7 +826,15 @@ public class GTaskClient {
return mAccount;
}
+<<<<<<< HEAD
+ //重置更新的内容
+ public void resetUpdateArray() {
+ mUpdateArray = null;
+ }
+}
+=======
public void resetUpdateArray() {
mUpdateArray = null;
}
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/src/src/net/micode/notes/gtask/remote/GTaskManager.java b/src/src/net/micode/notes/gtask/remote/GTaskManager.java
index d2b4082..053cdfa 100644
--- a/src/src/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/src/src/net/micode/notes/gtask/remote/GTaskManager.java
@@ -87,25 +87,54 @@ public class GTaskManager {
private HashMap mNidToGid;
+<<<<<<< HEAD
+ private GTaskManager() { //对象初始化函数
+ mSyncing = false; //正在同步,flase代表未执行
+ mCancelled = false; //全局标识，flase代表可以执行
+ mGTaskListHashMap = new HashMap(); //<>代表Java的泛型,就是创建一个用类型作为参数的类。
+=======
private GTaskManager() {
mSyncing = false;
mCancelled = false;
mGTaskListHashMap = new HashMap();
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
mGTaskHashMap = new HashMap();
mMetaHashMap = new HashMap();
mMetaList = null;
mLocalDeleteIdMap = new HashSet();
+<<<<<<< HEAD
+ mGidToNid = new HashMap(); //GoogleID to NodeID
+ mNidToGid = new HashMap(); //NodeID to GoogleID通过hashmap散列表建立映射
+ }
+
+ //包含关键字synchronized，语言级同步，指明该函数可能运行在多线程的环境下。
+ public static synchronized GTaskManager getInstance() { //可能运行在多线程环境下，使用语言级同步--synchronized
+=======
mGidToNid = new HashMap();
mNidToGid = new HashMap();
}
public static synchronized GTaskManager getInstance() {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (mInstance == null) {
mInstance = new GTaskManager();
}
return mInstance;
}
+<<<<<<< HEAD
+ //包含关键字synchronized，语言级同步，指明该函数可能运行在多线程的环境下。
+
+ public synchronized void setActivityContext(Activity activity) {
+ // used for getting auth token
+ mActivity = activity;
+ }
+
+ //实现了本地同步操作和远端同步操作
+ public int sync(Context context, GTaskASyncTask asyncTask) { //核心函数
+ if (mSyncing) {
+ Log.d(TAG, "Sync is in progress"); //创建日志文件（调试信息），debug
+=======
public synchronized void setActivityContext(Activity activity) {
// used for getting authtoken
mActivity = activity;
@@ -114,6 +143,7 @@ public class GTaskManager {
public int sync(Context context, GTaskASyncTask asyncTask) {
if (mSyncing) {
Log.d(TAG, "Sync is in progress");
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
return STATE_SYNC_IN_PROGRESS;
}
mContext = context;
@@ -128,8 +158,13 @@ public class GTaskManager {
mNidToGid.clear();
try {
+<<<<<<< HEAD
+ GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例,client--客户机
+ client.resetUpdateArray(); //JSONArray类型，reset即置为NULL
+=======
GTaskClient client = GTaskClient.getInstance();
client.resetUpdateArray();
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
// login google task
if (!mCancelled) {
@@ -140,15 +175,26 @@ public class GTaskManager {
// get the task list from google
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
+<<<<<<< HEAD
+ initGTaskList(); //获取Google上的JSONtasklist转为本地TaskList
+=======
initGTaskList();
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
// do content sync work
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
syncContent();
+<<<<<<< HEAD
+ } catch (NetworkFailureException e) { //分为两种异常，此类异常为网络异常
+ Log.e(TAG, e.toString()); //创建日志文件（调试信息），error
+ return STATE_NETWORK_ERROR;
+ } catch (ActionFailureException e) { //此类异常为操作异常
+=======
} catch (NetworkFailureException e) {
Log.e(TAG, e.toString());
return STATE_NETWORK_ERROR;
} catch (ActionFailureException e) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Log.e(TAG, e.toString());
return STATE_INTERNAL_ERROR;
} catch (Exception e) {
@@ -168,6 +214,37 @@ public class GTaskManager {
return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
}
+<<<<<<< HEAD
+ //初始化GtaskList，获取Google上的JSONtasklist转为本地TaskList。
+ private void initGTaskList() throws NetworkFailureException {
+ if (mCancelled)
+ return;
+ GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例，client应指远端客户机
+ try {
+ //Json对象是Name Value对(即子元素)的无序集合，相当于一个Map对象。JsonObject类是bantouyan-json库对Json对象的抽象，提供操纵Json对象的各种方法。
+ //其格式为{"key1":value1,"key2",value2....};key 必须是字符串。
+ //因为ajax请求不刷新页面，但配合js可以实现局部刷新，因此json常常被用来作为异步请求的返回对象使用。
+ JSONArray jsTaskLists = client.getTaskLists(); //原注释为get task list------lists？？？
+
+ // init meta list first
+ mMetaList = null; //TaskList类型
+ for (int i = 0; i < jsTaskLists.length(); i++) {
+ JSONObject object = jsTaskLists.getJSONObject(i); //JSONObject与JSONArray一个为对象，一个为数组。此处取出单个JASONObject
+ String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
+ String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
+
+ if (name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
+ mMetaList = new TaskList(); //MetaList意为元表,Tasklist类型，此处为初始化
+ mMetaList.setContentByRemoteJSON(object); //将JSON中部分数据复制到自己定义的对象中相对应的数据：name->mname...
+
+ // load meta data
+ JSONArray jsMetas = client.getTaskList(gid); //原注释为get action_list------list？？？
+ for (int j = 0; j < jsMetas.length(); j++) {
+ object = (JSONObject) jsMetas.getJSONObject(j);
+ MetaData metaData = new MetaData(); //继承自Node
+ metaData.setContentByRemoteJSON(object);
+ if (metaData.isWorthSaving()) { //if not worth to save，metadata将不加入mMetaList
+=======
private void initGTaskList() throws NetworkFailureException {
if (mCancelled)
return;
@@ -194,6 +271,7 @@ public class GTaskManager {
MetaData metaData = new MetaData();
metaData.setContentByRemoteJSON(object);
if (metaData.isWorthSaving()) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
mMetaList.addChildTask(metaData);
if (metaData.getGid() != null) {
mMetaHashMap.put(metaData.getRelatedGid(), metaData);
@@ -214,13 +292,22 @@ public class GTaskManager {
// init task list
for (int i = 0; i < jsTaskLists.length(); i++) {
JSONObject object = jsTaskLists.getJSONObject(i);
+<<<<<<< HEAD
+ String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); //通过getString函数传入本地某个标志数据的名称，获取其在远端的名称。
+=======
String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME);
if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)
&& !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX
+<<<<<<< HEAD
+ + GTaskStringUtils.FOLDER_META)) {
+ TaskList tasklist = new TaskList(); //继承自Node
+=======
+ GTaskStringUtils.FOLDER_META)) {
TaskList tasklist = new TaskList();
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
tasklist.setContentByRemoteJSON(object);
mGTaskListHashMap.put(gid, tasklist);
mGTaskHashMap.put(gid, tasklist);
@@ -247,6 +334,16 @@ public class GTaskManager {
}
}
+<<<<<<< HEAD
+ //本地内容同步操作
+ private void syncContent() throws NetworkFailureException { //本地内容同步操作
+ int syncType;
+ Cursor c = null; //数据库指针
+ String gid; //GoogleID
+ Node node; //Node包含Sync_Action的不同类型
+
+ mLocalDeleteIdMap.clear(); //HashSet类型
+=======
private void syncContent() throws NetworkFailureException {
int syncType;
Cursor c = null;
@@ -254,6 +351,7 @@ public class GTaskManager {
Node node;
mLocalDeleteIdMap.clear();
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (mCancelled) {
return;
@@ -301,8 +399,13 @@ public class GTaskManager {
node = mGTaskHashMap.get(gid);
if (node != null) {
mGTaskHashMap.remove(gid);
+<<<<<<< HEAD
+ mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); //通过hashmap建立联系
+ mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); //通过hashmap建立联系
+=======
mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN));
mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
syncType = node.getSyncAction(c);
} else {
if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
@@ -327,14 +430,22 @@ public class GTaskManager {
}
// go through remaining items
+<<<<<<< HEAD
+ Iterator> iter = mGTaskHashMap.entrySet().iterator(); //Iterator迭代器
+=======
Iterator> iter = mGTaskHashMap.entrySet().iterator();
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
while (iter.hasNext()) {
Map.Entry entry = iter.next();
node = entry.getValue();
doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
}
+<<<<<<< HEAD
+ // mCancelled can be set by another thread, so we neet to check one by //thread----线程
+=======
// mCancelled can be set by another thread, so we neet to check one by
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
// one
// clear local delete table
if (!mCancelled) {
@@ -351,6 +462,10 @@ public class GTaskManager {
}
+<<<<<<< HEAD
+
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private void syncFolder() throws NetworkFailureException {
Cursor c = null;
String gid;
@@ -394,7 +509,11 @@ public class GTaskManager {
try {
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)",
new String[] {
+<<<<<<< HEAD
+ String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
+=======
String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
}, null);
if (c != null) {
if (c.moveToNext()) {
@@ -476,6 +595,11 @@ public class GTaskManager {
GTaskClient.getInstance().commitUpdate();
}
+<<<<<<< HEAD
+ //功能：syncType分类，addLocalNode，addRemoteNode，deleteNode，updateLocalNode，updateRemoteNode
+
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -522,6 +646,10 @@ public class GTaskManager {
}
}
+<<<<<<< HEAD
+ //本地增加Node
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private void addLocalNode(Node node) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -596,6 +724,10 @@ public class GTaskManager {
updateRemoteMeta(node.getGid(), sqlNote);
}
+<<<<<<< HEAD
+ //功能：update本地node
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -619,12 +751,21 @@ public class GTaskManager {
updateRemoteMeta(node.getGid(), sqlNote);
}
+<<<<<<< HEAD
+ //功能：远程增加Node
+ //同步操作的基础数据类型
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
}
+<<<<<<< HEAD
+ SqlNote sqlNote = new SqlNote(mContext, c); //从本地mContext中获取内容
+=======
SqlNote sqlNote = new SqlNote(mContext, c);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Node n;
// update remotely
@@ -634,11 +775,20 @@ public class GTaskManager {
String parentGid = mNidToGid.get(sqlNote.getParentId());
if (parentGid == null) {
+<<<<<<< HEAD
+ Log.e(TAG, "cannot find task's parent tasklist"); //调试信息
+ throw new ActionFailureException("cannot add remote task");
+ }
+ mGTaskListHashMap.get(parentGid).addChildTask(task); //在本地生成的GTaskList中增加子结点
+
+ //登录远程服务器，创建Task
+=======
Log.e(TAG, "cannot find task's parent tasklist");
throw new ActionFailureException("cannot add remote task");
}
mGTaskListHashMap.get(parentGid).addChildTask(task);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
GTaskClient.getInstance().createTask(task);
n = (Node) task;
@@ -656,6 +806,10 @@ public class GTaskManager {
else
folderName += sqlNote.getSnippet();
+<<<<<<< HEAD
+ //iterator迭代器，通过统一的接口迭代所有的map元素
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Iterator> iter = mGTaskListHashMap.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry entry = iter.next();
@@ -687,11 +841,21 @@ public class GTaskManager {
sqlNote.resetLocalModified();
sqlNote.commit(true);
+<<<<<<< HEAD
+ // gid-id mapping //创建id间的映射
+=======
// gid-id mapping
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
mGidToNid.put(n.getGid(), sqlNote.getId());
mNidToGid.put(sqlNote.getId(), n.getGid());
}
+<<<<<<< HEAD
+ //更新远端的Node，包含meta更新(updateRemoteMeta)
+
+ //同步操作的基础数据类型
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -701,7 +865,11 @@ public class GTaskManager {
// update remotely
node.setContentByLocalJSON(sqlNote.getContent());
+<<<<<<< HEAD
+ GTaskClient.getInstance().addUpdateNode(node); //GTaskClient用途为从本地登陆远端服务器
+=======
GTaskClient.getInstance().addUpdateNode(node);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
// update meta
updateRemoteMeta(node.getGid(), sqlNote);
@@ -710,13 +878,25 @@ public class GTaskManager {
if (sqlNote.isNoteType()) {
Task task = (Task) node;
TaskList preParentList = task.getParent();
+<<<<<<< HEAD
+ //preParentList为通过node获取的父节点列表
String curParentGid = mNidToGid.get(sqlNote.getParentId());
+ //curParentGid为通过光标在数据库中找到sqlNote的mParentId，再通过mNidToGid由long类型转为String类型的Gid
+
+=======
+
+ String curParentGid = mNidToGid.get(sqlNote.getParentId());
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (curParentGid == null) {
Log.e(TAG, "cannot find task's parent tasklist");
throw new ActionFailureException("cannot update remote task");
}
TaskList curParentList = mGTaskListHashMap.get(curParentGid);
+<<<<<<< HEAD
+ //通过HashMap找到对应Gid的TaskList
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (preParentList != curParentList) {
preParentList.removeChildTask(task);
@@ -727,9 +907,18 @@ public class GTaskManager {
// clear local modified flag
sqlNote.resetLocalModified();
+<<<<<<< HEAD
+ //commit到本地数据库
+ sqlNote.commit(true);
+ }
+
+ //升级远程meta。 meta---元数据----计算机文件系统管理数据---管理数据的数据。
+ //同步前的数据库操作，故使用类SqlNote
+=======
sqlNote.commit(true);
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException {
if (sqlNote != null && sqlNote.isNoteType()) {
MetaData metaData = mMetaHashMap.get(gid);
@@ -746,12 +935,21 @@ public class GTaskManager {
}
}
+<<<<<<< HEAD
+ //功能：刷新本地，给sync的ID对应上最后更改过的对象
+
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private void refreshLocalSyncId() throws NetworkFailureException {
if (mCancelled) {
return;
}
+<<<<<<< HEAD
+ // get the latest gtask list //获取最近的（最晚的）gtask list
+=======
// get the latest gtask list
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
mGTaskHashMap.clear();
mGTaskListHashMap.clear();
mMetaHashMap.clear();
@@ -762,16 +960,26 @@ public class GTaskManager {
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE,
"(type<>? AND parent_id<>?)", new String[] {
String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
+<<<<<<< HEAD
+ }, NoteColumns.TYPE + " DESC"); //query语句：五个参数，NoteColumns.TYPE + " DESC"-----为按类型递减顺序返回查询结果。new String[] {String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)}------为选择参数。"(type<>? AND parent_id<>?)"-------指明返回行过滤器。SqlNote.PROJECTION_NOTE--------应返回的数据列的名字。Notes.CONTENT_NOTE_URI--------contentProvider包含所有数据集所对应的uri
+=======
}, NoteColumns.TYPE + " DESC");
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
if (c != null) {
while (c.moveToNext()) {
String gid = c.getString(SqlNote.GTASK_ID_COLUMN);
Node node = mGTaskHashMap.get(gid);
if (node != null) {
mGTaskHashMap.remove(gid);
+<<<<<<< HEAD
+ ContentValues values = new ContentValues(); //在ContentValues中创建键值对。准备通过contentResolver写入数据
+ values.put(NoteColumns.SYNC_ID, node.getLastModified());
+ mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, //进行批量更改，选择参数为NULL，应该可以用insert替换，参数分别为表名和需要更新的value对象。
+=======
ContentValues values = new ContentValues();
values.put(NoteColumns.SYNC_ID, node.getLastModified());
mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
c.getLong(SqlNote.ID_COLUMN)), values, null, null);
} else {
Log.e(TAG, "something is missed");
@@ -790,10 +998,20 @@ public class GTaskManager {
}
}
+<<<<<<< HEAD
+ //功能：获取同步账号,mAccount.name
+
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public String getSyncAccount() {
return GTaskClient.getInstance().getSyncAccount().name;
}
+<<<<<<< HEAD
+ //功能：取消同步，置mCancelled为true
+
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public void cancelSync() {
mCancelled = true;
}
diff --git a/src/src/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/src/net/micode/notes/gtask/remote/GTaskSyncService.java
index cca36f7..e01b563 100644
--- a/src/src/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ b/src/src/net/micode/notes/gtask/remote/GTaskSyncService.java
@@ -16,12 +16,30 @@
package net.micode.notes.gtask.remote;
+<<<<<<< HEAD
+/*
+ * Service是在一段不定的时间运行在后台，不和用户交互的应用组件
+ * 主要方法：
+ * private void startSync() 启动一个同步工作
+ * private void cancelSync() 取消同步
+ * public void onCreate()
+ * public int onStartCommand(Intent intent, int flags, int startId) service生命周期的组成部分，相当于重启service（比如在被暂停之后），而不是创建一个新的service
+ * public void onLowMemory() 在没有内存的情况下如果存在service则结束掉这的service
+ * public IBinder onBind()
+ * public void sendBroadcast(String msg) 发送同步的相关通知
+ * public static void startSync(Activity activity)
+ * public static void cancelSync(Context context)
+ * public static boolean isSyncing() 判读是否在进行同步
+ * public static String getProgressString() 获取当前进度的信息
+ */
+=======
import android.app.Activity;
import android.app.Service;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.IBinder;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public class GTaskSyncService extends Service {
public final static String ACTION_STRING_NAME = "sync_action_type";
@@ -42,6 +60,10 @@ public class GTaskSyncService extends Service {
private static String mSyncProgress = "";
+<<<<<<< HEAD
+ //开始一个同步的工作
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private void startSync() {
if (mSyncTask == null) {
mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
@@ -52,10 +74,18 @@ public class GTaskSyncService extends Service {
}
});
sendBroadcast("");
+<<<<<<< HEAD
+ mSyncTask.execute(); //这个函数让任务是以单线程队列方式或线程池队列方式运行
+ }
+ }
+
+
+=======
mSyncTask.execute();
}
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
private void cancelSync() {
if (mSyncTask != null) {
mSyncTask.cancelSync();
@@ -63,7 +93,11 @@ public class GTaskSyncService extends Service {
}
@Override
+<<<<<<< HEAD
+ public void onCreate() { //初始化一个service
+=======
public void onCreate() {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
mSyncTask = null;
}
@@ -72,6 +106,10 @@ public class GTaskSyncService extends Service {
Bundle bundle = intent.getExtras();
if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) {
switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) {
+<<<<<<< HEAD
+ //两种情况，开始同步或者取消同步
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
case ACTION_START_SYNC:
startSync();
break;
@@ -81,7 +119,11 @@ public class GTaskSyncService extends Service {
default:
break;
}
+<<<<<<< HEAD
+ return START_STICKY; //等待新的intent来是这个service继续运行
+=======
return START_STICKY;
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
}
return super.onStartCommand(intent, flags, startId);
}
@@ -99,6 +141,15 @@ public class GTaskSyncService extends Service {
public void sendBroadcast(String msg) {
mSyncProgress = msg;
+<<<<<<< HEAD
+ Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME); //创建一个新的Intent
+ intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null); //附加INTENT中的相应参数的值
+ intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg);
+ sendBroadcast(intent); //发送这个通知
+ }
+
+ public static void startSync(Activity activity) {//执行一个service，service的内容里的同步动作就是开始同步
+=======
Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME);
intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null);
intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg);
@@ -106,13 +157,18 @@ public class GTaskSyncService extends Service {
}
public static void startSync(Activity activity) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
GTaskManager.getInstance().setActivityContext(activity);
Intent intent = new Intent(activity, GTaskSyncService.class);
intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC);
activity.startService(intent);
}
+<<<<<<< HEAD
+ public static void cancelSync(Context context) {//执行一个service，service的内容里的同步动作就是取消同步
+=======
public static void cancelSync(Context context) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
Intent intent = new Intent(context, GTaskSyncService.class);
intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC);
context.startService(intent);
@@ -125,4 +181,8 @@ public class GTaskSyncService extends Service {
public static String getProgressString() {
return mSyncProgress;
}
+<<<<<<< HEAD
+}
+=======
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/src/src/net/micode/notes/widget/NoteWidgetProvider.java b/src/src/net/micode/notes/widget/NoteWidgetProvider.java
index ec6f819..7214dde 100644
--- a/src/src/net/micode/notes/widget/NoteWidgetProvider.java
+++ b/src/src/net/micode/notes/widget/NoteWidgetProvider.java
@@ -32,6 +32,18 @@ import net.micode.notes.tool.ResourceParser;
import net.micode.notes.ui.NoteEditActivity;
import net.micode.notes.ui.NotesListActivity;
+<<<<<<< HEAD
+// 定义一个抽象类 NoteWidgetProvider，继承自 AppWidgetProvider
+public abstract class NoteWidgetProvider extends AppWidgetProvider {
+ // 定义查询投影，即需要从数据库中查询的字段
+ public static final String [] PROJECTION = new String [] {
+ NoteColumns.ID,
+ NoteColumns.BG_COLOR_ID,
+ NoteColumns.SNIPPET
+ };
+
+ // 定义投影中各字段在数组中的位置
+=======
public abstract class NoteWidgetProvider extends AppWidgetProvider {
public static final String [] PROJECTION = new String [] {
NoteColumns.ID,
@@ -39,10 +51,26 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
NoteColumns.SNIPPET
};
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
public static final int COLUMN_ID = 0;
public static final int COLUMN_BG_COLOR_ID = 1;
public static final int COLUMN_SNIPPET = 2;
+<<<<<<< HEAD
+ // 定义标签常量 TAG，用于日志输出
+ private static final String TAG = "NoteWidgetProvider";
+
+ // 重写 AppWidgetProvider 中的 onDeleted 方法
+ @Override
+ public void onDeleted(Context context, int[] appWidgetIds) {
+ // 创建 ContentValues 对象，用于更新数据库中的记录
+ ContentValues values = new ContentValues();
+ // 将 Widget Id 设置为无效的 AppWidgetId
+ values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+ // 遍历传入的 appWidgetIds 数组
+ for (int i = 0; i < appWidgetIds.length; i++) {
+ // 更新数据库中的记录，将 Widget Id 设置为无效
+=======
private static final String TAG = "NoteWidgetProvider";
@Override
@@ -50,6 +78,7 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
ContentValues values = new ContentValues();
values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
for (int i = 0; i < appWidgetIds.length; i++) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
context.getContentResolver().update(Notes.CONTENT_NOTE_URI,
values,
NoteColumns.WIDGET_ID + "=?",
@@ -57,19 +86,88 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
}
}
+<<<<<<< HEAD
+ // 定义私有方法，用于获取指定 WidgetId 对应的笔记部件信息的 Cursor 对象
+ private Cursor getNoteWidgetInfo(Context context, int widgetId) {
+ // 查询指定 WidgetId 对应的笔记部件信息
+ return context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
+ PROJECTION,
+ // 查询条件：WidgetId 等于传入的 widgetId，且父文件夹不是垃圾桶
+=======
private Cursor getNoteWidgetInfo(Context context, int widgetId) {
return context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
PROJECTION,
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?",
new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) },
null);
}
+<<<<<<< HEAD
+ // 定义受保护的方法，用于更新 App Widget 的显示
protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ // 调用下方的重载方法，传入默认参数 false
+=======
+ protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
update(context, appWidgetManager, appWidgetIds, false);
}
private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds,
+<<<<<<< HEAD
+ boolean privacyMode) {
+ for (int i = 0; i < appWidgetIds.length; i++) { // 遍历小部件ID数组
+ if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) { // 检查小部件ID是否有效
+ int bgId = ResourceParser.getDefaultBgId(context); // 获取默认背景ID
+ String snippet = ""; // 初始化snippet字符串
+
+ // 创建启动NoteEditActivity的Intent
+ Intent intent = new Intent(context, NoteEditActivity.class);
+ intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); // 设置Intent标志
+ intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]); // 将小部件ID添加到Intent中
+ intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType()); // 获取小部件类型并添加到Intent中
+
+ // 获取NoteWidgetInfo的游标
+ Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]);
+ if (c != null && c.moveToFirst()) { // 检查游标不为空且移动到第一行
+ if (c.getCount() > 1) { // 检查游标中数据大于1
+ Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]); // 记录错误信息到日志中
+ c.close(); // 关闭游标
+ return; // 退出方法
+ }
+ snippet = c.getString(COLUMN_SNIPPET); // 从游标中获取snippet
+ bgId = c.getInt(COLUMN_BG_COLOR_ID); // 从游标中获取背景ID
+ intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID)); // 将ID添加到Intent中
+ intent.setAction(Intent.ACTION_VIEW); // 设置Intent动作为查看
+ } else {
+ snippet = context.getResources().getString(R.string.widget_havenot_content); // 获取资源文件中的字符串作为snippet
+ intent.setAction(Intent.ACTION_INSERT_OR_EDIT); // 设置Intent动作为插入或编辑
+ }
+
+ if (c != null) { // 如果游标不为空
+ c.close(); // 关闭游标
+ }
+
+ RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId()); // 创建RemoteViews对象
+ rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId)); // 设置RemoteViews中的背景图片
+ intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId); // 将背景ID添加到Intent中
+
+ /**
+ * 生成启动小部件宿主的待定Intent
+ */
+ PendingIntent pendingIntent = null; // 初始化待定Intent变量
+ // 检查是否处于隐私模式
+ if (privacyMode) {
+ // 如果是隐私模式，则设置小部件文本为指定的文本
+ rv.setTextViewText(R.id.widget_text, context.getString(R.string.widget_under_visit_mode));
+ // 创建一个用于启动 NotesListActivity 的 PendingIntent
+ pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent(
+ context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
+ } else {
+ // 如果不是隐私模式，则设置小部件文本为指定的 snippet（摘要）
+ rv.setTextViewText(R.id.widget_text, snippet);
+ // 创建一个用于启动指定 intent 的 PendingIntent
+=======
boolean privacyMode) {
for (int i = 0; i < appWidgetIds.length; i++) {
if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) {
@@ -114,12 +212,21 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider {
context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
} else {
rv.setTextViewText(R.id.widget_text, snippet);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent,
PendingIntent.FLAG_UPDATE_CURRENT);
}
+<<<<<<< HEAD
+// 为小部件文本视图设置点击事件的 PendingIntent
+ rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent);
+// 更新小部件
+ appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
+
+=======
rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent);
appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
}
}
}
diff --git a/src/src/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
index d1d3cc2..d5be044 100644
--- a/src/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
+++ b/src/src/net/micode/notes/widget/NoteWidgetProvider_2x.java
@@ -14,6 +14,33 @@
* limitations under the License.
*/
+<<<<<<< HEAD
+// 包声明，指定代码所在的包
+package net.micode.notes.widget;
+
+// 导入相关的 Android 类和自定义工具类
+import android.appwidget.AppWidgetManager;
+import android.content.Context;
+
+import net.micode.notes.R; // 导入 R 类，用于访问资源
+import net.micode.notes.data.Notes; // 导入自定义的 Notes 类
+import net.micode.notes.tool.ResourceParser; // 导入自定义的 ResourceParser 工具类
+
+// NoteWidgetProvider_2x 类继承自 NoteWidgetProvider 类
+public class NoteWidgetProvider_2x extends NoteWidgetProvider {
+
+ // 定义一个私有变量 a，赋值为 1（注意：代码中应该为 private int a = 1;）
+ private a = 1
+
+ // 重写 onUpdate 方法，处理小部件的更新逻辑
+ @Override
+ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ // 调用父类的 update 方法来处理更新逻辑
+ super.update(context, appWidgetManager, appWidgetIds);
+ }
+
+ // 实现抽象方法 getLayoutId，返回当前小部件的布局资源 ID
+=======
package net.micode.notes.widget;
import android.appwidget.AppWidgetManager;
@@ -31,18 +58,31 @@ public class NoteWidgetProvider_2x extends NoteWidgetProvider {
super.update(context, appWidgetManager, appWidgetIds);
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
@Override
protected int getLayoutId() {
return R.layout.widget_2x;
}
+<<<<<<< HEAD
+ // 实现抽象方法 getBgResourceId，根据传入的背景 ID 返回相应的资源 ID
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
@Override
protected int getBgResourceId(int bgId) {
return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId);
}
+<<<<<<< HEAD
+ // 实现抽象方法 getWidgetType，返回小部件的类型
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
@Override
protected int getWidgetType() {
return Notes.TYPE_WIDGET_2X;
}
}
+<<<<<<< HEAD
+
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
diff --git a/src/src/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
index c12a02e..4f9923f 100644
--- a/src/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
+++ b/src/src/net/micode/notes/widget/NoteWidgetProvider_4x.java
@@ -14,6 +14,30 @@
* limitations under the License.
*/
+<<<<<<< HEAD
+// 包声明，指定代码所在的包
+package net.micode.notes.widget;
+
+// 导入相关的 Android 类和自定义工具类
+import android.appwidget.AppWidgetManager;
+import android.content.Context;
+
+import net.micode.notes.R; // 导入 R 类，用于访问资源
+import net.micode.notes.data.Notes; // 导入自定义的 Notes 类
+import net.micode.notes.tool.ResourceParser; // 导入自定义的 ResourceParser 工具类
+
+// NoteWidgetProvider_4x 类继承自 NoteWidgetProvider 类
+public class NoteWidgetProvider_4x extends NoteWidgetProvider {
+
+ // 重写 onUpdate 方法，处理小部件的更新逻辑
+ @Override
+ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ // 调用父类的 update 方法来处理更新逻辑
+ super.update(context, appWidgetManager, appWidgetIds);
+ }
+
+ // 实现抽象方法 getLayoutId，返回当前小部件的布局资源 ID
+=======
package net.micode.notes.widget;
import android.appwidget.AppWidgetManager;
@@ -30,17 +54,30 @@ public class NoteWidgetProvider_4x extends NoteWidgetProvider {
super.update(context, appWidgetManager, appWidgetIds);
}
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
protected int getLayoutId() {
return R.layout.widget_4x;
}
+<<<<<<< HEAD
+ // 实现抽象方法 getBgResourceId，根据传入的背景 ID 返回相应的资源 ID
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
@Override
protected int getBgResourceId(int bgId) {
return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId);
}
+<<<<<<< HEAD
+ // 实现抽象方法 getWidgetType，返回小部件的类型
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4
@Override
protected int getWidgetType() {
return Notes.TYPE_WIDGET_4X;
}
}
+<<<<<<< HEAD
+
+=======
+>>>>>>> 348aa8d297582d7ae13cb99e56d6da68ba5862e4