();
}
+ // 检查缓存中是否已存在该电话号码的记录
if(sContactCache.containsKey(phoneNumber)) {
return sContactCache.get(phoneNumber);
}
+ // 动态构建查询条件（替换模板中的"+"为实际的匹配前缀）
String selection = CALLER_ID_SELECTION.replace("+",
PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));
Cursor cursor = context.getContentResolver().query(
@@ -54,6 +60,7 @@ public class Contact {
new String[] { phoneNumber },
null);
+ // 处理查询结果
if (cursor != null && cursor.moveToFirst()) {
try {
String name = cursor.getString(0);
diff --git a/java/net/micode/notes/data/Notes.java b/java/net/micode/notes/data/Notes.java
index 492eac1..b188846 100644
--- a/java/net/micode/notes/data/Notes.java
+++ b/java/net/micode/notes/data/Notes.java
@@ -18,8 +18,10 @@ package net.micode.notes.data;
import android.net.Uri;
public class Notes {
- public static final String AUTHORITY = "micode_notes";
- public static final String TAG = "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;
@@ -30,11 +32,13 @@ public class Notes {
* {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
* {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
*/
+ //定义了系统文件夹的标识符
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";
public static final String INTENT_EXTRA_WIDGET_ID = "net.micode.notes.widget_id";
@@ -42,6 +46,7 @@ public class Notes {
public static final String INTENT_EXTRA_FOLDER_ID = "net.micode.notes.folder_id";
public static final String INTENT_EXTRA_CALL_DATE = "net.micode.notes.call_date";
+ //定义了组件的类型、无效类型、2倍大小和4倍大小
public static final int TYPE_WIDGET_INVALIDE = -1;
public static final int TYPE_WIDGET_2X = 0;
public static final int TYPE_WIDGET_4X = 1;
@@ -54,21 +59,24 @@ public class Notes {
/**
* Uri to query all notes and folders
*/
+
+ /**
+ * 表示便签（Note）的内容URI，用于访问便签相关数据
+ */
+
public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
/**
* Uri to query data
*/
+ //表示数据（Data）的内容URI，用于访问数据相关信息。
public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
-<<<<<<< HEAD
-=======
/**
定义了便签（Note）数据表的列名和数据类型，
*包括便签的唯一ID、父级ID、创建日期、修改日期、
*提醒日期、内容摘要、小部件ID、小部件类型、背景颜色ID、
* 附件标识、便签数量、类型、同步ID、本地修改标识、原始父级ID、GTask ID和版本号等。*/
->>>>>>> f80461a97b63b394a77c3412d981ca8f1288a7cd
public interface NoteColumns {
/**
* The unique ID for a row
@@ -175,6 +183,11 @@ public class Notes {
public static final String VERSION = "version";
}
+ /**
+ * 定义了数据（Data）表的列名和数据类型，
+ * 包括数据的唯一ID、MIME类型、关联的便签ID、创建日期、修改日期、内容、
+ * 以及5个通用数据列（data1至data5）用于不同类型的数据存储。
+ */
public interface DataColumns {
/**
* The unique ID for a row
@@ -213,39 +226,19 @@ public class Notes {
public static final String CONTENT = "content";
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * integer data type
- * Type: INTEGER
- */
+
public static final String DATA1 = "data1";
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * integer data type
- * Type: INTEGER
- */
+
public static final String DATA2 = "data2";
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- * Type: TEXT
- */
+
public static final String DATA3 = "data3";
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- * Type: TEXT
- */
+
public static final String DATA4 = "data4";
- /**
- * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
- * TEXT data type
- * Type: TEXT
- */
+
public static final String DATA5 = "data5";
}
@@ -254,34 +247,45 @@ public class Notes {
* Mode to indicate the text in check list mode or not
* Type: Integer 1:check list mode 0: normal mode
*/
+ //表示文本便签的形式，用于指示是否处于检查列表模式
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";
+ //定义了文本便签的内容Uri
public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
}
+
public static final class CallNote implements DataColumns {
/**
* Call date for this record
* Type: INTEGER (long)
*/
+ //表示通话记录的日期
public static final String CALL_DATE = DATA1;
/**
* Phone number for this record
* Type: 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";
+ //定义了通话记录的内容Uri
public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
}
}
diff --git a/java/net/micode/notes/data/NotesDatabaseHelper.java b/java/net/micode/notes/data/NotesDatabaseHelper.java
index ea20f73..3ca153f 100644
--- a/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -22,26 +22,34 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
+//对Notes类中DataColumns、DataConstants、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;
+ //定义了TABLE接口
public interface TABLE {
+ //定义了两个表的名称
public static final String NOTE = "note";
public static final String DATA = "data";
}
+ //定义了标签
private static final String TAG = "NotesDatabaseHelper";
+ //定义了一个静态变量mInstance，用于表示NotesDatabaseHelper类的实例
private static NotesDatabaseHelper mInstance;
+ //定义了SQL语句分别用于创建便签表、数据表、包含ID、便签和数据的表格
private static final String CREATE_NOTE_TABLE_SQL =
"CREATE TABLE " + TABLE.NOTE + "(" +
NoteColumns.ID + " INTEGER PRIMARY KEY," +
@@ -84,7 +92,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Increase folder's note count when move note to the folder
+ * 将笔记移动到文件夹时增加文件夹的笔记数
*/
+ //定义了对数据库进行增删改查等工作的SQL语句
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 +
@@ -96,6 +106,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Decrease folder's note count when move note from folder
+ * 从文件夹中移动笔记时减少文件夹的笔记计数
*/
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER decrease_folder_count_on_update " +
@@ -109,6 +120,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Increase folder's note count when insert new note to the folder
+ * 在文件夹中插入新笔记时增加文件夹的笔记数
*/
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
"CREATE TRIGGER increase_folder_count_on_insert " +
@@ -121,6 +133,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Decrease folder's note count when delete note from the folder
+ * 从文件夹中删除笔记时减少文件夹的笔记计数
*/
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
"CREATE TRIGGER decrease_folder_count_on_delete " +
@@ -134,6 +147,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Update note's content when insert data with type {@link DataConstants#NOTE}
+ * 插入类型为｛DataConstants.Note｝的数据时更新注释的内容
*/
private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
"CREATE TRIGGER update_note_content_on_insert " +
@@ -147,6 +161,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Update note's content when data with {@link DataConstants#NOTE} type has changed
+ * 当｛DataConstants.Note｝类型的数据发生更改时，更新注释的内容
*/
private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER update_note_content_on_update " +
@@ -160,6 +175,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Update note's content when data with {@link DataConstants#NOTE} type has deleted
+ * 删除｛DataConstants.Note｝类型的数据后，更新注释的内容
*/
private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
"CREATE TRIGGER update_note_content_on_delete " +
@@ -173,6 +189,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Delete datas belong to note which has been deleted
+ * 删除数据属于已删除的注释
*/
private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
"CREATE TRIGGER delete_data_on_delete " +
@@ -184,6 +201,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Delete notes belong to folder which has been deleted
+ * 删除数据属于已删除的注释
*/
private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
"CREATE TRIGGER folder_delete_notes_on_delete " +
@@ -195,6 +213,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/**
* Move notes belong to folder which has been moved to trash folder
+ * 移动笔记属于已移动到垃圾文件夹的文件夹
*/
private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
"CREATE TRIGGER folder_move_notes_on_trash " +
@@ -210,13 +229,19 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
super(context, DB_NAME, null, DB_VERSION);
}
+ //创建便签表
public void createNoteTable(SQLiteDatabase db) {
+ //执行创建表的SQL语句
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");
@@ -235,6 +260,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.execSQL(FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER);
}
+ //创建系统文件夹，包括通话记录文件夹、默认文件夹、临时文件夹和回收站文件夹。
private void createSystemFolder(SQLiteDatabase db) {
ContentValues values = new ContentValues();
@@ -270,13 +296,19 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.insert(TABLE.NOTE, null, values);
}
+ //创建数据表
public void createDataTable(SQLiteDatabase db) {
+ //执行创建表的SQL语句
db.execSQL(CREATE_DATA_TABLE_SQL);
+ //重新创建表的触发器
reCreateDataTableTriggers(db);
+ //创建数据表的索引
db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL);
+ //打印日志
Log.d(TAG, "data table has been created");
}
+ //重新创建数据表的触发器
private void reCreateDataTableTriggers(SQLiteDatabase db) {
db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_update");
@@ -287,6 +319,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.execSQL(DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER);
}
+ //获取NotesDatabaseHelper类的实例
static synchronized NotesDatabaseHelper getInstance(Context context) {
if (mInstance == null) {
mInstance = new NotesDatabaseHelper(context);
@@ -294,12 +327,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
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;
@@ -333,6 +368,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
}
}
+ //升级数据库到版本2的操作
private void upgradeToV2(SQLiteDatabase db) {
db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
db.execSQL("DROP TABLE IF EXISTS " + TABLE.DATA);
@@ -340,6 +376,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
createDataTable(db);
}
+ //升级数据库到版本3的操作
private void upgradeToV3(SQLiteDatabase db) {
// drop unused triggers
db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
@@ -355,6 +392,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.insert(TABLE.NOTE, null, values);
}
+ //升级数据库到版本4的操作
private void upgradeToV4(SQLiteDatabase db) {
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ " INTEGER NOT NULL DEFAULT 0");
diff --git a/java/net/micode/notes/data/NotesProvider.java b/java/net/micode/notes/data/NotesProvider.java
index 2aa6680..3ca153f 100644
--- a/java/net/micode/notes/data/NotesProvider.java
+++ b/java/net/micode/notes/data/NotesProvider.java
@@ -28,32 +28,6 @@ import net.micode.notes.data.Notes.DataConstants;
import net.micode.notes.data.Notes.NoteColumns;
-<<<<<<< HEAD
-public class NotesProvider extends ContentProvider {
- private static final UriMatcher mMatcher;
-
- private NotesDatabaseHelper mHelper;
-
- private static final String TAG = "NotesProvider";
-
- private static final int URI_NOTE = 1;
- private static final int URI_NOTE_ITEM = 2;
- private static final int URI_DATA = 3;
- private static final int URI_DATA_ITEM = 4;
-
- private static final int URI_SEARCH = 5;
- private static final int URI_SEARCH_SUGGEST = 6;
-
- 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);
-=======
public class NotesDatabaseHelper extends SQLiteOpenHelper {
//定义了数据库名称
private static final String DB_NAME = "note.db";
@@ -67,7 +41,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
public static final String NOTE = "note";
public static final String DATA = "data";
->>>>>>> f80461a97b63b394a77c3412d981ca8f1288a7cd
}
//定义了标签
@@ -121,21 +94,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Increase folder's note count when move note to the folder
* 将笔记移动到文件夹时增加文件夹的笔记数
*/
-<<<<<<< HEAD
- 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;
-
- 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;
-=======
//定义了对数据库进行增删改查等工作的SQL语句
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER increase_folder_count_on_update "+
@@ -159,7 +117,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID +
" AND " + NoteColumns.NOTES_COUNT + ">0" + ";" +
" END";
->>>>>>> f80461a97b63b394a77c3412d981ca8f1288a7cd
/**
* Increase folder's note count when insert new note to the folder
@@ -377,10 +334,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
createDataTable(db);
}
-<<<<<<< HEAD
-=======
//在数据库升级时调用，根据旧版本和新版本执行相应的升级操作
->>>>>>> f80461a97b63b394a77c3412d981ca8f1288a7cd
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
boolean reCreateTriggers = false;
@@ -414,163 +368,6 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
}
}
-<<<<<<< HEAD
- @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);
- }
- // Notify the note uri
- if (noteId > 0) {
- getContext().getContentResolver().notifyChange(
- ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), null);
- }
-
- // Notify the data 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) {
- // TODO Auto-generated method stub
- return null;
- }
-
-=======
//升级数据库到版本2的操作
private void upgradeToV2(SQLiteDatabase db) {
db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
@@ -600,5 +397,4 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ " INTEGER NOT NULL DEFAULT 0");
}
->>>>>>> f80461a97b63b394a77c3412d981ca8f1288a7cd
}
diff --git a/java/net/micode/notes/gtask/data/MetaData.java b/java/net/micode/notes/gtask/data/MetaData.java
index 3a2050b..da1eaaa 100644
--- a/java/net/micode/notes/gtask/data/MetaData.java
+++ b/java/net/micode/notes/gtask/data/MetaData.java
@@ -24,31 +24,58 @@ import net.micode.notes.tool.GTaskStringUtils;
import org.json.JSONException;
import org.json.JSONObject;
-
public class MetaData extends Task {
+ /*
+ * 功能描述：得到类的简写名称存入字符串TAG中
+ * 实现过程：调用getSimpleName ()函数
+ */
private final static String TAG = MetaData.class.getSimpleName();
+ // 存储关联的Google Tasks ID
private String mRelatedGid = null;
+ /*
+ * 功能描述：设置数据，即生成元数据库
+ * 实现过程：调用JSONObject库函数put ()，Task类中的setNotes ()和setName ()函数
+ * 参数注解：
+ */
public void setMeta(String gid, JSONObject metaInfo) {
+ //对函数块进行注释
try {
metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
+ /*
+ * 将这对键值放入metaInfo这个jsonobject对象中
+ */
} catch (JSONException e) {
Log.e(TAG, "failed to put related gid");
+ /*
+ * 输出错误信息
+ */
}
setNotes(metaInfo.toString());
setName(GTaskStringUtils.META_NOTE_NAME);
}
+ /*
+ * 功能描述：获取相关联的Gid
+ */
public String getRelatedGid() {
return mRelatedGid;
}
+ /*
+ * 功能描述：判断当前数据是否为空，若为空则返回真即值得保存
+ */
@Override
public boolean isWorthSaving() {
return getNotes() != null;
}
+ /*
+ * 功能描述：使用远程json数据对象设置元数据内容
+ * 实现过程：调用父类Task中的setContentByRemoteJSON ()函数，并
+ * 参数注解：
+ */
@Override
public void setContentByRemoteJSON(JSONObject js) {
super.setContentByRemoteJSON(js);
@@ -63,20 +90,27 @@ public class MetaData extends Task {
}
}
+ /*
+ * 功能描述：使用本地json数据对象设置元数据内容，一般不会用到，若用到，则抛出异常
+ */
@Override
public void setContentByLocalJSON(JSONObject js) {
- // this function should not be called
throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
}
+ /*
+ * 功能描述：从元数据内容中获取本地json对象，一般不会用到，若用到，则抛出异常
+ */
@Override
public JSONObject getLocalJSONFromContent() {
throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
}
+ /*
+ * 功能描述：获取同步动作状态，一般不会用到，若用到，则抛出异常
+ */
@Override
public int getSyncAction(Cursor c) {
throw new IllegalAccessError("MetaData:getSyncAction should not be called");
}
-
}
diff --git a/java/net/micode/notes/gtask/data/Node.java b/java/net/micode/notes/gtask/data/Node.java
index 63950e0..4d99f31 100644
--- a/java/net/micode/notes/gtask/data/Node.java
+++ b/java/net/micode/notes/gtask/data/Node.java
@@ -21,32 +21,24 @@ import android.database.Cursor;
import org.json.JSONObject;
public abstract class Node {
+ // 同步动作常量（定义9种同步操作类型）
public static final int SYNC_ACTION_NONE = 0;
-
public static final int SYNC_ACTION_ADD_REMOTE = 1;
-
public static final int SYNC_ACTION_ADD_LOCAL = 2;
-
public static final int SYNC_ACTION_DEL_REMOTE = 3;
-
public static final int SYNC_ACTION_DEL_LOCAL = 4;
-
public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
-
public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
-
public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
-
public static final int SYNC_ACTION_ERROR = 8;
- private String mGid;
-
- private String mName;
-
- private long mLastModified;
-
- private boolean mDeleted;
+ // 节点基础属性
+ private String mGid; // Google Tasks ID或全局唯一标识
+ private String mName; // 节点名称
+ private long mLastModified; // 最后修改时间
+ private boolean mDeleted; // 删除状态
+ // 构造函数：初始化属性默认值
public Node() {
mGid = null;
mName = "";
@@ -54,48 +46,21 @@ public abstract class Node {
mDeleted = false;
}
- public abstract JSONObject getCreateAction(int actionId);
-
- public abstract JSONObject getUpdateAction(int actionId);
-
- public abstract void setContentByRemoteJSON(JSONObject js);
-
- public abstract void setContentByLocalJSON(JSONObject js);
-
- public abstract JSONObject getLocalJSONFromContent();
-
- public abstract int getSyncAction(Cursor c);
-
- public void setGid(String gid) {
- this.mGid = gid;
- }
-
- public void setName(String name) {
- this.mName = name;
- }
-
- public void setLastModified(long lastModified) {
- this.mLastModified = lastModified;
- }
-
- public void setDeleted(boolean deleted) {
- this.mDeleted = deleted;
- }
-
- public String getGid() {
- return this.mGid;
- }
-
- public String getName() {
- return this.mName;
- }
-
- public long getLastModified() {
- return this.mLastModified;
- }
-
- public boolean getDeleted() {
- return this.mDeleted;
- }
-
-}
+ // 抽象方法：由子类实现具体逻辑
+ public abstract JSONObject getCreateAction(int actionId); // 创建同步动作的JSON
+ public abstract JSONObject getUpdateAction(int actionId); // 更新同步动作的JSON
+ public abstract void setContentByRemoteJSON(JSONObject js); // 从远程JSON设置内容
+ public abstract void setContentByLocalJSON(JSONObject js); // 从本地JSON设置内容
+ public abstract JSONObject getLocalJSONFromContent(); // 从内容生成本地JSON
+ public abstract int getSyncAction(Cursor c); // 获取同步动作类型
+
+ // 基础属性的getter和setter方法
+ public void setGid(String gid) { this.mGid = gid; }
+ public void setName(String name) { this.mName = name; }
+ public void setLastModified(long lastModified) { this.mLastModified = lastModified; }
+ public void setDeleted(boolean deleted) { this.mDeleted = deleted; }
+ public String getGid() { return mGid; }
+ public String getName() { return mName; }
+ public long getLastModified() { return mLastModified; }
+ public boolean getDeleted() { return mDeleted; }
+}
\ No newline at end of file
diff --git a/java/net/micode/notes/gtask/data/SqlData.java b/java/net/micode/notes/gtask/data/SqlData.java
index d3ec3be..5013ca7 100644
--- a/java/net/micode/notes/gtask/data/SqlData.java
+++ b/java/net/micode/notes/gtask/data/SqlData.java
@@ -37,40 +37,31 @@ import org.json.JSONObject;
public class SqlData {
private static final String TAG = SqlData.class.getSimpleName();
+ private static final int INVALID_ID = -99999; // 无效ID标识
- private static final int INVALID_ID = -99999;
-
+ // 数据库查询投影（指定查询的列）
public static final String[] PROJECTION_DATA = new String[] {
- DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
- DataColumns.DATA3
+ DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT,
+ DataColumns.DATA1, DataColumns.DATA3
};
-
+ // 投影列的索引常量
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;
-
+ // 对象属性（对应数据库表字段）
+ private ContentResolver mContentResolver; // 内容解析器
+ private boolean mIsCreate; // 是否为新建状态
+ private long mDataId; // 数据ID
+ private String mDataMimeType; // MIME类型
+ private String mDataContent; // 数据内容
+ private long mDataContentData1; // 附加数据1（长整型）
+ private String mDataContentData3; // 附加数据3（字符串）
+ private ContentValues mDiffDataValues; // 记录变更的ContentValues
+
+ // 构造函数：初始化新对象
public SqlData(Context context) {
mContentResolver = context.getContentResolver();
mIsCreate = true;
@@ -82,13 +73,15 @@ public class SqlData {
mDiffDataValues = new ContentValues();
}
+ // 从Cursor加载数据的构造函数
public SqlData(Context context, Cursor c) {
mContentResolver = context.getContentResolver();
mIsCreate = false;
- loadFromCursor(c);
+ loadFromCursor(c); // 从游标加载数据
mDiffDataValues = new ContentValues();
}
+ // 从Cursor加载数据的辅助方法
private void loadFromCursor(Cursor c) {
mDataId = c.getLong(DATA_ID_COLUMN);
mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
@@ -97,13 +90,16 @@ public class SqlData {
mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
}
+ // 根据JSON设置数据内容，并记录变更
public void setContent(JSONObject js) throws JSONException {
+ // 解析ID
long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
if (mIsCreate || mDataId != dataId) {
mDiffDataValues.put(DataColumns.ID, dataId);
}
mDataId = dataId;
+ // 解析MIME类型
String dataMimeType = js.has(DataColumns.MIME_TYPE) ? js.getString(DataColumns.MIME_TYPE)
: DataConstants.NOTE;
if (mIsCreate || !mDataMimeType.equals(dataMimeType)) {
@@ -111,18 +107,21 @@ public class SqlData {
}
mDataMimeType = dataMimeType;
+ // 解析内容
String dataContent = js.has(DataColumns.CONTENT) ? js.getString(DataColumns.CONTENT) : "";
if (mIsCreate || !mDataContent.equals(dataContent)) {
mDiffDataValues.put(DataColumns.CONTENT, dataContent);
}
mDataContent = dataContent;
+ // 解析附加数据1
long dataContentData1 = js.has(DataColumns.DATA1) ? js.getLong(DataColumns.DATA1) : 0;
if (mIsCreate || mDataContentData1 != dataContentData1) {
mDiffDataValues.put(DataColumns.DATA1, dataContentData1);
}
mDataContentData1 = dataContentData1;
+ // 解析附加数据3
String dataContentData3 = js.has(DataColumns.DATA3) ? js.getString(DataColumns.DATA3) : "";
if (mIsCreate || !mDataContentData3.equals(dataContentData3)) {
mDiffDataValues.put(DataColumns.DATA3, dataContentData3);
@@ -130,9 +129,10 @@ public class SqlData {
mDataContentData3 = dataContentData3;
}
+ // 将对象数据转换为JSON
public JSONObject getContent() throws JSONException {
if (mIsCreate) {
- Log.e(TAG, "it seems that we haven't created this in database yet");
+ Log.e(TAG, "数据未创建到数据库中");
return null;
}
JSONObject js = new JSONObject();
@@ -144,46 +144,52 @@ public class SqlData {
return js;
}
+ // 提交数据到数据库（插入或更新）
public void commit(long noteId, boolean validateVersion, long version) {
-
if (mIsCreate) {
+ // 新建数据时移除无效ID，并添加noteId关联
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));
+ mDataId = Long.parseLong(uri.getPathSegments().get(1));
} catch (NumberFormatException e) {
- Log.e(TAG, "Get note id error :" + e.toString());
- throw new ActionFailureException("create note failed");
+ Log.e(TAG, "获取ID失败", e);
+ 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);
+ // 不验证版本时直接更新
+ 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)
- });
+ // 验证版本时添加条件（防止并发冲突）
+ result = mContentResolver.update(
+ ContentUris.withAppendedId(Notes.CONTENT_DATA_URI, mDataId),
+ mDiffDataValues,
+ " ? IN (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
+ + " WHERE " + NoteColumns.VERSION + "=?)",
+ new String[] {String.valueOf(noteId), String.valueOf(version)});
}
if (result == 0) {
- Log.w(TAG, "there is no update. maybe user updates note when syncing");
+ Log.w(TAG, "更新失败，可能同步时用户已修改笔记");
}
}
}
-
+ // 清空变更记录，并标记为非新建状态
mDiffDataValues.clear();
mIsCreate = false;
}
+ // 获取数据ID
public long getId() {
return mDataId;
}
-}
+}
\ No newline at end of file
diff --git a/java/net/micode/notes/gtask/data/SqlNote.java b/java/net/micode/notes/gtask/data/SqlNote.java
index f48ebf8..ae47bc3 100644
--- a/java/net/micode/notes/gtask/data/SqlNote.java
+++ b/java/net/micode/notes/gtask/data/SqlNote.java
@@ -30,148 +30,6 @@ import org.json.JSONObject;
import java.util.ArrayList;
-<<<<<<< HEAD
-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[] {
- NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID,
- NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE,
- NoteColumns.NOTES_COUNT, NoteColumns.PARENT_ID, NoteColumns.SNIPPET, NoteColumns.TYPE,
- NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.SYNC_ID,
- NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
- NoteColumns.VERSION
- };
-
- public static final int ID_COLUMN = 0;
-
- public static final int ALERTED_DATE_COLUMN = 1;
-
- public static final int BG_COLOR_ID_COLUMN = 2;
-
- public static final int CREATED_DATE_COLUMN = 3;
-
- public static final int HAS_ATTACHMENT_COLUMN = 4;
-
- public static final int MODIFIED_DATE_COLUMN = 5;
-
- public static final int NOTES_COUNT_COLUMN = 6;
-
- public static final int PARENT_ID_COLUMN = 7;
-
- public static final int SNIPPET_COLUMN = 8;
-
- public static final int TYPE_COLUMN = 9;
-
- public static final int WIDGET_ID_COLUMN = 10;
-
- public static final int WIDGET_TYPE_COLUMN = 11;
-
- public static final int SYNC_ID_COLUMN = 12;
-
- public static final int LOCAL_MODIFIED_COLUMN = 13;
-
- public static final int ORIGIN_PARENT_ID_COLUMN = 14;
-
- public static final int GTASK_ID_COLUMN = 15;
-
- public static final int VERSION_COLUMN = 16;
-
- private Context mContext;
-
- private ContentResolver mContentResolver;
-
- private boolean mIsCreate;
-
- private long mId;
-
- private long mAlertDate;
-
- private int mBgColorId;
-
- private long mCreatedDate;
-
- private int mHasAttachment;
-
- private long mModifiedDate;
-
- private long mParentId;
-
- private String mSnippet;
-
- private int mType;
-
- private int mWidgetId;
-
- private int mWidgetType;
-
- private long mOriginParent;
-
- private long mVersion;
-
- private ContentValues mDiffNoteValues;
-
- private ArrayList mDataList;
-
- public SqlNote(Context context) {
- mContext = context;
- mContentResolver = context.getContentResolver();
- mIsCreate = true;
- mId = INVALID_ID;
- mAlertDate = 0;
- mBgColorId = ResourceParser.getDefaultBgId(context);
- mCreatedDate = System.currentTimeMillis();
- mHasAttachment = 0;
- mModifiedDate = System.currentTimeMillis();
- mParentId = 0;
- mSnippet = "";
- mType = Notes.TYPE_NOTE;
- mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
- mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
- mOriginParent = 0;
- mVersion = 0;
- mDiffNoteValues = new ContentValues();
- mDataList = new ArrayList();
- }
-
- public SqlNote(Context context, Cursor c) {
- mContext = context;
- mContentResolver = context.getContentResolver();
- mIsCreate = false;
- loadFromCursor(c);
- mDataList = new ArrayList();
- if (mType == Notes.TYPE_NOTE)
- loadDataContent();
- mDiffNoteValues = new ContentValues();
- }
-
- public SqlNote(Context context, long id) {
- mContext = context;
- mContentResolver = context.getContentResolver();
- mIsCreate = false;
- loadFromCursor(id);
- mDataList = new ArrayList();
- if (mType == Notes.TYPE_NOTE)
- loadDataContent();
- mDiffNoteValues = new ContentValues();
-
- }
-
- private void loadFromCursor(long id) {
- Cursor c = null;
- try {
- c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
- new String[] {
- String.valueOf(id)
- }, null);
- if (c != null) {
- c.moveToNext();
- loadFromCursor(c);
- } else {
- Log.w(TAG, "loadFromCursor: cursor = null");
-=======
public class TaskList extends Node {
private static final String TAG = TaskList.class.getSimpleName();//tag标记
@@ -275,61 +133,15 @@ public class TaskList extends Node {
Log.e(TAG, e.toString());
e.printStackTrace();
throw new ActionFailureException("fail to get tasklist content from jsonobject");
->>>>>>> f80461a97b63b394a77c3412d981ca8f1288a7cd
}
}
}
-<<<<<<< HEAD
- 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 void setContentByLocalJSON(JSONObject js) {
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
->>>>>>> f80461a97b63b394a77c3412d981ca8f1288a7cd
}
-<<<<<<< HEAD
- public boolean setContent(JSONObject js) {
-=======
->>>>>>> f80461a97b63b394a77c3412d981ca8f1288a7cd
try {
JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
@@ -353,11 +165,7 @@ public class TaskList extends Node {
}
}
-<<<<<<< HEAD
- public JSONObject getContent() {
-=======
public JSONObject getLocalJSONFromContent() {
->>>>>>> f80461a97b63b394a77c3412d981ca8f1288a7cd
try {
JSONObject js = new JSONObject();
JSONObject folder = new JSONObject();
@@ -536,93 +344,6 @@ public class TaskList extends Node {
return null;
}
-<<<<<<< HEAD
- public void setParentId(long id) {
- mParentId = id;
- mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
- }
-
- public void setGtaskId(String gid) {
- mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
- }
-
- public void setSyncId(long syncId) {
- mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
- }
-
- public void resetLocalModified() {
- mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0);
- }
-
- public long getId() {
- return mId;
- }
-
- public long getParentId() {
- return mParentId;
- }
-
- public String getSnippet() {
- return mSnippet;
- }
-
- public boolean isNoteType() {
- return mType == Notes.TYPE_NOTE;
- }
-
- public void commit(boolean validateVersion) {
- 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);
- }
- }
-=======
/**
* @param task
* @return
@@ -641,7 +362,6 @@ public class TaskList extends Node {
if (index < 0 || index >= mChildren.size()) {
Log.e(TAG, "getTaskByIndex: invalid index");
return null;
->>>>>>> f80461a97b63b394a77c3412d981ca8f1288a7cd
}
return mChildren.get(index);
}
diff --git a/java/net/micode/notes/gtask/exception/ActionFailureException.java b/java/net/micode/notes/gtask/exception/ActionFailureException.java
index 15504be..403539d 100644
--- a/java/net/micode/notes/gtask/exception/ActionFailureException.java
+++ b/java/net/micode/notes/gtask/exception/ActionFailureException.java
@@ -16,13 +16,24 @@
package net.micode.notes.gtask.exception;
+/*
+ * Description：支持小米便签运行过程中的运行异常处理。
+ */
public class ActionFailureException extends RuntimeException {
private static final long serialVersionUID = 4425249765923293627L;
-
+ /*
+ * serialVersionUID相当于java类的身份证。主要用于版本控制。
+ * serialVersionUID作用是序列化时保持版本的兼容性，即在版本升级时反序列化仍保持对象的唯一性。
+ */
public ActionFailureException() {
super();
}
-
+ /*
+ * 在JAVA类中使用super来引用父类的成分，用this来引用当前对象.
+ * 如果一个类从另外一个类继承，我们new这个子类的实例对象的时候，这个子类对象里面会有一个父类对象。
+ * 怎么去引用里面的父类对象呢？使用super来引用
+ * 也就是说，此处super()以及super (paramString)可认为是Exception ()和Exception (paramString)
+ */
public ActionFailureException(String paramString) {
super(paramString);
}
diff --git a/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/java/net/micode/notes/gtask/exception/NetworkFailureException.java
index b08cfb1..ce87949 100644
--- a/java/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ b/java/net/micode/notes/gtask/exception/NetworkFailureException.java
@@ -13,16 +13,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+/*
+ * Description：支持小米便签运行过程中的网络异常处理。
+ */
package net.micode.notes.gtask.exception;
public class NetworkFailureException extends Exception {
private static final long serialVersionUID = 2107610287180234136L;
-
+ /*
+ * serialVersionUID相当于java类的身份证。主要用于版本控制。
+ * serialVersionUID作用是序列化时保持版本的兼容性，即在版本升级时反序列化仍保持对象的唯一性。
+ */
public NetworkFailureException() {
super();
}
+ /*
+ * 在JAVA类中使用super来引用父类的成分，用this来引用当前对象.
+ * 如果一个类从另外一个类继承，我们new这个子类的实例对象的时候，这个子类对象里面会有一个父类对象。
+ * 怎么去引用里面的父类对象呢？使用super来引用
+ * 也就是说，此处super()以及super (paramString)可认为是Exception ()和Exception (paramString)
+ */
public NetworkFailureException(String paramString) {
super(paramString);
}
diff --git a/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index 08d20f7..3b751df 100644
--- a/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -28,114 +28,106 @@ import net.micode.notes.R;
import net.micode.notes.ui.NotesListActivity;
import net.micode.notes.ui.NotesPreferenceActivity;
-
+/*异步操作类，实现GTask的异步操作过程
+ * 主要方法：
+ * private void showNotification(int tickerId, String content) 向用户提示当前同步的状态，是一个用于交互的方法
+ * protected Integer doInBackground(Void... unused) 此方法在后台线程执行，完成任务的主要工作，通常需要较长的时间
+ * protected void onProgressUpdate(String... progress) 可以使用进度条增加用户体验度。 此方法在主线程执行，用于显示任务执行的进度。
+ * protected void onPostExecute(Integer result) 相当于Handler 处理UI的方式，在这里面可以使用在doInBackground 得到的结果处理操作UI
+ */
public class GTaskASyncTask extends AsyncTask {
+ private static int GTASK_SYNC_NOTIFICATION_ID = 5234235; // 通知ID
- private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;
-
+ // 同步完成回调接口
public interface OnCompleteListener {
void onComplete();
}
- private Context mContext;
-
- private NotificationManager mNotifiManager;
-
- private GTaskManager mTaskManager;
-
- private OnCompleteListener mOnCompleteListener;
+ 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();
+ mNotifiManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+ mTaskManager = GTaskManager.getInstance(); // 获取GTask管理单例
}
+ // 取消同步任务
public void cancelSync() {
mTaskManager.cancelSync();
}
+ // 发布进度（封装参数格式）
public void publishProgess(String message) {
- publishProgress(new String[] {
- message
- });
+ publishProgress(new String[] { message });
}
-// private void showNotification(int tickerId, String content) {
-// Notification notification = new Notification(R.drawable.notification, mContext
-// .getString(tickerId), System.currentTimeMillis());
-// notification.defaults = Notification.DEFAULT_LIGHTS;
-// notification.flags = Notification.FLAG_AUTO_CANCEL;
-// PendingIntent pendingIntent;
-// if (tickerId != R.string.ticker_success) {
-// pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-// NotesPreferenceActivity.class), 0);
-//
-// } else {
-// pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-// NotesListActivity.class), 0);
-// }
-// notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
-// pendingIntent);
-// mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
-// }
-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);
+ // 显示同步通知
+ 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); // 显示为进行中状态
+ mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, builder.getNotification());
}
- 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.getNotification();
- mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
-}
+
+ // 后台执行同步任务（异步任务核心方法）
@Override
protected Integer doInBackground(Void... unused) {
- publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
- .getSyncAccountName(mContext)));
+ // 发布登录进度通知
+ publishProgess(mContext.getString(R.string.sync_progress_login,
+ NotesPreferenceActivity.getSyncAccountName(mContext)));
+ // 调用GTaskManager执行同步，返回状态码
return mTaskManager.sync(mContext, this);
}
+ // 更新进度（UI线程执行）
@Override
protected void onProgressUpdate(String... progress) {
- showNotification(R.string.ticker_syncing, progress[0]);
+ showNotification(R.string.ticker_syncing, progress[0]); // 显示同步中通知
+ // 向服务发送广播（如果上下文是GTaskSyncService）
if (mContext instanceof GTaskSyncService) {
((GTaskSyncService) mContext).sendBroadcast(progress[0]);
}
}
+ // 任务完成后执行（UI线程执行）
@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());
+ 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));
+ showNotification(R.string.ticker_cancel, mContext.getString(R.string.error_sync_cancelled));
}
+ // 异步执行回调（避免阻塞UI线程）
if (mOnCompleteListener != null) {
- new Thread(new Runnable() {
-
- public void run() {
- mOnCompleteListener.onComplete();
- }
- }).start();
+ new Thread(() -> mOnCompleteListener.onComplete()).start();
}
}
-}
+}
\ No newline at end of file
diff --git a/java/net/micode/notes/gtask/remote/GTaskClient.java b/java/net/micode/notes/gtask/remote/GTaskClient.java
index 48a038f..cb7582c 100644
--- a/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/java/net/micode/notes/gtask/remote/GTaskClient.java
@@ -24,8 +24,6 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
-//import com.google.firebase.crashlytics.buildtools.reloc.org.apache.http.HttpEntity;
-
import net.micode.notes.gtask.data.Node;
import net.micode.notes.gtask.data.Task;
import net.micode.notes.gtask.data.TaskList;
@@ -33,6 +31,7 @@ import net.micode.notes.gtask.exception.ActionFailureException;
import net.micode.notes.gtask.exception.NetworkFailureException;
import net.micode.notes.tool.GTaskStringUtils;
import net.micode.notes.ui.NotesPreferenceActivity;
+
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
@@ -61,7 +60,10 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
-
+/*
+ * 主要功能：实现GTASK的登录操作，进行GTASK任务的创建，创建任务列表，从网络上获取任务和任务列表的内容
+ * 主要使用类或技术：accountManager JSONObject HttpParams authToken Gid
+ */
public class GTaskClient {
private static final String TAG = GTaskClient.class.getSimpleName();
@@ -91,6 +93,7 @@ public class GTaskClient {
private JSONArray mUpdateArray;
+
private GTaskClient() {
mHttpClient = null;
mGetUrl = GTASK_GET_URL;
@@ -103,6 +106,10 @@ public class GTaskClient {
mUpdateArray = null;
}
+ /*用来获取的实例化对象
+ * 使用 getInstance()
+ * 返回mInstance这个实例化对象
+ */
public static synchronized GTaskClient getInstance() {
if (mInstance == null) {
mInstance = new GTaskClient();
@@ -110,42 +117,54 @@ public class GTaskClient {
return mInstance;
}
+ /*用来实现登录操作的函数，传入的参数是一个Activity
+ * 设置登录操作限制时间，如果超时则需要重新登录
+ * 有两种登录方式，使用用户自己的URL登录或者使用谷歌官方的URL登录
+ * 返回true或者false，即最后是否登陆成功
+ */
public boolean login(Activity activity) {
// we suppose that the cookie would expire after 5 minutes
// then we need to re-login
+ //判断距离最后一次登录操作是否超过5分钟
final long interval = 1000 * 60 * 5;
if (mLastLoginTime + interval < System.currentTimeMillis()) {
mLoggedin = false;
}
- // need to re-login after account switch
+ // need to re-login after account switch 重新登录操作
if (mLoggedin
&& !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity
.getSyncAccountName(activity))) {
mLoggedin = false;
}
+ //如果没超过时间，则不需要重新登录
if (mLoggedin) {
Log.d(TAG, "already logged in");
return true;
}
+ //更新最后登录时间，改为系统当前的时间
mLastLoginTime = System.currentTimeMillis();
String authToken = loginGoogleAccount(activity, false);
+ //判断是否登录到谷歌账户
if (authToken == null) {
Log.e(TAG, "login google account failed");
return false;
}
// login with custom domain if necessary
+
+
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";
+ mGetUrl = url.toString() + "ig"; //设置用户对应的getUrl
+ mPostUrl = url.toString() + "r/ig";//设置用户对应的postUrl
if (tryToLoginGtask(activity, authToken)) {
mLoggedin = true;
@@ -153,6 +172,7 @@ public class GTaskClient {
}
// try to login with google official url
+ //如果用户账户无法登录，则使用谷歌官方的URI进行登录
if (!mLoggedin) {
mGetUrl = GTASK_GET_URL;
mPostUrl = GTASK_POST_URL;
@@ -165,9 +185,17 @@ public class GTaskClient {
return true;
}
- private String loginGoogleAccount(Activity activity, boolean invalidateToken) {
+ /*具体实现登录谷歌账户的方法
+ * 使用令牌机制
+ * 使用AccountManager来管理注册账号
+ * 返回值是账号的令牌
+ */
+ private String loginGoogleAccount(Activity activity, boolean invalidateToken) {//令牌，是登录操作保证安全性的一个方法
String authToken;
+ //AccountManager这个类给用户提供了集中注册账号的接口
AccountManager accountManager = AccountManager.get(activity);
+
+ //获取全部以com.google结尾的account
Account[] accounts = accountManager.getAccountsByType("com.google");
if (accounts.length == 0) {
@@ -177,6 +205,7 @@ public class GTaskClient {
String accountName = NotesPreferenceActivity.getSyncAccountName(activity);
Account account = null;
+ //遍历获得的accounts信息，寻找已经记录过的账户信息
for (Account a : accounts) {
if (a.name.equals(accountName)) {
account = a;
@@ -191,11 +220,13 @@ public class GTaskClient {
}
// get the token now
+ //获取选中账号的令牌
AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account,
"goanna_mobile", null, activity, null, null);
try {
Bundle authTokenBundle = accountManagerFuture.getResult();
authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN);
+ //如果是invalidateToken，那么需要调用invalidateAuthToken(String, String)方法废除这个无效token
if (invalidateToken) {
accountManager.invalidateAuthToken("com.google", authToken);
loginGoogleAccount(activity, false);
@@ -208,10 +239,13 @@ public class GTaskClient {
return authToken;
}
+ //尝试登陆Gtask，这只是一个预先判断令牌是否是有效以及是否能登上GTask的方法,而不是具体实现登陆的方法
private boolean tryToLoginGtask(Activity activity, String authToken) {
if (!loginGtask(authToken)) {
// maybe the auth token is out of date, now let's invalidate the
// token and try again
+
+ //删除过一个无效的authToken，申请一个新的后再次尝试登陆
authToken = loginGoogleAccount(activity, true);
if (authToken == null) {
Log.e(TAG, "login google account failed");
@@ -226,25 +260,34 @@ public class GTaskClient {
return true;
}
+ //实现登录GTask的具体操作
private boolean loginGtask(String authToken) {
int timeoutConnection = 10000;
int timeoutSocket = 15000;
+ //socket是一种通信连接实现数据的交换的端口
HttpParams httpParameters = new BasicHttpParams();
+ //实例化一个新的HTTP参数类
HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);
+ //设置连接超时时间
HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);
+ //设置设置端口超时时间
mHttpClient = new DefaultHttpClient(httpParameters);
BasicCookieStore localBasicCookieStore = new BasicCookieStore();
+ //设置本地cookie
mHttpClient.setCookieStore(localBasicCookieStore);
HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false);
// login gtask
try {
String loginUrl = mGetUrl + "?auth=" + authToken;
+ //设置登录的url
HttpGet httpGet = new HttpGet(loginUrl);
+ //通过登录的uri实例化网页上资源的查找
HttpResponse response = null;
response = mHttpClient.execute(httpGet);
// get the cookie now
+ //获取CookieStore里存放的cookie,看如果存有“GTL(不知道什么意思)”，则说明有验证成功的有效的cookie
List cookies = mHttpClient.getCookieStore().getCookies();
boolean hasAuthCookie = false;
for (Cookie cookie : cookies) {
@@ -257,6 +300,7 @@ public class GTaskClient {
}
// get the client version
+ //获取client的内容，具体操作是在返回的Content中截取从_setup(开始到)}中间的字符串内容，也就是gtask_url的内容
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}";
@@ -285,6 +329,10 @@ public class GTaskClient {
return mActionId++;
}
+ /*实例化创建一个用于向网络传输数据的对象
+ * 使用HttpPost类
+ * 返回一个httpPost实例化对象，但里面还没有内容
+ */
private HttpPost createHttpPost() {
HttpPost httpPost = new HttpPost(mPostUrl);
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
@@ -292,17 +340,23 @@ public class GTaskClient {
return httpPost;
}
+ /*通过URL获取响应后返回的数据，也就是网络上的数据和资源
+ * 使用getContentEncoding()获取网络上的资源和数据
+ * 返回值就是获取到的资源
+ */
private String getResponseContent(HttpEntity entity) throws IOException {
String contentEncoding = null;
if (entity.getContentEncoding() != null) {
+ //通过URL得到HttpEntity对象，如果不为空则使用getContent（）方法创建一个流将数据从网络都过来
contentEncoding = entity.getContentEncoding().getValue();
Log.d(TAG, "encoding: " + contentEncoding);
}
InputStream input = entity.getContent();
if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {
+//GZIP是使用DEFLATE进行压缩数据的另一个压缩库
input = new GZIPInputStream(entity.getContent());
- } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {
+ } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {//DEFLATE是一个无专利的压缩算法，它可以实现无损数据压缩
Inflater inflater = new Inflater(true);
input = new InflaterInputStream(entity.getContent(), inflater);
}
@@ -310,6 +364,7 @@ public class GTaskClient {
try {
InputStreamReader isr = new InputStreamReader(input);
BufferedReader br = new BufferedReader(isr);
+//是一个包装类，它可以包装字符流，将字符流放入缓存里，先把字符读到缓存里，到缓存满了时候，再读入内存，是为了提供读的效率而设计的
StringBuilder sb = new StringBuilder();
while (true) {
@@ -324,12 +379,19 @@ public class GTaskClient {
}
}
+ /*通过JSON发送请求
+ * 请求的具体内容在json的实例化对象js中然后传入
+ * 利用UrlEncodedFormEntity entity和httpPost.setEntity(entity)方法把js中的内容放置到httpPost中
+ * 执行请求后使用getResponseContent方法得到返回的数据和资源
+ * 将资源再次放入json后返回
+ */
+
private JSONObject postRequest(JSONObject js) throws NetworkFailureException {
if (!mLoggedin) {
Log.e(TAG, "please login first");
throw new ActionFailureException("not logged in");
}
-
+ //实例化一个httpPost的对象用来向服务器传输数据，在这里就是发送请求，而请求的内容在js里
HttpPost httpPost = createHttpPost();
try {
LinkedList list = new LinkedList();
@@ -361,6 +423,13 @@ public class GTaskClient {
}
}
+ /*创建单个任务
+ * 传入参数是一个.gtask.data.Task包里Task类的对象
+ * 利用json获取Task里的内容,并且创建相应的jsPost
+ * 利用postRequest得到任务的返回信息
+ * 使用task.setGid设置task的new_ID
+ */
+
public void createTask(Task task) throws NetworkFailureException {
commitUpdate();
try {
@@ -387,6 +456,9 @@ public class GTaskClient {
}
}
+ /*
+ * 创建一个任务列表，与createTask几乎一样，区别就是最后设置的是tasklist的gid
+ */
public void createTaskList(TaskList tasklist) throws NetworkFailureException {
commitUpdate();
try {
@@ -413,6 +485,11 @@ public class GTaskClient {
}
}
+ /*
+ * 同步更新操作
+ * 使用JSONObject进行数据存储，使用jsPost.put，Put的信息包括UpdateArray和ClientVersion
+ * 使用postRequest发送这个jspost,进行处理
+ */
public void commitUpdate() throws NetworkFailureException {
if (mUpdateArray != null) {
try {
@@ -434,6 +511,10 @@ public class GTaskClient {
}
}
+ /*
+ * 添加更新的事项
+ * 调用commitUpdate()实现
+ */
public void addUpdateNode(Node node) throws NetworkFailureException {
if (node != null) {
// too many update items may result in an error
@@ -448,6 +529,12 @@ public class GTaskClient {
}
}
+ /*
+ * 移动task,比如讲task移动到不同的task列表中去
+ * 通过getGid获取task所属列表的gid
+ * 通过JSONObject.put(String name, Object value)函数设置移动后的task的相关属性值，从而达到移动的目的
+ * 最后还是通过postRequest进行更新后的发送
+ */
public void moveTask(Task task, TaskList preParent, TaskList curParent)
throws NetworkFailureException {
commitUpdate();
@@ -463,6 +550,8 @@ public class GTaskClient {
action.put(GTaskStringUtils.GTASK_JSON_ID, task.getGid());
if (preParent == curParent && task.getPriorSibling() != null) {
// put prioring_sibing_id only if moving within the tasklist and
+
+ //设置优先级ID，只有当移动是发生在文件中
// it is not the first one
action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling());
}
@@ -473,6 +562,7 @@ public class GTaskClient {
action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid());
}
actionList.put(action);
+ //最后将ACTION_LIST加入到jsPost中
jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList);
// client_version
@@ -487,6 +577,11 @@ public class GTaskClient {
}
}
+ /*
+ * 删除操作节点
+ * 还是利用JSON
+ * 删除过后使用postRequest发送删除后的结果
+ */
public void deleteNode(Node node) throws NetworkFailureException {
commitUpdate();
try {
@@ -510,6 +605,11 @@ public class GTaskClient {
}
}
+ /*
+ * 获取任务列表
+ * 首先通过GetURI使用getResponseContent从网上获取数据
+ * 然后筛选出"_setup("到)}的部分，并且从中获取GTASK_JSON_LISTS的内容返回
+ */
public JSONArray getTaskLists() throws NetworkFailureException {
if (!mLoggedin) {
Log.e(TAG, "please login first");
@@ -522,6 +622,7 @@ public class GTaskClient {
response = mHttpClient.execute(httpGet);
// get the task list
+ //筛选工作，把筛选出的字符串放入jsString
String resString = getResponseContent(response.getEntity());
String jsBegin = "_setup(";
String jsEnd = ")}";
@@ -548,6 +649,9 @@ public class GTaskClient {
}
}
+ /*
+ * 通过传入的TASKList的gid,从网络上获取相应属于这个任务列表的任务
+ */
public JSONArray getTaskList(String listGid) throws NetworkFailureException {
commitUpdate();
try {
@@ -580,6 +684,8 @@ public class GTaskClient {
return mAccount;
}
+
+ //重置更新的内容
public void resetUpdateArray() {
mUpdateArray = null;
}
diff --git a/java/net/micode/notes/gtask/remote/GTaskManager.java b/java/net/micode/notes/gtask/remote/GTaskManager.java
index 73c80f0..2c52d2d 100644
--- a/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/java/net/micode/notes/gtask/remote/GTaskManager.java
@@ -87,10 +87,13 @@ public class GTaskManager {
private HashMap mNidToGid;
- private GTaskManager() {
+ private GTaskManager() {//对象初始化函数
mSyncing = false;
+ //正在同步,flase代表未执行
mCancelled = false;
+ //全局标识，flase代表可以执行
mGTaskListHashMap = new HashMap();
+ //<>代表Java的泛型,就是创建一个用类型作为参数的类。
mGTaskHashMap = new HashMap();
mMetaHashMap = new HashMap();
mMetaList = null;
@@ -98,22 +101,42 @@ public class GTaskManager {
mGidToNid = new HashMap();
mNidToGid = new HashMap();
}
-
- public static synchronized GTaskManager getInstance() {
+ /*
+ * 包含关键字synchronized，语言级同步，指明该函数可能运行在多线程的环境下。
+ * 功能：类初始化函数
+ * @author TTS
+ * @return GtaskManger
+ */
+
+ public static synchronized GTaskManager getInstance() { //可能运行在多线程环境下，使用语言级同步--synchronized
if (mInstance == null) {
mInstance = new GTaskManager();
}
return mInstance;
}
+ /*
+ * 包含关键字synchronized，语言级同步，指明该函数可能运行在多线程的环境下。
+ * @author TTS
+ * @param activity
+ */
public synchronized void setActivityContext(Activity activity) {
// used for getting authtoken
mActivity = activity;
}
+ /*
+ * 核心函数
+ * 功能：实现了本地同步操作和远端同步操作
+ * @author TTS
+ * @param context-----获取上下文
+ * @param asyncTask-------用于同步的异步操作类
+ * @return int
+ */
public int sync(Context context, GTaskASyncTask asyncTask) {
if (mSyncing) {
Log.d(TAG, "Sync is in progress");
+ //创建日志文件（调试信息），debug
return STATE_SYNC_IN_PROGRESS;
}
mContext = context;
@@ -130,6 +153,7 @@ public class GTaskManager {
try {
GTaskClient client = GTaskClient.getInstance();
client.resetUpdateArray();
+//JSONArray类型，reset即置为NULL
// login google task
if (!mCancelled) {
@@ -141,14 +165,18 @@ public class GTaskManager {
// get the task list from google
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list));
initGTaskList();
+ //获取Google上的JSONtasklist转为本地TaskList
// do content sync work
asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing));
syncContent();
} catch (NetworkFailureException e) {
+ //分为两种异常，此类异常为网络异常
Log.e(TAG, e.toString());
+ //创建日志文件（调试信息），error
return STATE_NETWORK_ERROR;
} catch (ActionFailureException e) {
+ //此类异常为操作异常
Log.e(TAG, e.toString());
return STATE_INTERNAL_ERROR;
} catch (Exception e) {
@@ -168,11 +196,22 @@ public class GTaskManager {
return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS;
}
+ /*
+ *功能：初始化GtaskList，获取Google上的JSONtasklist转为本地TaskList。
+ *获得的数据存储在mMetaList，mGTaskListHashMap，mGTaskHashMap
+ *@author TTS
+ *@exception NetworkFailureException
+ *@return void
+ */
+
private void initGTaskList() throws NetworkFailureException {
if (mCancelled)
return;
GTaskClient client = GTaskClient.getInstance();
- try {
+ try {//Json对象是Name Value对(即子元素)的无序集合，相当于一个Map对象。JsonObject类是bantouyan-json库对Json对象的抽象，提供操纵Json对象的各种方法。
+ //其格式为{"key1":value1,"key2",value2....};key 必须是字符串。
+ //因为ajax请求不刷新页面，但配合js可以实现局部刷新，因此json常常被用来作为异步请求的返回对象使用。
+
JSONArray jsTaskLists = client.getTaskLists();
// init meta list first
@@ -185,7 +224,7 @@ public class GTaskManager {
if (name
.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) {
mMetaList = new TaskList();
- mMetaList.setContentByRemoteJSON(object);
+ mMetaList.setContentByRemoteJSON(object);//将JSON中部分数据复制到自己定义的对象中相对应的数据：name->mname...
// load meta data
JSONArray jsMetas = client.getTaskList(gid);
@@ -247,9 +286,17 @@ public class GTaskManager {
}
}
+ /*
+ * 功能：本地内容同步操作
+ * @throws NetworkFailureException
+ * @return 无返回值
+ */
private void syncContent() throws NetworkFailureException {
+ //本地内容同步操作
int syncType;
Cursor c = null;
+
+ //数据库指针
String gid;
Node node;
@@ -476,6 +523,14 @@ public class GTaskManager {
GTaskClient.getInstance().commitUpdate();
}
+ /*
+ * 功能：syncType分类，addLocalNode，addRemoteNode，deleteNode，updateLocalNode，updateRemoteNode
+ * @author TTS
+ * @param syncType
+ * @param node
+ * @param c
+ * @throws NetworkFailureException
+ */
private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -522,6 +577,12 @@ public class GTaskManager {
}
}
+ /*
+ * 功能：本地增加Node
+ * @author TTS
+ * @param node
+ * @throws NetworkFailureException
+ */
private void addLocalNode(Node node) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -596,6 +657,16 @@ public class GTaskManager {
updateRemoteMeta(node.getGid(), sqlNote);
}
+ /*
+ * 功能：update本地node
+ * @author TTS
+ * @param node
+ * ----同步操作的基础数据类型
+ * @param c
+ * ----Cursor
+ * @throws NetworkFailureException
+ */
+
private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -619,6 +690,17 @@ public class GTaskManager {
updateRemoteMeta(node.getGid(), sqlNote);
}
+ /*
+ * 功能：远程增加Node
+ * 需要updateRemoteMeta
+ * @author TTS
+ * @param node
+ * ----同步操作的基础数据类型
+ * @param c
+ * --Cursor
+ * @throws NetworkFailureException
+ */
+
private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -638,7 +720,7 @@ public class GTaskManager {
throw new ActionFailureException("cannot add remote task");
}
mGTaskListHashMap.get(parentGid).addChildTask(task);
-
+//登录远程服务器，创建Task
GTaskClient.getInstance().createTask(task);
n = (Node) task;
@@ -656,6 +738,7 @@ public class GTaskManager {
else
folderName += sqlNote.getSnippet();
+ //iterator迭代器，通过统一的接口迭代所有的map元素
Iterator> iter = mGTaskListHashMap.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry entry = iter.next();
@@ -692,6 +775,16 @@ public class GTaskManager {
mNidToGid.put(sqlNote.getId(), n.getGid());
}
+ /*
+ * 功能：更新远端的Node，包含meta更新(updateRemoteMeta)
+ * @author TTS
+ * @param node
+ * ----同步操作的基础数据类型
+ * @param c
+ * --Cursor
+ * @throws NetworkFailureException
+ */
+
private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
@@ -710,12 +803,14 @@ public class GTaskManager {
if (sqlNote.isNoteType()) {
Task task = (Task) node;
TaskList preParentList = task.getParent();
+ //preParentList为通过node获取的父节点列表
String curParentGid = mNidToGid.get(sqlNote.getParentId());
if (curParentGid == null) {
Log.e(TAG, "cannot find task's parent tasklist");
throw new ActionFailureException("cannot update remote task");
}
+ //通过HashMap找到对应Gid的TaskList
TaskList curParentList = mGTaskListHashMap.get(curParentGid);
if (preParentList != curParentList) {
@@ -727,9 +822,18 @@ public class GTaskManager {
// clear local modified flag
sqlNote.resetLocalModified();
- sqlNote.commit(true);
+ sqlNote.commit(true); //commit到本地数据库
}
+ /**
+ * 功能：升级远程meta。 meta---元数据----计算机文件系统管理数据---管理数据的数据。
+ * @author TTS
+ * @param gid
+ * ---GoogleID为String类型
+ * @param sqlNote
+ * ---同步前的数据库操作，故使用类SqlNote
+ * @throws NetworkFailureException
+ */
private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException {
if (sqlNote != null && sqlNote.isNoteType()) {
MetaData metaData = mMetaHashMap.get(gid);
@@ -746,6 +850,12 @@ public class GTaskManager {
}
}
+ /**
+ * 功能：刷新本地，给sync的ID对应上最后更改过的对象
+ * @author TTS
+ * @return void
+ * @throws NetworkFailureException
+ */
private void refreshLocalSyncId() throws NetworkFailureException {
if (mCancelled) {
return;
@@ -790,10 +900,19 @@ public class GTaskManager {
}
}
+ /**
+ * 功能：获取同步账号,mAccount.name
+ * @author TTS
+ * @return String
+ */
public String getSyncAccount() {
return GTaskClient.getInstance().getSyncAccount().name;
}
+ /**
+ * 功能：取消同步，置mCancelled为true
+ * @author TTS
+ */
public void cancelSync() {
mCancelled = true;
}
diff --git a/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/java/net/micode/notes/gtask/remote/GTaskSyncService.java
index cca36f7..81dc1d6 100644
--- a/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ b/java/net/micode/notes/gtask/remote/GTaskSyncService.java
@@ -15,6 +15,22 @@
*/
package net.micode.notes.gtask.remote;
+/*
+ * Service是在一段不定的时间运行在后台，不和用户交互的应用组件
+ * 主要方法：
+ * private void startSync() 启动一个同步工作
+ * private void cancelSync() 取消同步
+ * public void onCreate()
+ * public int onStartCommand(Intent intent, int flags, int startId) service生命周期的组成部分，相当于重启service（比如在被暂停之后），而不是创建一个新的service
+ * public void onLowMemory() 在没有内存的情况下如果存在service则结束掉这的service
+ * public IBinder onBind()
+ * public void sendBroadcast(String msg) 发送同步的相关通知
+ * public static void startSync(Activity activity)
+ * public static void cancelSync(Context context)
+ * public static boolean isSyncing() 判读是否在进行同步
+ * public static String getProgressString() 获取当前进度的信息
+ */
+
import android.app.Activity;
import android.app.Service;
@@ -42,7 +58,7 @@ public class GTaskSyncService extends Service {
private static String mSyncProgress = "";
- private void startSync() {
+ private void startSync() {//开始一个同步的工作
if (mSyncTask == null) {
mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() {
public void onComplete() {
@@ -52,7 +68,7 @@ public class GTaskSyncService extends Service {
}
});
sendBroadcast("");
- mSyncTask.execute();
+ mSyncTask.execute();//这个函数让任务是以单线程队列方式或线程池队列方式运行
}
}
@@ -62,6 +78,7 @@ public class GTaskSyncService extends Service {
}
}
+ //初始化一个service
@Override
public void onCreate() {
mSyncTask = null;
@@ -72,6 +89,7 @@ public class GTaskSyncService extends Service {
Bundle bundle = intent.getExtras();
if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) {
switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) {
+ //两种情况，开始同步或者取消同步
case ACTION_START_SYNC:
startSync();
break;
@@ -81,7 +99,7 @@ public class GTaskSyncService extends Service {
default:
break;
}
- return START_STICKY;
+ return START_STICKY;//等待新的intent来是这个service继续运行
}
return super.onStartCommand(intent, flags, startId);
}
@@ -99,20 +117,20 @@ public class GTaskSyncService extends Service {
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 intent = new Intent(GTASK_SERVICE_BROADCAST_NAME);//创建一个新的Intent
+ intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null);//附加INTENT中的相应参数的值
intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg);
- sendBroadcast(intent);
+ sendBroadcast(intent); //发送这个通知
}
- public static void startSync(Activity activity) {
+ public static void startSync(Activity activity) {//执行一个service，service的内容里的同步动作就是开始同步
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) {
+ public static void cancelSync(Context context) {//执行一个service，service的内容里的同步动作就是取消同步
Intent intent = new Intent(context, GTaskSyncService.class);
intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC);
context.startService(intent);
diff --git a/java/net/micode/notes/model/Note.java b/java/net/micode/notes/model/Note.java
index 6706cf6..5975683 100644
--- a/java/net/micode/notes/model/Note.java
+++ b/java/net/micode/notes/model/Note.java
@@ -49,8 +49,10 @@ public class Note {
values.put(NoteColumns.MODIFIED_DATE, createdTime);
values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
values.put(NoteColumns.LOCAL_MODIFIED, 1);
- values.put(NoteColumns.PARENT_ID, folderId);
+ values.put(NoteColumns.PARENT_ID, folderId);//将数据写入数据库表格
Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
+ //ContentResolver()主要是实现外部应用对ContentProvider中的数据
+ //进行添加、删除、修改和查询操作
long noteId = 0;
try {
@@ -65,38 +67,38 @@ public class Note {
return noteId;
}
- public Note() {
+ public Note() {//定义两个变量用来存储便签的数据，一个是存储便签属性、一个是存储便签内容
mNoteDiffValues = new ContentValues();
mNoteData = new NoteData();
}
- public void setNoteValue(String key, String value) {
+ public void setNoteValue(String key, String value) {//设置数据库表格的标签属性数据
mNoteDiffValues.put(key, value);
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
}
- public void setTextData(String key, String value) {
+ public void setTextData(String key, String value) {//设置数据库表格的标签文本内容的数据
mNoteData.setTextData(key, value);
}
- public void setTextDataId(long id) {
+ public void setTextDataId(long id) {//设置文本数据的ID
mNoteData.setTextDataId(id);
}
- public long getTextDataId() {
+ public long getTextDataId() {//得到文本数据的ID
return mNoteData.mTextDataId;
}
- public void setCallDataId(long id) {
+ public void setCallDataId(long id) {//设置电话号码数据的ID
mNoteData.setCallDataId(id);
}
- public void setCallData(String key, String value) {
+ public void setCallData(String key, String value) {//得到电话号码数据的ID
mNoteData.setCallData(key, value);
}
- public boolean isLocalModified() {
+ public boolean isLocalModified() {//判断是否本地修改
return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
}
@@ -130,6 +132,7 @@ public class Note {
return true;
}
+ //定义一个基本的便签内容的数据类，主要包含文本数据和电话号码数据
private class NoteData {
private long mTextDataId;
@@ -177,7 +180,7 @@ public class Note {
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
}
-
+ //将新的数据通过Uri的操作存储到数据库
Uri pushIntoContentResolver(Context context, long noteId) {
/**
* Check for safety
@@ -209,7 +212,7 @@ public class Note {
operationList.add(builder.build());
}
mTextDataValues.clear();
- }
+ }//把文本数据存入DataColumns
if(mCallDataValues.size() > 0) {
mCallDataValues.put(DataColumns.NOTE_ID, noteId);
@@ -231,7 +234,7 @@ public class Note {
operationList.add(builder.build());
}
mCallDataValues.clear();
- }
+ }//把电话号码数据存入DataColumns
if (operationList.size() > 0) {
try {
@@ -246,7 +249,7 @@ public class Note {
Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage()));
return null;
}
- }
+ }//存储过程中的异常处理
return null;
}
}
diff --git a/java/net/micode/notes/model/WorkingNote.java b/java/net/micode/notes/model/WorkingNote.java
index be081e4..289f70f 100644
--- a/java/net/micode/notes/model/WorkingNote.java
+++ b/java/net/micode/notes/model/WorkingNote.java
@@ -61,7 +61,7 @@ public class WorkingNote {
private boolean mIsDeleted;
private NoteSettingChangedListener mNoteSettingStatusListener;
-
+ // 声明 DATA_PROJECTION字符串数组
public static final String[] DATA_PROJECTION = new String[] {
DataColumns.ID,
DataColumns.CONTENT,
@@ -123,12 +123,13 @@ public class WorkingNote {
mNote = new Note();
loadNote();
}
-
+ // 加载Note
+ // 通过数据库调用query函数找到第一个条目
private void loadNote() {
Cursor cursor = mContext.getContentResolver().query(
ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
null, null);
-
+// 若存在，储存相应信息
if (cursor != null) {
if (cursor.moveToFirst()) {
mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN);
@@ -139,17 +140,18 @@ public class WorkingNote {
mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
}
cursor.close();
+ // 若不存在，报错
} else {
Log.e(TAG, "No note with id:" + mNoteId);
throw new IllegalArgumentException("Unable to find note with id " + mNoteId);
}
loadNoteData();
}
-
+ // 加载NoteData
private void loadNoteData() {
Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
DataColumns.NOTE_ID + "=?", new String[] {
- String.valueOf(mNoteId)
+ String.valueOf(mNoteId)
}, null);
if (cursor != null) {
@@ -173,10 +175,12 @@ public class WorkingNote {
throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
}
}
-
+ // 创建空的Note
+ // 传参：context，文件夹id，widget，背景颜色
public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
- int widgetType, int defaultBgColorId) {
+ int widgetType, int defaultBgColorId) {
WorkingNote note = new WorkingNote(context, folderId);
+ // 设定相关属性
note.setBgColorId(defaultBgColorId);
note.setWidgetId(widgetId);
note.setWidgetType(widgetType);
@@ -187,6 +191,7 @@ public class WorkingNote {
return new WorkingNote(context, id, 0);
}
+ // 保存Note
public synchronized boolean saveNote() {
if (isWorthSaving()) {
if (!existInDatabase()) {
@@ -224,11 +229,12 @@ public class WorkingNote {
return true;
}
}
-
+ // 设置mNoteSettingStatusListener
public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
mNoteSettingStatusListener = l;
}
-
+ // 设置AlertDate
+ // 若 mAlertDate与data不同，则更改mAlertDate并设定NoteValue
public void setAlertDate(long date, boolean set) {
if (date != mAlertDate) {
mAlertDate = date;
@@ -238,17 +244,17 @@ public class WorkingNote {
mNoteSettingStatusListener.onClockAlertChanged(date, set);
}
}
-
+ // 设定删除标记
public void markDeleted(boolean mark) {
mIsDeleted = mark;
if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID
&& mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) {
- mNoteSettingStatusListener.onWidgetChanged();
+ mNoteSettingStatusListener.onWidgetChanged();// 调用mNoteSettingStatusListener的 onWidgetChanged方法
}
}
-
+ // 设定背景颜色
public void setBgColorId(int id) {
- if (id != mBgColorId) {
+ if (id != mBgColorId) {//设定条件 id != mBgColorId
mBgColorId = id;
if (mNoteSettingStatusListener != null) {
mNoteSettingStatusListener.onBackgroundColorChanged();
@@ -256,7 +262,8 @@ public class WorkingNote {
mNote.setNoteValue(NoteColumns.BG_COLOR_ID, String.valueOf(id));
}
}
-
+ // 设定检查列表模式
+ // 参数：mode
public void setCheckListMode(int mode) {
if (mMode != mode) {
if (mNoteSettingStatusListener != null) {
@@ -266,82 +273,88 @@ public class WorkingNote {
mNote.setTextData(TextNote.MODE, String.valueOf(mMode));
}
}
-
+ // 设定WidgetType
+ // 参数：type
public void setWidgetType(int type) {
if (type != mWidgetType) {
mWidgetType = type;
mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType));
}
}
-
+ // 设定WidgetId
+ // 参数：id
public void setWidgetId(int id) {
if (id != mWidgetId) {
mWidgetId = id;
mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId));
}
}
-
+ // 设定WorkingTex
+ // 参数：更改的text
public void setWorkingText(String text) {
if (!TextUtils.equals(mContent, text)) {
mContent = text;
mNote.setTextData(DataColumns.CONTENT, mContent);
}
}
-
+ // 转变mNote的CallData及CallNote信息
+ // 参数：String phoneNumber, long callDate
public void convertToCallNote(String phoneNumber, long callDate) {
mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate));
mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber);
mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
}
-
+ // 判断是否有时钟题型
public boolean hasClockAlert() {
return (mAlertDate > 0 ? true : false);
}
-
+ // 获取Content
public String getContent() {
return mContent;
}
-
+ // 获取AlertDate
public long getAlertDate() {
return mAlertDate;
}
-
+ // 获取ModifiedDate
public long getModifiedDate() {
return mModifiedDate;
}
-
+ // 获取背景颜色来源id
public int getBgColorResId() {
return NoteBgResources.getNoteBgResource(mBgColorId);
}
-
+ // 获取背景颜色id
public int getBgColorId() {
return mBgColorId;
}
-
+ // 获取标题背景颜色id
public int getTitleBgResId() {
return NoteBgResources.getNoteTitleBgResource(mBgColorId);
}
-
+ // 获取CheckListMode
public int getCheckListMode() {
return mMode;
}
-
+ // 获取便签id
public long getNoteId() {
return mNoteId;
}
-
+ // 获取文件夹id
public long getFolderId() {
return mFolderId;
}
-
+ // 获取WidgetId
public int getWidgetId() {
return mWidgetId;
}
-
+ // 获取WidgetType
public int getWidgetType() {
return mWidgetType;
}
-
+ // 创建接口 NoteSettingChangedListener,便签更新监视
+ // 为NoteEditActivity提供接口
+ // 提供函数有
public interface NoteSettingChangedListener {
/**
* Called when the background color of current note has just changed
diff --git a/java/net/micode/notes/tool/BackupUtils.java b/java/net/micode/notes/tool/BackupUtils.java
index c26472a..2c300f7 100644
--- a/java/net/micode/notes/tool/BackupUtils.java
+++ b/java/net/micode/notes/tool/BackupUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+//哈哈哈哈
package net.micode.notes.tool;
import android.content.Context;
@@ -39,10 +39,15 @@ import java.io.PrintStream;
public class BackupUtils {
private static final String TAG = "BackupUtils";
// Singleton stuff
- private static BackupUtils sInstance;
+ private static BackupUtils sInstance;//类里面为什么可以定义自身类的对象？
public static synchronized BackupUtils getInstance(Context context) {
+ //ynchronized 关键字，代表这个方法加锁,相当于不管哪一个线程（例如线程A）
+ //运行到这个方法时,都要检查有没有其它线程B（或者C、 D等）正在用这个方法(或者该类的其他同步方法)，有的话要等正在使用synchronized方法的线程B（或者C 、D）运行完这个方法后再运行此线程A,没有的话,锁定调用者,然后直接运行。
+ //它包括两种用法：synchronized 方法和 synchronized 块。
+
if (sInstance == null) {
+ //如果当前备份不存在，则新声明一个
sInstance = new BackupUtils(context);
}
return sInstance;
@@ -65,10 +70,12 @@ public class BackupUtils {
private TextExport mTextExport;
+ //初始化函数
private BackupUtils(Context context) {
mTextExport = new TextExport(context);
}
+ //外部存储功能是否可用
private static boolean externalStorageAvailable() {
return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
}
@@ -146,7 +153,7 @@ public class BackupUtils {
folderId
}, null);
- if (notesCursor != null) {
+ if (notesCursor != null) {//利用光标来扫描内容，区别为callnote和note两种，靠ps.printline输出
if (notesCursor.moveToFirst()) {
do {
// Print note's last modified date
@@ -218,7 +225,7 @@ public class BackupUtils {
/**
* Note will be exported as text which is user readable
*/
- public int exportToText() {
+ public int exportToText() {//总函数，调用上面的exportFolder和exportNote
if (!externalStorageAvailable()) {
Log.d(TAG, "Media was not mounted");
return STATE_SD_CARD_UNMOUONTED;
diff --git a/res/color/primary_text_dark.xml b/res/color/primary_text_dark.xml
new file mode 100644
index 0000000..7c85459
--- /dev/null
+++ b/res/color/primary_text_dark.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+