pnju9rpvk
/
mijia_node
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

在 zy 分支上提交我的本地改动

Browse Source
pull/7/head
ZY 11 months ago
parent 6eb2630088
commit ceb76ff08c
2 changed files with 550 additions and 510 deletions
Show Stats Download Patch File Download Diff File

453
MiNotes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
Unescape View File

@ -37,16 +37,13 @@ import org.json.JSONObject;
import java.util.ArrayList;
/**
* 数据库笔记操作类
* 处理笔记（Note）的增删改查及同步逻辑，支持与Google任务（GTask）的数据交互
*/
public class SqlNote {
private static final String TAG = SqlNote.class.getSimpleName();
private static final int INVALID_ID = -99999; // 无效ID标识
// 笔记查询投影字段（对应数据库表中的列）
public static final String[] PROJECTION_NOTE = new String[]{
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,
@ -55,133 +52,139 @@ public class SqlNote {
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; // 内容解析器（用于操作ContentProvider）
private boolean mIsCreate; // 是否为新建笔记（未插入数据库）
private long mId; // 笔记ID
private long mAlertDate; // 提醒时间（时间戳）
private int mBgColorId; // 背景颜色ID（对应资源文件中的颜色）
private long mCreatedDate; // 创建时间（时间戳）
private int mHasAttachment; // 是否有附件（0-无，1-有）
private long mModifiedDate; // 修改时间（时间戳）
private long mParentId; // 父文件夹ID（0表示根目录）
private String mSnippet; // 笔记摘要（内容预览）
private int mType; // 类型（笔记、文件夹、系统文件夹等）
private int mWidgetId; // 小部件ID（关联桌面小部件）
private int mWidgetType; // 小部件类型（无效/文本/列表等）
private long mOriginParent; // 原始父文件夹ID（用于移动操作跟踪）
private long mVersion; // 版本号（用于数据同步冲突检测）
private ContentValues mDiffNoteValues; // 差异值（记录变更字段）
private ArrayList<SqlData> mDataList; // 关联的数据项列表（如文本内容、附件等）
/**
* 构造函数：创建新笔记（默认值初始化）
* @param context 上下文
*/
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<SqlData> mDataList;
public SqlNote(Context context) {
mContext = context;
mContentResolver = context.getContentResolver();
mIsCreate = true;
mId = INVALID_ID;
mAlertDate = 0;
// 默认背景颜色（从资源解析器获取）
mBgColorId = ResourceParser.getDefaultBgId(context);
mCreatedDate = System.currentTimeMillis(); // 当前时间戳
mCreatedDate = System.currentTimeMillis();
mHasAttachment = 0;
mModifiedDate = System.currentTimeMillis(); // 当前时间戳
mParentId = 0; // 根目录
mModifiedDate = System.currentTimeMillis();
mParentId = 0;
mSnippet = "";
mType = Notes.TYPE_NOTE; // 默认类型为普通笔记
mWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID; // 无效小部件ID
mWidgetType = Notes.TYPE_WIDGET_INVALIDE; // 无效小部件类型
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>();
}
/**
* 构造函数：从游标加载现有笔记数据
* @param context 上下文
* @param c 数据库游标（已查询到的笔记记录）
*/
public SqlNote(Context context, Cursor c) {
mContext = context;
mContentResolver = context.getContentResolver();
mIsCreate = false;
loadFromCursor(c); // 从游标加载基础字段
loadFromCursor(c);
mDataList = new ArrayList<SqlData>();
if (mType == Notes.TYPE_NOTE) {
loadDataContent(); // 加载笔记关联的数据项（如文本内容）
}
if (mType == Notes.TYPE_NOTE)
loadDataContent();
mDiffNoteValues = new ContentValues();
}
/**
* 构造函数：通过ID加载现有笔记数据
* @param context 上下文
* @param id 笔记ID
*/
public SqlNote(Context context, long id) {
mContext = context;
mContentResolver = context.getContentResolver();
mIsCreate = false;
loadFromCursor(id); // 通过ID查询并加载数据
loadFromCursor(id);
mDataList = new ArrayList<SqlData>();
if (mType == Notes.TYPE_NOTE) {
loadDataContent(); // 加载数据项
}
if (mType == Notes.TYPE_NOTE)
loadDataContent();
mDiffNoteValues = new ContentValues();
}
/**
* 从游标加载笔记基础字段（通过ID查询）
* @param id 笔记ID
*/
private void loadFromCursor(long id) {
Cursor c = null;
try {
// 查询笔记表，条件为ID匹配
c = mContentResolver.query(
Notes.CONTENT_NOTE_URI,
PROJECTION_NOTE,
"(_id=?)",
new String[]{String.valueOf(id)},
null
);
if (c != null && c.moveToNext()) {
loadFromCursor(c); // 调用游标加载方法
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: 游标为空或无数据");
Log.w(TAG, "loadFromCursor: cursor = null");
}
} finally {
if (c != null) c.close(); // 关闭游标释放资源
if (c != null)
c.close();
}
}
/**
* 从游标加载笔记基础字段（直接通过游标数据）
* @param c 已定位到目标记录的游标
*/
private void loadFromCursor(Cursor c) {
mId = c.getLong(ID_COLUMN);
mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
@ -194,138 +197,179 @@ public class SqlNote {
mType = c.getInt(TYPE_COLUMN);
mWidgetId = c.getInt(WIDGET_ID_COLUMN);
mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
mVersion = c.getLong(VERSION_COLUMN); // 版本号用于同步冲突检测
mVersion = c.getLong(VERSION_COLUMN);
}
/**
* 加载笔记关联的数据项（如文本内容、附件等）
*/
private void loadDataContent() {
Cursor c = null;
mDataList.clear(); // 清空现有数据项列表
mDataList.clear();
try {
// 查询数据项表，条件为所属笔记ID
c = mContentResolver.query(
Notes.CONTENT_DATA_URI,
SqlData.PROJECTION_DATA,
"(note_id=?)",
new String[]{String.valueOf(mId)},
null
);
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, "该笔记无数据项");
Log.w(TAG, "it seems that the note has not data");
return;
}
while (c.moveToNext()) {
// 每个数据项创建SqlData实例并添加到列表
SqlData data = new SqlData(mContext, c);
mDataList.add(data);
}
} else {
Log.w(TAG, "loadDataContent: 游标为空");
Log.w(TAG, "loadDataContent: cursor = null");
}
} finally {
if (c != null) c.close();
if (c != null)
c.close();
}
}
/**
* 从JSON对象设置笔记内容（支持普通笔记、文件夹、系统文件夹）
* @param js 包含笔记数据的JSON对象
* @return 是否设置成功
*/
public boolean setContent(JSONObject js) {
try {
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); // 提取笔记元数据
int type = note.getInt(NoteColumns.TYPE); // 获取笔记类型
// 系统文件夹禁止修改（直接返回）
if (type == Notes.TYPE_SYSTEM) {
Log.w(TAG, "无法修改系统文件夹");
return false;
} else if (type == Notes.TYPE_FOLDER) {
// 文件夹仅允许更新摘要和类型
String snippet = note.optString(NoteColumns.SNIPPET, "");
if (!mSnippet.equals(snippet)) { // 对比现有摘要
mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); // 记录差异
mSnippet = snippet;
}
int newType = note.optInt(NoteColumns.TYPE, Notes.TYPE_NOTE);
if (mType != newType) { // 对比类型
mDiffNoteValues.put(NoteColumns.TYPE, newType); // 记录差异
mType = newType;
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
Log.w(TAG, "cannot set system folder");
} else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
// for folder we can only update the snnipet and type
String snippet = note.has(NoteColumns.SNIPPET) ? note
.getString(NoteColumns.SNIPPET) : "";
if (mIsCreate || !mSnippet.equals(snippet)) {
mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
}
} else if (type == Notes.TYPE_NOTE) {
// 普通笔记处理（包含数据项）
JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); // 提取数据项数组
mSnippet = snippet;
// 基础字段更新
long id = note.optLong(NoteColumns.ID, INVALID_ID);
if (mId != id) {
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;
}
mId = id;
long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note
.getLong(NoteColumns.ALERTED_DATE) : 0;
if (mIsCreate || mAlertDate != alertDate) {
mDiffNoteValues.put(NoteColumns.ALERTED_DATE, alertDate);
}
mAlertDate = alertDate;
int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
.getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
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;
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;
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;
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;
mAlertDate = note.optLong(NoteColumns.ALERTED_DATE, 0);
mBgColorId = note.optInt(NoteColumns.BG_COLOR_ID, ResourceParser.getDefaultBgId(mContext));
mCreatedDate = note.optLong(NoteColumns.CREATED_DATE, System.currentTimeMillis());
mHasAttachment = note.optInt(NoteColumns.HAS_ATTACHMENT, 0);
mModifiedDate = note.optLong(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
mParentId = note.optLong(NoteColumns.PARENT_ID, 0);
mSnippet = note.optString(NoteColumns.SNIPPET, "");
mType = note.optInt(NoteColumns.TYPE, Notes.TYPE_NOTE);
mWidgetId = note.optInt(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
mWidgetType = note.optInt(NoteColumns.WIDGET_TYPE, Notes.TYPE_WIDGET_INVALIDE);
mOriginParent = note.optLong(NoteColumns.ORIGIN_PARENT_ID, 0);
// 数据项处理（新增/更新）
for (int i = 0; i < dataArray.length(); i++) {
JSONObject dataJson = dataArray.getJSONObject(i);
long dataId = dataJson.optLong(DataColumns.ID, INVALID_ID);
JSONObject data = dataArray.getJSONObject(i);
SqlData sqlData = null;
// 查找已存在的数据项（通过ID匹配）
for (SqlData temp : mDataList) {
if (temp.getId() == dataId) {
sqlData = temp;
break;
if (data.has(DataColumns.ID)) {
long dataId = data.getLong(DataColumns.ID);
for (SqlData temp : mDataList) {
if (dataId == temp.getId()) {
sqlData = temp;
}
}
}
// 不存在则创建新数据项
if (sqlData == null) {
sqlData = new SqlData(mContext);
mDataList.add(sqlData);
}
// 设置数据项内容（自动处理差异）
sqlData.setContent(dataJson);
sqlData.setContent(data);
}
}
} catch (JSONException e) {
Log.e(TAG, "JSON解析异常: " + e.toString());
Log.e(TAG, e.toString());
e.printStackTrace();
return false;
}
return true;
}
/**
* 将笔记内容转换为JSON对象（用于同步传输）
* @return JSON对象，包含笔记元数据和数据项
*/
public JSONObject getContent() {
try {
JSONObject js = new JSONObject();
if (mIsCreate) {
Log.e(TAG, "笔记尚未创建，无法生成JSON");
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);
@ -340,7 +384,6 @@ public class SqlNote {
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();
@ -350,49 +393,113 @@ public class SqlNote {
}
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, "JSON生成异常: " + e.toString());
Log.e(TAG, e.toString());
e.printStackTrace();
}
return null;
}
// ==================== 辅助设置方法（更新差异值） ====================
public void setParentId(long id) {
mParentId = id;
mDiffNoteValues.put(NoteColumns.PARENT_ID, id); // 记录父ID变更
mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
}
public void setGtaskId(String gid) {
mDiffNoteValues.put(NoteColumns.GTASK_ID, gid); // 记录GTask ID变更
mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
}
public void setSyncId(long syncId) {
mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId); // 记录同步ID变更
mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
}
public void resetLocalModified() {
mDiffNoteValues.put(NoteColumns.LOCAL_MODIFIED, 0); // 重置本地修改标记
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 long getId() {
return mId;
}
public long getParentId() {
return mParentId;
}
public String getSnippet() {
return mSnippet;
}
public boolean isNoteType() {
return mType == Notes.TYPE_NOTE;
}
/**
* 提交变更到数据库（执行插入或更新操作）
* @param validateVersion 是否验证版本号（防止并发冲突）
*/
public void commit(boolean validateVersion) {
if (mIsCreate) {
// 新建笔记：插入到笔记表
if (mId == IN
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);
}
}
}
// refresh local info
loadFromCursor(mId);
if (mType == Notes.TYPE_NOTE)
loadDataContent();
mDiffNoteValues.clear();
mIsCreate = false;
}
}

607
MiNotes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save