();
}
- if(sContactCache.containsKey(phoneNumber)) { // 如果缓存中存在该电话号码
- return sContactCache.get(phoneNumber); // 直接返回缓存中的联系人名称
+ if(sContactCache.containsKey(phoneNumber)) {
+ return sContactCache.get(phoneNumber);
}
String selection = CALLER_ID_SELECTION.replace("+",
- PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); // 替换查询条件中的占位符
- Cursor cursor = context.getContentResolver().query( // 执行查询
+ PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
+ Cursor cursor = context.getContentResolver().query(
Data.CONTENT_URI,
- new String [] { Phone.DISPLAY_NAME }, // 查询返回的字段为联系人显示名称
- selection, // 查询条件
- new String[] { phoneNumber }, // 查询参数
- null); // 排序方式
+ new String [] { Phone.DISPLAY_NAME },
+ selection,
+ new String[] { phoneNumber },
+ null);
- if (cursor != null && cursor.moveToFirst()) { // 如果查询结果不为空且移动到第一条记录
+ 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; // 返回空
+ 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(); // 关闭游标
+ cursor.close();
}
} else {
- Log.d(TAG, "No contact matched with number:" + phoneNumber); // 记录未找到联系人的日志
- return null; // 返回空
+ Log.d(TAG, "No contact matched with number:" + phoneNumber);
+ return null;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notesmaster/app/src/main/java/net/micode/notes/data/Notes.java
index 811ced4..f800dab 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/data/Notes.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/data/Notes.java
@@ -1,105 +1,275 @@
+
/*
- * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ * 版权所有（c）2010-2011年，The MiCode开源社区（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
+ * 根据Apache许可证2.0版（“许可证”）获得许可；
+ * 除非符合许可证的规定，否则您不得使用此文件。
+ * 您可以在以下网址获取许可证副本：
*
* 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; // 导入Uri类
-
-public class Notes { // 定义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; // 系统类型常量
- 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; // 垃圾站
-
- 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"; // 背景颜色ID
- public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id"; // 小部件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"; // 文件夹ID
- public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date"; // 通话日期
-
- 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; // 通话记录
- }
+package net.micode.notes.data;
+import android.net.Uri;
- public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); // 定义查询所有笔记和文件夹的Uri
-
- public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); // 定义查询数据的Uri
-
- public interface NoteColumns { // 定义笔记接口
- public static final String ID = "_id"; // ID
- public static final String PARENT_ID = "parent_id"; // 父级ID
- public static final String CREATED_DATE = "created_date"; // 创建日期
- public static final String MODIFIED_DATE = "modified_date"; // 最后修改日期
- public static final String ALERTED_DATE = "alert_date"; // 提醒日期
- public static final String SNIPPET = "snippet"; // 文件夹名称或笔记内容
- public static final String WIDGET_ID = "widget_id"; // 小部件ID
- public static final String WIDGET_TYPE = "widget_type"; // 小部件类型列
- public static final String BG_COLOR_ID = "bg_color_id"; // 背景颜色ID
- public static final String HAS_ATTACHMENT = "has_attachment"; // 附件
- public static final String NOTES_COUNT = "notes_count"; // 文件夹中的笔记数量
- public static final String TYPE = "type"; // 文件类型：文件夹或笔记
- public static final String SYNC_ID = "sync_id"; // 最后同步ID
- public static final String LOCAL_MODIFIED = "local_modified"; // 本地修改标签
- public static final String ORIGIN_PARENT_ID = "origin_parent_id"; // 移动前ID
- public static final String GTASK_ID = "gtask_id"; // gtask ID
- public static final String VERSION = "version"; // 版本号
- }
+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;
- public interface DataColumns { // 数据接口
- public static final String ID = "_id"; // ID
- public static final String MIME_TYPE = "mime_type"; //MIME类型是一种标准，用于标识文档、文件或字节流的性质和格式。在数据库中，这个字段可以用来识别不同类型的数据，例如文本、图片、音频或视频等。
- public static final String NOTE_ID = "note_id"; // 归属note的ID
- public static final String CREATED_DATE = "created_date"; // 创建日期
- public static final String MODIFIED_DATE = "modified_date"; // 最后修改日期
- public static final String CONTENT = "content"; // 数据内容
-
- // 以下5个是通用数据列，它们的具体意义取决于MIME类型（由MIME_TYPE字段指定）。
- // 不同的MIME类型可能需要存储不同类型的数据，这5个字段提供了灵活性，允许根据MIME类型来存储相应的数据。
- public static final String DATA1 = "data1";
- public static final String DATA2 = "data2";
- public static final String DATA3 = "data3";
- public static final String DATA4 = "data4";
- public static final String DATA5 = "data5";
- }
+ /**
+ * 下面的ID是系统文件夹的标识符
+ * {@link Notes#ID_ROOT_FOLDER } 是默认文件夹
+ * {@link Notes#ID_TEMPARAY_FOLDER } 是不属于任何文件夹的便签
+ * {@link Notes#ID_CALL_RECORD_FOLDER} 用于存储通话记录
+ */
+ 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;
- public static final class TextNote implements DataColumns { // 定义文本笔记类
- 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"; // 定义了MIME类型，用于标识文本标签的目录
- public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; // 定义了MIME类型，用于标识文本标签的单个项
- public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); // 文本笔记的Uri
- }
+ 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";
+
+ 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 final class CallNote implements DataColumns { // 定义通话记录类
- public static final String CALL_DATE = DATA1; // 通话日期
- public static final String PHONE_NUMBER = DATA3; // 电话号码
- public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note"; // 定义了MIME类型，用于标识文本标签的目录
- public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; // 定义了MIME类型，用于标识文本标签的单个项
- public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); // 通话笔记的Uri，用于访问通话记录数据
+ public static class DataConstants {
+ public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
+ public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
}
-}
\ No newline at end of file
+
+ /**
+ * 用于查询所有便签和文件夹的Uri
+ */
+ public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
+
+ /**
+ * 用于查询数据的Uri
+ */
+ public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
+
+ public interface NoteColumns {
+ /**
+ * 行的唯一ID
+ * 类型：INTEGER（long）
+ */
+ public static final String ID = "_id";
+
+ /**
+ * 便签或文件夹的父ID
+ * 类型：INTEGER（long）
+ */
+ public static final String PARENT_ID = "parent_id";
+
+ /**
+ * 便签或文件夹的创建日期
+ * 类型：INTEGER（long）
+ */
+ public static final String CREATED_DATE = "created_date";
+
+ /**
+ * 最新修改日期
+ * 类型：INTEGER（long）
+ */
+ public static final String MODIFIED_DATE = "modified_date";
+
+
+ /**
+ * 提醒日期
+ * 类型：INTEGER（long）
+ */
+ public static final String ALERTED_DATE = "alert_date";
+
+ /**
+ * 文件夹的名称或便签的文本内容
+ * 类型：TEXT
+ */
+ public static final String SNIPPET = "snippet";
+
+ /**
+ * 便签的小部件ID
+ * 类型：INTEGER（long）
+ */
+ public static final String WIDGET_ID = "widget_id";
+
+ /**
+ * 便签的小部件类型
+ * 类型：INTEGER（long）
+ */
+ public static final String WIDGET_TYPE = "widget_type";
+
+ /**
+ * 便签的背景颜色ID
+ * 类型：INTEGER（long）
+ */
+ public static final String BG_COLOR_ID = "bg_color_id";
+
+ /**
+ * 对于文本便签，它没有附件，对于多媒体便签，它至少有一个附件
+ * 类型：INTEGER
+ */
+ public static final String HAS_ATTACHMENT = "has_attachment";
+
+ /**
+ * 文件夹中便签的计数
+ * 类型：INTEGER（long）
+ */
+ public static final String NOTES_COUNT = "notes_count";
+
+ /**
+ * 文件类型：文件夹或便签
+ * 类型：INTEGER
+ */
+ public static final String TYPE = "type";
+
+ /**
+ * 最后同步ID
+ * 类型：INTEGER（long）
+ */
+ public static final String SYNC_ID = "sync_id";
+
+ /**
+ * 表示是否本地修改的标志
+ * 类型：INTEGER
+ */
+ public static final String LOCAL_MODIFIED = "local_modified";
+
+ /**
+ * 移动到临时文件夹之前的原始父ID
+ * 类型：INTEGER
+ */
+ public static final String ORIGIN_PARENT_ID = "origin_parent_id";
+
+ /**
+ * GTask ID
+ * 类型：TEXT
+ */
+ public static final String GTASK_ID = "gtask_id";
+
+ /**
+ * 版本号
+ *
+ * 类型：INTEGER（long）
+ */
+public static final String VERSION = "version";
+ }
+
+public interface DataColumns {
+ /**
+ * 行的唯一ID
+ * 类型：INTEGER（long）
+ */
+ public static final String ID = "_id";
+
+ /**
+ * 此行表示的项的MIME类型。
+ * 类型：Text
+ */
+ public static final String MIME_TYPE = "mime_type";
+
+ /**
+ * 引用便签的ID，此数据属于该便签
+ * 类型：INTEGER（long）
+ */
+ public static final String NOTE_ID = "note_id";
+
+ /**
+ * 便签或文件夹的创建日期
+ * 类型：INTEGER（long）
+ */
+ public static final String CREATED_DATE = "created_date";
+
+ /**
+ * 最新修改日期
+ * 类型：INTEGER（long）
+ */
+ public static final String MODIFIED_DATE = "modified_date";
+
+ /**
+ * 数据的内容
+ * 类型：TEXT
+ */
+ public static final String CONTENT = "content";
+
+
+ /**
+ * 通用数据列，含义与{@link #MIMETYPE}特定，用于整数数据类型
+ * 类型：INTEGER
+ */
+ public static final String DATA1 = "data1";
+
+ /**
+ * 通用数据列，含义与{@link #MIMETYPE}特定，用于整数数据类型
+ * 类型：INTEGER
+ */
+ public static final String DATA2 = "data2";
+
+ /**
+ * 通用数据列，含义与{@link #MIMETYPE}特定，用于TEXT数据类型
+ * 类型：TEXT
+ */
+ public static final String DATA3 = "data3";
+
+ /**
+ * 通用数据列，含义与{@link #MIMETYPE}特定，用于TEXT数据类型
+ * 类型：TEXT
+ */
+ public static final String DATA4 = "data4";
+
+ /**
+ * 通用数据列，含义与{@link #MIMETYPE}特定，用于TEXT数据类型
+ * 类型：TEXT
+ */
+ public static final String DATA5 = "data5";
+}
+
+public static final class TextNote implements DataColumns {
+ /**
+ * 模式，指示文本是否处于检查列表模式
+ * 类型：Integer 1：检查列表模式 0：普通模式
+ */
+ public static final String MODE = DATA1;
+
+ public static final int MODE_CHECK_LIST = 1;
+
+ public static final String CONTENT_TYPE = "vnd.android.cursor.dir/text_note";
+
+ public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
+
+ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
+}
+
+public static final class CallNote implements DataColumns {
+ /**
+ * 此记录的通话日期
+ * 类型：INTEGER（long）
+ */
+ public static final String CALL_DATE = DATA1;
+
+ /**
+ * 此记录的电话号码
+ * 类型：TEXT
+ */
+ public static final String PHONE_NUMBER = DATA3;
+
+ public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";
+
+ public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
+
+ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
+}
+}
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
index 2aa76b9..5e40bde 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -16,72 +16,75 @@
package net.micode.notes.data;
-import android.content.ContentValues; // 导入内容值类
-import android.content.Context; // 导入上下文类
-import android.database.sqlite.SQLiteDatabase; // 导入SQLite数据库类
-import android.database.sqlite.SQLiteOpenHelper; // 导入SQLite数据库帮助类
-import android.util.Log; // 导入日志类
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
-import net.micode.notes.data.Notes.DataColumns; // 导入数据列
-import net.micode.notes.data.Notes.DataConstants; // 导入数据常量
-import net.micode.notes.data.Notes.NoteColumns; // 导入笔记列
+import net.micode.notes.data.Notes.DataColumns;
+import net.micode.notes.data.Notes.DataConstants;
+import net.micode.notes.data.Notes.NoteColumns;
-public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮助类
- private static final String DB_NAME = "note.db"; // 数据库名称
- private static final int DB_VERSION = 4; // 数据库版本
+public class NotesDatabaseHelper extends SQLiteOpenHelper {
+ private static final String DB_NAME = "note.db";
- public interface TABLE { // 表名
- public static final String NOTE = "note"; // 笔记
+ private static final int DB_VERSION = 4;
- public static final String DATA = "data"; // 数据
+ public interface TABLE {
+ public static final String NOTE = "note";
+
+ public static final String DATA = "data";
}
- private static final String TAG = "NotesDatabaseHelper"; // 日志标签
+ private static final String TAG = "NotesDatabaseHelper";
private static NotesDatabaseHelper mInstance;
- private static final String CREATE_NOTE_TABLE_SQL = // 创建笔记表的SQL语句
+ private static final String CREATE_NOTE_TABLE_SQL =
"CREATE TABLE " + TABLE.NOTE + "(" +
- NoteColumns.ID + " INTEGER PRIMARY KEY," + // 笔记ID
- NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + // 父级ID
- NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," + // 提醒日期
- NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," + // 背景颜色ID
- NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + // 创建日期
- NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," + // 附件
- NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + // 修改日期
- NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," + // 笔记数量
- NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," + // 笔记摘要
- NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," + // 笔记类型
- NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," + // 小部件ID
- NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," + // 小部件类型
- NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," + // 同步ID
- NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," + // 本地修改标记
- NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + // 原始父级ID
- NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + // GTASK ID
- NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + // 版本
+ NoteColumns.ID + " INTEGER PRIMARY KEY," +
+ NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
+ NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
+ NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
+ NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
")";
- private static final String CREATE_DATA_TABLE_SQL = // 创建数据表的SQL语句
+ private static final String CREATE_DATA_TABLE_SQL =
"CREATE TABLE " + TABLE.DATA + "(" +
- DataColumns.ID + " INTEGER PRIMARY KEY," + // 数据ID
- DataColumns.MIME_TYPE + " TEXT NOT NULL," + // MIME类型
- DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," + // 笔记ID
- NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + // 创建日期
- NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," + // 修改日期
- DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," + // 内容
- DataColumns.DATA1 + " INTEGER," + // 数据字段1
- DataColumns.DATA2 + " INTEGER," + // 数据字段2
- DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + // 数据字段3
- DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + // 数据字段4
- DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + // 数据字段5
+ 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 = // 创建数据表笔记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 + ");"; // 在数据表上创建索引
+ TABLE.DATA + "(" + DataColumns.NOTE_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 +
@@ -91,7 +94,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮
" WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
" END";
+<<<<<<< HEAD
// 从文件夹移动笔记时减少文件夹的笔记数量
+=======
+ /**
+ * 减少文件夹中的笔记数量，当将笔记从文件夹中移出时。
+ */
+>>>>>>> liming
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 +
@@ -102,7 +111,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮
" AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
" END";
+<<<<<<< HEAD
// 向文件夹插入新笔记时增加文件夹的笔记数量
+=======
+ /**
+ *当插入新笔记到文件夹时，增加文件夹的笔记计数
+ */
+>>>>>>> liming
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
"CREATE TRIGGER increase_folder_count_on_insert " +
" AFTER INSERT ON " + TABLE.NOTE +
@@ -112,18 +127,34 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮
" WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" +
" END";
+<<<<<<< HEAD
// 从文件夹删除笔记时减少文件夹的笔记数量
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
"CREATE TRIGGER decrease_folder_count_on_delete " +
" AFTER DELETE ON " + TABLE.NOTE +
" BEGIN" +
+=======
+ /**
+ *从文件夹中删除笔记时减少文件夹的笔记计数
+ */
+ private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
+ "CREATE TRIGGER decrease_folder_count_on_delete " +
+ " AFTER DELETE ON " + TABLE.NOTE +
+ " BEGIN " +
+>>>>>>> liming
" UPDATE " + TABLE.NOTE +
" SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" +
" WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
" AND " + NoteColumns.NOTES_COUNT + ">0;" +
" END";
+<<<<<<< HEAD
// 插入类型为{@link DataConstants#NOTE}的数据时更新笔记内容
+=======
+ /**
+ * 当插入类型为{@link DataConstants# note}的数据时，更新注释的内容
+ */
+>>>>>>> liming
private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
"CREATE TRIGGER update_note_content_on_insert " +
" AFTER INSERT ON " + TABLE.DATA +
@@ -134,7 +165,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮
" WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
" END";
+<<<<<<< HEAD
// 当类型为{@link DataConstants#NOTE}的数据发生变化时更新笔记内容
+=======
+ /**
+ * 当{@link DataConstants# note}类型的数据发生变化时，更新注释的内容
+ */
+>>>>>>> liming
private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER update_note_content_on_update " +
" AFTER UPDATE ON " + TABLE.DATA +
@@ -145,7 +182,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮
" WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" +
" END";
+<<<<<<< HEAD
// 当类型为{@link DataConstants#NOTE}的数据被删除时更新笔记内容
+=======
+ /**
+ * 当{@link DataConstants# note}类型的数据被删除时，更新注释的内容
+ */
+>>>>>>> liming
private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
"CREATE TRIGGER update_note_content_on_delete " +
" AFTER delete ON " + TABLE.DATA +
@@ -156,7 +199,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮
" WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" +
" END";
+<<<<<<< HEAD
// 删除已删除笔记所关联的数据
+=======
+ /**
+ * 删除的数据属于已删除的笔记
+ */
+>>>>>>> liming
private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
"CREATE TRIGGER delete_data_on_delete " +
" AFTER DELETE ON " + TABLE.NOTE +
@@ -165,7 +214,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮
" WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" +
" END";
+<<<<<<< HEAD
// 删除已删除文件夹所关联的笔记
+=======
+ /**
+ * 删除笔记属于已删除的文件夹
+ */
+>>>>>>> liming
private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
"CREATE TRIGGER folder_delete_notes_on_delete " +
" AFTER DELETE ON " + TABLE.NOTE +
@@ -174,7 +229,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮
" WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
" END";
+<<<<<<< HEAD
// 将移动到垃圾箱文件夹的文件夹内的笔记移动
+=======
+ /**
+ *移动笔记属于已移动到垃圾文件夹的文件夹
+ */
+>>>>>>> liming
private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
"CREATE TRIGGER folder_move_notes_on_trash " +
" AFTER UPDATE ON " + TABLE.NOTE +
@@ -185,6 +246,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮
" WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" +
" END";
+<<<<<<< HEAD
public NotesDatabaseHelper(Context context) { // 构造函数 实现NotesDatabaseHelper实例的唯一性以及同步性
super(context, DB_NAME, null, DB_VERSION); // 调用父类构造函数
}
@@ -330,4 +392,160 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { //笔记数据库帮
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ " INTEGER NOT NULL DEFAULT 0"); // 为笔记表添加版本列
}
-}
\ No newline at end of file
+}
+=======
+ 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();
+
+ /**
+ * 通话记录文件夹，用于记录通话记录
+ */
+ values.put(NoteColumns.ID, Notes.ID_CALL_RECORD_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ * 根文件夹，默认文件夹
+ */
+ values.clear();
+ values.put(NoteColumns.ID, Notes.ID_ROOT_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ *用于移动笔记的临时文件夹
+ */
+ values.clear();
+ values.put(NoteColumns.ID, Notes.ID_TEMPARAY_FOLDER);
+ values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM);
+ db.insert(TABLE.NOTE, null, values);
+
+ /**
+ * 创建垃圾文件夹
+ */
+ 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) {
+ 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) {
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
+ db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_delete");
+
+ db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER);
+ db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER);
+ db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
+ }
+
+ 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 ''");
+ // 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");
+ }
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java
index 14b16a3..40ee760 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java
@@ -1,4 +1,5 @@
/*
+<<<<<<< HEAD
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -299,4 +300,321 @@ public class NotesProvider extends ContentProvider { // 笔记内容提供者类
return null; // 返回空
}
-}
\ No newline at end of file
+}
+=======
+ * 这个类为笔记应用提供了一个内容提供者，用于管理数据。
+ * 它通过 CRUD 操作与底层的 SQLite 数据库进行交互。
+ */
+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;
+
+public class NotesProvider extends ContentProvider {
+ // 定义用于 URI 匹配的常量
+ private static final UriMatcher mMatcher;
+
+ // 数据库帮助类实例
+ private NotesDatabaseHelper mHelper;
+
+ // 日志标签
+ private static final String TAG = "NotesProvider";
+
+ // URI 代码
+ private static final int URI_NOTE = 1;
+ private static final int URI_NOTE_ITEM = 2;
+ private static final int URI_DATA = 3;
+ private static final int URI_DATA_ITEM = 4;
+ private static final int URI_SEARCH = 5;
+ private static final int URI_SEARCH_SUGGEST = 6;
+
+ // 初始化 UriMatcher
+ 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);
+ }
+
+ // 用于搜索建议的投影
+ private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
+ + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
+ + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 + ","
+ + "TRIM(REPLACE(" + NoteColumns.SNIPPET + ", x'0A','')) AS " + SearchManager.SUGGEST_COLUMN_TEXT_2 + ","
+ + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + ","
+ + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
+ + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
+
+ // 用于搜索笔记的 SQL 查询
+ private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
+ + " FROM " + TABLE.NOTE
+ + " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
+ + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
+ + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE;
+
+ // onCreate 方法
+ @Override
+ public boolean onCreate() {
+ mHelper = NotesDatabaseHelper.getInstance(getContext());
+ return true;
+ }
+
+ // 查询方法
+ @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)) {
+ // 处理笔记的查询
+ case URI_NOTE:
+ c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
+ sortOrder);
+ break;
+ // 处理特定笔记的查询
+ case URI_NOTE_ITEM:
+ id = uri.getPathSegments().get(1);
+ c = db.query(TABLE.NOTE, projection, NoteColumns.ID + "=" + id
+ + parseSelection(selection), selectionArgs, null, null, sortOrder);
+ break;
+ // 处理数据的查询
+ case URI_DATA:
+ c = db.query(TABLE.DATA, projection, selection, selectionArgs, null, null,
+ sortOrder);
+ break;
+ // 处理特定数据项的查询
+ case URI_DATA_ITEM:
+ id = uri.getPathSegments().get(1);
+ c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
+ + parseSelection(selection), selectionArgs, null, null, sortOrder);
+ break;
+ // 处理搜索查询
+ case URI_SEARCH:
+ case URI_SEARCH_SUGGEST:
+ 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) {
+ 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);
+ }
+ //
+ // 通知内容解析器有变化
+ if (noteId > 0) {
+ getContext().getContentResolver().notifyChange(
+ ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
+ }
+
+ // 通知数据 URI 有变化
+ if (dataId > 0) {
+ getContext().getContentResolver().notifyChange(
+ ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, dataId), null);
+ }
+
+ 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:
+ id = uri.getPathSegments().get(1);
+ /**
+ * ID that smaller than 0 is system folder which is not allowed to
+ * trash
+ */
+ 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:
+ increaseNoteVersion(-1, selection, selectionArgs);
+ count = db.update(TABLE.NOTE, values, selection, selectionArgs);
+ break;
+ // 处理特定笔记的更新
+ case URI_NOTE_ITEM:
+ 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:
+ 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);
+ }
+
+ mHelper.getWritableDatabase().execSQL(sql.toString());
+ }
+
+ // 获取类型方法
+ @Override
+ public String getType(Uri uri) {
+ // 暂不实现
+ return null;
+ }
+
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
index 63af240..ce4ea9c 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
@@ -1,4 +1,5 @@
/*
+<<<<<<< HEAD
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,11 +60,73 @@ public class MetaData extends Task { // MetaData类继承自Task类
} catch (JSONException e) { // 捕获JSON异常
Log.w(TAG, "failed to get related gid"); // 记录警告日志
mRelatedGid = null; // 将相关GID设置为null
+=======
+ * 版权所有 (c) 2010-2011，MiCode开源社区（www.micode.net）
+ *
+ * 根据Apache许可证2.0版（“许可证”）许可;
+ * 除非符合许可证，否则您不得使用此文件。
+ * 您可以在以下网址获取许可证副本：
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 除非适用法律要求或书面同意，否则软件
+ * 根据许可证“按原样”分发，不附带任何明示或暗示的保证
+ * 或适销性或特定用途的条件。
+ * 有关特定语言的权限，请参阅许可证。
+ */
+
+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;
+
+
+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);
+ }
+
+ public String getRelatedGid() {
+ return mRelatedGid;
+ }
+
+ @Override
+ public boolean isWorthSaving() {
+ return getNotes() != 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) {
+ Log.w(TAG, "failed to get related gid");
+ mRelatedGid = null;
+>>>>>>> liming
}
}
}
@Override
+<<<<<<< HEAD
public void setContentByLocalJSON(JSONObject js) { // 从本地JSON设置内容的方法
// this function should not be called
throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called"); // 抛出非法访问错误
@@ -79,4 +142,22 @@ public class MetaData extends Task { // MetaData类继承自Task类
throw new IllegalAccessError("MetaData:getSyncAction should not be called"); // 抛出非法访问错误
}
-}
\ No newline at end of file
+}
+=======
+ public void setContentByLocalJSON(JSONObject js) {
+ // 不应调用此函数
+ throw new IllegalAccessError("MetaData:setContentByLocalJSON不应该被调用");
+ }
+
+ @Override
+ public JSONObject getLocalJSONFromContent() {
+ throw new IllegalAccessError("MetaData:getLocalJSONFromContent不应该被调用");
+ }
+
+ @Override
+ public int getSyncAction(Cursor c) {
+ throw new IllegalAccessError("MetaData:getSyncAction不应该被调用");
+ }
+
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Node.java
index 636cb9c..526e2e2 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Node.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Node.java
@@ -1,4 +1,5 @@
/*
+<<<<<<< HEAD
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -98,4 +99,104 @@ public abstract class Node { // 定义一个抽象类Node
return this.mDeleted; // 返回mDeleted
}
-}
\ No newline at end of file
+}
+=======
+ * 版权所有 (c) 2010-2011，MiCode开源社区（www.micode.net）
+ *
+ * 根据Apache许可证2.0版（“许可证”）许可;
+ * 除非符合许可证，否则您不得使用此文件。
+ * 您可以在以下网址获取许可证副本：
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 除非适用法律要求或书面同意，否则软件
+ * 根据许可证“按原样”分发，不附带任何明示或暗示的保证
+ * 或适销性或特定用途的条件。
+ * 有关特定语言的权限，请参阅许可证。
+ */
+
+package net.micode.notes.gtask.data;
+
+import android.database.Cursor;
+
+import org.json.JSONObject;
+
+/**
+ * Node类是所有与GTask同步的数据模型类的基类。
+ */
+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; // Google任务的ID
+ private String mName; // 名称
+ private long mLastModified; // 最后修改时间
+ private boolean mDeleted; // 是否已删除
+
+ /**
+ * 构造函数，初始化属性
+ */
+ public Node() {
+ mGid = null;
+ mName = "";
+ mLastModified = 0;
+ mDeleted = false;
+ }
+
+ // 抽象方法，由子类实现具体逻辑
+ public abstract JSONObject getCreateAction(int actionId);
+ public abstract JSONObject getUpdateAction(int actionId);
+ public abstract void setContentByRemoteJSON(JSONObject js);
+ public abstract void setContentByLocalJSON(JSONObject js);
+ public abstract JSONObject getLocalJSONFromContent();
+ public abstract int getSyncAction(Cursor c);
+
+ // 设置Google任务ID
+ public void setGid(String gid) {
+ this.mGid = gid;
+ }
+
+ // 设置名称
+ public void setName(String name) {
+ this.mName = name;
+ }
+
+ // 设置最后修改时间
+ public void setLastModified(long lastModified) {
+ this.mLastModified = lastModified;
+ }
+
+ // 设置删除状态
+ public void setDeleted(boolean deleted) {
+ this.mDeleted = deleted;
+ }
+
+ // 获取Google任务ID
+ public String getGid() {
+ return this.mGid;
+ }
+
+ // 获取名称
+ public String getName() {
+ return this.mName;
+ }
+
+ // 获取最后修改时间
+ public long getLastModified() {
+ return this.mLastModified;
+ }
+
+ // 获取删除状态
+ public boolean getDeleted() {
+ return this.mDeleted;
+ }
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
index 5c7755d..66e8fee 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
@@ -1,4 +1,5 @@
/*
+<<<<<<< HEAD
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,10 +42,56 @@ public class SqlData { // SqlData类，处理与数据库相关的数据操作
private static final int INVALID_ID = -99999; // 无效ID常量
public static final String[] PROJECTION_DATA = new String[] { // 数据列投影
+=======
+ * 版权所有 (c) 2010-2011，MiCode开源社区（www.micode.net）
+ *
+ * 根据Apache许可证2.0版（“许可证”）许可;
+ * 除非符合许可证，否则您不得使用此文件。
+ * 您可以在以下网址获取许可证副本：
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 除非适用法律要求或书面同意，否则软件
+ * 根据许可证“按原样”分发，不附带任何明示或暗示的保证
+ * 或适销性或特定用途的条件。
+ * 有关特定语言的权限，请参阅许可证。
+ */
+
+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;
+
+/**
+ * SqlData类用于处理与数据库的交互操作，包括创建、更新和获取数据等操作。
+ */
+public class SqlData {
+ private static final String TAG = SqlData.class.getSimpleName();
+
+ private static final int INVALID_ID = -99999;
+
+ public static final String[] PROJECTION_DATA = new String[] {
+>>>>>>> liming
DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
DataColumns.DATA3
};
+<<<<<<< HEAD
public static final int DATA_ID_COLUMN = 0; // 数据ID列索引
public static final int DATA_MIME_TYPE_COLUMN = 1; // 数据MIME类型列索引
@@ -186,4 +233,165 @@ public class SqlData { // SqlData类，处理与数据库相关的数据操作
public long getId() { // 获取数据ID
return mDataId; // 返回数据ID
}
-}
\ No newline at end of file
+}
+=======
+ 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();
+ }
+
+ /**
+ * 通过数据库查询结果构造SqlData对象
+ */
+ 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, "似乎我们还没有在数据库中创建此数据");
+ return null;
+ }
+ JSONObject js = new JSONObject();
+ js.put(DataColumns.ID, mDataId);
+ js.put(DataColumns.MIME_TYPE, mDataMimeType);
+ js.put(DataColumns.CONTENT, mDataContent);
+ js.put(DataColumns.DATA1, mDataContentData1);
+ js.put(DataColumns.DATA3, mDataContentData3);
+ return js;
+ }
+
+ /**
+ * 提交更改到数据库
+ */
+ public void commit(long noteId, boolean validateVersion, long version) {
+ if (mIsCreate) {
+ if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
+ mDiffDataValues.remove(DataColumns.ID);
+ }
+ mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
+ Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
+ try {
+ mDataId = Long.valueOf(uri.getPathSegments().get(1));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "获取笔记ID错误：" + e.toString());
+ throw new ActionFailureException("创建笔记失败");
+ }
+ } else {
+ if (mDiffDataValues.size() > 0) {
+ int result = 0;
+ if (!validateVersion) {
+ result = mContentResolver.update(ContentUris.withAppendedId(
+ Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
+ } else {
+ result = mContentResolver.update(ContentUris.withAppendedId(
+ Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
+ " ? in (SELECT " + NoteColumns.ID +" FROM " + TABLE.NOTE + " WHERE " + NoteColumns.VERSION + "=?)",
+ new String[] { String.valueOf(noteId), String.valueOf(version) });
+ }
+ if (result == 0) {
+ Log.w(TAG, "没有更新。可能是用户在同步时更新了笔记");
+ }
+ }
+ }
+ mDiffDataValues.clear();
+ mIsCreate = false;
+ }
+
+ /**
+ * 获取数据ID
+ */
+ public long getId() {
+ return mDataId;
+ }
+}
+
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
index 3a62ef1..d7a2915 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+<<<<<<< HEAD
package net.micode.notes.gtask.data; // 包名，包含与任务相关的数据处理
import android.appwidget.AppWidgetManager; // 导入AppWidgetManager类，用于管理小部件
@@ -43,6 +44,38 @@ public class SqlNote { // SqlNote类，表示一个笔记对象
private static final int INVALID_ID = -99999; // 无效ID常量
public static final String[] PROJECTION_NOTE = new String[] { // 笔记的列投影
+=======
+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;
+
+// SqlData类用于处理与数据库的交互操作，包括创建、更新和获取数据等操作。
+public class SqlNote {
+ private static final String TAG = SqlNote.class.getSimpleName();
+
+ private static final int INVALID_ID = -99999;
+
+ public static final String[] PROJECTION_NOTE = new String[] {
+>>>>>>> liming
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,
@@ -51,6 +84,7 @@ public class SqlNote { // SqlNote类，表示一个笔记对象
NoteColumns.VERSION
};
+<<<<<<< HEAD
public static final int ID_COLUMN = 0; // ID列索引
public static final int ALERTED_DATE_COLUMN = 1; // 提醒日期列索引
@@ -337,10 +371,315 @@ public class SqlNote { // SqlNote类，表示一个笔记对象
for (SqlData temp : mDataList) { // 遍历数据列表
if (dataId == temp.getId()) { // 如果找到匹配的ID
sqlData = temp; // 设置SqlData对象
+=======
+ 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();
+ }
+ //通过数据库查询结果构造SqlData对象
+ 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 {
+ 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 {
+ 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) {
+ // 对于文件夹，只能更新摘要和类型
+ 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;
+
+ // 背景颜色 ID
+ int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
+ .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
+ if (mIsCreate || mBgColorId != bgColorId) {
+ mDiffNoteValues.put(NoteColumns.BG_COLOR_ID, bgColorId);
+ }
+ mBgColorId = bgColorId;
+
+ // 创建日期
+ 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;
+
+ // 父笔记 ID
+ 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);
+ }
+ mType = type;
+
+ // 小部件 ID
+ 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;
+
+ // 小部件类型
+ 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;
+
+ // 原始父笔记 ID
+ 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);
+ for (SqlData temp : mDataList) {
+ if (dataId == temp.getId()) {
+ sqlData = temp;
+>>>>>>> liming
}
}
}
+<<<<<<< HEAD
if (sqlData == null) { // 如果没有找到匹配的SqlData
sqlData = new SqlData(mContext); // 创建新的SqlData对象
mDataList.add(sqlData); // 添加到数据列表
@@ -488,11 +827,176 @@ public class SqlNote { // SqlNote类，表示一个笔记对象
if (mType == Notes.TYPE_NOTE) { // 如果是笔记类型
for (SqlData sqlData : mDataList) { // 遍历数据列表
sqlData.commit(mId, validateVersion, mVersion); // 提交SqlData
+=======
+ if (sqlData == null) {
+ sqlData = new SqlData(mContext);
+ mDataList.add(sqlData);
+ }
+
+ sqlData.setContent(data);
+
+ }
+ }
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ 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;
+ }
+
+ // 设置父笔记 ID
+ public void setParentId(long id) {
+ mParentId = id;
+ mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
+ }
+
+ // 设置 Google 任务 ID
+ public void setGtaskId(String gid) {
+ mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
+ }
+
+ // 设置同步 ID
+ public void setSyncId(long syncId) {
+ mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
+ }
+
+ // 重置本地修改标志
+ public void resetLocalModified() {
+ mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
+ }
+
+ // 获取笔记 ID
+ public long getId() {
+ return mId;
+ }
+
+ // 获取父笔记 ID
+ public long getParentId() {
+ return mParentId;
+ }
+
+ // 获取摘要
+ public String getSnippet() {
+ return mSnippet;
+ }
+
+ // 判断是否为普通笔记类型
+ public boolean isNoteType() {
+ return mType == Notes.TYPE_NOTE;
+ }
+
+ // 提交笔记更改
+ public void commit(boolean validateVersion) {
+ if (mIsCreate) {
+ // 创建新笔记
+ if (mId == INVALID_ID && mDiffNoteValues.containsKey(NoteColumns.ID)) {
+ mDiffNoteValues.remove(NoteColumns.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");
+ }
+ if (mId == 0) {
+ throw new IllegalStateException("Create thread id failed");
+ }
+
+ // 如果是普通笔记，则提交笔记数据
+ if (mType == Notes.TYPE_NOTE) {
+ for (SqlData sqlData : mDataList) {
+ sqlData.commit(mId, false, -1);
+ }
+ }
+ } else {
+ // 更新已存在的笔记
+ 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");
+ }
+ 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 + "<=?)",
+ new String[] {
+ String.valueOf(mId), String.valueOf(mVersion)
+ });
+ }
+ 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);
+>>>>>>> liming
}
}
}
// 刷新本地信息
+<<<<<<< HEAD
loadFromCursor(mId); // 通过ID加载数据
if (mType == Notes.TYPE_NOTE) // 如果是笔记类型
loadDataContent(); // 加载数据内容
@@ -500,4 +1004,14 @@ public class SqlNote { // SqlNote类，表示一个笔记对象
mDiffNoteValues.clear(); // 清空差异值
mIsCreate = false; // 设置为非新建状态
}
-}
\ No newline at end of file
+}
+=======
+ loadFromCursor(mId);
+ if (mType == Notes.TYPE_NOTE)
+ loadDataContent();
+
+ mDiffNoteValues.clear();
+ mIsCreate = false;
+ }
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Task.java
index 15b0268..0c98b97 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Task.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/Task.java
@@ -31,6 +31,7 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+<<<<<<< HEAD
public class Task extends Node {
private static final String TAG = Task.class.getSimpleName(); // 任务类的标签，用于日志记录
@@ -135,46 +136,197 @@ public class Task extends Node {
return js; // 返回更新操作的JSON对象
}
+=======
+/**
+ * 表示一个任务的类，继承自节点类
+ */
+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;
+
+ /**
+ * Task 类的构造函数
+ */
+ public Task() {
+ super();
+ mCompleted = false;
+ mNotes = null;
+ mPriorSibling = null;
+ mParent = null;
+ mMetaInfo = null;
+ }
+
+ /**
+ * 生成用于创建任务的 JSON 对象
+ */
+ 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);
+
+ // 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());
+
+ // dest_parent_type
+ js.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT_TYPE, GTaskStringUtils.GTASK_JSON_TYPE_GROUP);
+
+ // list_id
+ js.put(GTaskStringUtils.GTASK_JSON_LIST_ID, mParent.getGid());
+
+ // prior_sibling_id
+ if (mPriorSibling != null) {
+ js.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, mPriorSibling.getGid());
+ }
+
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("fail to generate task-create jsonobject");
+ }
+
+ return js;
+ }
+
+ /**
+ * 生成用于更新任务的 JSON 对象
+ */
+ 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");
+ }
+
+ return js;
+ }
+
+ /**
+ * 根据远程 JSON 设置任务内容
+ */
+>>>>>>> liming
public void setContentByRemoteJSON(JSONObject js) {
if (js != null) {
try {
// id
if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
+<<<<<<< HEAD
setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); // 设置任务ID
+=======
+ setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
+>>>>>>> liming
}
// last_modified
if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
+<<<<<<< HEAD
setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); // 设置最后修改时间
+=======
+ setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
+>>>>>>> liming
}
// name
if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
+<<<<<<< HEAD
setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); // 设置任务名称
+=======
+ setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
+>>>>>>> liming
}
// notes
if (js.has(GTaskStringUtils.GTASK_JSON_NOTES)) {
+<<<<<<< HEAD
setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES)); // 设置备注信息
+=======
+ setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES));
+>>>>>>> liming
}
// deleted
if (js.has(GTaskStringUtils.GTASK_JSON_DELETED)) {
+<<<<<<< HEAD
setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED)); // 设置删除状态
+=======
+ setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED));
+>>>>>>> liming
}
// completed
if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) {
+<<<<<<< HEAD
setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED)); // 设置完成状态
}
} catch (JSONException e) {
Log.e(TAG, e.toString()); // 记录错误日志
e.printStackTrace(); // 打印堆栈跟踪
throw new ActionFailureException("fail to get task content from jsonobject"); // 抛出从JSON对象获取任务内容失败的异常
+=======
+ setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED));
+ }
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("fail to get task content from jsonobject");
+>>>>>>> liming
}
}
}
+<<<<<<< HEAD
public void setContentByLocalJSON(JSONObject js) {
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
|| !js.has(GTaskStringUtils.META_HEAD_DATA)) {
@@ -195,10 +347,35 @@ public class Task extends Node {
if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
setName(data.getString(DataColumns.CONTENT)); // 设置任务名称
break; // 退出循环
+=======
+ /**
+ * 根据本地 JSON 设置任务内容
+ */
+ public void setContentByLocalJSON(JSONObject js) {
+ if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE) || !js.has(GTaskStringUtils.META_HEAD_DATA)) {
+ Log.w(TAG, "setContentByLocalJSON: nothing is available");
+ }
+
+ 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) {
+ Log.e(TAG, "invalid type");
+ return;
+ }
+
+ for (int i = 0; i < dataArray.length(); i++) {
+ JSONObject data = dataArray.getJSONObject(i);
+ if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
+ setName(data.getString(DataColumns.CONTENT));
+ break;
+>>>>>>> liming
}
}
} catch (JSONException e) {
+<<<<<<< HEAD
Log.e(TAG, e.toString()); // 记录错误日志
e.printStackTrace(); // 打印堆栈跟踪
}
@@ -206,10 +383,23 @@ public class Task extends Node {
public JSONObject getLocalJSONFromContent() {
String name = getName(); // 获取任务名称
+=======
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 从内容生成本地 JSON
+ */
+ public JSONObject getLocalJSONFromContent() {
+ String name = getName();
+>>>>>>> liming
try {
if (mMetaInfo == null) {
// new task created from web
if (name == null) {
+<<<<<<< HEAD
Log.w(TAG, "the note seems to be an empty one"); // 记录警告日志
return null; // 返回null
}
@@ -254,10 +444,60 @@ public class Task extends Node {
} catch (JSONException e) {
Log.w(TAG, e.toString()); // 记录警告日志
mMetaInfo = null; // 设置元信息为null
+=======
+ Log.w(TAG, "the note seems to be an empty one");
+ return null;
+ }
+
+ 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) {
+ if (metaData != null && metaData.getNotes() != null) {
+ try {
+ mMetaInfo = new JSONObject(metaData.getNotes());
+ } catch (JSONException e) {
+ Log.w(TAG, e.toString());
+ mMetaInfo = null;
+>>>>>>> liming
+ }
+ }
+ }
+
+<<<<<<< HEAD
public int getSyncAction(Cursor c) {
try {
JSONObject noteInfo = null; // 声明备注信息对象
@@ -273,26 +513,59 @@ public class Task extends Node {
if (!noteInfo.has(NoteColumns.ID)) {
Log.w(TAG, "remote note id seems to be deleted"); // 记录警告日志
return SYNC_ACTION_UPDATE_LOCAL; // 返回更新本地的操作
+=======
+ /**
+ * 获取同步操作
+ */
+ public int getSyncAction(Cursor c) {
+ try {
+ 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;
+>>>>>>> liming
}
// validate the note id now
if (c.getLong(SqlNote.ID_COLUMN) != noteInfo.getLong(NoteColumns.ID)) {
+<<<<<<< HEAD
Log.w(TAG, "note id doesn't match"); // 记录警告日志
return SYNC_ACTION_UPDATE_LOCAL; // 返回更新本地的操作
+=======
+ Log.w(TAG, "note id doesn't match");
+ return SYNC_ACTION_UPDATE_LOCAL;
+>>>>>>> liming
}
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
+<<<<<<< HEAD
return SYNC_ACTION_NONE; // 返回无操作
} else {
// apply remote to local
return SYNC_ACTION_UPDATE_LOCAL; // 返回更新本地的操作
+=======
+ return SYNC_ACTION_NONE;
+ } else {
+ // apply remote to local
+ return SYNC_ACTION_UPDATE_LOCAL;
+>>>>>>> liming
}
} else {
// validate gtask id
if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
+<<<<<<< HEAD
Log.e(TAG, "gtask id doesn't match"); // 记录错误日志
return SYNC_ACTION_ERROR; // 返回错误操作
}
@@ -348,4 +621,72 @@ public class Task extends Node {
return this.mParent; // 获取父任务列表
}
-}
\ No newline at end of file
+}
+=======
+ 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 {
+ return SYNC_ACTION_UPDATE_CONFLICT;
+ }
+ }
+ } catch (Exception e) {
+ 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;
+ }
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
index 4eb162c..1f6b253 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
@@ -1,4 +1,5 @@
/*
+<<<<<<< HEAD
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,10 +46,65 @@ public class TaskList extends Node { // TaskList类继承自Node类
public JSONObject getCreateAction(int actionId) { // 获取创建操作的JSON对象
JSONObject js = new JSONObject(); // 创建JSON对象
+=======
+ * 版权所有 (c) 2010-2011，The MiCode开放源社区 (www.micode.net)
+ *
+ * 根据Apache许可证2.0版("许可证")获得许可;
+ * 除非符合许可证，否则您不得使用此文件。
+ * 您可以在以下网址获得许可证副本
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 除非适用法律要求或书面同意，否则软件
+ * 根据许可证分发的基础上是"按原样"分发的，
+ * 无任何明示或暗示的保证或条件。
+ * 有关许可证的特定语言的管辖权，请参阅
+ * 许可证。
+ */
+
+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 {
+ private static final String TAG = TaskList.class.getSimpleName();
+
+ private int mIndex;
+
+ private ArrayList mChildren;
+
+ public TaskList() {
+ super();
+ mChildren = new ArrayList();
+ mIndex = 1;
+ }
+
+ /**
+ * 获取创建动作
+ *
+ * @param actionId 动作ID
+ * @return JSON对象
+ */
+ public JSONObject getCreateAction(int actionId) {
+ JSONObject js = new JSONObject();
+>>>>>>> liming
try {
// action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
+<<<<<<< HEAD
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE); // 设置操作类型为创建
// action_id
@@ -76,10 +132,46 @@ public class TaskList extends Node { // TaskList类继承自Node类
public JSONObject getUpdateAction(int actionId) { // 获取更新操作的JSON对象
JSONObject js = new JSONObject(); // 创建JSON对象
+=======
+ GTaskStringUtils.GTASK_JSON_ACTION_TYPE_CREATE);
+
+ // action_id
+ js.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, actionId);
+
+ // index
+ js.put(GTaskStringUtils.GTASK_JSON_INDEX, mIndex);
+
+ // 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_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;
+ }
+
+ /**
+ * 获取更新动作
+ *
+ * @param actionId 动作ID
+ * @return JSON对象
+ */
+ public JSONObject getUpdateAction(int actionId) {
+ JSONObject js = new JSONObject();
+>>>>>>> liming
try {
// action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
+<<<<<<< HEAD
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); // 设置操作类型为更新
// action_id
@@ -125,10 +217,63 @@ public class TaskList extends Node { // TaskList类继承自Node类
Log.e(TAG, e.toString()); // 记录错误日志
e.printStackTrace(); // 打印堆栈跟踪
throw new ActionFailureException("fail to get tasklist content from jsonobject"); // 抛出自定义异常
+=======
+ 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());
+ 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;
+ }
+
+ /**
+ * 通过远程JSON设置内容
+ *
+ * @param js 远程JSON对象
+ */
+ 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");
+>>>>>>> liming
}
}
}
+<<<<<<< HEAD
public void setContentByLocalJSON(JSONObject js) { // 根据本地JSON设置内容
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) { // 检查JSON对象是否为空或是否包含头部注释
Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); // 记录警告日志
@@ -339,4 +484,304 @@ public class TaskList extends Node { // TaskList类继承自Node类
public int getIndex() { // 获取索引
return this.mIndex; // 返回索引
}
-}
\ No newline at end of file
+}
+=======
+ /**
+ * 通过本地JSON设置内容
+ *
+ * @param js 本地JSON对象
+ */
+ public void setContentByLocalJSON(JSONObject js) {
+ 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) {
+ 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 {
+ Log.e(TAG, "error type");
+ }
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 从内容获取本地JSON
+ *
+ * @return 本地JSON对象
+ */
+ public JSONObject getLocalJSONFromContent() {
+ try {
+ JSONObject js = new JSONObject();
+ JSONObject folder = new JSONObject();
+
+ 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;
+ }
+ }
+
+ /**
+ * 获取同步动作
+ *
+ * @param c 光标
+ * @return 同步动作
+ */
+ public int getSyncAction(Cursor c) {
+ try {
+ 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;
+ }
+ if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
+ // 仅本地修改
+ return SYNC_ACTION_UPDATE_REMOTE;
+ } else {
+ // 对于文件夹冲突，仅应用本地修改
+ return SYNC_ACTION_UPDATE_REMOTE;
+ }
+ }
+ } catch (Exception e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ }
+
+ return SYNC_ACTION_ERROR;
+ }
+
+ /**
+ * 获取子任务数量
+ *
+ * @return 子任务数量
+ */
+ public int getChildTaskCount() {
+ return mChildren.size();
+ }
+
+ /**
+ * 添加子任务
+ *
+ * @param task 子任务
+ * @return 是否添加成功
+ */
+ public boolean addChildTask(Task task) {
+ boolean ret = false;
+ if (task != null && !mChildren.contains(task)) {
+ ret = mChildren.add(task);
+ if (ret) {
+ // 设置前一个兄弟和父对象
+ task.setPriorSibling(mChildren.isEmpty() ? null : mChildren
+ .get(mChildren.size() - 1));
+ task.setParent(this);
+ }
+ }
+ return ret;
+ }
+
+ /**
+ * 添加子任务到指定位置
+ *
+ * @param task 子任务
+ * @param index 位置索引
+ * @return 是否添加成功
+ */
+ public boolean addChildTask(Task task, int index) {
+ if (index < 0 || index > mChildren.size()) {
+ Log.e(TAG, "添加子任务：无效的索引");
+ return false;
+ }
+
+ int pos = mChildren.indexOf(task);
+ if (task != null && pos == -1) {
+ mChildren.add(index, task);
+
+ // 更新任务列表
+ Task preTask = null;
+ Task afterTask = null;
+ if (index != 0)
+ preTask = mChildren.get(index - 1);
+ if (index != mChildren.size() - 1)
+ afterTask = mChildren.get(index + 1);
+
+ task.setPriorSibling(preTask);
+ if (afterTask != null)
+ afterTask.setPriorSibling(task);
+ }
+
+ return true;
+ }
+
+ /**
+ * 移除子任务
+ *
+ * @param task 子任务
+ * @return 是否移除成功
+ */
+ public boolean removeChildTask(Task task) {
+ boolean ret = false;
+ int index = mChildren.indexOf(task);
+ if (index != -1) {
+ ret = mChildren.remove(task);
+
+ if (ret) {
+ // 重置前一个兄弟和父对象
+ task.setPriorSibling(null);
+ task.setParent(null);
+
+ // 更新任务列表
+ if (index != mChildren.size()) {
+ mChildren.get(index).setPriorSibling(
+ index == 0 ? null : mChildren.get(index - 1));
+ }
+ }
+ }
+ return ret;
+ }
+
+ /**
+ * 移动子任务到指定位置
+ *
+ * @param task 子任务
+ * @param index 位置索引
+ * @return 是否移动成功
+ */
+ public boolean moveChildTask(Task task, int index) {
+
+ if (index < 0 || index >= mChildren.size()) {
+ Log.e(TAG, "移动子任务：无效的索引");
+ return false;
+ }
+
+ int pos = mChildren.indexOf(task);
+ if (pos == -1) {
+ Log.e(TAG, "移动子任务：任务应在列表中");
+ return false;
+ }
+
+ if (pos == index)
+ return true;
+ return (removeChildTask(task) && addChildTask(task, index));
+ }
+
+ /**
+ * 通过GID查找子任务
+ *
+ * @param gid GID
+ * @return 子任务
+ */
+ 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;
+ }
+
+ /**
+ * 获取子任务索引
+ *
+ * @param task 子任务
+ * @return 索引
+ */
+ public int getChildTaskIndex(Task task) {
+ return mChildren.indexOf(task);
+ }
+
+ /**
+ * 通过索引获取子任务
+ *
+ * @param index 索引
+ * @return 子任务
+ */
+ public Task getChildTaskByIndex(int index) {
+ if (index < 0 || index >= mChildren.size()) {
+ Log.e(TAG, "根据索引获取任务：无效的索引");
+ return null;
+ }
+ return mChildren.get(index);
+ }
+
+ /**
+ * 通过GID获取子任务
+ *
+ * @param gid GID
+ * @return 子任务
+ */
+ public Task getChilTaskByGid(String gid) {
+ for (Task task : mChildren) {
+ if (task.getGid().equals(gid))
+ return task;
+ }
+ return null;
+ }
+
+ /**
+ * 获取子任务列表
+ *
+ * @return 子任务列表
+ */
+ public ArrayList getChildTaskList() {
+ return this.mChildren;
+ }
+
+ /**
+ * 设置索引
+ *
+ * @param index 索引
+ */
+ public void setIndex(int index) {
+ this.mIndex = index;
+ }
+
+ /**
+ * 获取索引
+ *
+ * @return 索引
+ */
+ public int getIndex() {
+ return this.mIndex;
+ }
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
index e64c3c4..8440757 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
@@ -1,4 +1,5 @@
/*
+<<<<<<< HEAD
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,4 +31,54 @@ public class ActionFailureException extends RuntimeException { // 定义一个
public ActionFailureException(String paramString, Throwable paramThrowable) { // 带有错误信息和原因的构造函数
super(paramString, paramThrowable); // 调用父类构造函数，传递错误信息和原因
}
-}
\ No newline at end of file
+}
+=======
+ * 版权所有 (c) 2010-2011年，The MiCode 开源社区 (www.micode.net)
+ *
+ * 根据 Apache 许可证 2.0 版本（“许可证”）许可；
+ * 除非符合许可证，否则您不得使用此文件。
+ * 您可以在以下网址获取许可证副本：
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 除非适用法律要求或书面同意，否则软件
+ * 根据许可证分发的基础上是“按原样”提供的，
+ * 没有任何形式的明示或暗示的保证或条件。
+ * 有关特定语言的权限，请参见许可证。
+ */
+
+package net.micode.notes.gtask.exception;
+
+/**
+ * 表示操作失败的异常。
+ */
+public class ActionFailureException extends RuntimeException {
+ private static final long serialVersionUID = 4425249765923293627L;
+
+ /**
+ * 创建一个新的 ActionFailureException 实例。
+ */
+ public ActionFailureException() {
+ super();
+ }
+
+ /**
+ * 使用指定的详细信息创建一个新的 ActionFailureException 实例。
+ *
+ * @param paramString 异常的详细信息
+ */
+ public ActionFailureException(String paramString) {
+ super(paramString);
+ }
+
+ /**
+ * 使用指定的详细信息和原因创建一个新的 ActionFailureException 实例。
+ *
+ * @param paramString 异常的详细信息
+ * @param paramThrowable 异常的原因
+ */
+ public ActionFailureException(String paramString, Throwable paramThrowable) {
+ super(paramString, paramThrowable);
+ }
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
index da2dc71..504e783 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
@@ -1,4 +1,5 @@
/*
+<<<<<<< HEAD
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,4 +31,54 @@ public class NetworkFailureException extends Exception { // 定义网络故障
public NetworkFailureException(String paramString, Throwable paramThrowable) { // 带参数的构造函数，接受错误信息和根本原因
super(paramString, paramThrowable); // 调用父类构造函数，传递错误信息和根本原因
}
-}
\ No newline at end of file
+}
+=======
+ * 版权所有 (c) 2010-2011年，The MiCode 开源社区 (www.micode.net)
+ *
+ * 根据 Apache 许可证 2.0 版本（“许可证”）许可；
+ * 除非符合许可证，否则您不得使用此文件。
+ * 您可以在以下网址获取许可证副本：
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 除非适用法律要求或书面同意，否则软件
+ * 根据许可证分发的基础上是“按原样”提供的，
+ * 没有任何形式的明示或暗示的保证或条件。
+ * 有关特定语言的权限，请参见许可证。
+ */
+
+package net.micode.notes.gtask.exception;
+
+/**
+ * 表示网络故障的异常。
+ */
+public class NetworkFailureException extends Exception {
+ private static final long serialVersionUID = 2107610287180234136L;
+
+ /**
+ * 创建一个新的 NetworkFailureException 实例。
+ */
+ public NetworkFailureException() {
+ super();
+ }
+
+ /**
+ * 使用指定的详细信息创建一个新的 NetworkFailureException 实例。
+ *
+ * @param paramString 异常的详细信息
+ */
+ public NetworkFailureException(String paramString) {
+ super(paramString);
+ }
+
+ /**
+ * 使用指定的详细信息和原因创建一个新的 NetworkFailureException 实例。
+ *
+ * @param paramString 异常的详细信息
+ * @param paramThrowable 异常的原因
+ */
+ public NetworkFailureException(String paramString, Throwable paramThrowable) {
+ super(paramString, paramThrowable);
+ }
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index 331e5bf..0f90ba5 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -1,4 +1,5 @@
/*
+<<<<<<< HEAD
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -117,6 +118,135 @@ public class GTaskASyncTask extends AsyncTask { // 定义
mOnCompleteListener.onComplete(); // 调用完成监听器的完成方法
}
}).start(); // 启动线程
+=======
+ * 版权所有 (c) 2010-2011年，The MiCode 开源社区 (www.micode.net)
+ *
+ * 根据 Apache 许可证 2.0 版本（“许可证”）许可；
+ * 除非符合许可证，否则您不得使用此文件。
+ * 您可以在以下网址获取许可证副本：
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 除非适用法律要求或书面同意，否则软件
+ * 根据许可证分发的基础上是“按原样”提供的，
+ * 没有任何形式的明示或暗示的保证或条件。
+ * 有关特定语言的权限，请参见许可证。
+ */
+
+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;
+
+// 异步任务用于执行与 GTask 同步相关的操作
+public class GTaskASyncTask extends AsyncTask {
+
+ // GTask 同步通知的 ID
+ private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;
+
+ // 定义接口，用于在任务完成时通知调用者
+ public interface OnCompleteListener {
+ void onComplete();
+ }
+
+ private Context mContext; // 上下文对象
+ private NotificationManager mNotifiManager; // 通知管理器对象
+ private GTaskManager mTaskManager; // GTask 管理器对象
+ 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 });
+ }
+
+ // 显示通知
+ private void showNotification(int tickerId, String content) {
+ PendingIntent pendingIntent;
+ if (tickerId != R.string.ticker_success) {
+ // 如果同步失败，则跳转到偏好设置界面
+ pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesPreferenceActivity.class), PendingIntent.FLAG_IMMUTABLE);
+ } else {
+ // 如果同步成功，则跳转到笔记列表界面
+ pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesListActivity.class), PendingIntent.FLAG_IMMUTABLE);
+ }
+ Notification.Builder builder = new Notification.Builder(mContext)
+ .setAutoCancel(true)
+ .setContentTitle(mContext.getString(R.string.app_name))
+ .setContentText(content)
+ .setContentIntent(pendingIntent)
+ .setWhen(System.currentTimeMillis())
+ .setOngoing(true);
+ Notification notification = builder.build();
+ mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+ }
+
+ // 执行后台任务，进行 GTask 同步
+ @Override
+ protected Integer doInBackground(Void... unused) {
+ // 发布登录进度信息
+ publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity.getSyncAccountName(mContext)));
+ // 执行 GTask 同步操作，并返回结果状态码
+ return mTaskManager.sync(mContext, this);
+ }
+
+ // 更新任务进度
+ @Override
+ protected void onProgressUpdate(String... progress) {
+ // 显示同步通知
+ showNotification(R.string.ticker_syncing, progress[0]);
+ // 如果上下文是 GTaskSyncService 类型，则发送广播
+ if (mContext instanceof GTaskSyncService) {
+ ((GTaskSyncService) mContext).sendBroadcast(progress[0]);
+ }
+ }
+
+ // 后台任务执行完成后调用，根据结果状态码显示相应的通知，并通知完成监听器
+ @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()));
+ 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();
+>>>>>>> liming
}
}
}
\ No newline at end of file
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
index 9ee0436..6cfacba 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
@@ -1,4 +1,5 @@
/*
+<<<<<<< HEAD
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,6 +13,19 @@
* 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.
+=======
+ * 版权所有 (c) 2010-2011, MiCode 开源社区 (www.micode.net)
+ *
+ * 根据 Apache License 2.0 许可进行许可；
+ * 您不能使用此文件，除非符合许可。
+ * 您可以在以下网址获取许可副本：
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 除非适用法律要求或书面同意，否则根据该许可分发的软件
+ * 按“原样”分发，不提供任何明示或暗示的担保。
+ * 请参阅许可了解管理权限和限制的具体语言。
+>>>>>>> liming
*/
package net.micode.notes.gtask.remote;
@@ -60,6 +74,7 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
+<<<<<<< HEAD
public class GTaskClient {
private static final String TAG = GTaskClient.class.getSimpleName(); // 定义日志标签
@@ -91,6 +106,47 @@ public class GTaskClient {
private JSONArray mUpdateArray; // 更新数组
private GTaskClient() { // 构造函数
+=======
+public class GTaskClient {
+ // 日志标签
+ private static final String TAG = GTaskClient.class.getSimpleName();
+
+ // Google Tasks 的URL
+ 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;
+
+ // HTTP客户端
+ private DefaultHttpClient mHttpClient;
+
+ // 请求URL
+ private String mGetUrl;
+ private String mPostUrl;
+
+ // 客户端版本
+ private long mClientVersion;
+
+ // 登录状态
+ private boolean mLoggedin;
+
+ // 上次登录时间
+ private long mLastLoginTime;
+
+ // 动作ID
+ private int mActionId;
+
+ // 账号
+ private Account mAccount;
+
+ // 更新数组
+ private JSONArray mUpdateArray;
+
+ // 构造函数
+ private GTaskClient() {
+>>>>>>> liming
mHttpClient = null;
mGetUrl = GTASK_GET_URL;
mPostUrl = GTASK_POST_URL;
@@ -102,13 +158,19 @@ public class GTaskClient {
mUpdateArray = null;
}
+<<<<<<< HEAD
public static synchronized GTaskClient getInstance() { // 获取单例实例
+=======
+ // 获取单例实例
+ public static synchronized GTaskClient getInstance() {
+>>>>>>> liming
if (mInstance == null) {
mInstance = new GTaskClient();
}
return mInstance;
}
+<<<<<<< HEAD
public boolean login(Activity activity) { // 登录方法
// 我们假设cookie在5分钟后过期
// 然后我们需要重新登录
@@ -148,11 +210,53 @@ public class GTaskClient {
if (tryToLoginGtask(activity, authToken)) { // 尝试登录Gtask
mLoggedin = true; // 登录成功
+=======
+ // 登录方法
+ public boolean login(Activity activity) {
+ // 假设cookie在5分钟后过期，需要重新登录
+ final long interval = 1000 * 60 * 5;
+ if (mLastLoginTime + interval < System.currentTimeMillis()) {
+ mLoggedin = false;
+ }
+
+ // 切换账户后需要重新登录
+ if (mLoggedin
+ && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
+ .getSyncAccountName(activity))) {
+ mLoggedin = false;
+ }
+
+ if (mLoggedin) {
+ Log.d(TAG, "已经登录");
+ return true;
+ }
+
+ mLastLoginTime = System.currentTimeMillis();
+ String authToken = loginGoogleAccount(activity, false);
+ if (authToken == null) {
+ Log.e(TAG, "登录Google账户失败");
+ return false;
+ }
+
+ // 如果有必要，使用自定义域登录
+ if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase()
+ .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 + "/");
+ mGetUrl = url.toString() + "ig";
+ mPostUrl = url.toString() + "r/ig";
+
+ if (tryToLoginGtask(activity, authToken)) {
+ mLoggedin = true;
+>>>>>>> liming
}
}
// 尝试使用Google官方URL登录
if (!mLoggedin) {
+<<<<<<< HEAD
mGetUrl = GTASK_GET_URL; // 恢复获取任务的URL
mPostUrl = GTASK_POST_URL; // 恢复提交任务的URL
if (!tryToLoginGtask(activity, authToken)) { // 尝试登录Gtask
@@ -428,10 +532,302 @@ public class GTaskClient {
Log.e(TAG, e.toString()); // JSON解析异常
e.printStackTrace(); // 打印堆栈信息
throw new ActionFailureException("commit update: handing jsonobject failed"); // 抛出操作失败异常
+=======
+ mGetUrl = GTASK_GET_URL;
+ mPostUrl = GTASK_POST_URL;
+ if (!tryToLoginGtask(activity, authToken)) {
+ return false;
+ }
+ }
+
+ mLoggedin = true;
+ return true;
+ }
+
+ // 登录Google账户
+ private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
+ String authToken;
+ AccountManager accountManager = AccountManager.get(activity);
+ Account[] accounts = accountManager.getAccountsByType("com.google");
+
+ if (accounts.length == 0) {
+ Log.e(TAG, "没有可用的Google账户");
+ return null;
+ }
+
+ String accountName = NotesPreferenceActivity.getSyncAccountName(activity);
+ Account account = null;
+ for (Account a : accounts) {
+ if (a.name.equals(accountName)) {
+ account = a;
+ break;
+ }
+ }
+ if (account != null) {
+ mAccount = account;
+ } else {
+ Log.e(TAG, "无法获取设置中相同名称的账户");
+ return null;
+ }
+
+ // 获取token
+ AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account,
+ "goanna_mobile", null, activity, null, null);
+ try {
+ Bundle authTokenBundle = accountManagerFuture.getResult();
+ authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN);
+ if (invalidateToken) {
+ accountManager.invalidateAuthToken("com.google", authToken);
+ loginGoogleAccount(activity, false);
+
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "get auth token failed");
+ authToken = null;
+ }
+
+ return authToken;
+ }
+
+
+ // 尝试登录GTask服务
+ private boolean tryToLoginGtask(Activity activity, String authToken) {
+ if (!loginGtask(authToken)) {
+ // 可能auth token已经过期，现在让我们使token失效并重试
+ authToken = loginGoogleAccount(activity, true);
+ if (authToken == null) {
+ Log.e(TAG, "登录Google账户失败");
+ return false;
+ }
+
+ if (!loginGtask(authToken)) {
+ Log.e(TAG, "登录GTask失败");
+ return false;
+ }
+ }
+ return true;
+ }
+
+ // 使用auth token登录GTask
+ 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();
+ mHttpClient.setCookieStore(localBasicCookieStore);
+ HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
+
+ // 登录GTask
+ try {
+ String loginUrl = mGetUrl + "?auth=" + authToken;
+ HttpGet httpGet = new HttpGet(loginUrl);
+ HttpResponse response = null;
+ response = mHttpClient.execute(httpGet);
+
+ // 获取cookie
+ List cookies = mHttpClient.getCookieStore().getCookies();
+ boolean hasAuthCookie = false;
+ for (Cookie cookie : cookies) {
+ if (cookie.getName().contains("GTL")) {
+ hasAuthCookie = true;
+ }
+ }
+ if (!hasAuthCookie) {
+ Log.w(TAG, "似乎没有auth cookie");
+ }
+
+ // 获取客户端版本
+ 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) {
+ // 捕获所有异常
+ Log.e(TAG, "httpget gtask_url失败");
+ return false;
+ }
+
+ return true;
+ }
+
+ // 获取动作ID
+ private int getActionId() {
+ return mActionId++;
+ }
+
+ // 创建HttpPost对象
+ 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;
+ }
+
+ // 获取响应内容
+ private String getResponseContent(HttpEntity entity) throws IOException {
+ String contentEncoding = null;
+ if (entity.getContentEncoding() != null) {
+ contentEncoding = entity.getContentEncoding().getValue();
+ Log.d(TAG, "编码: " + contentEncoding);
+ }
+
+ InputStream input = entity.getContent();
+ if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
+ input = new GZIPInputStream(entity.getContent());
+ } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {
+ Inflater inflater = new Inflater(true);
+ input = new InflaterInputStream(entity.getContent(), inflater);
+ }
+
+ try {
+ InputStreamReader isr = new InputStreamReader(input);
+ BufferedReader br = new BufferedReader(isr);
+ StringBuilder sb = new StringBuilder();
+
+ while (true) {
+ String buff = br.readLine();
+ if (buff == null) {
+ return sb.toString();
+ }
+ sb = sb.append(buff);
+ }
+ } finally {
+ input.close();
+ }
+ }
+
+ // 发送POST请求
+ private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
+ if (!mLoggedin) {
+ Log.e(TAG, "请先登录");
+ throw new ActionFailureException("未登录");
+ }
+
+ HttpPost httpPost = createHttpPost();
+ try {
+ LinkedList list = new LinkedList();
+ list.add(new BasicNameValuePair("r", js.toString()));
+ UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8");
+ httpPost.setEntity(entity);
+
+ // 执行POST请求
+ 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失败");
+ } catch (IOException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new NetworkFailureException("postRequest失败");
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("无法将响应内容转换为JSONObject");
+ } catch (Exception e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("发送请求时发生错误");
+ }
+ }
+
+ // 创建任务
+ public void createTask(Task task) throws NetworkFailureException {
+ commitUpdate();
+ try {
+ JSONObject jsPost = new JSONObject();
+ JSONArray actionList = new JSONArray();
+
+ // 动作列表
+ actionList.put(task.getCreateAction(getActionId()));
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
+
+ // 客户端版本
+ jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
+
+ // 发送请求
+ 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("创建任务: 处理JSONObject失败");
+ }
+ }
+
+ // 创建任务列表
+ public void createTaskList(TaskList tasklist) throws NetworkFailureException {
+ commitUpdate();
+ try {
+ JSONObject jsPost = new JSONObject();
+ JSONArray actionList = new JSONArray();
+
+ // 动作列表
+ actionList.put(tasklist.getCreateAction(getActionId()));
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
+
+ // 客户端版本
+ jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
+
+ // 发送请求
+ 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("创建任务列表: 处理JSONObject失败");
+ }
+ }
+
+
+ // 提交更新
+ public void commitUpdate() throws NetworkFailureException {
+ if (mUpdateArray != null) {
+ try {
+ JSONObject jsPost = new JSONObject();
+
+ // 动作列表
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, mUpdateArray);
+
+ // 客户端版本
+ 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("提交更新: 处理JSONObject失败");
+>>>>>>> liming
}
}
}
+<<<<<<< HEAD
public void addUpdateNode(Node node) throws NetworkFailureException { // 添加更新节点
if (node != null) {
// 更新项过多可能导致错误
@@ -580,4 +976,159 @@ public class GTaskClient {
public void resetUpdateArray() { // 重置更新数组
mUpdateArray = null; // 清空更新数组
}
-}
\ No newline at end of file
+}
+=======
+ // 添加更新节点
+ public void addUpdateNode(Node node) throws NetworkFailureException {
+ if (node != null) {
+ // 太多的更新项可能会导致错误，设置最大数量为10项
+ if (mUpdateArray != null && mUpdateArray.length() > 10) {
+ commitUpdate();
+ }
+
+ if (mUpdateArray == null)
+ mUpdateArray = new JSONArray();
+ mUpdateArray.put(node.getUpdateAction(getActionId()));
+ }
+ }
+
+ // 移动任务
+ 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.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) {
+ // 仅在任务列表内移动且不是第一个时设置prior_sibling_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());
+ if (preParent != curParent) {
+ // 仅在不同任务列表之间移动时设置dest_list
+ action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid());
+ }
+ actionList.put(action);
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
+
+ // 客户端版本
+ jsPost.put(GTaskStringUtils.GTASK_JSON_CLIENT_VERSION, mClientVersion);
+
+ // 发送请求
+ postRequest(jsPost);
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("移动任务: 处理JSONObject失败");
+ }
+ }
+
+ // 删除节点
+ public void deleteNode(Node node) throws NetworkFailureException {
+ commitUpdate();
+ try {
+ JSONObject jsPost = new JSONObject();
+ JSONArray actionList = new JSONArray();
+
+ // 动作列表
+ node.setDeleted(true);
+ actionList.put(node.getUpdateAction(getActionId()));
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
+
+ // 客户端版本
+ 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("删除节点: 处理JSONObject失败");
+ }
+ }
+
+ // 获取任务列表
+ public JSONArray getTaskLists() throws NetworkFailureException {
+ if (!mLoggedin) {
+ Log.e(TAG, "请先登录");
+ throw new ActionFailureException("未登录");
+ }
+
+ try {
+ HttpGet httpGet = new HttpGet(mGetUrl);
+ HttpResponse response = mHttpClient.execute(httpGet);
+
+ // 获取任务列表
+ 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);
+ return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS);
+ } catch (ClientProtocolException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new NetworkFailureException("获取任务列表: HTTP GET失败");
+ } catch (IOException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new NetworkFailureException("获取任务列表: HTTP GET失败");
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("获取任务列表: 处理JSONObject失败");
+ }
+ }
+
+ // 获取特定任务列表
+ public JSONArray getTaskList(String listGid) throws NetworkFailureException {
+ commitUpdate();
+ try {
+ JSONObject jsPost = new JSONObject();
+ JSONArray actionList = new JSONArray();
+ JSONObject action = new JSONObject();
+
+ // 动作列表
+ action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL);
+ action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId());
+ action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid);
+ action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false);
+ actionList.put(action);
+ jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
+
+ // 客户端版本
+ 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("获取特定任务列表: 处理JSONObject失败");
+ }
+ }
+
+ // 获取同步账户
+ public Account getSyncAccount() {
+ return mAccount;
+ }
+
+ // 重置更新数组
+ public void resetUpdateArray() {
+ mUpdateArray = null;
+ }
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
index 151f45b..9f1bea0 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
@@ -14,378 +14,398 @@
* limitations under the License.
*/
-package net.micode.notes.gtask.remote; // 包名，表示该类属于远程GTask模块
-
-import android.app.Activity; // 导入Activity类
-import android.content.ContentResolver; // 导入内容解析器类
-import android.content.ContentUris; // 导入内容URI工具类
-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; // 导入SQL笔记类
-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; // 导入GTask字符串工具类
-
-import org.json.JSONArray; // 导入JSON数组类
-import org.json.JSONException; // 导入JSON异常类
-import org.json.JSONObject; // 导入JSON对象类
-
-import java.util.HashMap; // 导入哈希表类
-import java.util.HashSet; // 导入哈希集合类
-import java.util.Iterator; // 导入迭代器类
-import java.util.Map; // 导入映射类
-
-
-public class GTaskManager { // GTask管理器类
- 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; // GTaskManager单例实例
-
- private Activity mActivity; // 当前活动
-
- private Context mContext; // 上下文
-
- private ContentResolver mContentResolver; // 内容解析器
-
- private boolean mSyncing; // 同步状态标志
-
- private boolean mCancelled; // 取消状态标志
-
- private HashMap mGTaskListHashMap; // GTask任务列表映射
-
- private HashMap mGTaskHashMap; // GTask节点映射
-
- private HashMap mMetaHashMap; // 元数据映射
-
- private TaskList mMetaList; // 元任务列表
-
- private HashSet mLocalDeleteIdMap; // 本地删除ID集合
-
- private HashMap mGidToNid; // GID到NID的映射
-
- private HashMap mNidToGid; // NID到GID的映射
-
- private GTaskManager() { // 构造函数
- mSyncing = false; // 初始化同步状态
- mCancelled = false; // 初始化取消状态
- mGTaskListHashMap = new HashMap(); // 初始化GTask任务列表映射
- mGTaskHashMap = new HashMap(); // 初始化GTask节点映射
- mMetaHashMap = new HashMap(); // 初始化元数据映射
- mMetaList = null; // 初始化元任务列表
- mLocalDeleteIdMap = new HashSet(); // 初始化本地删除ID集合
- mGidToNid = new HashMap(); // 初始化GID到NID的映射
- mNidToGid = new HashMap(); // 初始化NID到GID的映射
+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 {
+ // 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;
+
+ // 单例模式的GTaskManager实例
+ private static GTaskManager mInstance = null;
+
+ // 活动对象
+ private Activity mActivity;
+
+ // 上下文对象
+ private Context mContext;
+
+ // 内容解析器
+ private ContentResolver mContentResolver;
+
+ // 同步标志
+ private boolean mSyncing;
+
+ // 取消标志
+ private boolean mCancelled;
+
+ // Google任务列表哈希映射
+ private HashMap mGTaskListHashMap;
+
+ // Google任务哈希映射
+ private HashMap mGTaskHashMap;
+
+ // 元数据哈希映射
+ private HashMap mMetaHashMap;
+
+ // 元数据列表
+ private TaskList mMetaList;
+
+ // 本地删除ID映射集合
+ private HashSet mLocalDeleteIdMap;
+
+ // Google ID到笔记ID映射
+ private HashMap mGidToNid;
+
+ // 笔记ID到Google ID映射
+ private HashMap mNidToGid;
+
+ // 私有构造函数，初始化各个字段
+ private GTaskManager() {
+ mSyncing = false;
+ mCancelled = false;
+ mGTaskListHashMap = new HashMap<>();
+ mGTaskHashMap = new HashMap<>();
+ mMetaHashMap = new HashMap<>();
+ mMetaList = null;
+ mLocalDeleteIdMap = new HashSet<>();
+ mGidToNid = new HashMap<>();
+ mNidToGid = new HashMap<>();
}
- public static synchronized GTaskManager getInstance() { // 获取GTaskManager单例实例
- if (mInstance == null) { // 如果实例为空
- mInstance = new GTaskManager(); // 创建新实例
+
+ // 获取单例
+ public static synchronized GTaskManager getInstance() {
+ if (mInstance == null) {
+ mInstance = new GTaskManager();
}
- return mInstance; // 返回实例
+ return mInstance;
}
- public synchronized void setActivityContext(Activity activity) { // 设置活动上下文
- // 用于获取认证令牌
- mActivity = activity; // 赋值活动
+ // 设置活动上下文
+ public synchronized void setActivityContext(Activity activity) {
+ // 用于获取authtoken
+ mActivity = activity;
}
- public int sync(Context context, GTaskASyncTask asyncTask) { // 同步方法
- if (mSyncing) { // 如果正在同步
- Log.d(TAG, "Sync is in progress"); // 记录日志
- return STATE_SYNC_IN_PROGRESS; // 返回同步进行中状态
+ // 同步任务
+ public int sync(Context context, GTaskASyncTask asyncTask) {
+ if (mSyncing) {
+ Log.d(TAG, "同步进行中");
+ return STATE_SYNC_IN_PROGRESS;
}
- mContext = context; // 赋值上下文
- mContentResolver = mContext.getContentResolver(); // 获取内容解析器
- mSyncing = true; // 设置同步状态为正在同步
- mCancelled = false; // 设置取消状态为未取消
- mGTaskListHashMap.clear(); // 清空GTask任务列表映射
- mGTaskHashMap.clear(); // 清空GTask节点映射
- mMetaHashMap.clear(); // 清空元数据映射
- mLocalDeleteIdMap.clear(); // 清空本地删除ID集合
- mGidToNid.clear(); // 清空GID到NID的映射
- mNidToGid.clear(); // 清空NID到GID的映射
+ mContext = context;
+ mContentResolver = mContext.getContentResolver();
+ mSyncing = true;
+ mCancelled = false;
+ mGTaskListHashMap.clear();
+ mGTaskHashMap.clear();
+ mMetaHashMap.clear();
+ mLocalDeleteIdMap.clear();
+ mGidToNid.clear();
+ mNidToGid.clear();
try {
- GTaskClient client = GTaskClient.getInstance(); // 获取GTask客户端实例
- client.resetUpdateArray(); // 重置更新数组
+ GTaskClient client = GTaskClient.getInstance();
+ client.resetUpdateArray();
// 登录Google任务
- if (!mCancelled) { // 如果未取消
- if (!client.login(mActivity)) { // 登录失败
- throw new NetworkFailureException("login google task failed"); // 抛出网络失败异常
+ if (!mCancelled) {
+ if (!client.login(mActivity)) {
+ throw new NetworkFailureException("登录Google任务失败");
}
}
// 从Google获取任务列表
- asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list)); // 发布进度
- initGTaskList(); // 初始化GTask列表
-
- // 执行内容同步工作
- asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing)); // 发布同步进度
- syncContent(); // 同步内容
- } catch (NetworkFailureException e) { // 捕获网络失败异常
- Log.e(TAG, e.toString()); // 记录错误日志
- return STATE_NETWORK_ERROR; // 返回网络错误状态
- } catch (ActionFailureException e) { // 捕获操作失败异常
- 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(); // 清空GTask任务列表映射
- mGTaskHashMap.clear(); // 清空GTask节点映射
- mMetaHashMap.clear(); // 清空元数据映射
- mLocalDeleteIdMap.clear(); // 清空本地删除ID集合
- mGidToNid.clear(); // 清空GID到NID的映射
- mNidToGid.clear(); // 清空NID到GID的映射
- mSyncing = false; // 设置同步状态为未同步
+ asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
+ initGTaskList();
+
+ // 进行内容同步
+ asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
+ syncContent();
+ } catch (NetworkFailureException e) {
+ Log.e(TAG, e.toString());
+ return STATE_NETWORK_ERROR;
+ } catch (ActionFailureException e) {
+ 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; // 返回状态
+ return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
}
- private void initGTaskList() throws NetworkFailureException { // 初始化GTask列表
- if (mCancelled) // 如果已取消
- return; // 返回
- GTaskClient client = GTaskClient.getInstance(); // 获取GTask客户端实例
+ // 初始化任务列表
+ private void initGTaskList() throws NetworkFailureException {
+ if (mCancelled)
+ return;
+ GTaskClient client = GTaskClient.getInstance();
try {
- JSONArray jsTaskLists = client.getTaskLists(); // 获取任务列表的JSON数组
-
- // 首先初始化元列表
- mMetaList = null; // 初始化元列表
- for (int i = 0; i < jsTaskLists.length(); i++) { // 遍历任务列表
- JSONObject object = jsTaskLists.getJSONObject(i); // 获取JSON对象
- String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); // 获取GID
- String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME); // 获取名称
-
- if (name // 如果名称是元文件夹前缀
- .equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
- mMetaList = new TaskList(); // 创建新的任务列表
- mMetaList.setContentByRemoteJSON(object); // 设置内容
-
- // 加载元数据
- JSONArray jsMetas = client.getTaskList(gid); // 获取元数据的JSON数组
- for (int j = 0; j < jsMetas.length(); j++) { // 遍历元数据
- object = (JSONObject) jsMetas.getJSONObject(j); // 获取JSON对象
- MetaData metaData = new MetaData(); // 创建元数据对象
- metaData.setContentByRemoteJSON(object); // 设置内容
- if (metaData.isWorthSaving()) { // 如果值得保存
- mMetaList.addChildTask(metaData); // 添加子任务
- if (metaData.getGid() != null) { // 如果GID不为空
- mMetaHashMap.put(metaData.getRelatedGid(), metaData); // 添加到元数据映射
+ JSONArray jsTaskLists = client.getTaskLists();
+
+ // 先初始化meta列表
+ 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);
+
+ // 处理meta列表
+ if (name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
+ mMetaList = new TaskList();
+ mMetaList.setContentByRemoteJSON(object);
+
+ // 加载meta数据
+ JSONArray jsMetas = client.getTaskList(gid);
+ for (int j = 0; j < jsMetas.length(); j++) {
+ object = jsMetas.getJSONObject(j);
+ MetaData metaData = new MetaData();
+ metaData.setContentByRemoteJSON(object);
+ if (metaData.isWorthSaving()) {
+ mMetaList.addChildTask(metaData);
+ if (metaData.getGid() != null) {
+ mMetaHashMap.put(metaData.getRelatedGid(), metaData);
}
}
}
}
}
- // 如果元列表不存在，则创建
+ //如果不存在，创建元列表
if (mMetaList == null) {
- mMetaList = new TaskList(); // 创建新的任务列表
+ mMetaList = new TaskList();
mMetaList.setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
- + GTaskStringUtils.FOLDER_META); // 设置名称
- GTaskClient.getInstance().createTaskList(mMetaList); // 创建任务列表
+ + GTaskStringUtils.FOLDER_META);
+ GTaskClient.getInstance().createTaskList(mMetaList);
}
- // 初始化任务列表
- for (int i = 0; i < jsTaskLists.length(); i++) { // 遍历任务列表
- JSONObject object = jsTaskLists.getJSONObject(i); // 获取JSON对象
- String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); // 获取GID
- String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME); // 获取名称
+ //初始化任务列表
+ 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.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX) // 如果名称以文件夹前缀开头
+ if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX)
&& !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX
- + GTaskStringUtils.FOLDER_META)) { // 并且不是元文件夹
- TaskList tasklist = new TaskList(); // 创建新的任务列表
- tasklist.setContentByRemoteJSON(object); // 设置内容
- mGTaskListHashMap.put(gid, tasklist); // 添加到GTask任务列表映射
- mGTaskHashMap.put(gid, tasklist); // 添加到GTask节点映射
-
- // 加载任务
- JSONArray jsTasks = client.getTaskList(gid); // 获取任务的JSON数组
- for (int j = 0; j < jsTasks.length(); j++) { // 遍历任务
- object = (JSONObject) jsTasks.getJSONObject(j); // 获取JSON对象
- gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); // 获取GID
- Task task = new Task(); // 创建任务对象
- task.setContentByRemoteJSON(object); // 设置内容
- if (task.isWorthSaving()) { // 如果值得保存
- task.setMetaInfo(mMetaHashMap.get(gid)); // 设置元信息
- tasklist.addChildTask(task); // 添加子任务
- mGTaskHashMap.put(gid, task); // 添加到GTask节点映射
+ + GTaskStringUtils.FOLDER_META)) {
+ TaskList tasklist = new TaskList();
+ tasklist.setContentByRemoteJSON(object);
+ mGTaskListHashMap.put(gid, tasklist);
+ mGTaskHashMap.put(gid, tasklist);
+
+ //加载任务
+ 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) { // 捕获JSON异常
- Log.e(TAG, e.toString()); // 记录错误日志
- e.printStackTrace(); // 打印堆栈跟踪
- throw new ActionFailureException("initGTaskList: handing JSONObject failed"); // 抛出操作失败异常
+ } catch (JSONException e) {
+ Log.e(TAG, e.toString());
+ e.printStackTrace();
+ throw new ActionFailureException("initGTaskList: handing JSONObject failed");
}
}
- private void syncContent() throws NetworkFailureException { // 同步内容
- int syncType; // 同步类型
- Cursor c = null; // 游标
- String gid; // GID
- Node node; // 节点
+ // 同步内容
+ private void syncContent() throws NetworkFailureException {
+ int syncType;
+ Cursor c = null;
+ String gid;
+ Node node;
- mLocalDeleteIdMap.clear(); // 清空本地删除ID集合
+ // 清空本地删除ID集合
+ mLocalDeleteIdMap.clear();
- if (mCancelled) { // 如果已取消
- return; // 返回
+ if (mCancelled) {
+ return;
}
// 处理本地删除的笔记
try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, // 查询笔记
+ 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) // 排除系统类型和垃圾桶
+ 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); // 获取GID
- node = mGTaskHashMap.get(gid); // 获取节点
- if (node != null) { // 如果节点不为空
- mGTaskHashMap.remove(gid); // 从映射中移除节点
- doContentSync(Node.SYNC_ACTION_DEL_REMOTE, node, c); // 执行内容同步，删除远程节点
+ 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)); // 添加到本地删除ID集合
+ mLocalDeleteIdMap.add(c.getLong(SqlNote.ID_COLUMN));
}
} else {
- Log.w(TAG, "failed to query trash folder"); // 记录警告日志
+ Log.w(TAG, "查询垃圾文件夹失败");
}
} finally {
- if (c != null) { // 如果游标不为空
- c.close(); // 关闭游标
- c = null; // 置空游标
+ if (c != null) {
+ c.close();
+ c = null;
}
}
// 首先同步文件夹
- syncFolder(); // 同步文件夹
+ syncFolder();
// 处理数据库中存在的笔记
try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, // 查询笔记
+ 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); // 获取GID
- node = mGTaskHashMap.get(gid); // 获取节点
- if (node != null) { // 如果节点不为空
- mGTaskHashMap.remove(gid); // 从映射中移除节点
- mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); // 更新GID到NID的映射
- mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); // 更新NID到GID的映射
- syncType = node.getSyncAction(c); // 获取同步类型
+ 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);
+ 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) { // 如果GID为空
- // 本地添加
- syncType = Node.SYNC_ACTION_ADD_REMOTE; // 设置为添加远程节点
+ if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
+ // 本地新增
+ syncType = Node.SYNC_ACTION_ADD_REMOTE;
} else {
// 远程删除
- syncType = Node.SYNC_ACTION_DEL_LOCAL; // 设置为删除本地节点
+ syncType = Node.SYNC_ACTION_DEL_LOCAL;
}
}
- doContentSync(syncType, node, c); // 执行内容同步
+ doContentSync(syncType, node, c);
}
} else {
- Log.w(TAG, "failed to query existing note in database"); // 记录警告日志
+ Log.w(TAG, "查询数据库中现有的笔记失败");
}
} finally {
- if (c != null) { // 如果游标不为空
- c.close(); // 关闭游标
- c = null; // 置空游标
+ if (c != null) {
+ c.close();
+ c = null;
}
}
- // 遍历剩余的项目
- Iterator> iter = mGTaskHashMap.entrySet().iterator(); // 获取迭代器
- while (iter.hasNext()) { // 遍历映射
- Map.Entry entry = iter.next(); // 获取映射项
- node = entry.getValue(); // 获取节点
- doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); // 执行内容同步，添加本地节点
+ // 处理剩余项
+ Iterator> iter = mGTaskHashMap.entrySet().iterator();
+ while (iter.hasNext()) {
+ Map.Entry entry = iter.next();
+ node = entry.getValue();
+ doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null);
}
- // mCancelled可能被其他线程设置，因此我们需要逐个检查
+ // mCancelled可以被另一个线程设置，所以需要逐一检查
// 清空本地删除表
- if (!mCancelled) { // 如果未取消
- if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) { // 批量删除本地删除的笔记失败
- throw new ActionFailureException("failed to batch-delete local deleted notes"); // 抛出操作失败异常
+ if (!mCancelled) {
+ if (!DataUtils.batchDeleteNotes(mContentResolver, mLocalDeleteIdMap)) {
+ throw new ActionFailureException("批量删除本地删除的笔记失败");
}
}
// 刷新本地同步ID
- if (!mCancelled) { // 如果未取消
- GTaskClient.getInstance().commitUpdate(); // 提交更新
- refreshLocalSyncId(); // 刷新本地同步ID
+ if (!mCancelled) {
+ GTaskClient.getInstance().commitUpdate();
+ refreshLocalSyncId();
}
}
- private void syncFolder() throws NetworkFailureException { // 同步文件夹
- Cursor c = null; // 游标
- String gid; // GID
- Node node; // 节点
- int syncType; // 同步类型
+ // 同步文件夹
+ private void syncFolder() throws NetworkFailureException {
+ Cursor c = null;
+ String gid;
+ Node node;
+ int syncType;
- if (mCancelled) { // 如果已取消
- return; // 返回
+ if (mCancelled) {
+ return;
}
// 处理根文件夹
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); // 获取GID
- node = mGTaskHashMap.get(gid); // 获取节点
- if (node != null) { // 如果节点不为空
- mGTaskHashMap.remove(gid); // 从映射中移除节点
- mGidToNid.put(gid, (long) Notes.ID_ROOT_FOLDER); // 更新GID到NID的映射
- mNidToGid.put((long) Notes.ID_ROOT_FOLDER, gid); // 更新NID到GID的映射
- // 对于系统文件夹，仅在必要时更新远程名称
+ 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);
+ // 对于系统文件夹，如果需要，只更新远程名称
if (!node.getName().equals(
- GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT)) // 如果名称不等于默认文件夹
- doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c); // 执行内容同步，更新远程节点
+ GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT))
+ doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
} else {
- doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c); // 执行内容同步，添加远程节点
+ doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
}
} else {
- Log.w(TAG, "failed to query root folder"); // 记录警告日志
+ Log.w(TAG, "查询根文件夹失败");
}
} finally {
- if (c != null) { // 如果游标不为空
- c.close(); // 关闭游标
- c = null; // 置空游标
+ if (c != null) {
+ c.close();
+ c = null;
}
}
@@ -393,32 +413,32 @@ public class GTaskManager { // GTask管理器类
try {
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)",
new String[] {
- String.valueOf(Notes.ID_CALL_RECORD_FOLDER) // 查询通话记录文件夹
+ String.valueOf(Notes.ID_CALL_RECORD_FOLDER)
}, null);
- if (c != null) { // 如果游标不为空
- if (c.moveToNext()) { // 移动到下一项
- gid = c.getString(SqlNote.GTASK_ID_COLUMN); // 获取GID
- node = mGTaskHashMap.get(gid); // 获取节点
- if (node != null) { // 如果节点不为空
- mGTaskHashMap.remove(gid); // 从映射中移除节点
- mGidToNid.put(gid, (long) Notes.ID_CALL_RECORD_FOLDER); // 更新GID到NID的映射
- mNidToGid.put((long) Notes.ID_CALL_RECORD_FOLDER, gid); // 更新NID到GID的映射
- // 对于系统文件夹，仅在必要时更新远程名称
+ 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);
+ // 对于系统文件夹，如果需要，只更新远程名称
if (!node.getName().equals(
GTaskStringUtils.MIUI_FOLDER_PREFFIX
- + GTaskStringUtils.FOLDER_CALL_NOTE)) // 如果名称不等于通话记录文件夹
- doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c); // 执行内容同步，更新远程节点
+ + GTaskStringUtils.FOLDER_CALL_NOTE))
+ doContentSync(Node.SYNC_ACTION_UPDATE_REMOTE, node, c);
} else {
- doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c); // 执行内容同步，添加远程节点
+ doContentSync(Node.SYNC_ACTION_ADD_REMOTE, node, c);
}
}
} else {
- Log.w(TAG, "failed to query call note folder"); // 记录警告日志
+ Log.w(TAG, "查询通话记录文件夹失败");
}
} finally {
- if (c != null) { // 如果游标不为空
- c.close(); // 关闭游标
- c = null; // 置空游标
+ if (c != null) {
+ c.close();
+ c = null;
}
}
@@ -426,372 +446,372 @@ public class GTaskManager { // GTask管理器类
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); // 获取GID
- node = mGTaskHashMap.get(gid); // 获取节点
- if (node != null) { // 如果节点不为空
- mGTaskHashMap.remove(gid); // 从映射中移除节点
- mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); // 更新GID到NID的映射
- mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); // 更新NID到GID的映射
- syncType = node.getSyncAction(c); // 获取同步类型
+ 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) { // 如果GID为空
- // 本地添加
- syncType = Node.SYNC_ACTION_ADD_REMOTE; // 设置为添加远程节点
+ if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) {
+ // 本地新增
+ syncType = Node.SYNC_ACTION_ADD_REMOTE;
} else {
// 远程删除
- syncType = Node.SYNC_ACTION_DEL_LOCAL; // 设置为删除本地节点
+ syncType = Node.SYNC_ACTION_DEL_LOCAL;
}
}
- doContentSync(syncType, node, c); // 执行内容同步
+ doContentSync(syncType, node, c);
}
} else {
- Log.w(TAG, "failed to query existing folder"); // 记录警告日志
+ Log.w(TAG, "查询现有文件夹失败");
}
} finally {
- if (c != null) { // 如果游标不为空
- c.close(); // 关闭游标
- c = null; // 置空游标
+ if (c != null) {
+ c.close();
+ c = null;
}
}
- // 处理远程添加的文件夹
- Iterator> iter = mGTaskListHashMap.entrySet().iterator(); // 获取迭代器
- while (iter.hasNext()) { // 遍历映射
- Map.Entry entry = iter.next(); // 获取映射项
- gid = entry.getKey(); // 获取GID
- node = entry.getValue(); // 获取节点
- if (mGTaskHashMap.containsKey(gid)) { // 如果映射中包含GID
- mGTaskHashMap.remove(gid); // 从映射中移除节点
- doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); // 执行内容同步，添加本地节点
+ // 处理远程新增的文件夹
+ 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(); // 提交更新
+ if (!mCancelled)
+ GTaskClient.getInstance().commitUpdate();
}
- private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException { // 执行内容同步
- if (mCancelled) { // 如果已取消
- return; // 返回
+ 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); // 添加本地节点
+ MetaData meta;
+ switch (syncType) {
+ case Node.SYNC_ACTION_ADD_LOCAL:
+ addLocalNode(node);
break;
- case Node.SYNC_ACTION_ADD_REMOTE: // 远程添加
- addRemoteNode(node, c); // 添加远程节点
+ 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); // 删除远程节点
+ 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)); // 添加到本地删除ID集合
+ 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); // 删除远程节点
+ case Node.SYNC_ACTION_DEL_REMOTE:
+ meta = mMetaHashMap.get(node.getGid());
+ if (meta != null) {
+ GTaskClient.getInstance().deleteNode(meta);
}
- GTaskClient.getInstance().deleteNode(node); // 删除远程节点
+ GTaskClient.getInstance().deleteNode(node);
break;
- case Node.SYNC_ACTION_UPDATE_LOCAL: // 本地更新
- updateLocalNode(node, c); // 更新本地节点
+ case Node.SYNC_ACTION_UPDATE_LOCAL:
+ updateLocalNode(node, c);
break;
- case Node.SYNC_ACTION_UPDATE_REMOTE: // 远程更新
- updateRemoteNode(node, c); // 更新远程节点
+ case Node.SYNC_ACTION_UPDATE_REMOTE:
+ updateRemoteNode(node, c);
break;
- case Node.SYNC_ACTION_UPDATE_CONFLICT: // 更新冲突
- // 合并两个修改可能是个好主意
- // 现在只是简单地使用本地更新
- updateRemoteNode(node, c); // 更新远程节点
+ case Node.SYNC_ACTION_UPDATE_CONFLICT:
+ // 合并两者的修改可能是个好主意，目前简单地使用本地更新
+ updateRemoteNode(node, c);
break;
- case Node.SYNC_ACTION_NONE: // 无操作
+ case Node.SYNC_ACTION_NONE:
break;
- case Node.SYNC_ACTION_ERROR: // 错误
- default: // 默认情况
- throw new ActionFailureException("unkown sync action type"); // 抛出操作失败异常
+ case Node.SYNC_ACTION_ERROR:
+ default:
+ throw new ActionFailureException("未知的同步操作类型");
}
}
- private void addLocalNode(Node node) throws NetworkFailureException { // 添加本地节点
- if (mCancelled) { // 如果已取消
- return; // 返回
+ private void addLocalNode(Node node) throws NetworkFailureException {
+ if (mCancelled) {
+ return;
}
- SqlNote sqlNote; // SQL笔记
- if (node instanceof TaskList) { // 如果是任务列表
+ 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); // 创建SQL笔记
+ 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); // 创建SQL笔记
+ GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE)) {
+ sqlNote = new SqlNote(mContext, Notes.ID_CALL_RECORD_FOLDER);
} else {
- sqlNote = new SqlNote(mContext); // 创建SQL笔记
- sqlNote.setContent(node.getLocalJSONFromContent()); // 设置内容
- sqlNote.setParentId(Notes.ID_ROOT_FOLDER); // 设置父ID
+ sqlNote = new SqlNote(mContext);
+ sqlNote.setContent(node.getLocalJSONFromContent());
+ sqlNote.setParentId(Notes.ID_ROOT_FOLDER);
}
- } else { // 如果是任务
- sqlNote = new SqlNote(mContext); // 创建SQL笔记
- JSONObject js = node.getLocalJSONFromContent(); // 获取本地内容的JSON对象
+ } 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); // 获取笔记头的JSON对象
- if (note.has(NoteColumns.ID)) { // 如果包含ID
- long id = note.getLong(NoteColumns.ID); // 获取ID
- if (DataUtils.existInNoteDatabase(mContentResolver, id)) { // 如果ID在数据库中存在
+ 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)) {
// ID不可用，必须创建一个新的
- note.remove(NoteColumns.ID); // 移除ID
+ 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); // 获取数据的JSON对象
- if (data.has(DataColumns.ID)) { // 如果包含数据ID
- long dataId = data.getLong(DataColumns.ID); // 获取数据ID
- if (DataUtils.existInDataDatabase(mContentResolver, dataId)) { // 如果数据ID在数据库中存在
- // 数据ID不可用，必须创建一个新的
- data.remove(DataColumns.ID); // 移除数据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)) {
+ // data ID不可用，必须创建一个新的
+ data.remove(DataColumns.ID);
}
}
}
}
- } catch (JSONException e) { // 捕获JSON异常
- Log.w(TAG, e.toString()); // 记录警告日志
- e.printStackTrace(); // 打印堆栈跟踪
+ } catch (JSONException e) {
+ Log.w(TAG, e.toString());
+ e.printStackTrace();
}
- sqlNote.setContent(js); // 设置内容
+ sqlNote.setContent(js);
- Long parentId = mGidToNid.get(((Task) node).getParent().getGid()); // 获取父ID
- if (parentId == null) { // 如果父ID为空
- Log.e(TAG, "cannot find task's parent id locally"); // 记录错误日志
- throw new ActionFailureException("cannot add local node"); // 抛出操作失败异常
+ Long parentId = mGidToNid.get(((Task) node).getParent().getGid());
+ if (parentId == null) {
+ Log.e(TAG, "在本地找不到任务的父ID");
+ throw new ActionFailureException("无法添加本地节点");
}
- sqlNote.setParentId(parentId.longValue()); // 设置父ID
+ sqlNote.setParentId(parentId.longValue());
}
// 创建本地节点
- sqlNote.setGtaskId(node.getGid()); // 设置GTask ID
- sqlNote.commit(false); // 提交
+ sqlNote.setGtaskId(node.getGid());
+ sqlNote.commit(false);
// 更新GID-NID映射
- mGidToNid.put(node.getGid(), sqlNote.getId()); // 更新GID到NID的映射
- mNidToGid.put(sqlNote.getId(), node.getGid()); // 更新NID到GID的映射
+ mGidToNid.put(node.getGid(), sqlNote.getId());
+ mNidToGid.put(sqlNote.getId(), node.getGid());
- // 更新元数据
- updateRemoteMeta(node.getGid(), sqlNote); // 更新远程元数据
+ // 更新meta信息
+ updateRemoteMeta(node.getGid(), sqlNote);
}
- private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException { // 更新本地节点
- if (mCancelled) { // 如果已取消
- return; // 返回
+ private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException {
+ if (mCancelled) {
+ return;
}
- SqlNote sqlNote; // SQL笔记
- // 在本地更新笔记
- sqlNote = new SqlNote(mContext, c); // 创建SQL笔记
- sqlNote.setContent(node.getLocalJSONFromContent()); // 设置内容
+ SqlNote sqlNote;
+ // 本地更新笔记
+ 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); // 获取父ID
- if (parentId == null) { // 如果父ID为空
- Log.e(TAG, "cannot find task's parent id locally"); // 记录错误日志
- throw new ActionFailureException("cannot update local node"); // 抛出操作失败异常
+ : new Long(Notes.ID_ROOT_FOLDER);
+ if (parentId == null) {
+ Log.e(TAG, "在本地找不到任务的父ID");
+ throw new ActionFailureException("无法更新本地节点");
}
- sqlNote.setParentId(parentId.longValue()); // 设置父ID
- sqlNote.commit(true); // 提交
+ sqlNote.setParentId(parentId.longValue());
+ sqlNote.commit(true);
- // 更新元信息
- updateRemoteMeta(node.getGid(), sqlNote); // 更新远程元数据
+ // 更新meta信息
+ updateRemoteMeta(node.getGid(), sqlNote);
}
- private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException { // 添加远程节点
- if (mCancelled) { // 如果已取消
- return; // 返回
+
+ private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
+ if (mCancelled) {
+ return;
}
- SqlNote sqlNote = new SqlNote(mContext, c); // 创建SQL笔记
- Node n; // 节点
+ SqlNote sqlNote = new SqlNote(mContext, c);
+ Node n;
// 远程更新
- if (sqlNote.isNoteType()) { // 如果是笔记类型
- Task task = new Task(); // 创建任务对象
- task.setContentByLocalJSON(sqlNote.getContent()); // 设置内容
-
- String parentGid = mNidToGid.get(sqlNote.getParentId()); // 获取父GID
- if (parentGid == null) { // 如果父GID为空
- Log.e(TAG, "cannot find task's parent tasklist"); // 记录错误日志
- throw new ActionFailureException("cannot add remote task"); // 抛出操作失败异常
+ if (sqlNote.isNoteType()) {
+ Task task = new Task();
+ task.setContentByLocalJSON(sqlNote.getContent());
+
+ String parentGid = mNidToGid.get(sqlNote.getParentId());
+ if (parentGid == null) {
+ Log.e(TAG, "找不到任务的父任务列表");
+ throw new ActionFailureException("无法添加远程任务");
}
- mGTaskListHashMap.get(parentGid).addChildTask(task); // 添加子任务
+ mGTaskListHashMap.get(parentGid).addChildTask(task);
- GTaskClient.getInstance().createTask(task); // 创建任务
- n = (Node) task; // 赋值节点
+ GTaskClient.getInstance().createTask(task);
+ n = (Node) task;
// 添加元数据
- updateRemoteMeta(task.getGid(), sqlNote); // 更新远程元数据
- } else { // 如果是任务列表
- TaskList tasklist = null; // 任务列表
+ updateRemoteMeta(task.getGid(), sqlNote);
+ } else {
+ TaskList tasklist = null;
// 如果文件夹已经存在，则跳过
- 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; // 添加通话记录文件夹后缀
+ 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(); // 添加文件夹片段
-
- Iterator> iter = mGTaskListHashMap.entrySet().iterator(); // 获取迭代器
- while (iter.hasNext()) { // 遍历映射
- Map.Entry entry = iter.next(); // 获取映射项
- String gid = entry.getKey(); // 获取GID
- TaskList list = entry.getValue(); // 获取任务列表
-
- if (list.getName().equals(folderName)) { // 如果名称匹配
- tasklist = list; // 赋值任务列表
- if (mGTaskHashMap.containsKey(gid)) { // 如果映射中包含GID
- mGTaskHashMap.remove(gid); // 从映射中移除节点
+ folderName += sqlNote.getSnippet();
+
+ 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; // 退出循环
+ break;
}
}
- // 如果没有匹配，可以添加
- if (tasklist == null) { // 如果任务列表为空
- tasklist = new TaskList(); // 创建新的任务列表
- tasklist.setContentByLocalJSON(sqlNote.getContent()); // 设置内容
- GTaskClient.getInstance().createTaskList(tasklist); // 创建任务列表
- mGTaskListHashMap.put(tasklist.getGid(), tasklist); // 添加到GTask任务列表映射
+ // 没有匹配的，现在可以添加
+ if (tasklist == null) {
+ tasklist = new TaskList();
+ tasklist.setContentByLocalJSON(sqlNote.getContent());
+ GTaskClient.getInstance().createTaskList(tasklist);
+ mGTaskListHashMap.put(tasklist.getGid(), tasklist);
}
- n = (Node) tasklist; // 赋值节点
+ n = (Node) tasklist;
}
// 更新本地笔记
- sqlNote.setGtaskId(n.getGid()); // 设置GTask ID
- sqlNote.commit(false); // 提交
- sqlNote.resetLocalModified(); // 重置本地修改标志
- sqlNote.commit(true); // 提交
-
- // GID-ID映射
- mGidToNid.put(n.getGid(), sqlNote.getId()); // 更新GID到NID的映射
- mNidToGid.put(sqlNote.getId(), n.getGid()); // 更新NID到GID的映射
+ sqlNote.setGtaskId(n.getGid());
+ sqlNote.commit(false);
+ sqlNote.resetLocalModified();
+ sqlNote.commit(true);
+
+ // gid-id 映射
+ mGidToNid.put(n.getGid(), sqlNote.getId());
+ mNidToGid.put(sqlNote.getId(), n.getGid());
}
- private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException { // 更新远程节点
- if (mCancelled) { // 如果已取消
- return; // 返回
+ private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException {
+ if (mCancelled) {
+ return;
}
- SqlNote sqlNote = new SqlNote(mContext, c); // 创建SQL笔记
+ SqlNote sqlNote = new SqlNote(mContext, c);
// 远程更新
- node.setContentByLocalJSON(sqlNote.getContent()); // 设置内容
- GTaskClient.getInstance().addUpdateNode(node); // 添加更新节点
+ node.setContentByLocalJSON(sqlNote.getContent());
+ GTaskClient.getInstance().addUpdateNode(node);
// 更新元数据
- updateRemoteMeta(node.getGid(), sqlNote); // 更新远程元数据
+ updateRemoteMeta(node.getGid(), sqlNote);
// 如果需要，移动任务
- if (sqlNote.isNoteType()) { // 如果是笔记类型
- Task task = (Task) node; // 赋值任务
- TaskList preParentList = task.getParent(); // 获取之前的父任务列表
-
- String curParentGid = mNidToGid.get(sqlNote.getParentId()); // 获取当前父GID
- if (curParentGid == null) { // 如果当前父GID为空
- Log.e(TAG, "cannot find task's parent tasklist"); // 记录错误日志
- throw new ActionFailureException("cannot update remote task"); // 抛出操作失败异常
+ if (sqlNote.isNoteType()) {
+ Task task = (Task) node;
+ TaskList preParentList = task.getParent();
+
+ String curParentGid = mNidToGid.get(sqlNote.getParentId());
+ if (curParentGid == null) {
+ Log.e(TAG, "找不到任务的父任务列表");
+ throw new ActionFailureException("无法更新远程任务");
}
- TaskList curParentList = mGTaskListHashMap.get(curParentGid); // 获取当前父任务列表
+ TaskList curParentList = mGTaskListHashMap.get(curParentGid);
- if (preParentList != curParentList) { // 如果之前的父任务列表与当前不同
- preParentList.removeChildTask(task); // 从之前的父任务列表中移除任务
- curParentList.addChildTask(task); // 添加到当前父任务列表
- GTaskClient.getInstance().moveTask(task, preParentList, curParentList); // 移动任务
+ if (preParentList != curParentList) {
+ preParentList.removeChildTask(task);
+ curParentList.addChildTask(task);
+ GTaskClient.getInstance().moveTask(task, preParentList, curParentList);
}
}
// 清除本地修改标志
- sqlNote.resetLocalModified(); // 重置本地修改标志
- sqlNote.commit(true); // 提交
+ sqlNote.resetLocalModified();
+ sqlNote.commit(true);
}
- private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException { // 更新远程元数据
- if (sqlNote != null && sqlNote.isNoteType()) { // 如果SQL笔记不为空且是笔记类型
- 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); // 创建任务
+ 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);
}
}
}
- private void refreshLocalSyncId() throws NetworkFailureException { // 刷新本地同步ID
- if (mCancelled) { // 如果已取消
- return; // 返回
+ private void refreshLocalSyncId() throws NetworkFailureException {
+ if (mCancelled) {
+ return;
}
- // 获取最新的GTask列表
- mGTaskHashMap.clear(); // 清空GTask节点映射
- mGTaskListHashMap.clear(); // 清空GTask任务列表映射
- mMetaHashMap.clear(); // 清空元数据映射
- initGTaskList(); // 初始化GTask列表
+ // 获取最新的gtask列表
+ mGTaskHashMap.clear();
+ mGTaskListHashMap.clear();
+ mMetaHashMap.clear();
+ initGTaskList();
- Cursor c = null; // 游标
+ Cursor c = null;
try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, // 查询笔记
+ 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) // 排除系统类型和垃圾桶
- }, NoteColumns.TYPE + " DESC"); // 按类型降序排列
- if (c != null) { // 如果游标不为空
- while (c.moveToNext()) { // 遍历游标
- String gid = c.getString(SqlNote.GTASK_ID_COLUMN); // 获取GID
- Node node = mGTaskHashMap.get(gid); // 获取节点
- if (node != null) { // 如果节点不为空
- mGTaskHashMap.remove(gid); // 从映射中移除节点
- ContentValues values = new ContentValues(); // 创建内容值
- values.put(NoteColumns.SYNC_ID, node.getLastModified()); // 更新同步ID
+ String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)
+ }, NoteColumns.TYPE + " DESC");
+ 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);
+ ContentValues values = new ContentValues();
+ values.put(NoteColumns.SYNC_ID, node.getLastModified());
mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI,
- c.getLong(SqlNote.ID_COLUMN)), values, null, null); // 更新数据库
+ c.getLong(SqlNote.ID_COLUMN)), values, null, null);
} else {
- Log.e(TAG, "something is missed"); // 记录错误日志
+ Log.e(TAG, "有些数据缺失");
throw new ActionFailureException(
- "some local items don't have gid after sync"); // 抛出操作失败异常
+ "同步后某些本地项目没有gid");
}
}
} else {
- Log.w(TAG, "failed to query local note to refresh sync id"); // 记录警告日志
+ Log.w(TAG, "查询本地笔记以刷新同步ID失败");
}
} finally {
- if (c != null) { // 如果游标不为空
- c.close(); // 关闭游标
- c = null; // 置空游标
+ if (c != null) {
+ c.close();
+ c = null;
}
}
}
- public String getSyncAccount() { // 获取同步账户
- return GTaskClient.getInstance().getSyncAccount().name; // 返回同步账户名称
+ public String getSyncAccount() {
+ return GTaskClient.getInstance().getSyncAccount().name;
}
- public void cancelSync() { // 取消同步
- mCancelled = true; // 设置取消状态为已取消
+ public void cancelSync() {
+ mCancelled = true;
}
-}
\ No newline at end of file
+}
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
index 4e3d668..6082be4 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+<<<<<<< HEAD
package net.micode.notes.gtask.remote; // 定义包名
import android.app.Activity; // 导入Activity类
@@ -59,10 +60,77 @@ public class GTaskSyncService extends Service { // 定义GTaskSyncService类，
private void cancelSync() { // 取消同步的方法
if (mSyncTask != null) { // 如果当前有同步任务
mSyncTask.cancelSync(); // 取消同步任务
+=======
+package net.micode.notes.gtask.remote;
+
+import android.app.Activity;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+
+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;
+
+ // GTask服务广播名称
+ 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 = "";
+
+ // 启动同步任务
+ private void startSync() {
+ if (mSyncTask == null) {
+ // 创建新的同步任务
+ mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
+ // 完成时回调
+ public void onComplete() {
+ // 清空同步任务
+ mSyncTask = null;
+ // 发送广播
+ sendBroadcast("");
+ // 停止服务
+ stopSelf();
+ }
+ });
+ // 发送广播
+ sendBroadcast("");
+ // 执行同步任务
+ mSyncTask.execute();
+ }
+ }
+
+ // 取消同步任务
+ private void cancelSync() {
+ if (mSyncTask != null) {
+ mSyncTask.cancelSync();
+>>>>>>> liming
}
}
@Override
+<<<<<<< HEAD
public void onCreate() { // 服务创建时调用
mSyncTask = null; // 初始化同步任务为null
}
@@ -125,4 +193,91 @@ public class GTaskSyncService extends Service { // 定义GTaskSyncService类，
public static String getProgressString() { // 静态方法获取同步进度
return mSyncProgress; // 返回同步进度
}
-}
\ No newline at end of file
+}
+=======
+ public void onCreate() {
+ // 清空同步任务
+ 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)) {
+ case ACTION_START_SYNC:
+ // 启动同步
+ startSync();
+ break;
+ case ACTION_CANCEL_SYNC:
+ // 取消同步
+ cancelSync();
+ break;
+ default:
+ break;
+ }
+ return START_STICKY;
+ }
+ return super.onStartCommand(intent, flags, startId);
+ }
+
+ @Override
+ public void onLowMemory() {
+ if (mSyncTask != null) {
+ // 低内存时取消同步任务
+ mSyncTask.cancelSync();
+ }
+ }
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return null;
+ }
+
+ // 发送广播
+ public void sendBroadcast(String msg) {
+ // 更新同步进度消息
+ mSyncProgress = msg;
+ // 创建意图
+ 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) {
+ // 设置活动上下文
+ GTaskManager.getInstance().setActivityContext(activity);
+ // 创建意图
+ Intent intent = new Intent(activity, GTaskSyncService.class);
+ // 添加动作类型参数
+ intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC);
+ // 启动服务
+ activity.startService(intent);
+ }
+
+ // 取消同步服务
+ public static void cancelSync(Context context) {
+ // 创建意图
+ 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;
+ }
+}
+>>>>>>> liming
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index 85723be..e648f9d 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -1,29 +1,11 @@
-/*
- * 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.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.AudioAttributes;
import android.media.MediaPlayer;
import android.media.RingtoneManager;
import android.net.Uri;
@@ -39,12 +21,11 @@ import net.micode.notes.tool.DataUtils;
import java.io.IOException;
-
-public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
+public class AlarmAlertActivity extends Activity implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
private long mNoteId;
private String mSnippet;
private static final int SNIPPET_PREW_MAX_LEN = 60;
- MediaPlayer mPlayer;
+ private MediaPlayer mPlayer;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -85,36 +66,25 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
private boolean isScreenOn() {
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
- return pm.isScreenOn();
+ return pm.isInteractive(); // updated for modern Android
}
private void playAlarmSound() {
Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
- int silentModeStreams = Settings.System.getInt(getContentResolver(),
- Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
-
- if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) {
- mPlayer.setAudioStreamType(silentModeStreams);
- } else {
- mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM);
- }
try {
+ AudioAttributes attributes = new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_ALARM)
+ .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+ .build();
+
+ mPlayer.setAudioAttributes(attributes);
mPlayer.setDataSource(this, url);
mPlayer.prepare();
mPlayer.setLooping(true);
mPlayer.start();
- } catch (IllegalArgumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IllegalStateException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
+ } catch (IllegalArgumentException | SecurityException |
+ IllegalStateException | IOException e) {
e.printStackTrace();
}
}
@@ -130,19 +100,17 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
dialog.show().setOnDismissListener(this);
}
+ @Override
public void onClick(DialogInterface dialog, int which) {
- switch (which) {
- case DialogInterface.BUTTON_NEGATIVE:
- Intent intent = new Intent(this, NoteEditActivity.class);
- intent.setAction(Intent.ACTION_VIEW);
- intent.putExtra(Intent.EXTRA_UID, mNoteId);
- startActivity(intent);
- break;
- default:
- break;
+ if (which == DialogInterface.BUTTON_NEGATIVE) {
+ Intent intent = new Intent(this, NoteEditActivity.class);
+ intent.setAction(Intent.ACTION_VIEW);
+ intent.putExtra(Intent.EXTRA_UID, mNoteId);
+ startActivity(intent);
}
}
+ @Override
public void onDismiss(DialogInterface dialog) {
stopAlarmSound();
finish();
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index f221202..42ddaf2 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -1,19 +1,3 @@
-/*
- * 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.ui;
import android.app.AlarmManager;
@@ -27,16 +11,15 @@ 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
+ private static final String[] PROJECTION = new String[]{
+ NoteColumns.ID,
+ NoteColumns.ALERTED_DATE
};
- private static final int COLUMN_ID = 0;
- private static final int COLUMN_ALERTED_DATE = 1;
+ private static final int COLUMN_ID = 0;
+ private static final int COLUMN_ALERTED_DATE = 1;
@Override
public void onReceive(Context context, Intent intent) {
@@ -44,22 +27,30 @@ public class AlarmInitReceiver extends BroadcastReceiver {
Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
PROJECTION,
NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
- new String[] { String.valueOf(currentDate) },
+ new String[]{String.valueOf(currentDate)},
null);
if (c != null) {
if (c.moveToFirst()) {
+ AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
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)));
+<<<<<<< HEAD
PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0);
AlarmManager alermManager = (AlarmManager) context
- .getSystemService(Context.ALARM_SERVICE);
- alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent);
+ 0,
+ sender,
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE // Updated flags
+ );
+
+ if (alarmManager != null) {
+ alarmManager.setExact(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); // Use setExact
+ }
+>>>>>>> liming
} while (c.moveToNext());
}
- c.close();
}
}
}
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
index 54e503b..4d96a32 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -1,19 +1,3 @@
-/*
- * 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.ui;
import android.content.BroadcastReceiver;
@@ -24,7 +8,7 @@ public class AlarmReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
intent.setClass(context, AlarmAlertActivity.class);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
context.startActivity(intent);
}
}
diff --git a/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 96a9ff8..287e437 100644
--- a/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -358,8 +358,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
|| ev.getX() > (x + view.getWidth())
|| ev.getY() < y
|| ev.getY() > (y + view.getHeight())) {
- return false;
- }
+ return false;
+ }
return true;
}
@@ -418,7 +418,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
- mWorkingNote.getWidgetId()
+ mWorkingNote.getWidgetId()
});
sendBroadcast(intent);
diff --git a/src/Notesmaster/gradle/wrapper/gradle-wrapper.properties b/src/Notesmaster/gradle/wrapper/gradle-wrapper.properties
index a0ad5d9..84af696 100644
--- a/src/Notesmaster/gradle/wrapper/gradle-wrapper.properties
+++ b/src/Notesmaster/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Mar 15 16:51:33 CST 2025
+#Thu Apr 17 15:33:14 CST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://mirrors.aliyun.com/macports/distfiles/gradle/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/Notesmaster/settings.gradle.kts b/src/Notesmaster/settings.gradle.kts
index 5300e56..77f1141 100644
--- a/src/Notesmaster/settings.gradle.kts
+++ b/src/Notesmaster/settings.gradle.kts
@@ -1,5 +1,9 @@
pluginManagement {
repositories {
+ maven { url=uri( "https://maven.aliyun.com/repository/central") }
+ maven { url=uri( "https://maven.aliyun.com/repository/public") }
+ maven { url=uri( "https://maven.aliyun.com/repository/google") }
+ maven { url=uri( "https://maven.aliyun.com/repository/gradle-plugin") }
google {
content {
includeGroupByRegex("com\\.android.*")
@@ -14,6 +18,10 @@ pluginManagement {
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
+ maven { url=uri( "https://maven.aliyun.com/repository/central") }
+ maven { url=uri( "https://maven.aliyun.com/repository/public") }
+ maven { url=uri( "https://maven.aliyun.com/repository/google") }
+ maven { url=uri( "https://maven.aliyun.com/repository/gradle-plugin") }
google()
mavenCentral()
}
diff --git a/test.txt b/test.txt
new file mode 100644
index 0000000..e69de29